diff options
author | drochner <drochner@pkgsrc.org> | 2012-08-01 12:27:11 +0000 |
---|---|---|
committer | drochner <drochner@pkgsrc.org> | 2012-08-01 12:27:11 +0000 |
commit | f31a02cccdcab11b8cd5eafccf239e49e8041b76 (patch) | |
tree | 90733a18c10ef51cfa51af3dd0b9cfc38c01bc4f /www/curl | |
parent | 91629e1b85bfa85da962ce58fd496ad21edf248e (diff) | |
download | pkgsrc-f31a02cccdcab11b8cd5eafccf239e49e8041b76.tar.gz |
update to 7.27.0
changes:
-added --metalink for metalink download support
-pop3: added more authentication types
-error message improvements
-bugfixes
Diffstat (limited to 'www/curl')
-rw-r--r-- | www/curl/Makefile | 5 | ||||
-rw-r--r-- | www/curl/distinfo | 11 | ||||
-rw-r--r-- | www/curl/patches/patch-aa | 16 | ||||
-rw-r--r-- | www/curl/patches/patch-lib_connect.c | 29 |
4 files changed, 18 insertions, 43 deletions
diff --git a/www/curl/Makefile b/www/curl/Makefile index b587e2e669a..ed2860fd136 100644 --- a/www/curl/Makefile +++ b/www/curl/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.114 2012/07/20 08:22:04 marino Exp $ +# $NetBSD: Makefile,v 1.115 2012/08/01 12:27:11 drochner Exp $ -DISTNAME= curl-7.26.0 +DISTNAME= curl-7.27.0 CATEGORIES= www -PKGREVISION= 1 MASTER_SITES= http://curl.haxx.se/download/ \ ftp://ftp.sunet.se/pub/www/utilities/curl/ EXTRACT_SUFX= .tar.bz2 diff --git a/www/curl/distinfo b/www/curl/distinfo index 7f4837cc696..31800f8815b 100644 --- a/www/curl/distinfo +++ b/www/curl/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.77 2012/07/20 08:22:04 marino Exp $ +$NetBSD: distinfo,v 1.78 2012/08/01 12:27:12 drochner Exp $ -SHA1 (curl-7.26.0.tar.bz2) = c2e62eaace2407d377bf544d1f808aea6dddf64c -RMD160 (curl-7.26.0.tar.bz2) = 90d66cd2f77bf825ba01056f4f384ff74e7b04eb -Size (curl-7.26.0.tar.bz2) = 2422651 bytes -SHA1 (patch-aa) = 4c5c76b76dc3a43087fdd8edf0de522fde563b3f -SHA1 (patch-lib_connect.c) = 58d9352a2628ffab12a41cdf1b409be198761e91 +SHA1 (curl-7.27.0.tar.bz2) = 51f563587720b71047b6e307412d49ce24ad7bfb +RMD160 (curl-7.27.0.tar.bz2) = b9ce785cae06911577b5654bb32f55fd2e6b712a +Size (curl-7.27.0.tar.bz2) = 2476068 bytes +SHA1 (patch-aa) = 66dc62384fa8dcd5a68f0f9af8b3c449a46fd250 diff --git a/www/curl/patches/patch-aa b/www/curl/patches/patch-aa index 1bf39f37c73..c0dedcedcd9 100644 --- a/www/curl/patches/patch-aa +++ b/www/curl/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.19 2012/05/29 14:58:05 wiz Exp $ +$NetBSD: patch-aa,v 1.20 2012/08/01 12:27:12 drochner Exp $ ---- configure.orig 2012-05-22 21:46:41.000000000 +0000 +--- configure.orig 2012-07-27 18:25:28.000000000 +0000 +++ configure -@@ -15698,7 +15698,7 @@ squeeze() { +@@ -15707,7 +15707,7 @@ squeeze() { # @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.19 2012/05/29 14:58:05 wiz Exp $ # if test "$compiler_id" = "GNU_C" || test "$compiler_id" = "CLANG"; then -@@ -20377,15 +20377,15 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd +@@ -20390,15 +20390,15 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd LIBS="$LIBS $gss_libs" elif test "$GSSAPI_ROOT" != "yes"; then LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff" @@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.19 2012/05/29 14:58:05 wiz Exp $ fi else CPPFLAGS="$save_CPPFLAGS" -@@ -23598,15 +23598,15 @@ $as_echo "$as_me: WARNING: You need an l +@@ -24033,19 +24033,19 @@ $as_echo "$as_me: WARNING: You need an l $as_echo "yes" >&6; } if test "x$OPENSSL_ENABLED" = "x1"; then versioned_symbols_flavour="OPENSSL_" @@ -49,5 +49,11 @@ $NetBSD: patch-aa,v 1.19 2012/05/29 14:58:05 wiz Exp $ - elif test "x$AXTLS_ENABLED" == "x1"; then + elif test "x$AXTLS_ENABLED" = "x1"; then versioned_symbols_flavour="AXTLS_" +- elif test "x$WINSSL_ENABLED" == "x1"; then ++ elif test "x$WINSSL_ENABLED" = "x1"; then + versioned_symbols_flavour="WINSSL_" +- elif test "x$DARWINSSL_ENABLED" == "x1"; then ++ elif test "x$DARWINSSL_ENABLED" = "x1"; then + versioned_symbols_flavour="DARWINSSL_" else versioned_symbols_flavour="" diff --git a/www/curl/patches/patch-lib_connect.c b/www/curl/patches/patch-lib_connect.c deleted file mode 100644 index bc5f8e8c84b..00000000000 --- a/www/curl/patches/patch-lib_connect.c +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-lib_connect.c,v 1.1 2012/07/20 08:22:04 marino Exp $ - -DragonFly uses millisecond as the unit of TCP_KEEP{IDLE} rather than second -Patch to be submitted upstream. - ---- lib/connect.c.orig 2012-04-25 15:29:20.000000000 +0000 -+++ lib/connect.c -@@ -105,6 +105,10 @@ tcpkeepalive(struct SessionHandle *data, - else { - #ifdef TCP_KEEPIDLE - optval = curlx_sltosi(data->set.tcp_keepidle); -+#ifdef __DragonFly__ -+ /* DragonFlyBSD uses millisecond as KEEPIDLE unit */ -+ optval *= 1000; -+#endif - if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPIDLE, - (void *)&optval, sizeof(optval)) < 0) { - infof(data, "Failed to set TCP_KEEPIDLE on fd %d\n", sockfd); -@@ -112,6 +116,10 @@ tcpkeepalive(struct SessionHandle *data, - #endif - #ifdef TCP_KEEPINTVL - optval = curlx_sltosi(data->set.tcp_keepintvl); -+#ifdef __DragonFly__ -+ /* DragonFlyBSD uses millisecond as KEEPINTVL unit */ -+ optval *= 1000; -+#endif - if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPINTVL, - (void *)&optval, sizeof(optval)) < 0) { - infof(data, "Failed to set TCP_KEEPINTVL on fd %d\n", sockfd); |