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

[Felix Yan]

    Date: Tuesday, April 13, 2021 @ 17:31:31
  Author: felixonmars
Revision: 917462

upgpkg: v2ray 4.37.3-1

Added:
  v2ray/trunk/0001-fix-not-creating-test-dir-in-some-environment.patch
Modified:
  v2ray/trunk/PKGBUILD

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

Added: 0001-fix-not-creating-test-dir-in-some-environment.patch
===================================================================
--- 0001-fix-not-creating-test-dir-in-some-environment.patch	                        (rev 0)
+++ 0001-fix-not-creating-test-dir-in-some-environment.patch	2021-04-13 17:31:31 UTC (rev 917462)
@@ -0,0 +1,28 @@
+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
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-13 17:31:15 UTC (rev 917461)
+++ PKGBUILD	2021-04-13 17:31:31 UTC (rev 917462)
@@ -2,7 +2,7 @@
 # Contributor: pandada8 <pandada8 at gmail.com>
 
 pkgname=v2ray
-pkgver=4.37.2
+pkgver=4.37.3
 pkgrel=1
 pkgdesc="A platform for building proxies to bypass network restrictions"
 arch=('x86_64')
@@ -11,11 +11,14 @@
 depends=('glibc' 'v2ray-domain-list-community' 'v2ray-geoip')
 makedepends=('go' 'git')
 backup=(etc/v2ray/config.json)
-source=("$pkgname-$pkgver.tar.gz::https://github.com/v2fly/v2ray-core/archive/v$pkgver.tar.gz")
-sha512sums=('30afb82890b2e0a7a292f8a659618d55a54fe5231b7cd68ac103bafcad4a976a69b4ee19ae0dbf00f34b8f4d8eb0138577205c4c81f9d043a0ab1d8f9bc9f50b')
+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
 }