Date: Monday, April 17, 2023 @ 18:07:22
Author: foxboron
Revision: 1447019
archrelease: copy trunk to community-x86_64
Added:
podman/repos/community-x86_64/PKGBUILD
(from rev 1447018, podman/trunk/PKGBUILD)
podman/repos/community-x86_64/keys/
podman/repos/community-x86_64/podman-4.2.0-defaultinitpath.patch
(from rev 1447018, podman/trunk/podman-4.2.0-defaultinitpath.patch)
Deleted:
podman/repos/community-x86_64/PKGBUILD
podman/repos/community-x86_64/keys/
podman/repos/community-x86_64/podman-4.2.0-defaultinitpath.patch
------------------------------------+
PKGBUILD | 204 +++++++++++++++++------------------
podman-4.2.0-defaultinitpath.patch | 26 ++--
2 files changed, 117 insertions(+), 113 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-04-17 18:07:07 UTC (rev 1447018)
+++ PKGBUILD 2023-04-17 18:07:22 UTC (rev 1447019)
@@ -1,100 +0,0 @@
-# Maintainer: Morten Linderud <[email protected]>
-# Maintainer: David Runge <[email protected]>
-# Contributor: Bartłomiej Piotrowski <[email protected]>
-
-pkgbase=podman
-pkgname=(podman podman-docker)
-pkgver=4.4.4
-_commit=c8223435f49a860c8ac4281a85db39232745a7cb #refs/tags/v4.4.4^{}
-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
- git
- go
- go-md2man
- gpgme
- libseccomp
- systemd
-)
-# https://github.com/containers/podman/issues/13297
-options=(!lto)
-source=(
- git+$url#commit=$_commit?signed
- $pkgname-4.2.0-defaultinitpath.patch
-)
-validpgpkeys=(
- B7DBDCA456F7335E91F1C25CD3624C551D0515C4 # Matthew Heon <[email protected]>
- 7CE1E6F8C90CB53E7E4D8F2D502E08DB0BBF8EEE # Ashley Cui <[email protected]>
-)
-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
- # https://github.com/containers/common/issues/1110
- 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 -j1 EXTRA_LDFLAGS='-s -w -linkmode=external' PREFIX=/usr -C $pkgbase
- make docker-docs -C $pkgbase
-}
-
-package_podman() {
- depends=(
- catatonit
- conmon
- containers-common
- crun
- gcc-libs
- glibc
- iptables
- device-mapper libdevmapper.so
- gpgme libgpgme.so
- libseccomp libseccomp.so
- slirp4netns
- )
- optdepends=(
- 'apparmor: for AppArmor support'
- 'btrfs-progs: support btrfs backend devices'
- 'cni-plugins: for an alternative container-network-stack implementation'
- 'fuse-overlayfs: for storage driver in rootless environment'
- '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
-}
-
-package_podman-docker() {
- pkgdesc='Emulate Docker CLI using podman'
- depends=(
- podman
- sh
- )
- conflicts=(docker)
- provides=(docker)
-
- make -j1 install.docker-full DESTDIR="$pkgdir" PREFIX=/usr -C $pkgbase
-}
Copied: podman/repos/community-x86_64/PKGBUILD (from rev 1447018,
podman/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-04-17 18:07:22 UTC (rev 1447019)
@@ -0,0 +1,104 @@
+# Maintainer: Morten Linderud <[email protected]>
+# Maintainer: David Runge <[email protected]>
+# Contributor: Bartłomiej Piotrowski <[email protected]>
+
+pkgbase=podman
+pkgname=(podman podman-docker)
+pkgver=4.5.0
+_commit=75e3c12579d391b81d871fd1cded6cf0d043550a #refs/tags/v4.5.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
+ git
+ go
+ go-md2man
+ gpgme
+ libseccomp
+ systemd
+)
+# https://github.com/containers/podman/issues/13297
+options=(!lto)
+source=(
+ git+$url#commit=$_commit?signed
+ $pkgname-4.2.0-defaultinitpath.patch
+)
+# See the release-keys repository
+# https://github.com/containers/release-keys
+validpgpkeys=(
+ B7DBDCA456F7335E91F1C25CD3624C551D0515C4 # Matthew Heon <[email protected]>
+ 7CE1E6F8C90CB53E7E4D8F2D502E08DB0BBF8EEE # Ashley Cui <[email protected]>
+ 9E33DD8704CC03E2DEB84D9A1C1EDD7CC7C3A0DD # Lokesh Mandvekar
<[email protected]>
+)
+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
+ # https://github.com/containers/common/issues/1110
+ 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"
+ export GOPATH="${srcdir}"
+
+ make -j1 EXTRA_LDFLAGS='-compressdwarf=false -linkmode=external' PREFIX=/usr
-C $pkgbase
+ make docker-docs -C $pkgbase
+}
+
+package_podman() {
+ depends=(
+ catatonit
+ conmon
+ containers-common
+ crun
+ gcc-libs
+ glibc
+ iptables
+ device-mapper libdevmapper.so
+ gpgme libgpgme.so
+ libseccomp libseccomp.so
+ slirp4netns
+ )
+ optdepends=(
+ 'apparmor: for AppArmor support'
+ 'btrfs-progs: support btrfs backend devices'
+ 'cni-plugins: for an alternative container-network-stack implementation'
+ 'fuse-overlayfs: for storage driver in rootless environment'
+ '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
+}
+
+package_podman-docker() {
+ pkgdesc='Emulate Docker CLI using podman'
+ depends=(
+ podman
+ sh
+ )
+ conflicts=(docker)
+ provides=(docker)
+
+ make -j1 install.docker-full DESTDIR="$pkgdir" PREFIX=/usr -C $pkgbase
+}
Deleted: podman-4.2.0-defaultinitpath.patch
===================================================================
--- podman-4.2.0-defaultinitpath.patch 2023-04-17 18:07:07 UTC (rev 1447018)
+++ podman-4.2.0-defaultinitpath.patch 2023-04-17 18:07:22 UTC (rev 1447019)
@@ -1,13 +0,0 @@
-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.
Copied: podman/repos/community-x86_64/podman-4.2.0-defaultinitpath.patch (from
rev 1447018, podman/trunk/podman-4.2.0-defaultinitpath.patch)
===================================================================
--- podman-4.2.0-defaultinitpath.patch (rev 0)
+++ podman-4.2.0-defaultinitpath.patch 2023-04-17 18:07:22 UTC (rev 1447019)
@@ -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.
