summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2019-01-09 22:44:36 +0000
committerEric Hameleers <alien@slackware.com>2019-01-10 08:59:42 +0100
commit01b2250a14e3a3bd513ce6f57bc995d19efe26e1 (patch)
tree73784978ed4f23b67abb5ccee87e97f3f85d4f62 /source
parent1e8ea1d7ed43fc66a7452dfa0557f42aa3916aea (diff)
downloadcurrent-01b2250a14e3a3bd513ce6f57bc995d19efe26e1.tar.gz
Wed Jan 9 22:44:36 UTC 201920190109224436
a/kernel-generic-4.19.14-x86_64-1.txz: Upgraded. a/kernel-huge-4.19.14-x86_64-1.txz: Upgraded. a/kernel-modules-4.19.14-x86_64-1.txz: Upgraded. a/sysvinit-2.93-x86_64-2.txz: Rebuilt. Patched to fix version number display. a/util-linux-2.33.1-x86_64-1.txz: Upgraded. d/kernel-headers-4.19.14-x86-1.txz: Upgraded. k/kernel-source-4.19.14-noarch-1.txz: Upgraded. l/alsa-plugins-1.1.8-x86_64-2.txz: Rebuilt. Remove symlink that breaks audio output. extra/pure-alsa-system/alsa-plugins-1.1.8-x86_64-2_alsa.txz: Rebuilt. Remove symlink that breaks audio output. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source')
-rwxr-xr-xsource/a/sysvinit/sysvinit.SlackBuild5
-rw-r--r--source/a/sysvinit/sysvinit.version.2.93.diff17
-rwxr-xr-xsource/a/util-linux/util-linux.SlackBuild2
-rw-r--r--source/k/kernel-configs/config-generic-4.19.14 (renamed from source/k/kernel-configs/config-generic-4.19.13)4
-rw-r--r--source/k/kernel-configs/config-generic-4.19.14.x64 (renamed from source/k/kernel-configs/config-generic-4.19.13.x64)4
-rw-r--r--source/k/kernel-configs/config-generic-smp-4.19.14-smp (renamed from source/k/kernel-configs/config-generic-smp-4.19.13-smp)4
-rw-r--r--source/k/kernel-configs/config-huge-4.19.14 (renamed from source/k/kernel-configs/config-huge-4.19.13)4
-rw-r--r--source/k/kernel-configs/config-huge-4.19.14.x64 (renamed from source/k/kernel-configs/config-huge-4.19.13.x64)4
-rw-r--r--source/k/kernel-configs/config-huge-smp-4.19.14-smp (renamed from source/k/kernel-configs/config-huge-smp-4.19.13-smp)4
-rwxr-xr-xsource/l/alsa-plugins/alsa-plugins.SlackBuild8
10 files changed, 37 insertions, 19 deletions
diff --git a/source/a/sysvinit/sysvinit.SlackBuild b/source/a/sysvinit/sysvinit.SlackBuild
index 6cfe01e9..457307e1 100755
--- a/source/a/sysvinit/sysvinit.SlackBuild
+++ b/source/a/sysvinit/sysvinit.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=sysvinit
VERSION=${VERSION:-2.93}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -65,6 +65,9 @@ find . \
# Fix paths for /etc/forcefsck and /etc/fastboot:
zcat $CWD/sysvinit.paths.diff.gz | patch -p1 -E --verbose --backup --suffix=.orig || exit 1
+# Fix failure to show program version:
+zcat $CWD/sysvinit.version.2.93.diff.gz | patch -p1 --verbose || exit 1
+
# Use /dev/initctl instead of /run/initctl ; this is a named pipe and probably
# should be in /dev anyway, but more importantly, having the upgraded package
# expect it in /run breaks shutdown/reboot without manual intervention:
diff --git a/source/a/sysvinit/sysvinit.version.2.93.diff b/source/a/sysvinit/sysvinit.version.2.93.diff
new file mode 100644
index 00000000..07b9b121
--- /dev/null
+++ b/source/a/sysvinit/sysvinit.version.2.93.diff
@@ -0,0 +1,17 @@
+--- ./src/init.c.orig 2018-11-24 10:38:12.000000000 -0600
++++ ./src/init.c 2019-01-08 23:56:31.143232075 -0600
+@@ -9,12 +9,8 @@
+ * Version: init.c 2.90 18-Jun-2018 jsmith@resonatingmedia.com
+ */
+
+-/*
+-Version information is not placed in the top-level Makefile by default
+-*/
+-#ifndef VERSION
+-#define VERSION "2.91"
+-#endif
++#define VERSION "2.93"
++
+ /*
+ * This file is part of the sysvinit suite,
+ * Copyright (C) 1991-2004 Miquel van Smoorenburg.
diff --git a/source/a/util-linux/util-linux.SlackBuild b/source/a/util-linux/util-linux.SlackBuild
index 0729a531..89ab3cac 100755
--- a/source/a/util-linux/util-linux.SlackBuild
+++ b/source/a/util-linux/util-linux.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=util-linux
VERSION=${VERSION:-$(echo util-linux*.tar.xz | cut -d - -f 3 | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
ADJTIMEXVERS=1.29
SETSERIALVERS=2.17
diff --git a/source/k/kernel-configs/config-generic-4.19.13 b/source/k/kernel-configs/config-generic-4.19.14
index 2e434186..0b9c6e2c 100644
--- a/source/k/kernel-configs/config-generic-4.19.13
+++ b/source/k/kernel-configs/config-generic-4.19.14
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.13 Kernel Configuration
+# Linux/x86 4.19.14 Kernel Configuration
#
#
@@ -6255,10 +6255,10 @@ CONFIG_TYPEC_MUX_PI3USB30532=m
# USB Type-C Alternate Mode drivers
#
CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_USB_ROLE_SWITCH=m
CONFIG_USB_ROLES_INTEL_XHCI=m
CONFIG_USB_LED_TRIG=y
CONFIG_USB_ULPI_BUS=m
-CONFIG_USB_ROLE_SWITCH=m
CONFIG_UWB=m
CONFIG_UWB_HWA=m
CONFIG_UWB_WHCI=m
diff --git a/source/k/kernel-configs/config-generic-4.19.13.x64 b/source/k/kernel-configs/config-generic-4.19.14.x64
index fea17769..a7c3f0cd 100644
--- a/source/k/kernel-configs/config-generic-4.19.13.x64
+++ b/source/k/kernel-configs/config-generic-4.19.14.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.13 Kernel Configuration
+# Linux/x86 4.19.14 Kernel Configuration
#
#
@@ -6178,10 +6178,10 @@ CONFIG_TYPEC_MUX_PI3USB30532=m
# USB Type-C Alternate Mode drivers
#
CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_USB_ROLE_SWITCH=m
CONFIG_USB_ROLES_INTEL_XHCI=m
CONFIG_USB_LED_TRIG=y
CONFIG_USB_ULPI_BUS=m
-CONFIG_USB_ROLE_SWITCH=m
CONFIG_UWB=m
CONFIG_UWB_HWA=m
CONFIG_UWB_WHCI=m
diff --git a/source/k/kernel-configs/config-generic-smp-4.19.13-smp b/source/k/kernel-configs/config-generic-smp-4.19.14-smp
index d0af4db1..6fae2297 100644
--- a/source/k/kernel-configs/config-generic-smp-4.19.13-smp
+++ b/source/k/kernel-configs/config-generic-smp-4.19.14-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.13 Kernel Configuration
+# Linux/x86 4.19.14 Kernel Configuration
#
#
@@ -6302,10 +6302,10 @@ CONFIG_TYPEC_MUX_PI3USB30532=m
# USB Type-C Alternate Mode drivers
#
CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_USB_ROLE_SWITCH=m
CONFIG_USB_ROLES_INTEL_XHCI=m
CONFIG_USB_LED_TRIG=y
CONFIG_USB_ULPI_BUS=m
-CONFIG_USB_ROLE_SWITCH=m
CONFIG_UWB=m
CONFIG_UWB_HWA=m
CONFIG_UWB_WHCI=m
diff --git a/source/k/kernel-configs/config-huge-4.19.13 b/source/k/kernel-configs/config-huge-4.19.14
index 47907ede..1dc4e425 100644
--- a/source/k/kernel-configs/config-huge-4.19.13
+++ b/source/k/kernel-configs/config-huge-4.19.14
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.13 Kernel Configuration
+# Linux/x86 4.19.14 Kernel Configuration
#
#
@@ -6255,10 +6255,10 @@ CONFIG_TYPEC_MUX_PI3USB30532=m
# USB Type-C Alternate Mode drivers
#
CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_USB_ROLE_SWITCH=m
CONFIG_USB_ROLES_INTEL_XHCI=m
CONFIG_USB_LED_TRIG=y
CONFIG_USB_ULPI_BUS=m
-CONFIG_USB_ROLE_SWITCH=m
CONFIG_UWB=m
CONFIG_UWB_HWA=m
CONFIG_UWB_WHCI=m
diff --git a/source/k/kernel-configs/config-huge-4.19.13.x64 b/source/k/kernel-configs/config-huge-4.19.14.x64
index 3f16e99a..c3ba1fc9 100644
--- a/source/k/kernel-configs/config-huge-4.19.13.x64
+++ b/source/k/kernel-configs/config-huge-4.19.14.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.13 Kernel Configuration
+# Linux/x86 4.19.14 Kernel Configuration
#
#
@@ -6178,10 +6178,10 @@ CONFIG_TYPEC_MUX_PI3USB30532=m
# USB Type-C Alternate Mode drivers
#
CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_USB_ROLE_SWITCH=m
CONFIG_USB_ROLES_INTEL_XHCI=m
CONFIG_USB_LED_TRIG=y
CONFIG_USB_ULPI_BUS=m
-CONFIG_USB_ROLE_SWITCH=m
CONFIG_UWB=m
CONFIG_UWB_HWA=m
CONFIG_UWB_WHCI=m
diff --git a/source/k/kernel-configs/config-huge-smp-4.19.13-smp b/source/k/kernel-configs/config-huge-smp-4.19.14-smp
index f85f9390..315d3ce2 100644
--- a/source/k/kernel-configs/config-huge-smp-4.19.13-smp
+++ b/source/k/kernel-configs/config-huge-smp-4.19.14-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.13 Kernel Configuration
+# Linux/x86 4.19.14 Kernel Configuration
#
#
@@ -6302,10 +6302,10 @@ CONFIG_TYPEC_MUX_PI3USB30532=m
# USB Type-C Alternate Mode drivers
#
CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_USB_ROLE_SWITCH=m
CONFIG_USB_ROLES_INTEL_XHCI=m
CONFIG_USB_LED_TRIG=y
CONFIG_USB_ULPI_BUS=m
-CONFIG_USB_ROLE_SWITCH=m
CONFIG_UWB=m
CONFIG_UWB_HWA=m
CONFIG_UWB_WHCI=m
diff --git a/source/l/alsa-plugins/alsa-plugins.SlackBuild b/source/l/alsa-plugins/alsa-plugins.SlackBuild
index 7fde7eb2..81d41f33 100755
--- a/source/l/alsa-plugins/alsa-plugins.SlackBuild
+++ b/source/l/alsa-plugins/alsa-plugins.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=alsa-plugins
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) "}
@@ -100,10 +100,8 @@ CXXFLAGS="$SLKCFLAGS -DHAVE_STDINT_H -DUSE_LIBSPEEX" \
make $NUMJOBS || make || exit 1
make install-strip DESTDIR=$PKG || exit 1
-if [ "$VERSION" = "1.1.7" ]; then
- # Remove symlink that's breaking audio:
- rm -f $PKG/etc/alsa/conf.d/98-maemo.conf
-fi
+# Remove symlink that's breaking audio:
+rm -f $PKG/etc/alsa/conf.d/98-maemo.conf
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
cp -a \