diff options
| -rw-r--r-- | www/curl/Makefile | 5 | ||||
| -rw-r--r-- | www/curl/PLIST | 3 | ||||
| -rw-r--r-- | www/curl/distinfo | 11 | ||||
| -rw-r--r-- | www/curl/patches/patch-curl-config.in | 26 | ||||
| -rw-r--r-- | www/curl/patches/patch-lib_multi.c | 23 |
5 files changed, 22 insertions, 46 deletions
diff --git a/www/curl/Makefile b/www/curl/Makefile index bb1ce61242e..4eccf91a840 100644 --- a/www/curl/Makefile +++ b/www/curl/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.126 2013/03/17 21:33:33 tsutsui Exp $ +# $NetBSD: Makefile,v 1.127 2013/04/14 16:39:48 wiz Exp $ -DISTNAME= curl-7.29.0 -PKGREVISION= 2 +DISTNAME= curl-7.30.0 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 c35bec170f0..da76be3545e 100644 --- a/www/curl/PLIST +++ b/www/curl/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.38 2012/12/06 16:24:29 adam Exp $ +@comment $NetBSD: PLIST,v 1.39 2013/04/14 16:39:48 wiz Exp $ bin/curl bin/curl-config include/curl/curl.h @@ -111,6 +111,7 @@ share/examples/curl/multi-debugcallback.c share/examples/curl/multi-double.c share/examples/curl/multi-post.c share/examples/curl/multi-single.c +share/examples/curl/multi-uv.c share/examples/curl/multithread.c share/examples/curl/opensslthreadlock.c share/examples/curl/persistant.c diff --git a/www/curl/distinfo b/www/curl/distinfo index d40e1acdadc..d16c90e3887 100644 --- a/www/curl/distinfo +++ b/www/curl/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.84 2013/03/17 21:33:33 tsutsui Exp $ +$NetBSD: distinfo,v 1.85 2013/04/14 16:39:48 wiz Exp $ -SHA1 (curl-7.29.0.tar.bz2) = 03eddd295d3d50d60a9dd1c130c8e110ff1aa95a -RMD160 (curl-7.29.0.tar.bz2) = 50c2ee716736dc0f1de26e032f525e7511912b95 -Size (curl-7.29.0.tar.bz2) = 2556495 bytes +SHA1 (curl-7.30.0.tar.bz2) = 23fdc215558023b943cea9dfab04b86020037b0d +RMD160 (curl-7.30.0.tar.bz2) = 858e772c17fc05d7114856f09fc34e696f1ef595 +Size (curl-7.30.0.tar.bz2) = 2625976 bytes SHA1 (patch-aa) = 07e12cd0576b87cfed74a6a2bf8dd42cb2f5a570 -SHA1 (patch-curl-config.in) = 406fdc1ea210e81a674b7edae9842ec9083bf45e -SHA1 (patch-lib_multi.c) = ead077ecdb819081e7a271feb6e249a20e025f75 +SHA1 (patch-curl-config.in) = c685dd4fd85fc9d97c6e6ff8dbf871c35dd57046 diff --git a/www/curl/patches/patch-curl-config.in b/www/curl/patches/patch-curl-config.in index a0c5e4f122e..085dc0b7938 100644 --- a/www/curl/patches/patch-curl-config.in +++ b/www/curl/patches/patch-curl-config.in @@ -1,18 +1,18 @@ -$NetBSD: patch-curl-config.in,v 1.1 2013/03/17 21:33:34 tsutsui Exp $ +$NetBSD: patch-curl-config.in,v 1.2 2013/04/14 16:39:49 wiz Exp $ - make "curl-config --libs" return proper ldflags for shared libraries ---- curl-config.in.orig 2012-08-08 21:38:25.000000000 +0000 +--- curl-config.in.orig 2013-02-06 14:44:37.000000000 +0000 +++ curl-config.in -@@ -148,9 +148,9 @@ - CURLLIBDIR="" - fi - if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then -- echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@ -+ echo @LDFLAGS@ ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@ - else -- echo ${CURLLIBDIR}-lcurl -+ echo @LDFLAGS@ ${CURLLIBDIR}-lcurl - fi - ;; +@@ -148,9 +148,9 @@ while test $# -gt 0; do + CURLLIBDIR="" + fi + if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then +- echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@ ++ echo @LDFLAGS@ ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@ + else +- echo ${CURLLIBDIR}-lcurl ++ echo @LDFLAGS@ ${CURLLIBDIR}-lcurl + fi + ;; diff --git a/www/curl/patches/patch-lib_multi.c b/www/curl/patches/patch-lib_multi.c deleted file mode 100644 index b46e3f44e4a..00000000000 --- a/www/curl/patches/patch-lib_multi.c +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-lib_multi.c,v 1.1 2013/03/10 13:21:05 obache Exp $ - -Fix NULL pointer reference when closing an unused multi handle. -(upstream commit da3fc1ee91de656a30f3a12de394bcba55119872) - ---- lib/multi.c.orig 2013-02-05 22:01:40.000000000 +0000 -+++ lib/multi.c -@@ -1773,10 +1773,12 @@ CURLMcode curl_multi_cleanup(CURLM *mult - /* Close all the connections in the connection cache */ - close_all_connections(multi); - -- multi->closure_handle->dns.hostcache = multi->hostcache; -- Curl_hostcache_clean(multi->closure_handle); -+ if(multi->closure_handle) { -+ multi->closure_handle->dns.hostcache = multi->hostcache; -+ Curl_hostcache_clean(multi->closure_handle); - -- Curl_close(multi->closure_handle); -+ Curl_close(multi->closure_handle); -+ } - multi->closure_handle = NULL; - - Curl_hash_destroy(multi->sockhash); |