From b05095b2d360cf56bb4d562fbcaae71c79c92808 Mon Sep 17 00:00:00 2001 From: Petr Lautrbach Date: Tue, 15 May 2018 09:51:02 +0200 Subject: [PATCH] SELinux userspace 2.8-rc3 release candidate --- .gitignore | 7 +++++++ policycoreutils-fedora.patch | 6 +++--- policycoreutils.spec | 23 +++++++++++++---------- selinux-dbus-fedora.patch | 12 ++++++------ selinux-python-fedora.patch | 31 +++++++++---------------------- selinux-sandbox-fedora.patch | 6 +++--- sources | 15 +++++++-------- 7 files changed, 48 insertions(+), 52 deletions(-) diff --git a/.gitignore b/.gitignore index 18ee1f1..175e739 100644 --- a/.gitignore +++ b/.gitignore @@ -262,3 +262,10 @@ policycoreutils-2.0.83.tgz /selinux-python-2.8-rc2.tar.gz /selinux-sandbox-2.8-rc2.tar.gz /semodule-utils-2.8-rc2.tar.gz +/policycoreutils-2.8-rc3.tar.gz +/restorecond-2.8-rc3.tar.gz +/selinux-dbus-2.8-rc3.tar.gz +/selinux-gui-2.8-rc3.tar.gz +/selinux-python-2.8-rc3.tar.gz +/selinux-sandbox-2.8-rc3.tar.gz +/semodule-utils-2.8-rc3.tar.gz diff --git a/policycoreutils-fedora.patch b/policycoreutils-fedora.patch index dbdc76c..71bef7a 100644 --- a/policycoreutils-fedora.patch +++ b/policycoreutils-fedora.patch @@ -1,7 +1,7 @@ -diff --git policycoreutils-2.8-rc2/scripts/fixfiles policycoreutils-2.8-rc2/scripts/fixfiles +diff --git policycoreutils-2.8-rc3/scripts/fixfiles policycoreutils-2.8-rc3/scripts/fixfiles index 1aa330f..7ec0396 100755 ---- policycoreutils-2.8-rc2/scripts/fixfiles -+++ policycoreutils-2.8-rc2/scripts/fixfiles +--- policycoreutils-2.8-rc3/scripts/fixfiles ++++ policycoreutils-2.8-rc3/scripts/fixfiles @@ -108,6 +108,7 @@ exclude_dirs_from_relabelling() { fullFlag=0 BOOTTIME="" diff --git a/policycoreutils.spec b/policycoreutils.spec index 56ac549..97cebba 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -6,7 +6,7 @@ %global generatorsdir %{_prefix}/lib/systemd/system-generators -%global rcversion rc2 +%global rcversion rc3 Summary: SELinux policy core utilities Name: policycoreutils @@ -14,13 +14,13 @@ Version: 2.8 Release: 0%{?rcversion:.%rcversion}.1%{?dist} License: GPLv2 # https://github.com/SELinuxProject/selinux/wiki/Releases -Source0: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180426/policycoreutils-2.8-rc2.tar.gz -Source1: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180426/selinux-python-2.8-rc2.tar.gz -Source2: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180426/selinux-gui-2.8-rc2.tar.gz -Source3: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180426/selinux-sandbox-2.8-rc2.tar.gz -Source4: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180426/selinux-dbus-2.8-rc2.tar.gz -Source5: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180426/semodule-utils-2.8-rc2.tar.gz -Source6: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180426/restorecond-2.8-rc2.tar.gz +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 URL: https://github.com/SELinuxProject Source12: policycoreutils_man_ru2.tar.bz2 Source13: system-config-selinux.png @@ -32,9 +32,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/5127dfaae645986169b50a7295d4961a4959006a +# HEAD https://github.com/fedora-selinux/selinux/commit/11eab8523bec5fcded6c336e3112f30f7931cba6 # $ for i in policycoreutils selinux-python selinux-gui selinux-sandbox selinux-dbus semodule-utils restorecond; do -# VERSION=2.8-rc2 ./make-fedora-selinux-patch.sh $i +# VERSION=2.8-rc3 ./make-fedora-selinux-patch.sh $i # done Patch: policycoreutils-fedora.patch Patch1: selinux-python-fedora.patch @@ -502,6 +502,9 @@ The policycoreutils-restorecond package contains the restorecond service. %systemd_postun_with_restart restorecond.service %changelog +* Tue May 15 2018 Petr Lautrbach - 2.8-0.rc3.1 +- SELinux userspace 2.8-rc2 release candidate + * Fri May 4 2018 Petr Lautrbach - 2.8-0.rc2.1 - SELinux userspace 2.8-rc2 release candidate diff --git a/selinux-dbus-fedora.patch b/selinux-dbus-fedora.patch index da95eb6..de6c93c 100644 --- a/selinux-dbus-fedora.patch +++ b/selinux-dbus-fedora.patch @@ -1,7 +1,7 @@ -diff --git selinux-dbus-2.8-rc2/org.selinux.conf selinux-dbus-2.8-rc2/org.selinux.conf +diff --git selinux-dbus-2.8-rc3/org.selinux.conf selinux-dbus-2.8-rc3/org.selinux.conf index a350978..1ae079d 100644 ---- selinux-dbus-2.8-rc2/org.selinux.conf -+++ selinux-dbus-2.8-rc2/org.selinux.conf +--- selinux-dbus-2.8-rc3/org.selinux.conf ++++ selinux-dbus-2.8-rc3/org.selinux.conf @@ -12,12 +12,8 @@