[arch-commits] Commit in v2ray/trunk (PKGBUILD)

[Felix Yan]

    Date: Friday, October 12, 2018 @ 16:24:24
  Author: felixonmars
Revision: 393244

upgpkg: v2ray 3.47-1

Modified:
  v2ray/trunk/PKGBUILD

----------+
 PKGBUILD |   29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-12 16:20:31 UTC (rev 393243)
+++ PKGBUILD	2018-10-12 16:24:24 UTC (rev 393244)
@@ -2,7 +2,7 @@
 # Contributor: pandada8 <pandada8 at gmail.com>
 
 pkgname=v2ray
-pkgver=3.46.4
+pkgver=3.47
 pkgrel=1
 pkgdesc="A platform for building proxies to bypass network restrictions"
 arch=('x86_64')
@@ -10,25 +10,18 @@
 license=('MIT')
 makedepends=('go' 'git')
 backup=(etc/v2ray/config.json)
-source=("$pkgname-$pkgver.tar.gz::https://github.com/v2ray/v2ray-core/archive/v$pkgver.tar.gz"
+source=("$pkgname-$pkgver.zip::https://github.com/v2ray/v2ray-core/releases/download/v$pkgver/src_all.zip"
         "v2ray-ext-$pkgver.tar.gz::https://github.com/v2ray/ext/archive/v$pkgver.tar.gz"
         'v2ray.service')
-sha512sums=('4f329fb755c1fdc7c440d9fdee01cc8b0f04d92045de4a836dae09f9c837f7dc0757490ccc890b5fb0402ae84a2d0f2b5c4656704d1299c58e7337d9f2eecfba'
-            '20b66f2fe0b6aa23255aebdb7e1f8f660a987afd005435a5d2204201acccf4d5265465766228297fe89ad881a066f53422785246798428fdec5eeeafcb103416'
+sha512sums=('c997e89068e15af825033f10f1b1076859ffad15b57862a22a7f08213a94ad4f0bf6d2bc76eb712a24539c8a3d9dd2235b3b206ab9be079f23705306e61402fe'
+            '42adee37376b9fcdef270d5f99908d5aa08628534731dde21868b5fdad4a68d116bbc92fb618bb7ccc521aab22b00dc142aa02c1d7c84f8add0f67b1a1fd9be4'
             'bebb87f43b3920be8efde9aece9c4305323cd7d3a65a3b2441f0dbd0098c02a18ca89a5b08833eee70482cffae2c8e7b7237bb5a4d1076e3c30d273898e2bedb')
 
 prepare() {
-  sed -i 's/h12.me/h12.io/' v2ray-core-$pkgver/testing/scenarios/socks_test.go
-
   export GOPATH="$srcdir/build"
-  mkdir -p "$GOPATH"/src/v2ray.com
-  cp -a "$srcdir"/v2ray-core-$pkgver "$GOPATH"/src/v2ray.com/core
-  cp -a "$srcdir"/ext-$pkgver "$GOPATH"/src/v2ray.com/ext
+  mkdir -p "$GOPATH"/src
 
-  go get github.com/miekg/dns golang.org/x/sys/unix h12.io/socks \
-         github.com/gorilla/websocket golang.org/x/crypto/chacha20poly1305 golang.org/x/crypto/sha3 \
-         golang.org/x/net/proxy github.com/google/go-github/github golang.org/x/oauth2 \
-         github.com/gogo/protobuf/proto google.golang.org/grpc
+  mv *.com *.io *.org "$GOPATH"/src/
 }
 
 build() {
@@ -37,18 +30,18 @@
 }
 
 check() {
-  cd v2ray-core-$pkgver
+  cd "$GOPATH"/src/v2ray.com/core
   go test -p 1 -tags json -v v2ray.com/core/...
 }
 
 package() {
-  cd v2ray-core-$pkgver
+  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 '/ExecStart/c\ExecStart=/usr/bin/env v2ray.location.asset=/etc/v2ray /usr/bin/v2ray -config /etc/v2ray/config.json' "$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 ../v2ray -t "$pkgdir"/usr/bin/
-  install -Dm755 ../v2ctl -t "$pkgdir"/usr/bin/
+  install -Dm755 "$srcdir"/v2ray -t "$pkgdir"/usr/bin/
+  install -Dm755 "$srcdir"/v2ctl -t "$pkgdir"/usr/bin/
 
-  install -Dm644 ../v2ray.service "$pkgdir"/usr/lib/systemd/system/v2ray at .service
+  install -Dm644 "$srcdir"/v2ray.service "$pkgdir"/usr/lib/systemd/system/v2ray at .service
 }