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

[Morten Linderud]

    Date: Friday, September 11, 2020 @ 22:45:02
  Author: foxboron
Revision: 702894

upgpkg: containerd 1.4.0-3 - Fixes FS#67773 aka "my docker is broken"

Modified:
  containerd/trunk/PKGBUILD

----------+
 PKGBUILD |   21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-11 22:33:15 UTC (rev 702893)
+++ PKGBUILD	2020-09-11 22:45:02 UTC (rev 702894)
@@ -6,7 +6,7 @@
 pkgname=containerd
 pkgver="1.4.0"
 _commit=09814d48d50816305a8e6c1a4ae3e2bcc4ba725a
-pkgrel=2
+pkgrel=3
 pkgdesc='An open and reliable container runtime'
 url='https://containerd.io/'
 depends=('runc')
@@ -13,8 +13,12 @@
 makedepends=('go' 'git' 'btrfs-progs' 'libseccomp')
 arch=('x86_64')
 license=("Apache")
-source=("$pkgname-$pkgver.tar.gz::https://github.com/containerd/containerd/archive/v$pkgver.tar.gz")
-sha256sums=('d6284c69e1933e4c05fe285feebef461efe8cd2030634dcf1cbdcde46abe86be')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/containerd/containerd/archive/v$pkgver.tar.gz"
+        "consume-fifo.patch::https://github.com/containerd/containerd/commit/9efd7381811e46b78f5b1f7bb2119ceb02eb5a82.patch"
+        "fix-health.patch::https://github.com/containerd/containerd/commit/5f9d15eaac5d20b252f956bd80da94ec1b8244f5.patch")
+sha256sums=('d6284c69e1933e4c05fe285feebef461efe8cd2030634dcf1cbdcde46abe86be'
+            'a1f044e05b411a7f48de5ba7c572dfa45e075b1ecf521129f2b3319bb6aae3b1'
+            '432be5cb48649a35c456676119a3ec86ac51cbc2d8fed7e41033de1c8e019d8b')
 
 prepare() {
   mkdir -p src/github.com/containerd
@@ -22,17 +26,16 @@
 
   # fix paths in service
   sed -i 's,/sbin,/usr/bin,;s,/usr/local,/usr,' $pkgname-$pkgver/containerd.service
+
+  cd $pkgname-$pkgver
+  patch -Np1 < "$srcdir/consume-fifo.patch"
+  patch -Np1 < "$srcdir/fix-health.patch"
 }
 
 build() {
   export GOPATH="$srcdir"
   cd src/github.com/containerd/containerd
-  export CGO_LDFLAGS="$LDFLAGS"
-  export CGO_CPPFLAGS="${CPPFLAGS}"
-  export CGO_CFLAGS="${CFLAGS}"
-  export CGO_CXXFLAGS="${CXXFLAGS}"
-  export CGO_LDFLAGS="${LDFLAGS}"
-  export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
+  export GOFLAGS="-trimpath -mod=readonly -modcacherw"
   make VERSION=v$pkgver.m REVISION=$_commit.m
 }