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

[Jan Steffens]

    Date: Friday, April 24, 2020 @ 11:12:08
  Author: heftig
Revision: 619238

1.3.4-1

Modified:
  containerd/trunk/PKGBUILD

----------+
 PKGBUILD |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-24 11:12:07 UTC (rev 619237)
+++ PKGBUILD	2020-04-24 11:12:08 UTC (rev 619238)
@@ -4,7 +4,7 @@
 # Contributor: Iwan Timmer <irtimmer at gmail.com>
 
 pkgname=containerd
-pkgver=1.3.3
+pkgver=1.3.4
 _commit=d76c121f76a5fc8a462dc64594aea72fe18e1178
 pkgrel=1
 pkgdesc='An open and reliable container runtime'
@@ -13,13 +13,20 @@
 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=('f5a3079210660a65a4ba36e322da03b465a83f18af563d33c4ef841ccb4411ae')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/containerd/containerd/archive/v$pkgver.tar.gz"
+        bbolt-1.3.4.tar.gz::https://github.com/etcd-io/bbolt/archive/v1.3.4.tar.gz)
+sha256sums=('374d0c944985a64a7f31da4018aaa6d7a0b123122633ce28ab04cf1203f785b8'
+            '536029610c6cd08e4a9fe2e1b0857ae539b0736850132cbbe1c18f0fbed8a4da')
 
 
 prepare() {
+  # Update bbolt to fix tests with go 1.14
+  rm -r $pkgname-$pkgver/vendor/go.etcd.io/bbolt
+  ln -rTsf bbolt-1.3.4 $pkgname-$pkgver/vendor/go.etcd.io/bbolt
+
   mkdir -p src/github.com/containerd
   ln -rTsf $pkgname-$pkgver src/github.com/containerd/containerd
+
   # fix paths in service
   sed -i 's,/sbin,/usr/bin,;s,/usr/local,/usr,' $pkgname-$pkgver/containerd.service
 }