From 3c227b83de4d8c4de252380066057fd49be281bf471419470d6eed569c464a44 Mon Sep 17 00:00:00 2001 From: Johannes Segitz Date: Thu, 14 Jul 2016 14:27:12 +0000 Subject: [PATCH] Accepting request 408533 from home:jsegitz:branches:security:SELinux - Without bug number no submit to SLE 12 SP2 is possible, so to make sle-changelog-checker happy: bsc#988977 - Added suse_path.patch to fix path to hll compiler OBS-URL: https://build.opensuse.org/request/show/408533 OBS-URL: https://build.opensuse.org/package/show/security:SELinux/libsemanage?expand=0&rev=55 --- libsemanage.changes | 11 +++++++++++ libsemanage.spec | 2 ++ python-semanage.spec | 2 ++ suse_path.patch | 26 ++++++++++++++++++++++++++ 4 files changed, 41 insertions(+) create mode 100644 suse_path.patch diff --git a/libsemanage.changes b/libsemanage.changes index b0e5baa..d3a7b09 100644 --- a/libsemanage.changes +++ b/libsemanage.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Jul 14 14:20:12 UTC 2016 - jsegitz@novell.com + +- Without bug number no submit to SLE 12 SP2 is possible, so to make + sle-changelog-checker happy: bsc#988977 + +------------------------------------------------------------------- +Wed Jul 13 09:43:28 UTC 2016 - jsegitz@novell.com + +- Added suse_path.patch to fix path to hll compiler + ------------------------------------------------------------------- Fri Jul 8 15:24:49 UTC 2016 - i@marguerite.su diff --git a/libsemanage.spec b/libsemanage.spec index 4f0b0d5..f7f5162 100644 --- a/libsemanage.spec +++ b/libsemanage.spec @@ -26,6 +26,7 @@ Url: https://github.com/SELinuxProject/selinux/wiki/Releases Source: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160223/%{name}-%{version}.tar.gz Source1: baselibs.conf Source2: semanage.conf +Patch0: suse_path.patch BuildRequires: audit-devel BuildRequires: bison BuildRequires: fdupes @@ -95,6 +96,7 @@ needed for developing applications that manipulate binary policies. %prep %setup -q +%patch0 -p0 %build make %{?_smp_mflags} clean diff --git a/python-semanage.spec b/python-semanage.spec index a1ea97f..3a28350 100644 --- a/python-semanage.spec +++ b/python-semanage.spec @@ -25,6 +25,7 @@ Group: Development/Languages/Python Url: https://github.com/SELinuxProject/selinux Source: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160223/libsemanage-%{version}.tar.gz Source1: baselibs.conf +Patch0: suse_path.patch BuildRequires: audit-devel BuildRequires: bison BuildRequires: flex @@ -43,6 +44,7 @@ SELinux management applications. %prep %setup -q -n libsemanage-%{version} +%patch0 -p0 %build make %{?_smp_mflags} clean diff --git a/suse_path.patch b/suse_path.patch new file mode 100644 index 0000000..05215cb --- /dev/null +++ b/suse_path.patch @@ -0,0 +1,26 @@ +Index: man/man5/semanage.conf.5 +=================================================================== +--- man/man5/semanage.conf.5.orig 2016-02-23 17:31:41.000000000 +0100 ++++ man/man5/semanage.conf.5 2016-07-13 11:42:45.687894644 +0200 +@@ -37,7 +37,7 @@ Specify an alternative store_root path t + + .TP + .B compiler-directory +-Specify an alternative directory that contains HLL to CIL compilers. The default value is "/usr/libexec/selinux/hll". ++Specify an alternative directory that contains HLL to CIL compilers. The default value is "/usr/lib/selinux/hll". + + .TP + .B ignore-module-cache +Index: src/conf-parse.y +=================================================================== +--- src/conf-parse.y.orig 2016-02-23 17:31:41.000000000 +0100 ++++ src/conf-parse.y 2016-07-13 11:42:45.687894644 +0200 +@@ -341,7 +341,7 @@ static int semanage_conf_init(semanage_c + conf->store_path = strdup(basename(selinux_policy_root())); + conf->ignoredirs = NULL; + conf->store_root_path = strdup("/var/lib/selinux"); +- conf->compiler_directory_path = strdup("/usr/libexec/selinux/hll"); ++ conf->compiler_directory_path = strdup("/usr/lib/selinux/hll"); + conf->policyvers = sepol_policy_kern_vers_max(); + conf->target_platform = SEPOL_TARGET_SELINUX; + conf->expand_check = 1;