From b846d75346d3e7155768e0a90cb35594ef22463b3cbcc8a226d94f9365f2d804 Mon Sep 17 00:00:00 2001 From: Hu Date: Thu, 9 Jan 2025 14:23:53 +0000 Subject: [PATCH 1/2] - Add BuildRequires selinux-policy-%{selinuxtype} to enable building for SLFO. Might be removed in the future again when 1231252 is fixed. OBS-URL: https://build.opensuse.org/package/show/security:SELinux/container-selinux?expand=0&rev=38 --- container-selinux.changes | 7 +++++++ container-selinux.spec | 1 + 2 files changed, 8 insertions(+) diff --git a/container-selinux.changes b/container-selinux.changes index 1651b33..f2e577b 100644 --- a/container-selinux.changes +++ b/container-selinux.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jan 9 14:16:15 UTC 2025 - Cathy Hu + +- Add BuildRequires selinux-policy-%{selinuxtype} to enable building + for SLFO. Might be removed in the future again when 1231252 + is fixed. + ------------------------------------------------------------------- Thu Nov 07 12:04:40 UTC 2024 - cathy.hu@suse.com diff --git a/container-selinux.spec b/container-selinux.spec index 1368ddc..a8fe06b 100644 --- a/container-selinux.spec +++ b/container-selinux.spec @@ -34,6 +34,7 @@ URL: https://github.com/containers/container-selinux Source0: container-selinux-%{version}.tar.xz BuildRequires: selinux-policy BuildRequires: selinux-policy-devel +BuildRequires: selinux-policy-%{selinuxtype} Requires: selinux-policy >= %(rpm -q selinux-policy --qf '%%{version}-%%{release}') Requires(posttrans): policycoreutils Requires(posttrans): /usr/bin/sed From 0e19467c12775033e5c0e901515dac4a01eb7f5076b567f64815586bca2311cb Mon Sep 17 00:00:00 2001 From: Robert Frohl Date: Fri, 10 Jan 2025 16:19:24 +0000 Subject: [PATCH 2/2] container-selinux: 2.234.2 + man page OBS-URL: https://build.opensuse.org/package/show/security:SELinux/container-selinux?expand=0&rev=39 --- _servicedata | 2 +- container-selinux-2.233.0.tar.xz | 3 --- container-selinux-2.234.2.tar.xz | 3 +++ container-selinux.changes | 12 ++++++++++++ container-selinux.spec | 5 ++++- 5 files changed, 20 insertions(+), 5 deletions(-) delete mode 100644 container-selinux-2.233.0.tar.xz create mode 100644 container-selinux-2.234.2.tar.xz diff --git a/_servicedata b/_servicedata index 872c29b..b74538a 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/containers/container-selinux.git - 3f06c141bebc00a07eec4c0ded038aac4f2ae3f0 \ No newline at end of file + 7fdbd0e8c428c335406969878f28e14f335f2e7e \ No newline at end of file diff --git a/container-selinux-2.233.0.tar.xz b/container-selinux-2.233.0.tar.xz deleted file mode 100644 index 421ffae..0000000 --- a/container-selinux-2.233.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b38f8dc1a274fb9781df60f04234f6851e93382eb95372af56a617ece8e0189 -size 28680 diff --git a/container-selinux-2.234.2.tar.xz b/container-selinux-2.234.2.tar.xz new file mode 100644 index 0000000..7b30744 --- /dev/null +++ b/container-selinux-2.234.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e4f618e58b1bcf3b65b87d334a98d5383f9ec6915668766abb7189542bbb4b8 +size 28276 diff --git a/container-selinux.changes b/container-selinux.changes index f2e577b..7d1eee7 100644 --- a/container-selinux.changes +++ b/container-selinux.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Jan 10 10:08:37 UTC 2025 - rfrohl@suse.com + +- Update to version 2.234.2: + * TMT: enable epel idomatically + * Packit: switch back to fedora-all + * RPM: Bump Epoch to 4 + * rpm: ship manpage + * Add proper labeling for RamaLama + * Packit: remove rhel / epel jobs + * packit: remove unused file + ------------------------------------------------------------------- Thu Jan 9 14:16:15 UTC 2025 - Cathy Hu diff --git a/container-selinux.spec b/container-selinux.spec index a8fe06b..3c38fa8 100644 --- a/container-selinux.spec +++ b/container-selinux.spec @@ -26,7 +26,7 @@ # Version of SELinux we were using %define selinux_policyver %(rpm -q selinux-policy --qf '%%{version}') Name: container-selinux -Version: 2.233.0 +Version: 2.234.2 Release: 0 Summary: SELinux policies for container runtimes License: GPL-2.0-only @@ -63,6 +63,8 @@ install -d %{buildroot}/%{_datadir}/containers/selinux install -m 644 container_contexts %{buildroot}/%{_datadir}/containers/selinux/contexts install -d %{buildroot}%{_datadir}/udica/templates install -m 0644 udica-templates/*.cil %{buildroot}%{_datadir}/udica/templates +install -d %{buildroot}%{_mandir}/man8/ +install -pm 0644 container_selinux.8 %{buildroot}%{_mandir}/man8/ %check @@ -99,5 +101,6 @@ matchpathcon -qV %{_sharedstatedir}/containers || restorecon -R %{_sharedstatedi %dir %{_datadir}/udica %dir %{_datadir}/udica/templates %{_datadir}/udica/templates/* +%{_mandir}/man8/container_selinux.8* %changelog