diff --git a/_service b/_service
index 78def79..0f24959 100644
--- a/_service
+++ b/_service
@@ -3,7 +3,7 @@
https://github.com/containers/storage.git
git
storage
- v1.53.0
+ v1.54.0
@PARENT_TAG@
v(.*)
@@ -11,7 +11,7 @@
https://github.com/containers/image.git
git
image
- v5.30.0
+ v5.31.0
@PARENT_TAG@
v(.*)
@@ -19,7 +19,7 @@
https://github.com/containers/common.git
git
common
- v0.58.0
+ v0.59.1
@PARENT_TAG@
v(.*)
diff --git a/common-0.58.0.tar.xz b/common-0.58.0.tar.xz
deleted file mode 100644
index dc54ada..0000000
--- a/common-0.58.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7924351cdc3fddce22b5803457694901437bccd4b4e95b0b522e21cfed5be309
-size 8233332
diff --git a/common-0.59.1.tar.xz b/common-0.59.1.tar.xz
new file mode 100644
index 0000000..6106180
--- /dev/null
+++ b/common-0.59.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8477a82ffc9b75080e26211cb7bf8372eee3934a0a7f8c6df7385efcc388aade
+size 8198064
diff --git a/image-5.30.0.tar.xz b/image-5.30.0.tar.xz
deleted file mode 100644
index 17753e2..0000000
--- a/image-5.30.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:89578b06e33bae568939478650572ee1d932b663d9b0eee47d96c74d6af8d77c
-size 488856
diff --git a/image-5.31.0.tar.xz b/image-5.31.0.tar.xz
new file mode 100644
index 0000000..6cc8beb
--- /dev/null
+++ b/image-5.31.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:12aa6aef9573a8753f2b335271464383637b4cf30ef2a4258779ecdbe36e1e00
+size 488436
diff --git a/libcontainers-common.changes b/libcontainers-common.changes
index 6619623..07a39d6 100644
--- a/libcontainers-common.changes
+++ b/libcontainers-common.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Jun 18 06:53:50 UTC 2024 - Danish Prakash
+
+- Move the following distro configs files to /usr/share/containers/:
+ * /etc/containers/mounts.json
+ * /etc/containers/storage.conf
+ * /etc/containers/seccomp.json
+- New release 20240618
+- bump bundled c/common to 0.59.1
+- bump bundled c/image to 5.31.0
+- bump bundled c/storage to 1.54.0
+
-------------------------------------------------------------------
Wed Apr 24 14:56:17 UTC 2024 - Danish Prakash
diff --git a/libcontainers-common.spec b/libcontainers-common.spec
index 11ca3ee..6434484 100644
--- a/libcontainers-common.spec
+++ b/libcontainers-common.spec
@@ -17,17 +17,17 @@
# commonver - version from containers/common
-%define commonver 0.58.0
+%define commonver 0.59.1
# storagever - version from containers/storage
-%define storagever 1.53.0
+%define storagever 1.54.0
# imagever - version from containers/image
-%define imagever 5.30.0
+%define imagever 5.31.0
# skopeover - version from containers/skopeo
-%define skopeover 1.15.0
+%define skopeover 1.14.4
# https://github.com/containers/shortnames
%define shortnamesver 2023.02.20
Name: libcontainers-common
-Version: 20240408
+Version: 20240618
Release: 0
Summary: Configuration files common to github.com/containers
License: Apache-2.0
@@ -182,14 +182,12 @@ install -d -m 0755 %{buildroot}/%{_datadir}/containers/systemd
install -D -m 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/containers/policy.json.default
install -D -m 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/containers/policy.json.openSUSE
-install -D -m 0644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/containers/storage.conf
install -D -m 0644 %{SOURCE5} %{buildroot}/%{_datadir}/containers/mounts.conf
-install -D -m 0644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/containers/mounts.conf
+install -D -m 0644 %{SOURCE4} %{buildroot}/%{_datadir}/containers/storage.conf
install -D -m 0644 %{SOURCE11} %{buildroot}/%{_sysconfdir}/containers/registries.conf.d/000-shortnames.conf
install -D -m 0644 %{SOURCE7} %{buildroot}/%{_sysconfdir}/containers/registries.d/default.yaml
install -D -m 0644 %_builddir/containers.conf %{buildroot}/%{_datadir}/containers/containers.conf
install -D -m 0644 common-%{commonver}/pkg/seccomp/seccomp.json %{buildroot}/%{_datadir}/containers/seccomp.json
-install -D -m 0644 common-%{commonver}/pkg/seccomp/seccomp.json %{buildroot}/%{_sysconfdir}/containers/seccomp.json
install -d %{buildroot}/%{_mandir}/man1
install -d %{buildroot}/%{_mandir}/man5
@@ -209,7 +207,7 @@ install -D -m 0644 registries.conf.suse %{buildroot}/%{_sysconfdir}/containers/r
%post
# Comment out ostree_repo if it's blank [boo#1189893]
-sed -i 's/ostree_repo = ""/\#ostree_repo = ""/g' %{_sysconfdir}/containers/storage.conf
+if [ -f %{_sysconfdir}/containers/storage.conf ]; then sed -i 's/ostree_repo = ""/\#ostree_repo = ""/g' %{_sysconfdir}/containers/storage.conf; fi
%files
%dir %{_sysconfdir}/containers
@@ -223,11 +221,10 @@ sed -i 's/ostree_repo = ""/\#ostree_repo = ""/g' %{_sysconfdir}/containers/stora
%dir %{_datadir}/containers/oci/hooks.d
%dir %{_datadir}/containers/systemd
-%config(noreplace) %{_sysconfdir}/containers/storage.conf
-%config(noreplace) %{_sysconfdir}/containers/seccomp.json
%config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml
%config(noreplace) %{_sysconfdir}/containers/registries.conf.d/000-shortnames.conf
%{_datadir}/containers/seccomp.json
+%{_datadir}/containers/storage.conf
%{_datadir}/containers/containers.conf
%{_mandir}/man1/*.1%{?ext_man}
@@ -235,7 +232,6 @@ sed -i 's/ostree_repo = ""/\#ostree_repo = ""/g' %{_sysconfdir}/containers/stora
%license LICENSE
%files -n libcontainers-sles-mounts
-%config(noreplace) %{_sysconfdir}/containers/mounts.conf
%{_datadir}/containers/mounts.conf
%files -n libcontainers-openSUSE-policy
diff --git a/storage-1.53.0.tar.xz b/storage-1.53.0.tar.xz
deleted file mode 100644
index 2065954..0000000
--- a/storage-1.53.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f8675a6aaf1209232202cec84794a3b32eb38d4439b4deeec865675eeb995ffc
-size 2295056
diff --git a/storage-1.54.0.tar.xz b/storage-1.54.0.tar.xz
new file mode 100644
index 0000000..b8ff09c
--- /dev/null
+++ b/storage-1.54.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6af7ecca307a540fb6c36b625f74c2eeee2d4836268e9e5fbbf51cedd5e39abf
+size 2184988