From b031c8ddf46c6ed560a0f7b36f29fef8945f5b46 Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Tue, 2 Mar 2021 12:08:04 +0800
Subject: [PATCH] GoQuiet: fix build with golang 1.16

---
 package/ctcgfw/GoQuiet/Makefile | 52 +++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/package/ctcgfw/GoQuiet/Makefile b/package/ctcgfw/GoQuiet/Makefile
index fbf2108123..b55974cbc7 100644
--- a/package/ctcgfw/GoQuiet/Makefile
+++ b/package/ctcgfw/GoQuiet/Makefile
@@ -11,65 +11,73 @@ PKG_VERSION:=1.2.2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/cbeuw/GoQuiet.git
-PKG_MIRROR_HASH:=d16557d89ac909877128729590e34a3c7a9b430000525ed133e2fffb56a0310a
 PKG_SOURCE_VERSION:=013cdfdf72000dcd4691799c37a0cf960ab4c82f
+PKG_MIRROR_HASH:=c9c97463e5286e8ad10de5e86512b98f60672235c47cfd9696188a16496fc56c
 
-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_LICENSE:=GPL-3.0
+PKG_LICENSE_FILES:=LICENSE
 
 PKG_BUILD_DEPENDS:=golang/host
 PKG_BUILD_PARALLEL:=1
 PKG_USE_MIPS16:=0
 
+PKG_CONFIG_DEPENDS:= \
+	CONFIG_GQ_CLIENT_COMPRESS_UPX \
+	CONFIG_GQ_SERVER_COMPRESS_UPX
+
 GO_PKG:=github.com/cbeuw/GoQuiet
 GO_PKG_LDFLAGS:=-s -w
+GO_PKG_LDFLAGS_X:=main.version=$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
 
-define Package/gq-client
+define Package/GoQuiet/template
   SECTION:=net
   CATEGORY:=Network
-  TITLE:=GoQuiet Client
+  TITLE:=GoQuiet
   DEPENDS:=$(GO_ARCH_DEPENDS) +libpthread
   URL:=https://github.com/cbeuw/GoQuiet
   SUBMENU:=Web Servers/Proxies
 endef
 
+define Package/gq-client
+  $(call Package/GoQuiet/template)
+  TITLE+= Client
+endef
+
 define Package/gq-server
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=GoQuiet Server
-  DEPENDS:=$(GO_ARCH_DEPENDS) +libpthread
-  URL:=https://github.com/cbeuw/GoQuiet
-  SUBMENU:=Web Servers/Proxies
+  $(call Package/GoQuiet/template)
+  TITLE+= Server
 endef
 
-define Package/gq-client/description
-GoQuiet-Client
+define Package/gq-client/config
+config GQ_CLIENT_COMPRESS_UPX
+	bool "Compress executable files with UPX"
+	default y
 endef
 
-define Package/gq-server/description
-GoQuiet-Server
+define Package/gq-server/config
+config GQ_SERVER_COMPRESS_UPX
+	bool "Compress executable files with UPX"
+	default y
 endef
 
-define Build/Prepare
-	tar -zxf $(DL_DIR)/$(PKG_SOURCE) -C $(PKG_BUILD_DIR) --strip-components 1
-endef
-
-define Build/Configure
-endef
+GO_PKG_BUILD_VARS += GO111MODULE=auto
 
 define Build/Compile
 	$(eval GO_PKG_BUILD_PKG:=$(GO_PKG)/cmd/gq-client)
 	$(call GoPackage/Build/Configure)
 	$(call GoPackage/Build/Compile)
+ifeq ($(CONFIG_GQ_CLIENT_COMPRESS_UPX),y)
 	$(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/gq-client
+endif
 	$(eval GO_PKG_BUILD_PKG:=$(GO_PKG)/cmd/gq-server)
 	$(call GoPackage/Build/Configure)
 	$(call GoPackage/Build/Compile)
+ifeq ($(CONFIG_GQ_SERVER_COMPRESS_UPX),y)
 	$(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/gq-server
+endif
 endef
 
 define Package/gq-client/install