From 10faec6346a5b3561c04ac4517fa88f87f60dac4 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 9 Dec 2018 21:12:36 +0100
Subject: [PATCH] wget: Update from 1.19.5 to 1.20

---
 packages/wget/build.sh            | 13 ++++++++-----
 packages/wget/src-openssl.c.patch | 13 -------------
 2 files changed, 8 insertions(+), 18 deletions(-)
 delete mode 100644 packages/wget/src-openssl.c.patch

diff --git a/packages/wget/build.sh b/packages/wget/build.sh
index 1e88a80c8..ded29bc4f 100644
--- a/packages/wget/build.sh
+++ b/packages/wget/build.sh
@@ -1,8 +1,11 @@
 TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/wget/
 TERMUX_PKG_DESCRIPTION="Commandline tool for retrieving files using HTTP, HTTPS and FTP"
-TERMUX_PKG_VERSION=1.19.5
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SHA256=29fbe6f3d5408430c572a63fe32bd43d5860f32691173dfd84edc06869edca75
+TERMUX_PKG_VERSION=1.20
+TERMUX_PKG_SHA256=b0b80f565ac27f5e56c847431c75b4f8fcb31af9dad2bf5ce947d89651f3681e
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/wget/wget-${TERMUX_PKG_VERSION}.tar.lz
-TERMUX_PKG_DEPENDS="pcre, openssl, libuuid, libandroid-support, libunistring"
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-ssl=openssl --disable-iri"
+TERMUX_PKG_DEPENDS="pcre2, openssl, libuuid, libandroid-support, libunistring"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+ac_cv_func_getpass=yes
+--disable-iri
+--with-ssl=openssl
+"
diff --git a/packages/wget/src-openssl.c.patch b/packages/wget/src-openssl.c.patch
deleted file mode 100644
index 2152c9604..000000000
--- a/packages/wget/src-openssl.c.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -u -r ../wget-1.19.5/src/openssl.c ./src/openssl.c
---- ../wget-1.19.5/src/openssl.c	2018-05-05 20:49:06.000000000 +0000
-+++ ./src/openssl.c	2018-08-23 22:35:58.863327970 +0000
-@@ -193,7 +193,9 @@
- 
- #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