From c6e6561646e3587556b032c8e676e4c8de1bf4e3 Mon Sep 17 00:00:00 2001 From: Lukas Vrabec Date: Wed, 25 Sep 2019 10:25:50 +0200 Subject: [PATCH] Remove patch which is already part of new rebase --- ...t_basic.podman.cil-test_basic.docker.patch | 61 ------------------- udica.spec | 1 - 2 files changed, 62 deletions(-) delete mode 100644 0001-Update-tests-test_basic.podman.cil-test_basic.docker.patch diff --git a/0001-Update-tests-test_basic.podman.cil-test_basic.docker.patch b/0001-Update-tests-test_basic.podman.cil-test_basic.docker.patch deleted file mode 100644 index eda87e3..0000000 --- a/0001-Update-tests-test_basic.podman.cil-test_basic.docker.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 1ef277aa4840a72ff474f6500bcc6576f37af0af Mon Sep 17 00:00:00 2001 -From: Lukas Vrabec -Date: Tue, 27 Aug 2019 21:20:16 +0200 -Subject: [PATCH] Update tests test_basic.podman.cil, test_basic.docker.cil. - Round 2 - -Because of the new versions of SELinux policy in Fedora 30 and Fedora -Rawhide, also several tests in Udica needed to be fixed to use new -labels. ---- - tests/semanage.py | 1 - - tests/test_basic.docker.cil | 3 --- - tests/test_basic.podman.cil | 5 +---- - 3 files changed, 1 insertion(+), 8 deletions(-) - -diff --git a/tests/semanage.py b/tests/semanage.py -index f64fda4..318a46a 100644 ---- a/tests/semanage.py -+++ b/tests/semanage.py -@@ -156,7 +156,6 @@ fcontexts_homedirs = [ - ('/var/spool/fcron/new\\.systab', 'system_u:object_r:system_cron_spool_t:s0'), - ('/var/spool/fcron/systab\\.orig', 'system_u:object_r:system_cron_spool_t:s0'), - ('/var/spool/postfix/etc/localtime', 'system_u:object_r:locale_t:s0'), -- ('/var/spool/cron', 'system_u:object_r:user_cron_spool_t:s0'), - ('/var/spool/cron/user', 'system_u:object_r:user_cron_spool_t:s0') - ] - -diff --git a/tests/test_basic.docker.cil b/tests/test_basic.docker.cil -index b29cb32..220c53b 100644 ---- a/tests/test_basic.docker.cil -+++ b/tests/test_basic.docker.cil -@@ -285,9 +285,6 @@ - (allow process user_cron_spool_t ( dir ( open read getattr lock search ioctl add_name remove_name write ))) - (allow process user_cron_spool_t ( file ( getattr read write append ioctl lock map open create ))) - (allow process user_cron_spool_t ( sock_file ( getattr read write append open ))) -- (allow process user_cron_spool_t ( dir ( open read getattr lock search ioctl add_name remove_name write ))) -- (allow process user_cron_spool_t ( file ( getattr read write append ioctl lock map open create ))) -- (allow process user_cron_spool_t ( sock_file ( getattr read write append open ))) - (allow process var_spool_t ( dir ( open read getattr lock search ioctl add_name remove_name write ))) - (allow process var_spool_t ( file ( getattr read write append ioctl lock map open create ))) - (allow process var_spool_t ( sock_file ( getattr read write append open ))) -diff --git a/tests/test_basic.podman.cil b/tests/test_basic.podman.cil -index 06b44e3..618fe07 100644 ---- a/tests/test_basic.podman.cil -+++ b/tests/test_basic.podman.cil -@@ -287,10 +287,7 @@ - (allow process user_cron_spool_t ( dir ( open read getattr lock search ioctl add_name remove_name write ))) - (allow process user_cron_spool_t ( file ( getattr read write append ioctl lock map open create ))) - (allow process user_cron_spool_t ( sock_file ( getattr read write append open ))) -- (allow process user_cron_spool_t ( dir ( open read getattr lock search ioctl add_name remove_name write ))) -- (allow process user_cron_spool_t ( file ( getattr read write append ioctl lock map open create ))) -- (allow process user_cron_spool_t ( sock_file ( getattr read write append open ))) - (allow process var_spool_t ( dir ( open read getattr lock search ioctl add_name remove_name write ))) - (allow process var_spool_t ( file ( getattr read write append ioctl lock map open create ))) - (allow process var_spool_t ( sock_file ( getattr read write append open ))) --) -\ No newline at end of file -+) --- -2.21.0 - diff --git a/udica.spec b/udica.spec index 3231d7b..2e69598 100644 --- a/udica.spec +++ b/udica.spec @@ -13,7 +13,6 @@ Requires: python3 python3-libsemanage python3-libselinux BuildRequires: python2 python2-devel python2-setuptools Requires: python2 libsemanage-python libselinux-python %endif -patch01: 0001-Update-tests-test_basic.podman.cil-test_basic.docker.patch %description Tool for generating SELinux security profiles for containers based on