summaryrefslogtreecommitdiff
path: root/source/n/curl
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2019-02-27 23:21:15 +0000
committerEric Hameleers <alien@slackware.com>2019-02-28 08:59:46 +0100
commit56b8c65632e9142589e8d7f83bf5c046af81822a (patch)
tree71a40ba7fe96196887fae9c966df53fd030e6613 /source/n/curl
parentaea2ef36ce7429426cea468334d292fe11ce1dd9 (diff)
downloadcurrent-56b8c65632e9142589e8d7f83bf5c046af81822a.tar.gz
Wed Feb 27 23:21:15 UTC 201920190227232115
a/aaa_terminfo-6.1_20190223-x86_64-1.txz: Upgraded. a/kernel-firmware-20190221_9ee52be-noarch-1.txz: Upgraded. a/kernel-generic-4.19.26-x86_64-1.txz: Upgraded. a/kernel-huge-4.19.26-x86_64-1.txz: Upgraded. a/kernel-modules-4.19.26-x86_64-1.txz: Upgraded. ap/vim-8.1.0984-x86_64-1.txz: Upgraded. d/kernel-headers-4.19.26-x86-1.txz: Upgraded. k/kernel-source-4.19.26-noarch-1.txz: Upgraded. l/ncurses-6.1_20190223-x86_64-1.txz: Upgraded. n/curl-7.64.0-x86_64-3.txz: Rebuilt. Applied upstream patch to fix log spam: [PATCH] multi: remove verbose "Expire in" ... messages Thanks to compassnet. n/postfix-3.3.3-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0984-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/n/curl')
-rwxr-xr-xsource/n/curl/curl.SlackBuild4
-rw-r--r--source/n/curl/curl.aabc7ae5ecf70973add429b5acbc86d6a57e4da5.patch27
2 files changed, 30 insertions, 1 deletions
diff --git a/source/n/curl/curl.SlackBuild b/source/n/curl/curl.SlackBuild
index 59fe9b38..e7a4e0a4 100755
--- a/source/n/curl/curl.SlackBuild
+++ b/source/n/curl/curl.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=curl
VERSION=${VERSION:-$(echo curl-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -80,6 +80,8 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+zcat $CWD/curl.aabc7ae5ecf70973add429b5acbc86d6a57e4da5.patch.gz | patch -p1 --verbose || exit 1
+
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
diff --git a/source/n/curl/curl.aabc7ae5ecf70973add429b5acbc86d6a57e4da5.patch b/source/n/curl/curl.aabc7ae5ecf70973add429b5acbc86d6a57e4da5.patch
new file mode 100644
index 00000000..27de3116
--- /dev/null
+++ b/source/n/curl/curl.aabc7ae5ecf70973add429b5acbc86d6a57e4da5.patch
@@ -0,0 +1,27 @@
+From aabc7ae5ecf70973add429b5acbc86d6a57e4da5 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel@haxx.se>
+Date: Mon, 11 Feb 2019 22:57:33 +0100
+Subject: [PATCH] multi: remove verbose "Expire in" ... messages
+
+Reported-by: James Brown
+Bug: https://curl.haxx.se/mail/archive-2019-02/0013.html
+Closes #3558
+---
+ lib/multi.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/lib/multi.c b/lib/multi.c
+index 6b891620f6..cd9d758ca4 100644
+--- a/lib/multi.c
++++ b/lib/multi.c
+@@ -3032,9 +3032,6 @@ void Curl_expire(struct Curl_easy *data, time_t milli, expire_id id)
+
+ DEBUGASSERT(id < EXPIRE_LAST);
+
+- infof(data, "Expire in %ld ms for %x (transfer %p)\n",
+- (long)milli, id, data);
+-
+ set = Curl_now();
+ set.tv_sec += milli/1000;
+ set.tv_usec += (unsigned int)(milli%1000)*1000;
+