diff --git a/testing/meek/APKBUILD b/testing/meek/APKBUILD index 7a1f52abe4ceef1a167b2c7a12040b55f10eb038..8b5f3622b88695ba4fef5ea7f585aec179b5e900 100644 --- a/testing/meek/APKBUILD +++ b/testing/meek/APKBUILD @@ -1,8 +1,8 @@ # Contributor: kpcyrd # Maintainer: kpcyrd pkgname=meek -pkgver=0.35.0 -pkgrel=2 +pkgver=0.37.0 +pkgrel=0 pkgdesc="A pluggable transport proxy written in Go" url="https://trac.torproject.org/projects/tor/wiki/doc/meek" arch="all !riscv64" # fails to build on riscv64 @@ -19,11 +19,12 @@ builddir="$srcdir/src/$pkgname" prepare() { mkdir -p "$srcdir/src" cd "$srcdir/src" - git clone https://git.torproject.org/pluggable-transports/meek.git + git clone --depth 1 --branch "v$pkgver" https://git.torproject.org/pluggable-transports/meek.git cd "$builddir" - git checkout "v$pkgver" export GOPATH="$srcdir" go mod vendor + sed 's|./meek-client|/usr/bin/meek-client|g; + s|./meek-server|/usr/bin/meek-server|g' -i meek-*/torrc default_prepare } @@ -31,6 +32,7 @@ build() { export GOPATH="$srcdir" for proj in meek-client meek-server; do go build -v \ + -buildmode=pie \ -trimpath \ -mod=vendor \ -ldflags "-s -w -extldflags '$LDFLAGS'" \ @@ -39,13 +41,14 @@ build() { } package() { - install -Dm 755 meek-client/meek-client "$pkgdir/usr/bin/meek-client" + install -Dm755 meek-client/meek-client "$pkgdir/usr/bin/meek-client" - mkdir -p "$pkgdir/usr/share/man/man1" install -Dm644 doc/*.1 -t "$pkgdir/usr/share/man/man1" install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" install -Dm644 README "$pkgdir/usr/share/doc/$pkgname/README" + install -Dm644 meek-server/README "$pkgdir/usr/share/doc/$pkgname/README.meek-server" + install -Dm644 meek-client/torrc \ "$pkgdir/usr/share/doc/$pkgname/torrc.meek-client" install -Dm644 meek-server/torrc \