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

[David Runge]

    Date: Saturday, August 13, 2022 @ 10:32:02
  Author: dvzrv
Revision: 1265946

upgpkg: podman 4.2.0-1: Upgrade to 4.2.0.

Update patch to set default init_path.

Added:
  podman/trunk/podman-4.2.0-defaultinitpath.patch
Modified:
  podman/trunk/PKGBUILD
Deleted:
  podman/trunk/podman-4.1.1-defaultinitpath.patch

------------------------------------+
 PKGBUILD                           |   12 ++++++------
 podman-4.1.1-defaultinitpath.patch |   13 -------------
 podman-4.2.0-defaultinitpath.patch |   13 +++++++++++++
 3 files changed, 19 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-13 10:27:38 UTC (rev 1265945)
+++ PKGBUILD	2022-08-13 10:32:02 UTC (rev 1265946)
@@ -4,9 +4,9 @@
 
 pkgbase=podman
 pkgname=(podman podman-docker)
-pkgver=4.1.1
-_commit=2ab593258b45c8071f8407ef2403227503fc4534  # refs/tags/v4.1.1
-pkgrel=4
+pkgver=4.2.0
+_commit=f61a22df078836b18f0a9004156b7d8771e6d5ba  # refs/tags/v4.2.0
+pkgrel=1
 pkgdesc='Tool and library for running OCI-based containers in pods'
 arch=(x86_64)
 url='https://github.com/containers/podman'
@@ -16,13 +16,13 @@
 options=(!lto)
 source=(
   git+$url#tag=$_commit?signed
-  $pkgname-4.1.1-defaultinitpath.patch
+  $pkgname-4.2.0-defaultinitpath.patch
 )
 validpgpkeys=(
   'B7DBDCA456F7335E91F1C25CD3624C551D0515C4'  # Matthew Heon <mheon at redhat.com>
 )
 sha256sums=('SKIP'
-            '58c830aea7fc11abd69170f7e305763e16d8bad69f49632601dc1544d47fdbc0')
+            'e4d15d2cf45237ddff64d149956e9f9c0ce366bd0bdf8d98de65269f53d4885d')
 
 pkgver() {
   cd $pkgname
@@ -32,7 +32,7 @@
 prepare() {
   # set default init_path to /usr/lib/podman/catatonit
   # https://bugs.archlinux.org/task/75493
-  patch -Np1 -d $pkgname -i ../$pkgname-4.1.1-defaultinitpath.patch
+  patch -Np1 -d $pkgname -i ../$pkgname-4.2.0-defaultinitpath.patch
 }
 
 build() {

Deleted: podman-4.1.1-defaultinitpath.patch
===================================================================
--- podman-4.1.1-defaultinitpath.patch	2022-08-13 10:27:38 UTC (rev 1265945)
+++ podman-4.1.1-defaultinitpath.patch	2022-08-13 10:32:02 UTC (rev 1265946)
@@ -1,13 +0,0 @@
-diff --git i/vendor/github.com/containers/common/pkg/config/default.go w/vendor/github.com/containers/common/pkg/config/default.go
-index 8979a406b..4736e0188 100644
---- i/vendor/github.com/containers/common/pkg/config/default.go
-+++ w/vendor/github.com/containers/common/pkg/config/default.go
-@@ -47,7 +47,7 @@ const (
- 
- var (
- 	// DefaultInitPath is the default path to the container-init binary
--	DefaultInitPath = "/usr/libexec/podman/catatonit"
-+	DefaultInitPath = "/usr/lib/podman/catatonit"
- 	// DefaultInfraImage to use for infra container
- 	DefaultInfraImage = ""
- 	// DefaultRootlessSHMLockPath is the default path for rootless SHM locks

Added: podman-4.2.0-defaultinitpath.patch
===================================================================
--- podman-4.2.0-defaultinitpath.patch	                        (rev 0)
+++ podman-4.2.0-defaultinitpath.patch	2022-08-13 10:32:02 UTC (rev 1265946)
@@ -0,0 +1,13 @@
+diff --git i/vendor/github.com/containers/common/pkg/config/default.go w/vendor/github.com/containers/common/pkg/config/default.go
+index c7ddf90ee..639e8f6f9 100644
+--- i/vendor/github.com/containers/common/pkg/config/default.go
++++ w/vendor/github.com/containers/common/pkg/config/default.go
+@@ -50,7 +50,7 @@ const (
+ 
+ var (
+ 	// DefaultInitPath is the default path to the container-init binary.
+-	DefaultInitPath = "/usr/libexec/podman/catatonit"
++	DefaultInitPath = "/usr/lib/podman/catatonit"
+ 	// DefaultInfraImage is the default image to run as infrastructure containers in pods.
+ 	DefaultInfraImage = ""
+ 	// DefaultRootlessSHMLockPath is the default path for rootless SHM locks.