Date: Tuesday, November 27, 2018 @ 14:50:30 Author: felixonmars Revision: 409979
archrelease: copy trunk to community-x86_64 Added: v2ray/repos/community-x86_64/PKGBUILD (from rev 409977, v2ray/trunk/PKGBUILD) v2ray/repos/community-x86_64/v2ray.service (from rev 409977, v2ray/trunk/v2ray.service) Deleted: v2ray/repos/community-x86_64/PKGBUILD v2ray/repos/community-x86_64/v2ray.service ---------------+ PKGBUILD | 96 ++++++++++++++++++++++++++++---------------------------- v2ray.service | 28 ++++++++-------- 2 files changed, 62 insertions(+), 62 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-11-27 14:50:23 UTC (rev 409978) +++ PKGBUILD 2018-11-27 14:50:30 UTC (rev 409979) @@ -1,48 +0,0 @@ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: pandada8 <panda...@gmail.com> - -pkgname=v2ray -pkgver=4.6.5 -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') -makedepends=('go' 'git') -backup=(etc/v2ray/config.json) -source=("$pkgname-$pkgver.zip::https://github.com/v2ray/v2ray-core/releases/download/v$pkgver/src_all.zip" - 'v2ray.service') -sha512sums=('4e454434c1c90eb564be9af088b51fba66c8bd114cb946bd07d62fe8e454ea32d2a260873362b0139e1aa53e9bd38d069b2d4087928855e0bb20453f31082e0f' - '37efc20ef71147f4400eba2bf57766462b5803b5952768bd32d5224f35e37c9c5639aaa19e0f3b63b52063dafd0381f40e2bfbb60dace08b055f0b3245cfa2b7') - -prepare() { - export GOPATH="$srcdir/build" - mkdir -p "$GOPATH"/src - - mv *.com *.io *.org "$GOPATH"/src/ -} - -build() { - go build -o v2ray v2ray.com/core/main - go build -o v2ctl v2ray.com/ext/tools/control/main -} - -check() { - cd "$GOPATH"/src/v2ray.com/core - go test -p 1 -tags json -v v2ray.com/core/... -} - -package() { - cd "$GOPATH"/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 '/ExecStart/i Environment=V2RAY_LOCATION_ASSET=/etc/v2ray' \ - -e 's|/usr/bin/v2ray/v2ray|/usr/bin/v2ray|' \ - "$pkgdir"/usr/lib/systemd/system/v2ray.service - install -Dm644 release/config/geoip.dat release/config/geosite.dat release/config/*.json -t "$pkgdir"/etc/v2ray/ - install -Dm755 "$srcdir"/v2ray -t "$pkgdir"/usr/bin/ - install -Dm755 "$srcdir"/v2ctl -t "$pkgdir"/usr/bin/ - - install -Dm644 "$srcdir"/v2ray.service "$pkgdir"/usr/lib/systemd/system/v2ray@.service -} Copied: v2ray/repos/community-x86_64/PKGBUILD (from rev 409977, v2ray/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-11-27 14:50:30 UTC (rev 409979) @@ -0,0 +1,48 @@ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: pandada8 <panda...@gmail.com> + +pkgname=v2ray +pkgver=4.6.6 +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') +makedepends=('go' 'git') +backup=(etc/v2ray/config.json) +source=("$pkgname-$pkgver.zip::https://github.com/v2ray/v2ray-core/releases/download/v$pkgver/src_all.zip" + 'v2ray.service') +sha512sums=('94ba1f4ee2b1a4fdcda2b0c50942e17e4a599f077ae7fb75cb96760e7eaeb6b1c3a874501771b39e1729065001fcc11b753ba9fe38a002e35eeb300e2c87863e' + '37efc20ef71147f4400eba2bf57766462b5803b5952768bd32d5224f35e37c9c5639aaa19e0f3b63b52063dafd0381f40e2bfbb60dace08b055f0b3245cfa2b7') + +prepare() { + export GOPATH="$srcdir/build" + mkdir -p "$GOPATH"/src + + mv *.com *.io *.org "$GOPATH"/src/ +} + +build() { + go build -o v2ray v2ray.com/core/main + go build -o v2ctl v2ray.com/ext/tools/control/main +} + +check() { + cd "$GOPATH"/src/v2ray.com/core + go test -p 1 -tags json -v v2ray.com/core/... +} + +package() { + cd "$GOPATH"/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 '/ExecStart/i Environment=V2RAY_LOCATION_ASSET=/etc/v2ray' \ + -e 's|/usr/bin/v2ray/v2ray|/usr/bin/v2ray|' \ + "$pkgdir"/usr/lib/systemd/system/v2ray.service + install -Dm644 release/config/geoip.dat release/config/geosite.dat release/config/*.json -t "$pkgdir"/etc/v2ray/ + install -Dm755 "$srcdir"/v2ray -t "$pkgdir"/usr/bin/ + install -Dm755 "$srcdir"/v2ctl -t "$pkgdir"/usr/bin/ + + install -Dm644 "$srcdir"/v2ray.service "$pkgdir"/usr/lib/systemd/system/v2ray@.service +} Deleted: v2ray.service =================================================================== --- v2ray.service 2018-11-27 14:50:23 UTC (rev 409978) +++ v2ray.service 2018-11-27 14:50:30 UTC (rev 409979) @@ -1,14 +0,0 @@ -[Unit] -Description=V2Ray Service -After=network.target -Wants=network.target - -[Service] -Type=simple -PIDFile=/var/run/v2ray-%i.pid -Environment=V2RAY_LOCATION_ASSET=/etc/v2ray -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 409977, v2ray/trunk/v2ray.service) =================================================================== --- v2ray.service (rev 0) +++ v2ray.service 2018-11-27 14:50:30 UTC (rev 409979) @@ -0,0 +1,14 @@ +[Unit] +Description=V2Ray Service +After=network.target +Wants=network.target + +[Service] +Type=simple +PIDFile=/var/run/v2ray-%i.pid +Environment=V2RAY_LOCATION_ASSET=/etc/v2ray +ExecStart=/usr/bin/v2ray -config /etc/v2ray/%i.json +Restart=on-failure + +[Install] +WantedBy=multi-user.target