Bump to 7.4.0, remove go-gpm, move to sha256, properly name source

2 files changed, 26 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a3a89f24fff2..5f04efb91295 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,17 @@
 pkgbase = oauth2_proxy
 	pkgdesc = A reverse proxy that provides authentication with Google, Github or other providers.
-	pkgver = 7.1.3
-	pkgrel = 1
+	pkgver = 7.4.0
+	pkgrel = 2
 	url = https://github.com/oauth2-proxy/oauth2-proxy
 	install = oauth2_proxy.install
 	arch = i686
 	arch = x86_64
 	license = MIT
 	makedepends = go
-	makedepends = go-gpm
 	backup = etc/oauth2_proxy.cfg
-	source = https://github.com/oauth2-proxy/oauth2-proxy/archive/v7.1.3.tar.gz
+	source = oauth2_proxy-7.4.0.tar.gz::https://github.com/oauth2-proxy/oauth2-proxy/archive/v7.4.0.tar.gz
 	source = oauth2_proxy.service
-	md5sums = c2b9e7a9dd9661bbe7b6f5886d05d69d
-	md5sums = d74991327448729ed64c1369724f7857
+	sha256sums = f9c5791537b1286b5985b0123f19ad84d390a7fffc1edc1b7c50c5d66c67ebdd
+	sha256sums = b8de9626474527b75cec9d23a621af4ef2d35ff13aff1a0b8a1a22fef262c970
 
 pkgname = oauth2_proxy
-
diff --git a/PKGBUILD b/PKGBUILD
index dd5931413899..ad8a639828db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,39 @@
-# Maintainer: Luiz Ribeiro <luizribeiro@gmail.com>, Tom Wambold <tom5760@gmail.com>
+# Maintainer: Martin Rys <rys.pw/contact>
+# Previous maintainers: Luiz Ribeiro <luizribeiro@gmail.com>, Tom Wambold <tom5760@gmail.com>
+
 pkgname=oauth2_proxy
-pkgver=7.1.3
-pkgrel=1
+pkgver=7.4.0
+pkgrel=2
 pkgdesc="A reverse proxy that provides authentication with Google, Github or other providers."
 arch=('i686' 'x86_64')
 url="https://github.com/oauth2-proxy/oauth2-proxy"
 license=('MIT')
-makedepends=(go go-gpm)
+makedepends=(go)
 backup=('etc/oauth2_proxy.cfg')
 install=oauth2_proxy.install
-source=("https://github.com/oauth2-proxy/oauth2-proxy/archive/v$pkgver.tar.gz"
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/oauth2-proxy/oauth2-proxy/archive/v${pkgver}.tar.gz"
         'oauth2_proxy.service')
-md5sums=('c2b9e7a9dd9661bbe7b6f5886d05d69d'
-         'd74991327448729ed64c1369724f7857')
+sha256sums=('f9c5791537b1286b5985b0123f19ad84d390a7fffc1edc1b7c50c5d66c67ebdd'
+            'b8de9626474527b75cec9d23a621af4ef2d35ff13aff1a0b8a1a22fef262c970')
 
 build() {
-  mkdir -p github.com/oauth2-proxy
-
-  mv "oauth2-proxy-$pkgver" github.com/oauth2-proxy/oauth2-proxy
-
-  mkdir -p deps
-  mkdir -p dist
+	mkdir -p github.com/oauth2-proxy
 
-  export GOPATH="$(pwd)/deps:$(realpath $(pwd)/..)"
+	mv "oauth2-proxy-${pkgver}" github.com/oauth2-proxy/oauth2-proxy
+	mkdir -p deps dist
 
-  cd github.com/oauth2-proxy/oauth2-proxy
-  go-gpm install
+	export GOPATH="$(pwd)/deps:$(realpath $(pwd)/..)"
+	cd github.com/oauth2-proxy/oauth2-proxy
 
-  go build -o ../../../dist/oauth2-proxy -trimpath
+	go build -o ../../../dist/oauth2-proxy -trimpath
 }
 
 package() {
-  mkdir -p "$pkgdir/usr/bin"
-  mkdir -p "$pkgdir/etc"
-  mkdir -p "$pkgdir/usr/lib/systemd/system"
+	mkdir -p "${pkgdir}/usr/bin"
+	mkdir -p "${pkgdir}/etc"
+	mkdir -p "${pkgdir}/usr/lib/systemd/system"
 
-  install dist/oauth2-proxy "$pkgdir/usr/bin/oauth2-proxy"
-  install github.com/oauth2-proxy/oauth2-proxy/contrib/oauth2-proxy.cfg.example "$pkgdir/etc/oauth2_proxy.cfg"
-  install oauth2_proxy.service "$pkgdir/usr/lib/systemd/system/oauth2_proxy.service"
+	install dist/oauth2-proxy "${pkgdir}/usr/bin/oauth2-proxy"
+	install github.com/oauth2-proxy/oauth2-proxy/contrib/oauth2-proxy.cfg.example "${pkgdir}/etc/oauth2_proxy.cfg"
+	install oauth2_proxy.service "${pkgdir}/usr/lib/systemd/system/oauth2_proxy.service"
 }