[libselinux] * Tue May 6 2014 Miroslav Grepl <mgrepl at redhat.com> - 2.2.2-8 - Add selinux_openssh_contexts_path()

[Miroslav Grepl]

commit 05fcafd63be5bc6cda61ab200b9b76557d915b19
Author: Miroslav Grepl <mgrepl at redhat.com>
Date:   Tue May 6 15:08:30 2014 +0200

    * Tue May 6 2014 Miroslav Grepl <mgrepl at redhat.com> - 2.2.2-8
    - Add selinux_openssh_contexts_path()

 0001-Add-selinux_openssh_contexts_path.patch |   81 ++++++++++++++++++++++++++
 libselinux.spec                              |    7 ++-
 2 files changed, 87 insertions(+), 1 deletions(-)
---
diff --git a/0001-Add-selinux_openssh_contexts_path.patch b/0001-Add-selinux_openssh_contexts_path.patch
new file mode 100644
index 0000000..673b528
--- /dev/null
+++ b/0001-Add-selinux_openssh_contexts_path.patch
@@ -0,0 +1,81 @@
+From e8f8394fdbc6869e98a88d63aa16d107e2de0275 Mon Sep 17 00:00:00 2001
+From: Miroslav Grepl <mgrepl at redhat.com>
+Date: Tue, 6 May 2014 15:05:14 +0200
+Subject: [PATCH] Add selinux_openssh_contexts_path()
+
+---
+ libselinux/include/selinux/selinux.h |  1 +
+ libselinux/src/file_path_suffixes.h  |  1 +
+ libselinux/src/selinux_config.c      | 12 ++++++++++--
+ libselinux/src/selinux_internal.h    |  1 +
+ 4 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/libselinux/include/selinux/selinux.h b/libselinux/include/selinux/selinux.h
+index 7fff62a..5f4a85e 100644
+--- a/libselinux/include/selinux/selinux.h
++++ b/libselinux/include/selinux/selinux.h
+@@ -523,6 +523,7 @@ extern const char *selinux_virtual_image_context_path(void);
+ extern const char *selinux_lxc_contexts_path(void);
+ extern const char *selinux_x_context_path(void);
+ extern const char *selinux_sepgsql_context_path(void);
++extern const char *selinux_openssh_contexts_path(void);
+ extern const char *selinux_systemd_contexts_path(void);
+ extern const char *selinux_contexts_path(void);
+ extern const char *selinux_securetty_types_path(void);
+diff --git a/libselinux/src/file_path_suffixes.h b/libselinux/src/file_path_suffixes.h
+index 3c92424..d1f9b48 100644
+--- a/libselinux/src/file_path_suffixes.h
++++ b/libselinux/src/file_path_suffixes.h
+@@ -23,6 +23,7 @@ S_(BINPOLICY, "/policy/policy")
+     S_(VIRTUAL_DOMAIN, "/contexts/virtual_domain_context")
+     S_(VIRTUAL_IMAGE, "/contexts/virtual_image_context")
+     S_(LXC_CONTEXTS, "/contexts/lxc_contexts")
++    S_(OPENSSH_CONTEXTS, "/contexts/openssh_contexts")
+     S_(SYSTEMD_CONTEXTS, "/contexts/systemd_contexts")
+     S_(FILE_CONTEXT_SUBS, "/contexts/files/file_contexts.subs")
+     S_(FILE_CONTEXT_SUBS_DIST, "/contexts/files/file_contexts.subs_dist")
+diff --git a/libselinux/src/selinux_config.c b/libselinux/src/selinux_config.c
+index 30e9dc7..2129f26 100644
+--- a/libselinux/src/selinux_config.c
++++ b/libselinux/src/selinux_config.c
+@@ -50,8 +50,9 @@
+ #define FILE_CONTEXT_SUBS_DIST 25
+ #define LXC_CONTEXTS      26
+ #define BOOLEAN_SUBS      27
+-#define SYSTEMD_CONTEXTS  28
+-#define NEL               29
++#define OPENSSH_CONTEXTS  28
++#define SYSTEMD_CONTEXTS  29
++#define NEL               30
+ 
+ /* Part of one-time lazy init */
+ static pthread_once_t once = PTHREAD_ONCE_INIT;
+@@ -493,6 +494,13 @@ const char *selinux_lxc_contexts_path(void)
+ 
+ hidden_def(selinux_lxc_contexts_path)
+ 
++const char *selinux_openssh_contexts_path(void)
++{
++	return get_path(OPENSSH_CONTEXTS);
++}
++
++hidden_def(selinux_openssh_contexts_path)
++
+ const char *selinux_systemd_contexts_path(void)
+ {
+ 	return get_path(SYSTEMD_CONTEXTS);
+diff --git a/libselinux/src/selinux_internal.h b/libselinux/src/selinux_internal.h
+index afb2170..fe8eb67 100644
+--- a/libselinux/src/selinux_internal.h
++++ b/libselinux/src/selinux_internal.h
+@@ -82,6 +82,7 @@ hidden_proto(selinux_mkload_policy)
+     hidden_proto(selinux_customizable_types_path)
+     hidden_proto(selinux_media_context_path)
+     hidden_proto(selinux_x_context_path)
++    hidden_proto(selinux_openssh_contexts_path)
+     hidden_proto(selinux_sepgsql_context_path)
+     hidden_proto(selinux_systemd_contexts_path)
+     hidden_proto(selinux_path)
+-- 
+1.9.0
+
diff --git a/libselinux.spec b/libselinux.spec
index 466e04d..37db6f1 100644
--- a/libselinux.spec
+++ b/libselinux.spec
@@ -10,7 +10,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.2.2
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 Source: %{name}-%{version}.tgz
@@ -18,6 +18,7 @@ Source1: selinuxconlist.8
 Source2: selinuxdefcon.8
 Url: http://oss.tresys.com/git/selinux.git
 Patch1: libselinux-rhat.patch
+Patch2: 0001-Add-selinux_openssh_contexts_path.patch
 BuildRequires: pkgconfig python-devel ruby-devel ruby libsepol-static >= %{libsepolver} swig pcre-devel xz-devel
 %if 0%{?with_python3}
 BuildRequires: python3-devel
@@ -101,6 +102,7 @@ needed for developing SELinux applications.
 %prep
 %setup -q
 %patch1 -p2 -b .rhat
+%patch2 -p2 -b .openssh
 
 %build
 # To support building the Python wrapper against multiple Python runtimes
@@ -243,6 +245,9 @@ rm -rf %{buildroot}
 %{ruby_sitearch}/selinux.so
 
 %changelog
+* Tue May 6 2014 Miroslav Grepl <mgrepl at redhat.com> - 2.2.2-8
+- Add selinux_openssh_contexts_path()
+
 * Thu Apr 24 2014 Vít Ondruch <vondruch at redhat.com> - 2.2.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.1