[arch-commits] Commit in v2ray/repos/community-x86_64 (3 files)

[Felix Yan]

    Date: Saturday, May 1, 2021 @ 09:15:44
  Author: felixonmars
Revision: 925452

archrelease: copy trunk to community-x86_64

Added:
  v2ray/repos/community-x86_64/PKGBUILD
    (from rev 925451, v2ray/trunk/PKGBUILD)
Deleted:
  v2ray/repos/community-x86_64/0001-fix-not-creating-test-dir-in-some-environment.patch
  v2ray/repos/community-x86_64/PKGBUILD

----------------------------------------------------------+
 0001-fix-not-creating-test-dir-in-some-environment.patch |   28 ---
 PKGBUILD                                                 |   93 ++++++-------
 2 files changed, 45 insertions(+), 76 deletions(-)

Deleted: 0001-fix-not-creating-test-dir-in-some-environment.patch
===================================================================
--- 0001-fix-not-creating-test-dir-in-some-environment.patch	2021-05-01 09:15:24 UTC (rev 925451)
+++ 0001-fix-not-creating-test-dir-in-some-environment.patch	2021-05-01 09:15:44 UTC (rev 925452)
@@ -1,28 +0,0 @@
-From 3172dea3fcd07a5311635d6f7c3af691eefe5acd Mon Sep 17 00:00:00 2001
-From: Shelikhoo <xiaokangwang at outlook.com>
-Date: Tue, 13 Apr 2021 18:15:06 +0100
-Subject: [PATCH]  fix not creating test dir in some environment
-
----
- infra/conf/router_test.go | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/infra/conf/router_test.go b/infra/conf/router_test.go
-index b594f1ca..1b7578d1 100644
---- a/infra/conf/router_test.go
-+++ b/infra/conf/router_test.go
-@@ -28,9 +28,10 @@ func init() {
- 
- 	os.Setenv("v2ray.location.asset", tempPath)
- 
-+	common.Must(os.MkdirAll(tempPath, 0755))
-+
- 	if _, err := os.Stat(platform.GetAssetLocation("geoip.dat")); err != nil && errors.Is(err, fs.ErrNotExist) {
- 		if _, err := os.Stat(geoipPath); err != nil && errors.Is(err, fs.ErrNotExist) {
--			common.Must(os.MkdirAll(tempPath, 0755))
- 			geoipBytes, err := common.FetchHTTPContent(geoipURL)
- 			common.Must(err)
- 			common.Must(filesystem.WriteFile(geoipPath, geoipBytes))
--- 
-2.27.0
-

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-01 09:15:24 UTC (rev 925451)
+++ PKGBUILD	2021-05-01 09:15:44 UTC (rev 925452)
@@ -1,48 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: pandada8 <pandada8 at gmail.com>
-
-pkgname=v2ray
-pkgver=4.37.3
-pkgrel=1
-pkgdesc="A platform for building proxies to bypass network restrictions"
-arch=('x86_64')
-url="https://github.com/v2fly/v2ray-core"
-license=('MIT')
-depends=('glibc' 'v2ray-domain-list-community' 'v2ray-geoip')
-makedepends=('go' 'git')
-backup=(etc/v2ray/config.json)
-source=("https://github.com/v2fly/v2ray-core/archive/v$pkgver/$pkgname-$pkgver.tar.gz"
-        0001-fix-not-creating-test-dir-in-some-environment.patch)
-sha512sums=('303df7373811a613a962358a080f6de3d661401b8eaf9c8c7b665e540938655dd01c6b134cb127be0d183f800b7cb992c22d571aac2e580fefedeb68cd871eae'
-            '7de6f9a970b44fec59655365bd3ec367b0fe9598be443d3dcb98941a86d91a7d88f33717eaa20183b9a8210b4b0af9852dae3c404b270b803cdcf6703dba9872')
-
-prepare() {
-  cd v2ray-core-$pkgver
-  patch -p1 -i ../0001-fix-not-creating-test-dir-in-some-environment.patch
-  sed -i 's|/usr/local/bin|/usr/bin|;s|/usr/local/etc|/etc|' release/config/systemd/system/*.service
-}
-
-build() {
-  cd v2ray-core-$pkgver
-  export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external"
-  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 ./...
-}
-
-package() {
-  cd v2ray-core-$pkgver
-  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/v2ray/LICENSE
-  install -Dm644 release/config/systemd/system/v2ray.service "$pkgdir"/usr/lib/systemd/system/v2ray.service
-  install -Dm644 release/config/systemd/system/v2ray at .service "$pkgdir"/usr/lib/systemd/system/v2ray at .service
-  install -Dm644 release/config/*.json -t "$pkgdir"/etc/v2ray/
-  install -Dm755 v2ray -t "$pkgdir"/usr/bin/
-  install -Dm755 v2ctl -t "$pkgdir"/usr/bin/
-}

Copied: v2ray/repos/community-x86_64/PKGBUILD (from rev 925451, v2ray/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-05-01 09:15:44 UTC (rev 925452)
@@ -0,0 +1,45 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: pandada8 <pandada8 at gmail.com>
+
+pkgname=v2ray
+pkgver=4.38.3
+pkgrel=1
+pkgdesc="A platform for building proxies to bypass network restrictions"
+arch=('x86_64')
+url="https://github.com/v2fly/v2ray-core"
+license=('MIT')
+depends=('glibc' 'v2ray-domain-list-community' 'v2ray-geoip')
+makedepends=('go' 'git')
+backup=(etc/v2ray/config.json)
+source=("https://github.com/v2fly/v2ray-core/archive/v$pkgver/$pkgname-$pkgver.tar.gz")
+sha512sums=('e6089b346850fc61a4a135a2f86c4966ebf472737422676a9c40151323e2df9619e5fcea9e9ea345a8735bdba53e212cb502d7c76c2d359284624962b560ee1d')
+
+prepare() {
+  cd v2ray-core-$pkgver
+  sed -i 's|/usr/local/bin|/usr/bin|;s|/usr/local/etc|/etc|' release/config/systemd/system/*.service
+}
+
+build() {
+  cd v2ray-core-$pkgver
+  export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external"
+  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 ./...
+}
+
+package() {
+  cd v2ray-core-$pkgver
+  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/v2ray/LICENSE
+  install -Dm644 release/config/systemd/system/v2ray.service "$pkgdir"/usr/lib/systemd/system/v2ray.service
+  install -Dm644 release/config/systemd/system/v2ray at .service "$pkgdir"/usr/lib/systemd/system/v2ray at .service
+  install -Dm644 release/config/*.json -t "$pkgdir"/etc/v2ray/
+  install -Dm755 v2ray -t "$pkgdir"/usr/bin/
+  install -Dm755 v2ctl -t "$pkgdir"/usr/bin/
+}