From 281cae8d2db5a9578854a43677d72330eed54dc284fbc1d4f0d4a7fd6c59624e Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Mon, 30 Sep 2019 13:50:34 +0000
Subject: [PATCH] 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                     | 12 ++++++------
 image-3.0.0.tar.xz           |  3 ---
 image-3.0.2.tar.xz           |  3 +++
 libcontainers-common.changes | 16 ++++++++++++++++
 libcontainers-common.spec    | 14 ++++++++------
 libpod-1.4.4.tar.xz          |  3 ---
 libpod-1.5.1.tar.xz          |  3 +++
 storage-1.12.16.tar.xz       |  3 ---
 storage-1.13.2.tar.xz        |  3 +++
 9 files changed, 39 insertions(+), 21 deletions(-)
 delete mode 100644 image-3.0.0.tar.xz
 create mode 100644 image-3.0.2.tar.xz
 delete mode 100644 libpod-1.4.4.tar.xz
 create mode 100644 libpod-1.5.1.tar.xz
 delete mode 100644 storage-1.12.16.tar.xz
 create mode 100644 storage-1.13.2.tar.xz

diff --git a/_service b/_service
index 50fdca9..1f1e65c 100644
--- a/_service
+++ b/_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">
diff --git a/image-3.0.0.tar.xz b/image-3.0.0.tar.xz
deleted file mode 100644
index 3dfff1d..0000000
--- a/image-3.0.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5abc4d2acd5eddca6d8b2d25fa6a6f487de5d080762fbb390cbdd19dfeced272
-size 259944
diff --git a/image-3.0.2.tar.xz b/image-3.0.2.tar.xz
new file mode 100644
index 0000000..6c5cf52
--- /dev/null
+++ b/image-3.0.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d0bb8d61a8bd4f4c05bf37577263a3306cc7f9b648ad39584eecdc5caec5234d
+size 259532
diff --git a/libcontainers-common.changes b/libcontainers-common.changes
index f74715d..61a541d 100644
--- a/libcontainers-common.changes
+++ b/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>
 
diff --git a/libcontainers-common.spec b/libcontainers-common.spec
index 5bef894..3a1322a 100644
--- a/libcontainers-common.spec
+++ b/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
diff --git a/libpod-1.4.4.tar.xz b/libpod-1.4.4.tar.xz
deleted file mode 100644
index 63f5132..0000000
--- a/libpod-1.4.4.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1d140dc2b0ed7e938fa765d39d33b6faa12ea34e0fc098085ea54a40384ad82c
-size 4411108
diff --git a/libpod-1.5.1.tar.xz b/libpod-1.5.1.tar.xz
new file mode 100644
index 0000000..b1d054c
--- /dev/null
+++ b/libpod-1.5.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f658f971ef96916577e9aee48cc971b0f1cc40d589ea7caa0d81cafc34f9fac4
+size 4300652
diff --git a/storage-1.12.16.tar.xz b/storage-1.12.16.tar.xz
deleted file mode 100644
index 97cee0a..0000000
--- a/storage-1.12.16.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1a6daf5a26f5a837e81500be45d1c86deb46294bcde15afa02ca1e0d657b527b
-size 2960684
diff --git a/storage-1.13.2.tar.xz b/storage-1.13.2.tar.xz
new file mode 100644
index 0000000..f3db8ec
--- /dev/null
+++ b/storage-1.13.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b61e99aec0cd213bf12bd62ed4caa26819ecc3e40757d5dcec6869d3eff25da0
+size 2972860