From 7199f9da25fefa130b94369ad247d468bbac3ba9 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 8 Feb 2024 19:49:04 +0100 Subject: [PATCH 1/3] Update Golang to 1.22 --- golang/golang/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/golang/golang/Makefile b/golang/golang/Makefile index 55da6587b..a4978b636 100644 --- a/golang/golang/Makefile +++ b/golang/golang/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk -GO_VERSION_MAJOR_MINOR:=1.21 -GO_VERSION_PATCH:=4 +GO_VERSION_MAJOR_MINOR:=1.22 +GO_VERSION_PATCH:=0 PKG_NAME:=golang PKG_VERSION:=$(GO_VERSION_MAJOR_MINOR)$(if $(GO_VERSION_PATCH),.$(GO_VERSION_PATCH)) @@ -20,7 +20,7 @@ GO_SOURCE_URLS:=https://dl.google.com/go/ \ PKG_SOURCE:=go$(PKG_VERSION).src.tar.gz PKG_SOURCE_URL:=$(GO_SOURCE_URLS) -PKG_HASH:=47b26a83d2b65a3c1c1bcace273b69bee49a7a7b5168a7604ded3d26a37bd787 +PKG_HASH:=4d196c3d41a0d6c1dfc64d04e3cc1f608b0c436bd87b7060ce3e23234e1f4d5c PKG_MAINTAINER:=Jeffery To PKG_LICENSE:=BSD-3-Clause From 49002dd61d114a347181c325e79c16aecfe5845e Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 8 Feb 2024 19:49:40 +0100 Subject: [PATCH 2/3] Fix on shadowsocks-rust init for kernel 5.4 --- shadowsocks-rust/files/shadowsocks-rust.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shadowsocks-rust/files/shadowsocks-rust.init b/shadowsocks-rust/files/shadowsocks-rust.init index a1689bba2..fbca7e408 100644 --- a/shadowsocks-rust/files/shadowsocks-rust.init +++ b/shadowsocks-rust/files/shadowsocks-rust.init @@ -365,7 +365,7 @@ rules_up() { rules_down() { rules_exist || return 0 enabled="0" - config_load shadowsocks-libev + config_load shadowsocks-rust config_foreach server_state server [ "$enabled" = "1" ] && return logger -t "Shadowsocks-rust" "Rules DOWN" From 0e5d941c9b605f218824713b4462b9564ea6130f Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 8 Feb 2024 19:50:07 +0100 Subject: [PATCH 3/3] Update shadowsocks-rust --- shadowsocks-rust/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shadowsocks-rust/Makefile b/shadowsocks-rust/Makefile index 410dfc772..3331f2c98 100644 --- a/shadowsocks-rust/Makefile +++ b/shadowsocks-rust/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=shadowsocks-rust -PKG_VERSION:=1.17.1 +PKG_VERSION:=1.18.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/shadowsocks/shadowsocks-rust/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=97a1c8ebf7fd19de94cd6d0dfee398667e1f4e131ec8a37ecb7c3191af7cc75e +PKG_HASH:=e854743ecef9ab3b371fdcb139e6f4452831b487d449c97c2129abbf4f51e863 PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=MIT