From f266a8a3cb454a17d1952b3f8204ec94cab024f0 Mon Sep 17 00:00:00 2001 From: Beginner <70857188+Beginner-Go@users.noreply.github.com> Date: Fri, 11 Feb 2022 15:06:46 +0800 Subject: [PATCH] baidupcs-web: bump to latest git HEAD (#8858) --- package/lean/baidupcs-web/Makefile | 36 ++++++++++--------- .../patches/001-add-missing-go-sum.patch | 21 ----------- 2 files changed, 19 insertions(+), 38 deletions(-) delete mode 100644 package/lean/baidupcs-web/patches/001-add-missing-go-sum.patch diff --git a/package/lean/baidupcs-web/Makefile b/package/lean/baidupcs-web/Makefile index ce92e8990..7ba4fe87f 100644 --- a/package/lean/baidupcs-web/Makefile +++ b/package/lean/baidupcs-web/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=baidupcs-web -PKG_VERSION:=3.7.4 -PKG_RELEASE:=1 +PKG_VERSION:=3.7.4-nnew +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/Erope/BaiduPCS-Go.git -PKG_SOURCE_VERSION:=5649b562ef4d5390fa18a996042f5f7d27b2ef8d -PKG_MIRROR_HASH:=5cdff81544f52cbadc8eb0eb7a855a41ad8f751edd702e9da5f3a05041baf81d +PKG_SOURCE_VERSION:=cffd49d0709f9c7d3dd6ae5c9625f68bfd446166 +PKG_MIRROR_HASH:=2cb9c9e27613cf4126234c969f1928e392108ad4f1580b3eac92339c42a2ab0a PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE @@ -35,26 +35,28 @@ GO_PKG_LDFLAGS_X:=main.Version=v$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk -define Package/$(PKG_NAME) - SECTION:=net - CATEGORY:=Network - TITLE:=BaiduPCS-Web is a web controller for BaiduPCS-Go - URL:=https://github.com/Erope/BaiduPCS-Go - DEPENDS:=$(GO_ARCH_DEPENDS) +define Package/baidupcs-web + TITLE:=BaiduPCS-Web is a web controller for BaiduPCS-Go + SECTION:=net + CATEGORY:=Network + SUBMENU:=Web Servers/Proxies + URL:=https://github.com/Erope/BaiduPCS-Go + DEPENDS:=$(GO_ARCH_DEPENDS) endef -define Package/$(PKG_NAME)/description +define Package/baidupcs-web/description BaiduPCS-Web is a web controller for BaiduPCS-Go endef -define Package/$(PKG_NAME)/config +define Package/baidupcs-web/config config BAIDUPCS_WEB_COMPRESS_GOPROXY bool "Compiling with GOPROXY proxy" default n config BAIDUPCS_WEB_COMPRESS_UPX bool "Compress executable files with UPX" - default y + depends on !mips64 + default n endef ifeq ($(CONFIG_BAIDUPCS_WEB_COMPRESS_GOPROXY),y) @@ -74,11 +76,11 @@ ifeq ($(CONFIG_BAIDUPCS_WEB_COMPRESS_UPX),y) endif endef -define Package/$(PKG_NAME)/install +define Package/baidupcs-web/install $(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR)) $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/BaiduPCS-Go $(1)/usr/bin/$(PKG_NAME) + $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/BaiduPCS-Go $(1)/usr/bin/baidupcs-web endef -$(eval $(call GoBinPackage,$(PKG_NAME))) -$(eval $(call BuildPackage,$(PKG_NAME))) +$(eval $(call GoBinPackage,baidupcs-web)) +$(eval $(call BuildPackage,baidupcs-web)) diff --git a/package/lean/baidupcs-web/patches/001-add-missing-go-sum.patch b/package/lean/baidupcs-web/patches/001-add-missing-go-sum.patch deleted file mode 100644 index 820d44353..000000000 --- a/package/lean/baidupcs-web/patches/001-add-missing-go-sum.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/go.sum -+++ b/go.sum -@@ -45,6 +45,7 @@ github.com/daaku/go.zipexe v1.0.1 h1:wV4zMsDOI2SZ2m7Tdz1Ps96Zrx+TzaK15VbUaGozw0M - github.com/daaku/go.zipexe v1.0.1/go.mod h1:5xWogtqlYnfBXkSB1o9xysukNP9GTvaNkqzUZbt3Bw8= - github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= - github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -+github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= - github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= - github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= - github.com/elastic/go-elasticsearch/v6 v6.8.5/go.mod h1:UwaDJsD3rWLM5rKNFzv9hgox93HoX8utj1kxD9aFUcI= ---- a/pcsutil/jwted25519/jwted25519.go -+++ b/pcsutil/jwted25519/jwted25519.go -@@ -2,7 +2,7 @@ package jwted25519 - - import ( - "github.com/dgrijalva/jwt-go" -- "golang.org/x/crypto/ed25519" -+ "crypto/ed25519" - "unsafe" - ) -