From 461c4a5dbbd07c3037b86395cd0e771d4ec03008 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Wed, 14 Dec 2022 13:41:20 -0500
Subject: [PATCH 01/30] local build

---
 .gitignore             | 1 +
 container-selinux.spec | 2 +-
 sources                | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2dc3488..6de2d1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -191,3 +191,4 @@
 /v2.190.1.tar.gz
 /v2.191.0.tar.gz
 /v2.193.0.tar.gz
+/v2.195.0.tar.gz
diff --git a/container-selinux.spec b/container-selinux.spec
index a3d4218..5269333 100644
--- a/container-selinux.spec
+++ b/container-selinux.spec
@@ -3,7 +3,7 @@
 # container-selinux
 %global git0 https://github.com/containers/container-selinux
 
-%global built_tag v2.193.0
+%global built_tag v2.195.0
 %global built_tag_strip %(b=%{built_tag}; echo ${b:1})
 %global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
 
diff --git a/sources b/sources
index 56b5aed..0895196 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v2.193.0.tar.gz) = b245fdd45e8de8701fd387f431fb48ba9c590efa0b5d804413059f8fb6672261fcb6bc3648d54fc30188038711f42239e0687259eb8dd33d17d75c7c24910d4a
+SHA512 (v2.195.0.tar.gz) = 1e24c8bb9791a705d3ba3830d5529f4c1e30b1a4d6b681d5a2352b3cbede05accbf496c0fa08f067f559a50b37a988530b518364418fad93061cda61b64dd911

From b210c98a9c23781dadad4b864dcb0fc8432cff79 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Thu, 15 Dec 2022 05:11:07 -0500
Subject: [PATCH 02/30] local build

---
 .gitignore             | 1 +
 container-selinux.spec | 2 +-
 sources                | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6de2d1d..944a3ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -192,3 +192,4 @@
 /v2.191.0.tar.gz
 /v2.193.0.tar.gz
 /v2.195.0.tar.gz
+/v2.195.1.tar.gz
diff --git a/container-selinux.spec b/container-selinux.spec
index 5269333..3128b75 100644
--- a/container-selinux.spec
+++ b/container-selinux.spec
@@ -3,7 +3,7 @@
 # container-selinux
 %global git0 https://github.com/containers/container-selinux
 
-%global built_tag v2.195.0
+%global built_tag v2.195.1
 %global built_tag_strip %(b=%{built_tag}; echo ${b:1})
 %global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
 
diff --git a/sources b/sources
index 0895196..d0faf71 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v2.195.0.tar.gz) = 1e24c8bb9791a705d3ba3830d5529f4c1e30b1a4d6b681d5a2352b3cbede05accbf496c0fa08f067f559a50b37a988530b518364418fad93061cda61b64dd911
+SHA512 (v2.195.1.tar.gz) = 11c3b61cdf274fe36b4aa7b59ffb43664aa4a5e73b3845ca664dbadb9e7b016529053e300c4805546864f1cefd12074363c00b935c5c28500a2f2b9d9bb0376b

From 9a3fda28aab04e5c245eaba1a7151d1b7e695926 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Wed, 4 Jan 2023 17:51:20 +0530
Subject: [PATCH 03/30] bump to v2.197.0

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
(cherry picked from commit 3fa11813c16c17d5fd12249572ee5da023af8b7f)
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 .gitignore             | 1 +
 container-selinux.spec | 2 +-
 sources                | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 944a3ae..4862469 100644
--- a/.gitignore
+++ b/.gitignore
@@ -193,3 +193,4 @@
 /v2.193.0.tar.gz
 /v2.195.0.tar.gz
 /v2.195.1.tar.gz
+/v2.197.0.tar.gz
diff --git a/container-selinux.spec b/container-selinux.spec
index 3128b75..fe007d2 100644
--- a/container-selinux.spec
+++ b/container-selinux.spec
@@ -3,7 +3,7 @@
 # container-selinux
 %global git0 https://github.com/containers/container-selinux
 
-%global built_tag v2.195.1
+%global built_tag v2.197.0
 %global built_tag_strip %(b=%{built_tag}; echo ${b:1})
 %global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
 
diff --git a/sources b/sources
index d0faf71..ef9f434 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v2.195.1.tar.gz) = 11c3b61cdf274fe36b4aa7b59ffb43664aa4a5e73b3845ca664dbadb9e7b016529053e300c4805546864f1cefd12074363c00b935c5c28500a2f2b9d9bb0376b
+SHA512 (v2.197.0.tar.gz) = 2e0ef73206be5193cbd073d8e5a63cd62fc0f22be98fed73e45b424d062588182cfdb34af95d1b152a2626afcbef57443a6a0c248bd0e6d17a730268dc09e2be

From bf496e6d7c545caa0ab896c551eefdbe5256ddef Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Fri, 6 Jan 2023 20:11:43 +0530
Subject: [PATCH 04/30] bump to v2.198.0

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
(cherry picked from commit 33f8e14356bc2653c33365f2c9252fc5e3074b65)
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 .gitignore             | 1 +
 container-selinux.spec | 2 +-
 sources                | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4862469..46109be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -194,3 +194,4 @@
 /v2.195.0.tar.gz
 /v2.195.1.tar.gz
 /v2.197.0.tar.gz
+/v2.198.0.tar.gz
diff --git a/container-selinux.spec b/container-selinux.spec
index fe007d2..6f0543c 100644
--- a/container-selinux.spec
+++ b/container-selinux.spec
@@ -3,7 +3,7 @@
 # container-selinux
 %global git0 https://github.com/containers/container-selinux
 
-%global built_tag v2.197.0
+%global built_tag v2.198.0
 %global built_tag_strip %(b=%{built_tag}; echo ${b:1})
 %global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
 
diff --git a/sources b/sources
index ef9f434..8ec4aca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v2.197.0.tar.gz) = 2e0ef73206be5193cbd073d8e5a63cd62fc0f22be98fed73e45b424d062588182cfdb34af95d1b152a2626afcbef57443a6a0c248bd0e6d17a730268dc09e2be
+SHA512 (v2.198.0.tar.gz) = 33b4cf3a550894e4157098d24784474309dc8e65702bb15d735fa6899d7662d1077067dfed85e045037971cef8c2d3172d93ecd4efedbbdbaf8e56c5e93d8e14

From aef3a8a009f85f54258327035f57fd6baa1b3307 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Tue, 31 Jan 2023 17:33:18 +0530
Subject: [PATCH 05/30] bump to v2.199.0

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
(cherry picked from commit 9e01c83a26dbf1f67bfd31da87c38d146f830cf4)
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 .gitignore             | 1 +
 container-selinux.spec | 2 +-
 sources                | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 46109be..a2cd6e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -195,3 +195,4 @@
 /v2.195.1.tar.gz
 /v2.197.0.tar.gz
 /v2.198.0.tar.gz
+/v2.199.0.tar.gz
diff --git a/container-selinux.spec b/container-selinux.spec
index 6f0543c..b11b646 100644
--- a/container-selinux.spec
+++ b/container-selinux.spec
@@ -3,7 +3,7 @@
 # container-selinux
 %global git0 https://github.com/containers/container-selinux
 
-%global built_tag v2.198.0
+%global built_tag v2.199.0
 %global built_tag_strip %(b=%{built_tag}; echo ${b:1})
 %global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
 
diff --git a/sources b/sources
index 8ec4aca..750ae14 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v2.198.0.tar.gz) = 33b4cf3a550894e4157098d24784474309dc8e65702bb15d735fa6899d7662d1077067dfed85e045037971cef8c2d3172d93ecd4efedbbdbaf8e56c5e93d8e14
+SHA512 (v2.199.0.tar.gz) = 28fd8f66d01fb4398f5df42432dca4c08123cd0cd9196d2f7deb30a095dd777a7285f067a508ec7faa7d1f3a72ae6939891b26d823c7c286586a36fa8a3a4ea2

From cafac4427da60549258725304e32e0d83a05edad Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Wed, 8 Feb 2023 18:42:43 +0530
Subject: [PATCH 06/30] bump to v2.200.0

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
(cherry picked from commit 24761d467feaa921c9150be25951d661c4ead1ca)
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 .gitignore             | 1 +
 container-selinux.spec | 6 +++++-
 sources                | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index a2cd6e8..e860c9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -196,3 +196,4 @@
 /v2.197.0.tar.gz
 /v2.198.0.tar.gz
 /v2.199.0.tar.gz
+/v2.200.0.tar.gz
diff --git a/container-selinux.spec b/container-selinux.spec
index b11b646..f7b71cf 100644
--- a/container-selinux.spec
+++ b/container-selinux.spec
@@ -3,7 +3,7 @@
 # container-selinux
 %global git0 https://github.com/containers/container-selinux
 
-%global built_tag v2.199.0
+%global built_tag v2.200.0
 %global built_tag_strip %(b=%{built_tag}; echo ${b:1})
 %global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
 
@@ -51,6 +51,10 @@ SELinux policy modules for use with container runtimes.
 
 %prep
 %autosetup -Sgit %{name}-%{built_tag_strip}
+# https://github.com/containers/container-selinux/issues/203
+%if 0%{?fedora} <= 37
+sed -i '/user_namespace/d' container.te
+%endif
 
 %build
 make
diff --git a/sources b/sources
index 750ae14..c13e8d1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v2.199.0.tar.gz) = 28fd8f66d01fb4398f5df42432dca4c08123cd0cd9196d2f7deb30a095dd777a7285f067a508ec7faa7d1f3a72ae6939891b26d823c7c286586a36fa8a3a4ea2
+SHA512 (v2.200.0.tar.gz) = a681067e88552831de652dd74412e407b52b941dd769936cb5f9666a53837256d253c15916f1287c68f7c2693694904db42986582fa4a8487102e4332e592a2f

From 4f6088c2511213153f90d8e3bd5575b6525d5260 Mon Sep 17 00:00:00 2001
From: RH Container Bot <rhcontainerbot@fedoraproject.org>
Date: Wed, 22 Feb 2023 20:00:53 +0000
Subject: [PATCH 07/30] auto bump to v2.201.0

(cherry picked from commit f405e189fc5f1e6f4d553c1689989cec7da0f6b9)
---
 .gitignore             | 1 +
 container-selinux.spec | 2 +-
 sources                | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index e860c9e..92e554e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -197,3 +197,4 @@
 /v2.198.0.tar.gz
 /v2.199.0.tar.gz
 /v2.200.0.tar.gz
+/v2.201.0.tar.gz
diff --git a/container-selinux.spec b/container-selinux.spec
index f7b71cf..8d73a08 100644
--- a/container-selinux.spec
+++ b/container-selinux.spec
@@ -3,7 +3,7 @@
 # container-selinux
 %global git0 https://github.com/containers/container-selinux
 
-%global built_tag v2.200.0
+%global built_tag v2.201.0
 %global built_tag_strip %(b=%{built_tag}; echo ${b:1})
 %global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
 
diff --git a/sources b/sources
index c13e8d1..3bf8fa4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v2.200.0.tar.gz) = a681067e88552831de652dd74412e407b52b941dd769936cb5f9666a53837256d253c15916f1287c68f7c2693694904db42986582fa4a8487102e4332e592a2f
+SHA512 (v2.201.0.tar.gz) = 90e09245ae0252edbf7c43c45de9a6e9fb8ea5b6e382608a29ce8c28736a1c4a8829f19e0f33badf5300af6648f58f545312f7da0be1697192e9df6175b05f77

From b7327a477f154ccd81b6e5b5a09c8c44bb536469 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Mon, 6 Mar 2023 16:36:19 +0530
Subject: [PATCH 08/30] migrated to SPDX license

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
(cherry picked from commit 29543ebdbe4d9519dfb9fa62680e0276787d41b3)
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 container-selinux.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container-selinux.spec b/container-selinux.spec
index 8d73a08..e81eb06 100644
--- a/container-selinux.spec
+++ b/container-selinux.spec
@@ -23,7 +23,7 @@ Name: container-selinux
 Epoch: 2
 Version: %{gen_version}
 Release: %autorelease
-License: GPLv2
+License: GPL-2.0-only
 URL: %{git0}
 Summary: SELinux policies for container runtimes
 Source0: %{git0}/archive/v%{built_tag_strip}.tar.gz

From 5a1db149fda67615fd05883d8aa1a0614cfab450 Mon Sep 17 00:00:00 2001
From: RH Container Bot <rhcontainerbot@fedoraproject.org>
Date: Tue, 7 Mar 2023 15:01:31 +0000
Subject: [PATCH 09/30] auto bump to v2.203.0

(cherry picked from commit 436047e7238fec57a6c2ec9a0e51bdec58c5a157)
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 .gitignore             | 2 ++
 container-selinux.spec | 2 +-
 sources                | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 92e554e..2fde8e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -198,3 +198,5 @@
 /v2.199.0.tar.gz
 /v2.200.0.tar.gz
 /v2.201.0.tar.gz
+/v2.202.0.tar.gz
+/v2.203.0.tar.gz
diff --git a/container-selinux.spec b/container-selinux.spec
index e81eb06..bafb2b3 100644
--- a/container-selinux.spec
+++ b/container-selinux.spec
@@ -3,7 +3,7 @@
 # container-selinux
 %global git0 https://github.com/containers/container-selinux
 
-%global built_tag v2.201.0
+%global built_tag v2.203.0
 %global built_tag_strip %(b=%{built_tag}; echo ${b:1})
 %global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
 
diff --git a/sources b/sources
index 3bf8fa4..34a5f8d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v2.201.0.tar.gz) = 90e09245ae0252edbf7c43c45de9a6e9fb8ea5b6e382608a29ce8c28736a1c4a8829f19e0f33badf5300af6648f58f545312f7da0be1697192e9df6175b05f77
+SHA512 (v2.203.0.tar.gz) = 2b3f575af1078f798338225b1b619c0685399abbff506c9cfe10ebf4994c3e17f5296dc7050c91ab12b2e478bf298f33aaec4c21bb4fa302db5f47f3fdc6b609

From 57f4a437dbb2bc67550542b8deac3707a92fc7f7 Mon Sep 17 00:00:00 2001
From: RH Container Bot <rhcontainerbot@fedoraproject.org>
Date: Mon, 13 Mar 2023 19:01:42 +0000
Subject: [PATCH 10/30] auto bump to v2.204.0

(cherry picked from commit a37491982632620730918271acb0524ee5bbdab6)
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 .gitignore             | 1 +
 container-selinux.spec | 2 +-
 sources                | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2fde8e0..6e3d1d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -200,3 +200,4 @@
 /v2.201.0.tar.gz
 /v2.202.0.tar.gz
 /v2.203.0.tar.gz
+/v2.204.0.tar.gz
diff --git a/container-selinux.spec b/container-selinux.spec
index bafb2b3..e26575e 100644
--- a/container-selinux.spec
+++ b/container-selinux.spec
@@ -3,7 +3,7 @@
 # container-selinux
 %global git0 https://github.com/containers/container-selinux
 
-%global built_tag v2.203.0
+%global built_tag v2.204.0
 %global built_tag_strip %(b=%{built_tag}; echo ${b:1})
 %global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
 
diff --git a/sources b/sources
index 34a5f8d..5444a47 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v2.203.0.tar.gz) = 2b3f575af1078f798338225b1b619c0685399abbff506c9cfe10ebf4994c3e17f5296dc7050c91ab12b2e478bf298f33aaec4c21bb4fa302db5f47f3fdc6b609
+SHA512 (v2.204.0.tar.gz) = 7318826bffd9fbdfa2b339e2686317aa403dc497da66569f1a414b506b2f324535f1f4c4a784f006f6110158740bb3e81cafb1665fe8a864dcb210a16228b602

From 0ce1c3b18a3632ab32ac9cdf3c50ae5d6d9268ae Mon Sep 17 00:00:00 2001
From: RH Container Bot <rhcontainerbot@fedoraproject.org>
Date: Thu, 16 Mar 2023 20:01:06 +0000
Subject: [PATCH 11/30] auto bump to v2.205.0

(cherry picked from commit b30eaa12138a11645cc0dc9546ef67c218347d50)
---
 .gitignore             | 1 +
 container-selinux.spec | 2 +-
 sources                | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6e3d1d0..13febe7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -201,3 +201,4 @@
 /v2.202.0.tar.gz
 /v2.203.0.tar.gz
 /v2.204.0.tar.gz
+/v2.205.0.tar.gz
diff --git a/container-selinux.spec b/container-selinux.spec
index e26575e..bbc7cac 100644
--- a/container-selinux.spec
+++ b/container-selinux.spec
@@ -3,7 +3,7 @@
 # container-selinux
 %global git0 https://github.com/containers/container-selinux
 
-%global built_tag v2.204.0
+%global built_tag v2.205.0
 %global built_tag_strip %(b=%{built_tag}; echo ${b:1})
 %global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
 
diff --git a/sources b/sources
index 5444a47..236868f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v2.204.0.tar.gz) = 7318826bffd9fbdfa2b339e2686317aa403dc497da66569f1a414b506b2f324535f1f4c4a784f006f6110158740bb3e81cafb1665fe8a864dcb210a16228b602
+SHA512 (v2.205.0.tar.gz) = a30ebb584c46d93b62cd53c50d2e8b7e84a98f0a9adb91e16e523ebfad920c61334471a32c0b8f96f3ce06de14e7346b64137b59a3248b4e5ea4978acad74948

From 532cad161fd87ea7ac7b3c3fac130a2f911ac09e Mon Sep 17 00:00:00 2001
From: RH Container Bot <rhcontainerbot@fedoraproject.org>
Date: Tue, 21 Mar 2023 22:01:20 +0000
Subject: [PATCH 12/30] auto bump to v2.206.0

(cherry picked from commit e37858fe401e10b8ad4d8caa4aaed5d3bbe2b311)
---
 .gitignore             | 1 +
 container-selinux.spec | 2 +-
 sources                | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 13febe7..cd3ece2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -202,3 +202,4 @@
 /v2.203.0.tar.gz
 /v2.204.0.tar.gz
 /v2.205.0.tar.gz
+/v2.206.0.tar.gz
diff --git a/container-selinux.spec b/container-selinux.spec
index bbc7cac..7fbea93 100644
--- a/container-selinux.spec
+++ b/container-selinux.spec
@@ -3,7 +3,7 @@
 # container-selinux
 %global git0 https://github.com/containers/container-selinux
 
-%global built_tag v2.205.0
+%global built_tag v2.206.0
 %global built_tag_strip %(b=%{built_tag}; echo ${b:1})
 %global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
 
diff --git a/sources b/sources
index 236868f..ec2bd26 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v2.205.0.tar.gz) = a30ebb584c46d93b62cd53c50d2e8b7e84a98f0a9adb91e16e523ebfad920c61334471a32c0b8f96f3ce06de14e7346b64137b59a3248b4e5ea4978acad74948
+SHA512 (v2.206.0.tar.gz) = 3959f10964427476f121f683f3146ef50b1ce6859544d978fd3fb7473ae9fe73dab1b141a9e53f1048ca3c9aff0ba01f1d6bb454b678806749dca50ffcfd080c

From 4b8a9dbc3c59742790b607659dc81f54c9ef025c Mon Sep 17 00:00:00 2001
From: RH Container Bot <rhcontainerbot@fedoraproject.org>
Date: Fri, 31 Mar 2023 20:01:03 +0000
Subject: [PATCH 13/30] auto bump to v2.208.0

(cherry picked from commit a9e375591259343c3da7a6828e43c14ff9852f1c)
---
 .gitignore             | 1 +
 container-selinux.spec | 2 +-
 sources                | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index cd3ece2..5d7442b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -203,3 +203,4 @@
 /v2.204.0.tar.gz
 /v2.205.0.tar.gz
 /v2.206.0.tar.gz
+/v2.208.0.tar.gz
diff --git a/container-selinux.spec b/container-selinux.spec
index 7fbea93..8cc96b2 100644
--- a/container-selinux.spec
+++ b/container-selinux.spec
@@ -3,7 +3,7 @@
 # container-selinux
 %global git0 https://github.com/containers/container-selinux
 
-%global built_tag v2.206.0
+%global built_tag v2.208.0
 %global built_tag_strip %(b=%{built_tag}; echo ${b:1})
 %global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
 
diff --git a/sources b/sources
index ec2bd26..3353eb8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v2.206.0.tar.gz) = 3959f10964427476f121f683f3146ef50b1ce6859544d978fd3fb7473ae9fe73dab1b141a9e53f1048ca3c9aff0ba01f1d6bb454b678806749dca50ffcfd080c
+SHA512 (v2.208.0.tar.gz) = 3612d332b385fb96835a310e10533a96b3c87d441144f80b1097a68913271d0480ba75c0b391f6ab599ca4b869d3331e95b1d5e04090e01917699b5d2e0c8d9a

From 4e41e53dba2148d2a34353504b70281bd2a24e2f Mon Sep 17 00:00:00 2001
From: RH Container Bot <rhcontainerbot@fedoraproject.org>
Date: Mon, 3 Apr 2023 07:02:31 +0000
Subject: [PATCH 14/30] auto bump to v2.209.0

(cherry picked from commit 06867e53d1101cf0da4c066db17344bfdd57925e)
---
 .gitignore             | 1 +
 container-selinux.spec | 2 +-
 sources                | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5d7442b..8b858d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -204,3 +204,4 @@
 /v2.205.0.tar.gz
 /v2.206.0.tar.gz
 /v2.208.0.tar.gz
+/v2.209.0.tar.gz
diff --git a/container-selinux.spec b/container-selinux.spec
index 8cc96b2..e75ad6e 100644
--- a/container-selinux.spec
+++ b/container-selinux.spec
@@ -3,7 +3,7 @@
 # container-selinux
 %global git0 https://github.com/containers/container-selinux
 
-%global built_tag v2.208.0
+%global built_tag v2.209.0
 %global built_tag_strip %(b=%{built_tag}; echo ${b:1})
 %global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
 
diff --git a/sources b/sources
index 3353eb8..00840ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v2.208.0.tar.gz) = 3612d332b385fb96835a310e10533a96b3c87d441144f80b1097a68913271d0480ba75c0b391f6ab599ca4b869d3331e95b1d5e04090e01917699b5d2e0c8d9a
+SHA512 (v2.209.0.tar.gz) = 98215e6ab832b0e9b951c69f9000b5bc8e0f38e4e88c8b702a0b01b0da945a32d9692fe87cc2ebeac4cd224fa37e94ef7c72a280e7ff2c95deedfa44eddb687f

From 099248697ca8cbd0f761d8350286b2ab5c120176 Mon Sep 17 00:00:00 2001
From: RH Container Bot <rhcontainerbot@fedoraproject.org>
Date: Thu, 6 Apr 2023 21:01:05 +0000
Subject: [PATCH 15/30] auto bump to v2.210.0

(cherry picked from commit 5ebc24d7cc1de5a37711b900fa2dc2457132568c)
---
 .gitignore             | 1 +
 container-selinux.spec | 2 +-
 sources                | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8b858d3..f47eb93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -205,3 +205,4 @@
 /v2.206.0.tar.gz
 /v2.208.0.tar.gz
 /v2.209.0.tar.gz
+/v2.210.0.tar.gz
diff --git a/container-selinux.spec b/container-selinux.spec
index e75ad6e..c3ec254 100644
--- a/container-selinux.spec
+++ b/container-selinux.spec
@@ -3,7 +3,7 @@
 # container-selinux
 %global git0 https://github.com/containers/container-selinux
 
-%global built_tag v2.209.0
+%global built_tag v2.210.0
 %global built_tag_strip %(b=%{built_tag}; echo ${b:1})
 %global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
 
diff --git a/sources b/sources
index 00840ea..24940fe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v2.209.0.tar.gz) = 98215e6ab832b0e9b951c69f9000b5bc8e0f38e4e88c8b702a0b01b0da945a32d9692fe87cc2ebeac4cd224fa37e94ef7c72a280e7ff2c95deedfa44eddb687f
+SHA512 (v2.210.0.tar.gz) = e0bc076893028b4cef0d6c48d690b984c5f5c87dcf75b502b91d0905e97db8ce21d5792f3e91d0b19d6991f9a7bba068525033a1e7ad075880a36c6d366b7187

From c1b02375b24fba4d80a176720dcf845d71db093a Mon Sep 17 00:00:00 2001
From: RH Container Bot <rhcontainerbot@fedoraproject.org>
Date: Sat, 22 Apr 2023 12:01:40 +0000
Subject: [PATCH 16/30] auto bump to v2.211.0

(cherry picked from commit 2d04a157867e9b5d46bf06bf1e1a7359da293422)
---
 .gitignore             | 1 +
 container-selinux.spec | 2 +-
 sources                | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index f47eb93..515560e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -206,3 +206,4 @@
 /v2.208.0.tar.gz
 /v2.209.0.tar.gz
 /v2.210.0.tar.gz
+/v2.211.0.tar.gz
diff --git a/container-selinux.spec b/container-selinux.spec
index c3ec254..dcdf37a 100644
--- a/container-selinux.spec
+++ b/container-selinux.spec
@@ -3,7 +3,7 @@
 # container-selinux
 %global git0 https://github.com/containers/container-selinux
 
-%global built_tag v2.210.0
+%global built_tag v2.211.0
 %global built_tag_strip %(b=%{built_tag}; echo ${b:1})
 %global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
 
diff --git a/sources b/sources
index 24940fe..c752430 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v2.210.0.tar.gz) = e0bc076893028b4cef0d6c48d690b984c5f5c87dcf75b502b91d0905e97db8ce21d5792f3e91d0b19d6991f9a7bba068525033a1e7ad075880a36c6d366b7187
+SHA512 (v2.211.0.tar.gz) = 76c795cf51e80a3996ff79d5f29952932c35124c3ed283d1f101c61b02499ea8769d886b99a61e3c8c794ed9729b0151de92b283ef18d7e12f5fd59e5568860a

From 5b8cf75a06f7f62aa1f5c240f4ca4abb23eb3737 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Fri, 28 Apr 2023 14:25:38 -0400
Subject: [PATCH 17/30] prepare for Packit integration, remove centos
 conditionals

(cherry picked from commit 23b10c340b66402759218152a43e04adbc259275)
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 container-selinux.spec | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/container-selinux.spec b/container-selinux.spec
index dcdf37a..6592a46 100644
--- a/container-selinux.spec
+++ b/container-selinux.spec
@@ -3,10 +3,6 @@
 # container-selinux
 %global git0 https://github.com/containers/container-selinux
 
-%global built_tag v2.211.0
-%global built_tag_strip %(b=%{built_tag}; echo ${b:1})
-%global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
-
 # container-selinux stuff (prefix with ds_ for version/release etc.)
 # Some bits borrowed from the openstack-selinux package
 %global selinuxtype targeted
@@ -18,15 +14,14 @@
 # Format must contain '$x' somewhere to do anything useful
 %global _format() export %1=""; for x in %{modulenames}; do %1+=%2; %1+=" "; done;
 
-# Hooked up to autobuilder, please check with @lsm5 before updating
 Name: container-selinux
 Epoch: 2
-Version: %{gen_version}
+Version: 2.211.0
 Release: %autorelease
 License: GPL-2.0-only
 URL: %{git0}
 Summary: SELinux policies for container runtimes
-Source0: %{git0}/archive/v%{built_tag_strip}.tar.gz
+Source0: %{git0}/archive/v%{version}.tar.gz
 BuildArch: noarch
 BuildRequires: make
 BuildRequires: git-core

From cf6c8412318efa340950dca74b22dfebbc9d3ff6 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Tue, 2 May 2023 10:30:32 -0400
Subject: [PATCH 18/30] bump to v2.211.1

Should address relabeling issues mentioned in:
https://bodhi.fedoraproject.org/updates/FEDORA-2023-06ac069828

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
(cherry picked from commit 8bff9a525154955a3d8efda5a6a358ff36898bae)
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 .gitignore             | 1 +
 container-selinux.spec | 2 +-
 sources                | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 515560e..bed9bb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -207,3 +207,4 @@
 /v2.209.0.tar.gz
 /v2.210.0.tar.gz
 /v2.211.0.tar.gz
+/v2.211.1.tar.gz
diff --git a/container-selinux.spec b/container-selinux.spec
index 6592a46..564cc18 100644
--- a/container-selinux.spec
+++ b/container-selinux.spec
@@ -16,7 +16,7 @@
 
 Name: container-selinux
 Epoch: 2
-Version: 2.211.0
+Version: 2.211.1
 Release: %autorelease
 License: GPL-2.0-only
 URL: %{git0}
diff --git a/sources b/sources
index c752430..8ab7d2a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v2.211.0.tar.gz) = 76c795cf51e80a3996ff79d5f29952932c35124c3ed283d1f101c61b02499ea8769d886b99a61e3c8c794ed9729b0151de92b283ef18d7e12f5fd59e5568860a
+SHA512 (v2.211.1.tar.gz) = 1708e6978905261d2fb03cd44da57761c3d813811ceb8af54a2615af50c2950c99fc62c7a38786af612be91de46abb27fc4b40c0cf116f2a3cef0b3a3944f8fa

From d883955c4528e487a0a997fa1c38688c5cfac9aa Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Tue, 16 May 2023 09:21:55 -0400
Subject: [PATCH 19/30] bump to v2.213.0

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
(cherry picked from commit e5568c55a3835ddb7b47506cb48e2207dfb96bb0)
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 .gitignore             | 1 +
 container-selinux.spec | 2 +-
 sources                | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index bed9bb1..4733626 100644
--- a/.gitignore
+++ b/.gitignore
@@ -208,3 +208,4 @@
 /v2.210.0.tar.gz
 /v2.211.0.tar.gz
 /v2.211.1.tar.gz
+/v2.213.0.tar.gz
diff --git a/container-selinux.spec b/container-selinux.spec
index 564cc18..0b9e76e 100644
--- a/container-selinux.spec
+++ b/container-selinux.spec
@@ -16,7 +16,7 @@
 
 Name: container-selinux
 Epoch: 2
-Version: 2.211.1
+Version: 2.213.0
 Release: %autorelease
 License: GPL-2.0-only
 URL: %{git0}
diff --git a/sources b/sources
index 8ab7d2a..8920a6c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v2.211.1.tar.gz) = 1708e6978905261d2fb03cd44da57761c3d813811ceb8af54a2615af50c2950c99fc62c7a38786af612be91de46abb27fc4b40c0cf116f2a3cef0b3a3944f8fa
+SHA512 (v2.213.0.tar.gz) = 5973b104b99dbadf8d935f241c70a570efc27a1858c035fc343f4ed6a234cd083da1e5a6281e04902bc8fe5997f2bfefe58d698c9225a82353a0f3d57b30933b

From f6623a978079b51e8390bea41d263140938593cd Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Mon, 22 May 2023 15:47:33 +0000
Subject: [PATCH 20/30] [packit] 2.215.0 upstream release

Upstream tag: v2.215.0
Upstream commit: 730f696f
---
 .gitignore             |  1 +
 .packit.yaml           | 86 ++++++++++++++++++++++++++++++++++++++++++
 README.packit          |  3 ++
 container-selinux.spec | 74 ++++++++++++++++++++++++++----------
 sources                |  2 +-
 5 files changed, 146 insertions(+), 20 deletions(-)
 create mode 100644 .packit.yaml
 create mode 100644 README.packit

diff --git a/.gitignore b/.gitignore
index 4733626..aaed0c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -209,3 +209,4 @@
 /v2.211.0.tar.gz
 /v2.211.1.tar.gz
 /v2.213.0.tar.gz
+/v2.215.0.tar.gz
diff --git a/.packit.yaml b/.packit.yaml
new file mode 100644
index 0000000..d49f936
--- /dev/null
+++ b/.packit.yaml
@@ -0,0 +1,86 @@
+---
+# See the documentation for more information:
+# https://packit.dev/docs/configuration/
+
+# Build targets can be found at:
+# https://copr.fedorainfracloud.org/coprs/rhcontainerbot/packit-builds/
+
+specfile_path: rpm/container-selinux.spec
+upstream_tag_template: v{version}
+
+jobs:
+  - &copr
+    job: copr_build
+    # Run on every PR
+    trigger: pull_request
+    owner: rhcontainerbot
+    project: packit-builds
+    enable_net: true
+    # x86_64 is assumed by default
+    # container-selinux is noarch so we only need to test on one arch
+    targets: &pr_copr_targets
+      - fedora-rawhide
+      - fedora-38
+      - fedora-37
+      - centos-stream-9
+      - centos-stream-8
+    srpm_build_deps:
+      - make
+      - rpkg
+    actions:
+      fix-spec-file:
+        - bash .packit.sh
+
+  - <<: *copr
+    # Run on commit to main branch
+    trigger: commit
+    branch: main
+    project: podman-next
+    targets:
+      - fedora-rawhide-aarch64
+      - fedora-rawhide-ppc64le
+      - fedora-rawhide-s390x
+      - fedora-rawhide-x86_64
+      - fedora-38-aarch64
+      - fedora-38-ppc64le
+      - fedora-38-s390x
+      - fedora-38-x86_64
+      - fedora-37-aarch64
+      - fedora-37-ppc64le
+      - fedora-37-s390x
+      - fedora-37-x86_64
+      - centos-stream+epel-next-9-aarch64
+      - centos-stream+epel-next-9-ppc64le
+      - centos-stream+epel-next-9-s390x
+      - centos-stream+epel-next-9-x86_64
+
+  # All tests specified in the `/plans/` subdir
+  # FIXME: uncomment e2e tests after disk space issues resolved on testing farm
+  #- job: tests
+  #  trigger: pull_request
+  #  targets: *test_targets
+  #  identifier: podman_e2e_test
+  #  tmt_plan: "/plans/podman_e2e_test"
+
+  - job: tests
+    trigger: pull_request
+    # arch assumed to be x86_64 by default.
+    targets: *pr_copr_targets
+    identifier: podman_system_test
+    tmt_plan: "/plans/podman_system_test"
+
+  - job: propose_downstream
+    trigger: release
+    update_release: false
+    dist_git_branches:
+      - fedora-all
+
+  - job: koji_build
+    trigger: commit
+    dist_git_branches:
+      - fedora-all
+
+  - job: bodhi_update
+    trigger: commit
+    dist_git_branches:
+      - fedora-branched # rawhide updates are created automatically
diff --git a/README.packit b/README.packit
new file mode 100644
index 0000000..03c3f50
--- /dev/null
+++ b/README.packit
@@ -0,0 +1,3 @@
+This repository is maintained by packit.
+https://packit.dev/
+The file was generated using packit 0.75.0.post16+g33d32c7.
diff --git a/container-selinux.spec b/container-selinux.spec
index 0b9e76e..48fcfc5 100644
--- a/container-selinux.spec
+++ b/container-selinux.spec
@@ -1,6 +1,6 @@
-%global debug_package   %{nil}
+%global debug_package %{nil}
 
-# container-selinux
+# container-selinux upstream
 %global git0 https://github.com/containers/container-selinux
 
 # container-selinux stuff (prefix with ds_ for version/release etc.)
@@ -14,9 +14,40 @@
 # Format must contain '$x' somewhere to do anything useful
 %global _format() export %1=""; for x in %{modulenames}; do %1+=%2; %1+=" "; done;
 
+# copr_username is only set on copr environments, not on others like koji
+%if "%{?copr_username}" != "rhcontainerbot"
+%bcond_with copr
+%else
+%bcond_without copr
+%endif
+
+# RHEL 8 doesn't allow watch and systemd_chat_resolved
+%if 0%{?rhel} == 8
+%bcond_without no_watch
+%bcond_without no_systemd_chat_resolved
+%else
+%bcond_with no_watch
+%bcond_with no_systemd_chat_resolved
+%endif
+
+# https://github.com/containers/container-selinux/issues/203
+%if 0%{?fedora} <= 37 || 0%{?rhel} <= 9
+%bcond_without no_user_namespace
+%else
+%bcond_with no_user_namespace
+%endif
+
 Name: container-selinux
+# Set different Epochs for copr and koji
+%if %{with copr}
+Epoch: 101
+%else
 Epoch: 2
-Version: 2.213.0
+%endif
+# Keep Version in upstream specfile at 0. It will be automatically set
+# to the correct value by Packit for copr and koji builds.
+# IGNORE this comment if you're looking at it in dist-git.
+Version: 2.215.0
 Release: %autorelease
 License: GPL-2.0-only
 URL: %{git0}
@@ -45,9 +76,22 @@ Conflicts: k3s-selinux <= 0.4-1
 SELinux policy modules for use with container runtimes.
 
 %prep
-%autosetup -Sgit %{name}-%{built_tag_strip}
-# https://github.com/containers/container-selinux/issues/203
-%if 0%{?fedora} <= 37
+%autosetup -Sgit %{name}-%{version}
+
+sed -i 's/^man: install-policy/man:/' Makefile
+sed -i 's/^install: man/install:/' Makefile
+
+%if %{with no_watch}
+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
+%endif
+
+%if %{with no_systemd_chat_resolved}
+sed -i '/^systemd_chat_resolved/d' container.te
+%endif
+
+%if %{with no_user_namespace}
 sed -i '/user_namespace/d' container.te
 %endif
 
@@ -57,16 +101,7 @@ make
 %install
 # install policy modules
 %_format MODULES $x.pp.bz2
-install -d %{buildroot}%{_datadir}/selinux/packages
-install -d -p %{buildroot}%{_datadir}/selinux/devel/include/services
-install -p -m 644 container.if %{buildroot}%{_datadir}/selinux/devel/include/services
-install -m 0644 $MODULES %{buildroot}%{_datadir}/selinux/packages
-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
-
-%check
+%{__make} DATADIR=%{buildroot}%{_datadir} SYSCONFDIR=%{buildroot}%{_sysconfdir} install install.udica-templates install.selinux-user
 
 %pre
 %selinux_relabel_pre -s %{selinuxtype}
@@ -82,7 +117,7 @@ fi
 %{_sbindir}/semodule -n -s %{selinuxtype} -d gear 2> /dev/null
 %selinux_modules_install -s %{selinuxtype} $MODULES
 . %{_sysconfdir}/selinux/config
-sed -e "\|container_file_t|h; \${x;s|container_file_t||;{g;t};a\\" -e "container_file_t" -e "}" -i /etc/selinux/${SELINUXTYPE}/contexts/customizable_types 
+sed -e "\|container_file_t|h; \${x;s|container_file_t||;{g;t};a\\" -e "container_file_t" -e "}" -i /etc/selinux/${SELINUXTYPE}/contexts/customizable_types
 matchpathcon -qV %{_sharedstatedir}/containers || restorecon -R %{_sharedstatedir}/containers &> /dev/null || :
 
 %postun
@@ -103,8 +138,9 @@ fi
 %{_datadir}/containers/selinux/contexts
 %dir %{_datadir}/udica/templates/
 %{_datadir}/udica/templates/*
-# Currently shipped in selinux-policy-doc
-#%%{_datadir}/man/man8/container_selinux.8.gz
+%{_mandir}/man8/container_selinux.8.gz
+%{_sysconfdir}/selinux/targeted/contexts/users/*
+%ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{modulenames}
 
 %triggerpostun -- container-selinux < 2:2.162.1-3
 if %{_sbindir}/selinuxenabled ; then
diff --git a/sources b/sources
index 8920a6c..20ec8ae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v2.213.0.tar.gz) = 5973b104b99dbadf8d935f241c70a570efc27a1858c035fc343f4ed6a234cd083da1e5a6281e04902bc8fe5997f2bfefe58d698c9225a82353a0f3d57b30933b
+SHA512 (v2.215.0.tar.gz) = b6a756169bb0c9da8332d4913471cc72fb82c3cd7d8b919dd8a8b7527d2375773bcf553bc5e53ba7ee3f01539334864348b081eeae4362611355d454c869e7d9

From 6ab851cd1a3cbcd46e3b060267c555407e55bff3 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Tue, 23 May 2023 09:22:04 -0400
Subject: [PATCH 21/30] [packit] 2.215.0 upstream release

Upstream tag: v2.215.0
Upstream commit: e16876ee
---
 README.packit          | 2 +-
 container-selinux.spec | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.packit b/README.packit
index 03c3f50..83c84ce 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.75.0.post16+g33d32c7.
+The file was generated using packit 0.75.0.
diff --git a/container-selinux.spec b/container-selinux.spec
index 48fcfc5..bc1092c 100644
--- a/container-selinux.spec
+++ b/container-selinux.spec
@@ -103,6 +103,9 @@ make
 %_format MODULES $x.pp.bz2
 %{__make} DATADIR=%{buildroot}%{_datadir} SYSCONFDIR=%{buildroot}%{_sysconfdir} install install.udica-templates install.selinux-user
 
+# Ref: https://bugzilla.redhat.com/show_bug.cgi?id=2209120
+rm %{buildroot}%{_mandir}/man8/container_selinux.8
+
 %pre
 %selinux_relabel_pre -s %{selinuxtype}
 
@@ -138,7 +141,8 @@ fi
 %{_datadir}/containers/selinux/contexts
 %dir %{_datadir}/udica/templates/
 %{_datadir}/udica/templates/*
-%{_mandir}/man8/container_selinux.8.gz
+# Ref: https://bugzilla.redhat.com/show_bug.cgi?id=2209120
+#%%{_mandir}/man8/container_selinux.8.gz
 %{_sysconfdir}/selinux/targeted/contexts/users/*
 %ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{modulenames}
 

From 2ca50f13033de0fb3c48e342ed08e4f29f9b5e7d Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Tue, 30 May 2023 19:11:34 +0000
Subject: [PATCH 22/30] [packit] 2.216.0 upstream release

Upstream tag: v2.216.0
Upstream commit: a1a96a2e
---
 .gitignore             | 1 +
 README.packit          | 2 +-
 container-selinux.spec | 2 +-
 sources                | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index aaed0c6..071ebdf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -210,3 +210,4 @@
 /v2.211.1.tar.gz
 /v2.213.0.tar.gz
 /v2.215.0.tar.gz
+/v2.216.0.tar.gz
diff --git a/README.packit b/README.packit
index 83c84ce..01582f6 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.75.0.
+The file was generated using packit 0.76.0.
diff --git a/container-selinux.spec b/container-selinux.spec
index bc1092c..f660d54 100644
--- a/container-selinux.spec
+++ b/container-selinux.spec
@@ -47,7 +47,7 @@ Epoch: 2
 # Keep Version in upstream specfile at 0. It will be automatically set
 # to the correct value by Packit for copr and koji builds.
 # IGNORE this comment if you're looking at it in dist-git.
-Version: 2.215.0
+Version: 2.216.0
 Release: %autorelease
 License: GPL-2.0-only
 URL: %{git0}
diff --git a/sources b/sources
index 20ec8ae..1178355 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v2.215.0.tar.gz) = b6a756169bb0c9da8332d4913471cc72fb82c3cd7d8b919dd8a8b7527d2375773bcf553bc5e53ba7ee3f01539334864348b081eeae4362611355d454c869e7d9
+SHA512 (v2.216.0.tar.gz) = 444497b0dbb41b4b3534a08f37ae861fd31300b6add9380e7df9519b248b5527342ff66956a455a47630c9e174def5ce4fb34fffcf3fc0c522cd25b153b1ba40

From a26196c36c2a1a88f7ee8b179a2e55a886f5679f Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Mon, 5 Jun 2023 18:29:57 +0000
Subject: [PATCH 23/30] [packit] 2.217.0 upstream release

Upstream tag: v2.217.0
Upstream commit: 2e448062
---
 .gitignore             | 1 +
 container-selinux.spec | 2 +-
 sources                | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 071ebdf..d272ada 100644
--- a/.gitignore
+++ b/.gitignore
@@ -211,3 +211,4 @@
 /v2.213.0.tar.gz
 /v2.215.0.tar.gz
 /v2.216.0.tar.gz
+/v2.217.0.tar.gz
diff --git a/container-selinux.spec b/container-selinux.spec
index f660d54..54d960c 100644
--- a/container-selinux.spec
+++ b/container-selinux.spec
@@ -47,7 +47,7 @@ Epoch: 2
 # Keep Version in upstream specfile at 0. It will be automatically set
 # to the correct value by Packit for copr and koji builds.
 # IGNORE this comment if you're looking at it in dist-git.
-Version: 2.216.0
+Version: 2.217.0
 Release: %autorelease
 License: GPL-2.0-only
 URL: %{git0}
diff --git a/sources b/sources
index 1178355..17c50fa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v2.216.0.tar.gz) = 444497b0dbb41b4b3534a08f37ae861fd31300b6add9380e7df9519b248b5527342ff66956a455a47630c9e174def5ce4fb34fffcf3fc0c522cd25b153b1ba40
+SHA512 (v2.217.0.tar.gz) = 69bf61a04800f970b216994a4b579e4755ace2cc75f1444664c634fa3b9f7fa75faa5f018acf81b3d4ac7ddfc16e395f62a0bbfb11ad4b8961f11fd45e9f5c19

From b57a8dba7b4f4ead46b475d8c3f693f2ce132ea8 Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Tue, 6 Jun 2023 15:25:28 +0000
Subject: [PATCH 24/30] [packit] 2.218.0 upstream release

Upstream tag: v2.218.0
Upstream commit: 08662f13
---
 .gitignore             | 1 +
 README.packit          | 2 +-
 container-selinux.spec | 2 +-
 sources                | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index d272ada..84f65ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -212,3 +212,4 @@
 /v2.215.0.tar.gz
 /v2.216.0.tar.gz
 /v2.217.0.tar.gz
+/v2.218.0.tar.gz
diff --git a/README.packit b/README.packit
index 01582f6..b25e4da 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.76.0.
+The file was generated using packit 0.76.0.post2+gbdab6df.
diff --git a/container-selinux.spec b/container-selinux.spec
index 54d960c..f76e6b1 100644
--- a/container-selinux.spec
+++ b/container-selinux.spec
@@ -47,7 +47,7 @@ Epoch: 2
 # Keep Version in upstream specfile at 0. It will be automatically set
 # to the correct value by Packit for copr and koji builds.
 # IGNORE this comment if you're looking at it in dist-git.
-Version: 2.217.0
+Version: 2.218.0
 Release: %autorelease
 License: GPL-2.0-only
 URL: %{git0}
diff --git a/sources b/sources
index 17c50fa..3fb48db 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v2.217.0.tar.gz) = 69bf61a04800f970b216994a4b579e4755ace2cc75f1444664c634fa3b9f7fa75faa5f018acf81b3d4ac7ddfc16e395f62a0bbfb11ad4b8961f11fd45e9f5c19
+SHA512 (v2.218.0.tar.gz) = 93ff44d54ee0970eccfdacf9d7cf8b4aa5efe172995d72772e48ae5317f0eb28c1fddfdf3b9bd0c3c47014b978a28060e665e2459b0dda539f58e4338e9587a8

From bf6a81d7d1e18de3d01c28c1ab74e66e14a94ace Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Sun, 2 Jul 2023 11:27:55 +0000
Subject: [PATCH 25/30] [packit] 2.219.0 upstream release

Upstream tag: v2.219.0
Upstream commit: e3d7d0b1
---
 .gitignore             |  1 +
 .packit.yaml           | 24 +++++-------------------
 README.packit          |  2 +-
 container-selinux.spec | 42 ++++++++++++++----------------------------
 sources                |  2 +-
 5 files changed, 22 insertions(+), 49 deletions(-)

diff --git a/.gitignore b/.gitignore
index 84f65ac..ec73296 100644
--- a/.gitignore
+++ b/.gitignore
@@ -213,3 +213,4 @@
 /v2.216.0.tar.gz
 /v2.217.0.tar.gz
 /v2.218.0.tar.gz
+/v2.219.0.tar.gz
diff --git a/.packit.yaml b/.packit.yaml
index d49f936..e5121fc 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -19,17 +19,11 @@ jobs:
     # x86_64 is assumed by default
     # container-selinux is noarch so we only need to test on one arch
     targets: &pr_copr_targets
-      - fedora-rawhide
-      - fedora-38
-      - fedora-37
+      - fedora-all
       - centos-stream-9
       - centos-stream-8
     srpm_build_deps:
       - make
-      - rpkg
-    actions:
-      fix-spec-file:
-        - bash .packit.sh
 
   - <<: *copr
     # Run on commit to main branch
@@ -37,18 +31,10 @@ jobs:
     branch: main
     project: podman-next
     targets:
-      - fedora-rawhide-aarch64
-      - fedora-rawhide-ppc64le
-      - fedora-rawhide-s390x
-      - fedora-rawhide-x86_64
-      - fedora-38-aarch64
-      - fedora-38-ppc64le
-      - fedora-38-s390x
-      - fedora-38-x86_64
-      - fedora-37-aarch64
-      - fedora-37-ppc64le
-      - fedora-37-s390x
-      - fedora-37-x86_64
+      - fedora-all-aarch64
+      - fedora-all-ppc64le
+      - fedora-all-s390x
+      - fedora-all-x86_64
       - centos-stream+epel-next-9-aarch64
       - centos-stream+epel-next-9-ppc64le
       - centos-stream+epel-next-9-s390x
diff --git a/README.packit b/README.packit
index b25e4da..101115f 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.76.0.post2+gbdab6df.
+The file was generated using packit 0.77.0.post2+g06f877b.
diff --git a/container-selinux.spec b/container-selinux.spec
index f76e6b1..bc2580c 100644
--- a/container-selinux.spec
+++ b/container-selinux.spec
@@ -1,8 +1,5 @@
 %global debug_package %{nil}
 
-# container-selinux upstream
-%global git0 https://github.com/containers/container-selinux
-
 # container-selinux stuff (prefix with ds_ for version/release etc.)
 # Some bits borrowed from the openstack-selinux package
 %global selinuxtype targeted
@@ -14,45 +11,34 @@
 # Format must contain '$x' somewhere to do anything useful
 %global _format() export %1=""; for x in %{modulenames}; do %1+=%2; %1+=" "; done;
 
-# copr_username is only set on copr environments, not on others like koji
-%if "%{?copr_username}" != "rhcontainerbot"
-%bcond_with copr
-%else
-%bcond_without copr
-%endif
-
 # RHEL 8 doesn't allow watch and systemd_chat_resolved
-%if 0%{?rhel} == 8
-%bcond_without no_watch
-%bcond_without no_systemd_chat_resolved
-%else
-%bcond_with no_watch
-%bcond_with no_systemd_chat_resolved
+%if %{defined rhel} && 0%{?rhel} == 8
+%define no_watch 1
+%define no_systemd_chat_resolved 1
+%global _selinux_policy_version 3.14.3-80.el8
 %endif
 
 # https://github.com/containers/container-selinux/issues/203
-%if 0%{?fedora} <= 37 || 0%{?rhel} <= 9
-%bcond_without no_user_namespace
-%else
-%bcond_with no_user_namespace
+%if %{!defined fedora} && %{!defined rhel} || %{defined fedora} && 0%{?fedora} <= 37 || %{defined rhel} && 0%{?rhel} <= 9
+%define no_user_namespace 1
 %endif
 
 Name: container-selinux
 # Set different Epochs for copr and koji
-%if %{with copr}
-Epoch: 101
+%if %{defined copr_username}
+Epoch: 102
 %else
 Epoch: 2
 %endif
 # Keep Version in upstream specfile at 0. It will be automatically set
 # to the correct value by Packit for copr and koji builds.
 # IGNORE this comment if you're looking at it in dist-git.
-Version: 2.218.0
+Version: 2.219.0
 Release: %autorelease
 License: GPL-2.0-only
-URL: %{git0}
+URL: https://github.com/containers/%{name}
 Summary: SELinux policies for container runtimes
-Source0: %{git0}/archive/v%{version}.tar.gz
+Source0: %{url}/archive/v%{version}.tar.gz
 BuildArch: noarch
 BuildRequires: make
 BuildRequires: git-core
@@ -81,17 +67,17 @@ SELinux policy modules for use with container runtimes.
 sed -i 's/^man: install-policy/man:/' Makefile
 sed -i 's/^install: man/install:/' Makefile
 
-%if %{with no_watch}
+%if %{defined no_watch}
 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
 %endif
 
-%if %{with no_systemd_chat_resolved}
+%if %{defined no_systemd_chat_resolved}
 sed -i '/^systemd_chat_resolved/d' container.te
 %endif
 
-%if %{with no_user_namespace}
+%if %{defined no_user_namespace}
 sed -i '/user_namespace/d' container.te
 %endif
 
diff --git a/sources b/sources
index 3fb48db..f62b444 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v2.218.0.tar.gz) = 93ff44d54ee0970eccfdacf9d7cf8b4aa5efe172995d72772e48ae5317f0eb28c1fddfdf3b9bd0c3c47014b978a28060e665e2459b0dda539f58e4338e9587a8
+SHA512 (v2.219.0.tar.gz) = 469987579a645b1b7df843e2f3e11b74c798ebe0774cc021f6aa24e4c365c2eb65397ad918f89a0734119dcb803ddac622b1420a998bd3d1e34b7dd3c13e8cc3

From 2f5095544ce9fc7680b0b172b2a9a276080ffcc4 Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Mon, 14 Aug 2023 17:40:01 +0000
Subject: [PATCH 26/30] 2.221 upstream release
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Upstream tag: v2.221
Upstream commit: ed30ab0d

If you need to do any change in this pull request, you need to locally fetch the source branch of it and push it (with a fix) to your fork (as it is not possible to push to the branch created in the Packit’s fork):
```
git fetch https://src.fedoraproject.org/forks/packit/rpms/container-selinux.git refs/heads/*:refs/remotes/packit/*
git checkout packit/2.221-rawhide-update-propose_downstream
```

(cherry picked from commit 507a53d1e9c2341c1b3d16dacb00aade052fa840)
---
 .gitignore             |  1 +
 .packit.yaml           | 30 ++++++++----------------------
 README.packit          |  2 +-
 container-selinux.spec |  2 +-
 sources                |  2 +-
 5 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/.gitignore b/.gitignore
index ec73296..7ddca38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -214,3 +214,4 @@
 /v2.217.0.tar.gz
 /v2.218.0.tar.gz
 /v2.219.0.tar.gz
+/v2.221.tar.gz
diff --git a/.packit.yaml b/.packit.yaml
index e5121fc..b4167a5 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -2,43 +2,29 @@
 # See the documentation for more information:
 # https://packit.dev/docs/configuration/
 
-# Build targets can be found at:
-# https://copr.fedorainfracloud.org/coprs/rhcontainerbot/packit-builds/
-
 specfile_path: rpm/container-selinux.spec
 upstream_tag_template: v{version}
 
+srpm_build_deps:
+  - make
+
 jobs:
-  - &copr
-    job: copr_build
-    # Run on every PR
+  - job: copr_build
     trigger: pull_request
-    owner: rhcontainerbot
-    project: packit-builds
     enable_net: true
-    # x86_64 is assumed by default
     # container-selinux is noarch so we only need to test on one arch
     targets: &pr_copr_targets
       - fedora-all
       - centos-stream-9
       - centos-stream-8
-    srpm_build_deps:
-      - make
 
-  - <<: *copr
-    # Run on commit to main branch
+  # Run on commit to main branch
+  - job: copr_build
     trigger: commit
     branch: main
+    owner: rhcontainerbot
     project: podman-next
-    targets:
-      - fedora-all-aarch64
-      - fedora-all-ppc64le
-      - fedora-all-s390x
-      - fedora-all-x86_64
-      - centos-stream+epel-next-9-aarch64
-      - centos-stream+epel-next-9-ppc64le
-      - centos-stream+epel-next-9-s390x
-      - centos-stream+epel-next-9-x86_64
+    enable_net: true
 
   # All tests specified in the `/plans/` subdir
   # FIXME: uncomment e2e tests after disk space issues resolved on testing farm
diff --git a/README.packit b/README.packit
index 101115f..d7c433c 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.77.0.post2+g06f877b.
+The file was generated using packit 0.78.2.post2+g81828af.
diff --git a/container-selinux.spec b/container-selinux.spec
index bc2580c..e08e6b1 100644
--- a/container-selinux.spec
+++ b/container-selinux.spec
@@ -33,7 +33,7 @@ Epoch: 2
 # Keep Version in upstream specfile at 0. It will be automatically set
 # to the correct value by Packit for copr and koji builds.
 # IGNORE this comment if you're looking at it in dist-git.
-Version: 2.219.0
+Version: 2.221
 Release: %autorelease
 License: GPL-2.0-only
 URL: https://github.com/containers/%{name}
diff --git a/sources b/sources
index f62b444..a950989 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v2.219.0.tar.gz) = 469987579a645b1b7df843e2f3e11b74c798ebe0774cc021f6aa24e4c365c2eb65397ad918f89a0734119dcb803ddac622b1420a998bd3d1e34b7dd3c13e8cc3
+SHA512 (v2.221.tar.gz) = bc00af81076bc1ab468f67dfcb9affff7d335c613d5a859637b0d6d63d42fd86e93057ac84e1549d3d41c787b24e36f194880c04e5e29c5bf6b7ed0004cf1074

From bec82d6e4cf6b4593cfe36c184796e4dcaa943cc Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Tue, 15 Aug 2023 09:19:54 -0400
Subject: [PATCH 27/30] bump to v2.221.0

(cherry picked from commit 813175eff445ebe89b3730223bc2523334f031d7)
---
 .gitignore             | 1 +
 container-selinux.spec | 2 +-
 sources                | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7ddca38..5e1ef4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -215,3 +215,4 @@
 /v2.218.0.tar.gz
 /v2.219.0.tar.gz
 /v2.221.tar.gz
+/v2.221.0.tar.gz
diff --git a/container-selinux.spec b/container-selinux.spec
index e08e6b1..6eeab50 100644
--- a/container-selinux.spec
+++ b/container-selinux.spec
@@ -33,7 +33,7 @@ Epoch: 2
 # Keep Version in upstream specfile at 0. It will be automatically set
 # to the correct value by Packit for copr and koji builds.
 # IGNORE this comment if you're looking at it in dist-git.
-Version: 2.221
+Version: 2.221.0
 Release: %autorelease
 License: GPL-2.0-only
 URL: https://github.com/containers/%{name}
diff --git a/sources b/sources
index a950989..38029d7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v2.221.tar.gz) = bc00af81076bc1ab468f67dfcb9affff7d335c613d5a859637b0d6d63d42fd86e93057ac84e1549d3d41c787b24e36f194880c04e5e29c5bf6b7ed0004cf1074
+SHA512 (v2.221.0.tar.gz) = 71e4bbc1507f9d04dd78c5881814c57b2138ed91ff474f0ce6db5da5e14ce848d7fe41952284b3525fb222eaf364dcc84efbb2f7641d78ac9abf5343e481be5d

From ee006fd02088af8ab7134227763de0c03b741a91 Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Tue, 29 Aug 2023 21:06:14 +0000
Subject: [PATCH 28/30] [packit] 2.221.1 upstream release
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Upstream tag: v2.221.1
Upstream commit: bfb44d38

If you need to do any change in this pull request, you need to locally fetch the source branch of it and push it (with a fix) to your fork (as it is not possible to push to the branch created in the Packit’s fork):
```
git fetch https://src.fedoraproject.org/forks/packit/rpms/container-selinux.git refs/heads/*:refs/remotes/packit/*
git checkout packit/2.221.1-f37-update-propose_downstream
```
---
 .gitignore             | 1 +
 README.packit          | 2 +-
 container-selinux.spec | 2 +-
 sources                | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5e1ef4b..4d18507 100644
--- a/.gitignore
+++ b/.gitignore
@@ -216,3 +216,4 @@
 /v2.219.0.tar.gz
 /v2.221.tar.gz
 /v2.221.0.tar.gz
+/v2.221.1.tar.gz
diff --git a/README.packit b/README.packit
index d7c433c..797aefb 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.78.2.post2+g81828af.
+The file was generated using packit 0.79.0.post2+g93f33d9.
diff --git a/container-selinux.spec b/container-selinux.spec
index 6eeab50..9c3efc3 100644
--- a/container-selinux.spec
+++ b/container-selinux.spec
@@ -33,7 +33,7 @@ Epoch: 2
 # Keep Version in upstream specfile at 0. It will be automatically set
 # to the correct value by Packit for copr and koji builds.
 # IGNORE this comment if you're looking at it in dist-git.
-Version: 2.221.0
+Version: 2.221.1
 Release: %autorelease
 License: GPL-2.0-only
 URL: https://github.com/containers/%{name}
diff --git a/sources b/sources
index 38029d7..7ecf5ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v2.221.0.tar.gz) = 71e4bbc1507f9d04dd78c5881814c57b2138ed91ff474f0ce6db5da5e14ce848d7fe41952284b3525fb222eaf364dcc84efbb2f7641d78ac9abf5343e481be5d
+SHA512 (v2.221.1.tar.gz) = 5ba0144812b4df7b5ef2480cdb1330f3aeae4781ee89d3342770cd301b3c8df764a144ca32f622a28adadeb9b973ede8008c23eacca51edec12d3882bceb2d9a

From 32cce5b0b4b1cc03acb42105316c832181432e1f Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Sun, 17 Sep 2023 13:50:39 +0000
Subject: [PATCH 29/30] [packit] 2.222.0 upstream release

Upstream tag: v2.222.0
Upstream commit: cbaa1ba7
---
 .gitignore             | 1 +
 README.packit          | 2 +-
 container-selinux.spec | 2 +-
 sources                | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4d18507..16e4ef8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -217,3 +217,4 @@
 /v2.221.tar.gz
 /v2.221.0.tar.gz
 /v2.221.1.tar.gz
+/v2.222.0.tar.gz
diff --git a/README.packit b/README.packit
index 797aefb..786c2a0 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.79.0.post2+g93f33d9.
+The file was generated using packit 0.80.0.post8+gf2b5fcbc.
diff --git a/container-selinux.spec b/container-selinux.spec
index 9c3efc3..324451a 100644
--- a/container-selinux.spec
+++ b/container-selinux.spec
@@ -33,7 +33,7 @@ Epoch: 2
 # Keep Version in upstream specfile at 0. It will be automatically set
 # to the correct value by Packit for copr and koji builds.
 # IGNORE this comment if you're looking at it in dist-git.
-Version: 2.221.1
+Version: 2.222.0
 Release: %autorelease
 License: GPL-2.0-only
 URL: https://github.com/containers/%{name}
diff --git a/sources b/sources
index 7ecf5ea..e18b4c0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v2.221.1.tar.gz) = 5ba0144812b4df7b5ef2480cdb1330f3aeae4781ee89d3342770cd301b3c8df764a144ca32f622a28adadeb9b973ede8008c23eacca51edec12d3882bceb2d9a
+SHA512 (v2.222.0.tar.gz) = f5475c4f0d99c0b594637d004b526f8c129e967ed93b558e11dbed772df958cd6967f0a3183ea02cd1c7ef941510b59e9ffdf1a1238ae6880c220466967d683a

From cbae3b1553175571281f8c1f743d89492474ee6d Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Wed, 11 Oct 2023 11:10:24 +0000
Subject: [PATCH 30/30] [packit] 2.224.0 upstream release

Upstream tag: v2.224.0
Upstream commit: 31e9f0bd
---
 .gitignore             |  1 +
 .packit.yaml           | 67 ++++++++++++++++++++++++++++++++++--------
 README.packit          |  2 +-
 container-selinux.spec |  2 +-
 sources                |  2 +-
 5 files changed, 59 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index 16e4ef8..a935d69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -218,3 +218,4 @@
 /v2.221.0.tar.gz
 /v2.221.1.tar.gz
 /v2.222.0.tar.gz
+/v2.224.0.tar.gz
diff --git a/.packit.yaml b/.packit.yaml
index b4167a5..6f84a58 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -11,36 +11,79 @@ srpm_build_deps:
 jobs:
   - job: copr_build
     trigger: pull_request
+    notifications:
+      failure_comment:
+        message: "Ephemeral COPR build failed. @containers/packit-build please check."
     enable_net: true
     # container-selinux is noarch so we only need to test on one arch
-    targets: &pr_copr_targets
+    targets:
       - fedora-all
-      - centos-stream-9
-      - centos-stream-8
+      - fedora-eln
+      - epel-9
+      - epel-8
 
   # Run on commit to main branch
+  # Build targets managed in copr settings
   - job: copr_build
     trigger: commit
+    notifications:
+      failure_comment:
+        message: "podman-next COPR build failed. @containers/packit-build please check."
     branch: main
     owner: rhcontainerbot
     project: podman-next
     enable_net: true
 
   # All tests specified in the `/plans/` subdir
-  # FIXME: uncomment e2e tests after disk space issues resolved on testing farm
-  #- job: tests
-  #  trigger: pull_request
-  #  targets: *test_targets
-  #  identifier: podman_e2e_test
-  #  tmt_plan: "/plans/podman_e2e_test"
-
+  # Podman e2e tests for Fedora and CentOS Stream
   - job: tests
     trigger: pull_request
-    # arch assumed to be x86_64 by default.
-    targets: *pr_copr_targets
+    notifications:
+      failure_comment:
+        message: "podman e2e tests failed. @containers/packit-build please check."
+    targets: &pr_test_targets
+      - fedora-all
+      - epel-9
+      - epel-8
+    identifier: podman_e2e_test
+    tmt_plan: "/plans/podman_e2e_test"
+
+  # Podman system tests for Fedora and CentOS Stream
+  - job: tests
+    trigger: pull_request
+    notifications:
+      failure_comment:
+        message: "podman system tests failed. @containers/packit-build please check."
+    targets: *pr_test_targets
     identifier: podman_system_test
     tmt_plan: "/plans/podman_system_test"
 
+  # Podman e2e tests for RHEL
+  - job: tests
+    trigger: pull_request
+    use_internal_tf: true
+    notifications:
+      failure_comment:
+        message: "podman e2e tests failed on RHEL. @containers/packit-build please check."
+    targets: &pr_test_targets_rhel
+      epel-9-x86_64:
+        distros: [RHEL-9.2.0-Nightly]
+      epel-8-x86_64:
+        distros: [RHEL-8.10.0-Nightly]
+    identifier: podman_e2e_test_internal
+    tmt_plan: "/plans/podman_e2e_test"
+
+  # Podman system tests for RHEL
+  - job: tests
+    trigger: pull_request
+    use_internal_tf: true
+    notifications:
+      failure_comment:
+        message: "podman system tests failed on RHEL. @containers/packit-build please check."
+    targets: *pr_test_targets_rhel
+    identifier: podman_system_test_internal
+    tmt_plan: "/plans/podman_system_test"
+
   - job: propose_downstream
     trigger: release
     update_release: false
diff --git a/README.packit b/README.packit
index 786c2a0..327dfec 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.80.0.post8+gf2b5fcbc.
+The file was generated using packit 0.83.0.post1.dev4+g46d87465.
diff --git a/container-selinux.spec b/container-selinux.spec
index 324451a..3c995a5 100644
--- a/container-selinux.spec
+++ b/container-selinux.spec
@@ -33,7 +33,7 @@ Epoch: 2
 # Keep Version in upstream specfile at 0. It will be automatically set
 # to the correct value by Packit for copr and koji builds.
 # IGNORE this comment if you're looking at it in dist-git.
-Version: 2.222.0
+Version: 2.224.0
 Release: %autorelease
 License: GPL-2.0-only
 URL: https://github.com/containers/%{name}
diff --git a/sources b/sources
index e18b4c0..2eec748 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v2.222.0.tar.gz) = f5475c4f0d99c0b594637d004b526f8c129e967ed93b558e11dbed772df958cd6967f0a3183ea02cd1c7ef941510b59e9ffdf1a1238ae6880c220466967d683a
+SHA512 (v2.224.0.tar.gz) = ab838c379aae99347c5d49ef84513c5fa1cd03faf1ab6b1dd4b6c571875c7c9df389abfb41ce0e2c2a57e14d11c47cbac85e2a6ad8004c2db6087849d91282aa