Update to 7.26:

This release includes the following changes:

 o nss: the minimal supported version of NSS bumped to 3.12.x
 o nss: human-readable names are now provided for NSS errors if available
 o add a manual page for mk-ca-bundle
 o added --post303 and the CURL_REDIR_POST_303 option for CURLOPT_POSTREDIR
 o smtp: Add support for DIGEST-MD5 authentication
 o pop3: Added support for additional pop3 commands

This release includes the following bugfixes:

 o nss: libcurl now uses NSS_InitContext() to prevent collisions if available [1]
 o URL parse: reject numerical IPv6 addresses outside brackets [4]
 o MD5: fix OOM memory leak [5]
 o OpenSSL cert: provide more details when cert check fails
 o HTTP: empty chunked POST ended up in two zero size chunks [6]
 o fixed a regression when curl resolved to multiple addresses and the first
   isn't supported [7]
 o -# progress meter: avoid superfluous updates and duplicate lines [8]
 o headers: surround GCC attribute names with double underscores [9]
 o PolarSSL: correct return code for CRL matches
 o PolarSSL: include version number in version string
 o PolarSSL: add support for asynchronous connect
 o mk-ca-bundle: revert the LWP usage [12]
 o IPv6 cookie domain: get rid of the first bracket before the second
 o connect.c: return changed to CURLE_COULDNT_CONNECT when opensocket fails
 o OpenSSL: Made cert hostname check conform to RFC 6125 [10]
 o HTTP: reset expected DL/UL sizes on redirects [11]
 o CMake: fix Windows LDAP/LDAPS option handling [2]
 o CMake: fix MS Visual Studio x64 unsigned long long literal suffix [3]
 o configure: update detection logic of getaddrinfo() thread-safeness
 o configure: check for gethostbyname in the watt lib
 o curl-config.1: fix curl-config usage in example [13]
 o smtp: Fixed non-escaping of dot character at beginning of line
 o MakefileBuild.vc: use the correct IDN variable
 o autoconf: improve handling of versioned symbols
 o curl.1: clarify -x usage
 o curl: shorten user-agent
 o smtp: issue with the multi-interface always sending postdata [14]
 o compile error with GnuTLS+Nettle fixed
 o winbuild: fix IPv6 enabled build

4 files changed, 33 insertions, 32 deletions

diff --git a/www/curl/Makefile b/www/curl/Makefile
index 334e36ebc47..4897dd52f8a 100644
--- a/www/curl/Makefile
+++ b/www/curl/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.112 2012/04/17 17:50:58 drochner Exp $
+# $NetBSD: Makefile,v 1.113 2012/05/29 14:58:05 wiz Exp $
 
-DISTNAME=	curl-7.25.0
+DISTNAME=	curl-7.26.0
 CATEGORIES=	www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		ftp://ftp.sunet.se/pub/www/utilities/curl/
diff --git a/www/curl/PLIST b/www/curl/PLIST
index 057320a19c5..0dbf992a6c1 100644
--- a/www/curl/PLIST
+++ b/www/curl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2012/01/28 14:41:15 wiz Exp $
+@comment $NetBSD: PLIST,v 1.36 2012/05/29 14:58:05 wiz Exp $
 bin/curl
 bin/curl-config
 include/curl/curl.h
@@ -14,6 +14,7 @@ lib/libcurl.la
 lib/pkgconfig/libcurl.pc
 man/man1/curl-config.1
 man/man1/curl.1
+man/man1/mk-ca-bundle.1
 man/man3/curl_easy_cleanup.3
 man/man3/curl_easy_duphandle.3
 man/man3/curl_easy_escape.3
diff --git a/www/curl/distinfo b/www/curl/distinfo
index aa2eeb95e72..35527784bdf 100644
--- a/www/curl/distinfo
+++ b/www/curl/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.75 2012/04/17 17:50:58 drochner Exp $
+$NetBSD: distinfo,v 1.76 2012/05/29 14:58:05 wiz Exp $
 
-SHA1 (curl-7.25.0.tar.bz2) = f6016a24051d98806ca3ddf754592701cb66e00c
-RMD160 (curl-7.25.0.tar.bz2) = e35b46a17fc2fc2a23fd12ed9488cc753bd941c5
-Size (curl-7.25.0.tar.bz2) = 2418060 bytes
-SHA1 (patch-aa) = 29e7a24fe828c88dd2f5435edcfe6dace44f18b3
+SHA1 (curl-7.26.0.tar.bz2) = c2e62eaace2407d377bf544d1f808aea6dddf64c
+RMD160 (curl-7.26.0.tar.bz2) = 90d66cd2f77bf825ba01056f4f384ff74e7b04eb
+Size (curl-7.26.0.tar.bz2) = 2422651 bytes
+SHA1 (patch-aa) = 4c5c76b76dc3a43087fdd8edf0de522fde563b3f
diff --git a/www/curl/patches/patch-aa b/www/curl/patches/patch-aa
index d576d41c61a..1bf39f37c73 100644
--- a/www/curl/patches/patch-aa
+++ b/www/curl/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.18 2012/01/28 14:41:15 wiz Exp $
+$NetBSD: patch-aa,v 1.19 2012/05/29 14:58:05 wiz Exp $
 
---- configure.orig	2012-01-23 15:32:37.000000000 +0000
+--- configure.orig	2012-05-22 21:46:41.000000000 +0000
 +++ configure
-@@ -15614,7 +15614,7 @@ squeeze() {
+@@ -15698,7 +15698,7 @@ squeeze() {
  
  
        #
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.18 2012/01/28 14:41:15 wiz Exp $
      #
      if test "$compiler_id" = "GNU_C" ||
        test "$compiler_id" = "CLANG"; then
-@@ -20090,15 +20090,15 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd
+@@ -20377,15 +20377,15 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd
             LIBS="$LIBS $gss_libs"
          elif test "$GSSAPI_ROOT" != "yes"; then
             LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff"
@@ -30,24 +30,24 @@ $NetBSD: patch-aa,v 1.18 2012/01/28 14:41:15 wiz Exp $
    fi
  else
    CPPFLAGS="$save_CPPFLAGS"
-@@ -23346,15 +23346,15 @@ if test "${enable_versioned_symbols+set}
+@@ -23598,15 +23598,15 @@ $as_echo "$as_me: WARNING: You need an l
  $as_echo "yes" >&6; }
-     if test "x$OPENSSL_ENABLED" = "x1"; then
-       versioned_symbols_flavour="OPENSSL_"
--    elif test "x$GNUTLS_ENABLED" == "x1"; then
-+    elif test "x$GNUTLS_ENABLED" = "x1"; then
-       versioned_symbols_flavour="GNUTLS_"
--    elif test "x$NSS_ENABLED" == "x1"; then
-+    elif test "x$NSS_ENABLED" = "x1"; then
-       versioned_symbols_flavour="NSS_"
--    elif test "x$POLARSSL_ENABLED" == "x1"; then
-+    elif test "x$POLARSSL_ENABLED" = "x1"; then
-       versioned_symbols_flavour="POLARSSL_"
--    elif test "x$CYASSL_ENABLED" == "x1"; then
-+    elif test "x$CYASSL_ENABLED" = "x1"; then
-       versioned_symbols_flavour="CYASSL_"
--    elif test "x$AXTLS_ENABLED" == "x1"; then
-+    elif test "x$AXTLS_ENABLED" = "x1"; then
-       versioned_symbols_flavour="AXTLS_"
-     else
-       versioned_symbols_flavour=""
+         if test "x$OPENSSL_ENABLED" = "x1"; then
+           versioned_symbols_flavour="OPENSSL_"
+-        elif test "x$GNUTLS_ENABLED" == "x1"; then
++        elif test "x$GNUTLS_ENABLED" = "x1"; then
+           versioned_symbols_flavour="GNUTLS_"
+-        elif test "x$NSS_ENABLED" == "x1"; then
++        elif test "x$NSS_ENABLED" = "x1"; then
+           versioned_symbols_flavour="NSS_"
+-        elif test "x$POLARSSL_ENABLED" == "x1"; then
++        elif test "x$POLARSSL_ENABLED" = "x1"; then
+           versioned_symbols_flavour="POLARSSL_"
+-        elif test "x$CYASSL_ENABLED" == "x1"; then
++        elif test "x$CYASSL_ENABLED" = "x1"; then
+           versioned_symbols_flavour="CYASSL_"
+-        elif test "x$AXTLS_ENABLED" == "x1"; then
++        elif test "x$AXTLS_ENABLED" = "x1"; then
+           versioned_symbols_flavour="AXTLS_"
+         else
+           versioned_symbols_flavour=""