diff --git a/_service b/_service index b8cd8d6..7ba4321 100644 --- a/_service +++ b/_service @@ -1,5 +1,5 @@ - + https://github.com/containers/storage.git git storage @@ -7,23 +7,23 @@ @PARENT_TAG@ v(.*) - + https://github.com/containers/image.git git image - v5.29.0 + v5.29.2 @PARENT_TAG@ v(.*) - + https://github.com/containers/common.git git common - v0.57.0 + v0.57.4 @PARENT_TAG@ v(.*) - + *.tar xz diff --git a/common-0.57.0.tar.xz b/common-0.57.0.tar.xz deleted file mode 100644 index efd77a0..0000000 --- a/common-0.57.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:53096ec983561ccd71dc31eb0ea235ced5d8dfdcad710c0c3cea693c549de45f -size 7898448 diff --git a/common-0.57.4.tar.xz b/common-0.57.4.tar.xz new file mode 100644 index 0000000..b90e3bf --- /dev/null +++ b/common-0.57.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23fa495f7da1921eb1633e95c13ba9f678f124f145ed7f7cd2c891f9ca1d3cd3 +size 7865740 diff --git a/image-5.29.0.tar.xz b/image-5.29.0.tar.xz deleted file mode 100644 index 5864abe..0000000 --- a/image-5.29.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:93f06925270aa3f8ad1b3af018b67b9c7351d0104e7e051db191eae710af33f7 -size 480464 diff --git a/image-5.29.2.tar.xz b/image-5.29.2.tar.xz new file mode 100644 index 0000000..abc4c68 --- /dev/null +++ b/image-5.29.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7812f2d34d4d308168a38c3b4451e693d4729f551e9bc4484dca8be2efd1e8c2 +size 481376 diff --git a/libcontainers-common.changes b/libcontainers-common.changes index dda0da7..6dc4a64 100644 --- a/libcontainers-common.changes +++ b/libcontainers-common.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Fri Mar 1 13:16:28 UTC 2024 - Marcus Meissner + +- disable the SUSE registry key validation temporary to switch the key on + registry.suse.com. + +------------------------------------------------------------------- +Tue Feb 6 13:35:30 UTC 2024 - Dan Čermák + +- New release 20240206 +- bump bundled c/common to 0.57.4 +- bump bundled c/image to 0.29.2 +- conditionally require libcontainers-sles-mounds for product(SLE-Micro) as well + (SLE Micro 6.0 now no longer provides product(SUSE_SLE) and instead only + provides product(SLE-Micro)), fixes bsc#1216443 + ------------------------------------------------------------------- Mon Dec 4 07:12:17 UTC 2023 - Danish Prakash diff --git a/libcontainers-common.spec b/libcontainers-common.spec index c3c7274..dbe8a1c 100644 --- a/libcontainers-common.spec +++ b/libcontainers-common.spec @@ -17,17 +17,17 @@ # commonver - version from containers/common -%define commonver 0.57.0 +%define commonver 0.57.4 # storagever - version from containers/storage %define storagever 1.51.0 # imagever - version from containers/image -%define imagever 5.29.0 +%define imagever 5.29.2 # skopeover - version from containers/skopeo -%define skopeover 1.14.0 +%define skopeover 1.14.2 # https://github.com/containers/shortnames %define shortnamesver 2023.02.20 Name: libcontainers-common -Version: 20231204 +Version: 20240206 Release: 0 Summary: Configuration files common to github.com/containers License: Apache-2.0 @@ -55,7 +55,7 @@ Source12: openSUSE-policy.json BuildRequires: go-go-md2man Requires(post): %{_bindir}/sed # add SLE-specific mounts for only SLES systems -Requires: (libcontainers-sles-mounts if product(SUSE_SLE)) +Requires: (libcontainers-sles-mounts if (product(SUSE_SLE) or product(SLE-Micro))) Requires: libcontainers-policy >= %{version} Suggests: (libcontainers-policy-openSUSE if openSUSE-release) Provides: libcontainers-image = %{version} @@ -106,7 +106,7 @@ pwd cd image-%{imagever} for md in docs/*.md do - go-md2man -in $md -out $md + go-md2man -in $md -out $md done rename '.5.md' '.5' docs/* rename '.md' '.1' docs/* @@ -115,7 +115,7 @@ cd .. cd storage-%{storagever} for md in docs/*.md do - go-md2man -in $md -out $md + go-md2man -in $md -out $md done rename '.5.md' '.5' docs/* rename '.md' '.1' docs/* @@ -134,7 +134,7 @@ EOL # Disable CNI related configs on ALP (bsc#1213556) # https://github.com/containers/podman/issues/19327 -%if 0%{suse_version} >= 1600 && !0%{?is_opensuse} +%if 0%{?suse_version} >= 1600 && !0%{?is_opensuse} sed -i 's/cni_plugin_dirs = .*/\# cni_plugin_dirs = []/g' %{SOURCE9} %endif @@ -175,7 +175,9 @@ install -D -m 0644 common-%{commonver}/pkg/hooks/docs/oci-hooks.5 %{buildroot}/% install -D -m 0644 common-%{commonver}/docs/containers-mounts.conf.5 %{buildroot}/%{_mandir}/man5/ install -D -m 0644 common-%{commonver}/docs/containers.conf.5 %{buildroot}/%{_mandir}/man5/ -install -D -m 0644 %{SOURCE12} %{buildroot}/%{_sysconfdir}/containers/policy.json.openSUSE +#install -D -m 0644 %{SOURCE12} %{buildroot}/%{_sysconfdir}/containers/policy.json.openSUSE +# temporary switch off the key checking again, to switch the SUSE container keys +install -D -m 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/containers/policy.json.openSUSE install -D -m 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/containers/policy.json.default %post