diff --git a/testing/obfs4proxy/APKBUILD b/testing/obfs4proxy/APKBUILD index 5f47a4795bc..1f8c8194e0e 100644 --- a/testing/obfs4proxy/APKBUILD +++ b/testing/obfs4proxy/APKBUILD @@ -2,47 +2,28 @@ # Maintainer: Katie Holly pkgname=obfs4proxy pkgver=0.0.11 -pkgrel=1 +pkgrel=2 pkgdesc="pluggable transport proxy for Tor, implementing obfs4" url="https://gitweb.torproject.org/pluggable-transports/obfs4.git/" arch="x86_64 x86 armv7" license="BSD-3-Clause" -makedepends="go glide" +makedepends="go" options="!strip chmod-clean" -source="$pkgname-$pkgver.tar.gz::https://github.com/Yawning/obfs4/archive/obfs4proxy-$pkgver.tar.gz - glide.yaml - glide.lock - " +source="$pkgname-$pkgver.tar.gz::https://github.com/Yawning/obfs4/archive/obfs4proxy-$pkgver.tar.gz" builddir="$srcdir"/obfs4-$pkgname-$pkgver -_godir="$srcdir"/go -_vendordir="$_godir"/src/git.torproject.org/pluggable-transports/obfs4.git -unpack() { - default_unpack - mkdir -p "$_godir"/bin "$_vendordir" "$builddir/.glide" "$builddir/.glidetmp" - rmdir "$_vendordir" - ln -sf "$builddir" "$_vendordir" - cp "$srcdir"/glide.yaml "$srcdir"/glide.lock "$_vendordir" -} +export GOPATH="$srcdir" build() { - cd "$_vendordir" - export GOPATH="$_godir" - export PATH="$PATH:$GOPATH" - GLIDE_HOME="$builddir/.glide" GLIDE_TMP="$builddir/.glidetmp" glide install go build -v -o ./$pkgname-executable ./$pkgname } check() { - cd "$_vendordir" go test -short ./... } package() { - mkdir -p "$pkgdir"/usr/bin install -Dm755 $pkgname-executable "$pkgdir"/usr/bin/$pkgname } -sha512sums="3eb50bc8067802f8260e0926999a659919e55cb34247f443f66a4852c9ceceacae361602a57ad1fd28a84e4ed54f3800c3258e67266eb23d45b1d09e31c5d869 obfs4proxy-0.0.11.tar.gz -5531b275dc7954b46382f3e01a5d014cc9e06df001c08d80861c6a65e3110d1152219c76231f4ab0f81d95cff3bebcf4b6c687fd65ec8b0980364a716b9a08c2 glide.yaml -e1a8de9a26d3ae49cf7feb53d16b75c19827a4a04e84a0f44412da25f49152205da17c5be832bd94c0688d7e078679350bd8c0ff9c9fbe3eb9cefed42bedfe2f glide.lock" +sha512sums="3eb50bc8067802f8260e0926999a659919e55cb34247f443f66a4852c9ceceacae361602a57ad1fd28a84e4ed54f3800c3258e67266eb23d45b1d09e31c5d869 obfs4proxy-0.0.11.tar.gz" diff --git a/testing/obfs4proxy/glide.lock b/testing/obfs4proxy/glide.lock deleted file mode 100644 index 159b228616f..00000000000 --- a/testing/obfs4proxy/glide.lock +++ /dev/null @@ -1,25 +0,0 @@ -hash: 784b5b8f5e754ef8f63a01e552ceb75767be4ecdc1735996e68c46114bcff6bf -updated: 2018-02-22T10:55:09.464159938Z -imports: -- name: git.torproject.org/pluggable-transports/goptlib.git - version: a3ad5df6c9e7dc8117f55958b4ce99bf1e0fe291 -- name: github.com/agl/ed25519 - version: 5312a61534124124185d41f09206b9fef1d88403 - subpackages: - - edwards25519 - - extra25519 -- name: github.com/dchest/siphash - version: 4ebf1de738443ea7f45f02dc394c4df1942a126d -- name: golang.org/x/crypto - version: dc137beb6cce2043eb6b5f223ab8bf51c32459f4 - subpackages: - - curve25519 - - hkdf - - nacl/secretbox - - poly1305 - - salsa20/salsa -- name: golang.org/x/net - version: f2499483f923065a842d38eb4c7f1927e6fc6e6d - subpackages: - - proxy -testImports: [] diff --git a/testing/obfs4proxy/glide.yaml b/testing/obfs4proxy/glide.yaml deleted file mode 100644 index 6772cc244de..00000000000 --- a/testing/obfs4proxy/glide.yaml +++ /dev/null @@ -1,15 +0,0 @@ -package: git.torproject.org/pluggable-transports/obfs4.git -import: -- package: git.torproject.org/pluggable-transports/goptlib.git -- package: github.com/agl/ed25519 - subpackages: - - extra25519 -- package: github.com/dchest/siphash -- package: golang.org/x/crypto - subpackages: - - curve25519 - - hkdf - - nacl/secretbox -- package: golang.org/x/net - subpackages: - - proxy