Date: Wednesday, October 19, 2022 @ 21:17:08
Author: dvzrv
Revision: 1332926
archrelease: copy trunk to community-staging-any
Added:
containers-common/repos/community-staging-any/
containers-common/repos/community-staging-any/PKGBUILD
(from rev 1332925, containers-common/trunk/PKGBUILD)
containers-common/repos/community-staging-any/containers-common-0.48.0-init_path.patch
(from rev 1332925,
containers-common/trunk/containers-common-0.48.0-init_path.patch)
containers-common/repos/community-staging-any/mounts.conf
(from rev 1332925, containers-common/trunk/mounts.conf)
------------------------------------------+
PKGBUILD | 163 +++++++++++++++++++++++++++++
containers-common-0.48.0-init_path.patch | 13 ++
mounts.conf | 3
3 files changed, 179 insertions(+)
Copied: containers-common/repos/community-staging-any/PKGBUILD (from rev
1332925, containers-common/trunk/PKGBUILD)
===================================================================
--- community-staging-any/PKGBUILD (rev 0)
+++ community-staging-any/PKGBUILD 2022-10-19 21:17:08 UTC (rev 1332926)
@@ -0,0 +1,163 @@
+# Maintainer: David Runge <[email protected]>
+
+pkgname=containers-common
+pkgver=0.50.1
+pkgrel=1
+epoch=1
+_image_pkgver=5.23.0
+_podman_pkgver=4.3.0
+_shortnames_pkgver=2022.02.08
+_skopeo_pkgver=1.10.0
+_storage_pkgver=1.43.0
+pkgdesc="Configuration files and manpages for containers"
+arch=(any)
+url="https://github.com/containers";
+license=(Apache)
+depends=('container-network-stack>1')
+makedepends=(go-md2man)
+checkdepends=(ripgrep)
+backup=(
+ etc/containers/containers.conf
+ etc/containers/mounts.conf
+ etc/containers/policy.json
+ etc/containers/registries.conf
+ etc/containers/seccomp.json
+ etc/containers/storage.conf
+)
+# configuration override directories need to exist
+options=(emptydirs)
+source=(
+
common-$pkgver.tar.gz::https://github.com/containers/common/archive/v$pkgver.tar.gz
+
image-$_image_pkgver.tar.gz::https://github.com/containers/image/archive/v$_image_pkgver.tar.gz
+
podman-$_podman_pkgver.tar.gz::https://github.com/containers/podman/archive/v$_podman_pkgver.tar.gz
+
skopeo-$_skopeo_pkgver.tar.gz::https://github.com/containers/skopeo/archive/v$_skopeo_pkgver.tar.gz
+
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=('33af155650ac1b1a728a1c52d8056ac2fcac39c44ab050515149bb76e81b488f45673f13d642a963dd7594dc743c98053c95669605a64e058e1f4fba05a68889'
+
'4e35b4494607414308dc86c854a03a2af5580d02c0e2aa984e06e20c303fcd865c7344dda72e48d08120a8d4fdb28ce76a937507ec99a16cc428d37bd12303d7'
+
'b5b70e83a67ccfea149cb7df87a452d51fbb5e87ab3d1c6b4f623ba0f8f8a25442cee6ae8b8d31ea844f08c3ea4962e865ddb90e61c185dfad29d3b23aa8338f'
+
'0d64e7f12a0d10c81074a04b6c74ed6e7213f598013f1ba672c4c696e9dad5827f41f41bb817263bf8606cd051b8e24e7eab65b95d73d8a1c8bbb3eaeb9defdb'
+
'7e479086a75ebf0b9ba1bfd3824bbb3f15a337e967aa0f69ac762d93515f49813a5245b7c835765d7a0b6c1fc6baa5041e152e6036f264242d7307c8e72810bb'
+
'd0f72ad6f86cc1bcb0f02d9c29d3a982c541679098e417410c8f1a3df42550753e4f491efdec09dc02fe3ab4e3f5d8971c8ab9e964293e6b4e1f1261191b3501'
+
'11fa515bbb0686d2b49c4fd2ab35348cb19f9c6780d6eb951a33b07ed7b7c72a676627f36e8c74e1a2d15e306d4537178f0e127fd3490f6131d078e56b46d5e1'
+
'4a6526d01f192f0eb4dcbd28c019a2b0db6dc2128af644e8e89992e5dcfa45a02c739b06ee01e22606b5cb847213c002f8ab5f87a576846ac73f73eed9b2b469')
+b2sums=('7dc1f8137314e41799159f31ab002e2f5999fb8edef76e1481fba2691e695651817bdc7fe1104276ebdb8a2b682ed90b6caa758cbbd2e70061735593b880f043'
+
'86f8135651003dc1b15964600f9a9f86da83d820d5cbdbff43375b3bc6ffcdd944f8cade122bf5c2483ad821a566fd3a7d2a814fa23767c4b465b4177dec2ab1'
+
'530b5484abe774aacdb107162a68d98f15c0b5af7cf5c8a862fe9cb701cc3a57d2ed2bafe09517d3a3f9e09fa196b28eed6c6e2dabadaf663ad5ff0d1de97475'
+
'b904a161334ef0a3eaaab8c58f0c7e4c507fa68a09f8fa8235e8a9222d48c98874c9ce878a509e2816f210ffb37dbf707ff2653212e1efbd9ad6686efb97e147'
+
'75841fea436f06d1163dc9fc9e5604927de97054f6c54e7728c6ef91894ab412dd0bf3c220892fc91f9b4ff0fd58543e12b10e9834f18c3fea1934c5b02fe305'
+
'da94f0fe514031d3f02cbc3524fb8ba2ffab1e53949bea009768663f487301c3029a026abff23771ebf73ee94868490cf1758ebee2646c95dc5406111fb12208'
+
'2f4b0af3271103362a898e7fcc3ec05f06755902ad664ac3107bb8debb8b2ac0d50de311d5fc651279a817a56e3ff05864a7e77c0d8fc628ff7411bfb98c9b69'
+
'89e95f468785f6ca1309b0de37921702bd4eb6fb191afc0d93454bec7b7096a1b84e19408b5a0abcdfd89ce2ebd228879cbc42a0d409425fb41caab6a8f049f5')
+
+prepare() {
+ sed -r 's/(GOMD2MAN = ).*/\1 go-md2man/' -i
storage-$_storage_pkgver/docs/Makefile
+ patch -Np1 -d common-$pkgver -i ../$pkgname-0.48.0-init_path.patch
+ mkdir -vp build/{man1,man5}
+}
+
+build() {
+
+ (
+ 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
+ )
+
+ (
+ printf "Creating image man pages...\n"
+ cd image-$_image_pkgver
+ mkdir -vp man5
+ 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 ../build/man5/$(basename ${_man_page//.md})
+ done
+ )
+
+ (
+ printf "Creating storage documentation...\n"
+ cd storage-$_storage_pkgver
+ make -C docs
+ )
+}
+
+check() {
+ local _podman_common_ver
+ _podman_common_ver="$(rg "github.com/containers/common"
podman-$_podman_pkgver/go.mod | cut -d ' ' -f2 | sed 's/v//')"
+ _podman_image_ver="$(rg "github.com/containers/image"
podman-$_podman_pkgver/go.mod | cut -d ' ' -f2 | sed 's/v//')"
+ _podman_storage_ver="$(rg "github.com/containers/storage"
podman-$_podman_pkgver/go.mod | cut -d ' ' -f2 | sed 's/v//')"
+
+ printf "Common version in podman: %s\n" $_podman_common_ver
+ printf "Image version in podman: %s\n" $_podman_image_ver
+ printf "Storage version in podman: %s\n" $_podman_storage_ver
+
+ # NOTE: we are comparing the major.minor version of containers/common
required by podman with the one of containers/common that we are trying to build
+ # https://github.com/containers/common/issues/923
+ if (( $(vercmp "${_podman_common_ver%.*}" "${pkgver%.*}") != 0 )); then
+ printf "The podman package in version %s requires containers/common in
version %s but we are trying to build version %s\n" $_podman_pkgver
${_podman_common_ver%.*} ${pkgver%.*}
+ exit 1
+ fi
+ if (( $(vercmp "${_podman_image_ver%.*}" "${_image_pkgver%.*}") != 0 )); then
+ printf "The podman package in version %s requires containers/image in
version %s but we are trying to use version %s\n" $_podman_pkgver
${_podman_image_ver%.*} ${_image_pkgver%.*}
+ exit 1
+ fi
+ if (( $(vercmp "${_podman_storage_ver%.*}" "${_storage_pkgver%.*}") != 0 ));
then
+ printf "The podman package in version %s requires containers/storage in
version %s but we are trying to use version %s\n" $_podman_pkgver
${_podman_storage_ver%.*} ${_storage_pkgver%.*}
+ exit 1
+ fi
+}
+
+package() {
+ # directories
+ install -vdm 755 "$pkgdir/etc/containers/oci/hooks.d/"
+ install -vdm 755 "$pkgdir/etc/containers/registries.conf.d/"
+ install -vdm 755 "$pkgdir/usr/share/containers/oci/hooks.d/"
+ install -vdm 755 "$pkgdir/var/lib/containers/"
+
+ # configs
+ install -vDm 644 mounts.conf -t "$pkgdir/etc/containers/"
+
+ (
+ 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/"
+ )
+ (
+ cd image-$_image_pkgver
+ # configs
+ install -vDm 644 registries.conf -t "$pkgdir/etc/containers/"
+ )
+ (
+ cd shortnames-$_shortnames_pkgver
+ install -vDm 644 shortnames.conf
"$pkgdir/etc/containers/registries.conf.d/00-shortnames.conf"
+ )
+ (
+ cd skopeo-$_skopeo_pkgver
+ # configs
+ install -vDm 644 default-policy.json "$pkgdir/etc/containers/policy.json"
+ install -vDm 644 default.yaml -t "$pkgdir/etc/containers/registries.d/"
+ )
+ (
+ cd storage-$_storage_pkgver
+ # configs
+ install -vDm 644 storage.conf -t "$pkgdir/etc/containers/"
+ install -vDm 644 storage.conf -t "$pkgdir/usr/share/containers/"
+ # man pages
+ 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/"
+}
Copied:
containers-common/repos/community-staging-any/containers-common-0.48.0-init_path.patch
(from rev 1332925,
containers-common/trunk/containers-common-0.48.0-init_path.patch)
===================================================================
--- community-staging-any/containers-common-0.48.0-init_path.patch
(rev 0)
+++ community-staging-any/containers-common-0.48.0-init_path.patch
2022-10-19 21:17:08 UTC (rev 1332926)
@@ -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:
Copied: containers-common/repos/community-staging-any/mounts.conf (from rev
1332925, containers-common/trunk/mounts.conf)
===================================================================
--- community-staging-any/mounts.conf (rev 0)
+++ community-staging-any/mounts.conf 2022-10-19 21:17:08 UTC (rev 1332926)
@@ -0,0 +1,3 @@
+# Configuration file for default mounts in containers (see man 5
+# containers-mounts.conf for further information)
+
