From 62e576d7d3c088e9c05a3661db3c8f53a11e27ce Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Wed, 14 Dec 2022 13:41:34 -0500 Subject: [PATCH 1/7] 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 a6126a69dd1c7feb85a17fab657dc5979796161b Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 15 Dec 2022 05:11:34 -0500 Subject: [PATCH 2/7] 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 4ae40022292a15447747da3a747728be953c7c7f Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 4 Jan 2023 17:51:20 +0530 Subject: [PATCH 3/7] bump to v2.197.0 Signed-off-by: Lokesh Mandvekar (cherry picked from commit 3fa11813c16c17d5fd12249572ee5da023af8b7f) Signed-off-by: Lokesh Mandvekar --- .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 c95d018081e8c3b1044dc3000a2a28fc1d196a1d Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 6 Jan 2023 20:11:43 +0530 Subject: [PATCH 4/7] bump to v2.198.0 Signed-off-by: Lokesh Mandvekar (cherry picked from commit 33f8e14356bc2653c33365f2c9252fc5e3074b65) Signed-off-by: Lokesh Mandvekar --- .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 f2f8d23567257d4edb3c6c9b40e54ca42210aa9a Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 31 Jan 2023 17:33:18 +0530 Subject: [PATCH 5/7] bump to v2.199.0 Signed-off-by: Lokesh Mandvekar (cherry picked from commit 9e01c83a26dbf1f67bfd31da87c38d146f830cf4) Signed-off-by: Lokesh Mandvekar --- .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 6a7e6766751d064485eeef229298dce881993b76 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 8 Feb 2023 18:42:43 +0530 Subject: [PATCH 6/7] bump to v2.200.0 Signed-off-by: Lokesh Mandvekar (cherry picked from commit 24761d467feaa921c9150be25951d661c4ead1ca) Signed-off-by: Lokesh Mandvekar --- .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 044d2472016afc92d115b678ecddf46022602f55 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 28 Apr 2023 14:25:38 -0400 Subject: [PATCH 7/7] prepare for Packit integration, remove centos conditionals update tarball info in sources file (cherry picked from commit 23b10c340b66402759218152a43e04adbc259275) Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + container-selinux.spec | 9 ++------- sources | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index e860c9e..b95ae5f 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.211.0.tar.gz diff --git a/container-selinux.spec b/container-selinux.spec index f7b71cf..6f1801d 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.200.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: GPLv2 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 diff --git a/sources b/sources index c13e8d1..c752430 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v2.200.0.tar.gz) = a681067e88552831de652dd74412e407b52b941dd769936cb5f9666a53837256d253c15916f1287c68f7c2693694904db42986582fa4a8487102e4332e592a2f +SHA512 (v2.211.0.tar.gz) = 76c795cf51e80a3996ff79d5f29952932c35124c3ed283d1f101c61b02499ea8769d886b99a61e3c8c794ed9729b0151de92b283ef18d7e12f5fd59e5568860a