upgpkg: obfs4proxy 0.0.12-1

Upstream release.

Switch to GitLab and update Go build environment.

2 files changed, 17 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8d56ab48a609..c2ba736f8903 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = obfs4proxy
 	pkgdesc = The obfourscator - a pluggable transport proxy written in Go
-	pkgver = 0.0.11
+	pkgver = 0.0.12
 	pkgrel = 1
-	url = https://gitweb.torproject.org/pluggable-transports/obfs4.git/
+	url = https://gitlab.com/yawning/obfs4
 	arch = i686
 	arch = x86_64
 	arch = armv6h
@@ -12,7 +12,7 @@ pkgbase = obfs4proxy
 	makedepends = git
 	makedepends = go
 	optdepends = tor: you need tor to use this package
-	source = https://people.torproject.org/~yawning/releases/obfs4proxy/obfs4proxy-0.0.11.tar.xz
-	sha512sums = 7d7fef951bcebd4433dfb638896d4be15dc090d38a3b54c9a9d34ea264b006cff75a42da1b97b6af998cfbc3b44919770cd8cb519ada351486a247faf47c656f
+	source = https://gitlab.com/yawning/obfs4/-/archive/obfs4proxy-0.0.12/obfs4-obfs4proxy-0.0.12.tar.bz2
+	sha512sums = 9243470d5b96be5ffd9e942f54b57624c3aa0f5a3a3287ccb9bcb2d399d1612114b2fb7fb28f8fb4cb15e8e282cffd2db616f40d82ee0e8f79fb9d8eadaeafbd
 
 pkgname = obfs4proxy
diff --git a/PKGBUILD b/PKGBUILD
index d21da7e266d6..9cf24628e812 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,24 +2,31 @@
 # Contributor: shyokou <shyokou at gmail dot com>
 # Contributor: FzerorubigD <Fzerorubigd {AT} GMail {DOT} com>
 pkgname=obfs4proxy
-pkgver=0.0.11
+pkgver=0.0.12
 pkgrel=1
 pkgdesc='The obfourscator - a pluggable transport proxy written in Go'
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
-url='https://gitweb.torproject.org/pluggable-transports/obfs4.git/'
+url='https://gitlab.com/yawning/obfs4'
 license=('BSD')
 makedepends=('git' 'go')
 optdepends=('tor: you need tor to use this package')
-source=("https://people.torproject.org/~yawning/releases/obfs4proxy/obfs4proxy-${pkgver}.tar.xz")
-sha512sums=('7d7fef951bcebd4433dfb638896d4be15dc090d38a3b54c9a9d34ea264b006cff75a42da1b97b6af998cfbc3b44919770cd8cb519ada351486a247faf47c656f')
+source=("https://gitlab.com/yawning/obfs4/-/archive/obfs4proxy-${pkgver}/obfs4-obfs4proxy-${pkgver}.tar.bz2")
+sha512sums=('9243470d5b96be5ffd9e942f54b57624c3aa0f5a3a3287ccb9bcb2d399d1612114b2fb7fb28f8fb4cb15e8e282cffd2db616f40d82ee0e8f79fb9d8eadaeafbd')
 
 build()	{
-  cd "${srcdir}/"
+  export GOPATH="$srcdir"
+  export CGO_CPPFLAGS="${CPPFLAGS}"
+  export CGO_CFLAGS="${CFLAGS}"
+  export CGO_CXXFLAGS="${CXXFLAGS}"
+  export CGO_LDFLAGS="${LDFLAGS}"
+  export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
+
+  cd "${srcdir}/obfs4-obfs4proxy-${pkgver}"
   GOPATH="${srcdir}/go" go build -o obfs4proxy/obfs4proxy ./obfs4proxy
 }
 
 package()	{
-  cd "${srcdir}/"
+  cd "${srcdir}/obfs4-obfs4proxy-${pkgver}"
   install -Dm0755 obfs4proxy/obfs4proxy "${pkgdir}/usr/bin/obfs4proxy"
   install -Dm0644 doc/obfs4proxy.1 "${pkgdir}/usr/share/man/man1/obfs4proxy.1"
   install -Dm0644 ChangeLog "${pkgdir}/usr/share/doc/${pkgname}/ChangeLog"