Rewrote certspotter

2 files changed, 20 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d6b411d99640..5496f09c21d5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
 pkgbase = certspotter
 	pkgdesc = Certificate Transparency Log Monitor
 	pkgver = 0.9
-	pkgrel = 4
+	pkgrel = 5
 	url = https://github.com/SSLMate/certspotter
 	arch = x86_64
 	license = MPL2
-	makedepends = git
-	makedepends = go-pie
-	source = certspotter-0.9-4.tar.gz::https://github.com/SSLMate/certspotter/archive/0.9.tar.gz
+	makedepends = go-pie>=1.5
+	makedepends = golang-golang-x-net
+	makedepends = golang-github-mreiferson-go-httpclient
+	source = certspotter-0.9-5.tar.gz::https://github.com/SSLMate/certspotter/archive/0.9.tar.gz
 	sha256sums = ea377ae70a0a754c6ec07ec63d23a0fd4b41be714d9e67a8603a858edc7309fa
 
 pkgname = certspotter
diff --git a/PKGBUILD b/PKGBUILD
index b8d098f96035..c0cc42ca9b50 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,34 @@
 # Maintainer: Daniel Peukert <dan.peukert@gmail.com>
 pkgname='certspotter'
 pkgver='0.9'
-pkgrel='4'
+pkgrel='5'
 pkgdesc='Certificate Transparency Log Monitor'
 arch=('x86_64')
 url="https://github.com/SSLMate/$pkgname"
 license=('MPL2')
-makedepends=('git' 'go-pie')
+makedepends=('go-pie>=1.5' 'golang-golang-x-net' 'golang-github-mreiferson-go-httpclient')
 source=("$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz")
 sha256sums=('ea377ae70a0a754c6ec07ec63d23a0fd4b41be714d9e67a8603a858edc7309fa')
 
-_gopath="$pkgname-$pkgver-$pkgrel-gopath"
+_builddir="$pkgname-$pkgver-$pkgrel-build"
+_buildpath="src/software.sslmate.com/src/$pkgname"
 
 prepare() {
-	mkdir -p "$srcdir/$_gopath/src/software.sslmate.com/src/"
-	mv "$srcdir/$pkgname-$pkgver/" "$srcdir/$_gopath/src/software.sslmate.com/src/$pkgname/"
-
-	export GOPATH="$srcdir/$_gopath"
-	go get -d -v "software.sslmate.com/src/$pkgname/cmd/$pkgname"
+	cd "$srcdir/"
+	mkdir -p "$_builddir/$(echo "$_buildpath" | rev | cut -d '/' -f 2- | rev)/"
+	mv "$pkgname-$pkgver/" "$_builddir/$_buildpath/"
 }
 
 build() {
-	export GOPATH="$srcdir/$_gopath"
-	go install -gcflags "all=-trimpath=$PWD" -asmflags "all=-trimpath=$PWD" -ldflags "-extldflags $LDFLAGS" "software.sslmate.com/src/$pkgname/cmd/$pkgname"
+	export GOPATH="$srcdir/$_builddir:/usr/share/gocode"
+	go build -v -trimpath -ldflags "-extldflags $LDFLAGS" -o "$srcdir/$pkgname-$pkgver-$pkgrel" "software.sslmate.com/src/$pkgname/cmd/$pkgname"
+}
+
+check() {
+	export GOPATH="$srcdir/$_builddir:/usr/share/gocode"
+	go test -v "$srcdir/$_builddir/$_buildpath/..."
 }
 
 package() {
-	install -Dm755 "$srcdir/$_gopath/bin/$pkgname" "$pkgdir/usr/bin/$pkgname"
+	install -Dm755 "$srcdir/$pkgname-$pkgver-$pkgrel" "$pkgdir/usr/bin/$pkgname"
 }