diff --git a/checkpolicy-fedora.patch b/checkpolicy-fedora.patch index e69de29..7916347 100644 --- a/checkpolicy-fedora.patch +++ b/checkpolicy-fedora.patch @@ -0,0 +1,91 @@ +diff --git checkpolicy-2.7/checkmodule.8 checkpolicy-2.7/checkmodule.8 +index ee95882..cf76591 100644 +--- checkpolicy-2.7/checkmodule.8 ++++ checkpolicy-2.7/checkmodule.8 +@@ -64,4 +64,4 @@ especially "Configuring the SELinux Policy". + This manual page was copied from the checkpolicy man page + written by Arpad Magosanyi , + and edited by Dan Walsh . +-The program was written by Stephen Smalley . ++The program was written by Stephen Smalley . +diff --git checkpolicy-2.7/checkpolicy.8 checkpolicy-2.7/checkpolicy.8 +index 7b28696..1c8805d 100644 +--- checkpolicy-2.7/checkpolicy.8 ++++ checkpolicy-2.7/checkpolicy.8 +@@ -58,5 +58,5 @@ especially "Configuring the SELinux Policy". + + .SH AUTHOR + This manual page was written by Arpad Magosanyi , +-and edited by Stephen Smalley . +-The program was written by Stephen Smalley . ++and edited by Stephen Smalley . ++The program was written by Stephen Smalley . +diff --git checkpolicy-2.7/checkpolicy.c checkpolicy-2.7/checkpolicy.c +index b75f2af..923b47c 100644 +--- checkpolicy-2.7/checkpolicy.c ++++ checkpolicy-2.7/checkpolicy.c +@@ -1,6 +1,6 @@ + + /* +- * Author : Stephen Smalley, ++ * Author : Stephen Smalley, + */ + + /* +diff --git checkpolicy-2.7/policy_define.c checkpolicy-2.7/policy_define.c +index f12ebdb..2c5db55 100644 +--- checkpolicy-2.7/policy_define.c ++++ checkpolicy-2.7/policy_define.c +@@ -1,5 +1,5 @@ + /* +- * Author : Stephen Smalley, ++ * Author : Stephen Smalley, + */ + + /* +diff --git checkpolicy-2.7/policy_parse.y checkpolicy-2.7/policy_parse.y +index 6b406c8..247bd4e 100644 +--- checkpolicy-2.7/policy_parse.y ++++ checkpolicy-2.7/policy_parse.y +@@ -1,6 +1,6 @@ + + /* +- * Author : Stephen Smalley, ++ * Author : Stephen Smalley, + */ + + /* +diff --git checkpolicy-2.7/policy_scan.l checkpolicy-2.7/policy_scan.l +index e6c4898..e93ccb6 100644 +--- checkpolicy-2.7/policy_scan.l ++++ checkpolicy-2.7/policy_scan.l +@@ -1,6 +1,6 @@ + + /* +- * Author : Stephen Smalley, ++ * Author : Stephen Smalley, + */ + + /* Updated: David Caplan, +diff --git checkpolicy-2.7/queue.c checkpolicy-2.7/queue.c +index acc991c..82e6673 100644 +--- checkpolicy-2.7/queue.c ++++ checkpolicy-2.7/queue.c +@@ -1,5 +1,5 @@ + +-/* Author : Stephen Smalley, */ ++/* Author : Stephen Smalley, */ + + /* FLASK */ + +diff --git checkpolicy-2.7/queue.h checkpolicy-2.7/queue.h +index 655c94b..60c07fe 100644 +--- checkpolicy-2.7/queue.h ++++ checkpolicy-2.7/queue.h +@@ -1,5 +1,5 @@ + +-/* Author : Stephen Smalley, */ ++/* Author : Stephen Smalley, */ + + /* FLASK */ + diff --git a/checkpolicy.spec b/checkpolicy.spec index 92c57bb..01644cf 100644 --- a/checkpolicy.spec +++ b/checkpolicy.spec @@ -1,18 +1,18 @@ -%define libselinuxver 2.7-1 -%define libsepolver 2.7-1 +%define libselinuxver 2.7-5 +%define libsepolver 2.7-2 Summary: SELinux policy compiler Name: checkpolicy Version: 2.7 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Development/System Source: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20170804/checkpolicy-2.7.tar.gz # download https://raw.githubusercontent.com/fedora-selinux/scripts/master/selinux/make-fedora-selinux-patch.sh # run: # $ VERSION=2.7 ./make-fedora-selinux-patch.sh checkpolicy -# FIXME: HEAD https://github.com/fedora-selinux/selinux/commit/caefad506ca46db441952ab64ebfc6202897516b -# Patch1: checkpolicy-fedora.patch +# HEAD https://github.com/fedora-selinux/selinux/commit/4247fad665261169b430895f0ab10f56eb33dd10 +Patch1: checkpolicy-fedora.patch Conflicts: selinux-policy-base < 3.13.1-138 BuildRoot: %{_tmppath}/%{name}-buildroot BuildRequires: byacc bison flex flex-static libsepol-static >= %{libsepolver} libselinux-devel >= %{libselinuxver} @@ -62,6 +62,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_bindir}/sedispol %changelog +* Fri Oct 20 2017 Petr Lautrbach - 2.7-2 +- Rebuilt with libsepol-2.7-2 + * Mon Aug 07 2017 Petr Lautrbach - 2.7-1 - Update to upstream release 2017-08-04