diff options
| -rw-r--r-- | www/curl/Makefile | 8 | ||||
| -rw-r--r-- | www/curl/PLIST | 5 | ||||
| -rw-r--r-- | www/curl/distinfo | 13 | ||||
| -rw-r--r-- | www/curl/patches/patch-configure | 50 | ||||
| -rw-r--r-- | www/curl/patches/patch-lib_hostcheck.c | 21 |
5 files changed, 42 insertions, 55 deletions
diff --git a/www/curl/Makefile b/www/curl/Makefile index 74aa60c8cea..f4fce1aca99 100644 --- a/www/curl/Makefile +++ b/www/curl/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.207 2019/02/06 08:02:48 adam Exp $ +# $NetBSD: Makefile,v 1.208 2019/03/31 20:41:29 leot Exp $ -DISTNAME= curl-7.64.0 +DISTNAME= curl-7.64.1 CATEGORIES= www MASTER_SITES= https://curl.haxx.se/download/ EXTRACT_SUFX= .tar.xz -MAINTAINER= pkgsrc-users@NetBSD.org +MAINTAINER= leot@NetBSD.org HOMEPAGE= https://curl.haxx.se/ COMMENT= Client that groks URLs # not completely, but near enough @@ -27,7 +27,7 @@ INSTALLATION_DIRS= share/doc/curl .include "options.mk" post-install: -.for f in MANUAL TheArtOfHttpScripting FAQ +.for f in TheArtOfHttpScripting FAQ ${INSTALL_DATA} ${WRKSRC}/docs/${f} ${DESTDIR}${PREFIX}/share/doc/curl/ .endfor diff --git a/www/curl/PLIST b/www/curl/PLIST index 59a3708a8c3..288b901c65f 100644 --- a/www/curl/PLIST +++ b/www/curl/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.73 2019/02/06 08:02:48 adam Exp $ +@comment $NetBSD: PLIST,v 1.74 2019/03/31 20:41:29 leot Exp $ bin/curl bin/curl-config include/curl/curl.h @@ -96,6 +96,8 @@ man/man3/CURLOPT_ABSTRACT_UNIX_SOCKET.3 man/man3/CURLOPT_ACCEPTTIMEOUT_MS.3 man/man3/CURLOPT_ACCEPT_ENCODING.3 man/man3/CURLOPT_ADDRESS_SCOPE.3 +man/man3/CURLOPT_ALTSVC.3 +man/man3/CURLOPT_ALTSVC_CTRL.3 man/man3/CURLOPT_APPEND.3 man/man3/CURLOPT_AUTOREFERER.3 man/man3/CURLOPT_BUFFERSIZE.3 @@ -440,5 +442,4 @@ man/man3/libcurl-url.3 man/man3/libcurl.3 share/aclocal/libcurl.m4 share/doc/curl/FAQ -share/doc/curl/MANUAL share/doc/curl/TheArtOfHttpScripting diff --git a/www/curl/distinfo b/www/curl/distinfo index 2d1b7f3da30..fc5b9ca9005 100644 --- a/www/curl/distinfo +++ b/www/curl/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.150 2019/02/06 08:02:48 adam Exp $ +$NetBSD: distinfo,v 1.151 2019/03/31 20:41:29 leot Exp $ -SHA1 (curl-7.64.0.tar.xz) = 7539acc0742c2fb1472bc2904f0bd58eeebc011a -RMD160 (curl-7.64.0.tar.xz) = 40806b3ea50ddab9d2f063dad37e81fdf6b04a17 -SHA512 (curl-7.64.0.tar.xz) = 953f1f5336ce5dfd1b9f933624432d401552d91ee02d39ecde6f023c956f99ec6aae8d7746d7c34b6eb2d6452f114e67da4e64d9c8dd90b7644b7844e7b9b423 -Size (curl-7.64.0.tar.xz) = 2398904 bytes -SHA1 (patch-configure) = 9b65a0b9564b7226942d1d1efef576b381a9755e +SHA1 (curl-7.64.1.tar.xz) = a7242098aebf31107bd4765f3d54456953dba141 +RMD160 (curl-7.64.1.tar.xz) = e53f8e3279d351de1fba7de1fea3126cdd59bf50 +SHA512 (curl-7.64.1.tar.xz) = 1629ba154691bf9d936e0bce69ec8fb54991a40d34bc16ffdfb117f91e3faa93164154fc9ae9043e963955862e69515018673b7239f2fd625684a59cdd1db81c +Size (curl-7.64.1.tar.xz) = 2385360 bytes +SHA1 (patch-configure) = a1674c54b3a8803f84c6b5a7ddd5e79df2b20896 SHA1 (patch-curl-config.in) = 363359665985cc14f36ddf47fc3480f1200e3533 -SHA1 (patch-lib_hostcheck.c) = 8e772d3f91cdafae17281cc19004269ece0cf308 diff --git a/www/curl/patches/patch-configure b/www/curl/patches/patch-configure index b91946c85fe..290d63114c7 100644 --- a/www/curl/patches/patch-configure +++ b/www/curl/patches/patch-configure @@ -1,17 +1,16 @@ -$NetBSD: patch-configure,v 1.4 2018/11/28 01:31:45 sevan Exp $ +$NetBSD: patch-configure,v 1.5 2019/03/31 20:41:29 leot Exp $ -builtin krb5-config in platforms such as solaris do not support -the gssapi option, and need an explicit -lgss +- Builtin krb5-config in platforms such as solaris do not support + the gssapi option, and need an explicit -lgss +- On Darwin, do not append custom CFLAGS. +- Do not strip debug flags. +- Support Minix. +- Avoid unportable `==' test(1) operator, applied upstream via: + <https://github.com/curl/curl/pull/3709> -On Darwin, do not append custom CFLAGS. - -Do not strip debug flags. - -Support Minix. - ---- configure.orig Wed Nov 28 00:16:07 2018 +--- configure.orig 2019-03-25 21:03:50.000000000 +0000 +++ configure -@@ -3744,6 +3744,7 @@ $as_echo "$as_me: $xc_bad_var_msg libraries. Use LIBS +@@ -3746,6 +3746,7 @@ $as_echo "$as_me: $xc_bad_var_msg librar ;; esac done @@ -19,7 +18,7 @@ Support Minix. if test $xc_bad_var_cflags = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: using CFLAGS: $CFLAGS" >&5 $as_echo "$as_me: using CFLAGS: $CFLAGS" >&6;} -@@ -8089,7 +8090,7 @@ else +@@ -7881,7 +7882,7 @@ else lt_cv_sys_max_cmd_len=8192; ;; @@ -28,7 +27,7 @@ Support Minix. # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` -@@ -8555,12 +8556,8 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +@@ -8347,12 +8348,8 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu lt_cv_deplibs_check_method=pass_all ;; @@ -43,7 +42,7 @@ Support Minix. ;; newos6*) -@@ -12761,14 +12758,13 @@ _LT_EOF +@@ -12559,14 +12556,13 @@ _LT_EOF fi ;; @@ -65,7 +64,7 @@ Support Minix. ;; solaris*) -@@ -13451,15 +13447,13 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } +@@ -13249,15 +13245,13 @@ $as_echo "$lt_cv_irix_exported_symbol" > esac ;; @@ -86,7 +85,7 @@ Support Minix. ;; newsos6) -@@ -14565,6 +14559,18 @@ fi +@@ -14363,6 +14357,18 @@ fi dynamic_linker='GNU/Linux ld.so' ;; @@ -105,7 +104,7 @@ Support Minix. netbsdelf*-gnu) version_type=linux need_lib_prefix=no -@@ -17079,7 +17085,7 @@ squeeze() { +@@ -16931,7 +16937,7 @@ squeeze() { # @@ -114,7 +113,7 @@ Support Minix. # if test "$compiler_id" = "GNU_C" || test "$compiler_id" = "CLANG"; then -@@ -17407,13 +17413,6 @@ $as_echo_n "checking if compiler accepts debug disabli +@@ -17259,13 +17265,6 @@ $as_echo_n "checking if compiler accepts tmp_options="$flags_dbg_off" fi # @@ -128,7 +127,7 @@ Support Minix. squeeze CPPFLAGS squeeze CFLAGS -@@ -19081,7 +19080,7 @@ $as_echo "no" >&6; } +@@ -18933,7 +18932,7 @@ $as_echo "no" >&6; } tst_cflags="no" case $host_os in darwin*) @@ -137,7 +136,7 @@ Support Minix. ;; esac -@@ -22013,7 +22012,11 @@ $as_echo "yes" >&6; } +@@ -21934,7 +21933,11 @@ $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 "$KRB5CONFIG"; then @@ -150,7 +149,7 @@ Support Minix. elif test "$GSSAPI_ROOT" != "yes"; then GSSAPI_INCS="-I$GSSAPI_ROOT/include" fi -@@ -22186,7 +22189,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confdefs.h +@@ -22107,7 +22110,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd LIBS="-lgss $LIBS" ;; *) @@ -159,3 +158,12 @@ Support Minix. ;; esac fi +@@ -22252,7 +22255,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable Amiga native SSL/TLS (AmiSSL)" >&5 + $as_echo_n "checking whether to enable Amiga native SSL/TLS (AmiSSL)... " >&6; } +-if test "$HAVE_PROTO_BSDSOCKET_H" == "1"; then ++if test "$HAVE_PROTO_BSDSOCKET_H" = "1"; then + if test -z "$ssl_backends" -o "x$OPT_AMISSL" != xno; then + ssl_msg= + if test "x$OPT_AMISSL" != "xno"; then diff --git a/www/curl/patches/patch-lib_hostcheck.c b/www/curl/patches/patch-lib_hostcheck.c deleted file mode 100644 index 1ac2251f5e4..00000000000 --- a/www/curl/patches/patch-lib_hostcheck.c +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-lib_hostcheck.c,v 1.4 2015/08/08 02:44:16 spz Exp $ - -Add missing header for DragonflyBSD. -PR 48691 by David Shao. - ---- lib/hostcheck.c.orig 2015-06-03 07:38:20.000000000 +0000 -+++ lib/hostcheck.c -@@ -34,6 +34,13 @@ - #include "inet_pton.h" - - #include "curl_memory.h" -+ -+#ifdef ENABLE_IPV6 -+#ifdef HAVE_NETINET_IN_H -+#include <netinet/in.h> -+#endif -+#endif -+ - /* The last #include file should be: */ - #include "memdebug.h" - |