[arch-commits] Commit in podman/repos/community-x86_64 (PKGBUILD PKGBUILD)

[Morten Linderud]

    Date: Saturday, November 23, 2019 @ 12:00:01
  Author: foxboron
Revision: 532060

archrelease: copy trunk to community-x86_64

Added:
  podman/repos/community-x86_64/PKGBUILD
    (from rev 532059, podman/trunk/PKGBUILD)
Deleted:
  podman/repos/community-x86_64/PKGBUILD

----------+
 PKGBUILD |  107 +++++++++++++++++++++++++++++++------------------------------
 1 file changed, 55 insertions(+), 52 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-23 11:59:54 UTC (rev 532059)
+++ PKGBUILD	2019-11-23 12:00:01 UTC (rev 532060)
@@ -1,52 +0,0 @@
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-
-pkgbase=podman
-pkgname=(podman podman-docker)
-pkgver=1.6.2
-pkgrel=1
-pkgdesc='Tool and library for running OCI-based containers in pods'
-arch=(x86_64)
-url='https://github.com/containers/libpod'
-license=(Apache)
-depends=(cni-plugins conmon device-mapper iptables libseccomp ostree runc skopeo
-         btrfs-progs slirp4netns libsystemd)
-makedepends=(go-pie go-md2man git)
-_commit=f3ffda1e08f19e9a6a88484136b5eed76533f21a
-source=("git+$url#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd libpod
-  git describe --tags | sed 's/^v//;s/-/+/g'
-}
-
-prepare() {
-  cd libpod
-  sed -i '/^LDFLAGS_PODMAN ?=/s/$(LDFLAGS)//' Makefile
-}
-
-build() {
-  export GOPATH="$srcdir"
-  export BUILDTAGS='seccomp ostree varlink containers_image_ostree_stub systemd'
-  export CGO_LDFLAGS=$LDFLAGS
-  export GOFLAGS="-trimpath"
-
-  cd libpod
-  make
-}
-
-package_podman() {
-  optdepends=('podman-docker: for Docker-compatible CLI')
-
-  cd libpod
-  make install install.completions install.config DESTDIR="$pkgdir" PREFIX=/usr
-}
-
-package_podman-docker() {
-  pkgdesc='Emulate Docker CLI using podman'
-  depends=(podman)
-  conflicts=(docker)
-
-  cd libpod
-  make install.docker DESTDIR="$pkgdir" PREFIX=/usr
-}

Copied: podman/repos/community-x86_64/PKGBUILD (from rev 532059, podman/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-11-23 12:00:01 UTC (rev 532060)
@@ -0,0 +1,55 @@
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+
+pkgbase=podman
+pkgname=(podman podman-docker)
+pkgver=1.6.3
+pkgrel=1
+pkgdesc='Tool and library for running OCI-based containers in pods'
+arch=(x86_64)
+url='https://github.com/containers/libpod'
+license=(Apache)
+depends=(cni-plugins conmon device-mapper iptables libseccomp ostree runc skopeo
+         btrfs-progs slirp4netns libsystemd)
+makedepends=(go-pie go-md2man git)
+_commit=9d087f6a766259ba53b224944f1b7b778035c370
+source=("git+$url#commit=$_commit"
+        "fix-makefile.patch::https://github.com/containers/libpod/commit/ca4c24cce1345ab8757cd9a590a0f099207150fa.patch")
+sha256sums=('SKIP'
+            'b94b7b07320e95e068972d697ae36a027bc48d173e1f52b96f7817e63e77f92f')
+
+pkgver() {
+  cd libpod
+  git describe --tags | sed 's/^v//;s/-/+/g'
+}
+
+prepare() {
+  cd libpod
+  sed -i '/^LDFLAGS_PODMAN ?=/s/$(LDFLAGS)//' Makefile
+  patch -Np1 < "../fix-makefile.patch"
+}
+
+build() {
+  export GOPATH="$srcdir"
+  export BUILDTAGS='seccomp ostree varlink containers_image_ostree_stub systemd'
+  export CGO_LDFLAGS=$LDFLAGS
+  export GOFLAGS="-trimpath"
+
+  cd libpod
+  make
+}
+
+package_podman() {
+  optdepends=('podman-docker: for Docker-compatible CLI')
+
+  cd libpod
+  make install install.completions install.config DESTDIR="$pkgdir" PREFIX=/usr
+}
+
+package_podman-docker() {
+  pkgdesc='Emulate Docker CLI using podman'
+  depends=(podman)
+  conflicts=(docker)
+
+  cd libpod
+  make install.docker DESTDIR="$pkgdir" PREFIX=/usr
+}