From f48e49830d679e95463560e96aa4ea7a2645ae4e Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Thu, 28 May 2020 11:39:15 +0800
Subject: [PATCH] GoQuiet: use source code to build

fix https://github.com/project-openwrt/openwrt-isco/issues/182
fix https://github.com/project-openwrt/openwrt-latest-isco/issues/86
---
 package/ctcgfw/GoQuiet/Makefile | 89 +++++++++++++++++----------------
 1 file changed, 45 insertions(+), 44 deletions(-)

diff --git a/package/ctcgfw/GoQuiet/Makefile b/package/ctcgfw/GoQuiet/Makefile
index d850dde9c7..7dd7442f9d 100644
--- a/package/ctcgfw/GoQuiet/Makefile
+++ b/package/ctcgfw/GoQuiet/Makefile
@@ -6,81 +6,82 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=gq-client
+PKG_NAME:=GoQuiet
 PKG_VERSION:=1.2.2
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/cbeuw/GoQuiet.git
+PKG_SOURCE_VERSION:=013cdfdf72000dcd4691799c37a0cf960ab4c82f
+
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)
+PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
+
+PKG_BUILD_DEPENDS:=golang/host
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
+
+GO_PKG:=github.com/cbeuw/GoQuiet
+GO_PKG_LDFLAGS:=-s -w
 
 include $(INCLUDE_DIR)/package.mk
+include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
 
-define Package/$(PKG_NAME)/temple
+define Package/gq-client
   SECTION:=net
   CATEGORY:=Network
-  TITLE:=GoQuiet
-  DEPENDS:=+libpthread
+  TITLE:=GoQuiet Client
+  DEPENDS:=$(GO_ARCH_DEPENDS) +libpthread
   URL:=https://github.com/cbeuw/GoQuiet
-endef
-
-define Package/$(PKG_NAME)
-    $(call Package/$(PKG_NAME)/temple)
+  SUBMENU:=Web Servers/Proxies
 endef
 
 define Package/gq-server
-    $(call Package/$(PKG_NAME)/temple)
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=GoQuiet Server
+  DEPENDS:=$(GO_ARCH_DEPENDS) +libpthread
+  URL:=https://github.com/cbeuw/GoQuiet
+  SUBMENU:=Web Servers/Proxies
 endef
 
-define Package/$(PKG_NAME)/description
-GoQuiet-client
+define Package/gq-client/description
+GoQuiet-Client
 endef
 
 define Package/gq-server/description
-GoQuiet-server
+GoQuiet-Server
 endef
 
-ifeq ($(ARCH),x86_64)
-  GOQUIET_NAME:=gq-client-linux-amd64-$(PKG_VERSION)
-  GOQUIETSERVER_NAME:=gq-server-linux-amd64-$(PKG_VERSION)
-endif
-ifeq ($(ARCH),i386)
-  GOQUIET_NAME:=gq-client-linux-386-$(PKG_VERSION)
-  GOQUIETSERVER_NAME:=gq-server-linux-386-$(PKG_VERSION)
-endif
-ifeq ($(ARCH),mipsel)
-  GOQUIET_NAME:=gq-client-linux-mips64-$(PKG_VERSION)
-endif
-ifeq ($(ARCH),mips)
-  GOQUIET_NAME:=gq-client-linux-mips-$(PKG_VERSION)
-endif
-ifeq ($(ARCH),arm)
-  GOQUIET_NAME:=gq-client-linux-arm-$(PKG_VERSION)
-  GOQUIETSERVER_NAME:=gq-server-linux-arm-$(PKG_VERSION)
-endif
-ifeq ($(ARCH),aarch64)
-  GOQUIET_NAME:=gq-client-linux-arm64-$(PKG_VERSION)
-  GOQUIETSERVER_NAME:=gq-server-linux-arm64-$(PKG_VERSION)
-endif
-
 define Build/Prepare
-	[ ! -f $(PKG_BUILD_DIR)/gq-client ] && wget -O $(PKG_BUILD_DIR)/gq-client https://github.com/cbeuw/GoQuiet/releases/download/v$(PKG_VERSION)/$(GOQUIET_NAME)
-	[ ! -f $(PKG_BUILD_DIR)/gq-server ] && wget -O $(PKG_BUILD_DIR)/gq-server https://github.com/cbeuw/GoQuiet/releases/download/v$(PKG_VERSION)/$(GOQUIETSERVER_NAME)
+	tar -zxf $(DL_DIR)/$(PKG_SOURCE) -C $(PKG_BUILD_DIR) --strip-components 1
 endef
 
 define Build/Configure
-	chmod +x $(PKG_BUILD_DIR)/gq-client && upx --ultra-brute $(PKG_BUILD_DIR)/gq-client
-	chmod +x $(PKG_BUILD_DIR)/gq-server && upx --ultra-brute $(PKG_BUILD_DIR)/gq-server
 endef
 
 define Build/Compile
+	$(eval GO_PKG_BUILD_PKG:=$(GO_PKG)/cmd/gq-client)
+	$(call GoPackage/Build/Configure)
+	$(call GoPackage/Build/Compile)
+	$(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/gq-client
+	$(eval GO_PKG_BUILD_PKG:=$(GO_PKG)/cmd/gq-server)
+	$(call GoPackage/Build/Configure)
+	$(call GoPackage/Build/Compile)
+	$(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/gq-server
 endef
 
-define Package/$(PKG_NAME)/install
+define Package/gq-client/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/gq-client $(1)/usr/bin/
+	$(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/gq-client $(1)/usr/bin/
 endef
 
 define Package/gq-server/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/gq-server $(1)/usr/bin/
+	$(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/gq-server $(1)/usr/bin/
 endef
 
-$(eval $(call BuildPackage,$(PKG_NAME)))
+$(eval $(call GoBinPackage,gq-client))
+$(eval $(call GoBinPackage,gq-server))
+$(eval $(call BuildPackage,gq-client))
 $(eval $(call BuildPackage,gq-server))