Update to upstream release 2.4 from https://github.com/bachradsusi/selinux.git branch 2.4

make-rhat-patches.sh

@@ -1,13 +1,14 @@
 #!/bin/bash
 
-POLICYCOREUTILS_VERSION=2.3
+POLICYCOREUTILS_VERSION=2.4
-SEPOLGEN_VERSION=1.2.1
+SEPOLGEN_VERSION=1.2.2
-BRANCH=master
+BRANCH=2.4
 
 REBASEDIR=`mktemp -d rebase.XXXXXX`
 pushd $REBASEDIR
 
-git clone git@github.com:fedora-selinux/selinux.git
+# git clone git@github.com:fedora-selinux/selinux.git
+git clone https://github.com/bachradsusi/selinux.git
 pushd selinux; git checkout $BRANCH; COMMIT=`git rev-parse --verify HEAD`; popd
 
 # prepare policycoreutils-rhat.patch

policycoreutils.spec

@@ -1,18 +1,18 @@
 %global	libauditver	2.1.3-4
-%global libsepolver	2.1.9-1
+%global libsepolver	2.4-0
-%global	libsemanagever	2.1.10-1
+%global	libsemanagever	2.4-0
-%global	libselinuxver	2.2.1-1
+%global	libselinuxver	2.4-0
-%global	sepolgenver	1.2.1
+%global	sepolgenver	1.2.2
 
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
-Version: 2.3
+Version: 2.4
-Release: 16%{?dist}
+Release: 0%{?dist}.4
 License: GPLv2
 Group:	 System Environment/Base
 # 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
 Source2: policycoreutils_man_ru2.tar.bz2
 Source3: system-config-selinux.png
@@ -63,7 +63,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
 
 %install
-mkdir -p %{buildroot}/var/lib/selinux
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}%{_mandir}/man1
@@ -187,7 +186,6 @@ an SELinux environment.
 %{python_sitearch}/%{name}*.egg-info
 %{python_sitearch}/sepolicy*.egg-info
 %{python_sitearch}/%{name}
-%dir  /var/lib/selinux
 %{_mandir}/man8/chcat.8*
 %{_mandir}/ru/man8/chcat.8*
 %{_mandir}/man8/sandbox.8*
@@ -306,7 +304,6 @@ system-config-selinux is a utility for managing the SELinux environment
 %{_mandir}/man8/system-config-selinux.8*
 %{_mandir}/man8/selinux-polgengui.8*
 %{_mandir}/man8/sepolicy-gui.8*
-%{_datadir}/system-config-selinux/selinux_server.py
 %{_datadir}/dbus-1/system-services/org.selinux.service
 %{_datadir}/polkit-1/actions/org.selinux.policy
 %{_datadir}/polkit-1/actions/org.selinux.config.policy
@@ -333,6 +330,7 @@ fi
 %{_sbindir}/semodule
 %{_sbindir}/sestatus
 %{_bindir}/secon
+%{_libexecdir}/selinux/hll
 %config(noreplace) %{_sysconfdir}/sestatus.conf
 # selinux-policy Requires: policycoreutils, so we own this set of directories and our files within them
 %{_mandir}/man5/selinux_config.5.gz
@@ -388,6 +386,9 @@ The policycoreutils-restorecond package contains the restorecond service.
 %systemd_postun_with_restart restorecond.service
 
 %changelog
+* 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
 - Temporary removed Requires:audit-libs-python from policycoreutils-python3 subpackage (#1195139)
 - Simplication of sepolicy-manpage web functionality (#1193552)

sepolgen-rhat.patch

@@ -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
---- 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:
              self.audit_msgs = []
              self.type = audit2why.TERULE
@@ -43,10 +43,10 @@ index cf13210..9154887 100644
              access.type = avc_type
              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
---- 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):
          self.exe = ""
          self.path = ""
@@ -164,10 +164,10 @@ index 56919be..57263d0 100644
          return av_set
  
  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
---- 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:
              self.module = refpolicy.Module()