From 406b052f7357507774644b6e9a7211081643e26e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Tue, 26 Nov 2019 13:56:22 +0100 Subject: [PATCH 1/3] wget: do not provide itself MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The package wget should not say that it provides itself. This also make gnu-wget provide general so it is not written in Makefile twice. Signed-off-by: Karel Kočí (cherry picked from commit 75f2be7d509e802f2d946d732e7a7539c2b27d2e) --- net/wget/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/net/wget/Makefile b/net/wget/Makefile index 306da1b14..9664a37d5 100644 --- a/net/wget/Makefile +++ b/net/wget/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wget PKG_VERSION:=1.20.3 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/$(PKG_NAME) @@ -29,7 +29,7 @@ define Package/wget/Default SUBMENU:=File Transfer TITLE:=Non-interactive network downloader URL:=https://www.gnu.org/software/wget/index.html - PROVIDES:=wget + PROVIDES:=gnu-wget endef define Package/wget/Default/description @@ -46,7 +46,6 @@ $(call Package/wget/Default) DEPENDS+= +libopenssl +librt TITLE+= (with SSL support) VARIANT:=ssl - PROVIDES+=gnu-wget ALTERNATIVES:=300:/usr/bin/wget:/usr/bin/wget-ssl endef @@ -59,7 +58,7 @@ define Package/wget-nossl $(call Package/wget/Default) TITLE+= (without SSL support) VARIANT:=nossl - PROVIDES+=gnu-wget + PROVIDES+=wget ALTERNATIVES:=300:/usr/bin/wget:/usr/bin/wget-nossl endef From ba4c4e681e75590a25c51a635d753e22a10f087e Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Mon, 6 Apr 2020 10:20:55 +0800 Subject: [PATCH 2/3] wget: make the ssl variant provides wget-ssl This is to address the need for specifying dependency on a wget implementation with ssl support. Now we have a game of names for opkg 1. uclient-fetch: minimal version by openwrt project 2. wget-nossl: gnu wget w/o ssl support 3. wget-ssl: for the moment since this commit, gnu wget w/ ssl support 4. wget: uclient-fetch, wget-nossl, or wget-ssl 5. gnu-wget: wget-nossl or wget-ssl By the time we provide some dummy package like uclient-fetch-ssl and make it also provide wget-ssl, I guess by then we will also need gnu-wget-ssl... Ref: https://github.com/openwrt/packages/issues/11534 Ref: https://github.com/openwrt/packages/pull/9941 Signed-off-by: Yousong Zhou (cherry picked from commit 585e4a38feca24c9650d4e762b44146ecd75d4d0) --- net/wget/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/wget/Makefile b/net/wget/Makefile index 9664a37d5..ffad46109 100644 --- a/net/wget/Makefile +++ b/net/wget/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wget PKG_VERSION:=1.20.3 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/$(PKG_NAME) @@ -46,6 +46,7 @@ $(call Package/wget/Default) DEPENDS+= +libopenssl +librt TITLE+= (with SSL support) VARIANT:=ssl + PROVIDES+=wget-ssl ALTERNATIVES:=300:/usr/bin/wget:/usr/bin/wget-ssl endef From fb64ef9d368f83abcdba9a3cf00b080389a54adc Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Mon, 6 Apr 2020 10:31:49 +0800 Subject: [PATCH 3/3] acme: depends on wget-ssl Signed-off-by: Yousong Zhou (cherry picked from commit d917d662aedd9c133217b5c6d8c5a4f4a6bd3dea) --- net/acme/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/acme/Makefile b/net/acme/Makefile index 8ce6e3dd4..e6220a6e4 100644 --- a/net/acme/Makefile +++ b/net/acme/Makefile @@ -27,7 +27,7 @@ include $(INCLUDE_DIR)/package.mk define Package/acme SECTION:=net CATEGORY:=Network - DEPENDS:=+gnu-wget +ca-bundle +openssl-util +socat + DEPENDS:=+wget-ssl +ca-bundle +openssl-util +socat TITLE:=ACME (Letsencrypt) client URL:=https://acme.sh PKGARCH:=all