shadowsocks:apply lede patches

0001-Add-ss-server-and-ss-check.patch 0002-Revert-verify_simple-and-auth_simple.patch 0003-Refine-Usage.patch 999-Fix-Werror-sizeof-pointer-memaccess.patch
Yh793 · Jan 9, 2021 · 19d57a8 · 19d57a8
1 parent 23c87b9
commit 19d57a8
Show file tree

Hide file tree

Showing 8 changed files with 17,272 additions and 5 deletions.
diff --git a/trunk/user/shadowsocks/Makefile b/trunk/user/shadowsocks/Makefile
@@ -3,9 +3,9 @@ THISDIR = $(shell pwd)
 SRC_SS_NAME=shadowsocks-libev-3.3.5
 #https://github.com/shadowsocks/shadowsocks-libev.git
 
-SRC_SSR_NAME=shadowsocksr-libev-master
-ARCHIVE_SSR_NAME=shadowsocksr-libev-master-e2373d7
-#https://github.com/shadowsocksr-backup/shadowsocksr-libev.git
+SRC_SSR_NAME=shadowsocksr-libev-2.5.3
+ARCHIVE_SSR_NAME=shadowsocksr-libev-d63ff86
+#https://github.com/shadowsocksrr/shadowsocksr-libev.git
 
 
 all: extract_test config_test
@@ -21,7 +21,11 @@ endif
 
 extract_ssr_test:
 	( if [ ! -d $(SRC_SSR_NAME) ]; then \
-		unzip -qq $(ARCHIVE_SSR_NAME).zip ; \
+		tar xf $(ARCHIVE_SSR_NAME).tar.gz ; \
+		patch -d $(SRC_SSR_NAME) -p1 -i ../patches/0001-Add-ss-server-and-ss-check.patch; \
+		patch -d $(SRC_SSR_NAME) -p1 -i ../patches/0002-Revert-verify_simple-and-auth_simple.patch; \
+		patch -d $(SRC_SSR_NAME) -p1 -i ../patches/0003-Refine-Usage.patch; \
+		patch -d $(SRC_SSR_NAME) -p1 -i ../patches/999-Fix-Werror-sizeof-pointer-memaccess.patch; \
 	fi )
 
 extract_ss_test:
@@ -107,10 +111,12 @@ ifeq ($(CONFIG_FIRMWARE_INCLUDE_SHADOWSOCKS),y)
 	$(ROMFSINST) $(THISDIR)/ss/ /etc_ro/ss/
 	$(ROMFSINST) -p +x $(THISDIR)/$(SRC_SSR_NAME)/src/ss-redir /usr/bin/ssr-redir
 	$(ROMFSINST) -p +x $(THISDIR)/$(SRC_SSR_NAME)/src/ss-local /usr/bin/ssr-local
+	$(ROMFSINST) -p +x $(THISDIR)/$(SRC_SSR_NAME)/server/ss-check /usr/bin/ssr-check
+	$(ROMFSINST) -p +x $(THISDIR)/$(SRC_SSR_NAME)/server/ss-server /usr/bin/ssr-server
 	$(ROMFSINST) -p +x $(THISDIR)/$(SRC_SS_NAME)/src/ss-redir /usr/bin/ss-redir
 	#$(ROMFSINST) -p +x $(THISDIR)/$(SRC_SS_NAME)/src/ss-tunnel /usr/bin/ss-tunne
 	$(ROMFSINST) -p +x $(THISDIR)/$(SRC_SS_NAME)/src/ss-local /usr/bin/ss-local
-	$(ROMFSINST) -p +x $(THISDIR)/scripts/ss-check /usr/bin/ss-check 
+	$(ROMFSINST) -p +x $(THISDIR)/scripts/tcping /usr/bin/tcping
 	#ln -sf /var/ss-redir $(ROMFSDIR)/usr/bin/ss-redir
 	#ln -sf /var/ss-tunnel $(ROMFSDIR)/usr/bin/ss-local
 endif