From 6d190fcdfafc21d071d0f512d806b548eebf0175 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 14 Aug 2019 22:44:11 +0200 Subject: [PATCH] - wget: bump version to 1.20.3 --- make/target-tools.mk | 12 ++++--- ...hardcoded-engine-support-for-openssl.patch | 33 ------------------- ...wget-set-check_cert-false-by-default.patch | 26 --------------- .../change_DEFAULT_LOGFILE.patch} | 8 ++--- .../set-check_cert-false-by-default.patch | 13 ++++++++ 5 files changed, 24 insertions(+), 68 deletions(-) delete mode 100644 patches/wget-remove-hardcoded-engine-support-for-openssl.patch delete mode 100644 patches/wget-set-check_cert-false-by-default.patch rename patches/{wget-change_DEFAULT_LOGFILE.patch => wget/change_DEFAULT_LOGFILE.patch} (89%) create mode 100644 patches/wget/set-check_cert-false-by-default.patch diff --git a/make/target-tools.mk b/make/target-tools.mk index 421dbebc..8d5de516 100644 --- a/make/target-tools.mk +++ b/make/target-tools.mk @@ -1580,7 +1580,7 @@ $(D)/mc: $(MC_DEPS) $(ARCHIVE)/$(MC_SOURCE) | $(TARGET_DIR) # ----------------------------------------------------------------------------- -WGET_VER = 1.19.2 +WGET_VER = 1.20.3 WGET_TMP = wget-$(WGET_VER) WGET_SOURCE = wget-$(WGET_VER).tar.gz WGET_URL = https://ftp.gnu.org/gnu/wget @@ -1588,17 +1588,18 @@ WGET_URL = https://ftp.gnu.org/gnu/wget $(ARCHIVE)/$(WGET_SOURCE): $(DOWNLOAD) $(WGET_URL)/$(WGET_SOURCE) -WGET_PATCH = wget-remove-hardcoded-engine-support-for-openssl.patch -WGET_PATCH += wget-set-check_cert-false-by-default.patch -WGET_PATCH += wget-change_DEFAULT_LOGFILE.patch +WGET_PATCH = set-check_cert-false-by-default.patch +WGET_PATCH += change_DEFAULT_LOGFILE.patch WGET_DEPS = $(D)/openssl +WGET_CFLAGS = $(TARGET_CFLAGS) -DOPENSSL_NO_ENGINE + $(D)/wget: $(WGET_DEPS) $(ARCHIVE)/$(WGET_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(WGET_TMP) $(UNTAR)/$(WGET_SOURCE) $(CHDIR)/$(WGET_TMP); \ - $(call apply_patches, $(WGET_PATCH)); \ + $(call apply_patches, $(addprefix $(@F)/,$(WGET_PATCH))); \ $(CONFIGURE) \ --target=$(TARGET) \ --prefix= \ @@ -1607,6 +1608,7 @@ $(D)/wget: $(WGET_DEPS) $(ARCHIVE)/$(WGET_SOURCE) | $(TARGET_DIR) --with-gnu-ld \ --with-ssl=openssl \ --disable-debug \ + CFLAGS="$(WGET_CFLAGS)" \ ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) diff --git a/patches/wget-remove-hardcoded-engine-support-for-openssl.patch b/patches/wget-remove-hardcoded-engine-support-for-openssl.patch deleted file mode 100644 index d209bf40..00000000 --- a/patches/wget-remove-hardcoded-engine-support-for-openssl.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b92cffc28b6f683ed001d0c4bb08ee8a3d00f9f4 Mon Sep 17 00:00:00 2001 -Message-Id: -From: gandharva -Date: Sat, 5 Dec 2015 16:14:01 +0100 -Subject: [PATCH] - wget: remove hardcoded engine support for openssl - ---- - src/openssl.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/src/openssl.c b/src/openssl.c -index 4876048..86b846a 100644 ---- a/src/openssl.c -+++ b/src/openssl.c -@@ -43,7 +43,6 @@ as that of the covered work. */ - #include - #if OPENSSL_VERSION_NUMBER >= 0x00907000 - #include --#include - #endif - - #include "utils.h" -@@ -197,7 +196,6 @@ ssl_init (void) - - #if OPENSSL_VERSION_NUMBER >= 0x00907000 - OPENSSL_load_builtin_modules(); -- ENGINE_load_builtin_engines(); - CONF_modules_load_file(NULL, NULL, - CONF_MFLAGS_DEFAULT_SECTION|CONF_MFLAGS_IGNORE_MISSING_FILE); - #endif --- -2.6.3 - diff --git a/patches/wget-set-check_cert-false-by-default.patch b/patches/wget-set-check_cert-false-by-default.patch deleted file mode 100644 index 38cb9180..00000000 --- a/patches/wget-set-check_cert-false-by-default.patch +++ /dev/null @@ -1,26 +0,0 @@ -From afb04eb59528b9cc6ff6503ecddb4ff5b5eec7c1 Mon Sep 17 00:00:00 2001 -Message-Id: -From: gandharva -Date: Sun, 6 Dec 2015 11:33:35 +0100 -Subject: [PATCH] - wget: set check_cert = CHECK_CERT_OFF by default - ---- - src/init.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/init.c b/src/init.c -index 67c94b9..b2ce270 100644 ---- a/src/init.c -+++ b/src/init.c -@@ -425,7 +425,7 @@ defaults (void) - opt.retr_symlinks = true; - - #ifdef HAVE_SSL -- opt.check_cert = CHECK_CERT_ON; -+ opt.check_cert = CHECK_CERT_OFF; - opt.ftps_resume_ssl = true; - opt.ftps_fallback_to_ftp = false; - opt.ftps_implicit = false; --- -2.6.3 - diff --git a/patches/wget-change_DEFAULT_LOGFILE.patch b/patches/wget/change_DEFAULT_LOGFILE.patch similarity index 89% rename from patches/wget-change_DEFAULT_LOGFILE.patch rename to patches/wget/change_DEFAULT_LOGFILE.patch index 4cffed51..a53d7e03 100644 --- a/patches/wget-change_DEFAULT_LOGFILE.patch +++ b/patches/wget/change_DEFAULT_LOGFILE.patch @@ -1,13 +1,13 @@ diff --git a/src/log.h b/src/log.h -index c3b7fec..1eecf3a 100644 +index e298f5c..c86e4e8 100644 --- a/src/log.h +++ b/src/log.h @@ -32,7 +32,7 @@ as that of the covered work. */ #define LOG_H - + /* The log file to which Wget writes to after HUP. */ -#define DEFAULT_LOGFILE "wget-log" +#define DEFAULT_LOGFILE "/var/run/wget/wget-log" - + #include - + diff --git a/patches/wget/set-check_cert-false-by-default.patch b/patches/wget/set-check_cert-false-by-default.patch new file mode 100644 index 00000000..d9c2996d --- /dev/null +++ b/patches/wget/set-check_cert-false-by-default.patch @@ -0,0 +1,13 @@ +diff --git a/src/init.c b/src/init.c +index 9b6665a..cf78af8 100644 +--- a/src/init.c ++++ b/src/init.c +@@ -445,7 +445,7 @@ defaults (void) + opt.retr_symlinks = true; + + #ifdef HAVE_SSL +- opt.check_cert = CHECK_CERT_ON; ++ opt.check_cert = CHECK_CERT_OFF; + opt.ftps_resume_ssl = true; + opt.ftps_fallback_to_ftp = false; + opt.ftps_implicit = false;