diff options
| -rw-r--r-- | www/curl/Makefile | 5 | ||||
| -rw-r--r-- | www/curl/PLIST | 212 | ||||
| -rw-r--r-- | www/curl/distinfo | 11 | ||||
| -rw-r--r-- | www/curl/patches/patch-aa | 22 | ||||
| -rw-r--r-- | www/curl/patches/patch-lib_url.c | 15 |
5 files changed, 229 insertions, 36 deletions
diff --git a/www/curl/Makefile b/www/curl/Makefile index 9b039c69ae2..eec60901ba7 100644 --- a/www/curl/Makefile +++ b/www/curl/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.139 2014/05/29 23:37:56 wiz Exp $ +# $NetBSD: Makefile,v 1.140 2014/07/22 11:38:26 wiz Exp $ -DISTNAME= curl-7.37.0 -PKGREVISION= 1 +DISTNAME= curl-7.37.1 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 c698b71b43c..012b63d04e3 100644 --- a/www/curl/PLIST +++ b/www/curl/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.43 2013/12/31 11:48:03 adam Exp $ +@comment $NetBSD: PLIST,v 1.44 2014/07/22 11:38:26 wiz Exp $ bin/curl bin/curl-config include/curl/curl.h @@ -14,6 +14,216 @@ lib/libcurl.la lib/pkgconfig/libcurl.pc man/man1/curl-config.1 man/man1/curl.1 +man/man3/CURLOPT_ACCEPTTIMEOUT_MS.3 +man/man3/CURLOPT_ACCEPT_ENCODING.3 +man/man3/CURLOPT_ADDRESS_SCOPE.3 +man/man3/CURLOPT_APPEND.3 +man/man3/CURLOPT_AUTOREFERER.3 +man/man3/CURLOPT_BUFFERSIZE.3 +man/man3/CURLOPT_CAINFO.3 +man/man3/CURLOPT_CAPATH.3 +man/man3/CURLOPT_CERTINFO.3 +man/man3/CURLOPT_CHUNK_BGN_FUNCTION.3 +man/man3/CURLOPT_CHUNK_DATA.3 +man/man3/CURLOPT_CHUNK_END_FUNCTION.3 +man/man3/CURLOPT_CLOSESOCKETDATA.3 +man/man3/CURLOPT_CLOSESOCKETFUNCTION.3 +man/man3/CURLOPT_CONNECTTIMEOUT.3 +man/man3/CURLOPT_CONNECTTIMEOUT_MS.3 +man/man3/CURLOPT_CONNECT_ONLY.3 +man/man3/CURLOPT_CONV_FROM_NETWORK_FUNCTION.3 +man/man3/CURLOPT_CONV_FROM_UTF8_FUNCTION.3 +man/man3/CURLOPT_CONV_TO_NETWORK_FUNCTION.3 +man/man3/CURLOPT_COOKIE.3 +man/man3/CURLOPT_COOKIEFILE.3 +man/man3/CURLOPT_COOKIEJAR.3 +man/man3/CURLOPT_COOKIELIST.3 +man/man3/CURLOPT_COOKIESESSION.3 +man/man3/CURLOPT_COPYPOSTFIELDS.3 +man/man3/CURLOPT_CRLF.3 +man/man3/CURLOPT_CRLFILE.3 +man/man3/CURLOPT_CUSTOMREQUEST.3 +man/man3/CURLOPT_DEBUGDATA.3 +man/man3/CURLOPT_DEBUGFUNCTION.3 +man/man3/CURLOPT_DIRLISTONLY.3 +man/man3/CURLOPT_DNS_CACHE_TIMEOUT.3 +man/man3/CURLOPT_DNS_INTERFACE.3 +man/man3/CURLOPT_DNS_LOCAL_IP4.3 +man/man3/CURLOPT_DNS_LOCAL_IP6.3 +man/man3/CURLOPT_DNS_SERVERS.3 +man/man3/CURLOPT_DNS_USE_GLOBAL_CACHE.3 +man/man3/CURLOPT_EGDSOCKET.3 +man/man3/CURLOPT_ERRORBUFFER.3 +man/man3/CURLOPT_EXPECT_100_TIMEOUT_MS.3 +man/man3/CURLOPT_FAILONERROR.3 +man/man3/CURLOPT_FILETIME.3 +man/man3/CURLOPT_FNMATCH_DATA.3 +man/man3/CURLOPT_FNMATCH_FUNCTION.3 +man/man3/CURLOPT_FOLLOWLOCATION.3 +man/man3/CURLOPT_FORBID_REUSE.3 +man/man3/CURLOPT_FRESH_CONNECT.3 +man/man3/CURLOPT_FTPPORT.3 +man/man3/CURLOPT_FTPSSLAUTH.3 +man/man3/CURLOPT_FTP_ACCOUNT.3 +man/man3/CURLOPT_FTP_ALTERNATIVE_TO_USER.3 +man/man3/CURLOPT_FTP_CREATE_MISSING_DIRS.3 +man/man3/CURLOPT_FTP_FILEMETHOD.3 +man/man3/CURLOPT_FTP_RESPONSE_TIMEOUT.3 +man/man3/CURLOPT_FTP_SKIP_PASV_IP.3 +man/man3/CURLOPT_FTP_SSL_CCC.3 +man/man3/CURLOPT_FTP_USE_EPRT.3 +man/man3/CURLOPT_FTP_USE_EPSV.3 +man/man3/CURLOPT_FTP_USE_PRET.3 +man/man3/CURLOPT_GSSAPI_DELEGATION.3 +man/man3/CURLOPT_HEADER.3 +man/man3/CURLOPT_HEADERDATA.3 +man/man3/CURLOPT_HEADERFUNCTION.3 +man/man3/CURLOPT_HEADEROPT.3 +man/man3/CURLOPT_HTTP200ALIASES.3 +man/man3/CURLOPT_HTTPAUTH.3 +man/man3/CURLOPT_HTTPGET.3 +man/man3/CURLOPT_HTTPHEADER.3 +man/man3/CURLOPT_HTTPPOST.3 +man/man3/CURLOPT_HTTPPROXYTUNNEL.3 +man/man3/CURLOPT_HTTP_CONTENT_DECODING.3 +man/man3/CURLOPT_HTTP_TRANSFER_DECODING.3 +man/man3/CURLOPT_HTTP_VERSION.3 +man/man3/CURLOPT_IGNORE_CONTENT_LENGTH.3 +man/man3/CURLOPT_INFILESIZE.3 +man/man3/CURLOPT_INFILESIZE_LARGE.3 +man/man3/CURLOPT_INTERFACE.3 +man/man3/CURLOPT_INTERLEAVEDATA.3 +man/man3/CURLOPT_INTERLEAVEFUNCTION.3 +man/man3/CURLOPT_IOCTLDATA.3 +man/man3/CURLOPT_IOCTLFUNCTION.3 +man/man3/CURLOPT_IPRESOLVE.3 +man/man3/CURLOPT_ISSUERCERT.3 +man/man3/CURLOPT_KEYPASSWD.3 +man/man3/CURLOPT_KRBLEVEL.3 +man/man3/CURLOPT_LOCALPORT.3 +man/man3/CURLOPT_LOCALPORTRANGE.3 +man/man3/CURLOPT_LOGIN_OPTIONS.3 +man/man3/CURLOPT_LOW_SPEED_LIMIT.3 +man/man3/CURLOPT_LOW_SPEED_TIME.3 +man/man3/CURLOPT_MAIL_AUTH.3 +man/man3/CURLOPT_MAIL_FROM.3 +man/man3/CURLOPT_MAIL_RCPT.3 +man/man3/CURLOPT_MAXCONNECTS.3 +man/man3/CURLOPT_MAXFILESIZE.3 +man/man3/CURLOPT_MAXFILESIZE_LARGE.3 +man/man3/CURLOPT_MAXREDIRS.3 +man/man3/CURLOPT_MAX_RECV_SPEED_LARGE.3 +man/man3/CURLOPT_MAX_SEND_SPEED_LARGE.3 +man/man3/CURLOPT_NETRC.3 +man/man3/CURLOPT_NETRC_FILE.3 +man/man3/CURLOPT_NEW_DIRECTORY_PERMS.3 +man/man3/CURLOPT_NEW_FILE_PERMS.3 +man/man3/CURLOPT_NOBODY.3 +man/man3/CURLOPT_NOPROGRESS.3 +man/man3/CURLOPT_NOPROXY.3 +man/man3/CURLOPT_NOSIGNAL.3 +man/man3/CURLOPT_OPENSOCKETDATA.3 +man/man3/CURLOPT_OPENSOCKETFUNCTION.3 +man/man3/CURLOPT_PASSWORD.3 +man/man3/CURLOPT_PORT.3 +man/man3/CURLOPT_POST.3 +man/man3/CURLOPT_POSTFIELDS.3 +man/man3/CURLOPT_POSTFIELDSIZE.3 +man/man3/CURLOPT_POSTFIELDSIZE_LARGE.3 +man/man3/CURLOPT_POSTQUOTE.3 +man/man3/CURLOPT_POSTREDIR.3 +man/man3/CURLOPT_PREQUOTE.3 +man/man3/CURLOPT_PRIVATE.3 +man/man3/CURLOPT_PROGRESSDATA.3 +man/man3/CURLOPT_PROGRESSFUNCTION.3 +man/man3/CURLOPT_PROTOCOLS.3 +man/man3/CURLOPT_PROXY.3 +man/man3/CURLOPT_PROXYAUTH.3 +man/man3/CURLOPT_PROXYHEADER.3 +man/man3/CURLOPT_PROXYPASSWORD.3 +man/man3/CURLOPT_PROXYPORT.3 +man/man3/CURLOPT_PROXYTYPE.3 +man/man3/CURLOPT_PROXYUSERNAME.3 +man/man3/CURLOPT_PROXYUSERPWD.3 +man/man3/CURLOPT_PROXY_TRANSFER_MODE.3 +man/man3/CURLOPT_PUT.3 +man/man3/CURLOPT_QUOTE.3 +man/man3/CURLOPT_RANDOM_FILE.3 +man/man3/CURLOPT_RANGE.3 +man/man3/CURLOPT_READDATA.3 +man/man3/CURLOPT_READFUNCTION.3 +man/man3/CURLOPT_REDIR_PROTOCOLS.3 +man/man3/CURLOPT_REFERER.3 +man/man3/CURLOPT_RESOLVE.3 +man/man3/CURLOPT_RESUME_FROM.3 +man/man3/CURLOPT_RESUME_FROM_LARGE.3 +man/man3/CURLOPT_RTSP_CLIENT_CSEQ.3 +man/man3/CURLOPT_RTSP_REQUEST.3 +man/man3/CURLOPT_RTSP_SERVER_CSEQ.3 +man/man3/CURLOPT_RTSP_SESSION_ID.3 +man/man3/CURLOPT_RTSP_STREAM_URI.3 +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_SHARE.3 +man/man3/CURLOPT_SOCKOPTDATA.3 +man/man3/CURLOPT_SOCKOPTFUNCTION.3 +man/man3/CURLOPT_SOCKS5_GSSAPI_NEC.3 +man/man3/CURLOPT_SOCKS5_GSSAPI_SERVICE.3 +man/man3/CURLOPT_SSH_AUTH_TYPES.3 +man/man3/CURLOPT_SSH_HOST_PUBLIC_KEY_MD5.3 +man/man3/CURLOPT_SSH_KEYDATA.3 +man/man3/CURLOPT_SSH_KEYFUNCTION.3 +man/man3/CURLOPT_SSH_KNOWNHOSTS.3 +man/man3/CURLOPT_SSH_PRIVATE_KEYFILE.3 +man/man3/CURLOPT_SSH_PUBLIC_KEYFILE.3 +man/man3/CURLOPT_SSLCERT.3 +man/man3/CURLOPT_SSLCERTTYPE.3 +man/man3/CURLOPT_SSLENGINE.3 +man/man3/CURLOPT_SSLENGINE_DEFAULT.3 +man/man3/CURLOPT_SSLKEY.3 +man/man3/CURLOPT_SSLKEYTYPE.3 +man/man3/CURLOPT_SSLVERSION.3 +man/man3/CURLOPT_SSL_CIPHER_LIST.3 +man/man3/CURLOPT_SSL_CTX_DATA.3 +man/man3/CURLOPT_SSL_CTX_FUNCTION.3 +man/man3/CURLOPT_SSL_ENABLE_ALPN.3 +man/man3/CURLOPT_SSL_ENABLE_NPN.3 +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_STDERR.3 +man/man3/CURLOPT_TCP_KEEPALIVE.3 +man/man3/CURLOPT_TCP_KEEPIDLE.3 +man/man3/CURLOPT_TCP_KEEPINTVL.3 +man/man3/CURLOPT_TCP_NODELAY.3 +man/man3/CURLOPT_TELNETOPTIONS.3 +man/man3/CURLOPT_TFTP_BLKSIZE.3 +man/man3/CURLOPT_TIMECONDITION.3 +man/man3/CURLOPT_TIMEOUT.3 +man/man3/CURLOPT_TIMEOUT_MS.3 +man/man3/CURLOPT_TIMEVALUE.3 +man/man3/CURLOPT_TLSAUTH_PASSWORD.3 +man/man3/CURLOPT_TLSAUTH_TYPE.3 +man/man3/CURLOPT_TLSAUTH_USERNAME.3 +man/man3/CURLOPT_TRANSFERTEXT.3 +man/man3/CURLOPT_TRANSFER_ENCODING.3 +man/man3/CURLOPT_UNRESTRICTED_AUTH.3 +man/man3/CURLOPT_UPLOAD.3 +man/man3/CURLOPT_URL.3 +man/man3/CURLOPT_USERAGENT.3 +man/man3/CURLOPT_USERNAME.3 +man/man3/CURLOPT_USERPWD.3 +man/man3/CURLOPT_USE_SSL.3 +man/man3/CURLOPT_VERBOSE.3 +man/man3/CURLOPT_WILDCARDMATCH.3 +man/man3/CURLOPT_WRITEDATA.3 +man/man3/CURLOPT_WRITEFUNCTION.3 +man/man3/CURLOPT_XFERINFODATA.3 +man/man3/CURLOPT_XFERINFOFUNCTION.3 +man/man3/CURLOPT_XOAUTH2_BEARER.3 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 efe57186e79..ac495bc4644 100644 --- a/www/curl/distinfo +++ b/www/curl/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.96 2014/07/18 09:04:43 ryoon Exp $ +$NetBSD: distinfo,v 1.97 2014/07/22 11:38:26 wiz Exp $ -SHA1 (curl-7.37.0.tar.bz2) = 3bde6fb2e599197e9579c0735ad255c1ddbd914d -RMD160 (curl-7.37.0.tar.bz2) = b1ceac937c0b22d1674a8c308e1c2fd66082e017 -Size (curl-7.37.0.tar.bz2) = 2870197 bytes -SHA1 (patch-aa) = 41bbc1e6c17c8ff1bf826d7d8ccdaec9ad9e97ed +SHA1 (curl-7.37.1.tar.bz2) = 612081014c8393fa4747f28706d72542514a14aa +RMD160 (curl-7.37.1.tar.bz2) = f5c9f72c9e87ae246df410921c01889ffd221b6d +Size (curl-7.37.1.tar.bz2) = 3151531 bytes +SHA1 (patch-aa) = f6a461da2fe2bbc33ce3fb3c961a088fc9f2f1b7 SHA1 (patch-curl-config.in) = fd87c97b601a6b9269f67fbc066604ee7e22570e SHA1 (patch-lib_hostcheck.c) = 9faf94f44703c7d37377fd3af319ca5c27df34c2 -SHA1 (patch-lib_url.c) = c256a52617991e33c666bfb5e1aa799c18bac9d7 diff --git a/www/curl/patches/patch-aa b/www/curl/patches/patch-aa index fbc989d7106..fefc3369d90 100644 --- a/www/curl/patches/patch-aa +++ b/www/curl/patches/patch-aa @@ -1,9 +1,9 @@ -$NetBSD: patch-aa,v 1.26 2014/03/30 12:57:54 spz Exp $ +$NetBSD: patch-aa,v 1.27 2014/07/22 11:38:26 wiz Exp $ builtin krb5-config in platforms such as solaris do not support the gssapi option, and need an explicit -lgss ---- configure.orig 2014-03-25 10:29:28.000000000 +0000 +--- configure.orig 2014-07-14 18:50:03.000000000 +0000 +++ configure @@ -3641,6 +3641,7 @@ $as_echo "$as_me: $xc_bad_var_msg librar ;; @@ -22,10 +22,10 @@ the gssapi option, and need an explicit -lgss # if test "$compiler_id" = "GNU_C" || test "$compiler_id" = "CLANG"; then -@@ -21079,7 +21080,12 @@ $as_echo "yes" >&6; } - - if test -z "$GSSAPI_INCS"; then - if test -f "$GSSAPI_ROOT/bin/krb5-config"; then +@@ -21081,7 +21082,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 - 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 @@ -36,10 +36,10 @@ the gssapi option, and need an explicit -lgss elif test "$GSSAPI_ROOT" != "yes"; then GSSAPI_INCS="-I$GSSAPI_ROOT/include" fi -@@ -21227,13 +21233,18 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd - ;; - *) - if test -f "$GSSAPI_ROOT/bin/krb5-config"; then +@@ -21232,13 +21238,18 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd + gss_libs=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --libs gssapi` + LIBS="$gss_libs $LIBS" + elif test -f "$GSSAPI_ROOT/bin/krb5-config"; then - gss_libs=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi` + if $GSSAPI_ROOT/bin/krb5-config --libs gssapi 2>&1 | \ + grep "Unknown option" > /dev/null ; then @@ -58,7 +58,7 @@ the gssapi option, and need an explicit -lgss fi ;; esac -@@ -21244,7 +21255,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd +@@ -21249,7 +21260,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd LIBS="-lgss $LIBS" ;; *) diff --git a/www/curl/patches/patch-lib_url.c b/www/curl/patches/patch-lib_url.c deleted file mode 100644 index 2fa1e000577..00000000000 --- a/www/curl/patches/patch-lib_url.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-lib_url.c,v 1.1 2014/07/18 09:04:43 ryoon Exp $ - -* SCO OpenServer 5.0.7/3.2 has no if_nametoindex(3). - ---- lib/url.c.orig 2014-05-20 08:34:01.000000000 +0000 -+++ lib/url.c -@@ -4004,7 +4004,7 @@ static CURLcode parseurlandfillconn(stru - } - else { - /* Zone identifier is not numeric */ --#if defined(HAVE_NET_IF_H) && defined(IFNAMSIZ) -+#if defined(HAVE_NET_IF_H) && defined(IFNAMSIZ) && !defined(_SCO_DS) - char ifname[IFNAMSIZ + 2]; - char *square_bracket; - unsigned int scopeidx = 0; |