From 118faa8516d1bbd8a5a34addff1be6f0a674138d Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Tue, 25 Aug 2020 19:20:30 +0800
Subject: [PATCH] ssocks: separate into 2 packages

---
 package/ctcgfw/luci-app-ssocks/Makefile |  2 +-
 package/ctcgfw/openwrt-ssocks/Makefile  | 30 +++++++++++++++++++------
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/package/ctcgfw/luci-app-ssocks/Makefile b/package/ctcgfw/luci-app-ssocks/Makefile
index 26df3ebce1..9feeaf3800 100644
--- a/package/ctcgfw/luci-app-ssocks/Makefile
+++ b/package/ctcgfw/luci-app-ssocks/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI support for sSocks
-LUCI_DEPENDS:=+busybox +iptables +ssocks
+LUCI_DEPENDS:=+busybox +iptables +ssocksd
 LUCI_PKGARCH:=all
 PKG_NAME:=luci-app-ssocks
 PKG_VERSION:=1.0
diff --git a/package/ctcgfw/openwrt-ssocks/Makefile b/package/ctcgfw/openwrt-ssocks/Makefile
index 08296c19e2..d22b9c5e26 100644
--- a/package/ctcgfw/openwrt-ssocks/Makefile
+++ b/package/ctcgfw/openwrt-ssocks/Makefile
@@ -29,20 +29,36 @@ PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/$(PKG_NAME)
+define Package/ssocks
 	SECTION:=net
 	CATEGORY:=Network
-	TITLE:=sSocks
+	TITLE:=sSocks Relay
 	URL:=https://github.com/david378/ssocks
 endef
 
-define Package/$(PKG_NAME)/description
-sSocks is a package which contains: a socks5 server implements RFC 1928 (SOCKS V5) and RFC 1929 (Authentication for SOCKS V5), a reverse socks server and client, a netcat like tool and a socks5 relay.
+define Package/ssocks/description
+sSocks is a package which contains: a socks5 server implements RFC 1928 (SOCKS V5) and RFC 1929 (Authentication for SOCKS V5),
+a reverse socks server and client, a netcat like tool and a socks5 relay.
 endef
 
-define Package/$(PKG_NAME)/install
+define Package/ssocksd
+  $(call Package/ssocks)
+  TITLE:=sSocks Server
+endef
+
+define Package/ssocksd/description
+  $(call Package/ssocks/description)
+endef
+
+define Package/ssocks/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ssocksd $(1)/usr/bin/ssocks
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ssocks $(1)/usr/bin/
 endef
 
-$(eval $(call BuildPackage,$(PKG_NAME)))
+define Package/ssocksd/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ssocksd $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,ssocks))
+$(eval $(call BuildPackage,ssocksd))