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

[David Runge]

    Date: Friday, October 1, 2021 @ 10:54:17
  Author: dvzrv
Revision: 1026349

upgpkg: podman 3.4.0-1: Upgrade to 3.4.0.

Move all depends to package_podman().
Remove cherry-picked commit as it is included now.
Remove stale backup array.
Add apparmor to BUILDTAGS.
Add apparmor to podman's optdepends.
Remove crun from podman's optdepends (it is in depends).

Modified:
  podman/trunk/PKGBUILD

----------+
 PKGBUILD |   26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-10-01 08:40:13 UTC (rev 1026348)
+++ PKGBUILD	2021-10-01 10:54:17 UTC (rev 1026349)
@@ -4,17 +4,14 @@
 
 pkgbase=podman
 pkgname=(podman podman-docker)
-pkgver=3.3.1
+pkgver=3.4.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)
-depends=(cni-plugins conmon containers-common
-         device-mapper iptables libseccomp
-         crun slirp4netns libsystemd fuse-overlayfs)
-makedepends=(btrfs-progs go go-md2man git gpgme systemd)
-backup=('etc/cni/net.d/87-podman-bridge.conflist')
+makedepends=(apparmor btrfs-progs device-mapper go go-md2man git gpgme
+libseccomp systemd)
 source=("git+$url#tag=v$pkgver?signed")
 validpgpkeys=('B7DBDCA456F7335E91F1C25CD3624C551D0515C4'
               '7CE1E6F8C90CB53E7E4D8F2D502E08DB0BBF8EEE')
@@ -25,15 +22,9 @@
   git describe --tags | sed 's/^v//;s/-/+/g'
 }
 
-prepare(){
-  cd $pkgname
-  # Fix trimpath in makefile
-  # https://github.com/containers/podman/commit/e7b7c90bae1c65f61f524498e0ff152639f1ce04.patch 
-  git cherry-pick -n e7b7c90bae1c65f61f524498e0ff152639f1ce04  
-}
-
 build() {
-  export BUILDTAGS='seccomp systemd'
+  # NOTE: the BUILDTAGS may change over time
+  export BUILDTAGS='apparmor seccomp systemd'
   export CGO_CPPFLAGS="${CPPFLAGS}"
   export CGO_CFLAGS="${CFLAGS}"
   export CGO_CXXFLAGS="${CXXFLAGS}"
@@ -45,11 +36,12 @@
 }
 
 package_podman() {
-  depends+=('libgpgme.so')
-  optdepends+=('podman-docker: for Docker-compatible CLI'
+  depends=(cni-plugins conmon containers-common crun fuse-overlayfs iptables
+  libdevmapper.so libgpgme.so libseccomp.so slirp4netns)
+  optdepends=('apparmor: for AppArmor support'
               'btrfs-progs: support btrfs backend devices'
               'catatonit: --init flag support'
-              'crun: support for unified cgroupsv2')
+              'podman-docker: for Docker-compatible CLI')
 
   cd $pkgname
   make install install.completions DESTDIR="$pkgdir" PREFIX=/usr