CVS commit: pkgsrc/www/curl

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Aug  9 08:50:18 UTC 2017

Modified Files:
        pkgsrc/www/curl: Makefile PLIST distinfo
Added Files:
        pkgsrc/www/curl/patches: patch-Makefile.am

Log Message:
Updated curl to 7.55.0.

Curl and libcurl 7.55.0

 Public curl releases:         167
 Command line options:         210
 curl_easy_setopt() options:   247
 Public functions in libcurl:  61
 Contributors:                 1571

This release includes the following changes:

 o curl: allow --header and --proxy-header read from file [7]
 o getinfo: provide sizes as curl_off_t [6]
 o curl: prevent binary output spewed to terminal [16]
 o curl: added --request-target [22]
 o libcurl: added CURLOPT_REQUEST_TARGET [22]
 o curl: added --socks5-{basic,gssapi}: control socks5 auth [30]
 o libcurl: added CURLOPT_SOCKS5_AUTH [30]

This release includes the following bugfixes:

 o glob: do not parse after a strtoul() overflow range (CVE-2017-1000101) [85]
 o tftp: reject file name lengths that don't fit (CVE-2017-1000100) [84]
 o file: output the correct buffer to the user (CVE-2017-1000099) [83]
 o includes: remove curl/curlbuild.h and curl/curlrules.h [1]
 o dist: make the hugehelp.c not get regenerated unnecessarily [2]
 o timers: store internal time stamps as time_t instead of doubles [3]
 o progress: let "current speed" be UL + DL speeds combined [4]
 o http-proxy: do the HTTP CONNECT process entirely non-blocking [5]
 o lib/curl_setup.h: remove CURL_WANTS_CA_BUNDLE_ENV [8]
 o fuzz: bring oss-fuzz initial code converted to C89 [10]
 o configure: disable nghttp2 too if HTTP has been disabled
 o mk-ca-bundle.pl: Check curl's exit code after certdata download [11]
 o test1148: verify the -# progressbar [12]
 o tests: stabilize test 2032 and 2033 [13]
 o HTTPS-Proxy: don't offer h2 for https proxy connections [14]
 o http-proxy: only attempt FTP over HTTP proxy [9]
 o curl-compilers.m4: enable vla warning for clang [15]
 o curl-compilers.m4: enable double-promotion warning [15]
 o curl-compilers.m4: enable missing-variable-declarations clang warning [15]
 o curl-compilers.m4: enable comma clang warning [15]
 o Makefile.m32: enable -W for MinGW32 build [15]
 o CURLOPT_PREQUOTE: not supported for SFTP [17]
 o http2: fix OOM crash
 o PIPELINING_SERVER_BL: cleanup the internal list use [18]
 o mkhelp.pl: fix script name in usage text
 o lib1521: add curl_easy_getinfo calls to the test set
 o travis: do the distcheck test build out-of-tree as well
 o if2ip: fix compiler warning in ISO C90 mode
 o lib: fix the djgpp build [19]
 o typecheck-gcc: add support for CURLINFO_OFF_T [20]
 o travis: enable typecheck-gcc warnings [21]
 o maketgz: switch to xz instead of lzma [23]
 o CURLINFO_REDIRECT_URL.3: mention the CURLOPT_MAXREDIRS case
 o curl-compilers.m4: fix unknown-warning-option on Apple clang [24]
 o winbuild: fix boringssl build [25]
 o curl/system.h: add check for XTENSA for 32bit gcc [26]
 o test1537: fixed memory leak on OOM
 o test1521: fix compiler warnings [27]
 o curl: fix memory leak on test 1147 OOM [28]
 o libtest/make: generate lib1521.c dynamically at build-time [29]
 o curl_strequal.3: fix typo in SYNOPSIS [31]
 o progress: prevent resetting t_starttransfer [32]
 o openssl: improve fallback seed of PRNG with a time based hash [33]
 o http2: improved PING frame handling [34]
 o test1450: add simple testing for DICT [35]
 o make: build the docs subdir only from within src [36]
 o cmake: Added compatibility options for older Windows versions [37]
 o gtls: fix build when sizeof(long) < sizeof(void *) [38]
 o url: make the original string get used on subsequent transfers [39]
 o timeval.c: Use long long constant type for timeval assignment [40]
 o tool_sleep: typecast to avoid macos compiler warning
 o travis.yml: use --enable-werror on debug builds [41]
 o test1451: add SMB support to the testbed [42]
 o configure: remove checks for 5 functions never used [43]
 o configure: try ldap/lber in reversed order first [44]
 o smb: fix build for djgpp/MSDOS [45]
 o travis: install nghttp2 on linux builds [46]
 o smb: add support for CURLOPT_FILETIME [47]
 o cmake: fix send/recv argument scanner for windows [48]
 o inet_pton: fix include on windows to get prototype [49]
 o select.h: avoid macro redefinition harder
 o cmake: if inet_pton is used, bump _WIN32_WINNT
 o asyn-thread.c: fix unused variable warnings on macOS
 o runtests: support "threaded-resolver" as a feature
 o test506: skip if threaded-resolver
 o cmake: remove spurious "-l" from linker flags [50]
 o cmake: add CURL_WERROR for enabling "warning as errors"
 o memdebug: don't setbuf() if the file open failed [51]
 o curl_easy_escape.3: mention the (lack of) encoding [52]
 o test1452: add telnet negotiation [53]
 o CURLOPT_POSTFIELDS.3: explain the 100-continue magic better
 o cmake: offer CMAKE_DEBUG_POSTFIX when building with MSVC [54]
 o tests/valgrind.supp: supress OpenSSL false positive seen on travis [55]
 o curl_setup_once: Remove ERRNO/SET_ERRNO macros [56]
 o curl-compilers.m4: disable warning spam with Cygwin's clang [57]
 o ldap: fix MinGW compiler warning [58]
 o make: fix docs build on OpenBSD [59]
 o curl_setup: always define WIN32_LEAN_AND_MEAN on Windows [60]
 o system.h: include winsock2.h before windows.h
 o winbuild: build with warning level 4 [61]
 o rtspd: fix MSVC level 4 warning
 o sockfilt: suppress conversion warning with explicit cast
 o libtest: fix MSVC warning C4706
 o darwinssl: fix pinnedpubkey build error [62]
 o tests/server/resolve.c: fix deprecation warning [63]
 o nss: fix a possible use-after-free in SelectClientCert() [64]
 o checksrc: escape open brace in regex
 o multi: mention integer overflow risk if using > 500 million sockets [65]
 o darwinssl: fix --tlsv1.2 regression [66]
 o timeval: struct curltime is a struct timeval replacement [67]
 o curl_rtmp: fix a compiler warning [68]
 o include.d: clarify that it concerns the response headers [69]
 o cmake: support make uninstall [70]
 o include.d: clarify --include is only for response headers [71]
 o libcurl: Stop using error codes defined under CURL_NO_OLDIES [72]
 o http: fix response code parser to avoid integer overflow [73]
 o configure: fix the check for IdnToUnicode [74]
 o multi: fix request timer management [75]
 o curl_threads: fix MSVC compiler warning [76]
 o travis: build on osx with openssl
 o travis: build on osx with libressl
 o CURLOPT_NETRC.3: mention the file name on windows
 o cmake: set MSVC warning level to 4 [77]
 o netrc: skip lines starting with '#' [78]
 o darwinssl: fix curlssl_sha256sum() compiler warnings on first argument
 o BUILD.WINDOWS: mention buildconf.bat for builds off git
 o darwinssl: silence compiler warnings [79]
 o travis: build on osx with darwinssl
 o FTP: skip unnecessary CWD when in nocwd mode [80]
 o gssapi: fix memory leak of output token in multi round context [81]
 o getparameter: avoid returning uninitialized 'usedarg' [82]
 o curl (debug build) easy_events: make event data static
 o curl: detect and bail out early on parameter integer overflows [86]
 o configure: fix recv/send/select detection on Android [87]


To generate a diff of this commit:
cvs rdiff -u -r1.182 -r1.183 pkgsrc/www/curl/Makefile
cvs rdiff -u -r1.63 -r1.64 pkgsrc/www/curl/PLIST
cvs rdiff -u -r1.134 -r1.135 pkgsrc/www/curl/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/www/curl/patches/patch-Makefile.am

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.182 pkgsrc/www/curl/Makefile:1.183
--- pkgsrc/www/curl/Makefile:1.182      Wed Jun 14 07:11:41 2017
+++ pkgsrc/www/curl/Makefile    Wed Aug  9 08:50:17 2017
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.182 2017/06/14 07:11:41 adam Exp $
+# $NetBSD: Makefile,v 1.183 2017/08/09 08:50:17 wiz Exp $
 
-DISTNAME=      curl-7.54.1
+DISTNAME=      curl-7.55.0
 CATEGORIES=    www
 MASTER_SITES=  https://curl.haxx.se/download/
 EXTRACT_SUFX=  .tar.bz2
@@ -24,6 +24,11 @@ PKGCONFIG_OVERRIDE=  libcurl.pc.in
 
 INSTALLATION_DIRS=     share/doc/curl
 
+# only needed for 7.55.0 due to a bug, see patches/patch-Makefile.am
+USE_TOOLS+=            automake
+pre-configure:
+       cd ${WRKSRC} && automake
+
 .include "../../mk/bsd.prefs.mk"
 
 .if !empty(PKGSRC_RUN_TEST:M[Yy][Ee][Ss])

Index: pkgsrc/www/curl/PLIST
diff -u pkgsrc/www/curl/PLIST:1.63 pkgsrc/www/curl/PLIST:1.64
--- pkgsrc/www/curl/PLIST:1.63  Wed Apr 19 10:28:07 2017
+++ pkgsrc/www/curl/PLIST       Wed Aug  9 08:50:17 2017
@@ -1,9 +1,7 @@
-@comment $NetBSD: PLIST,v 1.63 2017/04/19 10:28:07 wiz Exp $
+@comment $NetBSD: PLIST,v 1.64 2017/08/09 08:50:17 wiz Exp $
 bin/curl
 bin/curl-config
 include/curl/curl.h
-include/curl/curlbuild.h
-include/curl/curlrules.h
 include/curl/curlver.h
 include/curl/easy.h
 include/curl/mprintf.h
@@ -245,6 +243,7 @@ man/man3/CURLOPT_READDATA.3
 man/man3/CURLOPT_READFUNCTION.3
 man/man3/CURLOPT_REDIR_PROTOCOLS.3
 man/man3/CURLOPT_REFERER.3
+man/man3/CURLOPT_REQUEST_TARGET.3
 man/man3/CURLOPT_RESOLVE.3
 man/man3/CURLOPT_RESUME_FROM.3
 man/man3/CURLOPT_RESUME_FROM_LARGE.3

Index: pkgsrc/www/curl/distinfo
diff -u pkgsrc/www/curl/distinfo:1.134 pkgsrc/www/curl/distinfo:1.135
--- pkgsrc/www/curl/distinfo:1.134      Wed Jul  5 10:34:12 2017
+++ pkgsrc/www/curl/distinfo    Wed Aug  9 08:50:17 2017
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.134 2017/07/05 10:34:12 adam Exp $
+$NetBSD: distinfo,v 1.135 2017/08/09 08:50:17 wiz Exp $
 
-SHA1 (curl-7.54.1.tar.bz2) = f5193316e4b5ff23505cb09bc946763d35d02cd6
-RMD160 (curl-7.54.1.tar.bz2) = 6f8eb154e020157811b72a27688840ca10321320
-SHA512 (curl-7.54.1.tar.bz2) = eb9639677f0ca1521ca631c520ab83ad071c52b31690e5e7f31546f6a44b2f11d1bb62282056cffb570eb290bf1e7830e87cb536295ac6a54a904663e795f2da
-Size (curl-7.54.1.tar.bz2) = 2612443 bytes
+SHA1 (curl-7.55.0.tar.bz2) = 2285a785a822d0a4cf2435c4e535ba243826be4e
+RMD160 (curl-7.55.0.tar.bz2) = efc904c64c78b2c1060f0d631920e0d18a6de444
+SHA512 (curl-7.55.0.tar.bz2) = 4975864621219e937585aaf5a9a54bba112b58bbf5a8acd92e1e972ea747a15a5564143548c5d8930b8c0d0e9d27d28225d0c81e52a1ba71e4c6f9e3859c978b
+Size (curl-7.55.0.tar.bz2) = 2782908 bytes
+SHA1 (patch-Makefile.am) = cea5874e9c6de97041dacb9e332c91bd6ec7da6b
 SHA1 (patch-configure) = fac0071bbb22cb379f36477e0e806a8f9f4d43eb
 SHA1 (patch-curl-config.in) = d0cc7bb6a5bf0b9257f40dcffce7093cc0098eb7
 SHA1 (patch-lib_hostcheck.c) = 8e772d3f91cdafae17281cc19004269ece0cf308

Added files:

Index: pkgsrc/www/curl/patches/patch-Makefile.am
diff -u /dev/null pkgsrc/www/curl/patches/patch-Makefile.am:1.1
--- /dev/null   Wed Aug  9 08:50:18 2017
+++ pkgsrc/www/curl/patches/patch-Makefile.am   Wed Aug  9 08:50:18 2017
@@ -0,0 +1,21 @@
+$NetBSD: patch-Makefile.am,v 1.1 2017/08/09 08:50:18 wiz Exp $
+
+Fix installation of docs.
+https://github.com/curl/curl/commit/f864bd8c880d5a916379aa4f26f1c45fe370b282
+
+--- Makefile.am.orig   2017-08-07 22:42:29.000000000 +0000
++++ Makefile.am
+@@ -276,11 +276,13 @@ cygwinbin:
+ install-data-hook:
+       cd include && $(MAKE) install
+       cd docs && $(MAKE) install
++      cd docs/libcurl && $(MAKE) install
+ 
+ # We extend the standard uninstall with a custom hook:
+ uninstall-hook:
+       cd include && $(MAKE) uninstall
+       cd docs && $(MAKE) uninstall
++      cd docs/libcurl && $(MAKE) uninstall
+ 
+ ca-bundle: lib/mk-ca-bundle.pl
+       @echo "generating a fresh ca-bundle.crt"