[arch-commits] Commit in containers-common/trunk (2 files)

[David Runge]

    Date: Wednesday, August 3, 2022 @ 21:14:27
  Author: dvzrv
Revision: 1260164

upgpkg: containers-common 1:0.48.0-2: Rebuild to upgrade components.

Upgrade podman to 4.1.1.
Upgrade skopeo to 1.9.2.
Upgrade storage to 1.40.3.

Add patch to set default init_path in containers.conf to the correct location.

Added:
  containers-common/trunk/containers-common-0.48.0-init_path.patch
Modified:
  containers-common/trunk/PKGBUILD

------------------------------------------+
 PKGBUILD                                 |   28 ++++++++++++++++------------
 containers-common-0.48.0-init_path.patch |   13 +++++++++++++
 2 files changed, 29 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-03 21:11:45 UTC (rev 1260163)
+++ PKGBUILD	2022-08-03 21:14:27 UTC (rev 1260164)
@@ -2,13 +2,13 @@
 
 pkgname=containers-common
 pkgver=0.48.0
-pkgrel=1
+pkgrel=2
 epoch=1
 _image_pkgver=5.21.1
-_podman_pkgver=4.1.0
+_podman_pkgver=4.1.1
 _shortnames_pkgver=2022.02.08
-_skopeo_pkgver=1.7.0
-_storage_pkgver=1.40.2
+_skopeo_pkgver=1.9.2
+_storage_pkgver=1.40.3
 pkgdesc="Configuration files and manpages for containers"
 arch=(any)
 url="https://github.com/containers"
@@ -34,24 +34,28 @@
   storage-$_storage_pkgver.tar.gz::https://github.com/containers/storage/archive/v$_storage_pkgver.tar.gz
   shortnames-$_shortnames_pkgver.tar.gz::https://github.com/containers/shortnames/archive/refs/tags/v$_shortnames_pkgver.tar.gz
   mounts.conf
+  $pkgname-0.48.0-init_path.patch
 )
 sha512sums=('82d823899a39e6d08de5e8880edc5af41165188d9a54346b0ddb0a27e3697af3a4b33e9905fa87ae9e545a0bb5f68fea9a88ae2268e252f0fe20852a41e80057'
             'd4d6d6dc9e1359dbf23165d0f636eeb89246efa89c2b38cb5760e3cec6439234fb708a72e8ec5d07fe8bf9a12ef81b9040c03d70cacff2764c926a3f77d133b0'
-            '4d5f240423f21b1224ce44853a2265359dacee0d921f0ea53a7fca34f9076ebfaa49f4327a59ac51f5bf5b9dafb47dda3a9bb8e609237cc69f833b42b95bcd0a'
-            '7d17f98e86677150fb2ddba9edae18d8b1ac8f06fba575268e6ba54c60f7b371b5e5a9eab1a4fe19da6c7e85eb79c1eef169ad2a39eff979130ee8d141bd8d6b'
-            'f4ff23e26d9103debc1709cbbbc6e715d2b9378a3bd7c2e72393841b2eb499ffce525526aa53bd1f7985cda87962a98f1d0b4601610f7cee8c9c879957575ad2'
+            '19dd2800b59dacf7edd5d8204bdaffa0959910c7751b582f5a12b8d644b52f9d6581b9c3b4cba3ddb0707f6a90c0dbc93de6d8e2eaa6a4234ebb9dfa28e693b3'
+            '8d9aad3a6190f0c9bdd85485423dc257408b27088300f8a891615bf47f3ef16e02035d69ea15a75a93f375e6e7ad465f90951725e4ee1509463f05447c7ce174'
+            '62f7b0d49095dbd55d6556e7631ac672883b1f2cc1aa05cd95befa11977a73838f16f45d72aa8cd087d39989143c1964b6689e58e0368b9b70b69c7ad9537b3d'
             'd0f72ad6f86cc1bcb0f02d9c29d3a982c541679098e417410c8f1a3df42550753e4f491efdec09dc02fe3ab4e3f5d8971c8ab9e964293e6b4e1f1261191b3501'
-            '11fa515bbb0686d2b49c4fd2ab35348cb19f9c6780d6eb951a33b07ed7b7c72a676627f36e8c74e1a2d15e306d4537178f0e127fd3490f6131d078e56b46d5e1')
+            '11fa515bbb0686d2b49c4fd2ab35348cb19f9c6780d6eb951a33b07ed7b7c72a676627f36e8c74e1a2d15e306d4537178f0e127fd3490f6131d078e56b46d5e1'
+            '4a6526d01f192f0eb4dcbd28c019a2b0db6dc2128af644e8e89992e5dcfa45a02c739b06ee01e22606b5cb847213c002f8ab5f87a576846ac73f73eed9b2b469')
 b2sums=('cfb3f20f1a3ee7559e580ae1b7b3cc771852e346ed73d42c5c0458db16f97457e99d5812af3e00dbd1d2a7a7f5e6ea52ee4165a5ad21dedf214258ef5142885c'
         'f5bb2350a3d32e444e06c163ec1afe7a3bb1cc8dd8d382ab5016b5583bc0a6dafe34225f39ad13e3b5f0ead37f090010424e87ebf6402dd4068d7124eac21bf8'
-        '6d01a65b13494dc948c0667147eca6f250a81056f1bcf6eda6285566b8aa7aa526794ea96a571aecad642a8b1d3d1877cd31683ccf46662f8681a2afac083b5a'
-        '990ad594df9483ad114debeb2882ed3976306d69983ae3d91d807e2654583e7a6599ddf50152df9a937c1c64c1e5a8abb6ed83433036e7efd4ef7e911f99c191'
-        '980f714e86bb198687b351876e1bb55a6a115e5aa1c73b1c54f63f57ee75727a3b720322b62300c21de30982b5028c82f6ca94d9457e35f9e88d67de96a2f16f'
+        'a094785ccb7a84a42147fb0f0360480ad4f73a1cdaa29b666fabb08528584f5d37b1cf8fb807351d4a60d81779de4dec3ab5fc83275061eded21f97fd3fa5e7f'
+        'd40786fc1d7af5c4293c6eb3aeab6672a2c1535cda5c7abaa03126c99ab5676838ccd7095a58ec75213a17e2cee1cfd25f337ba7406676330b5e97603b804cab'
+        '0bebcee0eea8830b3c8fe0ab901688f7dbb3928743a3a8b390140e7ac12b29b252c626e211e446016f6acd6372fee9a2bd08b3e61a76cb66c59ea5d81b3ec6d0'
         'da94f0fe514031d3f02cbc3524fb8ba2ffab1e53949bea009768663f487301c3029a026abff23771ebf73ee94868490cf1758ebee2646c95dc5406111fb12208'
-        '2f4b0af3271103362a898e7fcc3ec05f06755902ad664ac3107bb8debb8b2ac0d50de311d5fc651279a817a56e3ff05864a7e77c0d8fc628ff7411bfb98c9b69')
+        '2f4b0af3271103362a898e7fcc3ec05f06755902ad664ac3107bb8debb8b2ac0d50de311d5fc651279a817a56e3ff05864a7e77c0d8fc628ff7411bfb98c9b69'
+        '89e95f468785f6ca1309b0de37921702bd4eb6fb191afc0d93454bec7b7096a1b84e19408b5a0abcdfd89ce2ebd228879cbc42a0d409425fb41caab6a8f049f5')
 
 prepare() {
   sed -r 's/(GOMD2MAN = ).*/\1 go-md2man/' -i storage-$_storage_pkgver/docs/Makefile
+  patch -Np1 -d common-0.48.0 -i ../$pkgname-0.48.0-init_path.patch
 }
 
 build() {

Added: containers-common-0.48.0-init_path.patch
===================================================================
--- containers-common-0.48.0-init_path.patch	                        (rev 0)
+++ containers-common-0.48.0-init_path.patch	2022-08-03 21:14:27 UTC (rev 1260164)
@@ -0,0 +1,13 @@
+diff --git i/pkg/config/containers.conf w/pkg/config/containers.conf
+index a4e755a6..f13c7860 100644
+--- i/pkg/config/containers.conf
++++ w/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: