diff --git a/container-selinux-1957904.patch b/container-selinux-1957904.patch deleted file mode 100644 index 9efeeea9b1bdd7ef25df3181a2f9adb8c7f751d1..0000000000000000000000000000000000000000 --- a/container-selinux-1957904.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up container-selinux-2.163.0/container.te.orig container-selinux-2.163.0/container.te ---- container-selinux-2.163.0/container.te.orig 2021-06-16 16:14:04.107700701 +0200 -+++ container-selinux-2.163.0/container.te 2021-06-16 16:14:29.756010679 +0200 -@@ -454,7 +454,7 @@ modutils_domtrans_kmod(container_runtime - systemd_status_all_unit_files(container_runtime_domain) - systemd_start_systemd_services(container_runtime_domain) - systemd_dbus_chat_logind(container_runtime_domain) --systemd_chat_resolved(container_runtime_domain) -+#systemd_chat_resolved(container_runtime_domain) - - userdom_stream_connect(container_runtime_domain) - userdom_search_user_home_content(container_runtime_domain) diff --git a/container-selinux.spec b/container-selinux.spec index 53955f5293b576affe36d69dbe6dce7e8e59dbfd..05bd33af3d8e76ebdc5b22b9b79cb61282f71e3b 100644 --- a/container-selinux.spec +++ b/container-selinux.spec @@ -19,13 +19,12 @@ Epoch: 2 Name: container-selinux -Version: 2.199.0 -Release: 1%{?dist} +Version: 2.205.0 +Release: 3%{?dist} License: GPLv2 URL: %{git0} Summary: SELinux policies for container runtimes Source0: %{git0}/archive/v%{version}.tar.gz -Patch1: container-selinux-1957904.patch BuildArch: noarch BuildRequires: git BuildRequires: pkgconfig(systemd) @@ -55,6 +54,17 @@ SELinux policy modules for use with container runtimes. %prep %autosetup -Sgit +sed -i 's/watch watch_reads//' container.if +sed -i '/sysfs_t:dir watch/d' container.te +sed -i '/systemd_chat_resolved/d' container.te +sed -i 's/man: install-policy/man:/' Makefile +sed -i 's/install: man/install:/' Makefile + +# https://github.com/containers/container-selinux/issues/203 +%if 0%{?fedora} <= 37 || 0%{?rhel} <= 9 +sed -i '/user_namespace/d' container.te +%endif + %build make @@ -112,34 +122,23 @@ fi %{_datadir}/udica/templates/* %changelog -* Wed Feb 08 2023 Jindrich Novy - 2:2.199.0-1 -- revert back to https://github.com/containers/container-selinux/releases/tag/v2.199.0 - (2.200.0 fails to build as it relies on the new selinux-policy which is not there yet) -- Related: #2123641 +* Tue May 02 2023 Jindrich Novy - 2:2.205.0-3 +- fix build for stable module +- Related: #2176055 -* Tue Feb 07 2023 Jindrich Novy - 2:2.200.0-1 -- update to https://github.com/containers/container-selinux/releases/tag/v2.200.0 -- Related: #2129766 +* Fri Apr 14 2023 Jindrich Novy - 2:2.205.0-2 +- use conditionals from https://github.com/containers/container-selinux/blob/main/container-selinux.spec.rpkg +- Related: #2176055 -* Mon Jan 30 2023 Jindrich Novy - 2:2.199.0-1 -- update to https://github.com/containers/container-selinux/releases/tag/v2.199.0 -- Related: #2129766 +* Tue Mar 21 2023 Jindrich Novy - 2:2.205.0-1 +- update to https://github.com/containers/container-selinux/releases/tag/v2.205.0 +- remove user_namespace class, thanks to Lokesh Mandvekar +- Related: #2176055 -* Mon Jan 09 2023 Jindrich Novy - 2:2.198.0-1 -- update to https://github.com/containers/container-selinux/releases/tag/v2.198.0 -- Related: #2129766 - -* Wed Jan 04 2023 Jindrich Novy - 2:2.197.0-1 -- update to https://github.com/containers/container-selinux/releases/tag/v2.197.0 -- Related: #2129766 - -* Mon Jan 02 2023 Jindrich Novy - 2:2.195.1-1 -- update to https://github.com/containers/container-selinux/releases/tag/v2.195.1 -- Related: #2129766 - -* Mon Nov 28 2022 Jindrich Novy - 2:2.193.0-1 -- update to https://github.com/containers/container-selinux/releases/tag/v2.193.0 -- Related: #2129766 +* Tue Mar 14 2023 Jindrich Novy - 2:2.199.0-1 +- revert back to https://github.com/containers/container-selinux/releases/tag/v2.199.0 + (2.200.0 fails to build as it relies on the new selinux-policy which is not there yet) +- Related: #2176055 * Mon Oct 31 2022 Jindrich Novy - 2:2.191.0-1 - update to https://github.com/containers/container-selinux/releases/tag/v2.191.0 diff --git a/download b/download index aba38e42a3999c45c322fb6cafd8ff94653341e6..d7a6a67df5b5e9924d8f6309117bab4810776dbc 100644 --- a/download +++ b/download @@ -1 +1 @@ -47c041ce4efbb6f96c932782fd6d5bd9 v2.199.0.tar.gz +71e413c630cf349845986ad9649b3d4d v2.205.0.tar.gz diff --git a/v2.199.0.tar.gz b/v2.199.0.tar.gz deleted file mode 100644 index be892fa47c8b7dd111425faea79e23d2639d492f..0000000000000000000000000000000000000000 Binary files a/v2.199.0.tar.gz and /dev/null differ