From c6aaaee231de1ff9b341a22b602a157146132650 Mon Sep 17 00:00:00 2001 From: Lukas Vrabec Date: Tue, 15 Aug 2017 16:27:40 +0200 Subject: [PATCH] Remove temporary fix labeling cockpit binary --- policy-rawhide-base-cockpit.patch | 12 ------------ selinux-policy.spec | 2 -- 2 files changed, 14 deletions(-) delete mode 100644 policy-rawhide-base-cockpit.patch diff --git a/policy-rawhide-base-cockpit.patch b/policy-rawhide-base-cockpit.patch deleted file mode 100644 index a98354aa..00000000 --- a/policy-rawhide-base-cockpit.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/policy/modules/kernel/corecommands.fc b/policy/modules/kernel/corecommands.fc -index 9a8ff3e..593281c 100644 ---- a/policy/modules/kernel/corecommands.fc -+++ b/policy/modules/kernel/corecommands.fc -@@ -308,7 +308,6 @@ ifdef(`distro_gentoo',` - /usr/libexec(/.*)? gen_context(system_u:object_r:bin_t,s0) - - /usr/libexec/git-core/git-shell -- gen_context(system_u:object_r:shell_exec_t,s0) --/usr/libexec/cockpit-agent -- gen_context(system_u:object_r:shell_exec_t,s0) - /usr/bin/cockpit-bridge -- gen_context(system_u:object_r:shell_exec_t,s0) - /usr/libexec/sesh -- gen_context(system_u:object_r:shell_exec_t,s0) - diff --git a/selinux-policy.spec b/selinux-policy.spec index 91e6e4e2..dc1602ba 100644 --- a/selinux-policy.spec +++ b/selinux-policy.spec @@ -29,7 +29,6 @@ Source: serefpolicy-%{version}.tgz # git diff 64302b790bf2b39d93610e1452c8361d56966ae0 rawhide > policy-rawhide-contrib.patch patch: policy-rawhide-base.patch patch1: policy-rawhide-contrib.patch -patch2: policy-rawhide-base-cockpit.patch Source1: modules-targeted-base.conf Source31: modules-targeted-contrib.conf Source2: booleans-targeted.conf @@ -354,7 +353,6 @@ tar -xf %{SOURCE35} contrib_path=`pwd` %setup -n serefpolicy-%{version} -q %patch -p1 -%patch2 -p1 refpolicy_path=`pwd` cp $contrib_path/* $refpolicy_path/policy/modules/contrib