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

[Felix Yan]

    Date: Saturday, May 1, 2021 @ 09:15:20
  Author: felixonmars
Revision: 925450

upgpkg: v2ray 4.38.3-1

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

----------------------------------------------------------+
 0001-fix-not-creating-test-dir-in-some-environment.patch |   28 -------------
 PKGBUILD                                                 |    9 +---
 2 files changed, 3 insertions(+), 34 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:14:23 UTC (rev 925449)
+++ 0001-fix-not-creating-test-dir-in-some-environment.patch	2021-05-01 09:15:20 UTC (rev 925450)
@@ -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
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-01 09:14:23 UTC (rev 925449)
+++ PKGBUILD	2021-05-01 09:15:20 UTC (rev 925450)
@@ -2,7 +2,7 @@
 # Contributor: pandada8 <pandada8 at gmail.com>
 
 pkgname=v2ray
-pkgver=4.37.3
+pkgver=4.38.3
 pkgrel=1
 pkgdesc="A platform for building proxies to bypass network restrictions"
 arch=('x86_64')
@@ -11,14 +11,11 @@
 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')
+source=("https://github.com/v2fly/v2ray-core/archive/v$pkgver/$pkgname-$pkgver.tar.gz")
+sha512sums=('e6089b346850fc61a4a135a2f86c4966ebf472737422676a9c40151323e2df9619e5fcea9e9ea345a8735bdba53e212cb502d7c76c2d359284624962b560ee1d')
 
 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
 }