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

[Morten Linderud]

    Date: Saturday, January 11, 2020 @ 12:53:54
  Author: foxboron
Revision: 551894

archrelease: copy trunk to community-x86_64

Added:
  podman/repos/community-x86_64/PKGBUILD
    (from rev 551893, podman/trunk/PKGBUILD)
  podman/repos/community-x86_64/fix-makefile.patch
    (from rev 551893, podman/trunk/fix-makefile.patch)
Deleted:
  podman/repos/community-x86_64/PKGBUILD

--------------------+
 PKGBUILD           |  109 +++++++++++++++++++++++++--------------------------
 fix-makefile.patch |   13 ++++++
 2 files changed, 67 insertions(+), 55 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-11 12:53:45 UTC (rev 551893)
+++ PKGBUILD	2020-01-11 12:53:54 UTC (rev 551894)
@@ -1,55 +0,0 @@
-# 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
-}

Copied: podman/repos/community-x86_64/PKGBUILD (from rev 551893, podman/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-01-11 12:53:54 UTC (rev 551894)
@@ -0,0 +1,54 @@
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+
+pkgbase=podman
+pkgname=(podman podman-docker)
+pkgver=1.7.0
+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 runc skopeo
+         btrfs-progs slirp4netns libsystemd)
+makedepends=(go-pie go-md2man git)
+optdepends=('catatonit: --init flag support')
+source=("git+$url#tag=v$pkgver?signed"
+        "fix-makefile.patch")
+validpgpkeys=('B7DBDCA456F7335E91F1C25CD3624C551D0515C4')
+sha256sums=('SKIP'
+            '7dc9b1bb6b134196ca5125ba40c1f6d82c260a42bc929d9fb6142a5ac61a1c6a')
+
+prepare() {
+  cd libpod
+  patch -Np1 < "../fix-makefile.patch"
+}
+
+pkgver() {
+  cd libpod
+  git describe --tags | sed 's/^v//;s/-/+/g'
+}
+
+build() {
+  export BUILDTAGS='seccomp varlink  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/fix-makefile.patch (from rev 551893, podman/trunk/fix-makefile.patch)
===================================================================
--- fix-makefile.patch	                        (rev 0)
+++ fix-makefile.patch	2020-01-11 12:53:54 UTC (rev 551894)
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 3f87990f..c09fcd08 100644
+--- a/Makefile
++++ b/Makefile
+@@ -520,7 +520,7 @@ install.libseccomp.sudo:
+ 	cd ../../seccomp/libseccomp && git checkout --detach $(LIBSECCOMP_COMMIT) && ./autogen.sh && ./configure --prefix=/usr && make all && make install
+ 
+ 
+-cmd/podman/varlink/iopodman.go: cmd/podman/varlink/io.podman.varlink
++cmd/podman/varlink/iopodman.go: .gopathok cmd/podman/varlink/io.podman.varlink
+ 	GO111MODULE=off $(GO) generate ./cmd/podman/varlink/...
+ 
+ API.md: cmd/podman/varlink/io.podman.varlink