diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2023-07-05 21:02:14 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2023-07-05 23:35:07 +0200 |
commit | 3c177122b7f7e4145b048cc16a7980d8b7e50452 (patch) | |
tree | 8278455845d068d52f4b89d01bf0934fd6925073 /source/a | |
parent | d877915983f4d4d711abde89feb431691d43f5b2 (diff) | |
download | current-3c177122b7f7e4145b048cc16a7980d8b7e50452.tar.gz current-3c177122b7f7e4145b048cc16a7980d8b7e50452.tar.xz |
Wed Jul 5 21:02:14 UTC 202320230705210214
a/kernel-generic-6.1.38-x86_64-1.txz: Upgraded.
a/kernel-huge-6.1.38-x86_64-1.txz: Upgraded.
a/kernel-modules-6.1.38-x86_64-1.txz: Upgraded.
a/upower-1.90.1-x86_64-1.txz: Upgraded.
a/util-linux-2.39.1-x86_64-3.txz: Rebuilt.
Use --disable-libmount-mountfd-support for now to avoid breaking overlayfs.
d/kernel-headers-6.1.38-x86-1.txz: Upgraded.
k/kernel-source-6.1.38-noarch-1.txz: Upgraded.
l/nodejs-20.4.0-x86_64-1.txz: Upgraded.
n/samba-4.18.4-x86_64-1.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/a')
-rw-r--r-- | source/a/upower/81a89385a45d3de1028bcd86b3688fb465b4035c.patch | 43 | ||||
-rwxr-xr-x | source/a/upower/upower.SlackBuild | 5 | ||||
-rwxr-xr-x | source/a/util-linux/util-linux.SlackBuild | 3 |
3 files changed, 3 insertions, 48 deletions
diff --git a/source/a/upower/81a89385a45d3de1028bcd86b3688fb465b4035c.patch b/source/a/upower/81a89385a45d3de1028bcd86b3688fb465b4035c.patch deleted file mode 100644 index ff80079ea..000000000 --- a/source/a/upower/81a89385a45d3de1028bcd86b3688fb465b4035c.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 81a89385a45d3de1028bcd86b3688fb465b4035c Mon Sep 17 00:00:00 2001 -From: "Maciej S. Szmigiero" <mail@maciej.szmigiero.name> -Date: Fri, 21 Oct 2022 00:14:18 +0200 -Subject: [PATCH] enumerator-udev: actually check for an idevice - -up-enumerator-udev.c forgot to include the build config file, resulting in -HAVE_IDEVICE macro always being undefined. - -This meant that the idevice backend was never actually instantiated - as -evidenced by the file not even compiling when this was fixed, due to -missing "up-device-idevice.h" include. - -Fix both of these issues. ---- - src/linux/up-enumerator-udev.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/linux/up-enumerator-udev.c b/src/linux/up-enumerator-udev.c -index 9e52d153..1182bdfd 100644 ---- a/src/linux/up-enumerator-udev.c -+++ b/src/linux/up-enumerator-udev.c -@@ -18,6 +18,8 @@ - * - */ - -+#include "config.h" -+ - #include <string.h> - - #include <gudev/gudev.h> -@@ -29,6 +31,9 @@ - #include "up-device-supply-battery.h" - #include "up-device-hid.h" - #include "up-device-wup.h" -+#ifdef HAVE_IDEVICE -+#include "up-device-idevice.h" -+#endif /* HAVE_IDEVICE */ - - struct _UpEnumeratorUdev { - UpEnumerator parent; --- -GitLab - diff --git a/source/a/upower/upower.SlackBuild b/source/a/upower/upower.SlackBuild index ba6b2bdb7..a3a9a8a21 100755 --- a/source/a/upower/upower.SlackBuild +++ b/source/a/upower/upower.SlackBuild @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=upower VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -91,9 +91,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Fix libimobiledevice support: -zcat $CWD/81a89385a45d3de1028bcd86b3688fb465b4035c.patch.gz | patch -p1 --verbose || exit 1 - # Configure, build, and install: export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" diff --git a/source/a/util-linux/util-linux.SlackBuild b/source/a/util-linux/util-linux.SlackBuild index 23f636729..85dabc1e4 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:-2} +BUILD=${BUILD:-3} ADJTIMEXVERS=1.29 SETSERIALVERS=2.17 @@ -158,6 +158,7 @@ configure_with_python(){ --enable-use-tty-group \ --enable-libblkid \ --enable-libmount \ + --disable-libmount-mountfd-support \ --enable-libuuid \ --disable-uuidd \ --with-python=$1 \ |