From 87a2334d2e90422273a8eb7b1119f4c5fadec03e Mon Sep 17 00:00:00 2001 From: Van Waholtz Date: Thu, 5 Jan 2023 19:31:44 +0800 Subject: [PATCH] frp: update to 0.46.0 Add `test.sh`. Signed-off-by: Van Waholtz --- net/frp/Makefile | 10 ++++------ net/frp/test.sh | 3 +++ 2 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 net/frp/test.sh diff --git a/net/frp/Makefile b/net/frp/Makefile index 101a6f9f1f..7fc9f922fe 100644 --- a/net/frp/Makefile +++ b/net/frp/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=frp -PKG_VERSION:=0.45.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=0.46.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:=829cf9f14861ab1b074de6995282f30292f53513824372cfec4084a2e8de7123 +PKG_HASH:=bf617b7c5b3f9a34b4edbac73ca2b7b6781c4f09f33666a7d331d9fe8302679e PKG_MAINTAINER:=Richard Yu PKG_LICENSE:=Apache-2.0 @@ -23,10 +23,8 @@ include $(INCLUDE_DIR)/package.mk include ../../lang/golang/golang-package.mk define Package/frp/install - $(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR)) - $(INSTALL_DIR) $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(2) $(1)/usr/bin/ + $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/$(2) $(1)/usr/bin/ $(INSTALL_DIR) $(1)/etc/frp/$(2).d/ $(INSTALL_DATA) $(PKG_BUILD_DIR)/conf/$(2)_full.ini $(1)/etc/frp/$(2).d/ $(INSTALL_DIR) $(1)/etc/config/ diff --git a/net/frp/test.sh b/net/frp/test.sh new file mode 100644 index 0000000000..1436d02d3b --- /dev/null +++ b/net/frp/test.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +$1 -v 2>&1 | grep -F "$PKG_VERSION" -- 2.30.2