frp: bump version to v0.32.1 and dos2unix for Makefile (#4338)

This commit is contained in:
Xiaok 2020-04-16 16:12:16 +08:00 committed by GitHub
parent d16a020193
commit a5570642c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,68 +1,68 @@
# #
# Copyright (C) 2019 Xingwang Liao # Copyright (C) 2019 Xingwang Liao
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
# #
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=frp PKG_NAME:=frp
PKG_VERSION:=0.32.0 PKG_VERSION:=0.32.1
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/fatedier/frp/tar.gz/v$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/fatedier/frp/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=39162780b28c0019207d83919530b573fac0bef8df30f1b6a5860886b0616c67 PKG_HASH:=3a6ef59163f5a1d41b67908269e924000a8ccb2984e4bdfc18bd1405b5dbaf22
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
PKG_MAINTAINER:=Xingwang Liao <kuoruan@gmail.com> PKG_MAINTAINER:=Xingwang Liao <kuoruan@gmail.com>
PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_DEPENDS:=golang/host
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_USE_MIPS16:=0 PKG_USE_MIPS16:=0
GO_PKG:=github.com/fatedier/frp GO_PKG:=github.com/fatedier/frp
GO_PKG_BUILD_PKG:=github.com/fatedier/frp/cmd/... GO_PKG_BUILD_PKG:=github.com/fatedier/frp/cmd/...
GO_PKG_LDFLAGS:=-s -w GO_PKG_LDFLAGS:=-s -w
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
define frp/templates define frp/templates
define Package/$(1) define Package/$(1)
TITLE:=A fast reverse proxy ($(1)) TITLE:=A fast reverse proxy ($(1))
URL:=https://github.com/fatedier/frp URL:=https://github.com/fatedier/frp
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
SUBMENU:=Web Servers/Proxies SUBMENU:=Web Servers/Proxies
DEPENDS:=$$(GO_ARCH_DEPENDS) DEPENDS:=$$(GO_ARCH_DEPENDS)
endef endef
define Package/$(1)/description define Package/$(1)/description
frp is a fast reverse proxy to help you expose a local server behind a NAT or firewall 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 http and https protocols, to the internet. As of now, it supports tcp & udp, as well as http and https protocols,
where requests can be forwarded to internal services by domain name. where requests can be forwarded to internal services by domain name.
This package contains the $(1). This package contains the $(1).
endef endef
define Package/$(1)/install define Package/$(1)/install
$$(call GoPackage/Package/Install/Bin,$$(PKG_INSTALL_DIR)) $$(call GoPackage/Package/Install/Bin,$$(PKG_INSTALL_DIR))
$$(INSTALL_DIR) $$(1)/usr/bin $$(INSTALL_DIR) $$(1)/usr/bin
$$(INSTALL_BIN) $$(PKG_INSTALL_DIR)/usr/bin/$(1) $$(1)/usr/bin/ $$(INSTALL_BIN) $$(PKG_INSTALL_DIR)/usr/bin/$(1) $$(1)/usr/bin/
$(STAGING_DIR_HOST)/bin/upx --lzma --best $$(1)/usr/bin/$(1) $(STAGING_DIR_HOST)/bin/upx --lzma --best $$(1)/usr/bin/$(1)
endef endef
endef endef
FRP_COMPONENTS:=frpc frps FRP_COMPONENTS:=frpc frps
$(foreach component,$(FRP_COMPONENTS), \ $(foreach component,$(FRP_COMPONENTS), \
$(eval $(call frp/templates,$(component))) \ $(eval $(call frp/templates,$(component))) \
$(eval $(call GoBinPackage,$(component))) \ $(eval $(call GoBinPackage,$(component))) \
$(eval $(call BuildPackage,$(component))) \ $(eval $(call BuildPackage,$(component))) \
) )