CVS commit: pkgsrc/www/curl

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Feb 26 08:37:47 UTC 2017

Modified Files:
        pkgsrc/www/curl: Makefile distinfo
Added Files:
        pkgsrc/www/curl/patches: patch-configure
Removed Files:
        pkgsrc/www/curl/patches: patch-aa

Log Message:
Changes 7.53.1:
Bugfixes:
* cyassl: fix typo
* url: Improve CURLOPT_PROXY_CAPATH error handling
* urldata: include curl_sspi.h when Windows SSPI is enabled
* formdata: check for EOF when reading from stdin
* tests: Set CHARSET & LANG to UTF-8 in 1035, 2046 and 2047
* url: Default the proxy CA bundle location to CURL_CA_BUNDLE
* rand: added missing #ifdef HAVE_FCNTL_H around fcntl.h header


To generate a diff of this commit:
cvs rdiff -u -r1.177 -r1.178 pkgsrc/www/curl/Makefile
cvs rdiff -u -r1.127 -r1.128 pkgsrc/www/curl/distinfo
cvs rdiff -u -r1.35 -r0 pkgsrc/www/curl/patches/patch-aa
cvs rdiff -u -r0 -r1.1 pkgsrc/www/curl/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/curl/Makefile
diff -u pkgsrc/www/curl/Makefile:1.177 pkgsrc/www/curl/Makefile:1.178
--- pkgsrc/www/curl/Makefile:1.177      Wed Feb 22 10:29:43 2017
+++ pkgsrc/www/curl/Makefile    Sun Feb 26 08:37:46 2017
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.177 2017/02/22 10:29:43 wiz Exp $
+# $NetBSD: Makefile,v 1.178 2017/02/26 08:37:46 adam Exp $
 
-DISTNAME=      curl-7.53.0
+DISTNAME=      curl-7.53.1
 CATEGORIES=    www
 MASTER_SITES=  https://curl.haxx.se/download/
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/www/curl/distinfo
diff -u pkgsrc/www/curl/distinfo:1.127 pkgsrc/www/curl/distinfo:1.128
--- pkgsrc/www/curl/distinfo:1.127      Wed Feb 22 10:29:43 2017
+++ pkgsrc/www/curl/distinfo    Sun Feb 26 08:37:46 2017
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.127 2017/02/22 10:29:43 wiz Exp $
+$NetBSD: distinfo,v 1.128 2017/02/26 08:37:46 adam Exp $
 
-SHA1 (curl-7.53.0.tar.bz2) = 9fd91627ddcceb364301775f192ad83b01897e50
-RMD160 (curl-7.53.0.tar.bz2) = 1c865c3abc0a39f5ce326f0752820a7a1ae89ee4
-SHA512 (curl-7.53.0.tar.bz2) = 1fc3264dd52f6f16463de158b4ab4637ba698b1fdbf01b7a3c05ae80b06a5480323b748b31f771c969a5f7062aa9e41a1aad8677be220a411d3cbad24581baf2
-Size (curl-7.53.0.tar.bz2) = 2612491 bytes
-SHA1 (patch-aa) = d79a8d6c15863848f2328553cbc273bbc941f749
+SHA1 (curl-7.53.1.tar.bz2) = ae4a14778ef9ac3aaeaa022243d6e26c0bf1362b
+RMD160 (curl-7.53.1.tar.bz2) = 9b8bee9e4833d65a4531c86a34011817aa1fea36
+SHA512 (curl-7.53.1.tar.bz2) = c668494d0e795f34b00505ca68ab41fbb475a1bccbcac1d0bbacbbbafa40a994472e100be18a0c10f8fa21b5b9bd3f4e66c1e68ff5423b13b82d829cbaefcd52
+Size (curl-7.53.1.tar.bz2) = 2609559 bytes
+SHA1 (patch-configure) = 0f065d05cdf9b36e49253481b90ee7c057e87998
 SHA1 (patch-curl-config.in) = d0cc7bb6a5bf0b9257f40dcffce7093cc0098eb7
 SHA1 (patch-lib_hostcheck.c) = 8e772d3f91cdafae17281cc19004269ece0cf308

Added files:

Index: pkgsrc/www/curl/patches/patch-configure
diff -u /dev/null pkgsrc/www/curl/patches/patch-configure:1.1
--- /dev/null   Sun Feb 26 08:37:47 2017
+++ pkgsrc/www/curl/patches/patch-configure     Sun Feb 26 08:37:47 2017
@@ -0,0 +1,46 @@
+$NetBSD: patch-configure,v 1.1 2017/02/26 08:37:47 adam Exp $
+
+builtin krb5-config in platforms such as solaris do not support
+the gssapi option, and need an explicit -lgss
+
+--- configure.orig     2017-02-23 09:52:01.000000000 +0000
++++ configure
+@@ -3820,6 +3820,7 @@ $as_echo "$as_me: $xc_bad_var_msg librar
+         ;;
+     esac
+   done
++  xc_bad_var_cflags=no
+   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;}
+@@ -17281,7 +17282,7 @@ squeeze() {
+ 
+ 
+       #
+-  if test "$compiler_id" != "unknown"; then
++  if false; then
+     #
+     if test "$compiler_id" = "GNU_C" ||
+       test "$compiler_id" = "CLANG"; then
+@@ -21846,7 +21847,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
+-        GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi`
++        if `$KRB5CONFIG --cflags gssapi` 2>&1 | grep "Unknown option" >/dev/null; then
++           GSSAPI_INCS=`$KRB5CONFIG --cflags`
++        else
++           GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi`
++        fi
+      elif test "$GSSAPI_ROOT" != "yes"; then
+         GSSAPI_INCS="-I$GSSAPI_ROOT/include"
+      fi
+@@ -22019,7 +22024,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd
+         LIBS="-lgss $LIBS"
+         ;;
+      *)
+-        LIBS="-lgssapi $LIBS"
++        LIBS="-lgssapi -lkrb5 $LIBS"
+         ;;
+      esac
+   fi