From d9775d799880810b26c752084405081ba41ff9ba Mon Sep 17 00:00:00 2001 From: Petr Lautrbach Date: Tue, 14 Nov 2023 20:58:35 +0100 Subject: [PATCH] SELinux userspace 3.6-rc1 release --- .gitignore | 1 + ...heckpolicy-Add-examples-to-man-pages.patch | 47 ------------------- checkpolicy.spec | 20 ++++---- sources | 2 +- 4 files changed, 12 insertions(+), 58 deletions(-) delete mode 100644 0001-checkpolicy-Add-examples-to-man-pages.patch diff --git a/.gitignore b/.gitignore index ade347d..193f242 100644 --- a/.gitignore +++ b/.gitignore @@ -119,3 +119,4 @@ checkpolicy-2.0.22.tgz /checkpolicy-3.5-rc2.tar.gz /checkpolicy-3.5-rc3.tar.gz /checkpolicy-3.5.tar.gz +/checkpolicy-3.6-rc1.tar.gz diff --git a/0001-checkpolicy-Add-examples-to-man-pages.patch b/0001-checkpolicy-Add-examples-to-man-pages.patch deleted file mode 100644 index d1a530d..0000000 --- a/0001-checkpolicy-Add-examples-to-man-pages.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 1718f0b89648a0bf77578b05c0924daa14a7ca18 Mon Sep 17 00:00:00 2001 -From: Vit Mojzis -Date: Thu, 1 Jun 2023 16:39:14 +0200 -Subject: [PATCH] checkpolicy: Add examples to man pages - -Signed-off-by: Vit Mojzis -Acked-by: Petr Lautrbach ---- - checkpolicy/checkpolicy.8 | 15 +++++++++++++-- - 1 file changed, 13 insertions(+), 2 deletions(-) - -diff --git a/checkpolicy/checkpolicy.8 b/checkpolicy/checkpolicy.8 -index 2984c238..7843569b 100644 ---- a/checkpolicy/checkpolicy.8 -+++ b/checkpolicy/checkpolicy.8 -@@ -12,8 +12,8 @@ command. - .PP - .B checkpolicy - is a program that checks and compiles a SELinux security policy configuration --into a binary representation that can be loaded into the kernel. If no --input file name is specified, -+into a binary representation that can be loaded into the kernel. -+If no input file name is specified, - .B checkpolicy - will attempt to read from policy.conf or policy, depending on whether the \-b - flag is specified. -@@ -64,6 +64,17 @@ Show version information. - .B \-h,\-\-help - Show usage information. - -+.SH EXAMPLE -+.nf -+Generate policy.conf based on the system policy -+# checkpolicy -b -M -F /etc/selinux/targeted/policy/policy.33 -o policy.conf -+Recompile system policy so that unknown permissions are denied (uses policy.conf from ^^). -+Note that binary policy extension represents its version, which is subject to change -+# checkpolicy -M -U deny -o /etc/selinux/targeted/policy/policy.33 policy.conf -+# load_policy -+Generate CIL representation of current system policy -+# checkpolicy -b -M -C /etc/selinux/targeted/policy/policy.33 -o policy.out -+ - .SH "SEE ALSO" - SELinux Reference Policy documentation at https://github.com/SELinuxProject/refpolicy/wiki - --- -2.40.0 - diff --git a/checkpolicy.spec b/checkpolicy.spec index a08fb6e..8e79de7 100644 --- a/checkpolicy.spec +++ b/checkpolicy.spec @@ -1,18 +1,17 @@ -%define libselinuxver 3.5-1 -%define libsepolver 3.5-1 +%define libselinuxver 3.6-0 +%define libsepolver 3.6-0 Summary: SELinux policy compiler Name: checkpolicy -Version: 3.5 -Release: 3%{?dist} +Version: 3.6 +Release: 0.rc1.1%{?dist} License: GPL-2.0-or-later AND LGPL-2.1-or-later -Source0: https://github.com/SELinuxProject/selinux/releases/download/3.5/checkpolicy-3.5.tar.gz +Source0: https://github.com/SELinuxProject/selinux/releases/download/3.6-rc1/checkpolicy-3.6-rc1.tar.gz # $ git clone https://github.com/fedora-selinux/selinux.git # $ cd selinux -# $ git format-patch -N 3.5 -- checkpolicy +# $ git format-patch -N 3.6-rc1 -- checkpolicy # $ i=1; for j in 00*patch; do printf "Patch%04d: %s\n" $i $j; i=$((i+1));done # Patch list start -Patch0001: 0001-checkpolicy-Add-examples-to-man-pages.patch # Patch list end BuildRequires: gcc BuildRequires: make @@ -33,7 +32,7 @@ This package contains checkpolicy, the SELinux policy compiler. Only required for building policies. %prep -%autosetup -p 2 -n checkpolicy-%{version} +%autosetup -p 2 -n checkpolicy-%{version}-rc1 %build @@ -56,12 +55,13 @@ install test/dispol ${RPM_BUILD_ROOT}%{_bindir}/sedispol %{_bindir}/checkmodule %{_mandir}/man8/checkpolicy.8.gz %{_mandir}/man8/checkmodule.8.gz -%{_mandir}/ru/man8/checkpolicy.8.gz -%{_mandir}/ru/man8/checkmodule.8.gz %{_bindir}/sedismod %{_bindir}/sedispol %changelog +* Tue Nov 14 2023 Petr Lautrbach - 3.6-0.rc1.1 +- SELinux userspace 3.6-rc1 release + * Wed Jul 19 2023 Fedora Release Engineering - 3.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index f7be9b1..d72c861 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (checkpolicy-3.5.tar.gz) = fcd490d865af3b4350c32c5dd9916f8406219841e1e255d8945c6dcc958535247aa27af5597a6988e19f11faea7beeabcb46e8ba2431112bb4aa5c7697bca529 +SHA512 (checkpolicy-3.6-rc1.tar.gz) = 8ca6cef467dd4fcf085ee8c33d58b0eda8aa570b3ef61da57b31c8fca82e492b0275755968ea4c2e4c999bfcb279eb43232226b4db9ff62893ec0cb0190c0a3a