Sun Apr 14 16:39:49 2013 UTC ()
Update to 7.30.0:

Fixed in 7.30.0 - April 12 2013
Release contains security-related bug fix

Changes:

    imap: Changed response tag generation to be completely unique
    imap: Added support for SASL-IR extension
    imap: Added support for the list command
    imap: Added support for the append command
    imap: Added custom request parsing
    imap: Added support to the fetch command for UID and SECTION properties
    imap: Added parsing and verification of the UIDVALIDITY mailbox attribute
    darwinssl: Make certificate errors less techy
    imap/pop3/smtp: Added support for the STARTTLS capability
    checksrc: ban use of sprintf, vsprintf, strcat, strncat and gets
    curl_global_init() now accepts the CURL_GLOBAL_ACK_EINTR flag
    Added CURLMOPT_MAX_HOST_CONNECTIONS, CURLMOPT_MAX_TOTAL_CONNECTIONS for new multi interface connection handling
    Added CURLMOPT_MAX_PIPELINE_LENGTH, CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE, CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE, CURLMOPT_PIPELINING_SITE_BL and CURLMOPT_PIPELI NING_SERVER_BL for new pipelining control

Bugfixes:

    SECURITY ADVISORY: cookie tailmatching to avoid cross-domain leakage
    darwinssl: Fix build under Leopard
    DONE: consider callback-aborted transfers premature
    ntlm: Fixed memory leaks
    smtp: Fixed an issue when processing EHLO failure responses
    pop3: Fixed incorrect return value from pop3_endofresp()
    pop3: Fixed SASL authentication capability detection
    pop3: Fixed blocking SSL connect when connecting via POP3S
    imap: Fixed memory leak when performing multiple selects
    nss: fix misplaced code enabling non-blocking socket mode
    AddFormData: prevent only directories from being posted
    darwinssl: fix infinite loop if server disconnected abruptly
    metalink: fix improbable crash parsing metalink filename
    show proper host name on failed resolve
    MacOSX-Framework: Make script work in Xcode 4.0 and later
    strlcat: remove function
    darwinssl: Fix send glitchiness with data > 32 or so KB
    polarssl: better 1.1.x and 1.2.x support
    various documentation improvements
    multi: NULL pointer reference when closing an unused multi handle
    SOCKS: fix socks proxy when noproxy matched
    install-sh: updated to support multiple source files as arguments
    PolarSSL: added human readable error strings
    resolver_error: remove wrong error message output
    docs: updates HTML index and general improvements
    curlbuild.h.dist: enhance non-configure GCC ABI detection logic
    sasl: Fixed null pointer reference when decoding empty digest challenge
    easy: do not ignore poll() failures other than EINTR
    darwinssl: disable ECC ciphers under Mountain Lion by default
    CONNECT: count received headers
    build: fixes for VMS
    CONNECT: clear 'rewindaftersend' on success
    HTTP proxy: insert slash in URL if missing
    hiperfifo: updated to use current libevent API
    getinmemory.c: abort the transfer nicely if not enough memory
    improved win32 memorytracking
    corrected proxy header response headers count
    FTP quote operations on re-used connection
    tcpkeepalive on win32
    tcpkeepalive on Mac OS X
    easy: acknowledge the CURLOPT_MAXCONNECTS option properly
    easy interface: restore default MAXCONNECTS to 5
    win32: don't set SO_SNDBUF for windows vista or later versions
    HTTP: made cookie sort function more deterministic
    winssl: Fixed memory leak if connection was not successful
    FTP: wait on both connections during active STOR state
    connect: treat a failed local bind of an interface as a non-fatal error
    darwinssl: disable insecure ciphers by default
    FTP: handle "rubbish" in front of directory name in 257 responses
    mk-ca-bundle: Fixed lost OpenSSL output with "-t"


(wiz)
diff -r1.126 -r1.127 pkgsrc/www/curl/Makefile
diff -r1.38 -r1.39 pkgsrc/www/curl/PLIST
diff -r1.84 -r1.85 pkgsrc/www/curl/distinfo
diff -r1.1 -r1.2 pkgsrc/www/curl/patches/patch-curl-config.in
diff -r1.1 -r0 pkgsrc/www/curl/patches/patch-lib_multi.c
cvs diff -r1.126 -r1.127 pkgsrc/www/curl/Makefile (switch to unified diff)

--- pkgsrc/www/curl/Makefile 2013/03/17 21:33:33 1.126
+++ pkgsrc/www/curl/Makefile 2013/04/14 16:39:48 1.127
@@ -1,57 +1,56 @@ @@ -1,57 +1,56 @@
1# $NetBSD: Makefile,v 1.126 2013/03/17 21:33:33 tsutsui Exp $ 1# $NetBSD: Makefile,v 1.127 2013/04/14 16:39:48 wiz Exp $
2 2
3DISTNAME= curl-7.29.0 3DISTNAME= curl-7.30.0
4PKGREVISION= 2 
5CATEGORIES= www 4CATEGORIES= www
6MASTER_SITES= http://curl.haxx.se/download/ \ 5MASTER_SITES= http://curl.haxx.se/download/ \
7 ftp://ftp.sunet.se/pub/www/utilities/curl/ 6 ftp://ftp.sunet.se/pub/www/utilities/curl/
8EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://curl.haxx.se/ 10HOMEPAGE= http://curl.haxx.se/
12COMMENT= Client that groks URLs 11COMMENT= Client that groks URLs
13# not completely, but near enough 12# not completely, but near enough
14LICENSE= mit 13LICENSE= mit
15 14
16PKG_INSTALLATION_TYPES= overwrite pkgviews 15PKG_INSTALLATION_TYPES= overwrite pkgviews
17 16
18# list it into IPv6-ready packages 17# list it into IPv6-ready packages
19BUILD_DEFS+= IPV6_READY 18BUILD_DEFS+= IPV6_READY
20 19
21USE_LIBTOOL= yes 20USE_LIBTOOL= yes
22GNU_CONFIGURE= yes 21GNU_CONFIGURE= yes
23CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_PREFIX.openssl} 22CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_PREFIX.openssl}
24CONFIGURE_ARGS+= --with-ca-path=${SSLCERTS} 23CONFIGURE_ARGS+= --with-ca-path=${SSLCERTS}
25CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} 24CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
26PKGCONFIG_OVERRIDE= libcurl.pc.in 25PKGCONFIG_OVERRIDE= libcurl.pc.in
27 26
28INSTALLATION_DIRS= share/doc/curl share/examples/curl 27INSTALLATION_DIRS= share/doc/curl share/examples/curl
29 28
30.include "../../mk/bsd.prefs.mk" 29.include "../../mk/bsd.prefs.mk"
31 30
32.if !empty(PKGSRC_RUN_TEST:M[Yy][Ee][Ss]) 31.if !empty(PKGSRC_RUN_TEST:M[Yy][Ee][Ss])
33TEST_TARGET= check 32TEST_TARGET= check
34USE_TOOLS+= perl 33USE_TOOLS+= perl
35.endif 34.endif
36 35
37.if ${_USE_DESTDIR} == "no" 36.if ${_USE_DESTDIR} == "no"
38PRIVILEGED_STAGES+= clean 37PRIVILEGED_STAGES+= clean
39.endif 38.endif
40 39
41.include "options.mk" 40.include "options.mk"
42 41
43post-install: 42post-install:
44 for _f in MANUAL TheArtOfHttpScripting FAQ \ 43 for _f in MANUAL TheArtOfHttpScripting FAQ \
45 curl-config.pdf curl.pdf; do \ 44 curl-config.pdf curl.pdf; do \
46 ${INSTALL_DATA} ${WRKSRC}/docs/$${_f} \ 45 ${INSTALL_DATA} ${WRKSRC}/docs/$${_f} \
47 ${DESTDIR}${PREFIX}/share/doc/curl/${_f}; \ 46 ${DESTDIR}${PREFIX}/share/doc/curl/${_f}; \
48 done 47 done
49 for _f in ${WRKSRC}/docs/examples/*.c \ 48 for _f in ${WRKSRC}/docs/examples/*.c \
50 ${WRKSRC}/docs/examples/README; do \ 49 ${WRKSRC}/docs/examples/README; do \
51 ${INSTALL_DATA} $${_f} \ 50 ${INSTALL_DATA} $${_f} \
52 ${DESTDIR}${PREFIX}/share/examples/curl; \ 51 ${DESTDIR}${PREFIX}/share/examples/curl; \
53 done 52 done
54 53
55.include "../../devel/zlib/buildlink3.mk" 54.include "../../devel/zlib/buildlink3.mk"
56.include "../../security/openssl/buildlink3.mk" 55.include "../../security/openssl/buildlink3.mk"
57.include "../../mk/bsd.pkg.mk" 56.include "../../mk/bsd.pkg.mk"
cvs diff -r1.38 -r1.39 pkgsrc/www/curl/PLIST (switch to unified diff)

--- pkgsrc/www/curl/PLIST 2012/12/06 16:24:29 1.38
+++ pkgsrc/www/curl/PLIST 2013/04/14 16:39:48 1.39
@@ -1,137 +1,138 @@ @@ -1,137 +1,138 @@
1@comment $NetBSD: PLIST,v 1.38 2012/12/06 16:24:29 adam Exp $ 1@comment $NetBSD: PLIST,v 1.39 2013/04/14 16:39:48 wiz Exp $
2bin/curl 2bin/curl
3bin/curl-config 3bin/curl-config
4include/curl/curl.h 4include/curl/curl.h
5include/curl/curlbuild.h 5include/curl/curlbuild.h
6include/curl/curlrules.h 6include/curl/curlrules.h
7include/curl/curlver.h 7include/curl/curlver.h
8include/curl/easy.h 8include/curl/easy.h
9include/curl/mprintf.h 9include/curl/mprintf.h
10include/curl/multi.h 10include/curl/multi.h
11include/curl/stdcheaders.h 11include/curl/stdcheaders.h
12include/curl/typecheck-gcc.h 12include/curl/typecheck-gcc.h
13lib/libcurl.la 13lib/libcurl.la
14lib/pkgconfig/libcurl.pc 14lib/pkgconfig/libcurl.pc
15man/man1/curl-config.1 15man/man1/curl-config.1
16man/man1/curl.1 16man/man1/curl.1
17man/man1/mk-ca-bundle.1 17man/man1/mk-ca-bundle.1
18man/man3/curl_easy_cleanup.3 18man/man3/curl_easy_cleanup.3
19man/man3/curl_easy_duphandle.3 19man/man3/curl_easy_duphandle.3
20man/man3/curl_easy_escape.3 20man/man3/curl_easy_escape.3
21man/man3/curl_easy_getinfo.3 21man/man3/curl_easy_getinfo.3
22man/man3/curl_easy_init.3 22man/man3/curl_easy_init.3
23man/man3/curl_easy_pause.3 23man/man3/curl_easy_pause.3
24man/man3/curl_easy_perform.3 24man/man3/curl_easy_perform.3
25man/man3/curl_easy_recv.3 25man/man3/curl_easy_recv.3
26man/man3/curl_easy_reset.3 26man/man3/curl_easy_reset.3
27man/man3/curl_easy_send.3 27man/man3/curl_easy_send.3
28man/man3/curl_easy_setopt.3 28man/man3/curl_easy_setopt.3
29man/man3/curl_easy_strerror.3 29man/man3/curl_easy_strerror.3
30man/man3/curl_easy_unescape.3 30man/man3/curl_easy_unescape.3
31man/man3/curl_escape.3 31man/man3/curl_escape.3
32man/man3/curl_formadd.3 32man/man3/curl_formadd.3
33man/man3/curl_formfree.3 33man/man3/curl_formfree.3
34man/man3/curl_formget.3 34man/man3/curl_formget.3
35man/man3/curl_free.3 35man/man3/curl_free.3
36man/man3/curl_getdate.3 36man/man3/curl_getdate.3
37man/man3/curl_getenv.3 37man/man3/curl_getenv.3
38man/man3/curl_global_cleanup.3 38man/man3/curl_global_cleanup.3
39man/man3/curl_global_init.3 39man/man3/curl_global_init.3
40man/man3/curl_global_init_mem.3 40man/man3/curl_global_init_mem.3
41man/man3/curl_mprintf.3 41man/man3/curl_mprintf.3
42man/man3/curl_multi_add_handle.3 42man/man3/curl_multi_add_handle.3
43man/man3/curl_multi_assign.3 43man/man3/curl_multi_assign.3
44man/man3/curl_multi_cleanup.3 44man/man3/curl_multi_cleanup.3
45man/man3/curl_multi_fdset.3 45man/man3/curl_multi_fdset.3
46man/man3/curl_multi_info_read.3 46man/man3/curl_multi_info_read.3
47man/man3/curl_multi_init.3 47man/man3/curl_multi_init.3
48man/man3/curl_multi_perform.3 48man/man3/curl_multi_perform.3
49man/man3/curl_multi_remove_handle.3 49man/man3/curl_multi_remove_handle.3
50man/man3/curl_multi_setopt.3 50man/man3/curl_multi_setopt.3
51man/man3/curl_multi_socket.3 51man/man3/curl_multi_socket.3
52man/man3/curl_multi_socket_action.3 52man/man3/curl_multi_socket_action.3
53man/man3/curl_multi_strerror.3 53man/man3/curl_multi_strerror.3
54man/man3/curl_multi_timeout.3 54man/man3/curl_multi_timeout.3
55man/man3/curl_multi_wait.3 55man/man3/curl_multi_wait.3
56man/man3/curl_share_cleanup.3 56man/man3/curl_share_cleanup.3
57man/man3/curl_share_init.3 57man/man3/curl_share_init.3
58man/man3/curl_share_setopt.3 58man/man3/curl_share_setopt.3
59man/man3/curl_share_strerror.3 59man/man3/curl_share_strerror.3
60man/man3/curl_slist_append.3 60man/man3/curl_slist_append.3
61man/man3/curl_slist_free_all.3 61man/man3/curl_slist_free_all.3
62man/man3/curl_strequal.3 62man/man3/curl_strequal.3
63man/man3/curl_unescape.3 63man/man3/curl_unescape.3
64man/man3/curl_version.3 64man/man3/curl_version.3
65man/man3/curl_version_info.3 65man/man3/curl_version_info.3
66man/man3/libcurl-easy.3 66man/man3/libcurl-easy.3
67man/man3/libcurl-errors.3 67man/man3/libcurl-errors.3
68man/man3/libcurl-multi.3 68man/man3/libcurl-multi.3
69man/man3/libcurl-share.3 69man/man3/libcurl-share.3
70man/man3/libcurl-tutorial.3 70man/man3/libcurl-tutorial.3
71man/man3/libcurl.3 71man/man3/libcurl.3
72share/doc/curl/FAQ 72share/doc/curl/FAQ
73share/doc/curl/MANUAL 73share/doc/curl/MANUAL
74share/doc/curl/TheArtOfHttpScripting 74share/doc/curl/TheArtOfHttpScripting
75share/doc/curl/curl-config.pdf 75share/doc/curl/curl-config.pdf
76share/doc/curl/curl.pdf 76share/doc/curl/curl.pdf
77share/examples/curl/10-at-a-time.c 77share/examples/curl/10-at-a-time.c
78share/examples/curl/README 78share/examples/curl/README
79share/examples/curl/anyauthput.c 79share/examples/curl/anyauthput.c
80share/examples/curl/cacertinmem.c 80share/examples/curl/cacertinmem.c
81share/examples/curl/certinfo.c 81share/examples/curl/certinfo.c
82share/examples/curl/chkspeed.c 82share/examples/curl/chkspeed.c
83share/examples/curl/cookie_interface.c 83share/examples/curl/cookie_interface.c
84share/examples/curl/curlgtk.c 84share/examples/curl/curlgtk.c
85share/examples/curl/curlx.c 85share/examples/curl/curlx.c
86share/examples/curl/debug.c 86share/examples/curl/debug.c
87share/examples/curl/evhiperfifo.c 87share/examples/curl/evhiperfifo.c
88share/examples/curl/externalsocket.c 88share/examples/curl/externalsocket.c
89share/examples/curl/fileupload.c 89share/examples/curl/fileupload.c
90share/examples/curl/fopen.c 90share/examples/curl/fopen.c
91share/examples/curl/ftp-wildcard.c 91share/examples/curl/ftp-wildcard.c
92share/examples/curl/ftpget.c 92share/examples/curl/ftpget.c
93share/examples/curl/ftpgetinfo.c 93share/examples/curl/ftpgetinfo.c
94share/examples/curl/ftpgetresp.c 94share/examples/curl/ftpgetresp.c
95share/examples/curl/ftpsget.c 95share/examples/curl/ftpsget.c
96share/examples/curl/ftpupload.c 96share/examples/curl/ftpupload.c
97share/examples/curl/ftpuploadresume.c 97share/examples/curl/ftpuploadresume.c
98share/examples/curl/getinfo.c 98share/examples/curl/getinfo.c
99share/examples/curl/getinmemory.c 99share/examples/curl/getinmemory.c
100share/examples/curl/ghiper.c 100share/examples/curl/ghiper.c
101share/examples/curl/hiperfifo.c 101share/examples/curl/hiperfifo.c
102share/examples/curl/href_extractor.c 102share/examples/curl/href_extractor.c
103share/examples/curl/htmltidy.c 103share/examples/curl/htmltidy.c
104share/examples/curl/http-post.c 104share/examples/curl/http-post.c
105share/examples/curl/httpcustomheader.c 105share/examples/curl/httpcustomheader.c
106share/examples/curl/httpput.c 106share/examples/curl/httpput.c
107share/examples/curl/https.c 107share/examples/curl/https.c
108share/examples/curl/imap.c 108share/examples/curl/imap.c
109share/examples/curl/multi-app.c 109share/examples/curl/multi-app.c
110share/examples/curl/multi-debugcallback.c 110share/examples/curl/multi-debugcallback.c
111share/examples/curl/multi-double.c 111share/examples/curl/multi-double.c
112share/examples/curl/multi-post.c 112share/examples/curl/multi-post.c
113share/examples/curl/multi-single.c 113share/examples/curl/multi-single.c
 114share/examples/curl/multi-uv.c
114share/examples/curl/multithread.c 115share/examples/curl/multithread.c
115share/examples/curl/opensslthreadlock.c 116share/examples/curl/opensslthreadlock.c
116share/examples/curl/persistant.c 117share/examples/curl/persistant.c
117share/examples/curl/pop3s.c 118share/examples/curl/pop3s.c
118share/examples/curl/pop3slist.c 119share/examples/curl/pop3slist.c
119share/examples/curl/post-callback.c 120share/examples/curl/post-callback.c
120share/examples/curl/postit2.c 121share/examples/curl/postit2.c
121share/examples/curl/progressfunc.c 122share/examples/curl/progressfunc.c
122share/examples/curl/resolve.c 123share/examples/curl/resolve.c
123share/examples/curl/rtsp.c 124share/examples/curl/rtsp.c
124share/examples/curl/sampleconv.c 125share/examples/curl/sampleconv.c
125share/examples/curl/sendrecv.c 126share/examples/curl/sendrecv.c
126share/examples/curl/sepheaders.c 127share/examples/curl/sepheaders.c
127share/examples/curl/sftpget.c 128share/examples/curl/sftpget.c
128share/examples/curl/simple.c 129share/examples/curl/simple.c
129share/examples/curl/simplepost.c 130share/examples/curl/simplepost.c
130share/examples/curl/simplesmtp.c 131share/examples/curl/simplesmtp.c
131share/examples/curl/simplessl.c 132share/examples/curl/simplessl.c
132share/examples/curl/smooth-gtk-thread.c 133share/examples/curl/smooth-gtk-thread.c
133share/examples/curl/smtp-multi.c 134share/examples/curl/smtp-multi.c
134share/examples/curl/smtp-tls.c 135share/examples/curl/smtp-tls.c
135share/examples/curl/synctime.c 136share/examples/curl/synctime.c
136share/examples/curl/threaded-ssl.c 137share/examples/curl/threaded-ssl.c
137share/examples/curl/url2file.c 138share/examples/curl/url2file.c
cvs diff -r1.84 -r1.85 pkgsrc/www/curl/distinfo (switch to unified diff)

--- pkgsrc/www/curl/distinfo 2013/03/17 21:33:33 1.84
+++ pkgsrc/www/curl/distinfo 2013/04/14 16:39:48 1.85
@@ -1,8 +1,7 @@ @@ -1,8 +1,7 @@
1$NetBSD: distinfo,v 1.84 2013/03/17 21:33:33 tsutsui Exp $ 1$NetBSD: distinfo,v 1.85 2013/04/14 16:39:48 wiz Exp $
2 2
3SHA1 (curl-7.29.0.tar.bz2) = 03eddd295d3d50d60a9dd1c130c8e110ff1aa95a 3SHA1 (curl-7.30.0.tar.bz2) = 23fdc215558023b943cea9dfab04b86020037b0d
4RMD160 (curl-7.29.0.tar.bz2) = 50c2ee716736dc0f1de26e032f525e7511912b95 4RMD160 (curl-7.30.0.tar.bz2) = 858e772c17fc05d7114856f09fc34e696f1ef595
5Size (curl-7.29.0.tar.bz2) = 2556495 bytes 5Size (curl-7.30.0.tar.bz2) = 2625976 bytes
6SHA1 (patch-aa) = 07e12cd0576b87cfed74a6a2bf8dd42cb2f5a570 6SHA1 (patch-aa) = 07e12cd0576b87cfed74a6a2bf8dd42cb2f5a570
7SHA1 (patch-curl-config.in) = 406fdc1ea210e81a674b7edae9842ec9083bf45e 7SHA1 (patch-curl-config.in) = c685dd4fd85fc9d97c6e6ff8dbf871c35dd57046
8SHA1 (patch-lib_multi.c) = ead077ecdb819081e7a271feb6e249a20e025f75 
cvs diff -r1.1 -r1.2 pkgsrc/www/curl/patches/patch-curl-config.in (switch to unified diff)

--- pkgsrc/www/curl/patches/patch-curl-config.in 2013/03/17 21:33:34 1.1
+++ pkgsrc/www/curl/patches/patch-curl-config.in 2013/04/14 16:39:49 1.2
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-curl-config.in,v 1.1 2013/03/17 21:33:34 tsutsui Exp $ 1$NetBSD: patch-curl-config.in,v 1.2 2013/04/14 16:39:49 wiz Exp $
2 2
3- make "curl-config --libs" return proper ldflags for shared libraries 3- make "curl-config --libs" return proper ldflags for shared libraries
4 4
5--- curl-config.in.orig 2012-08-08 21:38:25.000000000 +0000 5--- curl-config.in.orig 2013-02-06 14:44:37.000000000 +0000
6+++ curl-config.in 6+++ curl-config.in
7@@ -148,9 +148,9 @@ 7@@ -148,9 +148,9 @@ while test $# -gt 0; do
8 CURLLIBDIR="" 8 CURLLIBDIR=""
9 fi 9 fi
10 if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then 10 if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then
11- echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@ 11- echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@
12+ echo @LDFLAGS@ ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@ 12+ echo @LDFLAGS@ ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@
13 else 13 else
14- echo ${CURLLIBDIR}-lcurl 14- echo ${CURLLIBDIR}-lcurl
15+ echo @LDFLAGS@ ${CURLLIBDIR}-lcurl 15+ echo @LDFLAGS@ ${CURLLIBDIR}-lcurl
16 fi 16 fi
17 ;; 17 ;;
18  18
File Deleted: pkgsrc/www/curl/patches/Attic/patch-lib_multi.c