From 54b53e380c81d6d50f9633c9b4ce1cd883849524 Mon Sep 17 00:00:00 2001 From: Petr Lautrbach Date: Fri, 10 Jul 2020 20:27:21 +0200 Subject: [PATCH] checkpolicy-3.1-1 - SELinux userspace 3.1 release --- .gitignore | 1 + ...ckpolicy-remove-unused-te_assertions.patch | 42 ------------------- checkpolicy.spec | 16 +++---- sources | 2 +- 4 files changed, 11 insertions(+), 50 deletions(-) delete mode 100644 0001-checkpolicy-remove-unused-te_assertions.patch diff --git a/.gitignore b/.gitignore index c1c820a..836f74f 100644 --- a/.gitignore +++ b/.gitignore @@ -104,3 +104,4 @@ checkpolicy-2.0.22.tgz /checkpolicy-2.9.tar.gz /checkpolicy-3.0-rc1.tar.gz /checkpolicy-3.0.tar.gz +/checkpolicy-3.1.tar.gz diff --git a/0001-checkpolicy-remove-unused-te_assertions.patch b/0001-checkpolicy-remove-unused-te_assertions.patch deleted file mode 100644 index 672f12c..0000000 --- a/0001-checkpolicy-remove-unused-te_assertions.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 95d8f16ece96829109eb75a605b1459a25b5a6be Mon Sep 17 00:00:00 2001 -From: Ondrej Mosnacek -Date: Thu, 23 Jan 2020 13:57:15 +0100 -Subject: [PATCH] checkpolicy: remove unused te_assertions - -This variable is declared in a header file, but never defined or used. -The te_assert structure definition is only used in this declaration, so -remove both. - -Signed-off-by: Ondrej Mosnacek ---- - checkpolicy/checkpolicy.h | 14 -------------- - 1 file changed, 14 deletions(-) - -diff --git a/checkpolicy/checkpolicy.h b/checkpolicy/checkpolicy.h -index 3868f1fa023b..f127687e72a6 100644 ---- a/checkpolicy/checkpolicy.h -+++ b/checkpolicy/checkpolicy.h -@@ -1,20 +1,6 @@ - #ifndef _CHECKPOLICY_H_ - #define _CHECKPOLICY_H_ - --#include -- --typedef struct te_assert { -- ebitmap_t stypes; -- ebitmap_t ttypes; -- ebitmap_t tclasses; -- int self; -- sepol_access_vector_t *avp; -- unsigned long line; -- struct te_assert *next; --} te_assert_t; -- --te_assert_t *te_assertions; -- - extern unsigned int policyvers; - - #endif --- -2.24.1 - diff --git a/checkpolicy.spec b/checkpolicy.spec index e515442..8ff7960 100644 --- a/checkpolicy.spec +++ b/checkpolicy.spec @@ -1,18 +1,17 @@ -%define libselinuxver 3.0-1 -%define libsepolver 3.0-1 +%define libselinuxver 3.1 +%define libsepolver 3.1 Summary: SELinux policy compiler Name: checkpolicy -Version: 3.0 -Release: 3%{?dist} +Version: 3.1 +Release: 1%{?dist} License: GPLv2 -Source0: https://github.com/SELinuxProject/selinux/releases/download/20191204/checkpolicy-3.0.tar.gz +Source0: https://github.com/SELinuxProject/selinux/releases/download/20200710/checkpolicy-3.1.tar.gz # $ git clone https://github.com/fedora-selinux/selinux.git # $ cd selinux -# $ git format-patch -N checkpolicy-3.0 -- checkpolicy +# $ git format-patch -N checkpolicy-3.1 -- 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-remove-unused-te_assertions.patch # Patch list end BuildRequires: gcc BuildRequires: byacc bison flex flex-static libsepol-static >= %{libsepolver} libselinux-devel >= %{libselinuxver} @@ -62,6 +61,9 @@ install test/dispol ${RPM_BUILD_ROOT}%{_bindir}/sedispol %{_bindir}/sedispol %changelog +* Fri Jul 10 2020 Petr Lautrbach - 3.1-1 +- SELinux userspace 3.1 release + * Tue Jan 28 2020 Petr Lautrbach - 3.0-3 - Fix -fno-common issues discovered by GCC 10 diff --git a/sources b/sources index ac99ca2..72e0bf4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (checkpolicy-3.0.tar.gz) = 196d24638ec7fc88d427637e2308c7a0c5a3d4cc88c372a5f5dc61d6c1e2f895e308b8e06ee9e47d340d65a1b2d4486dc4decfa6074594dda14e46f1308ded89 +SHA512 (checkpolicy-3.1.tar.gz) = 2276a5a0919286049d2ceba386ef5f6de523745b588bb81cb4fed5eced5fd0b8070249b7a3ae5a85e2abb9369a86318f727d4073aad14ab75c43750a46069168