From bd8b5a05a73d99df4344a2d31fdfebeaab93a469 Mon Sep 17 00:00:00 2001 From: Dan Walsh Date: Mon, 12 Nov 2012 17:02:39 -0500 Subject: [PATCH] Move policy generation tools into policycoreutils-devel --- policycoreutils-rhat.patch | 8 +++--- policycoreutils.spec | 57 +++++++++++++++++++++++--------------- 2 files changed, 39 insertions(+), 26 deletions(-) diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index c1be83d..ff54260 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -342441,7 +342441,7 @@ index 0000000..f77e50e +""" diff --git a/policycoreutils/sepolicy/sepolicy/templates/spec.py b/policycoreutils/sepolicy/sepolicy/templates/spec.py new file mode 100644 -index 0000000..1e83ff9 +index 0000000..c0a8b41 --- /dev/null +++ b/policycoreutils/sepolicy/sepolicy/templates/spec.py @@ -0,0 +1,77 @@ @@ -342466,9 +342466,9 @@ index 0000000..1e83ff9 +Source1: MODULENAME.if +Source2: MODULENAME_selinux.8 + -+Requires: policycoreutils-python, libselinux-utils -+Requires(post): selinux-policy-base >= %{selinux_policyver}, policycoreutils-python -+Requires(postun): policycoreutils-python ++Requires: policycoreutils, libselinux-utils ++Requires(post): selinux-policy-base >= %{selinux_policyver}, policycoreutils ++Requires(postun): policycoreutils +""" + +mid_section="""\ diff --git a/policycoreutils.spec b/policycoreutils.spec index 76d1c49..940be73 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -7,7 +7,7 @@ Summary: SELinux policy core utilities Name: policycoreutils Version: 2.1.13 -Release: 28%{?dist} +Release: 30%{?dist} License: GPLv2 Group: System Environment/Base # Based on git repository with tag 20101221 @@ -126,12 +126,9 @@ Group: System Environment/Base Requires: policycoreutils = %{version}-%{release} Requires: libsemanage-python >= %{libsemanagever} libselinux-python libcgroup Requires: audit-libs-python >= %{libauditver} -Requires: /usr/bin/make Requires(pre): python >= 2.6 Obsoletes: policycoreutils < 2.0.61-2 -Requires: setools-libs-python >= 3.3.7-14 -Requires: python-IPy checkpolicy -Requires: selinux-policy-devel +Requires: python-IPy %description python The policycoreutils-python package contains the management tools use to manage an SELinux environment. @@ -139,25 +136,16 @@ The policycoreutils-python package contains the management tools use to manage a %files python %defattr(-,root,root,-) %{_sbindir}/semanage -%{_bindir}/audit2allow %{_bindir}/audit2why %{_bindir}/chcat %{_bindir}/sandbox -%{_bindir}/sepolgen %{_bindir}/sepolicy -%{_bindir}/sepolgen-ifgen -%{_bindir}/sepolgen-ifgen-attr-helper %{python_sitelib}/seobject.py* -%{python_sitelib}/sepolgen %{python_sitelib}/sepolicy %{python_sitelib}/%{name}*.egg-info %{python_sitelib}/sepolicy*.egg-info %{pkgpythondir} -%dir /var/lib/sepolgen %dir /var/lib/selinux -/var/lib/sepolgen/perm_map -%{_mandir}/man1/audit2allow.1* -%{_mandir}/ru/man1/audit2allow.1* %{_mandir}/man1/audit2why.1* %{_mandir}/man8/chcat.8* %{_mandir}/ru/man8/chcat.8* @@ -170,10 +158,37 @@ The policycoreutils-python package contains the management tools use to manage a %{_sysconfdir}/bash_completion.d/sepolicy-bash-completion.sh %{_sysconfdir}/bash_completion.d/setsebool-bash-completion.sh -%post python +%package devel +Summary: SELinux policy core policy devel utilities +Group: System Environment/Base +Requires: policycoreutils-python = %{version}-%{release} +Requires: /usr/bin/make +Requires: checkpolicy +Requires: selinux-policy-devel selinux-policy-doc + +%description devel +The policycoreutils-devel package contains the management tools use to develop policy in an SELinux environment. + +%files devel +%defattr(-,root,root,-) +%{_bindir}/audit2allow +%{_bindir}/sepolgen +%{_bindir}/sepolgen-ifgen +%{_bindir}/sepolgen-ifgen-attr-helper +%{python_sitelib}/sepolgen +%dir /var/lib/sepolgen +/var/lib/sepolgen/perm_map +%{_mandir}/man1/audit2allow.1* +%{_mandir}/ru/man1/audit2allow.1* + +%post devel selinuxenabled && [ -f /usr/share/selinux/devel/include/build.conf ] && /usr/bin/sepolgen-ifgen 2>/dev/null exit 0 +%triggerin devel -- selinux-policy-devel +selinuxenabled && [ -f /usr/share/selinux/devel/include/build.conf ] && /usr/bin/sepolgen-ifgen 2>/dev/null +exit 0 + %package sandbox Summary: SELinux sandbox utilities Group: System Environment/Base @@ -195,10 +210,6 @@ The policycoreutils-sandbox package contains the scripts to create graphical san %{_mandir}/man8/seunshare.8* %{_mandir}/man5/sandbox.5* -%triggerin python -- selinux-policy-devel -selinuxenabled && [ -f /usr/share/selinux/devel/include/build.conf ] && /usr/bin/sepolgen-ifgen 2>/dev/null -exit 0 - %package newrole Summary: The newrole application for RBAC/MLS Group: System Environment/Base @@ -218,10 +229,9 @@ or level of a logged in user. %package gui Summary: SELinux configuration GUI Group: System Environment/Base -Requires: policycoreutils-python = %{version}-%{release} +Requires: policycoreutils-devel = %{version}-%{release} Requires: gnome-python2-gnome, pygtk2, pygtk2-libglade, gnome-python2-canvas Requires: usermode-gtk -Requires: selinux-policy-doc Requires: python >= 2.6 BuildRequires: desktop-file-utils @@ -328,7 +338,10 @@ The policycoreutils-restorecond package contains the restorecond service. %{_bindir}/systemctl try-restart restorecond.service >/dev/null 2>&1 || : %changelog -* Mon Nov 12 2012 Dan Walsh - 2.1.12-28 +* Mon Nov 12 2012 Dan Walsh - 2.1.12-30 +- Move policy generation tools into policycoreutils-devel + +* Mon Nov 12 2012 Dan Walsh - 2.1.12-29 - Document and fix sepolicy booleans - Update Translations - Fix several spelling mistakes