From b5f82a4a5a6f14b4d178a4d662784d7bd6f7fada Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 21 Mar 2022 20:29:47 +0100 Subject: [PATCH] package/wget: bump version to 1.21.3 - bump version to 1.21.3 (for details see [1]) - remove legacy --with-libidn option (see [2]), replace with --enable-iri option in case locale support and libidn2 are available [1] https://lists.gnu.org/archive/html/info-gnu/2022-02/msg00017.html [2] https://git.savannah.gnu.org/cgit/wget.git/commit/configure.ac?id=a24e67e239ef949cc77a4c4e5a0beb703026a296 Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/wget/wget.hash | 4 ++-- package/wget/wget.mk | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/wget/wget.hash b/package/wget/wget.hash index 7f89bedb88..22674650a2 100644 --- a/package/wget/wget.hash +++ b/package/wget/wget.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/wget/wget-1.21.2.tar.lz.sig +# https://ftp.gnu.org/gnu/wget/wget-1.21.3.tar.lz.sig # with key 6B98F637D879C5236E277C5C64FF90AAE8C70AF9 -sha256 1727a330a86acacb3e57615ce268f5f29978bf7adec4abe6a30d370207bc91b3 wget-1.21.2.tar.lz +sha256 dbd2fb5e47149d4752d0eaa0dac68cc49cf20d46df4f8e326ffc8f18b2af4ea5 wget-1.21.3.tar.lz # Locally calculated sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING diff --git a/package/wget/wget.mk b/package/wget/wget.mk index 8a73c33699..455faaed12 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -4,7 +4,7 @@ # ################################################################################ -WGET_VERSION = 1.21.2 +WGET_VERSION = 1.21.3 WGET_SOURCE = wget-$(WGET_VERSION).tar.lz WGET_SITE = $(BR2_GNU_MIRROR)/wget WGET_DEPENDENCIES = host-pkgconf @@ -33,11 +33,12 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y) WGET_DEPENDENCIES += libiconv endif -ifeq ($(BR2_PACKAGE_LIBIDN2),y) -WGET_CONF_OPTS += --with-libidn +# BR2_ENABLE_LOCALE and BR2_PACKAGE_LIBICONV are mutually exclusive +ifeq ($(BR2_ENABLE_LOCALE)$(BR2_PACKAGE_LIBICONV)$(BR2_PACKAGE_LIBIDN2),yy) +WGET_CONF_OPTS += --enable-iri WGET_DEPENDENCIES += libidn2 else -WGET_CONF_OPTS += --without-libidn +WGET_CONF_OPTS += --disable-iri endif ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y)