From bf817b6f2b5ffe028bcf74f48494622c09975b3c Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Fri, 11 Sep 2020 23:22:53 +0800 Subject: [PATCH] ssocks: fix gcc10 compilation Co-authored-by: Lienol --- package/ctcgfw/{openwrt-ssocks => ssocks}/Makefile | 3 ++- package/ctcgfw/ssocks/patches/002-gcc10.patch | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) rename package/ctcgfw/{openwrt-ssocks => ssocks}/Makefile (97%) create mode 100644 package/ctcgfw/ssocks/patches/002-gcc10.patch diff --git a/package/ctcgfw/openwrt-ssocks/Makefile b/package/ctcgfw/ssocks/Makefile similarity index 97% rename from package/ctcgfw/openwrt-ssocks/Makefile rename to package/ctcgfw/ssocks/Makefile index d22b9c5e26..e8644b50da 100644 --- a/package/ctcgfw/openwrt-ssocks/Makefile +++ b/package/ctcgfw/ssocks/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ssocks PKG_VERSION:=0.0.14 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/tostercx/ssocks.git @@ -34,6 +34,7 @@ define Package/ssocks CATEGORY:=Network TITLE:=sSocks Relay URL:=https://github.com/david378/ssocks + DEPENDS:=+libopenssl endef define Package/ssocks/description diff --git a/package/ctcgfw/ssocks/patches/002-gcc10.patch b/package/ctcgfw/ssocks/patches/002-gcc10.patch new file mode 100644 index 0000000000..678c821ede --- /dev/null +++ b/package/ctcgfw/ssocks/patches/002-gcc10.patch @@ -0,0 +1,11 @@ +--- a/src/configd-util.h 2020-07-09 05:30:54.000000000 +0800 ++++ b/src/configd-util.h 2020-09-08 19:35:11.000000000 +0800 +@@ -33,7 +33,7 @@ + + + +-struct globalArgsServer_t { ++static struct globalArgsServer_t { + char fileauth[255]; // -a option + char fileconfig[255]; // -f option + char filelog[255]; // -l option