From 07b98fa627b9280b7b0c3775fe9b20949a06ae45 Mon Sep 17 00:00:00 2001 From: Renbo Date: Wed, 10 Apr 2024 17:26:54 +0800 Subject: [PATCH] update to container-selinux-2.229.0-1.src.rpm Signed-off-by: Renbo --- container-selinux.spec | 29 +++++++---------------------- download | 2 +- 2 files changed, 8 insertions(+), 23 deletions(-) diff --git a/container-selinux.spec b/container-selinux.spec index a48a80b..92e0c56 100644 --- a/container-selinux.spec +++ b/container-selinux.spec @@ -19,8 +19,8 @@ Epoch: 2 Name: container-selinux -Version: 2.221.0 -Release: 2%{?dist}%{?lifsea_dist} +Version: 2.229.0 +Release: 1%{?dist} License: GPLv2 URL: %{git0} Summary: SELinux policies for container runtimes @@ -35,13 +35,6 @@ Requires: selinux-policy >= %{selinux_policyver} Requires(post): selinux-policy-base >= %{selinux_policyver} Requires(post): selinux-policy-targeted >= %{selinux_policyver} Requires(post): policycoreutils >= 2.5-11 -%if ! %{defined lifsea_dist} -%if 0%{?rhel} > 7 || 0%{?fedora} -Requires(post): policycoreutils-python-utils -%else -Requires(post): policycoreutils-python -%endif -%endif Requires(post): libselinux-utils Requires(post): sed Obsoletes: %{name} <= 2:1.12.5-14 @@ -53,13 +46,6 @@ Conflicts: udica < 0.2.6-1 %description SELinux policy modules for use with container runtimes. -# To avoid users installing the LifseaOS package in other os -%define common_pre_scripts() \ -if ! grep -q 'ID="lifsea"' /etc/os-release; then \ - echo "This package is only for LifseaOS!" \ - exit 1 \ -fi - %prep %autosetup -Sgit @@ -67,7 +53,8 @@ fi %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 '/watch;/d' container.te +sed -i '/watch;/d' container.if sed -i '/systemd_chat_resolved/d' container.te %endif @@ -100,9 +87,6 @@ rm -rf %{name}.spec %check %pre -%if %{defined lifsea_dist} -%{common_pre_scripts} -%endif %selinux_relabel_pre -s %{selinuxtype} %post @@ -139,8 +123,9 @@ fi %{_datadir}/udica/templates/* %changelog -* Tue Mar 12 2024 yuanhui - 2:2.221.0-2 -- LifseaOS: Remove the dependency of python +* Wed Mar 13 2024 Jindrich Novy - 2:2.229.0-1 +- update to https://github.com/containers/container-selinux/releases/tag/v2.229.0 +- Resolves: RHEL-28923 * Tue Aug 15 2023 Jindrich Novy - 2:2.221.0-1 - update to https://github.com/containers/container-selinux/releases/tag/v2.221.0 diff --git a/download b/download index 316c10c..c801a8a 100644 --- a/download +++ b/download @@ -1 +1 @@ -78791b809487f99f571e82bbeb3b5099 v2.221.0.tar.gz +ee17e263d11f9784aca5e69d99df9946 v2.229.0.tar.gz -- Gitee