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

[David Runge]

    Date: Saturday, August 13, 2022 @ 11:19:21
  Author: dvzrv
Revision: 1265948

upgpkg: containers-common 1:0.49.1-1: Upgrade to 0.49.1

Upgrade image to 5.22.0.
Upgrade podman to 4.2.0.
Upgrade storage to 1.42.0.

Simplify creation and installation of man pages (when go-md2man is called manually).

Modified:
  containers-common/trunk/PKGBUILD

----------+
 PKGBUILD |   69 +++++++++++++++++++++++++++++--------------------------------
 1 file changed, 33 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-13 10:32:19 UTC (rev 1265947)
+++ PKGBUILD	2022-08-13 11:19:21 UTC (rev 1265948)
@@ -1,14 +1,14 @@
 # Maintainer: David Runge <dvzrv at archlinux.org>
 
 pkgname=containers-common
-pkgver=0.48.0
-pkgrel=2
+pkgver=0.49.1
+pkgrel=1
 epoch=1
-_image_pkgver=5.21.1
-_podman_pkgver=4.1.1
+_image_pkgver=5.22.0
+_podman_pkgver=4.2.0
 _shortnames_pkgver=2022.02.08
 _skopeo_pkgver=1.9.2
-_storage_pkgver=1.40.3
+_storage_pkgver=1.42.0
 pkgdesc="Configuration files and manpages for containers"
 arch=(any)
 url="https://github.com/containers"
@@ -36,19 +36,19 @@
   mounts.conf
   $pkgname-0.48.0-init_path.patch
 )
-sha512sums=('82d823899a39e6d08de5e8880edc5af41165188d9a54346b0ddb0a27e3697af3a4b33e9905fa87ae9e545a0bb5f68fea9a88ae2268e252f0fe20852a41e80057'
-            'd4d6d6dc9e1359dbf23165d0f636eeb89246efa89c2b38cb5760e3cec6439234fb708a72e8ec5d07fe8bf9a12ef81b9040c03d70cacff2764c926a3f77d133b0'
-            '19dd2800b59dacf7edd5d8204bdaffa0959910c7751b582f5a12b8d644b52f9d6581b9c3b4cba3ddb0707f6a90c0dbc93de6d8e2eaa6a4234ebb9dfa28e693b3'
+sha512sums=('c918c4ba3a5bdcb5164f4fe8b7fc949fc8ddec1a6819b42859383902f41b845d1989ed8abbdd272b812372116505a899e0d632a247f6b79a6e52c446e5a29fdd'
+            '1b286ddd527d47a11f57af74c8f171ae8ec129678bed8b12476737672655548a1218732b27152c80437f1367b1878f80144e569e77c01ff6c05d659f49bcf694'
+            'bc9e28d9938127f91be10ea8bc6c6f638a01d74d120efad5ad1e72c5f7b893685871e83872434745bc72ecaca430355b0f59d302660e8b4a53cc88a88cc37f9c'
             '8d9aad3a6190f0c9bdd85485423dc257408b27088300f8a891615bf47f3ef16e02035d69ea15a75a93f375e6e7ad465f90951725e4ee1509463f05447c7ce174'
-            '62f7b0d49095dbd55d6556e7631ac672883b1f2cc1aa05cd95befa11977a73838f16f45d72aa8cd087d39989143c1964b6689e58e0368b9b70b69c7ad9537b3d'
+            'c8a4fdfbc71915dd3a1d5c1fabef4be7641b8a0edb14805719d93bc9de5bd8fe150636c4457fa544487a6bccbb0f58ad36ca3990d6ca3c2b73935418aaf98f22'
             'd0f72ad6f86cc1bcb0f02d9c29d3a982c541679098e417410c8f1a3df42550753e4f491efdec09dc02fe3ab4e3f5d8971c8ab9e964293e6b4e1f1261191b3501'
             '11fa515bbb0686d2b49c4fd2ab35348cb19f9c6780d6eb951a33b07ed7b7c72a676627f36e8c74e1a2d15e306d4537178f0e127fd3490f6131d078e56b46d5e1'
             '4a6526d01f192f0eb4dcbd28c019a2b0db6dc2128af644e8e89992e5dcfa45a02c739b06ee01e22606b5cb847213c002f8ab5f87a576846ac73f73eed9b2b469')
-b2sums=('cfb3f20f1a3ee7559e580ae1b7b3cc771852e346ed73d42c5c0458db16f97457e99d5812af3e00dbd1d2a7a7f5e6ea52ee4165a5ad21dedf214258ef5142885c'
-        'f5bb2350a3d32e444e06c163ec1afe7a3bb1cc8dd8d382ab5016b5583bc0a6dafe34225f39ad13e3b5f0ead37f090010424e87ebf6402dd4068d7124eac21bf8'
-        'a094785ccb7a84a42147fb0f0360480ad4f73a1cdaa29b666fabb08528584f5d37b1cf8fb807351d4a60d81779de4dec3ab5fc83275061eded21f97fd3fa5e7f'
+b2sums=('952ea2307d2347fda89a71b2ac7bb647f15031b5e83a9b9974e6b3da65469846fe28ab1ce9117eefb07d8ffb22781918c76daa88b2da0160e6e9daffbcabcb4e'
+        'f8e06fb6441112d6fa47e168f6f3d20309d292f5acf4008d64248643b4b4e10bdaa73701d5cdf8ffa7e38018880f5456386b141aeea451969ae23bb14261e9f9'
+        'a3b8d8b140b9d34e24f87f998fff3558649487b503bdd437f537f09adc51819d81786b6b4e858ef4e8a43c0d872cd20cd1ceee06988a36f830b9ffbb5109d14d'
         'd40786fc1d7af5c4293c6eb3aeab6672a2c1535cda5c7abaa03126c99ab5676838ccd7095a58ec75213a17e2cee1cfd25f337ba7406676330b5e97603b804cab'
-        '0bebcee0eea8830b3c8fe0ab901688f7dbb3928743a3a8b390140e7ac12b29b252c626e211e446016f6acd6372fee9a2bd08b3e61a76cb66c59ea5d81b3ec6d0'
+        '3cca3833695bb5e15a0ab5d97d5f72e14102d8c6eee1c132932e4177f64ab9a171cf8486f4fe8d9e09a0537a325c988c6b766249c3c0843bb5f1b270a705b523'
         'da94f0fe514031d3f02cbc3524fb8ba2ffab1e53949bea009768663f487301c3029a026abff23771ebf73ee94868490cf1758ebee2646c95dc5406111fb12208'
         '2f4b0af3271103362a898e7fcc3ec05f06755902ad664ac3107bb8debb8b2ac0d50de311d5fc651279a817a56e3ff05864a7e77c0d8fc628ff7411bfb98c9b69'
         '89e95f468785f6ca1309b0de37921702bd4eb6fb191afc0d93454bec7b7096a1b84e19408b5a0abcdfd89ce2ebd228879cbc42a0d409425fb41caab6a8f049f5')
@@ -55,32 +55,35 @@
 
 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
+  patch -Np1 -d common-$pkgver -i ../$pkgname-0.48.0-init_path.patch
+  mkdir -vp build/{man1,man5}
 }
 
 build() {
+
   (
-    cd common-$pkgver/docs
-    for _man_page in *.md; do
-      go-md2man -in $_man_page -out ${_man_page//.md}
+    printf "Creating common man pages...\n"
+    cd common-$pkgver
+    for _man_page in docs/*.md pkg/hooks/docs/*.md; do
+      go-md2man -in $_man_page -out ../build/man5/$(basename ${_man_page//.md})
     done
   )
+
   (
-    cd image-$_image_pkgver/docs
+    printf "Creating image man pages...\n"
+    cd image-$_image_pkgver
     mkdir -vp man5
-    mv -v *.5.md man5/
-    for _man_page in *.md; do
-      go-md2man -in $_man_page -out ${_man_page//.md}.1
+    mv -v docs/*.5.md man5/
+    for _man_page in docs/*.md; do
+      go-md2man -in $_man_page -out ../build/man1/$(basename ${_man_page//.md}).1
     done
     for _man_page in man5/*.md; do
-      go-md2man -in $_man_page -out ${_man_page//.md}
+      go-md2man -in $_man_page -out ../build/man5/$(basename ${_man_page//.md})
     done
   )
+
   (
-    cd podman-$_podman_pkgver
-    go-md2man -in pkg/hooks/docs/oci-hooks.5.md -out oci-hooks.5
-  )
-  (
+    printf "Creating storage documentation...\n"
     cd storage-$_storage_pkgver
     make -C docs
   )
@@ -123,28 +126,19 @@
   install -vDm 644 mounts.conf -t "$pkgdir/etc/containers/"
 
   (
-    cd "common-$pkgver"
+    cd common-$pkgver
     # configs
     install -vDm 644 pkg/config/containers.conf -t "$pkgdir/etc/containers/"
     install -vDm 644 pkg/config/containers.conf -t "$pkgdir/usr/share/containers/"
     install -vDm 644 pkg/seccomp/seccomp.json -t "$pkgdir/etc/containers/"
     install -vDm 644 pkg/seccomp/seccomp.json -t "$pkgdir/usr/share/containers/"
-    # man pages
-    install -vDm 644 docs/*.5 -t "$pkgdir/usr/share/man/man5/"
   )
   (
     cd image-$_image_pkgver
     # configs
     install -vDm 644 registries.conf -t "$pkgdir/etc/containers/"
-    # man pages
-    install -vDm 644 docs/*.1 -t "$pkgdir/usr/share/man/man1/"
-    install -vDm 644 docs/man5/*.5 -t "$pkgdir/usr/share/man/man5/"
   )
   (
-    cd podman-$_podman_pkgver
-    install -vDm 644 *.5 -t "$pkgdir/usr/share/man/man5/"
-  )
-  (
     cd shortnames-$_shortnames_pkgver
     install -vDm 644 shortnames.conf "$pkgdir/etc/containers/registries.conf.d/00-shortnames.conf"
   )
@@ -163,4 +157,7 @@
     install -vDm 644 docs/*.1 -t "$pkgdir/usr/share/man/man1/"
     install -vDm 644 docs/*.5 -t "$pkgdir/usr/share/man/man5/"
   )
+  # man pages
+  install -vDm 644 build/man1/*.1 "$pkgdir/usr/share/man/man1/"
+  install -vDm 644 build/man5/*.5 "$pkgdir/usr/share/man/man5/"
 }