[arch-commits] Commit in podman/trunk (5 files)

[David Runge]

    Date: Wednesday, August 3, 2022 @ 08:34:12
  Author: dvzrv
Revision: 1259971

upgpkg: podman 4.1.1-3: Rebuild to apply patch for catatonit location.

The catatonit binary is now packaged in /usr/lib/podman/catatonit, but podman implicitly defaults to /usr/libexec/podman/catatonit (somewhere).
Apply patch to set the default location in /etc/containers/containers.conf by uncommenting init_path.
https://bugs.archlinux.org/task/75493
Pin a commit representing a tag, instead of using a tag directly (as it may move).

Added:
  podman/trunk/keys/
  podman/trunk/keys/pgp/
  podman/trunk/keys/pgp/B7DBDCA456F7335E91F1C25CD3624C551D0515C4.asc
  podman/trunk/podman-4.1.1-libexec.patch
Modified:
  podman/trunk/PKGBUILD

-------------------------------------------------------+
 PKGBUILD                                              |   17 +++++++++++++---
 keys/pgp/B7DBDCA456F7335E91F1C25CD3624C551D0515C4.asc |    1 
 podman-4.1.1-libexec.patch                            |   13 ++++++++++++
 3 files changed, 28 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-03 08:28:41 UTC (rev 1259970)
+++ PKGBUILD	2022-08-03 08:34:12 UTC (rev 1259971)
@@ -5,7 +5,8 @@
 pkgbase=podman
 pkgname=(podman podman-docker)
 pkgver=4.1.1
-pkgrel=2
+_commit=2ab593258b45c8071f8407ef2403227503fc4534  # refs/tags/v4.1.1
+pkgrel=3
 pkgdesc='Tool and library for running OCI-based containers in pods'
 arch=(x86_64)
 url='https://github.com/containers/podman'
@@ -13,11 +14,15 @@
 makedepends=(apparmor btrfs-progs catatonit device-mapper go go-md2man git gpgme libseccomp systemd)
 # https://github.com/containers/podman/issues/13297
 options=(!lto)
-source=(git+$url#tag=v$pkgver?signed)
+source=(
+  git+$url#tag=$_commit?signed
+  $pkgname-4.1.1-libexec.patch
+)
 validpgpkeys=(
   'B7DBDCA456F7335E91F1C25CD3624C551D0515C4'  # Matthew Heon <mheon at redhat.com>
 )
-sha256sums=('SKIP')
+sha256sums=('SKIP'
+            '42a4475ffad503193d9dfc2637ecfa585b595f6a132c4b80932ae74d8c975596')
 
 pkgver() {
   cd $pkgname
@@ -24,6 +29,12 @@
   git describe --tags | sed 's/^v//;s/-/+/g'
 }
 
+prepare() {
+  # uncomment init_path in containers.conf as it defaults to using /usr/libexec/podman otherwise:
+  # https://bugs.archlinux.org/task/75493
+  patch -Np1 -d $pkgname -i ../$pkgname-4.1.1-libexec.patch
+}
+
 build() {
   # NOTE: the BUILDTAGS may change over time
   export BUILDTAGS='apparmor seccomp systemd'

Added: keys/pgp/B7DBDCA456F7335E91F1C25CD3624C551D0515C4.asc
===================================================================
(Binary files differ)

Index: podman/trunk/keys/pgp/B7DBDCA456F7335E91F1C25CD3624C551D0515C4.asc
===================================================================
--- keys/pgp/B7DBDCA456F7335E91F1C25CD3624C551D0515C4.asc	2022-08-03 08:28:41 UTC (rev 1259970)
+++ keys/pgp/B7DBDCA456F7335E91F1C25CD3624C551D0515C4.asc	2022-08-03 08:34:12 UTC (rev 1259971)

Property changes on: podman/trunk/keys/pgp/B7DBDCA456F7335E91F1C25CD3624C551D0515C4.asc
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pgp-keys
\ No newline at end of property
Added: podman-4.1.1-libexec.patch
===================================================================
--- podman-4.1.1-libexec.patch	                        (rev 0)
+++ podman-4.1.1-libexec.patch	2022-08-03 08:34:12 UTC (rev 1259971)
@@ -0,0 +1,13 @@
+diff --git i/vendor/github.com/containers/common/pkg/config/containers.conf w/vendor/github.com/containers/common/pkg/config/containers.conf
+index a4e755a66..27b625f82 100644
+--- i/vendor/github.com/containers/common/pkg/config/containers.conf
++++ w/vendor/github.com/containers/common/pkg/config/containers.conf
+@@ -146,7 +146,7 @@ default_sysctls = [
+ 
+ # Container init binary, if init=true, this is the init binary to be used for containers.
+ #
+-#init_path = "/usr/libexec/podman/catatonit"
++init_path = "/usr/lib/podman/catatonit"
+ 
+ # Default way to to create an IPC namespace (POSIX SysV IPC) for the container
+ # Options are: