Date: Saturday, August 13, 2022 @ 10:32:19 Author: dvzrv Revision: 1265947
archrelease: copy trunk to community-staging-x86_64 Added: podman/repos/community-staging-x86_64/ podman/repos/community-staging-x86_64/PKGBUILD (from rev 1265946, podman/trunk/PKGBUILD) podman/repos/community-staging-x86_64/keys/ podman/repos/community-staging-x86_64/podman-4.2.0-defaultinitpath.patch (from rev 1265946, podman/trunk/podman-4.2.0-defaultinitpath.patch) ------------------------------------+ PKGBUILD | 74 +++++++++++++++++++++++++++++++++++ podman-4.2.0-defaultinitpath.patch | 13 ++++++ 2 files changed, 87 insertions(+) Copied: podman/repos/community-staging-x86_64/PKGBUILD (from rev 1265946, podman/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2022-08-13 10:32:19 UTC (rev 1265947) @@ -0,0 +1,74 @@ +# Maintainer: Morten Linderud <foxbo...@archlinux.org> +# Maintainer: David Runge <dv...@archlinux.org> +# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> + +pkgbase=podman +pkgname=(podman podman-docker) +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' +license=(Apache) +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=$_commit?signed + $pkgname-4.2.0-defaultinitpath.patch +) +validpgpkeys=( + 'B7DBDCA456F7335E91F1C25CD3624C551D0515C4' # Matthew Heon <mh...@redhat.com> +) +sha256sums=('SKIP' + 'e4d15d2cf45237ddff64d149956e9f9c0ce366bd0bdf8d98de65269f53d4885d') + +pkgver() { + cd $pkgname + git describe --tags | sed 's/^v//;s/-/+/g' +} + +prepare() { + # set default init_path to /usr/lib/podman/catatonit + # https://bugs.archlinux.org/task/75493 + patch -Np1 -d $pkgname -i ../$pkgname-4.2.0-defaultinitpath.patch +} + +build() { + # NOTE: the BUILDTAGS may change over time + export BUILDTAGS='apparmor seccomp systemd' + export CGO_CPPFLAGS="${CPPFLAGS}" + export CGO_CFLAGS="${CFLAGS}" + export CGO_CXXFLAGS="${CXXFLAGS}" + export CGO_LDFLAGS="${LDFLAGS}" + export GOFLAGS="-buildmode=pie -trimpath" + + make EXTRA_LDFLAGS='-s -w -linkmode=external' -C $pkgbase + make docker-docs -C $pkgbase +} + +package_podman() { + depends=(catatonit conmon containers-common crun iptables libdevmapper.so + libgpgme.so libseccomp.so slirp4netns) + optdepends=( + 'apparmor: for AppArmor support' + 'btrfs-progs: support btrfs backend devices' + 'netavark: for a new container-network-stack implementation' + 'podman-compose: for docker-compose compatibility' + 'podman-docker: for Docker-compatible CLI' + ) + + make install install.completions DESTDIR="$pkgdir" PREFIX=/usr LIBEXECDIR=/usr/lib -C $pkgbase + # remove man pages provided by containers-common + rm -rvf "$pkgdir/usr/share/man/man5" +} + +package_podman-docker() { + pkgdesc='Emulate Docker CLI using podman' + depends=(podman) + conflicts=(docker) + provides=(docker) + + make -j1 install.docker-full DESTDIR="$pkgdir" PREFIX=/usr -C $pkgbase +} Copied: podman/repos/community-staging-x86_64/podman-4.2.0-defaultinitpath.patch (from rev 1265946, podman/trunk/podman-4.2.0-defaultinitpath.patch) =================================================================== --- community-staging-x86_64/podman-4.2.0-defaultinitpath.patch (rev 0) +++ community-staging-x86_64/podman-4.2.0-defaultinitpath.patch 2022-08-13 10:32:19 UTC (rev 1265947) @@ -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.