From 9304134a2785dbc1046307e50fff552262efef73 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Wed, 17 Feb 2021 12:28:10 +0100 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/policycoreutils.git#8c9bb8afaf3b543eaa44b83bef64fcb67ee2e716 --- .gitignore | 7 ++++ ...setfiles-Improve-description-of-d-sw.patch | 12 +++---- policycoreutils.spec | 32 +++++++++++-------- sources | 14 ++++---- 4 files changed, 39 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index f044c8f..76c62c5 100644 --- a/.gitignore +++ b/.gitignore @@ -329,3 +329,10 @@ policycoreutils-2.0.83.tgz /selinux-python-3.2-rc1.tar.gz /selinux-sandbox-3.2-rc1.tar.gz /semodule-utils-3.2-rc1.tar.gz +/policycoreutils-3.2-rc2.tar.gz +/restorecond-3.2-rc2.tar.gz +/selinux-dbus-3.2-rc2.tar.gz +/selinux-gui-3.2-rc2.tar.gz +/selinux-python-3.2-rc2.tar.gz +/selinux-sandbox-3.2-rc2.tar.gz +/semodule-utils-3.2-rc2.tar.gz diff --git a/0013-policycoreutils-setfiles-Improve-description-of-d-sw.patch b/0013-policycoreutils-setfiles-Improve-description-of-d-sw.patch index eb4dff2..a097bff 100644 --- a/0013-policycoreutils-setfiles-Improve-description-of-d-sw.patch +++ b/0013-policycoreutils-setfiles-Improve-description-of-d-sw.patch @@ -1,4 +1,4 @@ -From 37a871b6138f9783d832d2fa6f5482fb648c4928 Mon Sep 17 00:00:00 2001 +From b34090e94f28bd04306630055a0c95d6da796660 Mon Sep 17 00:00:00 2001 From: Vit Mojzis Date: Wed, 21 Mar 2018 08:51:31 +0100 Subject: [PATCH] policycoreutils/setfiles: Improve description of -d switch @@ -13,15 +13,15 @@ Resolves: rhbz#1271327 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/policycoreutils/setfiles/setfiles.8 b/policycoreutils/setfiles/setfiles.8 -index e328a5628682..02e0960289d3 100644 +index 4d28bc9a95c1..8e6c4ab94841 100644 --- a/policycoreutils/setfiles/setfiles.8 +++ b/policycoreutils/setfiles/setfiles.8 -@@ -58,7 +58,7 @@ check the validity of the contexts against the specified binary policy. +@@ -57,7 +57,7 @@ option will force a replacement of the entire context. + check the validity of the contexts against the specified binary policy. .TP .B \-d - show what specification matched each file (do not abort validation --after ABORT_ON_ERRORS errors). -+after ABORT_ON_ERRORS errors). Not affected by "\-q" +-show what specification matched each file. ++show what specification matched each file. Not affected by "\-q". .TP .BI \-e \ directory directory to exclude (repeat option for more than one directory). diff --git a/policycoreutils.spec b/policycoreutils.spec index d327cae..6528bdb 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -1,7 +1,7 @@ %global libauditver 3.0 -%global libsepolver 3.2-0.rc1 -%global libsemanagever 3.2-0.rc1 -%global libselinuxver 3.2-0.rc1 +%global libsepolver 3.2-0.rc2 +%global libsemanagever 3.2-0.rc2 +%global libselinuxver 3.2-0.rc2 %global generatorsdir %{_prefix}/lib/systemd/system-generators @@ -11,16 +11,16 @@ Summary: SELinux policy core utilities Name: policycoreutils Version: 3.2 -Release: 0.rc1.1%{?dist} +Release: 0.rc2.1%{?dist} License: GPLv2 # https://github.com/SELinuxProject/selinux/wiki/Releases -Source0: https://github.com/SELinuxProject/selinux/releases/download/3.2-rc1/policycoreutils-3.2-rc1.tar.gz -Source1: https://github.com/SELinuxProject/selinux/releases/download/3.2-rc1/selinux-python-3.2-rc1.tar.gz -Source2: https://github.com/SELinuxProject/selinux/releases/download/3.2-rc1/selinux-gui-3.2-rc1.tar.gz -Source3: https://github.com/SELinuxProject/selinux/releases/download/3.2-rc1/selinux-sandbox-3.2-rc1.tar.gz -Source4: https://github.com/SELinuxProject/selinux/releases/download/3.2-rc1/selinux-dbus-3.2-rc1.tar.gz -Source5: https://github.com/SELinuxProject/selinux/releases/download/3.2-rc1/semodule-utils-3.2-rc1.tar.gz -Source6: https://github.com/SELinuxProject/selinux/releases/download/3.2-rc1/restorecond-3.2-rc1.tar.gz +Source0: https://github.com/SELinuxProject/selinux/releases/download/3.2-rc2/policycoreutils-3.2-rc2.tar.gz +Source1: https://github.com/SELinuxProject/selinux/releases/download/3.2-rc2/selinux-python-3.2-rc2.tar.gz +Source2: https://github.com/SELinuxProject/selinux/releases/download/3.2-rc2/selinux-gui-3.2-rc2.tar.gz +Source3: https://github.com/SELinuxProject/selinux/releases/download/3.2-rc2/selinux-sandbox-3.2-rc2.tar.gz +Source4: https://github.com/SELinuxProject/selinux/releases/download/3.2-rc2/selinux-dbus-3.2-rc2.tar.gz +Source5: https://github.com/SELinuxProject/selinux/releases/download/3.2-rc2/semodule-utils-3.2-rc2.tar.gz +Source6: https://github.com/SELinuxProject/selinux/releases/download/3.2-rc2/restorecond-3.2-rc2.tar.gz URL: https://github.com/SELinuxProject/selinux Source13: system-config-selinux.png Source14: sepolicy-icons.tgz @@ -34,7 +34,7 @@ Source21: python-po.tgz Source22: gui-po.tgz Source23: sandbox-po.tgz # https://github.com/fedora-selinux/selinux -# $ git format-patch -N 3.2-rc1 -- policycoreutils python gui sandbox dbus semodule-utils restorecond +# $ git format-patch -N 3.2-rc2 -- policycoreutils python gui sandbox dbus semodule-utils restorecond # $ for j in [0-9]*.patch; do printf "Patch%s: %s\n" ${j/-*/} $j; done # Patch list start Patch0001: 0001-sandbox-add-reset-to-Xephyr-as-it-works-better-with-.patch @@ -99,7 +99,7 @@ to switch roles. %autosetup -S git -N -T -D -a 6 -n selinux for i in *; do - git mv $i ${i/-%{version}-rc1/} + git mv $i ${i/-%{version}-rc2/} git commit -q --allow-empty -a --author 'rpm-build ' -m "$i -> ${i/-%{version}/}" done @@ -531,6 +531,12 @@ The policycoreutils-restorecond package contains the restorecond service. %systemd_postun_with_restart restorecond.service %changelog +* Fri Feb 5 2021 Petr Lautrbach - 3.2-0.rc2.1 +- SELinux userspace 3.2-rc2 release + +* Wed Jan 27 2021 Fedora Release Engineering - 3.2-0.rc1.1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jan 20 2021 Petr Lautrbach - 3.2-0.rc1.1 - SELinux userspace 3.2-rc1 release diff --git a/sources b/sources index 00d999e..e3ce4c5 100644 --- a/sources +++ b/sources @@ -1,10 +1,10 @@ -SHA512 (policycoreutils-3.2-rc1.tar.gz) = 91e1660542c1c050ecae3319c2227833ccab16ddb2a6a066c92598b565aafcf2d753f50ec0a7a6bc08c8e8f579d65429acf7443ad058ee1d5ab29e6340023d89 -SHA512 (restorecond-3.2-rc1.tar.gz) = 34b39dfb160518e725127920898fde38aa9fc8783090836f9601c6b791fc5c29e89f7b291dad7703e30d0bbbd65761533266e6749fd1bbe05f3c95324a99b255 -SHA512 (selinux-dbus-3.2-rc1.tar.gz) = e568950980d88608f236d222ecd59d1f12b64704a5dc262cdb5eb23fc6b2916ab0be06ea0c53ec51f174efa4ca9cccbd47a6fb4e7d7de7debd81d328d4c7bdb4 -SHA512 (selinux-gui-3.2-rc1.tar.gz) = 71a28e44adb73677c2b7b8ba8cfcf04396a3332a9596b7260e19a5a6a1eddfb14ec2e93fa8851cdb94e2e61f8bcfee9134cb8dc073c339de8d10e1b57439588c -SHA512 (selinux-python-3.2-rc1.tar.gz) = 5996fe9e28f41b8a25e625352f0c16d1858e730aae20b590825c599e57a2c3e4288441c16759bfcadc76469d2d4b613b5e19a04ed9ea36c27205112fe2b4341c -SHA512 (selinux-sandbox-3.2-rc1.tar.gz) = 192e8f526e5d3144ce9eb7e07076011eb3b6984edbd7d3ad885d69a0cd2dd0afbd720f960f1ad5df422e48d48f23800e4cf61fccc8384b07a156c1c48d9677ba -SHA512 (semodule-utils-3.2-rc1.tar.gz) = 9e46ea1af299c272017847dd8b3bbb827af2bc685ab536a9020cf58c75f58c335b9502a135ee1a65bf21cfa5d8571840ecb3587e701e96b92b5453dada97a04d +SHA512 (policycoreutils-3.2-rc2.tar.gz) = cc22784406fb3158983bb4676d924da2bf4111ae92e4ed7cab0360e9cecb89a992837a6fad03318236668b16ad22ec8361bb07f4b319fc855bdaaa613cd466e5 +SHA512 (restorecond-3.2-rc2.tar.gz) = fbb2c7492bdc76d6ddd6e7d01d7d5aa4de828a25591f7d28f541cdc3655e65320826a72d7dbcec3e0953ef75789f76a647201d925df8498865346dbf794c2ddd +SHA512 (selinux-dbus-3.2-rc2.tar.gz) = ea17702e2a4e23d30ec870931ebb48ca43c3f9a139f63043b3c01de49afba8ad89ac38c9715aadc9d64278377e1a00642e9845cd1bd10c545c3c82256d72443b +SHA512 (selinux-gui-3.2-rc2.tar.gz) = 1c05c8375d48343202a59056f99adaaf39256f7fa4eb965d17e4f1cc740388800d1d1719f35d8ebbe02659f614f56ddd13caf64a7c44156e9c744ab4eb440647 +SHA512 (selinux-python-3.2-rc2.tar.gz) = e4dbc468d695c3453d6352b0d7c044255a29ee8b5f3ef4e3c6cafa33d40cd6408771eef3986e04392b154a015db81a8ffa27105a9fd03a052efcb49bb074f91c +SHA512 (selinux-sandbox-3.2-rc2.tar.gz) = 9024a7b0d35d849b4223d558c841517677fc3bc69b338b315a875e42c96167e02070edcfe9d5b746ac5117a031f558cb2dfd76c71a1c8b7b7d12ff926cc13b5c +SHA512 (semodule-utils-3.2-rc2.tar.gz) = 01f728b058101cc7226d7f953d1b950686141070b2136886a1f2004e4d6e58ca41d8468e0c5a80141a097e081976f7304cd8144386b92b9cf48ac17d249a0b69 SHA512 (gui-po.tgz) = 8e0855256b825eea422b8e2b82cc0decf66b902c9930840905c5ad5dda7bef3679943a22db62709907d48f8a331d67edc5efed3e2638b53e379959b14077b4ea SHA512 (policycoreutils-po.tgz) = 66b908f7a167225bebded46f9cf92f42eb194daa2a083d48de43c2a5d33fa42724c5add0a9d029ac9d62c500f6f1c8d3bc138dd598b1fd97e609d7cc7160be72 SHA512 (python-po.tgz) = 7f2a082b77c7b4417d5d3dac35d86dd635635a9c05a80e5f9284d03604e2f2a06ec879fb29b056d1a46d3fc448cd76e6fd25196834c18a161fd6677f2e11b2be