Update certspotter to 0.15.1

2 files changed, 8 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1e49b2014484..a0855883ef59 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = certspotter
 	pkgdesc = Certificate Transparency Log Monitor
-	pkgver = 0.15.0
+	pkgver = 0.15.1
 	pkgrel = 1
 	url = https://github.com/SSLMate/certspotter
 	install = certspotter.install
@@ -13,9 +13,7 @@ pkgbase = certspotter
 	license = MPL2
 	makedepends = go>=1.19
 	makedepends = lowdown
-	source = certspotter-0.15.0-1.tar.gz::https://github.com/SSLMate/certspotter/archive/v0.15.0.tar.gz
-	source = certspotter-0.15.0-1-fix-errorf.diff::https://github.com/SSLMate/certspotter/pull/67.diff
-	sha512sums = e877894bafa3e9d33b756b85d25010392ab9a08d2b2bd3b839665396bd7225a52c1b119495217d4bfd14de15845f12529a87b4d638d4c56e5016fba73fd52f4f
-	sha512sums = 9a27893c2ddbb7634e4316b63f7b6ba4686a44d27b9d128f627514fface7251f154d4dbb1300ba39d1290149a3c0879d232f523681cf577ddcc9e8b519fae0eb
+	source = certspotter-0.15.1-1.tar.gz::https://github.com/SSLMate/certspotter/archive/v0.15.1.tar.gz
+	sha512sums = b814b09385666b5269fc5b09131f9917a85ad7489954ea2a5451f272d9c623f29983c63f4d33377f4a936a9324003db4877e786b6029a7e3467e8e4f67a8648c
 
 pkgname = certspotter
diff --git a/PKGBUILD b/PKGBUILD
index e466a1148660..5df04b417645 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Daniel Peukert <daniel@peukert.cc>
 pkgname='certspotter'
-pkgver='0.15.0'
+pkgver='0.15.1'
 pkgrel='1'
 pkgdesc='Certificate Transparency Log Monitor'
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
@@ -8,12 +8,8 @@ url="https://github.com/SSLMate/$pkgname"
 license=('MPL2')
 makedepends=('go>=1.19' 'lowdown')
 install="$pkgname.install"
-source=(
-	"$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/v$pkgver.tar.gz"
-	"$pkgname-$pkgver-$pkgrel-fix-errorf.diff::$url/pull/67.diff"
-)
-sha512sums=('e877894bafa3e9d33b756b85d25010392ab9a08d2b2bd3b839665396bd7225a52c1b119495217d4bfd14de15845f12529a87b4d638d4c56e5016fba73fd52f4f'
-            '9a27893c2ddbb7634e4316b63f7b6ba4686a44d27b9d128f627514fface7251f154d4dbb1300ba39d1290149a3c0879d232f523681cf577ddcc9e8b519fae0eb')
+source=("$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/v$pkgver.tar.gz")
+sha512sums=('b814b09385666b5269fc5b09131f9917a85ad7489954ea2a5451f272d9c623f29983c63f4d33377f4a936a9324003db4877e786b6029a7e3467e8e4f67a8648c')
 
 _sourcedirectory="$pkgname-$pkgver"
 _bindir="$pkgname-$pkgver-$pkgrel-bin"
@@ -22,10 +18,6 @@ _gopath="$pkgname-$pkgver-$pkgrel-gopath"
 prepare() {
 	mkdir -p "$srcdir/$_bindir/"
 	mkdir -p "$srcdir/$_gopath/"
-
-	# Apply errorf patch
-	cd "$srcdir/$_sourcedirectory/"
-	patch --forward -p1 < "$srcdir/$pkgname-$pkgver-$pkgrel-fix-errorf.diff"
 }
 
 build() {
@@ -35,7 +27,7 @@ build() {
 	export CGO_CFLAGS="${CFLAGS}"
 	export CGO_CXXFLAGS="${CXXFLAGS}"
 	export CGO_LDFLAGS="${LDFLAGS}"
-	export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
+	export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw -ldflags=-X=main.Version=v$pkgver"
 	go build -v -o "$srcdir/$_bindir/" './...'
 
 	# Build man pages
@@ -50,7 +42,7 @@ check() {
 	export CGO_CFLAGS="${CFLAGS}"
 	export CGO_CXXFLAGS="${CXXFLAGS}"
 	export CGO_LDFLAGS="${LDFLAGS}"
-	export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
+	export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw -ldflags=-X=main.Version=v$pkgver"
 	go test -v './...'
 }