diff --git a/.gitignore b/.gitignore index ccb7043..a2f5562 100644 --- a/.gitignore +++ b/.gitignore @@ -102,3 +102,4 @@ checkpolicy-2.0.22.tgz /checkpolicy-2.9-rc1.tar.gz /checkpolicy-2.9-rc2.tar.gz /checkpolicy-2.9.tar.gz +/checkpolicy-3.0-rc1.tar.gz diff --git a/checkpolicy-fedora.patch b/checkpolicy-fedora.patch deleted file mode 100644 index e69de29..0000000 diff --git a/checkpolicy.spec b/checkpolicy.spec index 59473c4..dd7bba2 100644 --- a/checkpolicy.spec +++ b/checkpolicy.spec @@ -1,18 +1,18 @@ -%define libselinuxver 2.9-1 -%define libsepolver 2.9-1 +%define libselinuxver 3.0 +%define libsepolver 3.0 Summary: SELinux policy compiler Name: checkpolicy -Version: 2.9 -Release: 2%{?dist} +Version: 3.0 +Release: 0.rc1.1%{?dist} License: GPLv2 -Source0: https://github.com/SELinuxProject/selinux/releases/download/20190315/checkpolicy-2.9.tar.gz -# download https://raw.githubusercontent.com/fedora-selinux/scripts/master/selinux/make-fedora-selinux-patch.sh -# run: -# $ VERSION=2.9 ./make-fedora-selinux-patch.sh checkpolicy -# HEAD https://github.com/fedora-selinux/selinux/commit/431f72836d6c02450725cf6ffb1c7223b9fa6acc -# Patch1: checkpolicy-fedora.patch -Conflicts: selinux-policy-base < 3.13.1-138 +Source0: https://github.com/SELinuxProject/selinux/releases/download/20191031/checkpolicy-3.0-rc1.tar.gz +# $ git clone https://github.com/fedora-selinux/selinux.git +# $ cd selinux +# $ git format-patch -N checkpolicy-3.0-rc1 -- checkpolicy +# $ i=1; for j in 00*patch; do printf "Patch%04d: %s\n" $i $j; i=$((i+1));done +# Patch list start +# Patch list end Conflicts: selinux-policy-base < 3.13.1-138 BuildRequires: gcc BuildRequires: byacc bison flex flex-static libsepol-static >= %{libsepolver} libselinux-devel >= %{libselinuxver} @@ -31,7 +31,7 @@ This package contains checkpolicy, the SELinux policy compiler. Only required for building policies. %prep -%autosetup -p 1 -n checkpolicy-%{version} +%autosetup -p 2 -n checkpolicy-%{version}-rc1 %build @@ -61,6 +61,9 @@ install test/dispol ${RPM_BUILD_ROOT}%{_bindir}/sedispol %{_bindir}/sedispol %changelog +* Mon Nov 11 2019 Petr Lautrbach - 3.0-0.rc1.1 +- SELinux userspace 3.0-rc1 release candidate + * Wed Jul 24 2019 Fedora Release Engineering - 2.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index c3e6dcd..fb23695 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (checkpolicy-2.9.tar.gz) = 8dafdd871c5fd32023883149c74891279c386cc87d70cbfc6f0a8dcb0406f17f1158f9078c1b35892a0f0edcb6b5208a031594ab80898eec016ad765ad046e03 +SHA512 (checkpolicy-3.0-rc1.tar.gz) = efcc0be57eef988118a1d3dd012e8602a10ceb42044984c62b925430dc7881baca817f2ae490f18a5636cafb8801bff9ff6c8f33382fa82b128b6e6f7d3e730f