From 5e7b2de2610cdd3e13c44978cacc3c282944a0a7 Mon Sep 17 00:00:00 2001
From: Leo <thinkabit.ukim@gmail.com>
Date: Fri, 15 Nov 2019 15:19:40 +0100
Subject: testing/consul: upgrade to 1.6.2

---
 testing/consul/APKBUILD | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'testing')

diff --git a/testing/consul/APKBUILD b/testing/consul/APKBUILD
index 5fe1219c5a..8a9eb92945 100644
--- a/testing/consul/APKBUILD
+++ b/testing/consul/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Olivier Mauras <olivier@mauras.ch>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=consul
-pkgver=1.6.1
+pkgver=1.6.2
 pkgrel=0
 pkgdesc="Tool for service discovery, monitoring and configuration"
 url="https://www.consul.io"
@@ -12,7 +12,7 @@ install="$pkgname.pre-install"
 pkgusers="consul"
 pkggroups="consul"
 subpackages="$pkgname-openrc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/hashicorp/$pkgname/archive/v$pkgver.tar.gz
+source="consul-$pkgver.tar.gz::https://github.com/hashicorp/consul/archive/v$pkgver.tar.gz
 	consul.initd
 	consul.confd
 	acl.json.sample
@@ -28,20 +28,16 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
-
 	GOPATH="$srcdir" go build -v -o bin/$pkgname \
 		-ldflags "-X github.com/hashicorp/consul/version.GitDescribe='$pkgver'" \
 		--tags consul
 }
 
 check() {
-	cd "$builddir"
 	GOPATH="$srcdir" go test
 }
 
 package() {
-	cd "$builddir"
 	# Consul init script
 	install -m755 -D "$srcdir"/$pkgname.initd \
 		"$pkgdir"/etc/init.d/$pkgname
@@ -62,7 +58,12 @@ package() {
 	done
 }
 
-sha512sums="67e2032bd128288b0177f23fbacaa8c289682a88ad75a744e583619e9cf9426747f3e129be89080eb2f7c8d186a9c25899d3a4ac3c0cce73b9433bb29ba18ab2  consul-1.6.1.tar.gz
+cleanup_srcdir() {
+	go clean -modcache
+	default_cleanup_srcdir
+}
+
+sha512sums="2df67854b85fa27600bf2cd57c913669f784019ee5a25b20a950ab00a403ca0562d74cb73c3402ebcec6cd951d7b9b4eb80c926746bcc27050db85f31192f826  consul-1.6.2.tar.gz
 74c2581bcafa119b4fc8ce72cf0c73584316a4bf3007130ae8864e97a91dcc4aab15f39faa423d90bfa667e26db11f7f581982f9fe7e1870df72e2dc0240676a  consul.initd
 f2c5af74dfcbca2fea8ebea31139d93f44455b93ef17ec611b880d7071af4125615dbbd23969d0d04ca636c26d7b4e7eb97f1266baa89252097f4cbc5173d817  consul.confd
 d4310dde63d3b8fc4791124bd255bf2a1402b86d00f6b1732e18b0caedb75eae6c77382e1a48f12469828ef4bb363db4580fb1aafa63fcdc97b1431f6ea96d58  acl.json.sample
-- 
cgit v1.2.3