From 6c42f1f6fcf62332318f5b2e4ad406dedc0692157b7f572d41df3cfb9ecafc70 Mon Sep 17 00:00:00 2001
From: Johannes Segitz <jsegitz@suse.com>
Date: Mon, 6 May 2024 14:44:14 +0000
Subject: [PATCH] Accepting request 1172200 from
 home:jsegitz:branches:security:SELinux_6

- Update to version 2.231.0:
  * Allow container domains to communicate with spc_t unix_stream_sockets
  * Move to %posttrans to ensure selinux-policy got updated before
    the commands run (bsc#1221720)

OBS-URL: https://build.opensuse.org/request/show/1172200
OBS-URL: https://build.opensuse.org/package/show/security:SELinux/container-selinux?expand=0&rev=35
---
 _servicedata                                  |  2 +-
 container-selinux-2.230.0+git4.a8e389d.tar.xz |  3 ---
 container-selinux-2.231.0.tar.xz              |  3 +++
 container-selinux.changes                     |  8 ++++++
 container-selinux.spec                        | 26 +++++++++----------
 5 files changed, 24 insertions(+), 18 deletions(-)
 delete mode 100644 container-selinux-2.230.0+git4.a8e389d.tar.xz
 create mode 100644 container-selinux-2.231.0.tar.xz

diff --git a/_servicedata b/_servicedata
index 19cf922..9039f99 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/containers/container-selinux.git</param>
-              <param name="changesrevision">a8e389dbcd3f9b6ed0a7e495c6f559c0383dc49e</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">a3cba5ee5c2df48ccd5bdd6cff258c3e72225a41</param></service></servicedata>
\ No newline at end of file
diff --git a/container-selinux-2.230.0+git4.a8e389d.tar.xz b/container-selinux-2.230.0+git4.a8e389d.tar.xz
deleted file mode 100644
index e6462fb..0000000
--- a/container-selinux-2.230.0+git4.a8e389d.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a51c6267aeda128a15487628d4e976d50074ec97fb36dbe12377e996903563a8
-size 27684
diff --git a/container-selinux-2.231.0.tar.xz b/container-selinux-2.231.0.tar.xz
new file mode 100644
index 0000000..746fb5b
--- /dev/null
+++ b/container-selinux-2.231.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3b2e700f295063858c1cf480e76b9c720b5e759434397863afbe8de984644cdf
+size 27952
diff --git a/container-selinux.changes b/container-selinux.changes
index d8967c7..4943ad6 100644
--- a/container-selinux.changes
+++ b/container-selinux.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon May 06 07:36:02 UTC 2024 - jsegitz@suse.com
+
+- Update to version 2.231.0:
+  * Allow container domains to communicate with spc_t unix_stream_sockets
+  * Move to %posttrans to ensure selinux-policy got updated before
+    the commands run (bsc#1221720)
+
 -------------------------------------------------------------------
 Wed Apr 10 15:47:15 UTC 2024 - Cathy Hu <cathy.hu@suse.com>
 
diff --git a/container-selinux.spec b/container-selinux.spec
index 2f9d0fd..25dd724 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.230.0+git4.a8e389d
+Version:        2.231.0
 Release:        0
 Summary:        SELinux policies for container runtimes
 License:        GPL-2.0-only
@@ -35,11 +35,11 @@ Source0:        container-selinux-%{version}.tar.xz
 BuildRequires:  selinux-policy
 BuildRequires:  selinux-policy-devel
 Requires:       selinux-policy >= %(rpm -q selinux-policy --qf '%%{version}-%%{release}')
-Requires(post): policycoreutils
-Requires(post): /usr/bin/sed
-Requires(post): selinux-policy-base >= %{selinux_policyver}
-Requires(post): selinux-policy-targeted >= %{selinux_policyver}
-Requires(post): selinux-tools
+Requires(posttrans): policycoreutils
+Requires(posttrans): /usr/bin/sed
+Requires(posttrans): selinux-policy-base >= %{selinux_policyver}
+Requires(posttrans): selinux-policy-targeted >= %{selinux_policyver}
+Requires(posttrans): selinux-tools
 BuildArch:      noarch
 
 %description
@@ -68,7 +68,12 @@ install -m 0644 udica-templates/*.cil %{buildroot}%{_datadir}/udica/templates
 %pre
 %selinux_relabel_pre -s %{selinuxtype}
 
-%post
+%postun
+if [ $1 -eq 0 ]; then
+   %selinux_modules_uninstall -s %{selinuxtype} %{modulenames} docker
+fi
+
+%posttrans
 # Install all modules in a single transaction
 if [ $1 -eq 1 ]; then
    %{_sbindir}/setsebool -P -N virt_use_nfs=1 virt_sandbox_use_all_caps=1
@@ -81,13 +86,6 @@ fi
 . %{_sysconfdir}/selinux/config
 sed -e "\|container_file_t|h; \${x;s|container_file_t||;{g;t};a\\" -e "container_file_t" -e "}" -i %{_sysconfdir}/selinux/${SELINUXTYPE}/contexts/customizable_types
 matchpathcon -qV %{_sharedstatedir}/containers || restorecon -R %{_sharedstatedir}/containers &> /dev/null || :
-
-%postun
-if [ $1 -eq 0 ]; then
-   %selinux_modules_uninstall -s %{selinuxtype} %{modulenames} docker
-fi
-
-%posttrans
 %selinux_relabel_post -s %{selinuxtype}
 
 %files