From a1a66715635a74549e80ea0dbe190cc15cc95ea7 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Mon, 16 Oct 2023 09:19:01 +0000 Subject: [PATCH] import CS container-selinux-2.221.0-1.module_el8+653+feef7bfe --- .container-selinux.metadata | 2 +- .gitignore | 2 +- SOURCES/container-selinux-1957904.patch | 12 ---- SPECS/container-selinux.spec | 78 ++++++++++++++++++------- 4 files changed, 59 insertions(+), 35 deletions(-) delete mode 100644 SOURCES/container-selinux-1957904.patch diff --git a/.container-selinux.metadata b/.container-selinux.metadata index c100dd6..9d9de12 100644 --- a/.container-selinux.metadata +++ b/.container-selinux.metadata @@ -1 +1 @@ -8c77e6accb6094a6c33200d621a1905015bda784 SOURCES/v2.199.0.tar.gz +949e88bb092d00e713fb0f022f717e4cb63156fa SOURCES/v2.221.0.tar.gz diff --git a/.gitignore b/.gitignore index d66226e..d3e4e1d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/v2.199.0.tar.gz +SOURCES/v2.221.0.tar.gz diff --git a/SOURCES/container-selinux-1957904.patch b/SOURCES/container-selinux-1957904.patch deleted file mode 100644 index 9efeeea..0000000 --- a/SOURCES/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/SPECS/container-selinux.spec b/SPECS/container-selinux.spec index e39cb14..043d877 100644 --- a/SPECS/container-selinux.spec +++ b/SPECS/container-selinux.spec @@ -19,13 +19,12 @@ Epoch: 2 Name: container-selinux -Version: 2.199.0 -Release: 2%{?dist} +Version: 2.221.0 +Release: 1%{?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,22 @@ SELinux policy modules for use with container runtimes. %prep %autosetup -Sgit +# Remove some lines for RHEL 8 build +%if ! 0%{?fedora} && 0%{?rhel} <= 8 +sed -i 's/watch watch_reads//' container.if +sed -i 's/watch watch_reads//' container.te +sed -i '/sysfs_t:dir watch/d' container.te +sed -i '/systemd_chat_resolved/d' container.te +%endif + +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,26 +127,47 @@ fi %{_datadir}/udica/templates/* %changelog -* Tue Feb 07 2023 Jindrich Novy - 2:2.199.0-2 +* Tue Aug 15 2023 Jindrich Novy - 2:2.221.0-1 +- update to https://github.com/containers/container-selinux/releases/tag/v2.221.0 +- Related: #2176055 + +* Mon Jul 03 2023 Jindrich Novy - 2:2.219.0-1 +- update to https://github.com/containers/container-selinux/releases/tag/v2.219.0 +- Related: #2176055 + +* Thu Jun 08 2023 Jindrich Novy - 2:2.218.0-1 +- update to https://github.com/containers/container-selinux/releases/tag/v2.218.0 +- Related: #2176055 + +* Wed May 24 2023 Jindrich Novy - 2:2.215.0-1 +- update to https://github.com/containers/container-selinux/releases/tag/v2.215.0 +- Related: #2176055 + +* Tue May 16 2023 Jindrich Novy - 2:2.213.0-2 +- add watch statement removal from container.te +- Related: #2176055 + +* Mon May 15 2023 Jindrich Novy - 2:2.213.0-1 +- update to https://github.com/containers/container-selinux/releases/tag/v2.213.0 +- Related: #2176055 + +* Wed May 03 2023 Jindrich Novy - 2:2.211.1-1 +- update to https://github.com/containers/container-selinux/releases/tag/v2.211.1 +- Related: #2176055 + +* Fri Mar 24 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 + +* 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 + +* Thu Mar 09 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 Feb 07 2023 Jindrich Novy - 2:2.200.0-1 -- update to https://github.com/containers/container-selinux/releases/tag/v2.200.0 -- Related: #2123641 - -* 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: #2123641 - -* Fri Jan 06 2023 Jindrich Novy - 2:2.198.0-1 -- update to https://github.com/containers/container-selinux/releases/tag/v2.198.0 -- Related: #2123641 - -* Thu Jan 05 2023 Jindrich Novy - 2:2.197.0-1 -- update to https://github.com/containers/container-selinux/releases/tag/v2.197.0 -- Related: #2123641 +- Related: #2176055 * Thu Dec 15 2022 Jindrich Novy - 2:2.195.1-1 - update to https://github.com/containers/container-selinux/releases/tag/v2.195.1