Accepting request 732772 from devel:kubic

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

_service

@@ -4,24 +4,24 @@
 <param name="url">https://github.com/containers/storage.git</param>
 <param name="scm">git</param>
 <param name="filename">storage</param>
-<param name="versionformat">1.12.16</param>
-<param name="revision">v1.12.16</param>
+<param name="versionformat">1.13.2</param>
+<param name="revision">v1.13.2</param>
 </service>
 
 <service name="tar_scm" mode="disabled">
 <param name="url">https://github.com/containers/image.git</param>
 <param name="scm">git</param>
 <param name="filename">image</param>
-<param name="versionformat">3.0.0</param>
-<param name="revision">v3.0.0</param>
+<param name="versionformat">3.0.2</param>
+<param name="revision">v3.0.2</param>
 </service>
 
 <service name="tar_scm" mode="disabled">
 <param name="url">https://github.com/containers/libpod.git</param>
 <param name="scm">git</param>
 <param name="filename">libpod</param>
-<param name="versionformat">1.4.4</param>
-<param name="revision">v1.4.4</param>
+<param name="versionformat">1.5.1</param>
+<param name="revision">v1.5.1</param>
 </service>
 
 <service name="recompress" mode="disabled">

image-3.0.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5abc4d2acd5eddca6d8b2d25fa6a6f487de5d080762fbb390cbdd19dfeced272
-size 259944

image-3.0.2.tar.xz

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

libcontainers-common.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Mon Sep 23 15:28:02 UTC 2019 - Richard Brown <rbrown@suse.com>
+
+- Update to image 1.4.4
+  - Hard-code the kernel keyring use to be disabled for now
+- Update to libpod 1.5.1
+  - The hostname of pods is now set to the pod's name
+  - Minor bugfixes
+- Update to storage 1.12.16
+  - Ignore ro mount options in btrfs and windows drivers
+
+-------------------------------------------------------------------
+Mon Sep 23 12:01:53 UTC 2019 - Richard Brown <rbrown@suse.com>
+
+- Check /var/lib/containers if possible before setting btrfs backend (bsc#1151028)
+
 -------------------------------------------------------------------
 Wed Aug  7 10:35:07 UTC 2019 - Sascha Grunert <sgrunert@suse.com>
 

libcontainers-common.spec

@@ -16,16 +16,16 @@
 #
 
 # libpodver - version from containers/libpod
-%define libpodver 1.4.4
+%define libpodver 1.5.1
 
 # storagever - version from containers/storage
-%define storagever 1.12.16
+%define storagever 1.13.2
 
 # imagever - version from containers/image
-%define imagever 3.0.0
+%define imagever 3.0.2
 
 Name:           libcontainers-common
-Version:        20190802
+Version:        20190923
 Release:        0
 Summary:        Configuration files common to github.com/containers
 License:        Apache-2.0 and GPL-3.0+
@@ -121,9 +121,11 @@ install -D -m 0644 storage-%{storagever}/docs/*.5 %{buildroot}/%{_mandir}/man5/
 install -D -m 0644 libpod-%{libpodver}/pkg/hooks/docs/oci-hooks.5 %{buildroot}/%{_mandir}/man5/
 
 %post
-# If installing, check if /var/lib is btrfs and set driver to "btrfs" if true
+# If installing, check if /var/lib/containers (or /var/lib in its defect) is btrfs and set driver
+# to "btrfs" if true
 if [ $1 -eq 1 ] ; then
-  if [ "`findmnt -o FSTYPE -l --target /var/lib|grep -v FSTYPE`" = "btrfs" ]; then
+  fstype=$((findmnt -o FSTYPE -l --target /var/lib/containers || findmnt -o FSTYPE -l --target /var/lib) | grep -v FSTYPE)
+  if [ "$fstype" = "btrfs" ]; then
     sed -i 's/driver = ""/driver = "btrfs"/g' %{_sysconfdir}/containers/storage.conf
   fi
 fi

libpod-1.4.4.tar.xz

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

libpod-1.5.1.tar.xz

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

storage-1.12.16.tar.xz

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

storage-1.13.2.tar.xz

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