diff options
| -rw-r--r-- | www/curl/Makefile | 4 | ||||
| -rw-r--r-- | www/curl/PLIST | 4 | ||||
| -rw-r--r-- | www/curl/distinfo | 11 | ||||
| -rw-r--r-- | www/curl/patches/patch-aa | 21 | ||||
| -rw-r--r-- | www/curl/patches/patch-lib_curl__sasl__gssapi.c | 15 |
5 files changed, 25 insertions, 30 deletions
diff --git a/www/curl/Makefile b/www/curl/Makefile index 32c37ffb5b4..17e14fc2fa7 100644 --- a/www/curl/Makefile +++ b/www/curl/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.144 2015/01/08 17:23:07 wiz Exp $ +# $NetBSD: Makefile,v 1.145 2015/03/01 15:01:00 wiz Exp $ -DISTNAME= curl-7.40.0 +DISTNAME= curl-7.41.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 8a5d047dade..e2a64014a89 100644 --- a/www/curl/PLIST +++ b/www/curl/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.46 2015/01/08 17:23:07 wiz Exp $ +@comment $NetBSD: PLIST,v 1.47 2015/03/01 15:01:00 wiz Exp $ bin/curl bin/curl-config include/curl/curl.h @@ -207,6 +207,7 @@ man/man3/CURLOPT_SSL_OPTIONS.3 man/man3/CURLOPT_SSL_SESSIONID_CACHE.3 man/man3/CURLOPT_SSL_VERIFYHOST.3 man/man3/CURLOPT_SSL_VERIFYPEER.3 +man/man3/CURLOPT_SSL_VERIFYSTATUS.3 man/man3/CURLOPT_STDERR.3 man/man3/CURLOPT_TCP_KEEPALIVE.3 man/man3/CURLOPT_TCP_KEEPIDLE.3 @@ -290,6 +291,7 @@ man/man3/libcurl-easy.3 man/man3/libcurl-errors.3 man/man3/libcurl-multi.3 man/man3/libcurl-share.3 +man/man3/libcurl-symbols.3 man/man3/libcurl-tutorial.3 man/man3/libcurl.3 share/aclocal/libcurl.m4 diff --git a/www/curl/distinfo b/www/curl/distinfo index 5fa29b94a40..e37f4461ddb 100644 --- a/www/curl/distinfo +++ b/www/curl/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.101 2015/01/08 19:23:53 wiz Exp $ +$NetBSD: distinfo,v 1.102 2015/03/01 15:01:00 wiz Exp $ -SHA1 (curl-7.40.0.tar.bz2) = 1446603f4df89b6d1cafc4d6a8617c892651b3ff -RMD160 (curl-7.40.0.tar.bz2) = 5ca0220dc5e866271e3757b21eee14477690e259 -Size (curl-7.40.0.tar.bz2) = 3266944 bytes -SHA1 (patch-aa) = 54c9f5b1a22743e2714883ae5a2b20366b839e7e +SHA1 (curl-7.41.0.tar.bz2) = 6784591ed7dc3452a8ef6fba050777c50775c4f1 +RMD160 (curl-7.41.0.tar.bz2) = 8aa31d13947a9f0c13d7445e1da70554555fe67a +Size (curl-7.41.0.tar.bz2) = 3304508 bytes +SHA1 (patch-aa) = bb12008145096a963948ae69124746875452afa7 SHA1 (patch-curl-config.in) = fd87c97b601a6b9269f67fbc066604ee7e22570e -SHA1 (patch-lib_curl__sasl__gssapi.c) = 63ef03938a2a15ccae86722df776d40fd9bd2c7a SHA1 (patch-lib_hostcheck.c) = 9faf94f44703c7d37377fd3af319ca5c27df34c2 diff --git a/www/curl/patches/patch-aa b/www/curl/patches/patch-aa index 7f2ef2b6922..7abe639c7e7 100644 --- a/www/curl/patches/patch-aa +++ b/www/curl/patches/patch-aa @@ -1,11 +1,11 @@ -$NetBSD: patch-aa,v 1.28 2014/09/14 16:43:44 wiz Exp $ +$NetBSD: patch-aa,v 1.29 2015/03/01 15:01:00 wiz Exp $ builtin krb5-config in platforms such as solaris do not support the gssapi option, and need an explicit -lgss ---- configure.orig 2014-09-04 20:42:23.000000000 +0000 +--- configure.orig 2015-02-24 23:05:37.000000000 +0000 +++ configure -@@ -3640,6 +3640,7 @@ $as_echo "$as_me: $xc_bad_var_msg librar +@@ -3703,6 +3703,7 @@ $as_echo "$as_me: $xc_bad_var_msg librar ;; esac done @@ -13,7 +13,7 @@ the gssapi option, and need an explicit -lgss if test $xc_bad_var_cflags = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: using CFLAGS: $CFLAGS" >&5 $as_echo "$as_me: using CFLAGS: $CFLAGS" >&6;} -@@ -16618,7 +16619,7 @@ squeeze() { +@@ -16682,7 +16683,7 @@ squeeze() { # @@ -22,7 +22,7 @@ the gssapi option, and need an explicit -lgss # if test "$compiler_id" = "GNU_C" || test "$compiler_id" = "CLANG"; then -@@ -21039,7 +21040,12 @@ $as_echo "yes" >&6; } +@@ -21128,7 +21129,12 @@ $as_echo "yes" >&6; } if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi` elif test -f "$GSSAPI_ROOT/bin/krb5-config"; then @@ -36,7 +36,7 @@ the gssapi option, and need an explicit -lgss elif test "$GSSAPI_ROOT" != "yes"; then GSSAPI_INCS="-I$GSSAPI_ROOT/include" fi -@@ -21212,7 +21218,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd +@@ -21301,7 +21307,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd LIBS="-lgss $LIBS" ;; *) @@ -45,3 +45,12 @@ the gssapi option, and need an explicit -lgss ;; esac fi +@@ -24016,7 +24022,7 @@ _ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $capath (capath)" >&5 + $as_echo "$capath (capath)" >&6; } + fi +- if test "x$ca" == "xno" && test "x$capath" == "xno"; then ++ if test "x$ca" = "xno" && test "x$capath" = "xno"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi diff --git a/www/curl/patches/patch-lib_curl__sasl__gssapi.c b/www/curl/patches/patch-lib_curl__sasl__gssapi.c deleted file mode 100644 index 142507fbf5e..00000000000 --- a/www/curl/patches/patch-lib_curl__sasl__gssapi.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-lib_curl__sasl__gssapi.c,v 1.1 2015/01/08 19:23:53 wiz Exp $ - -Fix build on NetBSD with gssapi. - ---- lib/curl_sasl_gssapi.c.orig 2015-01-07 21:53:57.000000000 +0000 -+++ lib/curl_sasl_gssapi.c -@@ -126,7 +126,7 @@ CURLcode Curl_sasl_create_gssapi_user_me - - /* Import the SPN */ - gss_major_status = gss_import_name(&gss_minor_status, &spn_token, -- gss_nt_service_name, &krb5->spn); -+ GSS_C_NT_HOSTBASED_SERVICE, &krb5->spn); - if(GSS_ERROR(gss_major_status)) { - Curl_gss_log_error(data, gss_minor_status, "gss_import_name() failed: "); - |