Accepting request 1154053 from devel:microos

- disable the SUSE registry key validation temporary to switch the key on 
  registry.suse.com. (forwarded request 1154044 from msmeissn)

OBS-URL: https://build.opensuse.org/request/show/1154053
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libcontainers-common?expand=0&rev=68

_service

@@ -1,5 +1,5 @@
 <services>
-  <service name="tar_scm" mode="disabled">
+  <service name="tar_scm" mode="manual">
     <param name="url">https://github.com/containers/storage.git</param>
     <param name="scm">git</param>
     <param name="filename">storage</param>
@@ -7,23 +7,23 @@
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="versionrewrite-pattern">v(.*)</param>
   </service>
-  <service name="tar_scm" mode="disabled">
+  <service name="tar_scm" mode="manual">
     <param name="url">https://github.com/containers/image.git</param>
     <param name="scm">git</param>
     <param name="filename">image</param>
-    <param name="revision">v5.29.0</param>
+    <param name="revision">v5.29.2</param>
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="versionrewrite-pattern">v(.*)</param>
   </service>
-  <service name="tar_scm" mode="disabled">
+  <service name="tar_scm" mode="manual">
     <param name="url">https://github.com/containers/common.git</param>
     <param name="scm">git</param>
     <param name="filename">common</param>
-    <param name="revision">v0.57.0</param>
+    <param name="revision">v0.57.4</param>
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="versionrewrite-pattern">v(.*)</param>
   </service>
-  <service name="recompress" mode="disabled">
+  <service name="recompress" mode="manual">
     <param name="file">*.tar</param>
     <param name="compression">xz</param>
   </service>

common-0.57.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:53096ec983561ccd71dc31eb0ea235ced5d8dfdcad710c0c3cea693c549de45f
-size 7898448

image-5.29.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:93f06925270aa3f8ad1b3af018b67b9c7351d0104e7e051db191eae710af33f7
-size 480464

libcontainers-common.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Fri Mar  1 13:16:28 UTC 2024 - Marcus Meissner <meissner@suse.com>
+
+- 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 <dcermak@suse.com>
+
+- 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 <danish.prakash@suse.com>
 

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}
@@ -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