From fbeee4de1d0b3ca0c00d6c6646b6637c63c3b671 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Pola=C5=84ski?= <michal@polanski.me>
Date: Fri, 17 Apr 2020 11:52:16 +0200
Subject: [PATCH] testing/podman: upgrade to 1.9.0
---
testing/podman/APKBUILD | 8 ++++----
testing/podman/libpod-config.patch | 12 ++++++++++--
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/testing/podman/APKBUILD b/testing/podman/APKBUILD
index 885a24e6b3e4..4639de63dfa0 100644
--- a/testing/podman/APKBUILD
+++ b/testing/podman/APKBUILD
@@ -1,14 +1,14 @@
# Contributor: Michał Polański <michal@polanski.me>
# Maintainer: Michał Polański <michal@polanski.me>
pkgname=podman
-pkgver=1.8.2
+pkgver=1.9.0
pkgrel=0
pkgdesc="Simple management tool for pods, containers, and images"
url="https://podman.io/"
options="!check" # TODO: enable tests
arch="all !mips !mips64" # fails to build on mips
license="Apache-2.0"
-depends="conmon cni-plugins runc iptables ip6tables slirp4netns shadow-uidmap skopeo"
+depends="conmon cni-plugins crun iptables ip6tables slirp4netns shadow-uidmap skopeo"
makedepends="go gpgme-dev libseccomp-dev libassuan-dev go-md2man btrfs-progs-dev bash"
subpackages="$pkgname-doc
$pkgname-bash-completion:bashcomp:noarch
@@ -49,5 +49,5 @@ zshcomp() {
"$subpkgdir"/usr/share/zsh/site-functions/_$pkgname
}
-sha512sums="c6e1426f66299a21be66be033460c44830b422f8a3319f37bbe53030f6a2bf84b140a29f30b83f6b61199f1df373f81a6d73787d16423ad942fc8a9154c68366 podman-1.8.2.tar.gz
-fb0997502e996ed0b1e99b11970380d4e7a61ab1aa0bf54ec925edd7defbbe2fec67f4cb28ab4a6f0de4ba770ca11c952893a35a0c71f10bd2c3d19f3c836803 libpod-config.patch"
+sha512sums="ba7de72e03dc55896025b698465745873f3030547e19133b835e4f47c1cd1c0261f17845d50cbe7b824db2a9ed77def7883405637333e141f7abecada644b5be podman-1.9.0.tar.gz
+5b21c99940ed1d81ef0ae1bb0e192b92158d84d0f227d1170e03b63e6062806a1093bd345c26279bfb66a01c721ac589f17ef095e35c89f052405d2af09a6032 libpod-config.patch"
diff --git a/testing/podman/libpod-config.patch b/testing/podman/libpod-config.patch
index 5d41a731288b..784241f45030 100644
--- a/testing/podman/libpod-config.patch
+++ b/testing/podman/libpod-config.patch
@@ -1,5 +1,5 @@
diff --git a/libpod.conf b/libpod.conf
-index 7e0228c1..c767b80d 100644
+index 1bc31eb4c..278551726 100644
--- a/libpod.conf
+++ b/libpod.conf
@@ -24,10 +24,10 @@ conmon_env_vars = [
@@ -23,4 +23,12 @@ index 7e0228c1..c767b80d 100644
"/usr/libexec/cni",
"/usr/lib/cni",
"/usr/local/lib/cni",
-
+@@ -116,7 +117,7 @@ num_locks = 2048
+ # detach_keys = "ctrl-p,ctrl-q"
+
+ # Default OCI runtime
+-runtime = "runc"
++runtime = "crun"
+
+ # List of the OCI runtimes that support --format=json. When json is supported
+ # libpod will use it for reporting nicer errors.
--
GitLab