From b78d343d52100cb0cea4c302a84ffd387bfd0c00 Mon Sep 17 00:00:00 2001
From: coolsnowwolf <coolsnowwolf@gmail.com>
Date: Sat, 6 Apr 2019 00:59:53 +0800
Subject: [PATCH] frpc: bump to v0.25.3

---
 package/lean/frpc/Makefile | 110 ++++++++++++++++++++++---------------
 1 file changed, 66 insertions(+), 44 deletions(-)

diff --git a/package/lean/frpc/Makefile b/package/lean/frpc/Makefile
index 2e3eacd31..5ec1b899c 100644
--- a/package/lean/frpc/Makefile
+++ b/package/lean/frpc/Makefile
@@ -1,70 +1,92 @@
 #
-# Copyright (C) 2015-2016 OpenWrt.org
+# Copyright (C) 2019 Xingwang Liao
 #
-# This is free software, licensed under the GNU General Public License v3.
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
 #
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=frpc
-PKG_VERSION:=0.24.1
+PKG_NAME:=frp
+PKG_VERSION:=0.25.3
 PKG_RELEASE:=1
 
-ifeq ($(ARCH),mipsel)
-	FRPC_ARCH:=mipsle
-endif
-ifeq ($(ARCH),mips)
-	FRPC_ARCH:=mips
-endif
-ifeq ($(ARCH),i386)
-	FRPC_ARCH:=386
-endif
-ifeq ($(ARCH),x86_64)
-	FRPC_ARCH:=amd64
-endif
-ifeq ($(ARCH),arm)
-	FRPC_ARCH:=arm
-endif
-ifeq ($(ARCH),aarch64)
-	FRPC_ARCH:=arm64
-endif
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/fatedier/frp/tar.gz/v$(PKG_VERSION)?
+PKG_HASH:=68281965d04567d55f143b4a4c4d4369c1962937d80484b6b48e96a5dcf0b2e4
 
 PKG_LICENSE:=Apache-2.0
+PKG_LICENSE_FILES:=LICENSE
+PKG_MAINTAINER:=Xingwang Liao <kuoruan@gmail.com>
 
-PKG_SOURCE_URL:=https://github.com/fatedier/frp/releases/download/v$(PKG_VERSION)
-PKG_SOURCE:=frp_$(PKG_VERSION)_linux_$(FRPC_ARCH).tar.gz
-PKG_BUILD_DIR:=$(BUILD_DIR)/frp_$(PKG_VERSION)_linux_$(FRPC_ARCH)
-PKG_HASH:=skip
+PKG_BUILD_DEPENDS:=golang/host
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
+
+GO_PKG:=github.com/fatedier/frp
+GO_PKG_BUILD_PKG:=github.com/fatedier/frp/cmd/...
 
 include $(INCLUDE_DIR)/package.mk
+include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
 
-define Package/$(PKG_NAME)
-	SECTION:=net
-	CATEGORY:=Network
-	TITLE:=FRPC Client
-	DEPENDS:=
-	URL:=https://github.com/fatedier/frp/releases
+define Package/frp/Default
+  TITLE:=A fast reverse proxy
+  URL:=https://github.com/fatedier/frp
 endef
 
-
-
-define Package/$(PKG_NAME)/description
-frp is a fast reverse proxy to help you expose a local server behind a NAT or firewall to the internet
+define Package/frp/Default/description
+frp is a fast reverse proxy to help you expose a local server behind a NAT or firewall
+to the internet. As of now, it supports tcp & udp, as well as httpand https protocols,
+where requests can be forwarded to internal services by domain name.
 endef
 
-define Build/Prepare
-	$(PKG_UNPACK)
+define frp/templates
+  define Package/$(1)
+  $$(call Package/frp/Default)
+    TITLE+= ($(1))
+    USERID:=frp=7000:frp=7000
+    SECTION:=net
+    CATEGORY:=Network
+    SUBMENU:=Web Servers/Proxies
+    DEPENDS:=$$(GO_ARCH_DEPENDS)
+  endef
+
+  define Package/$(1)/description
+  $$(call Package/frp/Default/description)
+
+  This package contains the $(1).
+  endef
+
+  define Package/$(1)/install
+	$$(INSTALL_DIR) $$(1)/usr/bin
+	$$(INSTALL_BIN) $$(GO_PKG_BUILD_BIN_DIR)/$(1) $$(1)/usr/bin/
+  endef
 endef
 
-define Build/Configure
+define Package/golang-github-fatedier-frp-dev
+$(call Package/frp/Default)
+$(call GoPackage/GoSubMenu)
+  TITLE+= (source files)
+  PKGARCH:=all
+endef
+
+define Package/golang-github-fatedier-frp-dev/description
+$(call Package/frp/Default/description)
+
+This package provides the source files for frpc/frps.
 endef
 
 define Build/Compile
+$(call GoPackage/Build/Compile,-ldflags "-s -w")
 endef
 
-define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/frpc $(1)/usr/bin/
-endef
+FRP_COMPONENTS:=frpc frps
 
-$(eval $(call BuildPackage,$(PKG_NAME)))
+$(foreach component,$(FRP_COMPONENTS), \
+  $(eval $(call frp/templates,$(component))) \
+  $(eval $(call GoBinPackage,$(component))) \
+  $(eval $(call BuildPackage,$(component))) \
+)
+
+$(eval $(call GoSrcPackage,golang-github-fatedier-frp-dev))
+$(eval $(call BuildPackage,golang-github-fatedier-frp-dev))