From 977672f12abc930886c30a61512aca45275b8740 Mon Sep 17 00:00:00 2001 From: spz Date: Tue, 30 Jun 2015 23:00:21 +0000 Subject: rollback to previous version of curl. See http://mail-index.netbsd.org/tech-pkg/2015/06/29/msg015105.html --- www/curl/Makefile | 6 +++--- www/curl/PLIST | 5 +---- www/curl/distinfo | 15 ++++++++------- www/curl/patches/patch-aa | 34 +++++++++++++++++++++------------- www/curl/patches/patch-curl-config.in | 4 ++-- www/curl/patches/patch-lib_hostcheck.c | 6 +++--- www/curl/patches/patch-lib_http2.c | 18 ++++++++++++++++++ 7 files changed, 56 insertions(+), 32 deletions(-) create mode 100644 www/curl/patches/patch-lib_http2.c diff --git a/www/curl/Makefile b/www/curl/Makefile index bf558c42d8f..450ceb7632a 100644 --- a/www/curl/Makefile +++ b/www/curl/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.151 2015/06/30 05:46:56 spz Exp $ +# $NetBSD: Makefile,v 1.152 2015/06/30 23:00:21 spz Exp $ -DISTNAME= curl-7.43.0 -#PKGREVISION= 0 +DISTNAME= curl-7.42.1 +PKGREVISION= 2 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 54c2fd94ee7..fd6a0314447 100644 --- a/www/curl/PLIST +++ b/www/curl/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.50 2015/06/30 05:46:56 spz Exp $ +@comment $NetBSD: PLIST,v 1.51 2015/06/30 23:00:21 spz Exp $ bin/curl bin/curl-config include/curl/curl.h @@ -140,7 +140,6 @@ man/man3/CURLOPT_OPENSOCKETFUNCTION.3 man/man3/CURLOPT_PASSWORD.3 man/man3/CURLOPT_PATH_AS_IS.3 man/man3/CURLOPT_PINNEDPUBLICKEY.3 -man/man3/CURLOPT_PIPEWAIT.3 man/man3/CURLOPT_PORT.3 man/man3/CURLOPT_POST.3 man/man3/CURLOPT_POSTFIELDS.3 @@ -161,7 +160,6 @@ man/man3/CURLOPT_PROXYPORT.3 man/man3/CURLOPT_PROXYTYPE.3 man/man3/CURLOPT_PROXYUSERNAME.3 man/man3/CURLOPT_PROXYUSERPWD.3 -man/man3/CURLOPT_PROXY_SERVICE_NAME.3 man/man3/CURLOPT_PROXY_TRANSFER_MODE.3 man/man3/CURLOPT_PUT.3 man/man3/CURLOPT_QUOTE.3 @@ -183,7 +181,6 @@ man/man3/CURLOPT_RTSP_TRANSPORT.3 man/man3/CURLOPT_SASL_IR.3 man/man3/CURLOPT_SEEKDATA.3 man/man3/CURLOPT_SEEKFUNCTION.3 -man/man3/CURLOPT_SERVICE_NAME.3 man/man3/CURLOPT_SHARE.3 man/man3/CURLOPT_SOCKOPTDATA.3 man/man3/CURLOPT_SOCKOPTFUNCTION.3 diff --git a/www/curl/distinfo b/www/curl/distinfo index 04b8ffbf92f..d70a1462d02 100644 --- a/www/curl/distinfo +++ b/www/curl/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.106 2015/06/30 05:46:56 spz Exp $ +$NetBSD: distinfo,v 1.107 2015/06/30 23:00:21 spz Exp $ -SHA1 (curl-7.43.0.tar.bz2) = d821ea39610b7f1122f1f574a4d8e20e81b3c561 -RMD160 (curl-7.43.0.tar.bz2) = 404481695a8f79cbf9a245bfa9c06140d1cdbf11 -Size (curl-7.43.0.tar.bz2) = 3363770 bytes -SHA1 (patch-aa) = 89e33ed9492522af7bee22cdfaf6c4b0731f1510 -SHA1 (patch-curl-config.in) = d0cc7bb6a5bf0b9257f40dcffce7093cc0098eb7 -SHA1 (patch-lib_hostcheck.c) = 8e772d3f91cdafae17281cc19004269ece0cf308 +SHA1 (curl-7.42.1.tar.bz2) = f65708915875b8cb35edb51d8dd31440dc02fbd3 +RMD160 (curl-7.42.1.tar.bz2) = 76d5b23fae60356342e2bac2e4c706ed544d4adf +Size (curl-7.42.1.tar.bz2) = 3327304 bytes +SHA1 (patch-aa) = 59ec0be3ac90470fdc5935881da6a14dbab9d378 +SHA1 (patch-curl-config.in) = fd87c97b601a6b9269f67fbc066604ee7e22570e +SHA1 (patch-lib_hostcheck.c) = 9faf94f44703c7d37377fd3af319ca5c27df34c2 +SHA1 (patch-lib_http2.c) = 4ba0164ffdba714c620daccbf80eedd51562acf4 diff --git a/www/curl/patches/patch-aa b/www/curl/patches/patch-aa index e6058f71cbc..5dd9c050bfa 100644 --- a/www/curl/patches/patch-aa +++ b/www/curl/patches/patch-aa @@ -1,9 +1,9 @@ -$NetBSD: patch-aa,v 1.31 2015/06/30 05:46:56 spz Exp $ +$NetBSD: patch-aa,v 1.32 2015/06/30 23:00:21 spz Exp $ builtin krb5-config in platforms such as solaris do not support the gssapi option, and need an explicit -lgss ---- configure.orig 2015-06-15 21:31:47.000000000 +0000 +--- configure.orig 2015-04-21 07:21:35.000000000 +0000 +++ configure @@ -3703,6 +3703,7 @@ $as_echo "$as_me: $xc_bad_var_msg librar ;; @@ -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;} -@@ -16689,7 +16690,7 @@ squeeze() { +@@ -16682,7 +16683,7 @@ squeeze() { # @@ -22,20 +22,19 @@ the gssapi option, and need an explicit -lgss # if test "$compiler_id" = "GNU_C" || test "$compiler_id" = "CLANG"; then -@@ -21137,7 +21138,11 @@ $as_echo "yes" >&6; } - if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then +@@ -21131,6 +21132,11 @@ $as_echo "yes" >&6; } GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi` - elif test -f "$KRB5CONFIG"; then -- GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi` -+ if `$KRB5CONFIG --cflags gssapi` 2>&1 | grep "Unknown option" >/dev/null; then -+ GSSAPI_INCS=`$KRB5CONFIG --cflags` + elif test -f "$GSSAPI_ROOT/bin/krb5-config"; then + GSSAPI_INCS=`$GSSAPI_ROOT/bin/krb5-config --cflags gssapi` ++ if $GSSAPI_ROOT/bin/krb5-config --cflags gssapi 2>&1 | grep "Unknown option" >/dev/null; then ++ GSSAPI_INCS=`$GSSAPI_ROOT/bin/krb5-config --cflags` + else -+ GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi` ++ GSSAPI_INCS=`$GSSAPI_ROOT/bin/krb5-config --cflags gssapi` + fi + elif test -f "$KRB5CONFIG"; then + GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi` elif test "$GSSAPI_ROOT" != "yes"; then - GSSAPI_INCS="-I$GSSAPI_ROOT/include" - fi -@@ -21310,7 +21315,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd +@@ -21305,7 +21311,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd LIBS="-lgss $LIBS" ;; *) @@ -44,3 +43,12 @@ the gssapi option, and need an explicit -lgss ;; esac fi +@@ -24264,7 +24270,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-curl-config.in b/www/curl/patches/patch-curl-config.in index b8f2b47c70e..fc3476a6aea 100644 --- a/www/curl/patches/patch-curl-config.in +++ b/www/curl/patches/patch-curl-config.in @@ -1,8 +1,8 @@ -$NetBSD: patch-curl-config.in,v 1.5 2015/06/30 05:46:56 spz Exp $ +$NetBSD: patch-curl-config.in,v 1.6 2015/06/30 23:00:21 spz Exp $ - make "curl-config --libs" return proper ldflags for shared libraries ---- curl-config.in.orig 2015-06-03 07:38:20.000000000 +0000 +--- curl-config.in.orig 2014-01-05 22:07:54.000000000 +0000 +++ curl-config.in @@ -148,9 +148,9 @@ while test $# -gt 0; do CURLLIBDIR="" diff --git a/www/curl/patches/patch-lib_hostcheck.c b/www/curl/patches/patch-lib_hostcheck.c index 5b2f1fdf8d7..d0480af87b3 100644 --- a/www/curl/patches/patch-lib_hostcheck.c +++ b/www/curl/patches/patch-lib_hostcheck.c @@ -1,11 +1,11 @@ -$NetBSD: patch-lib_hostcheck.c,v 1.2 2015/06/30 05:46:56 spz Exp $ +$NetBSD: patch-lib_hostcheck.c,v 1.3 2015/06/30 23:00:21 spz Exp $ Add missing header for DragonflyBSD. PR 48691 by David Shao. ---- lib/hostcheck.c.orig 2015-06-03 07:38:20.000000000 +0000 +--- lib/hostcheck.c.orig 2014-03-25 22:01:37.000000000 +0000 +++ lib/hostcheck.c -@@ -34,6 +34,13 @@ +@@ -31,6 +31,13 @@ #include "inet_pton.h" #include "curl_memory.h" diff --git a/www/curl/patches/patch-lib_http2.c b/www/curl/patches/patch-lib_http2.c new file mode 100644 index 00000000000..72e400298b7 --- /dev/null +++ b/www/curl/patches/patch-lib_http2.c @@ -0,0 +1,18 @@ +$NetBSD: patch-lib_http2.c,v 1.3 2015/06/30 23:00:21 spz Exp $ + +Update compatibility for nghttp2 1.0. This patch should become obsolete +with curl-7.43. + +--- lib/http2.c.orig 2015-04-29 06:06:52.000000000 +0000 ++++ lib/http2.c +@@ -1019,8 +1019,8 @@ CURLcode Curl_http2_switched(struct conn + + rv = (int) ((Curl_send*)httpc->send_underlying) + (conn, FIRSTSOCKET, +- NGHTTP2_CLIENT_CONNECTION_PREFACE, +- NGHTTP2_CLIENT_CONNECTION_PREFACE_LEN, ++ NGHTTP2_CLIENT_MAGIC, ++ NGHTTP2_CLIENT_MAGIC_LEN, + &result); + if(result) + /* TODO: This may get CURLE_AGAIN */ -- cgit v1.2.3