policycoreutils-2.5-0.99.rc1.1.fc24

Update to upstream rc1 release 2016-01-07

.gitignore

@@ -235,3 +235,5 @@ policycoreutils-2.0.83.tgz
 /sepolgen-1.2.1.tar.gz
 /sepolgen-1.2.2.tar.gz
 /policycoreutils-2.4.tar.gz
+/policycoreutils-2.5-rc1.tar.gz
+/sepolgen-1.2.3-rc1.tar.gz

make-rhat-patches.sh

@@ -1,13 +1,14 @@
 #!/bin/bash
 
-POLICYCOREUTILS_VERSION=2.4
-SEPOLGEN_VERSION=1.2.2
-BRANCH=master
+POLICYCOREUTILS_VERSION=2.5-rc1
+SEPOLGEN_VERSION=1.2.3-rc1
+REPO=https://github.com/fedora-selinux/selinux
+BRANCH=master-rc
 
 REBASEDIR=`mktemp -d rebase.XXXXXX`
 pushd $REBASEDIR
 
-git clone git@github.com:fedora-selinux/selinux.git
+git clone $REPO
 pushd selinux; git checkout $BRANCH; COMMIT=`git rev-parse --verify HEAD`; popd
 
 # prepare policycoreutils-rhat.patch
@@ -37,4 +38,4 @@ popd
 popd
 # echo rm -rf $REBASEDIR
 
-echo policycoreutils-rhat.patch and sepolgen-rhat.patch created from https://github.com/fedora-selinux/selinux/commit/$COMMIT
+echo policycoreutils-rhat.patch and sepolgen-rhat.patch created from $REPO/$COMMIT

policycoreutils.spec

@@ -1,24 +1,24 @@
 %global	libauditver	2.1.3-4
-%global libsepolver	2.4-1
-%global	libsemanagever	2.4-1
-%global	libselinuxver	2.4-1
-%global	sepolgenver	1.2.2
+%global libsepolver	2.5-0
+%global	libsemanagever	2.5-0
+%global	libselinuxver	2.5-0
+%global	sepolgenver	1.2.3
 
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
-Version: 2.4
-Release: 20%{?dist}
+Version: 2.5
+Release: 0.99.rc1.1%{?dist}
 License: GPLv2
 Group:	 System Environment/Base
 # https://github.com/SELinuxProject/selinux/wiki/Releases
-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/20150202/sepolgen-1.2.2.tar.gz
+Source: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160107/policycoreutils-2.5-rc1.tar.gz
+Source1:https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160107/sepolgen-1.2.3-rc1.tar.gz
 URL:	 http://www.selinuxproject.org
 Source2: policycoreutils_man_ru2.tar.bz2
 Source3: system-config-selinux.png
 Source4: sepolicy-icons.tgz
 # use make-rhat-patches.sh to create following patches from https://github.com/fedora-selinux/selinux/
-# HEAD https://github.com/fedora-selinux/selinux/commit/3f154b2e8e2978ba65afbd224f4bbd64e2374a36
+# HEAD https://github.com/fedora-selinux/selinux/83082eb446cfcb052d9971a483830014e5257d92
 Patch:	 policycoreutils-rhat.patch
 Patch1:  sepolgen-rhat.patch
 Patch100: policycoreutils-fix-semanage-python3.patch
@@ -29,7 +29,7 @@ Provides: /sbin/restorecon
 
 BuildRequires:	pam-devel libcgroup-devel libsepol-static >= %{libsepolver} libsemanage-static >= %{libsemanagever} libselinux-devel >= %{libselinuxver}  libcap-devel audit-libs-devel >=  %{libauditver} gettext
 BuildRequires: desktop-file-utils dbus-devel dbus-glib-devel
-BuildRequires: python-devel python3-devel setools-devel >= 3.3.7-14
+BuildRequires: python-devel python3-devel setools-devel >= 3.3.8-8.99
 Requires:	/bin/mount /bin/egrep /bin/awk /usr/bin/diff rpm /bin/sed
 Requires: libsepol >= %{libsepolver} coreutils libselinux-utils >=  %{libselinuxver}
 
@@ -53,19 +53,21 @@ to switch roles.
 # create selinux/ directory and extract %{SOURCE0} there
 %setup -q -c -n selinux
 %patch -p1 -b .policycoreutils-rhat
-pushd policycoreutils-%{version}
+pushd policycoreutils-2.5-rc1
 %patch100 -p2 -b .semanage-python3
 popd
 
-cp %{SOURCE3} policycoreutils-%{version}/gui/
-tar -xvf %{SOURCE4} -C policycoreutils-%{version}/
+cp %{SOURCE3} policycoreutils-2.5-rc1/gui/
+tar -xvf %{SOURCE4} -C policycoreutils-2.5-rc1/
 # extract {%SOURCE1} in selinux/ directory
 %setup -T -D -a 1 -n selinux
 %patch1 -p1 -b .sepolgen-rhat
 
+grep -l -r -E '^#! */usr/bin/python' | xargs -n 1 sed -i 's/\(^#! *\/usr\/bin\/python\)/\13/g'
+
 %build
-make -C policycoreutils-%{version} LSPP_PRIV=y SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" CFLAGS="%{optflags} -fPIE" LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" SEMODULE_PATH="/usr/sbin" all
-make -C sepolgen-%{sepolgenver} SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" CFLAGS="%{optflags} -fPIE" LDFLAGS="-pie -Wl,-z,relro" all
+make -C policycoreutils-2.5-rc1 LSPP_PRIV=y SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" CFLAGS="%{optflags} -fPIE" LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" SEMODULE_PATH="/usr/sbin" all
+make -C sepolgen-1.2.3-rc1 SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" CFLAGS="%{optflags} -fPIE" LDFLAGS="-pie -Wl,-z,relro" all
 
 %install
 mkdir -p %{buildroot}%{_bindir}
@@ -75,14 +77,14 @@ mkdir -p %{buildroot}%{_mandir}/man5
 mkdir -p %{buildroot}%{_mandir}/man8
 %{__mkdir} -p %{buildroot}/%{_usr}/share/doc/%{name}/
 
-make -C policycoreutils-%{version} LSPP_PRIV=y  DESTDIR="%{buildroot}" SBINDIR="%{buildroot}%{_sbindir}" LIBDIR="%{buildroot}%{_libdir}" SEMODULE_PATH="/usr/sbin" install
-make -C policycoreutils-%{version} PYTHON=python3 LSPP_PRIV=y  DESTDIR="%{buildroot}" SBINDIR="%{buildroot}%{_sbindir}" LIBDIR="%{buildroot}%{_libdir}" SEMODULE_PATH="/usr/sbin" install
+make -C policycoreutils-2.5-rc1 LSPP_PRIV=y  DESTDIR="%{buildroot}" SBINDIR="%{buildroot}%{_sbindir}" LIBDIR="%{buildroot}%{_libdir}" SEMODULE_PATH="/usr/sbin" install
+make -C policycoreutils-2.5-rc1 PYTHON=python3 LSPP_PRIV=y  DESTDIR="%{buildroot}" SBINDIR="%{buildroot}%{_sbindir}" LIBDIR="%{buildroot}%{_libdir}" SEMODULE_PATH="/usr/sbin" install
 
 # Systemd
 rm -rf %{buildroot}/%{_sysconfdir}/rc.d/init.d/restorecond
 
-make -C sepolgen-%{sepolgenver} DESTDIR="%{buildroot}" SBINDIR="%{buildroot}%{_sbindir}" LIBDIR="%{buildroot}%{_libdir}" install
-make -C sepolgen-%{sepolgenver} PYTHON=python3 DESTDIR="%{buildroot}" SBINDIR="%{buildroot}%{_sbindir}" LIBDIR="%{buildroot}%{_libdir}" install
+make -C sepolgen-1.2.3-rc1 DESTDIR="%{buildroot}" SBINDIR="%{buildroot}%{_sbindir}" LIBDIR="%{buildroot}%{_libdir}" install
+make -C sepolgen-1.2.3-rc1 PYTHON=python3 DESTDIR="%{buildroot}" SBINDIR="%{buildroot}%{_sbindir}" LIBDIR="%{buildroot}%{_libdir}" install
 
 tar -jxf %{SOURCE2} -C %{buildroot}/
 rm -f %{buildroot}/usr/share/man/ru/man8/genhomedircon.8.gz
@@ -371,7 +373,7 @@ fi
 %{_mandir}/ru/man1/secon.1*
 %{_mandir}/man8/genhomedircon.8*
 %{!?_licensedir:%global license %%doc}
-%license policycoreutils-%{version}/COPYING
+%license policycoreutils-2.5-rc1/COPYING
 %doc %{_usr}/share/doc/%{name}
 
 %package restorecond
@@ -392,7 +394,7 @@ The policycoreutils-restorecond package contains the restorecond service.
 %{_mandir}/man8/restorecond.8*
 %{_mandir}/ru/man8/restorecond.8*
 %{!?_licensedir:%global license %%doc}
-%license policycoreutils-%{version}/COPYING
+%license policycoreutils-2.5-rc1/COPYING
 
 %post restorecond
 %systemd_post restorecond.service
@@ -404,6 +406,9 @@ The policycoreutils-restorecond package contains the restorecond service.
 %systemd_postun_with_restart restorecond.service
 
 %changelog
+* Fri Jan 08 2016 Petr Lautrbach <plautrba@redhat.com> 2.5-0.99.rc1.1
+- Update to upstream rc1 release 2016-01-07
+
 * Mon Dec 14 2015 Petr Lautrbach <plautrba@redhat.com> - 2.4-20
 - Fix 'semanage permissive -l' subcommand (#1286325)
 - Several 'sepolicy gui' fixes (#1281309,#1281309,#1282382)

sources

@@ -1,3 +1,2 @@
-59d33101d57378ce69889cc078addf90  policycoreutils_man_ru2.tar.bz2
-c7bf0999723ff7a3f1cb7a2888ef86b0  sepolgen-1.2.2.tar.gz
-795b05c3ad58253cba61249ec65b28ef  policycoreutils-2.4.tar.gz
+91c305a513871b1b28b2c77df61873c8  policycoreutils-2.5-rc1.tar.gz
+e1af957a577a6ae643fad110d4c680e6  sepolgen-1.2.3-rc1.tar.gz