From e02a5886542aba16f54185058c9692865838d98c Mon Sep 17 00:00:00 2001 From: Petr Lautrbach Date: Fri, 25 May 2018 11:45:50 +0200 Subject: [PATCH] policycoreutils-2.8-1 - SELinux userspace 2.8 release --- .gitignore | 7 ++++ policycoreutils-fedora.patch | 8 ++--- policycoreutils.spec | 69 ++++++++++++++++++------------------ selinux-dbus-fedora.patch | 12 +++---- selinux-python-fedora.patch | 18 +++++----- selinux-sandbox-fedora.patch | 6 ++-- sources | 14 ++++---- 7 files changed, 71 insertions(+), 63 deletions(-) diff --git a/.gitignore b/.gitignore index 175e739..e784e44 100644 --- a/.gitignore +++ b/.gitignore @@ -269,3 +269,10 @@ policycoreutils-2.0.83.tgz /selinux-python-2.8-rc3.tar.gz /selinux-sandbox-2.8-rc3.tar.gz /semodule-utils-2.8-rc3.tar.gz +/policycoreutils-2.8.tar.gz +/restorecond-2.8.tar.gz +/selinux-dbus-2.8.tar.gz +/selinux-gui-2.8.tar.gz +/selinux-python-2.8.tar.gz +/selinux-sandbox-2.8.tar.gz +/semodule-utils-2.8.tar.gz diff --git a/policycoreutils-fedora.patch b/policycoreutils-fedora.patch index 71bef7a..e4240c0 100644 --- a/policycoreutils-fedora.patch +++ b/policycoreutils-fedora.patch @@ -1,7 +1,7 @@ -diff --git policycoreutils-2.8-rc3/scripts/fixfiles policycoreutils-2.8-rc3/scripts/fixfiles -index 1aa330f..7ec0396 100755 ---- policycoreutils-2.8-rc3/scripts/fixfiles -+++ policycoreutils-2.8-rc3/scripts/fixfiles +diff --git policycoreutils-2.8/scripts/fixfiles policycoreutils-2.8/scripts/fixfiles +index b277958..53d28c7 100755 +--- policycoreutils-2.8/scripts/fixfiles ++++ policycoreutils-2.8/scripts/fixfiles @@ -108,6 +108,7 @@ exclude_dirs_from_relabelling() { fullFlag=0 BOOTTIME="" diff --git a/policycoreutils.spec b/policycoreutils.spec index 88aed52..512aa9d 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -1,26 +1,24 @@ %global libauditver 2.1.3-4 -%global libsepolver 2.8-0 -%global libsemanagever 2.8-0 -%global libselinuxver 2.8-0 +%global libsepolver 2.8-1 +%global libsemanagever 2.8-1 +%global libselinuxver 2.8-1 %global sepolgenver 2.8 %global generatorsdir %{_prefix}/lib/systemd/system-generators -%global rcversion rc3 - Summary: SELinux policy core utilities Name: policycoreutils Version: 2.8 -Release: 0%{?rcversion:.%rcversion}.2%{?dist} +Release: 1%{?dist} License: GPLv2 # https://github.com/SELinuxProject/selinux/wiki/Releases -Source0: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180510/policycoreutils-2.8-rc3.tar.gz -Source1: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180510/selinux-python-2.8-rc3.tar.gz -Source2: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180510/selinux-gui-2.8-rc3.tar.gz -Source3: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180510/selinux-sandbox-2.8-rc3.tar.gz -Source4: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180510/selinux-dbus-2.8-rc3.tar.gz -Source5: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180510/semodule-utils-2.8-rc3.tar.gz -Source6: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180510/restorecond-2.8-rc3.tar.gz +Source0: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180524/policycoreutils-2.8.tar.gz +Source1: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180524/selinux-python-2.8.tar.gz +Source2: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180524/selinux-gui-2.8.tar.gz +Source3: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180524/selinux-sandbox-2.8.tar.gz +Source4: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180524/selinux-dbus-2.8.tar.gz +Source5: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180524/semodule-utils-2.8.tar.gz +Source6: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180524/restorecond-2.8.tar.gz URL: https://github.com/SELinuxProject Source12: policycoreutils_man_ru2.tar.bz2 Source13: system-config-selinux.png @@ -32,9 +30,9 @@ Source18: selinux-autorelabel.target Source19: selinux-autorelabel-generator.sh # download https://raw.githubusercontent.com/fedora-selinux/scripts/master/selinux/make-fedora-selinux-patch.sh # run: -# HEAD https://github.com/fedora-selinux/selinux/commit/11eab8523bec5fcded6c336e3112f30f7931cba6 +# HEAD https://github.com/fedora-selinux/selinux/commit/0e84c8fe6bb895d22f706be1c8f59119c6427f64 # $ for i in policycoreutils selinux-python selinux-gui selinux-sandbox selinux-dbus semodule-utils restorecond; do -# VERSION=2.8-rc3 ./make-fedora-selinux-patch.sh $i +# VERSION=2.8 ./make-fedora-selinux-patch.sh $i # done Patch: policycoreutils-fedora.patch Patch1: selinux-python-fedora.patch @@ -85,8 +83,8 @@ to switch roles. %setup -q -T -D -a 6 -n selinux %patch -p0 -b .policycoreutils-fedora -cp %{SOURCE13} selinux-gui-%{version}%{?rcversion:-%rcversion}/ -tar -xvf %{SOURCE14} -C selinux-python-%{version}%{?rcversion:-%rcversion}/sepolicy/ +cp %{SOURCE13} selinux-gui-%{version}/ +tar -xvf %{SOURCE14} -C selinux-python-%{version}/sepolicy/ %patch1 -p0 -b .selinux-python #%patch2 -p0 -b .selinux-gui %patch3 -p0 -b .selinux-sandbox @@ -97,13 +95,13 @@ tar -xvf %{SOURCE14} -C selinux-python-%{version}%{?rcversion:-%rcversion}/sepol %build %set_build_flags -make -C policycoreutils-%{version}%{?rcversion:-%rcversion} LSPP_PRIV=y SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" SEMODULE_PATH="/usr/sbin" LIBSEPOLA="%{_libdir}/libsepol.a" all -make -C selinux-python-%{version}%{?rcversion:-%rcversion} SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all -make -C selinux-gui-%{version}%{?rcversion:-%rcversion} SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all -make -C selinux-sandbox-%{version}%{?rcversion:-%rcversion} SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all -make -C selinux-dbus-%{version}%{?rcversion:-%rcversion} SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all -make -C semodule-utils-%{version}%{?rcversion:-%rcversion} SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all -make -C restorecond-%{version}%{?rcversion:-%rcversion} SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all +make -C policycoreutils-%{version} LSPP_PRIV=y SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" SEMODULE_PATH="/usr/sbin" LIBSEPOLA="%{_libdir}/libsepol.a" all +make -C selinux-python-%{version} SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all +make -C selinux-gui-%{version} SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all +make -C selinux-sandbox-%{version} SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all +make -C selinux-dbus-%{version} SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all +make -C semodule-utils-%{version} SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all +make -C restorecond-%{version} SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all %install mkdir -p %{buildroot}%{_bindir} @@ -113,20 +111,20 @@ mkdir -p %{buildroot}%{_mandir}/man5 mkdir -p %{buildroot}%{_mandir}/man8 %{__mkdir} -p %{buildroot}/%{_usr}/share/doc/%{name}/ -make -C policycoreutils-%{version}%{?rcversion:-%rcversion} LSPP_PRIV=y DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" SEMODULE_PATH="/usr/sbin" LIBSEPOLA="%{_libdir}/libsepol.a" install +make -C policycoreutils-%{version} LSPP_PRIV=y DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" SEMODULE_PATH="/usr/sbin" LIBSEPOLA="%{_libdir}/libsepol.a" install -make -C selinux-python-%{version}%{?rcversion:-%rcversion} PYTHON=%{__python2} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install -make -C selinux-python-%{version}%{?rcversion:-%rcversion} PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install +make -C selinux-python-%{version} PYTHON=%{__python2} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install +make -C selinux-python-%{version} PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install -make -C selinux-gui-%{version}%{?rcversion:-%rcversion} PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install +make -C selinux-gui-%{version} PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install -make -C selinux-sandbox-%{version}%{?rcversion:-%rcversion} PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install +make -C selinux-sandbox-%{version} PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install -make -C selinux-dbus-%{version}%{?rcversion:-%rcversion} PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install +make -C selinux-dbus-%{version} PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install -make -C semodule-utils-%{version}%{?rcversion:-%rcversion} PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install +make -C semodule-utils-%{version} PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install -make -C restorecond-%{version}%{?rcversion:-%rcversion} PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install +make -C restorecond-%{version} PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install # Systemd @@ -470,7 +468,7 @@ system-config-selinux is a utility for managing the SELinux environment %{_mandir}/man8/semodule_package.8* %{_mandir}/ru/man8/semodule_package.8* %{!?_licensedir:%global license %%doc} -%license policycoreutils-%{version}%{?rcversion:-%rcversion}/COPYING +%license policycoreutils-%{version}/COPYING %doc %{_usr}/share/doc/%{name} %package restorecond @@ -490,7 +488,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}%{?rcversion:-%rcversion}/COPYING +%license policycoreutils-%{version}/COPYING %post restorecond %systemd_post restorecond.service @@ -502,6 +500,9 @@ The policycoreutils-restorecond package contains the restorecond service. %systemd_postun_with_restart restorecond.service %changelog +* Fri May 25 2018 Petr Lautrbach - 2.8-1 +- SELinux userspace 2.8 release + * Tue May 22 2018 Petr Lautrbach - 2.8-0.rc3.2 - selinux-autorelabel: set UEFI boot order (BootNext) same as BootCurrent - selinux-autorelabel: synchronize cached writes before reboot (#1385272) diff --git a/selinux-dbus-fedora.patch b/selinux-dbus-fedora.patch index de6c93c..28e4cc2 100644 --- a/selinux-dbus-fedora.patch +++ b/selinux-dbus-fedora.patch @@ -1,7 +1,7 @@ -diff --git selinux-dbus-2.8-rc3/org.selinux.conf selinux-dbus-2.8-rc3/org.selinux.conf +diff --git selinux-dbus-2.8/org.selinux.conf selinux-dbus-2.8/org.selinux.conf index a350978..1ae079d 100644 ---- selinux-dbus-2.8-rc3/org.selinux.conf -+++ selinux-dbus-2.8-rc3/org.selinux.conf +--- selinux-dbus-2.8/org.selinux.conf ++++ selinux-dbus-2.8/org.selinux.conf @@ -12,12 +12,8 @@