From ff8f25cb98ce3117fac28020f96f3e7f49ff6106 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Thu, 21 Apr 2022 03:01:39 +0800 Subject: [PATCH] v2rayA: Update to 1.5.7 - Removed an upstreamed patch - Move logs to /var/log in accordance with FHS 3.0 Signed-off-by: Tianling Shen --- net/v2raya/Makefile | 4 +-- net/v2raya/files/v2raya.config | 2 +- net/v2raya/files/v2raya.init | 2 +- .../010-fix-panic-in-go-1.18-462.patch | 32 ------------------- 4 files changed, 4 insertions(+), 36 deletions(-) delete mode 100644 net/v2raya/patches/010-fix-panic-in-go-1.18-462.patch diff --git a/net/v2raya/Makefile b/net/v2raya/Makefile index 96276e87dd..8df40d2f3e 100644 --- a/net/v2raya/Makefile +++ b/net/v2raya/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2rayA -PKG_VERSION:=1.5.6.2 +PKG_VERSION:=1.5.7 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/v2rayA/v2rayA/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=d949246aa9fe80aa9cb8fb4d80cb470f508bb44d4ac23e84e28e3b9abd30b67c +PKG_HASH:=6d203ef95ac2a48f6f1808b93fc1cd1a4f32a0419710d0c7a74169f27c38ed9c PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/service PKG_LICENSE:=AGPL-3.0-only diff --git a/net/v2raya/files/v2raya.config b/net/v2raya/files/v2raya.config index 841b90a2aa..fbda47431a 100644 --- a/net/v2raya/files/v2raya.config +++ b/net/v2raya/files/v2raya.config @@ -16,7 +16,7 @@ config v2raya 'config' option log_level 'info' # The path of log file - option log_file '/tmp/v2raya.log' + option log_file '/var/log/v2raya/v2raya.log' # Maximum number of days to keep log files option log_max_days '3' diff --git a/net/v2raya/files/v2raya.init b/net/v2raya/files/v2raya.init index 826935d5c3..5c7a0ece47 100755 --- a/net/v2raya/files/v2raya.init +++ b/net/v2raya/files/v2raya.init @@ -44,7 +44,7 @@ start_service() { append_env_arg "config" "config" "/etc/v2raya" append_env_arg "config" "ipv6_support" "auto" append_env_arg "config" "log_level" "info" - append_env_arg "config" "log_file" "/tmp/v2raya.log" + append_env_arg "config" "log_file" "/var/log/v2raya/v2raya.log" append_env_arg "config" "log_max_days" "3" append_env_arg "config" "v2ray_bin" append_env_arg "config" "v2ray_confdir" diff --git a/net/v2raya/patches/010-fix-panic-in-go-1.18-462.patch b/net/v2raya/patches/010-fix-panic-in-go-1.18-462.patch deleted file mode 100644 index 3461629e90..0000000000 --- a/net/v2raya/patches/010-fix-panic-in-go-1.18-462.patch +++ /dev/null @@ -1,32 +0,0 @@ -From eb210b5e634b65838b50387891ad837590fb2b4e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=E9=AB=98=E6=B8=90=E7=A6=BB?= -Date: Tue, 22 Mar 2022 15:28:50 +0800 -Subject: [PATCH] fix: panic in go 1.18 (#462) - ---- - service/go.mod | 2 +- - service/go.sum | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) - ---- a/go.mod -+++ b/go.mod -@@ -50,7 +50,7 @@ require ( - github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect - github.com/mattn/go-isatty v0.0.12 // indirect - github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect -- github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect -+ github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/pelletier/go-toml v1.2.0 // indirect - github.com/pires/go-proxyproto v0.6.1 // indirect - github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect ---- a/go.sum -+++ b/go.sum -@@ -145,6 +145,8 @@ github.com/modern-go/concurrent v0.0.0-2 - github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= - github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg= - github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -+github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= -+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= - github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw= - github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= - github.com/muhammadmuzzammil1998/jsonc v0.0.0-20201229145248-615b0916ca38 h1:0FrBxrkJ0hVembTb/e4EU5Ml6vLcOusAqymmYISg5Uo= -- 2.30.2