Bump to 7.6.0, fix depends, fix license, add aarch64, fix RELRO. fix PIE

2 files changed, 31 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 188a0d051086..e3d33a9db6a5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,19 @@
 pkgbase = oauth2_proxy
 	pkgdesc = A reverse proxy that provides authentication with Google, Github or other providers.
-	pkgver = 7.5.1
+	pkgver = 7.6.0
 	pkgrel = 1
 	url = https://github.com/oauth2-proxy/oauth2-proxy
 	install = oauth2_proxy.install
 	arch = i686
 	arch = x86_64
+	arch = aarch64
 	license = MIT
 	makedepends = go
+	depends = glibc
 	backup = etc/oauth2_proxy.cfg
-	source = oauth2_proxy-7.5.1.tar.gz::https://github.com/oauth2-proxy/oauth2-proxy/archive/v7.5.1.tar.gz
+	source = oauth2_proxy-7.6.0.tar.gz::https://github.com/oauth2-proxy/oauth2-proxy/archive/v7.6.0.tar.gz
 	source = oauth2_proxy.service
-	sha256sums = 97de086ba98ce884da77d4031537f72496a059d14c60977c46824c24010096c8
+	sha256sums = 2beac9e817d59b37f2277efefeda68447418355792a60da709a80c278628fcd8
 	sha256sums = b8de9626474527b75cec9d23a621af4ef2d35ff13aff1a0b8a1a22fef262c970
 
 pkgname = oauth2_proxy
diff --git a/PKGBUILD b/PKGBUILD
index bf6b39a87270..f6fa92db2291 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,25 @@
 # Maintainer: Martin Rys <rys.pw/contact>
 # Previous maintainers: Luiz Ribeiro <luizribeiro@gmail.com>, Tom Wambold <tom5760@gmail.com>
 
+#Unresolved issues:
+#  https://bbs.archlinux.org/viewtopic.php?id=292194
+#  oauth2_proxy W: ELF file ('usr/bin/oauth2-proxy') lacks GNU_PROPERTY_X86_FEATURE_1_SHSTK.
+
+
 pkgname=oauth2_proxy
-pkgver=7.5.1
+pkgver=7.6.0
 pkgrel=1
 pkgdesc="A reverse proxy that provides authentication with Google, Github or other providers."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'aarch64')
 url="https://github.com/oauth2-proxy/oauth2-proxy"
 license=('MIT')
+depends=(glibc)
 makedepends=(go)
 backup=('etc/oauth2_proxy.cfg')
 install=oauth2_proxy.install
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/oauth2-proxy/oauth2-proxy/archive/v${pkgver}.tar.gz"
         'oauth2_proxy.service')
-sha256sums=('97de086ba98ce884da77d4031537f72496a059d14c60977c46824c24010096c8'
+sha256sums=('2beac9e817d59b37f2277efefeda68447418355792a60da709a80c278628fcd8'
             'b8de9626474527b75cec9d23a621af4ef2d35ff13aff1a0b8a1a22fef262c970')
 
 build() {
@@ -22,6 +28,22 @@ build() {
 	mv "oauth2-proxy-${pkgver}" github.com/oauth2-proxy/oauth2-proxy
 	mkdir -p deps dist
 
+	# Force fail on missing IBT / SHSTK
+	#	LDFLAGS+=' -Wl,-z,cet-report=error'
+		## github.com/oauth2-proxy/oauth2-proxy/v7
+		#/usr/lib/go/pkg/tool/linux_amd64/link: running gcc failed: exit status 1
+		#/usr/bin/ld: /tmp/go-link-1117948769/go.o: error: missing IBT and SHSTK properties
+		#/usr/bin/ld: /tmp/go-link-1117948769/000019.o: error: missing IBT and SHSTK properties
+		#collect2: error: ld returned 1 exit status
+
+	# oauth2_proxy W: ELF file ('usr/bin/oauth2-proxy') lacks FULL RELRO, check LDFLAGS.
+	# oauth2_proxy W: ELF file ('usr/bin/oauth2-proxy') lacks PIE.
+	# https://wiki.archlinux.org/title/Go_package_guidelines#Flags_and_build_options
+	export CGO_CPPFLAGS="${CPPFLAGS}"
+	export CGO_CFLAGS="${CFLAGS}"
+	export CGO_CXXFLAGS="${CXXFLAGS}"
+	export CGO_LDFLAGS="${LDFLAGS}"
+	export GOFLAGS="-buildmode=pie -ldflags=-linkmode=external -mod=readonly -modcacherw"
 	export GOPATH="$(pwd)/deps:$(realpath $(pwd)/..)"
 	cd github.com/oauth2-proxy/oauth2-proxy
 
@@ -36,6 +58,7 @@ package() {
 	mkdir -p "${pkgdir}/etc"
 	mkdir -p "${pkgdir}/usr/lib/systemd/system"
 
+	install -Dm 644 github.com/oauth2-proxy/oauth2-proxy/LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
 	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"