aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDDoSolitary <DDoSolitary@gmail.com>2021-04-01 02:49:39 +0800
committerLeo <thinkabit.ukim@gmail.com>2021-04-01 16:37:48 +0000
commita9e1bc8a1b9326916ac0d545d8787af395d723d7 (patch)
treecfa7ea71ceaaa1ce3d7802d6ac197b121fc28494
parent3636ac59fc6a81e0d054e94cee6679e10f3c8ea5 (diff)
downloadaports-a9e1bc8a1b9326916ac0d545d8787af395d723d7.tar.gz
aports-a9e1bc8a1b9326916ac0d545d8787af395d723d7.tar.bz2
aports-a9e1bc8a1b9326916ac0d545d8787af395d723d7.tar.xz
testing/meek: upgrade to 0.35.0
- upstream added go mod support, so remove use of glide here. - Tor's gitweb no longer provides snapshots, so we have to do git clone directly.
-rw-r--r--testing/meek/APKBUILD49
-rw-r--r--testing/meek/glide.lock25
-rw-r--r--testing/meek/glide.yaml9
3 files changed, 16 insertions, 67 deletions
diff --git a/testing/meek/APKBUILD b/testing/meek/APKBUILD
index 67e0355728..1590b90c8e 100644
--- a/testing/meek/APKBUILD
+++ b/testing/meek/APKBUILD
@@ -1,46 +1,44 @@
# Contributor: kpcyrd <git@rxv.cc>
# Maintainer: kpcyrd <git@rxv.cc>
pkgname=meek
-pkgver=0.30
-pkgrel=3
+pkgver=0.35.0
+pkgrel=0
pkgdesc="A pluggable transport proxy written in Go"
url="https://trac.torproject.org/projects/tor/wiki/doc/meek"
arch="all"
license="CC0-1.0"
depends="ca-certificates"
-makedepends="glide go libcap"
+makedepends="go libcap"
subpackages="$pkgname-doc
$pkgname-server
"
# no test suite available
-options="!check"
-source="$pkgname-$pkgver.tar.gz::https://gitweb.torproject.org/pluggable-transports/$pkgname.git/snapshot/$pkgname-$pkgver.tar.gz
- glide.lock
- glide.yaml
- "
+options="!check chmod-clean"
builddir="$srcdir/src/$pkgname"
prepare() {
- mkdir -p ${builddir%/*}
- mv "$srcdir/$pkgname-$pkgver" "$builddir"
+ mkdir -p "$srcdir/src"
+ cd "$srcdir/src"
+ git clone https://git.torproject.org/pluggable-transports/meek.git
cd "$builddir"
- cp "$srcdir"/glide.yaml "$srcdir"/glide.lock .
+ git checkout "v$pkgver"
export GOPATH="$srcdir"
- glide install --skip-test
+ go mod vendor
default_prepare
}
build() {
- cd "$builddir"
export GOPATH="$srcdir"
- go build -v -ldflags "-s -w" \
- -o meek-client/meek-client ./meek-client/...
- go build -v -ldflags "-s -w" \
- -o meek-server/meek-server ./meek-server/...
+ for proj in meek-client meek-server; do
+ go build -v \
+ -trimpath \
+ -mod=vendor \
+ -ldflags "-s -w -extldflags '$LDFLAGS'" \
+ -o $proj/$proj ./$proj/...
+ done
}
package() {
- cd "$builddir"
install -Dm 755 meek-client/meek-client "$pkgdir/usr/bin/meek-client"
mkdir -p "$pkgdir/usr/share/man/man1"
@@ -61,18 +59,3 @@ server() {
"$subpkgdir/usr/bin/meek-server"
setcap 'cap_net_bind_service=+ep' "$subpkgdir/usr/bin/meek-server"
}
-
-glide_init() {
- abuild clean deps unpack prepare
- cd "$builddir"
- export GOPATH="$srcdir"
- rm -f glide.yaml glide.lock
- glide init --non-interactive
- glide update
- cp glide.yaml glide.lock "$startdir"
- cd "$startdir" && abuild checksum clean
-}
-
-sha512sums="5dd989d6800f4aaca9e5f66acf325afbb4fea70a8347a1fdff77381b28d5b9762f9d7a45b4375086d9167e1a407e53aa1d1b3203eaa09e3f8e36f2a9805dcc3d meek-0.30.tar.gz
-ccbd369ec5319ed6057c2d980e77612c1f1c2ec8f63a24f8e4dba3ee4f6c2b041050d49753c96f9f7e4d1c759ce0f023fa620250022a1699fbf45893e71fa555 glide.lock
-6c04650f2b09db98f3fdce52cc4a2720f16ea3cdf6165dd75ea4f20785138a42635ad608c64b749767a58933ed5115ed720a3a03005f0a426ea1e5e379ff26cd glide.yaml"
diff --git a/testing/meek/glide.lock b/testing/meek/glide.lock
deleted file mode 100644
index aafbe4dd92..0000000000
--- a/testing/meek/glide.lock
+++ /dev/null
@@ -1,25 +0,0 @@
-hash: ebadb3f691ad2a4b1d80941e8ba0049959860146e8a5f28bc3eec7d9b4a2bd56
-updated: 2018-04-16T21:02:35.672083878Z
-imports:
-- name: git.torproject.org/pluggable-transports/goptlib.git
- version: 7d56ec4f381e8b1aedfda360594e35a5731b5337
-- name: golang.org/x/crypto
- version: f70185d77e8278766928032ee1355e3da47e7181
- subpackages:
- - acme
- - acme/autocert
-- name: golang.org/x/net
- version: 61147c48b25b599e5b561d2e9c4f3e1ef489ca41
- subpackages:
- - http2
- - http2/hpack
- - idna
- - lex/httplex
-- name: golang.org/x/text
- version: 7922cc490dd5a7dbaa7fd5d6196b49db59ac042f
- subpackages:
- - secure/bidirule
- - transform
- - unicode/bidi
- - unicode/norm
-testImports: []
diff --git a/testing/meek/glide.yaml b/testing/meek/glide.yaml
deleted file mode 100644
index f8f3ae0ead..0000000000
--- a/testing/meek/glide.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-package: meek
-import:
-- package: git.torproject.org/pluggable-transports/goptlib.git
-- package: golang.org/x/crypto
- subpackages:
- - acme/autocert
-- package: golang.org/x/net
- subpackages:
- - http2