diff options
Diffstat (limited to 'source')
11 files changed, 65 insertions, 17 deletions
diff --git a/source/d/oprofile/oprofile.SlackBuild b/source/d/oprofile/oprofile.SlackBuild index a14ef8955..93d804c5f 100755 --- a/source/d/oprofile/oprofile.SlackBuild +++ b/source/d/oprofile/oprofile.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=oprofile VERSION=${VERSION:-$(echo oprofile-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} NUMJOBS=${NUMJOBS:-" -j7 "} diff --git a/source/k/kernel-configs/config-generic-4.14.55 b/source/k/kernel-configs/config-generic-4.14.56 index e362cae31..0cb7950e4 100644 --- a/source/k/kernel-configs/config-generic-4.14.55 +++ b/source/k/kernel-configs/config-generic-4.14.56 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.55 Kernel Configuration +# Linux/x86 4.14.56 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -7889,7 +7889,6 @@ CONFIG_CRYPTO_DES=y CONFIG_CRYPTO_FCRYPT=y CONFIG_CRYPTO_KHAZAD=y CONFIG_CRYPTO_SALSA20=m -CONFIG_CRYPTO_SALSA20_586=m CONFIG_CRYPTO_CHACHA20=m CONFIG_CRYPTO_SEED=y CONFIG_CRYPTO_SERPENT=y diff --git a/source/k/kernel-configs/config-generic-4.14.55.x64 b/source/k/kernel-configs/config-generic-4.14.56.x64 index c1121ed2b..e72cbe10d 100644 --- a/source/k/kernel-configs/config-generic-4.14.55.x64 +++ b/source/k/kernel-configs/config-generic-4.14.56.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.55 Kernel Configuration +# Linux/x86 4.14.56 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -7845,7 +7845,6 @@ CONFIG_CRYPTO_DES3_EDE_X86_64=m CONFIG_CRYPTO_FCRYPT=y CONFIG_CRYPTO_KHAZAD=y CONFIG_CRYPTO_SALSA20=m -CONFIG_CRYPTO_SALSA20_X86_64=m CONFIG_CRYPTO_CHACHA20=m CONFIG_CRYPTO_CHACHA20_X86_64=m CONFIG_CRYPTO_SEED=y diff --git a/source/k/kernel-configs/config-generic-smp-4.14.55-smp b/source/k/kernel-configs/config-generic-smp-4.14.56-smp index c25251d92..369e22d35 100644 --- a/source/k/kernel-configs/config-generic-smp-4.14.55-smp +++ b/source/k/kernel-configs/config-generic-smp-4.14.56-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.55 Kernel Configuration +# Linux/x86 4.14.56 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -7944,7 +7944,6 @@ CONFIG_CRYPTO_DES=y CONFIG_CRYPTO_FCRYPT=y CONFIG_CRYPTO_KHAZAD=y CONFIG_CRYPTO_SALSA20=m -CONFIG_CRYPTO_SALSA20_586=m CONFIG_CRYPTO_CHACHA20=m CONFIG_CRYPTO_SEED=y CONFIG_CRYPTO_SERPENT=y diff --git a/source/k/kernel-configs/config-huge-4.14.55 b/source/k/kernel-configs/config-huge-4.14.56 index e9143ec9d..40ef28fd8 100644 --- a/source/k/kernel-configs/config-huge-4.14.55 +++ b/source/k/kernel-configs/config-huge-4.14.56 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.55 Kernel Configuration +# Linux/x86 4.14.56 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -7889,7 +7889,6 @@ CONFIG_CRYPTO_DES=y CONFIG_CRYPTO_FCRYPT=y CONFIG_CRYPTO_KHAZAD=y CONFIG_CRYPTO_SALSA20=m -CONFIG_CRYPTO_SALSA20_586=m CONFIG_CRYPTO_CHACHA20=m CONFIG_CRYPTO_SEED=y CONFIG_CRYPTO_SERPENT=y diff --git a/source/k/kernel-configs/config-huge-4.14.55.x64 b/source/k/kernel-configs/config-huge-4.14.56.x64 index ac8140728..f1cc5c386 100644 --- a/source/k/kernel-configs/config-huge-4.14.55.x64 +++ b/source/k/kernel-configs/config-huge-4.14.56.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.55 Kernel Configuration +# Linux/x86 4.14.56 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -7845,7 +7845,6 @@ CONFIG_CRYPTO_DES3_EDE_X86_64=m CONFIG_CRYPTO_FCRYPT=y CONFIG_CRYPTO_KHAZAD=y CONFIG_CRYPTO_SALSA20=m -CONFIG_CRYPTO_SALSA20_X86_64=m CONFIG_CRYPTO_CHACHA20=m CONFIG_CRYPTO_CHACHA20_X86_64=m CONFIG_CRYPTO_SEED=y diff --git a/source/k/kernel-configs/config-huge-smp-4.14.55-smp b/source/k/kernel-configs/config-huge-smp-4.14.56-smp index 41c2e44b7..4781b3c6b 100644 --- a/source/k/kernel-configs/config-huge-smp-4.14.55-smp +++ b/source/k/kernel-configs/config-huge-smp-4.14.56-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.55 Kernel Configuration +# Linux/x86 4.14.56 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -7944,7 +7944,6 @@ CONFIG_CRYPTO_DES=y CONFIG_CRYPTO_FCRYPT=y CONFIG_CRYPTO_KHAZAD=y CONFIG_CRYPTO_SALSA20=m -CONFIG_CRYPTO_SALSA20_586=m CONFIG_CRYPTO_CHACHA20=m CONFIG_CRYPTO_SEED=y CONFIG_CRYPTO_SERPENT=y diff --git a/source/n/NetworkManager/NetworkManager.SlackBuild b/source/n/NetworkManager/NetworkManager.SlackBuild index fdfe6ef31..b50b603ac 100755 --- a/source/n/NetworkManager/NetworkManager.SlackBuild +++ b/source/n/NetworkManager/NetworkManager.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=NetworkManager VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) diff --git a/source/n/NetworkManager/patches/NM-1.12.0-e205664ba8c25939f1678d1b078a67989c180046.patch b/source/n/NetworkManager/patches/NM-1.12.0-e205664ba8c25939f1678d1b078a67989c180046.patch new file mode 100644 index 000000000..3c17434b7 --- /dev/null +++ b/source/n/NetworkManager/patches/NM-1.12.0-e205664ba8c25939f1678d1b078a67989c180046.patch @@ -0,0 +1,54 @@ +From e205664ba8c25939f1678d1b078a67989c180046 Mon Sep 17 00:00:00 2001 +From: Beniamino Galvani <bgalvani@redhat.com> +Date: Fri, 6 Jul 2018 15:54:16 +0200 +Subject: [PATCH] manager: accept non-null device for VPN activations + +Commit 10753c36168a ("manager: merge VPN handling into +_new_active_connection()") added a check to fail the activation of +VPNs when a device is passed to ActivateConnection(), since the device +argument is ignored for VPNs. + +This broke activating VPNs from nm-applet as nm-applet sets both the +specific_object (parent-connection) and device arguments in the +activation request. + +Note that we already check in _new_active_connection() that when a +device is supplied, it matches the device of the parent +connection. Therefore, the check can be dropped. + +Reported-by: Michael Biebl <biebl@debian.org> +Fixes: 10753c36168a82cd658df8a7da800960fddd78ed + +https://github.com/NetworkManager/NetworkManager/pull/159 +--- + src/nm-manager.c | 16 +--------------- + 1 file changed, 1 insertion(+), 15 deletions(-) + +diff --git a/src/nm-manager.c b/src/nm-manager.c +index 67c71fea91..4c4b6bb5a9 100644 +--- a/src/nm-manager.c ++++ b/src/nm-manager.c +@@ -4611,21 +4611,7 @@ validate_activation_request (NMManager *self, + } + } + +- if (is_vpn && device) { +- /* VPN's are treated specially. Maybe the should accept a device as well, +- * however, later on during activation, we don't handle the device. +- * +- * Maybe we should, and maybe it makes sense to specify a device +- * when activating a VPN. But for now, just error out. */ +- g_set_error_literal (error, +- NM_MANAGER_ERROR, +- NM_MANAGER_ERROR_UNKNOWN_DEVICE, +- "Cannot specify device when activating VPN"); +- return NULL; +- } +- +- nm_assert ( ( is_vpn && !device) +- || (!is_vpn && NM_IS_DEVICE (device))); ++ nm_assert (is_vpn || NM_IS_DEVICE (device)); + + *out_device = device; + *out_is_vpn = is_vpn; + diff --git a/source/n/httpd/httpd.SlackBuild b/source/n/httpd/httpd.SlackBuild index a78468e3e..63424fba9 100755 --- a/source/n/httpd/httpd.SlackBuild +++ b/source/n/httpd/httpd.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=httpd VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/httpd/httpd.url b/source/n/httpd/httpd.url index ae8104145..152982ae4 100644 --- a/source/n/httpd/httpd.url +++ b/source/n/httpd/httpd.url @@ -1,2 +1,2 @@ -http://www.apache.org/dist/httpd/httpd-2.4.33.tar.bz2 -http://www.apache.org/dist/httpd/httpd-2.4.33.tar.bz2.asc +http://www.apache.org/dist/httpd/httpd-2.4.34.tar.bz2 +http://www.apache.org/dist/httpd/httpd-2.4.34.tar.bz2.asc |