rpms/policycoreutils
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'private-master-2.4'

Browse Source 
policycoreutils-2.4-1
This commit is contained in:
Petr Lautrbach 2015-07-20 18:34:55 +02:00
commit 3d60165989
4 changed files with 733 additions and 1080 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
make-rhat-patches.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
POLICYCOREUTILS_VERSION=2.3 POLICYCOREUTILS_VERSION=2.4
SEPOLGEN_VERSION=1.2.1 SEPOLGEN_VERSION=1.2.2
BRANCH=master BRANCH=master
REBASEDIR=`mktemp -d rebase.XXXXXX` REBASEDIR=`mktemp -d rebase.XXXXXX`

1756
policycoreutils-rhat.patch
View File

File diff suppressed because it is too large Load Diff

35
policycoreutils.spec
View File

@ -1,28 +1,28 @@
%global libauditver 2.1.3-4 %global libauditver 2.1.3-4
%global libsepolver 2.1.9-1 %global libsepolver 2.4-1
%global libsemanagever 2.1.10-1 %global libsemanagever 2.4-1
%global libselinuxver 2.2.1-1 %global libselinuxver 2.4-1
%global sepolgenver 1.2.1 %global sepolgenver 1.2.2
Summary: SELinux policy core utilities Summary: SELinux policy core utilities
Name: policycoreutils Name: policycoreutils
Version: 2.3 Version: 2.4
Release: 18%{?dist} Release: 1%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Base Group: System Environment/Base
# https://github.com/SELinuxProject/selinux/wiki/Releases # https://github.com/SELinuxProject/selinux/wiki/Releases
Source: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140506/policycoreutils-%{version}.tar.gz Source: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20150202/policycoreutils-2.4.tar.gz
Source1:https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140506/sepolgen-%{sepolgenver}.tar.gz Source1:https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20150202/sepolgen-1.2.2.tar.gz
URL: http://www.selinuxproject.org URL: http://www.selinuxproject.org
Source2: policycoreutils_man_ru2.tar.bz2 Source2: policycoreutils_man_ru2.tar.bz2
Source3: system-config-selinux.png Source3: system-config-selinux.png
Source4: sepolicy-icons.tgz Source4: sepolicy-icons.tgz
# use make-rhat-patches.sh to create following patches from https://github.com/fedora-selinux/selinux/ # use make-rhat-patches.sh to create following patches from https://github.com/fedora-selinux/selinux/
# HEAD https://github.com/fedora-selinux/selinux/commit/4395ef2b8bb086878b5fad80321ac9d32f424f51 # HEAD https://github.com/fedora-selinux/selinux/commit/36fd8bb4b36bb1ca3aa10e3226136459e6ed2498
Patch: policycoreutils-rhat.patch Patch: policycoreutils-rhat.patch
Patch1: sepolgen-rhat.patch Patch1: sepolgen-rhat.patch
Obsoletes: policycoreutils < 2.0.61-2 Obsoletes: policycoreutils < 2.0.61-2
Conflicts: filesystem < 3 Conflicts: filesystem < 3, selinux-policy < 3.13.1-138
Provides: /sbin/fixfiles Provides: /sbin/fixfiles
Provides: /sbin/restorecon Provides: /sbin/restorecon
@ -52,6 +52,7 @@ to switch roles.
# create selinux/ directory and extract %{SOURCE0} there # create selinux/ directory and extract %{SOURCE0} there
%setup -q -c -n selinux %setup -q -c -n selinux
%patch -p1 -b .policycoreutils-rhat %patch -p1 -b .policycoreutils-rhat
cp %{SOURCE3} policycoreutils-%{version}/gui/ cp %{SOURCE3} policycoreutils-%{version}/gui/
tar -xvf %{SOURCE4} -C policycoreutils-%{version}/ tar -xvf %{SOURCE4} -C policycoreutils-%{version}/
# extract {%SOURCE1} in selinux/ directory # extract {%SOURCE1} in selinux/ directory
@ -63,7 +64,6 @@ make -C policycoreutils-%{version} LSPP_PRIV=y SBINDIR="%{_sbindir}" LIBDIR="%{_
make -C sepolgen-%{sepolgenver} SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" CFLAGS="%{optflags} -fPIE" LDFLAGS="-pie -Wl,-z,relro" all make -C sepolgen-%{sepolgenver} SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" CFLAGS="%{optflags} -fPIE" LDFLAGS="-pie -Wl,-z,relro" all
%install %install
mkdir -p %{buildroot}/var/lib/selinux
mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_sbindir}
mkdir -p %{buildroot}%{_mandir}/man1 mkdir -p %{buildroot}%{_mandir}/man1
@ -187,7 +187,6 @@ an SELinux environment.
%{python_sitearch}/%{name}*.egg-info %{python_sitearch}/%{name}*.egg-info
%{python_sitearch}/sepolicy*.egg-info %{python_sitearch}/sepolicy*.egg-info
%{python_sitearch}/%{name} %{python_sitearch}/%{name}
%dir /var/lib/selinux
%{_mandir}/man8/chcat.8* %{_mandir}/man8/chcat.8*
%{_mandir}/ru/man8/chcat.8* %{_mandir}/ru/man8/chcat.8*
%{_mandir}/man8/sandbox.8* %{_mandir}/man8/sandbox.8*
@ -306,7 +305,6 @@ system-config-selinux is a utility for managing the SELinux environment
%{_mandir}/man8/system-config-selinux.8* %{_mandir}/man8/system-config-selinux.8*
%{_mandir}/man8/selinux-polgengui.8* %{_mandir}/man8/selinux-polgengui.8*
%{_mandir}/man8/sepolicy-gui.8* %{_mandir}/man8/sepolicy-gui.8*
%{_datadir}/system-config-selinux/selinux_server.py
%{_datadir}/dbus-1/system-services/org.selinux.service %{_datadir}/dbus-1/system-services/org.selinux.service
%{_datadir}/polkit-1/actions/org.selinux.policy %{_datadir}/polkit-1/actions/org.selinux.policy
%{_datadir}/polkit-1/actions/org.selinux.config.policy %{_datadir}/polkit-1/actions/org.selinux.config.policy
@ -333,6 +331,7 @@ fi
%{_sbindir}/semodule %{_sbindir}/semodule
%{_sbindir}/sestatus %{_sbindir}/sestatus
%{_bindir}/secon %{_bindir}/secon
%{_libexecdir}/selinux/hll
%config(noreplace) %{_sysconfdir}/sestatus.conf %config(noreplace) %{_sysconfdir}/sestatus.conf
# selinux-policy Requires: policycoreutils, so we own this set of directories and our files within them # selinux-policy Requires: policycoreutils, so we own this set of directories and our files within them
%{_mandir}/man5/selinux_config.5.gz %{_mandir}/man5/selinux_config.5.gz
@ -388,12 +387,22 @@ The policycoreutils-restorecond package contains the restorecond service.
%systemd_postun_with_restart restorecond.service %systemd_postun_with_restart restorecond.service
%changelog %changelog
* Wed Jul 15 2015 Petr Lautrbach <plautrba@redhat.com> 2.4-0.7
- Fix typo in semanage args for minimum policy store
* Fri Jul 03 2015 Petr Lautrbach <plautrba@redhat.com> 2.4-0.6
- policycoreutils: semanage: update to new source policy infrastructure
- semanage: move permissive module creation to /tmp
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3-18 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Wed May 06 2015 Petr Lautrbach <plautrba@redhat.com> 2.3-17 * Wed May 06 2015 Petr Lautrbach <plautrba@redhat.com> 2.3-17
- setfiles/restorecon: fix -r/-R option (#1211721) - setfiles/restorecon: fix -r/-R option (#1211721)
* Mon Apr 13 2015 Petr Lautrbach <plautrba@redhat.com> 2.4-0.4
- Update to upstream 2.4
* Tue Feb 24 2015 Petr Lautrbach <plautrba@redhat.com> 2.3-16 * Tue Feb 24 2015 Petr Lautrbach <plautrba@redhat.com> 2.3-16
- Temporary removed Requires:audit-libs-python from policycoreutils-python3 subpackage (#1195139) - Temporary removed Requires:audit-libs-python from policycoreutils-python3 subpackage (#1195139)
- Simplication of sepolicy-manpage web functionality (#1193552) - Simplication of sepolicy-manpage web functionality (#1193552)

18
sepolgen-rhat.patch
View File

@ -1,7 +1,7 @@
diff --git a/sepolgen-1.2.1/src/sepolgen/access.py b/sepolgen-1.2.1/src/sepolgen/access.py diff --git a/sepolgen-1.2.2/src/sepolgen/access.py b/sepolgen-1.2.2/src/sepolgen/access.py
index cf13210..9154887 100644 index cf13210..9154887 100644
--- a/sepolgen-1.2.1/src/sepolgen/access.py --- a/sepolgen-1.2.2/src/sepolgen/access.py
+++ b/sepolgen-1.2.1/src/sepolgen/access.py +++ b/sepolgen-1.2.2/src/sepolgen/access.py
@@ -88,6 +88,8 @@ class AccessVector: @@ -88,6 +88,8 @@ class AccessVector:
self.audit_msgs = [] self.audit_msgs = []
self.type = audit2why.TERULE self.type = audit2why.TERULE
@ -43,10 +43,10 @@ index cf13210..9154887 100644
access.type = avc_type access.type = avc_type
cls[obj_class, avc_type] = access cls[obj_class, avc_type] = access
diff --git a/sepolgen-1.2.1/src/sepolgen/audit.py b/sepolgen-1.2.1/src/sepolgen/audit.py diff --git a/sepolgen-1.2.2/src/sepolgen/audit.py b/sepolgen-1.2.2/src/sepolgen/audit.py
index 56919be..57263d0 100644 index 56919be..57263d0 100644
--- a/sepolgen-1.2.1/src/sepolgen/audit.py --- a/sepolgen-1.2.2/src/sepolgen/audit.py
+++ b/sepolgen-1.2.1/src/sepolgen/audit.py +++ b/sepolgen-1.2.2/src/sepolgen/audit.py
@@ -169,6 +169,7 @@ class AVCMessage(AuditMessage): @@ -169,6 +169,7 @@ class AVCMessage(AuditMessage):
self.exe = "" self.exe = ""
self.path = "" self.path = ""
@ -164,10 +164,10 @@ index 56919be..57263d0 100644
return av_set return av_set
class AVCTypeFilter: class AVCTypeFilter:
diff --git a/sepolgen-1.2.1/src/sepolgen/policygen.py b/sepolgen-1.2.1/src/sepolgen/policygen.py diff --git a/sepolgen-1.2.2/src/sepolgen/policygen.py b/sepolgen-1.2.2/src/sepolgen/policygen.py
index 5f38577..3b9e9f4 100644 index 5f38577..3b9e9f4 100644
--- a/sepolgen-1.2.1/src/sepolgen/policygen.py --- a/sepolgen-1.2.2/src/sepolgen/policygen.py
+++ b/sepolgen-1.2.1/src/sepolgen/policygen.py +++ b/sepolgen-1.2.2/src/sepolgen/policygen.py
@@ -81,8 +81,9 @@ class PolicyGenerator: @@ -81,8 +81,9 @@ class PolicyGenerator:
self.module = refpolicy.Module() self.module = refpolicy.Module()