wget: update to 1.21.

* Changes in Wget 1.21

** Improve the number of translated strings

** Remove all uses of alloca
   In some places the length of untrusted strings has been used, e.g.
   strings from the command line or from remote.

** Fix buffer overflows in progress bar code in some locales

** Fix two null pointer accesses

** Amend cookie file header to be recognized by the 'file' command

** Post Handshake Authentication for OpenSSL

** Require gettext version 0.19.3+

** Add configure flags --enable-fsanitize-ubsan, --enable-fsanitize-asan
   and --enable-fsanitize-msan for gcc and clang

** Make several smaller fixes, enhance fuzzing, enhance building

5 files changed, 62 insertions, 57 deletions

diff --git a/net/wget/Makefile b/net/wget/Makefile
index abe381a82c3..dd07d4b0327 100644
--- a/net/wget/Makefile
+++ b/net/wget/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.158 2020/11/05 09:08:57 ryoon Exp $
+# $NetBSD: Makefile,v 1.159 2021/01/04 12:27:41 wiz Exp $
 
-DISTNAME=	wget-1.20.3
-PKGREVISION=	10
+DISTNAME=	wget-1.21
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GNU:=wget/}
 EXTRACT_SUFX=	.tar.lz
diff --git a/net/wget/PLIST b/net/wget/PLIST
index b95fcfd0edb..d3f021da535 100644
--- a/net/wget/PLIST
+++ b/net/wget/PLIST
@@ -1,44 +1,82 @@
-@comment $NetBSD: PLIST,v 1.17 2011/10/25 07:50:33 tron Exp $
+@comment $NetBSD: PLIST,v 1.18 2021/01/04 12:27:41 wiz Exp $
 bin/wget
 info/wget.info
 man/man1/wget.1
 share/examples/wget/wgetrc
+share/locale/af/LC_MESSAGES/wget-gnulib.mo
+share/locale/be/LC_MESSAGES/wget-gnulib.mo
 share/locale/be/LC_MESSAGES/wget.mo
+share/locale/bg/LC_MESSAGES/wget-gnulib.mo
 share/locale/bg/LC_MESSAGES/wget.mo
+share/locale/ca/LC_MESSAGES/wget-gnulib.mo
 share/locale/ca/LC_MESSAGES/wget.mo
+share/locale/cs/LC_MESSAGES/wget-gnulib.mo
 share/locale/cs/LC_MESSAGES/wget.mo
+share/locale/da/LC_MESSAGES/wget-gnulib.mo
 share/locale/da/LC_MESSAGES/wget.mo
+share/locale/de/LC_MESSAGES/wget-gnulib.mo
 share/locale/de/LC_MESSAGES/wget.mo
+share/locale/el/LC_MESSAGES/wget-gnulib.mo
 share/locale/el/LC_MESSAGES/wget.mo
 share/locale/en_GB/LC_MESSAGES/wget.mo
+share/locale/eo/LC_MESSAGES/wget-gnulib.mo
 share/locale/eo/LC_MESSAGES/wget.mo
+share/locale/es/LC_MESSAGES/wget-gnulib.mo
 share/locale/es/LC_MESSAGES/wget.mo
+share/locale/et/LC_MESSAGES/wget-gnulib.mo
 share/locale/et/LC_MESSAGES/wget.mo
+share/locale/eu/LC_MESSAGES/wget-gnulib.mo
 share/locale/eu/LC_MESSAGES/wget.mo
+share/locale/fi/LC_MESSAGES/wget-gnulib.mo
 share/locale/fi/LC_MESSAGES/wget.mo
+share/locale/fr/LC_MESSAGES/wget-gnulib.mo
 share/locale/fr/LC_MESSAGES/wget.mo
+share/locale/ga/LC_MESSAGES/wget-gnulib.mo
 share/locale/ga/LC_MESSAGES/wget.mo
+share/locale/gl/LC_MESSAGES/wget-gnulib.mo
 share/locale/gl/LC_MESSAGES/wget.mo
 share/locale/he/LC_MESSAGES/wget.mo
 share/locale/hr/LC_MESSAGES/wget.mo
+share/locale/hu/LC_MESSAGES/wget-gnulib.mo
 share/locale/hu/LC_MESSAGES/wget.mo
 share/locale/id/LC_MESSAGES/wget.mo
+share/locale/it/LC_MESSAGES/wget-gnulib.mo
 share/locale/it/LC_MESSAGES/wget.mo
+share/locale/ja/LC_MESSAGES/wget-gnulib.mo
 share/locale/ja/LC_MESSAGES/wget.mo
+share/locale/ko/LC_MESSAGES/wget-gnulib.mo
 share/locale/lt/LC_MESSAGES/wget.mo
+share/locale/ms/LC_MESSAGES/wget-gnulib.mo
+share/locale/nb/LC_MESSAGES/wget-gnulib.mo
 share/locale/nb/LC_MESSAGES/wget.mo
+share/locale/nl/LC_MESSAGES/wget-gnulib.mo
 share/locale/nl/LC_MESSAGES/wget.mo
+share/locale/pl/LC_MESSAGES/wget-gnulib.mo
 share/locale/pl/LC_MESSAGES/wget.mo
+share/locale/pt/LC_MESSAGES/wget-gnulib.mo
 share/locale/pt/LC_MESSAGES/wget.mo
+share/locale/pt_BR/LC_MESSAGES/wget-gnulib.mo
 share/locale/pt_BR/LC_MESSAGES/wget.mo
+share/locale/ro/LC_MESSAGES/wget-gnulib.mo
 share/locale/ro/LC_MESSAGES/wget.mo
+share/locale/ru/LC_MESSAGES/wget-gnulib.mo
 share/locale/ru/LC_MESSAGES/wget.mo
+share/locale/rw/LC_MESSAGES/wget-gnulib.mo
+share/locale/sk/LC_MESSAGES/wget-gnulib.mo
 share/locale/sk/LC_MESSAGES/wget.mo
+share/locale/sl/LC_MESSAGES/wget-gnulib.mo
 share/locale/sl/LC_MESSAGES/wget.mo
+share/locale/sr/LC_MESSAGES/wget-gnulib.mo
 share/locale/sr/LC_MESSAGES/wget.mo
+share/locale/sv/LC_MESSAGES/wget-gnulib.mo
 share/locale/sv/LC_MESSAGES/wget.mo
+share/locale/tr/LC_MESSAGES/wget-gnulib.mo
 share/locale/tr/LC_MESSAGES/wget.mo
+share/locale/uk/LC_MESSAGES/wget-gnulib.mo
 share/locale/uk/LC_MESSAGES/wget.mo
+share/locale/vi/LC_MESSAGES/wget-gnulib.mo
 share/locale/vi/LC_MESSAGES/wget.mo
+share/locale/zh_CN/LC_MESSAGES/wget-gnulib.mo
 share/locale/zh_CN/LC_MESSAGES/wget.mo
+share/locale/zh_TW/LC_MESSAGES/wget-gnulib.mo
 share/locale/zh_TW/LC_MESSAGES/wget.mo
diff --git a/net/wget/distinfo b/net/wget/distinfo
index b2285d0b7bd..4abaaddbbf5 100644
--- a/net/wget/distinfo
+++ b/net/wget/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.60 2019/05/26 18:10:48 leot Exp $
+$NetBSD: distinfo,v 1.61 2021/01/04 12:27:41 wiz Exp $
 
-SHA1 (wget-1.20.3.tar.lz) = 021929778956b7d71cf5c4fd98b4c719b293088d
-RMD160 (wget-1.20.3.tar.lz) = 799ac821c7ffde9d2cb3007a6ce4114a66181ce6
-SHA512 (wget-1.20.3.tar.lz) = 95fb064f0d79b0a3178a83322f58a85a3a036fb300ed759eb67a538f0bbacdd552f6cbeb60d63b4f0113e8467d923a5ce7ac5570b7a4ce1733b3dfd559bb33b2
-Size (wget-1.20.3.tar.lz) = 2135272 bytes
+SHA1 (wget-1.21.tar.lz) = 07fc9a34a76c91d377a2594dbb61ba83cebab9ad
+RMD160 (wget-1.21.tar.lz) = e1c7267984c1f4d4cc3ad7bcce414405c0ff1d70
+SHA512 (wget-1.21.tar.lz) = 10f32e153511a13397933d24e57002ee6477aea87e1e6811262268e0f43c5cfd8ab298921857d70a6f567be34b5a4fe9898ce4e7488e66294f3e85f011283838
+Size (wget-1.21.tar.lz) = 2354273 bytes
+SHA1 (patch-configure) = d72ecfae0a156bf42046759daeb6ad284b9213e1
 SHA1 (patch-doc_wget.texi) = 6db25b3500ff4617b5ade34d9013b1f9876104f8
-SHA1 (patch-src_openssl.c) = 70abf425c36c48b07fa67f48562fe77c002cc620
diff --git a/net/wget/patches/patch-configure b/net/wget/patches/patch-configure
new file mode 100644
index 00000000000..3f69c042012
--- /dev/null
+++ b/net/wget/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.3 2021/01/04 12:27:41 wiz Exp $
+
+Fix unportable test(1) operator.
+
+--- configure.orig	2020-12-31 15:54:33.000000000 +0000
++++ configure
+@@ -55925,7 +55925,7 @@ else
+   WITH_XATTR_FALSE=
+ fi
+ 
+- if test "X$ENABLE_NTLM" == "Xyes"; then
++ if test "X$ENABLE_NTLM" = "Xyes"; then
+   WITH_NTLM_TRUE=
+   WITH_NTLM_FALSE='#'
+ else
diff --git a/net/wget/patches/patch-src_openssl.c b/net/wget/patches/patch-src_openssl.c
deleted file mode 100644
index 7d1d06ceb30..00000000000
--- a/net/wget/patches/patch-src_openssl.c
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-src_openssl.c,v 1.1 2019/05/26 18:10:49 leot Exp $
-
-Backport upstream commit 14e3712b8c39165219fa227bd11f6feae7b09a33:
-
-src/openssl.c: fix ssl_init for openssl 1.1.1
-
-ssl_init fails with openssl 1.1.1 when openssl.cnf is not found.
-Redundant calls to intialization functions were removed as
-OPENSSL_config takes care of them for openssl versions < 1.1.0.
-For versions > 1.1.0, OPENSSL_init_ssl is preferred.
-
---- src/openssl.c.orig	2019-04-05 09:58:33.000000000 +0000
-+++ src/openssl.c
-@@ -174,7 +174,9 @@ ssl_init (void)
- #if OPENSSL_VERSION_NUMBER >= 0x00907000
-   if (ssl_true_initialized == 0)
-     {
--#if OPENSSL_API_COMPAT < 0x10100000L
-+#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+      OPENSSL_init_ssl (OPENSSL_INIT_LOAD_CONFIG | OPENSSL_INIT_ENGINE_ALL_BUILTIN, NULL);
-+#else
-       OPENSSL_config (NULL);
- #endif
-       ssl_true_initialized = 1;
-@@ -194,21 +196,9 @@ ssl_init (void)
-       goto error;
-     }
- 
--#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
--#if OPENSSL_API_COMPAT >= 0x10100000L
--  OPENSSL_init_ssl(0, NULL);
--#else
-+#if defined(LIBRESSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x10100000L)
-   SSL_library_init ();
-   SSL_load_error_strings ();
--#endif
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-   SSLeay_add_all_algorithms ();
-   SSLeay_add_ssl_algorithms ();
- #endif