Update to 1.13.4

* Remove ssl option, and add gnutls and openssl options.
  The default is openssl like before.
* All security patches are included in upstream's tar ball.
* Remove ac_cv_func_sigsetjmp=yes line, because not defined now.

Tested on NetBSD/i386 4.0.1, 5.1 5.99.56.

Changelog:
* Changes in Wget 1.13.4

** Now --version and --help work again.

** Fix a build error on solaris 10 sparc.

** Now --timestamping and --continue work well together.

** Return a network failure when FTP downloads fail and --timestamping
   is specified.


* Changes in Wget 1.13.3

** Support HTTP/1.1

** Now by default the GNU TLS library for secure connections, instead of
   OpenSSL.

** Fix some portability issues.

** Handle properly malformed status line in a HTTP response.

** Ignore zero length domains in $no_proxy.

** Set new cookies after an authorization failure.

** Exit with failure if -k is specified and -O is not a regular file.

** Cope better with unclosed html tags.

** Print diagnostic messages to stderr, not stdout.

** Do not use an additional HEAD request when --content-disposition is used,
   but use directly GET.

** Report the average transfer speed correctly when multiple URL's are specified
   and -c influences the transferred data amount.

** GNU TLS backend works again.

** Now --timestamping and --continue works well together.

** By default, on server redirects, use the original URL to get the
   local file name. Close CVE-2010-2252.  This introduces a
   backward-incompatibility; any script that relies on the old
   behaviour must use --trust-server-names.

** Fix a problem when -k is used and some URLs are specified trough
   CSS.

** Convert correctly URLs that need to be encoded to local files when following
   links.

** Use persistent connections with proxies supporting them.

** Print the total download time as part of the summary for recursive downloads.

** Now it is possible to specify a different startup configuration file trough
   the --config option.

** Fix an infinite loop with the error '<filename> has sprung into existence'
   on a network error and -nc is used.

** Now --adjust-extension does not modify the file extension if the file ends
   in .htm.

** Support HTTP/1.1 307 redirects keep request method.

** Now --no-parent doesn't fetch undesired files if HTTP and HTTPS are used
   by the same host on different pages.

** Do not attempt to remove the file if it is not in the accept rules but
   it is the output destination file.

** Introduce `show_all_dns_entries' to print all IP addresses corresponding to
   a DNS name when it is resolved.

10 files changed, 18 insertions, 192 deletions

diff --git a/net/wget/Makefile b/net/wget/Makefile
index abaecff8fa7..cb2be662baf 100644
--- a/net/wget/Makefile
+++ b/net/wget/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.104 2011/10/12 17:35:15 hans Exp $
+# $NetBSD: Makefile,v 1.105 2011/10/24 15:22:01 ryoon Exp $
 
-DISTNAME=	wget-1.12
-PKGREVISION=	2
+DISTNAME=	wget-1.13.4
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GNU:=wget/}
 
@@ -20,7 +19,6 @@ USE_PKGLOCALEDIR=	YES
 USE_TOOLS+=		msgfmt
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ENV+=		ac_cv_func_sigsetjmp=yes
 
 EGDIR=			${PREFIX}/share/examples/wget
 CONF_FILES=		${EGDIR}/wgetrc ${PKG_SYSCONFDIR}/wgetrc
diff --git a/net/wget/PLIST b/net/wget/PLIST
index 42af497bc16..9bec66dc5ec 100644
--- a/net/wget/PLIST
+++ b/net/wget/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.15 2009/10/31 02:29:14 wiz Exp $
+@comment $NetBSD: PLIST,v 1.16 2011/10/24 15:22:01 ryoon Exp $
 bin/wget
 info/wget.info
+lib/charset.alias
 man/man1/wget.1
 share/examples/wget/wgetrc
 share/locale/be/LC_MESSAGES/wget.mo
@@ -10,10 +11,7 @@ share/locale/cs/LC_MESSAGES/wget.mo
 share/locale/da/LC_MESSAGES/wget.mo
 share/locale/de/LC_MESSAGES/wget.mo
 share/locale/el/LC_MESSAGES/wget.mo
-share/locale/en@boldquot/LC_MESSAGES/wget.mo
-share/locale/en@quot/LC_MESSAGES/wget.mo
 share/locale/en_GB/LC_MESSAGES/wget.mo
-share/locale/en_US/LC_MESSAGES/wget.mo
 share/locale/eo/LC_MESSAGES/wget.mo
 share/locale/es/LC_MESSAGES/wget.mo
 share/locale/et/LC_MESSAGES/wget.mo
diff --git a/net/wget/distinfo b/net/wget/distinfo
index 25ee0dc3967..27633e1e6e1 100644
--- a/net/wget/distinfo
+++ b/net/wget/distinfo
@@ -1,11 +1,5 @@
-$NetBSD: distinfo,v 1.36 2010/11/23 08:22:46 tron Exp $
+$NetBSD: distinfo,v 1.37 2011/10/24 15:22:01 ryoon Exp $
 
-SHA1 (wget-1.12.tar.gz) = 50d4ed2441e67db7aa5061d8a4dde41ee0e94248
-RMD160 (wget-1.12.tar.gz) = 232d0aa6fb36731c162d2b7374aa9ab59e671b7d
-Size (wget-1.12.tar.gz) = 2464747 bytes
-SHA1 (patch-aa) = f3f3c4f5aac5aac9c93dcc9f9a5d4e8e438192fd
-SHA1 (patch-ab) = 0c9a4ace8bd119718013efd175d00232b655cb0d
-SHA1 (patch-ac) = 4a1f6c08a15d76610cd1aa5e50c165e1c43017ac
-SHA1 (patch-ad) = f1c32ea0921c455fc48ec153032221e156c785a1
-SHA1 (patch-ae) = 9a17a2ecf2e73c8d678bbe3e507002a64258ce40
-SHA1 (patch-af) = eaccff4347cec71d1951624a05f36975996fb4db
+SHA1 (wget-1.13.4.tar.gz) = e25e1b487026ddd9026ca7d26af21f044c884d28
+RMD160 (wget-1.13.4.tar.gz) = 61062bfd4c28f85a31f599e90f83fa84ba1c71d0
+Size (wget-1.13.4.tar.gz) = 2815185 bytes
diff --git a/net/wget/options.mk b/net/wget/options.mk
index de24dbc5251..61a675b7025 100644
--- a/net/wget/options.mk
+++ b/net/wget/options.mk
@@ -1,8 +1,10 @@
-# $NetBSD: options.mk,v 1.5 2009/10/31 02:29:14 wiz Exp $
+# $NetBSD: options.mk,v 1.6 2011/10/24 15:22:01 ryoon Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.wget
-PKG_SUPPORTED_OPTIONS=	idn inet6 ssl
-PKG_SUGGESTED_OPTIONS=	idn ssl
+PKG_SUPPORTED_OPTIONS=	gnutls idn inet6 openssl
+PKG_OPTIONS_REQUIRED_GROUPS=	ssl
+PKG_OPTIONS_GROUP.ssl=	gnutls openssl
+PKG_SUGGESTED_OPTIONS=	idn openssl
 
 .include "../../mk/bsd.options.mk"
 
@@ -26,9 +28,12 @@ CONFIGURE_ARGS+=	--disable-ipv6
 ###
 ### Support SSL
 ###
-.if !empty(PKG_OPTIONS:Mssl)
+.if !empty(PKG_OPTIONS:Mopenssl)
 .  include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+=--with-ssl=${SSLBASE:Q}
+CONFIGURE_ARGS+=--with-ssl=openssl
+.elif !empty(PKG_OPTIONS:Mgnutls)
+.  include "../../security/gnutls/buildlink3.mk"
+CONFIGURE_ARGS+=--with-ssl=gnutls
 .else
 CONFIGURE_ARGS+=--without-ssl
 .endif
diff --git a/net/wget/patches/patch-aa b/net/wget/patches/patch-aa
deleted file mode 100644
index e036e201973..00000000000
--- a/net/wget/patches/patch-aa
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2010/11/23 08:22:47 tron Exp $
-
-Back port of patch for CVE-2010-2252 for to version 1.12 of "wget" taken
-from Debian:
-
-http://packages.debian.org/sid/wget
-http://ftp.de.debian.org/debian/pool/main/w/wget/wget_1.12-2.1.debian.tar.gz
-
---- src/http.c.orig	2009-09-22 04:02:18.000000000 +0100
-+++ src/http.c	2010-11-22 18:53:25.000000000 +0000
-@@ -2410,8 +2410,9 @@
- /* The genuine HTTP loop!  This is the part where the retrieval is
-    retried, and retried, and retried, and...  */
- uerr_t
--http_loop (struct url *u, char **newloc, char **local_file, const char *referer,
--           int *dt, struct url *proxy, struct iri *iri)
-+http_loop (struct url *u, struct url *original_url, char **newloc,
-+           char **local_file, const char *referer, int *dt, struct url *proxy,
-+           struct iri *iri)
- {
-   int count;
-   bool got_head = false;         /* used for time-stamping and filename detection */
-@@ -2457,7 +2458,8 @@
-     }
-   else if (!opt.content_disposition)
-     {
--      hstat.local_file = url_file_name (u);
-+      hstat.local_file =
-+        url_file_name (opt.trustservernames ? u : original_url);
-       got_name = true;
-     }
- 
-@@ -2497,7 +2499,7 @@
- 
-   /* Send preliminary HEAD request if -N is given and we have an existing
-    * destination file. */
--  file_name = url_file_name (u);
-+  file_name = url_file_name (opt.trustservernames ? u : original_url);
-   if (opt.timestamping
-       && !opt.content_disposition
-       && file_exists_p (file_name))
-@@ -2852,9 +2854,9 @@
- 
-           /* Remember that we downloaded the file for later ".orig" code. */
-           if (*dt & ADDED_HTML_EXTENSION)
--            downloaded_file(FILE_DOWNLOADED_AND_HTML_EXTENSION_ADDED, hstat.local_file);
-+            downloaded_file (FILE_DOWNLOADED_AND_HTML_EXTENSION_ADDED, hstat.local_file);
-           else
--            downloaded_file(FILE_DOWNLOADED_NORMALLY, hstat.local_file);
-+            downloaded_file (FILE_DOWNLOADED_NORMALLY, hstat.local_file);
- 
-           ret = RETROK;
-           goto exit;
-@@ -2885,9 +2887,9 @@
- 
-               /* Remember that we downloaded the file for later ".orig" code. */
-               if (*dt & ADDED_HTML_EXTENSION)
--                downloaded_file(FILE_DOWNLOADED_AND_HTML_EXTENSION_ADDED, hstat.local_file);
-+                downloaded_file (FILE_DOWNLOADED_AND_HTML_EXTENSION_ADDED, hstat.local_file);
-               else
--                downloaded_file(FILE_DOWNLOADED_NORMALLY, hstat.local_file);
-+                downloaded_file (FILE_DOWNLOADED_NORMALLY, hstat.local_file);
- 
-               ret = RETROK;
-               goto exit;
diff --git a/net/wget/patches/patch-ab b/net/wget/patches/patch-ab
deleted file mode 100644
index 9e7aa959d28..00000000000
--- a/net/wget/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.9 2010/11/23 08:22:47 tron Exp $
-
-Back port of patch for CVE-2010-2252 for to version 1.12 of "wget" taken
-from Debian:
-
-http://packages.debian.org/sid/wget
-http://ftp.de.debian.org/debian/pool/main/w/wget/wget_1.12-2.1.debian.tar.gz
-
---- src/http.h.orig	2009-09-04 17:31:54.000000000 +0100
-+++ src/http.h	2010-11-22 18:53:25.000000000 +0000
-@@ -33,8 +33,8 @@
- 
- struct url;
- 
--uerr_t http_loop (struct url *, char **, char **, const char *, int *,
--		  struct url *, struct iri *);
-+uerr_t http_loop (struct url *, struct url *, char **, char **, const char *,
-+                  int *, struct url *, struct iri *);
- void save_cookies (void);
- void http_cleanup (void);
- time_t http_atotm (const char *);
diff --git a/net/wget/patches/patch-ac b/net/wget/patches/patch-ac
deleted file mode 100644
index 627e98e44ba..00000000000
--- a/net/wget/patches/patch-ac
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ac,v 1.11 2010/11/23 08:22:47 tron Exp $
-
-Back port of patch for CVE-2010-2252 for to version 1.12 of "wget" taken
-from Debian:
-
-http://packages.debian.org/sid/wget
-http://ftp.de.debian.org/debian/pool/main/w/wget/wget_1.12-2.1.debian.tar.gz
-
---- src/init.c.orig	2009-09-22 04:02:41.000000000 +0100
-+++ src/init.c	2010-11-22 18:53:25.000000000 +0000
-@@ -243,6 +243,7 @@
-   { "timeout",          NULL,                   cmd_spec_timeout },
-   { "timestamping",     &opt.timestamping,      cmd_boolean },
-   { "tries",            &opt.ntry,              cmd_number_inf },
-+  { "trustservernames", &opt.trustservernames,  cmd_boolean },
-   { "useproxy",         &opt.use_proxy,         cmd_boolean },
-   { "user",             &opt.user,              cmd_string },
-   { "useragent",        NULL,                   cmd_spec_useragent },
diff --git a/net/wget/patches/patch-ad b/net/wget/patches/patch-ad
deleted file mode 100644
index 645443ffbfc..00000000000
--- a/net/wget/patches/patch-ad
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ad,v 1.10 2010/11/23 08:22:47 tron Exp $
-
-Back port of patch for CVE-2010-2252 for to version 1.12 of "wget" taken
-from Debian:
-
-http://packages.debian.org/sid/wget
-http://ftp.de.debian.org/debian/pool/main/w/wget/wget_1.12-2.1.debian.tar.gz
-
---- src/main.c.orig	2009-09-22 04:03:11.000000000 +0100
-+++ src/main.c	2010-11-22 18:53:25.000000000 +0000
-@@ -266,6 +266,7 @@
-     { "timeout", 'T', OPT_VALUE, "timeout", -1 },
-     { "timestamping", 'N', OPT_BOOLEAN, "timestamping", -1 },
-     { "tries", 't', OPT_VALUE, "tries", -1 },
-+    { "trust-server-names", 0, OPT_BOOLEAN, "trustservernames", -1 },
-     { "user", 0, OPT_VALUE, "user", -1 },
-     { "user-agent", 'U', OPT_VALUE, "useragent", -1 },
-     { "verbose", 'v', OPT_BOOLEAN, "verbose", -1 },
-@@ -675,6 +676,8 @@
-     N_("\
-   -I,  --include-directories=LIST  list of allowed directories.\n"),
-     N_("\
-+  --trust-server-names  use the name specified by the redirection url last component.\n"),
-+    N_("\
-   -X,  --exclude-directories=LIST  list of excluded directories.\n"),
-     N_("\
-   -np, --no-parent                 don't ascend to the parent directory.\n"),
diff --git a/net/wget/patches/patch-ae b/net/wget/patches/patch-ae
deleted file mode 100644
index 05a6b04531b..00000000000
--- a/net/wget/patches/patch-ae
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ae,v 1.8 2010/11/23 08:22:47 tron Exp $
-
-Back port of patch for CVE-2010-2252 for to version 1.12 of "wget" taken
-from Debian:
-
-http://packages.debian.org/sid/wget
-http://ftp.de.debian.org/debian/pool/main/w/wget/wget_1.12-2.1.debian.tar.gz
-
---- src/options.h.orig	2009-09-22 04:03:47.000000000 +0100
-+++ src/options.h	2010-11-22 18:53:25.000000000 +0000
-@@ -242,6 +242,7 @@
-   char *encoding_remote;
-   char *locale;
- 
-+  bool trustservernames;
- #ifdef __VMS
-   int ftp_stmlf;                /* Force Stream_LF format for binary FTP. */
- #endif /* def __VMS */
diff --git a/net/wget/patches/patch-af b/net/wget/patches/patch-af
deleted file mode 100644
index d4179795123..00000000000
--- a/net/wget/patches/patch-af
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-af,v 1.6 2010/11/23 08:22:47 tron Exp $
-
-Back port of patch for CVE-2010-2252 for to version 1.12 of "wget" taken
-from Debian:
-
-http://packages.debian.org/sid/wget
-http://ftp.de.debian.org/debian/pool/main/w/wget/wget_1.12-2.1.debian.tar.gz
-
---- src/retr.c.orig	2009-09-04 17:31:54.000000000 +0100
-+++ src/retr.c	2010-11-22 18:53:25.000000000 +0000
-@@ -689,7 +689,8 @@
- #endif
-       || (proxy_url && proxy_url->scheme == SCHEME_HTTP))
-     {
--      result = http_loop (u, &mynewloc, &local_file, refurl, dt, proxy_url, iri);
-+      result = http_loop (u, orig_parsed, &mynewloc, &local_file, refurl, dt,
-+                          proxy_url, iri);
-     }
-   else if (u->scheme == SCHEME_FTP)
-     {