diff options
| -rw-r--r-- | www/curl/Makefile | 4 | ||||
| -rw-r--r-- | www/curl/distinfo | 12 | ||||
| -rw-r--r-- | www/curl/patches/patch-configure | 30 |
3 files changed, 31 insertions, 15 deletions
diff --git a/www/curl/Makefile b/www/curl/Makefile index a22664066cf..6dfd488a08f 100644 --- a/www/curl/Makefile +++ b/www/curl/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.187.4.1 2017/11/12 12:13:32 spz Exp $ +# $NetBSD: Makefile,v 1.187.4.2 2017/12/27 18:34:01 spz Exp $ -DISTNAME= curl-7.56.1 +DISTNAME= curl-7.57.0 CATEGORIES= www MASTER_SITES= https://curl.haxx.se/download/ EXTRACT_SUFX= .tar.bz2 diff --git a/www/curl/distinfo b/www/curl/distinfo index 750e17406eb..37256c2f3ff 100644 --- a/www/curl/distinfo +++ b/www/curl/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.136.4.1 2017/11/12 12:13:32 spz Exp $ +$NetBSD: distinfo,v 1.136.4.2 2017/12/27 18:34:01 spz Exp $ -SHA1 (curl-7.56.1.tar.bz2) = f17b8f71f801b266828067f6f7c0e950509890b9 -RMD160 (curl-7.56.1.tar.bz2) = ee08c268c414be3d2c9a0bbcb9b7fbcfb33f48e9 -SHA512 (curl-7.56.1.tar.bz2) = f8a602e6890b2791ea9199c80801ffd027980de3733d4ab001ee80b5167f840cc821c6fe7852087c88a471edc9d3f328cf660af3e2c6f7139d6c8de62b0ade68 -Size (curl-7.56.1.tar.bz2) = 2824548 bytes -SHA1 (patch-configure) = fac0071bbb22cb379f36477e0e806a8f9f4d43eb +SHA1 (curl-7.57.0.tar.bz2) = 7f47469324bf22cc9ffd1d3a201aa3c76ab626b8 +RMD160 (curl-7.57.0.tar.bz2) = e50c4ff25b6208187c5a3a10a5c8675faf75f64f +SHA512 (curl-7.57.0.tar.bz2) = f366d2e931d7aff63bac0e1f760ced32c849252947d522427ba92124566906a7e6bd081b6d1630df36895dda2a00ac4cf1bed1470740693ef47ab90c6a270377 +Size (curl-7.57.0.tar.bz2) = 2849283 bytes +SHA1 (patch-configure) = ba8abac55f11a53d07235e57d21ce5b32a421902 SHA1 (patch-curl-config.in) = d0cc7bb6a5bf0b9257f40dcffce7093cc0098eb7 SHA1 (patch-lib_hostcheck.c) = 8e772d3f91cdafae17281cc19004269ece0cf308 diff --git a/www/curl/patches/patch-configure b/www/curl/patches/patch-configure index bb7b1e38f5a..8074f145ba7 100644 --- a/www/curl/patches/patch-configure +++ b/www/curl/patches/patch-configure @@ -1,13 +1,15 @@ -$NetBSD: patch-configure,v 1.2 2017/07/05 10:34:12 adam Exp $ +$NetBSD: patch-configure,v 1.2.4.1 2017/12/27 18:34:01 spz Exp $ builtin krb5-config in platforms such as solaris do not support the gssapi option, and need an explicit -lgss On Darwin, do not append custom CFLAGS. ---- configure.orig 2017-06-14 06:10:57.000000000 +0000 +Do not strip debug flags. + +--- configure.orig 2017-10-17 14:31:48.000000000 +0000 +++ configure -@@ -4241,6 +4241,7 @@ $as_echo "$as_me: $xc_bad_var_msg librar +@@ -4272,6 +4272,7 @@ $as_echo "$as_me: $xc_bad_var_msg librar ;; esac done @@ -15,7 +17,7 @@ On Darwin, do not append custom CFLAGS. 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;} -@@ -17702,7 +17703,7 @@ squeeze() { +@@ -17159,7 +17160,7 @@ squeeze() { # @@ -24,7 +26,21 @@ On Darwin, do not append custom CFLAGS. # if test "$compiler_id" = "GNU_C" || test "$compiler_id" = "CLANG"; then -@@ -19639,7 +19640,7 @@ $as_echo "no" >&6; } +@@ -17482,13 +17483,6 @@ $as_echo_n "checking if compiler accepts + tmp_options="$flags_dbg_off" + fi + # +- if test "$flags_prefer_cppflags" = "yes"; then +- CPPFLAGS="$tmp_CPPFLAGS $tmp_options" +- CFLAGS="$tmp_CFLAGS" +- else +- CPPFLAGS="$tmp_CPPFLAGS" +- CFLAGS="$tmp_CFLAGS $tmp_options" +- fi + squeeze CPPFLAGS + squeeze CFLAGS + +@@ -19122,7 +19116,7 @@ $as_echo "no" >&6; } tst_cflags="no" case $host_os in darwin*) @@ -33,7 +49,7 @@ On Darwin, do not append custom CFLAGS. ;; esac -@@ -22272,7 +22273,11 @@ $as_echo "yes" >&6; } +@@ -21788,7 +21782,11 @@ $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 "$KRB5CONFIG"; then @@ -46,7 +62,7 @@ On Darwin, do not append custom CFLAGS. elif test "$GSSAPI_ROOT" != "yes"; then GSSAPI_INCS="-I$GSSAPI_ROOT/include" fi -@@ -22445,7 +22450,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd +@@ -21961,7 +21959,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd LIBS="-lgss $LIBS" ;; *) |