summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--www/curl/Makefile5
-rw-r--r--www/curl/PLIST5
-rw-r--r--www/curl/distinfo12
-rw-r--r--www/curl/patches/patch-aa21
-rw-r--r--www/curl/patches/patch-lib_multi.c21
-rw-r--r--www/curl/patches/patch-lib_transfer.c21
6 files changed, 26 insertions, 59 deletions
diff --git a/www/curl/Makefile b/www/curl/Makefile
index 8b0ea6ec9b5..13dbb355961 100644
--- a/www/curl/Makefile
+++ b/www/curl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.153 2015/08/08 02:44:16 spz Exp $
+# $NetBSD: Makefile,v 1.154 2015/08/17 15:43:27 wiz Exp $
-DISTNAME= curl-7.43.0
-PKGREVISION= 1
+DISTNAME= curl-7.44.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 978d66a91dd..8415f166155 100644
--- a/www/curl/PLIST
+++ b/www/curl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.52 2015/08/08 02:44:16 spz Exp $
+@comment $NetBSD: PLIST,v 1.53 2015/08/17 15:43:27 wiz Exp $
bin/curl
bin/curl-config
include/curl/curl.h
@@ -23,6 +23,8 @@ man/man3/CURLMOPT_MAX_TOTAL_CONNECTIONS.3
man/man3/CURLMOPT_PIPELINING.3
man/man3/CURLMOPT_PIPELINING_SERVER_BL.3
man/man3/CURLMOPT_PIPELINING_SITE_BL.3
+man/man3/CURLMOPT_PUSHDATA.3
+man/man3/CURLMOPT_PUSHFUNCTION.3
man/man3/CURLMOPT_SOCKETDATA.3
man/man3/CURLMOPT_SOCKETFUNCTION.3
man/man3/CURLMOPT_TIMERDATA.3
@@ -298,6 +300,7 @@ man/man3/libcurl-errors.3
man/man3/libcurl-multi.3
man/man3/libcurl-share.3
man/man3/libcurl-symbols.3
+man/man3/libcurl-thread.3
man/man3/libcurl-tutorial.3
man/man3/libcurl.3
share/aclocal/libcurl.m4
diff --git a/www/curl/distinfo b/www/curl/distinfo
index d56f535f6b5..f6430e9691d 100644
--- a/www/curl/distinfo
+++ b/www/curl/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.108 2015/08/08 02:44:16 spz Exp $
+$NetBSD: distinfo,v 1.109 2015/08/17 15:43:27 wiz Exp $
-SHA1 (curl-7.43.0.tar.bz2) = d821ea39610b7f1122f1f574a4d8e20e81b3c561
-RMD160 (curl-7.43.0.tar.bz2) = 404481695a8f79cbf9a245bfa9c06140d1cdbf11
-Size (curl-7.43.0.tar.bz2) = 3363770 bytes
-SHA1 (patch-aa) = 89e33ed9492522af7bee22cdfaf6c4b0731f1510
+SHA1 (curl-7.44.0.tar.bz2) = 879a186944e7b06e619a2eb07cef729b5702345c
+RMD160 (curl-7.44.0.tar.bz2) = d7e4a2406c5fea9445c13e725dd421d7198389a6
+Size (curl-7.44.0.tar.bz2) = 3398814 bytes
+SHA1 (patch-aa) = 793701d5ecc3343170fb437906c9adb74763cd13
SHA1 (patch-curl-config.in) = d0cc7bb6a5bf0b9257f40dcffce7093cc0098eb7
SHA1 (patch-lib_hostcheck.c) = 8e772d3f91cdafae17281cc19004269ece0cf308
-SHA1 (patch-lib_multi.c) = 00770c93a6b482103e9bbeadba081581cef640eb
-SHA1 (patch-lib_transfer.c) = 8a608ff01ee7c3cd8dbc0090589826fe9a2b1474
diff --git a/www/curl/patches/patch-aa b/www/curl/patches/patch-aa
index 790578ad599..5d8432a566c 100644
--- a/www/curl/patches/patch-aa
+++ b/www/curl/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.33 2015/08/08 02:44:16 spz Exp $
+$NetBSD: patch-aa,v 1.34 2015/08/17 15:43:27 wiz Exp $
builtin krb5-config in platforms such as solaris do not support
the gssapi option, and need an explicit -lgss
---- configure.orig 2015-06-15 21:31:47.000000000 +0000
+--- configure.orig 2015-08-10 12:54:00.000000000 +0000
+++ configure
-@@ -3703,6 +3703,7 @@ $as_echo "$as_me: $xc_bad_var_msg librar
+@@ -3737,6 +3737,7 @@ $as_echo "$as_me: $xc_bad_var_msg librar
;;
esac
done
@@ -13,7 +13,7 @@ the gssapi option, and need an explicit -lgss
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;}
-@@ -16689,7 +16690,7 @@ squeeze() {
+@@ -16723,7 +16724,7 @@ squeeze() {
#
@@ -22,7 +22,16 @@ the gssapi option, and need an explicit -lgss
#
if test "$compiler_id" = "GNU_C" ||
test "$compiler_id" = "CLANG"; then
-@@ -21137,7 +21138,11 @@ $as_echo "yes" >&6; }
+@@ -19971,7 +19972,7 @@ done
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for monotonic clock_gettime" >&5
+ $as_echo_n "checking for monotonic clock_gettime... " >&6; }
+ #
+- if test "x$dontwant_rt" == "xno" ; then
++ if test "x$dontwant_rt" = "xno" ; then
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+@@ -21174,7 +21175,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
@@ -35,7 +44,7 @@ the gssapi option, and need an explicit -lgss
elif test "$GSSAPI_ROOT" != "yes"; then
GSSAPI_INCS="-I$GSSAPI_ROOT/include"
fi
-@@ -21310,7 +21315,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd
+@@ -21347,7 +21352,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd
LIBS="-lgss $LIBS"
;;
*)
diff --git a/www/curl/patches/patch-lib_multi.c b/www/curl/patches/patch-lib_multi.c
deleted file mode 100644
index 8ac73899785..00000000000
--- a/www/curl/patches/patch-lib_multi.c
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-lib_multi.c,v 1.3 2015/08/08 02:44:16 spz Exp $
-
-part of
-https://github.com/bagder/curl/commit/903b6e05565bf826b4194447864288642214b094
-fixing
-http://curl.haxx.se/mail/lib-2015-06/0122.html
-
---- lib/multi.c.orig 2015-06-15 21:14:25.000000000 +0000
-+++ lib/multi.c
-@@ -402,11 +402,6 @@ CURLMcode curl_multi_add_handle(CURLM *m
- /* Point to the multi's connection cache */
- data->state.conn_cache = &multi->conn_cache;
-
-- if(data->set.httpreq == HTTPREQ_PUT)
-- data->state.infilesize = data->set.filesize;
-- else
-- data->state.infilesize = data->set.postfieldsize;
--
- /* This adds the new entry at the 'end' of the doubly-linked circular
- list of SessionHandle structs to try and maintain a FIFO queue so
- the pipelined requests are in order. */
diff --git a/www/curl/patches/patch-lib_transfer.c b/www/curl/patches/patch-lib_transfer.c
deleted file mode 100644
index c99b0df5134..00000000000
--- a/www/curl/patches/patch-lib_transfer.c
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-lib_transfer.c,v 1.1 2015/08/08 02:44:16 spz Exp $
-
-part of
-https://github.com/bagder/curl/commit/903b6e05565bf826b4194447864288642214b094
-fixing
-http://curl.haxx.se/mail/lib-2015-06/0122.html
-
---- lib/transfer.c.orig 2015-06-14 21:31:01.000000000 +0000
-+++ lib/transfer.c
-@@ -1315,6 +1315,11 @@ CURLcode Curl_pretransfer(struct Session
- Curl_safefree(data->info.wouldredirect);
- data->info.wouldredirect = NULL;
-
-+ if(data->set.httpreq == HTTPREQ_PUT)
-+ data->state.infilesize = data->set.filesize;
-+ else
-+ data->state.infilesize = data->set.postfieldsize;
-+
- /* If there is a list of cookie files to read, do it now! */
- if(data->change.cookielist)
- Curl_cookie_loadfiles(data);
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-12 18:23:17 +0000