diff options
Diffstat (limited to 'source')
-rw-r--r-- | source/k/kernel-configs/config-generic-4.19.26 (renamed from source/k/kernel-configs/config-generic-4.19.25) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-generic-4.19.26.x64 (renamed from source/k/kernel-configs/config-generic-4.19.25.x64) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-generic-smp-4.19.26-smp (renamed from source/k/kernel-configs/config-generic-smp-4.19.25-smp) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-huge-4.19.26 (renamed from source/k/kernel-configs/config-huge-4.19.25) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-huge-4.19.26.x64 (renamed from source/k/kernel-configs/config-huge-4.19.25.x64) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-huge-smp-4.19.26-smp (renamed from source/k/kernel-configs/config-huge-smp-4.19.25-smp) | 2 | ||||
-rwxr-xr-x | source/n/curl/curl.SlackBuild | 4 | ||||
-rw-r--r-- | source/n/curl/curl.aabc7ae5ecf70973add429b5acbc86d6a57e4da5.patch | 27 |
8 files changed, 36 insertions, 7 deletions
diff --git a/source/k/kernel-configs/config-generic-4.19.25 b/source/k/kernel-configs/config-generic-4.19.26 index 3ae5d2a0..3b32ed00 100644 --- a/source/k/kernel-configs/config-generic-4.19.25 +++ b/source/k/kernel-configs/config-generic-4.19.26 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.25 Kernel Configuration +# Linux/x86 4.19.26 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-generic-4.19.25.x64 b/source/k/kernel-configs/config-generic-4.19.26.x64 index 79786211..f130425e 100644 --- a/source/k/kernel-configs/config-generic-4.19.25.x64 +++ b/source/k/kernel-configs/config-generic-4.19.26.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.25 Kernel Configuration +# Linux/x86 4.19.26 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-generic-smp-4.19.25-smp b/source/k/kernel-configs/config-generic-smp-4.19.26-smp index 52a77972..c92ae589 100644 --- a/source/k/kernel-configs/config-generic-smp-4.19.25-smp +++ b/source/k/kernel-configs/config-generic-smp-4.19.26-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.25 Kernel Configuration +# Linux/x86 4.19.26 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-4.19.25 b/source/k/kernel-configs/config-huge-4.19.26 index ad44bdb7..ab03639d 100644 --- a/source/k/kernel-configs/config-huge-4.19.25 +++ b/source/k/kernel-configs/config-huge-4.19.26 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.25 Kernel Configuration +# Linux/x86 4.19.26 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-4.19.25.x64 b/source/k/kernel-configs/config-huge-4.19.26.x64 index 7cbce11f..40f68f41 100644 --- a/source/k/kernel-configs/config-huge-4.19.25.x64 +++ b/source/k/kernel-configs/config-huge-4.19.26.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.25 Kernel Configuration +# Linux/x86 4.19.26 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-smp-4.19.25-smp b/source/k/kernel-configs/config-huge-smp-4.19.26-smp index 945273a7..378b31c6 100644 --- a/source/k/kernel-configs/config-huge-smp-4.19.25-smp +++ b/source/k/kernel-configs/config-huge-smp-4.19.26-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.25 Kernel Configuration +# Linux/x86 4.19.26 Kernel Configuration # # 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; + |