From 9d2c4a79c80719797cd32ad0ddeeb8f320ba1058 Mon Sep 17 00:00:00 2001 From: LEAN-ESX Date: Thu, 16 May 2019 19:37:14 -0700 Subject: [PATCH] frpc: bump to version v2.7.0 --- package/lean/frpc/Makefile | 110 +++++++++++++++---------------------- 1 file changed, 44 insertions(+), 66 deletions(-) diff --git a/package/lean/frpc/Makefile b/package/lean/frpc/Makefile index 4796754ed..631176680 100644 --- a/package/lean/frpc/Makefile +++ b/package/lean/frpc/Makefile @@ -1,92 +1,70 @@ # -# Copyright (C) 2019 Xingwang Liao +# Copyright (C) 2015-2016 OpenWrt.org # -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. +# This is free software, licensed under the GNU General Public License v3. # include $(TOPDIR)/rules.mk -PKG_NAME:=frp -PKG_VERSION:=0.26.0 +PKG_NAME:=frpc +PKG_VERSION:=0.27.0 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/fatedier/frp/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=b5a52c1f84af57af57d955c130876ad966baa66f48d063b10956e806dde45823 +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_LICENSE:=Apache-2.0 -PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=Xingwang Liao -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/... +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 include $(INCLUDE_DIR)/package.mk -include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk -define Package/frp/Default - TITLE:=A fast reverse proxy - URL:=https://github.com/fatedier/frp +define Package/$(PKG_NAME) + SECTION:=net + CATEGORY:=Network + TITLE:=FRPC Client + DEPENDS:= + URL:=https://github.com/fatedier/frp/releases endef -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. + + +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 endef -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 +define Build/Prepare + $(PKG_UNPACK) endef -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. +define Build/Configure endef define Build/Compile -$(call GoPackage/Build/Compile,-ldflags "-s -w") endef -FRP_COMPONENTS:=frpc frps +define Package/$(PKG_NAME)/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/frpc $(1)/usr/bin/ +endef -$(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)) +$(eval $(call BuildPackage,$(PKG_NAME))) \ No newline at end of file