diff --git a/net/wget/Makefile b/net/wget/Makefile index fa03cc60e..d9a49065d 100644 --- a/net/wget/Makefile +++ b/net/wget/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wget PKG_VERSION:=1.19.5 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/$(PKG_NAME) @@ -28,7 +28,7 @@ define Package/wget/Default DEPENDS:=+libpcre +zlib SUBMENU:=File Transfer TITLE:=Non-interactive network downloader - URL:=http://www.gnu.org/software/wget/index.html + URL:=https://www.gnu.org/software/wget/index.html endef define Package/wget/Default/description diff --git a/net/wget/patches/010-openssl-Do-not-use-engines-when-OpenSSL-does-not-sup.patch b/net/wget/patches/010-openssl-Do-not-use-engines-when-OpenSSL-does-not-sup.patch new file mode 100644 index 000000000..c3c2fd2c3 --- /dev/null +++ b/net/wget/patches/010-openssl-Do-not-use-engines-when-OpenSSL-does-not-sup.patch @@ -0,0 +1,42 @@ +From a3643c6076e60f778e069340100e86bec5786e5f Mon Sep 17 00:00:00 2001 +From: Rosen Penev +Date: Thu, 8 Nov 2018 16:01:05 -0800 +Subject: [PATCH] openssl: Do not use engines when OpenSSL does not support + +* src/openssl.c: Check for OPENSSL_NO_ENGINE before + including openssl/engine.h and before calling ENGINE_load_builtin_engines() + +Fixes compilation with no engines compiled. + +Copyright-paperwork-exempt: Yes +Signed-off-by: Rosen Penev +--- + src/openssl.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/openssl.c b/src/openssl.c +index 6cf4afe9..73e7f0f4 100644 +--- a/src/openssl.c ++++ b/src/openssl.c +@@ -43,8 +43,10 @@ as that of the covered work. */ + #include + #if OPENSSL_VERSION_NUMBER >= 0x00907000 + #include ++#ifndef OPENSSL_NO_ENGINE + #include + #endif ++#endif + + #include "utils.h" + #include "connect.h" +@@ -193,7 +195,9 @@ ssl_init (void) + + #if OPENSSL_VERSION_NUMBER >= 0x00907000 + OPENSSL_load_builtin_modules(); ++#ifndef OPENSSL_NO_ENGINE + ENGINE_load_builtin_engines(); ++#endif + CONF_modules_load_file(NULL, NULL, + CONF_MFLAGS_DEFAULT_SECTION|CONF_MFLAGS_IGNORE_MISSING_FILE); + #endif +