Date: Saturday, May 9, 2020 @ 14:18:51 Author: foxboron Revision: 625963
archrelease: copy trunk to community-x86_64 Added: v2ray/repos/community-x86_64/PKGBUILD (from rev 625962, v2ray/trunk/PKGBUILD) v2ray/repos/community-x86_64/v2ray.service (from rev 625962, v2ray/trunk/v2ray.service) Deleted: v2ray/repos/community-x86_64/PKGBUILD v2ray/repos/community-x86_64/v2ray.service ---------------+ PKGBUILD | 115 +++++++++++++++++++++++--------------------------------- v2ray.service | 26 ++++++------ 2 files changed, 61 insertions(+), 80 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-05-09 14:18:42 UTC (rev 625962) +++ PKGBUILD 2020-05-09 14:18:51 UTC (rev 625963) @@ -1,67 +0,0 @@ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: pandada8 <panda...@gmail.com> - -pkgname=v2ray -pkgver=4.23.1 -pkgrel=1 -pkgdesc="A platform for building proxies to bypass network restrictions" -arch=('x86_64') -url="https://github.com/v2ray/v2ray-core" -license=('MIT') -depends=('glibc' 'v2ray-domain-list-community' 'v2ray-geoip') -makedepends=('go-pie' 'golang-golang-x-crypto' 'golang-golang-x-net' 'golang-golang-x-sys' 'git') -backup=(etc/v2ray/config.json) -source=("$pkgname-$pkgver.tar.gz::https://github.com/v2ray/v2ray-core/archive/v$pkgver.tar.gz" - 'v2ray.service') -sha512sums=('3f5244c201a1c8e348b3928ac5ad130596db39419166273af0c45a916d365544dea7b07368ab47744317321300df13061349610c2770e8e561b5df2db691eecd' - '79192646438bcbd13a5a88d0093b1b6d5df603a9c2241a6260babf16f9e98d75f9e04fb3a1d926eb809a81fa935d3ff47d39cc703c609dfc906146ca58272bc7') - -prepare() { - # Try to unpin go mods - rm v2ray-core-$pkgver/go.{mod,sum} - - export GOPATH="$srcdir/build:/usr/share/gocode" - mkdir -p "$srcdir"/build/src/v2ray.com - - # mv *.com *.io *.org *.net "$srcdir"/build/src/ - mv v2ray-core-$pkgver "$srcdir"/build/src/v2ray.com/core - - # Future makedepends - go get github.com/golang/protobuf/proto go.starlark.net/starlark go.starlark.net/syntax \ - google.golang.org/grpc github.com/gorilla/websocket github.com/refraction-networking/utls - - # Future checkdepends - go get github.com/golang/mock/gomock github.com/google/go-cmp/cmp \ - golang.org/x/sync/errgroup golang.org/x/xerrors github.com/miekg/dns h12.io/socks -} - -build() { - go build -trimpath \ - -ldflags "-extldflags ${LDFLAGS}" \ - -o v2ray v2ray.com/core/main - - go build -trimpath \ - -ldflags "-extldflags ${LDFLAGS}" \ - -o v2ctl v2ray.com/core/infra/control/main -} - -check() { - cd "$srcdir"/build/src/v2ray.com/core - go test -p 1 -tags json -v -timeout 30m v2ray.com/core/... -} - -package() { - cd "$srcdir"/build/src/v2ray.com/core - install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/v2ray/LICENSE - install -Dm644 release/config/systemd/v2ray.service "$pkgdir"/usr/lib/systemd/system/v2ray.service - sed -i -e 's|/usr/bin/v2ray/v2ray|/usr/lib/v2ray/v2ray|' \ - "$pkgdir"/usr/lib/systemd/system/v2ray.service - install -Dm644 release/config/*.json -t "$pkgdir"/etc/v2ray/ - install -Dm755 "$srcdir"/v2ray -t "$pkgdir"/usr/lib/v2ray/ - install -Dm755 "$srcdir"/v2ctl -t "$pkgdir"/usr/lib/v2ray/ - install -dm755 "$pkgdir"/usr/bin - ln -s ../lib/v2ray/v2ray "$pkgdir"/usr/bin/v2ray - ln -s ../lib/v2ray/v2ctl "$pkgdir"/usr/bin/v2ctl - - install -Dm644 "$srcdir"/v2ray.service "$pkgdir"/usr/lib/systemd/system/v2ray@.service -} Copied: v2ray/repos/community-x86_64/PKGBUILD (from rev 625962, v2ray/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-05-09 14:18:51 UTC (rev 625963) @@ -0,0 +1,48 @@ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: pandada8 <panda...@gmail.com> + +pkgname=v2ray +pkgver=4.23.1 +pkgrel=2 +pkgdesc="A platform for building proxies to bypass network restrictions" +arch=('x86_64') +url="https://github.com/v2ray/v2ray-core" +license=('MIT') +depends=('glibc' 'v2ray-domain-list-community' 'v2ray-geoip') +makedepends=('go' 'git') +backup=(etc/v2ray/config.json) +source=("$pkgname-$pkgver.tar.gz::https://github.com/v2ray/v2ray-core/archive/v$pkgver.tar.gz" + 'v2ray.service') +sha512sums=('3f5244c201a1c8e348b3928ac5ad130596db39419166273af0c45a916d365544dea7b07368ab47744317321300df13061349610c2770e8e561b5df2db691eecd' + '79192646438bcbd13a5a88d0093b1b6d5df603a9c2241a6260babf16f9e98d75f9e04fb3a1d926eb809a81fa935d3ff47d39cc703c609dfc906146ca58272bc7') + +build() { + cd "v2ray-core-$pkgver" + export GOFLAGS="-buildmode=pie -trimpath" + export CGO_LDFLAGS="${LDFLAGS}" + export CGO_CFLAGS="${CFLAGS}" + export CGO_CPPFLAGS="${CPPFLAGS}" + go build -o v2ray ./main + go build -o v2ctl ./infra/control/main +} + +check() { + cd "v2ray-core-$pkgver" + go test -p 1 -tags json -v -timeout 30m v2ray.com/core/... +} + +package() { + cd v2ray-core-$pkgver + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/v2ray/LICENSE + install -Dm644 release/config/systemd/v2ray.service "$pkgdir"/usr/lib/systemd/system/v2ray.service + sed -i -e 's|/usr/bin/v2ray/v2ray|/usr/lib/v2ray/v2ray|' \ + "$pkgdir"/usr/lib/systemd/system/v2ray.service + install -Dm644 release/config/*.json -t "$pkgdir"/etc/v2ray/ + install -Dm755 v2ray -t "$pkgdir"/usr/lib/v2ray/ + install -Dm755 v2ctl -t "$pkgdir"/usr/lib/v2ray/ + install -dm755 "$pkgdir"/usr/bin + ln -s ../lib/v2ray/v2ray "$pkgdir"/usr/bin/v2ray + ln -s ../lib/v2ray/v2ctl "$pkgdir"/usr/bin/v2ctl + + install -Dm644 "$srcdir"/v2ray.service "$pkgdir"/usr/lib/systemd/system/v2ray@.service +} Deleted: v2ray.service =================================================================== --- v2ray.service 2020-05-09 14:18:42 UTC (rev 625962) +++ v2ray.service 2020-05-09 14:18:51 UTC (rev 625963) @@ -1,13 +0,0 @@ -[Unit] -Description=V2Ray Service -After=network.target -Wants=network.target - -[Service] -Type=simple -PIDFile=/var/run/v2ray-%i.pid -ExecStart=/usr/bin/v2ray -config /etc/v2ray/%i.json -Restart=on-failure - -[Install] -WantedBy=multi-user.target Copied: v2ray/repos/community-x86_64/v2ray.service (from rev 625962, v2ray/trunk/v2ray.service) =================================================================== --- v2ray.service (rev 0) +++ v2ray.service 2020-05-09 14:18:51 UTC (rev 625963) @@ -0,0 +1,13 @@ +[Unit] +Description=V2Ray Service +After=network.target +Wants=network.target + +[Service] +Type=simple +PIDFile=/var/run/v2ray-%i.pid +ExecStart=/usr/bin/v2ray -config /etc/v2ray/%i.json +Restart=on-failure + +[Install] +WantedBy=multi-user.target