summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2024-04-17 20:35:48 +0000
committer Eric Hameleers <alien@slackware.com>2024-04-17 23:41:21 +0200
commit2953aca3b1196570be74701d97c90c8c0b6b0d51 (patch)
treef84a47b25feade82fe455fe607531a3a7c0aec35 /source
parent0172ca92cda072648ac2b648be4e3ed0c671b6ab (diff)
downloadcurrent-2953aca3b1196570be74701d97c90c8c0b6b0d51.tar.gz
current-2953aca3b1196570be74701d97c90c8c0b6b0d51.tar.xz
Wed Apr 17 20:35:48 UTC 202420240417203548
a/kernel-firmware-20240417_e678699-noarch-1.txz: Upgraded. a/kernel-generic-6.6.28-x86_64-1.txz: Upgraded. a/kernel-huge-6.6.28-x86_64-1.txz: Upgraded. a/kernel-modules-6.6.28-x86_64-1.txz: Upgraded. a/xfsprogs-6.7.0-x86_64-1.txz: Upgraded. d/kernel-headers-6.6.28-x86-1.txz: Upgraded. k/kernel-source-6.6.28-noarch-1.txz: Upgraded. l/pycups-2.0.3-x86_64-1.txz: Upgraded. l/python-sphinx-7.3.5-x86_64-1.txz: Upgraded. n/bluez-5.75-x86_64-2.txz: Rebuilt. Prune duplicate config files. Thanks to audriusk. x/libXmu-1.2.1-x86_64-1.txz: Upgraded. x/util-macros-1.20.1-noarch-1.txz: Upgraded. x/wayland-protocols-1.35-noarch-1.txz: Upgraded. xap/mozilla-thunderbird-115.10.0-x86_64-1.txz: Upgraded. This release contains security fixes and improvements. For more information, see: https://www.mozilla.org/en-US/thunderbird/115.10.0/releasenotes/ https://www.mozilla.org/en-US/security/known-vulnerabilities/thunderbird/#thunderbird115.10 (* Security fix *) xfce/xfce4-notifyd-0.9.4-x86_64-2.txz: Rebuilt. Do not install DBus service files, as these cause xfce4-notifyd to start in plasma sessions. Thanks to ctrlaltca. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source')
-rw-r--r--source/k/kernel-configs/config-generic-6.6.28 (renamed from source/k/kernel-configs/config-generic-6.6.27)6
-rw-r--r--source/k/kernel-configs/config-generic-6.6.28.x64 (renamed from source/k/kernel-configs/config-generic-6.6.27.x64)6
-rw-r--r--source/k/kernel-configs/config-huge-6.6.28 (renamed from source/k/kernel-configs/config-huge-6.6.27)6
-rw-r--r--source/k/kernel-configs/config-huge-6.6.28.x64 (renamed from source/k/kernel-configs/config-huge-6.6.27.x64)6
-rwxr-xr-xsource/l/pycups/pycups.SlackBuild12
-rw-r--r--source/l/pycups/pycups.no.bogus.requires.diff30
-rwxr-xr-xsource/l/python-sphinx/python-sphinx.SlackBuild2
-rwxr-xr-xsource/n/bluez/bluez.SlackBuild15
-rw-r--r--source/n/bluez/config/uart.conf6
-rw-r--r--source/n/bluez/doinst.sh1
-rw-r--r--source/x/wayland-protocols/wayland-protocols.url2
-rwxr-xr-xsource/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild5
12 files changed, 58 insertions, 39 deletions
diff --git a/source/k/kernel-configs/config-generic-6.6.27 b/source/k/kernel-configs/config-generic-6.6.28
index b84648a1a..f69eba48d 100644
--- a/source/k/kernel-configs/config-generic-6.6.27
+++ b/source/k/kernel-configs/config-generic-6.6.28
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.6.27 Kernel Configuration
+# Linux/x86 6.6.28 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
@@ -530,9 +530,7 @@ CONFIG_RETPOLINE=y
CONFIG_RETHUNK=y
# CONFIG_GDS_FORCE_MITIGATION is not set
CONFIG_MITIGATION_RFDS=y
-CONFIG_SPECTRE_BHI_ON=y
-# CONFIG_SPECTRE_BHI_OFF is not set
-# CONFIG_SPECTRE_BHI_AUTO is not set
+CONFIG_MITIGATION_SPECTRE_BHI=y
#
# Power management and ACPI options
diff --git a/source/k/kernel-configs/config-generic-6.6.27.x64 b/source/k/kernel-configs/config-generic-6.6.28.x64
index 69043553a..662221fc8 100644
--- a/source/k/kernel-configs/config-generic-6.6.27.x64
+++ b/source/k/kernel-configs/config-generic-6.6.28.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.6.27 Kernel Configuration
+# Linux/x86 6.6.28 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
@@ -546,9 +546,7 @@ CONFIG_CPU_SRSO=y
CONFIG_SLS=y
# CONFIG_GDS_FORCE_MITIGATION is not set
CONFIG_MITIGATION_RFDS=y
-CONFIG_SPECTRE_BHI_ON=y
-# CONFIG_SPECTRE_BHI_OFF is not set
-# CONFIG_SPECTRE_BHI_AUTO is not set
+CONFIG_MITIGATION_SPECTRE_BHI=y
CONFIG_ARCH_HAS_ADD_PAGES=y
#
diff --git a/source/k/kernel-configs/config-huge-6.6.27 b/source/k/kernel-configs/config-huge-6.6.28
index 8a6fbe595..3395d7939 100644
--- a/source/k/kernel-configs/config-huge-6.6.27
+++ b/source/k/kernel-configs/config-huge-6.6.28
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.6.27 Kernel Configuration
+# Linux/x86 6.6.28 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
@@ -530,9 +530,7 @@ CONFIG_RETPOLINE=y
CONFIG_RETHUNK=y
# CONFIG_GDS_FORCE_MITIGATION is not set
CONFIG_MITIGATION_RFDS=y
-CONFIG_SPECTRE_BHI_ON=y
-# CONFIG_SPECTRE_BHI_OFF is not set
-# CONFIG_SPECTRE_BHI_AUTO is not set
+CONFIG_MITIGATION_SPECTRE_BHI=y
#
# Power management and ACPI options
diff --git a/source/k/kernel-configs/config-huge-6.6.27.x64 b/source/k/kernel-configs/config-huge-6.6.28.x64
index 55fa3760d..2aff09def 100644
--- a/source/k/kernel-configs/config-huge-6.6.27.x64
+++ b/source/k/kernel-configs/config-huge-6.6.28.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.6.27 Kernel Configuration
+# Linux/x86 6.6.28 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
@@ -546,9 +546,7 @@ CONFIG_CPU_SRSO=y
CONFIG_SLS=y
# CONFIG_GDS_FORCE_MITIGATION is not set
CONFIG_MITIGATION_RFDS=y
-CONFIG_SPECTRE_BHI_ON=y
-# CONFIG_SPECTRE_BHI_OFF is not set
-# CONFIG_SPECTRE_BHI_AUTO is not set
+CONFIG_MITIGATION_SPECTRE_BHI=y
CONFIG_ARCH_HAS_ADD_PAGES=y
#
diff --git a/source/l/pycups/pycups.SlackBuild b/source/l/pycups/pycups.SlackBuild
index 125b3902c..4b35c4e8d 100755
--- a/source/l/pycups/pycups.SlackBuild
+++ b/source/l/pycups/pycups.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/bash
# Copyright 2008 Heinz Wiesinger, Oggau, AT
-# Copyright 2008, 2009, 2010, 2018 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2018, 2024 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=pycups
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-7}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -65,8 +65,11 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-python3 setup.py install --root=$PKG || exit 1
-make install-rpmhook DESTDIR=$PKG || exit 1
+# Requiring gcc and python3-devel in these files must be a mistake:
+cat $CWD/pycups.no.bogus.requires.diff | patch -p1 --verbose || exit 1
+
+make || exit 1
+make install DESTDIR=$PKG || exit 1
find $PKG | xargs file | grep -e "shared object" -e "executable" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -87,4 +90,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/l/pycups/pycups.no.bogus.requires.diff b/source/l/pycups/pycups.no.bogus.requires.diff
new file mode 100644
index 000000000..0b33fc8e7
--- /dev/null
+++ b/source/l/pycups/pycups.no.bogus.requires.diff
@@ -0,0 +1,30 @@
+--- ./pycups.egg-info/requires.txt.orig 2024-04-17 09:28:43.000000000 -0500
++++ ./pycups.egg-info/requires.txt 2024-04-17 15:29:21.533926348 -0500
+@@ -1,2 +1 @@
+-gcc
+-python3-devel
++
+--- ./setup.py.orig 2024-04-17 09:27:05.000000000 -0500
++++ ./setup.py 2024-04-17 15:29:36.532925519 -0500
+@@ -61,10 +61,6 @@
+ "Programming Language :: Python :: 3",
+ ],
+ license="GPLv2+",
+- install_requires=[
+- 'gcc',
+- 'python3-devel',
+- ],
+ ext_modules=[Extension("cups",
+ ["cupsmodule.c", "cupsconnection.c",
+ "cupsppd.c", "cupsipp.c"],
+--- ./PKG-INFO.orig 2024-04-17 09:28:43.393506800 -0500
++++ ./PKG-INFO 2024-04-17 15:29:05.376927242 -0500
+@@ -16,8 +16,6 @@
+ Classifier: Programming Language :: Python
+ Classifier: Programming Language :: Python :: 3
+ License-File: COPYING
+-Requires-Dist: gcc
+-Requires-Dist: python3-devel
+
+ This is a set of Python bindings for the libcups library from the
+ CUPS project.
diff --git a/source/l/python-sphinx/python-sphinx.SlackBuild b/source/l/python-sphinx/python-sphinx.SlackBuild
index c55f7aca1..9a9ffd296 100755
--- a/source/l/python-sphinx/python-sphinx.SlackBuild
+++ b/source/l/python-sphinx/python-sphinx.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=python-sphinx
SRCNAM=sphinx
VERSION=${VERSION:-$(echo ${SRCNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
diff --git a/source/n/bluez/bluez.SlackBuild b/source/n/bluez/bluez.SlackBuild
index 069f952d6..08de3c809 100755
--- a/source/n/bluez/bluez.SlackBuild
+++ b/source/n/bluez/bluez.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=bluez
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) "}
@@ -138,12 +138,8 @@ cp -a $CWD/config/org.bluez.obex.service $PKG/usr/share/dbus-1/services
chown root:root $PKG/usr/share/dbus-1/services/org.bluez.obex.service
chmod 644 $PKG/usr/share/dbus-1/services/org.bluez.obex.service
-# Install the configuration files
-mkdir -p $PKG/etc/bluetooth $PKG/etc/default
-cat src/main.conf > $PKG/etc/bluetooth/main.conf.new
-cat profiles/input/input.conf > $PKG/etc/bluetooth/input.conf.new
-cat profiles/network/network.conf > $PKG/etc/bluetooth/network.conf.new
-cat $CWD/config/uart.conf > $PKG/etc/bluetooth/uart.conf.new
+# Install default options config file:
+mkdir -p $PKG/etc/default
cat $CWD/config/defaultconfig > $PKG/etc/default/bluetooth.new
# Add an init script
@@ -154,6 +150,11 @@ cat $CWD/config/rc.bluetooth > $PKG/etc/rc.d/rc.bluetooth.new
# script is not executable:
chmod 755 $PKG/etc/rc.d/rc.bluetooth.new
+# Make the other config files .new:
+for config in input.conf main.conf network.conf ; do
+ mv $PKG/etc/bluetooth/${config} $PKG/etc/bluetooth/${config}.new
+done
+
# If the deprecated utility gatttool was built, go ahead and install it:
if [ -x attrib/gatttool ]; then
cp attrib/gatttool $PKG/usr/bin
diff --git a/source/n/bluez/config/uart.conf b/source/n/bluez/config/uart.conf
deleted file mode 100644
index b2e276f4e..000000000
--- a/source/n/bluez/config/uart.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# /etc/bluetooth/uart.conf
-
-# Attach serial devices via UART HCI to BlueZ stack
-# Use one line per device
-# See the hciattach man page for options
-
diff --git a/source/n/bluez/doinst.sh b/source/n/bluez/doinst.sh
index 796630fd2..bd2e052b0 100644
--- a/source/n/bluez/doinst.sh
+++ b/source/n/bluez/doinst.sh
@@ -21,6 +21,5 @@ config etc/rc.d/rc.bluetooth.new
config etc/bluetooth/input.conf.new
config etc/bluetooth/main.conf.new
config etc/bluetooth/network.conf.new
-config etc/bluetooth/uart.conf.new
config etc/default/bluetooth.new
diff --git a/source/x/wayland-protocols/wayland-protocols.url b/source/x/wayland-protocols/wayland-protocols.url
index cc8a6cfb3..20fce0aba 100644
--- a/source/x/wayland-protocols/wayland-protocols.url
+++ b/source/x/wayland-protocols/wayland-protocols.url
@@ -1,2 +1,2 @@
https://wayland.freedesktop.org/releases.html
-https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/1.34/downloads/wayland-protocols-1.34.tar.xz
+https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/1.35/downloads/wayland-protocols-1.35.tar.xz
diff --git a/source/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild b/source/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild
index df8dda2d8..32312381a 100755
--- a/source/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild
+++ b/source/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild
@@ -3,7 +3,7 @@
# Slackware build script for Xfce4-notifyd
# Copyright 2008 Frank Caraballo <fecaraballo{at}gmail{dot}com>
-# Copyright 2010, 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2010, 2018, 2020, 2024 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=xfce4-notifyd
VERSION=${VERSION:-$(echo $PKGNAM-*.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
@@ -87,6 +87,7 @@ CFLAGS="$SLKCFLAGS" \
--localstatedir=/var \
--mandir=/usr/man \
--enable-debug=no \
+ --disable-dbus-start-daemon \
--build=$ARCH-slackware-linux || exit 1
make $NUMJOBS || make || exit 1