summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2021-09-19 00:13:58 +0000
committerEric Hameleers <alien@slackware.com>2021-09-19 08:59:56 +0200
commitbcf11b40a875d66fb8c56b631d8065371f9338f7 (patch)
treecc25f472cfa893cd2f60703dc981a8c7760c4c8a /source
parentb7cf3882dab7767651bfff1579436222c9a5fe59 (diff)
downloadcurrent-bcf11b40a875d66fb8c56b631d8065371f9338f7.tar.gz
Sun Sep 19 00:13:58 UTC 202120210919001358
a/kernel-generic-5.14.6-x86_64-1.txz: Upgraded. a/kernel-huge-5.14.6-x86_64-1.txz: Upgraded. a/kernel-modules-5.14.6-x86_64-1.txz: Upgraded. ap/mpg123-1.29.0-x86_64-2.txz: Rebuilt. Add ../lib64/mpg123 to the module search path. Thanks to Pithium. d/kernel-headers-5.14.6-x86-1.txz: Upgraded. k/kernel-source-5.14.6-noarch-1.txz: Upgraded. PINCTRL_CANNONLAKE n -> m Thanks to bassmadrigal. kde/kstars-3.5.5-x86_64-1.txz: Upgraded. l/libcap-2.58-x86_64-1.txz: Upgraded. n/bind-9.16.21-x86_64-2.txz: Rebuilt. rc.bind: make sure /etc/rndc.key has correct ownership. Thanks to marav. xfce/thunar-4.16.10-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source')
-rwxr-xr-xsource/ap/mpg123/mpg123.SlackBuild8
-rw-r--r--source/ap/mpg123/mpg123.lib64.diff12
-rw-r--r--source/k/kernel-configs/config-generic-5.14.6 (renamed from source/k/kernel-configs/config-generic-5.14.5)4
-rw-r--r--source/k/kernel-configs/config-generic-5.14.6.x64 (renamed from source/k/kernel-configs/config-generic-5.14.5.x64)4
-rw-r--r--source/k/kernel-configs/config-generic-smp-5.14.6-smp (renamed from source/k/kernel-configs/config-generic-smp-5.14.5-smp)4
-rw-r--r--source/k/kernel-configs/config-huge-5.14.6 (renamed from source/k/kernel-configs/config-huge-5.14.5)4
-rw-r--r--source/k/kernel-configs/config-huge-5.14.6.x64 (renamed from source/k/kernel-configs/config-huge-5.14.5.x64)4
-rw-r--r--source/k/kernel-configs/config-huge-smp-5.14.6-smp (renamed from source/k/kernel-configs/config-huge-smp-5.14.5-smp)4
-rw-r--r--source/kde/kde/patch/kstars.patch4
-rwxr-xr-xsource/n/bind/bind.SlackBuild2
-rw-r--r--source/n/bind/rc.bind4
-rw-r--r--source/xfce/thunar/thunar.url2
12 files changed, 36 insertions, 20 deletions
diff --git a/source/ap/mpg123/mpg123.SlackBuild b/source/ap/mpg123/mpg123.SlackBuild
index 8111ee5f..5cca00ab 100755
--- a/source/ap/mpg123/mpg123.SlackBuild
+++ b/source/ap/mpg123/mpg123.SlackBuild
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2006-2018 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006-2021 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=mpg123
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -111,6 +111,10 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
+# Search for modules in lib64 first, then lib. This should work on pure 64-bit,
+# pure 32-bit, and multilib.
+zcat $CWD/mpg123.lib64.diff.gz | patch -p1 --verbose || exit 1
+
# Configure:
CFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/source/ap/mpg123/mpg123.lib64.diff b/source/ap/mpg123/mpg123.lib64.diff
new file mode 100644
index 00000000..e86ec24e
--- /dev/null
+++ b/source/ap/mpg123/mpg123.lib64.diff
@@ -0,0 +1,12 @@
+--- ./src/libout123/module.c.orig 2021-09-05 17:31:03.000000000 -0500
++++ ./src/libout123/module.c 2021-09-18 14:46:42.800526245 -0500
+@@ -29,7 +29,8 @@
+ to wide and then replace / by \. No need to define another list. */
+ static const char* modulesearch[] =
+ {
+- "../lib/mpg123"
++ "../lib64/mpg123"
++ ,"../lib/mpg123"
+ ,"plugins"
+ ,"libout123/modules/.libs"
+ ,"libout123/modules"
diff --git a/source/k/kernel-configs/config-generic-5.14.5 b/source/k/kernel-configs/config-generic-5.14.6
index b488b803..e410af3e 100644
--- a/source/k/kernel-configs/config-generic-5.14.5
+++ b/source/k/kernel-configs/config-generic-5.14.6
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.14.5 Kernel Configuration
+# Linux/x86 5.14.6 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y
@@ -4504,7 +4504,7 @@ CONFIG_PINCTRL_LYNXPOINT=m
CONFIG_PINCTRL_INTEL=y
CONFIG_PINCTRL_ALDERLAKE=m
CONFIG_PINCTRL_BROXTON=m
-# CONFIG_PINCTRL_CANNONLAKE is not set
+CONFIG_PINCTRL_CANNONLAKE=m
CONFIG_PINCTRL_CEDARFORK=m
CONFIG_PINCTRL_DENVERTON=m
CONFIG_PINCTRL_ELKHARTLAKE=m
diff --git a/source/k/kernel-configs/config-generic-5.14.5.x64 b/source/k/kernel-configs/config-generic-5.14.6.x64
index e1613e89..d4c2ab54 100644
--- a/source/k/kernel-configs/config-generic-5.14.5.x64
+++ b/source/k/kernel-configs/config-generic-5.14.6.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.14.5 Kernel Configuration
+# Linux/x86 5.14.6 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y
@@ -4528,7 +4528,7 @@ CONFIG_PINCTRL_LYNXPOINT=m
CONFIG_PINCTRL_INTEL=y
CONFIG_PINCTRL_ALDERLAKE=m
CONFIG_PINCTRL_BROXTON=m
-# CONFIG_PINCTRL_CANNONLAKE is not set
+CONFIG_PINCTRL_CANNONLAKE=m
CONFIG_PINCTRL_CEDARFORK=m
CONFIG_PINCTRL_DENVERTON=m
CONFIG_PINCTRL_ELKHARTLAKE=m
diff --git a/source/k/kernel-configs/config-generic-smp-5.14.5-smp b/source/k/kernel-configs/config-generic-smp-5.14.6-smp
index 611c6cf9..f7b647b3 100644
--- a/source/k/kernel-configs/config-generic-smp-5.14.5-smp
+++ b/source/k/kernel-configs/config-generic-smp-5.14.6-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.14.5 Kernel Configuration
+# Linux/x86 5.14.6 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y
@@ -4554,7 +4554,7 @@ CONFIG_PINCTRL_LYNXPOINT=m
CONFIG_PINCTRL_INTEL=y
CONFIG_PINCTRL_ALDERLAKE=m
CONFIG_PINCTRL_BROXTON=m
-# CONFIG_PINCTRL_CANNONLAKE is not set
+CONFIG_PINCTRL_CANNONLAKE=m
CONFIG_PINCTRL_CEDARFORK=m
CONFIG_PINCTRL_DENVERTON=m
CONFIG_PINCTRL_ELKHARTLAKE=m
diff --git a/source/k/kernel-configs/config-huge-5.14.5 b/source/k/kernel-configs/config-huge-5.14.6
index cece1358..2deb6e65 100644
--- a/source/k/kernel-configs/config-huge-5.14.5
+++ b/source/k/kernel-configs/config-huge-5.14.6
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.14.5 Kernel Configuration
+# Linux/x86 5.14.6 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y
@@ -4504,7 +4504,7 @@ CONFIG_PINCTRL_LYNXPOINT=m
CONFIG_PINCTRL_INTEL=y
CONFIG_PINCTRL_ALDERLAKE=m
CONFIG_PINCTRL_BROXTON=m
-# CONFIG_PINCTRL_CANNONLAKE is not set
+CONFIG_PINCTRL_CANNONLAKE=m
CONFIG_PINCTRL_CEDARFORK=m
CONFIG_PINCTRL_DENVERTON=m
CONFIG_PINCTRL_ELKHARTLAKE=m
diff --git a/source/k/kernel-configs/config-huge-5.14.5.x64 b/source/k/kernel-configs/config-huge-5.14.6.x64
index 52799353..2e1d7e7a 100644
--- a/source/k/kernel-configs/config-huge-5.14.5.x64
+++ b/source/k/kernel-configs/config-huge-5.14.6.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.14.5 Kernel Configuration
+# Linux/x86 5.14.6 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y
@@ -4528,7 +4528,7 @@ CONFIG_PINCTRL_LYNXPOINT=m
CONFIG_PINCTRL_INTEL=y
CONFIG_PINCTRL_ALDERLAKE=m
CONFIG_PINCTRL_BROXTON=m
-# CONFIG_PINCTRL_CANNONLAKE is not set
+CONFIG_PINCTRL_CANNONLAKE=m
CONFIG_PINCTRL_CEDARFORK=m
CONFIG_PINCTRL_DENVERTON=m
CONFIG_PINCTRL_ELKHARTLAKE=m
diff --git a/source/k/kernel-configs/config-huge-smp-5.14.5-smp b/source/k/kernel-configs/config-huge-smp-5.14.6-smp
index e09115ed..7a6801cc 100644
--- a/source/k/kernel-configs/config-huge-smp-5.14.5-smp
+++ b/source/k/kernel-configs/config-huge-smp-5.14.6-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.14.5 Kernel Configuration
+# Linux/x86 5.14.6 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y
@@ -4554,7 +4554,7 @@ CONFIG_PINCTRL_LYNXPOINT=m
CONFIG_PINCTRL_INTEL=y
CONFIG_PINCTRL_ALDERLAKE=m
CONFIG_PINCTRL_BROXTON=m
-# CONFIG_PINCTRL_CANNONLAKE is not set
+CONFIG_PINCTRL_CANNONLAKE=m
CONFIG_PINCTRL_CEDARFORK=m
CONFIG_PINCTRL_DENVERTON=m
CONFIG_PINCTRL_ELKHARTLAKE=m
diff --git a/source/kde/kde/patch/kstars.patch b/source/kde/kde/patch/kstars.patch
deleted file mode 100644
index bc1dec63..00000000
--- a/source/kde/kde/patch/kstars.patch
+++ /dev/null
@@ -1,4 +0,0 @@
-# Fix kstars-3.5.4 not building due to a docbook error:
-if [ "${MODULAR_PACKAGE_VERSION}" = "3.5.4" ]; then
- rm -f po/de/docs/kstars/index.docbook
-fi
diff --git a/source/n/bind/bind.SlackBuild b/source/n/bind/bind.SlackBuild
index 45dbf08e..7af3a204 100755
--- a/source/n/bind/bind.SlackBuild
+++ b/source/n/bind/bind.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=bind
VERSION=${VERSION:-$(echo ${PKGNAM}-[0-9]*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/n/bind/rc.bind b/source/n/bind/rc.bind
index 7886a254..4cc8f49c 100644
--- a/source/n/bind/rc.bind
+++ b/source/n/bind/rc.bind
@@ -44,6 +44,10 @@ bind_start() {
chown -R ${BIND_USER}:${BIND_GROUP} /var/run/named
# Make sure that /var/named has correct ownership:
chown -R ${BIND_USER}:${BIND_GROUP} /var/named
+ if [ -r /etc/rndc.key ]; then
+ # Make sure that /etc/rndc.key has correct ownership:
+ chown ${BIND_USER}:${BIND_GROUP} /etc/rndc.key
+ fi
# Start named:
if [ -x /usr/sbin/named ]; then
echo "Starting BIND: /usr/sbin/named $NAMED_OPTIONS"
diff --git a/source/xfce/thunar/thunar.url b/source/xfce/thunar/thunar.url
index 3ad5f38f..e5b3078b 100644
--- a/source/xfce/thunar/thunar.url
+++ b/source/xfce/thunar/thunar.url
@@ -1 +1 @@
-https://archive.xfce.org/src/xfce/thunar/4.16/thunar-4.16.9.tar.bz2
+https://archive.xfce.org/src/xfce/thunar/4.16/thunar-4.16.10.tar.bz2