From b810b35b8a32051d7958658fa243e81731c2faf1 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 22 May 2023 15:48:51 +0000 Subject: [PATCH 01/18] [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 1e728ebeea42fa73f538c5db83be6ccf372aa18d Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 23 May 2023 09:21:30 -0400 Subject: [PATCH 02/18] [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 dea883635b125241a25faac42c950c20b9ef48d5 Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 30 May 2023 19:12:03 +0000 Subject: [PATCH 03/18] [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 a479cec308e351c7eb2917576cbe464fbe6451d6 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 5 Jun 2023 18:29:35 +0000 Subject: [PATCH 04/18] [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 0ec9bc8f845650e989b2db152c334583b37c6df6 Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 6 Jun 2023 15:25:54 +0000 Subject: [PATCH 05/18] [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 b34708b7d3da3f7224e825cac8e43fa7c706ab25 Mon Sep 17 00:00:00 2001 From: Packit Date: Sun, 2 Jul 2023 11:28:20 +0000 Subject: [PATCH 06/18] [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 e6ff2be87ea46c09255f88043bc82d80ad750f8b Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 14 Aug 2023 17:40:01 +0000 Subject: [PATCH 07/18] 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 572a738f54d9e95cc4d2b235137911669f020e47 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 15 Aug 2023 09:19:54 -0400 Subject: [PATCH 08/18] 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 6161620f8c7c3d51900bb453cc47146a8b7fe45a Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 29 Aug 2023 21:05:51 +0000 Subject: [PATCH 09/18] [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-f38-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 43e52d5e5c4ef214971b6d48182e73a480485f45 Mon Sep 17 00:00:00 2001 From: Packit Date: Sun, 17 Sep 2023 13:51:23 +0000 Subject: [PATCH 10/18] [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 9f5545c4414b0280aeb5b768030f564c9bb43416 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 11 Oct 2023 11:10:00 +0000 Subject: [PATCH 11/18] [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 From e8d5d5a7e011d4f0c17aaaf7d9bfb0054cec0b17 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 30 Nov 2023 00:40:17 +0000 Subject: [PATCH 12/18] [packit] 2.226.0 upstream release Upstream tag: v2.226.0 Upstream commit: cff8553f --- .gitignore | 1 + .packit.yaml | 4 ++-- README.packit | 2 +- container-selinux.spec | 2 +- sources | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index a935d69..e57030a 100644 --- a/.gitignore +++ b/.gitignore @@ -219,3 +219,4 @@ /v2.221.1.tar.gz /v2.222.0.tar.gz /v2.224.0.tar.gz +/v2.226.0.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 6f84a58..0f6b9fd 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -67,9 +67,9 @@ jobs: 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] + distros: [RHEL-9.3.0-Nightly,RHEL-9.4.0-Nightly] epel-8-x86_64: - distros: [RHEL-8.10.0-Nightly] + distros: [RHEL-8.9.0-Nightly,RHEL-8.10.0-Nightly] identifier: podman_e2e_test_internal tmt_plan: "/plans/podman_e2e_test" diff --git a/README.packit b/README.packit index 327dfec..ef95206 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.83.0.post1.dev4+g46d87465. +The file was generated using packit 0.87.0. diff --git a/container-selinux.spec b/container-selinux.spec index 3c995a5..7f2ac48 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.224.0 +Version: 2.226.0 Release: %autorelease License: GPL-2.0-only URL: https://github.com/containers/%{name} diff --git a/sources b/sources index 2eec748..d6bc57a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v2.224.0.tar.gz) = ab838c379aae99347c5d49ef84513c5fa1cd03faf1ab6b1dd4b6c571875c7c9df389abfb41ce0e2c2a57e14d11c47cbac85e2a6ad8004c2db6087849d91282aa +SHA512 (v2.226.0.tar.gz) = 9decb066c62779336c22c027a2d3870c3dc1fe0afaa80ad59c4058c0030e0867352955d568e297f2258ba855a2be0d70c0d257cb64543b8726ff0755d63e95f8 From 3969f9333e47d7a61a4502c986913851aa720d96 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 21 Dec 2023 15:51:17 +0000 Subject: [PATCH 13/18] [packit] 2.227.0 upstream release Upstream tag: v2.227.0 Upstream commit: 289df825 --- .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 e57030a..a6ea623 100644 --- a/.gitignore +++ b/.gitignore @@ -220,3 +220,4 @@ /v2.222.0.tar.gz /v2.224.0.tar.gz /v2.226.0.tar.gz +/v2.227.0.tar.gz diff --git a/README.packit b/README.packit index ef95206..f27b296 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.87.0. +The file was generated using packit 0.87.1.post1.dev11+gd1f7091b. diff --git a/container-selinux.spec b/container-selinux.spec index 7f2ac48..0aa2346 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.226.0 +Version: 2.227.0 Release: %autorelease License: GPL-2.0-only URL: https://github.com/containers/%{name} diff --git a/sources b/sources index d6bc57a..3b13bad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v2.226.0.tar.gz) = 9decb066c62779336c22c027a2d3870c3dc1fe0afaa80ad59c4058c0030e0867352955d568e297f2258ba855a2be0d70c0d257cb64543b8726ff0755d63e95f8 +SHA512 (v2.227.0.tar.gz) = 604f6e8be89efb1dc6b70596149ea8cdd36958125dc740e3468757e732d452dda8b786b7d593bff099fb80fada369e54118a6d9e3eff0cdae2c15ac22c4acf04 From a82cc71462ea2c19de48471abbf6873dfaa8f161 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 11 Jan 2024 03:13:48 +0000 Subject: [PATCH 14/18] [packit] 2.228.0 upstream release Upstream tag: v2.228.0 Upstream commit: 48c2b45f --- .gitignore | 1 + README.packit | 2 +- container-selinux.spec | 3 ++- sources | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a6ea623..5d86517 100644 --- a/.gitignore +++ b/.gitignore @@ -221,3 +221,4 @@ /v2.224.0.tar.gz /v2.226.0.tar.gz /v2.227.0.tar.gz +/v2.228.0.tar.gz diff --git a/README.packit b/README.packit index f27b296..8c508a5 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.87.1.post1.dev11+gd1f7091b. +The file was generated using packit 0.88.0. diff --git a/container-selinux.spec b/container-selinux.spec index 0aa2346..689dc58 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.227.0 +Version: 2.228.0 Release: %autorelease License: GPL-2.0-only URL: https://github.com/containers/%{name} @@ -71,6 +71,7 @@ sed -i 's/^install: man/install:/' Makefile 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 '/fifo_file watch/d' container.te %endif %if %{defined no_systemd_chat_resolved} diff --git a/sources b/sources index 3b13bad..56eb602 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v2.227.0.tar.gz) = 604f6e8be89efb1dc6b70596149ea8cdd36958125dc740e3468757e732d452dda8b786b7d593bff099fb80fada369e54118a6d9e3eff0cdae2c15ac22c4acf04 +SHA512 (v2.228.0.tar.gz) = b6dcfdc7044d491c15fe582af7cd2a653318ccb0d793556a7222620b5d3d1270d6d514cb9fae83d8f9e8300c5a3a8aee3c9bf69d68f8955b3f87cc20fb035f97 From 5e9128d5211fca5bda8b3f511f37e902441fb332 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 18 Jan 2024 02:52:51 +0000 Subject: [PATCH 15/18] [packit] 2.228.1 upstream release Upstream tag: v2.228.1 Upstream commit: d733187b --- .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 5d86517..755ae26 100644 --- a/.gitignore +++ b/.gitignore @@ -222,3 +222,4 @@ /v2.226.0.tar.gz /v2.227.0.tar.gz /v2.228.0.tar.gz +/v2.228.1.tar.gz diff --git a/README.packit b/README.packit index 8c508a5..115b422 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.88.0. +The file was generated using packit 0.88.0.post1.dev4+gc070191b. diff --git a/container-selinux.spec b/container-selinux.spec index 689dc58..efca51a 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.228.0 +Version: 2.228.1 Release: %autorelease License: GPL-2.0-only URL: https://github.com/containers/%{name} diff --git a/sources b/sources index 56eb602..ebebf32 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v2.228.0.tar.gz) = b6dcfdc7044d491c15fe582af7cd2a653318ccb0d793556a7222620b5d3d1270d6d514cb9fae83d8f9e8300c5a3a8aee3c9bf69d68f8955b3f87cc20fb035f97 +SHA512 (v2.228.1.tar.gz) = d746a9d843c6bbe9cec0d7bb4ab7de4c791f12d82cc2f95aa52b225729d2a0933019a4d588d8b565e92aaaf04a0e967a5db3d50caded4b3f446bc122e841da03 From ce9f4d3be16b3d9ad6b44146e9269a63322d1e57 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 28 Feb 2024 15:06:37 +0000 Subject: [PATCH 16/18] [packit] 2.229.1 upstream release Upstream tag: v2.229.1 Upstream commit: a023e9ee --- .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 755ae26..8b43f33 100644 --- a/.gitignore +++ b/.gitignore @@ -223,3 +223,4 @@ /v2.227.0.tar.gz /v2.228.0.tar.gz /v2.228.1.tar.gz +/v2.229.1.tar.gz diff --git a/README.packit b/README.packit index 115b422..31341b6 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.88.0.post1.dev4+gc070191b. +The file was generated using packit 0.93.0. diff --git a/container-selinux.spec b/container-selinux.spec index efca51a..3372761 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.228.1 +Version: 2.229.1 Release: %autorelease License: GPL-2.0-only URL: https://github.com/containers/%{name} diff --git a/sources b/sources index ebebf32..9c53c37 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v2.228.1.tar.gz) = d746a9d843c6bbe9cec0d7bb4ab7de4c791f12d82cc2f95aa52b225729d2a0933019a4d588d8b565e92aaaf04a0e967a5db3d50caded4b3f446bc122e841da03 +SHA512 (v2.229.1.tar.gz) = 19a3434093c1e30ae4e09988169435489c054f5eb9e0fb2a6ddd511da1393340913abbc5d848da280dfff1b314b1ee88bdff8092e59c51da839ca8e0bead531e From 21aaa5726713cc6443522c04563d5d9e7f8306a3 Mon Sep 17 00:00:00 2001 From: Packit Date: Sat, 2 Mar 2024 18:43:00 +0000 Subject: [PATCH 17/18] [packit] 2.230.0 upstream release Upstream tag: v2.230.0 Upstream commit: 5cec8532 --- .gitignore | 1 + container-selinux.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8b43f33..edc8bb6 100644 --- a/.gitignore +++ b/.gitignore @@ -224,3 +224,4 @@ /v2.228.0.tar.gz /v2.228.1.tar.gz /v2.229.1.tar.gz +/v2.230.0.tar.gz diff --git a/container-selinux.spec b/container-selinux.spec index 3372761..2aea4cd 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.229.1 +Version: 2.230.0 Release: %autorelease License: GPL-2.0-only URL: https://github.com/containers/%{name} diff --git a/sources b/sources index 9c53c37..17706d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v2.229.1.tar.gz) = 19a3434093c1e30ae4e09988169435489c054f5eb9e0fb2a6ddd511da1393340913abbc5d848da280dfff1b314b1ee88bdff8092e59c51da839ca8e0bead531e +SHA512 (v2.230.0.tar.gz) = 6534fb6e1360b6e64d6e49e674a976e711f42b8b75b0ad1dffb35f870e2ccf9fcfe38de5e4f695a7e2490c6fe880c36bb3c17c1510e4758d0d3aa877dea719a8 From 0072a7fe3aaa55a7b3f42a765e49e6f3ea174c36 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 24 Apr 2024 14:32:02 +0000 Subject: [PATCH 18/18] Update to 2.231.0 upstream release - Resolves: rhbz#2276827 Upstream tag: v2.231.0 Upstream commit: 5d983412 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 4 ++-- README.packit | 2 +- container-selinux.spec | 14 +++++++++++++- sources | 2 +- 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index edc8bb6..77a51e6 100644 --- a/.gitignore +++ b/.gitignore @@ -225,3 +225,4 @@ /v2.228.1.tar.gz /v2.229.1.tar.gz /v2.230.0.tar.gz +/v2.231.0.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 0f6b9fd..b066cb5 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -67,9 +67,9 @@ jobs: message: "podman e2e tests failed on RHEL. @containers/packit-build please check." targets: &pr_test_targets_rhel epel-9-x86_64: - distros: [RHEL-9.3.0-Nightly,RHEL-9.4.0-Nightly] + distros: [RHEL-9.4.0-Nightly,RHEL-9-Nightly] epel-8-x86_64: - distros: [RHEL-8.9.0-Nightly,RHEL-8.10.0-Nightly] + distros: [RHEL-8.9.0-Nightly,RHEL-8-Nightly] identifier: podman_e2e_test_internal tmt_plan: "/plans/podman_e2e_test" diff --git a/README.packit b/README.packit index 31341b6..bee8d88 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.93.0. +The file was generated using packit 0.95.0. diff --git a/container-selinux.spec b/container-selinux.spec index 2aea4cd..87bd464 100644 --- a/container-selinux.spec +++ b/container-selinux.spec @@ -18,6 +18,14 @@ %global _selinux_policy_version 3.14.3-80.el8 %endif +# RHEL < 10 and Fedora < 40 use file context entries in /var/run +%if %{defined rhel} && 0%{?rhel} < 10 +%define legacy_var_run 1 +%endif +%if %{defined fedora} && 0%{?fedora} < 40 +%define legacy_var_run 1 +%endif + # https://github.com/containers/container-selinux/issues/203 %if %{!defined fedora} && %{!defined rhel} || %{defined fedora} && 0%{?fedora} <= 37 || %{defined rhel} && 0%{?rhel} <= 9 %define no_user_namespace 1 @@ -33,7 +41,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.230.0 +Version: 2.231.0 Release: %autorelease License: GPL-2.0-only URL: https://github.com/containers/%{name} @@ -82,6 +90,10 @@ sed -i '/^systemd_chat_resolved/d' container.te sed -i '/user_namespace/d' container.te %endif +%if %{defined legacy_var_run} +sed -i 's|^/run/|/var/run/|' container.fc +%endif + %build make diff --git a/sources b/sources index 17706d2..2755628 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v2.230.0.tar.gz) = 6534fb6e1360b6e64d6e49e674a976e711f42b8b75b0ad1dffb35f870e2ccf9fcfe38de5e4f695a7e2490c6fe880c36bb3c17c1510e4758d0d3aa877dea719a8 +SHA512 (v2.231.0.tar.gz) = 1e1cf48dda96e72330719ec6b679cbb832e002903c94afee3d3a4754196712026a050bbf619e9b0fdba6efbd1c56aaf1e687cd0436cc3386ac23d5b5a83f6352