[mod_selinux: 1/2] security policy updates

[KaiGai Kohei]

commit 618129e7f67d120663445e166366ae730358129f
Author: KaiGai Kohei <kaigai at kaigai.gr.jp>
Date:   Thu Jun 6 18:17:40 2013 +0200

    security policy updates

 .gitignore       |    1 +
 mod_selinux.spec |   25 +++++++++++++++----------
 sources          |    2 +-
 3 files changed, 17 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7fda99d..b9dcb14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 mod_selinux-2.2.2454.tgz
 /mod_selinux-2.2.2455.tgz
 /mod_selinux-2.4.3.tgz
+/mod_selinux-2.4.4.tgz
diff --git a/mod_selinux.spec b/mod_selinux.spec
index f910666..95dc94f 100644
--- a/mod_selinux.spec
+++ b/mod_selinux.spec
@@ -5,10 +5,10 @@
 %{!?_httpd_confdir:    %{expand: %%global _httpd_confdir    %%{_sysconfdir}/httpd/conf.d}}
 %{!?_httpd_moddir:    %{expand: %%global _httpd_moddir    %%{_libdir}/httpd/modules}}
 
-%define selinux_policy_types targeted mls
+%define selinux_policy_types targeted mls minimum
 
 Name: mod_selinux
-Version: 2.4.3
+Version: 2.4.4
 Release: 1%{?dist}
 Summary: Apache/SELinux plus module
 Group: System Environment/Daemons
@@ -16,8 +16,8 @@ License: ASL 2.0
 URL: http://code.google.com/p/sepgsql/
 Source0: http://sepgsql.googlecode.com/files/%{name}-%{version}.tgz
 Source1: %{name}.conf
-BuildRequires: httpd-devel >= 2.4.0 libselinux-devel checkpolicy >= 2.0.19 policycoreutils selinux-policy-devel
-Requires: kernel >= 2.6.28 httpd >= 2.4.0 policycoreutils selinux-policy
+BuildRequires: httpd-devel >= 2.2.0 libselinux-devel checkpolicy >= 2.0.19 policycoreutils selinux-policy-devel
+Requires: kernel >= 2.6.28 httpd >= 2.2.0 policycoreutils selinux-policy
 Requires: httpd-mmn = %{_httpd_mmn}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -44,7 +44,7 @@ web application contains security bugs or vulnerabilities.
 for policy in %{selinux_policy_types}
 do
     %{__make} NAME=${policy} -f %{?policy_devel_root}%{_datadir}/selinux/devel/Makefile
-    mv %{name}.pp %{name}.pp.${policy}
+    mv %{name}.pp %{name}.${policy}.pp
 done
 
 %install
@@ -66,11 +66,10 @@ install -Dp mod_selinux.conf %{buildroot}%{_httpd_confdir}/mod_selinux.conf
 install -Dp -m 644 %{SOURCE1}       %{buildroot}%{_httpd_confdir}/mod_selinux.conf
 %endif
 
+%{__install} -d %{buildroot}%{_datadir}/selinux/packages
 for policy in %{selinux_policy_types}
 do
-    %{__install} -d %{buildroot}%{_datadir}/selinux/${policy}
-    %{__install} -p -m 644 %{name}.pp.${policy} \
-               %{buildroot}%{_datadir}/selinux/${policy}/%{name}.pp
+    %{__install} -p -m 644 %{name}.${policy}.pp %{buildroot}%{_datadir}/selinux/packages
 done
 
 %clean
@@ -82,7 +81,7 @@ rm -rf %{buildroot}
 for policy in %{selinux_policy_types}
 do
     %{_sbindir}/semodule -s ${policy} \
-        -i %{_datadir}/selinux/${policy}/%{name}.pp 2>/dev/null || :
+        -i %{_datadir}/selinux/packages/%{name}.${policy}.pp 2>/dev/null || :
 done
 
 %postun
@@ -102,9 +101,12 @@ fi
 %endif
 %config(noreplace) %{_httpd_confdir}/*.conf
 %{_libdir}/httpd/modules/%{name}.so
-%{_datadir}/selinux/*/%{name}.pp
+%{_datadir}/selinux/packages/*
 
 %changelog
+* Thu Jun  6 2013 KaiGai Kohei <kaigai at ak.jp.nec.com> - 2.4.4
+- fix security policy module
+
 * Tue Jul 24 2012 KaiGai Kohei <kaigai at ak.jp.nec.com> - 2.4.3
 - fix build towards httpd-2.4.x
 
@@ -114,6 +116,9 @@ fi
 * Tue May  1 2012 Joe Orton <jorton at redhat.com> - 2.2.2454-5
 - packaging fixes (#803075)
 
+* Tue May  1 2012 Joe Orton <jorton at redhat.com> - 2.2.2454-5
+- packaging fixes (#803075)
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.2454-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 4b88771..4b92b2b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f8949820caa41358d39895f0c51f3e3f  mod_selinux-2.4.3.tgz
+1dcb1035ef63113cfab05fcd3644908b  mod_selinux-2.4.4.tgz