summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2022-08-05 21:04:39 +0000
committerEric Hameleers <alien@slackware.com>2022-08-06 07:00:16 +0200
commit6882ad89994efcb555332d32b9a76282e37018e3 (patch)
tree21159e2be99bbcab50c85b03bac93b5de44f448e /extra
parentca27dc818b992f6deccc946ad7cae6b6e3b626cd (diff)
downloadcurrent-6882ad89994efcb555332d32b9a76282e37018e3.tar.gz
Fri Aug 5 21:04:39 UTC 202220220805210439
a/dcron-4.5-x86_64-12.txz: Rebuilt. Rebase the run-parts script on the latest version from Fedora's crontabs package. Thanks to avian. a/elilo-3.16-x86_64-13.txz: Rebuilt. Patched to disable the Confidential Computing blob for SEV-SNP, which fixes booting a 5.19 kernel with the EFI stub enabled. If you use elilo, be sure to either run eliloconfig again or manually copy (and rename) the proper elilo binary to your EFI System Partition. Thanks to PiterPunk. a/sysklogd-2.4.2-x86_64-1.txz: Upgraded. ap/most-5.2.0-x86_64-1.txz: Upgraded. d/cmake-3.24.0-x86_64-1.txz: Upgraded. x/ibus-table-1.16.10-x86_64-1.txz: Upgraded. extra/brltty/brltty-6.5-x86_64-1.txz: Upgraded. extra/php80/php80-8.0.22-x86_64-1.txz: Upgraded.
Diffstat (limited to 'extra')
-rwxr-xr-xextra/source/brltty/brltty.SlackBuild2
-rwxr-xr-xextra/source/php80/fetch-php.sh4
-rwxr-xr-xextra/source/php80/php80.SlackBuild2
-rw-r--r--extra/source/rust-for-mozilla/llvm.sanitizer_platform_limits_posix.cpp.glibc-2.36.diff27
-rwxr-xr-xextra/source/rust-for-mozilla/rust.SlackBuild3
5 files changed, 34 insertions, 4 deletions
diff --git a/extra/source/brltty/brltty.SlackBuild b/extra/source/brltty/brltty.SlackBuild
index fd4b5b79..5b026dad 100755
--- a/extra/source/brltty/brltty.SlackBuild
+++ b/extra/source/brltty/brltty.SlackBuild
@@ -32,7 +32,7 @@ PKG=/tmp/package-brltty
PKGNAM=brltty
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-5}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/extra/source/php80/fetch-php.sh b/extra/source/php80/fetch-php.sh
index 62cf5884..24064a34 100755
--- a/extra/source/php80/fetch-php.sh
+++ b/extra/source/php80/fetch-php.sh
@@ -1,2 +1,2 @@
-lftpget http://us.php.net/distributions/php-8.0.21.tar.xz.asc
-lftpget http://us.php.net/distributions/php-8.0.21.tar.xz
+lftpget http://us.php.net/distributions/php-8.0.22.tar.xz.asc
+lftpget http://us.php.net/distributions/php-8.0.22.tar.xz
diff --git a/extra/source/php80/php80.SlackBuild b/extra/source/php80/php80.SlackBuild
index 99fd78a3..9b220b79 100755
--- a/extra/source/php80/php80.SlackBuild
+++ b/extra/source/php80/php80.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=php
VERSION=${VERSION:-$(echo php-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
ALPINE=2.26
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/extra/source/rust-for-mozilla/llvm.sanitizer_platform_limits_posix.cpp.glibc-2.36.diff b/extra/source/rust-for-mozilla/llvm.sanitizer_platform_limits_posix.cpp.glibc-2.36.diff
new file mode 100644
index 00000000..6f68c0d8
--- /dev/null
+++ b/extra/source/rust-for-mozilla/llvm.sanitizer_platform_limits_posix.cpp.glibc-2.36.diff
@@ -0,0 +1,27 @@
+--- ./src/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp.orig 2022-07-16 03:50:21.000000000 -0500
++++ ./src/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp 2022-08-05 23:15:14.928568611 -0500
+@@ -73,7 +73,9 @@
+ #include <sys/vt.h>
+ #include <linux/cdrom.h>
+ #include <linux/fd.h>
++#if SANITIZER_ANDROID
+ #include <linux/fs.h>
++#endif
+ #include <linux/hdreg.h>
+ #include <linux/input.h>
+ #include <linux/ioctl.h>
+@@ -860,10 +862,10 @@
+ unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT;
+ unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT;
+ #endif
+- unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS;
+- unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION;
+- unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS;
+- unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION;
++ unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long);
++ unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long);
++ unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long);
++ unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long);
+ unsigned IOCTL_GIO_CMAP = GIO_CMAP;
+ unsigned IOCTL_GIO_FONT = GIO_FONT;
+ unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP;
diff --git a/extra/source/rust-for-mozilla/rust.SlackBuild b/extra/source/rust-for-mozilla/rust.SlackBuild
index 58d6601a..a3737776 100755
--- a/extra/source/rust-for-mozilla/rust.SlackBuild
+++ b/extra/source/rust-for-mozilla/rust.SlackBuild
@@ -142,6 +142,9 @@ if [ "${SYSTEM_LLVM}" = "YES" ]; then
zcat $CWD/link_libffi.diff.gz | patch -p1 --verbose || exit 1
fi
+# Fix build with glibc-2.36:
+zcat $CWD/llvm.sanitizer_platform_limits_posix.cpp.glibc-2.36.diff.gz | patch -p1 --verbose || exit 1
+
if [ "$LOCAL_BOOTSTRAP" != "yes" ] ; then
# rust requires bootstrapping with the previous rust version.
# versions are defined in src/stage0.txt.