summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2022-08-10 18:50:54 +0000
committer Eric Hameleers <alien@slackware.com>2022-08-11 07:00:16 +0200
commit26d50f213699b051562ecb7d443127a4f1ba2f7e (patch)
tree769bba2b98e65ea1a6623b66f959be01eb45cc24 /source
parenta5f98c65b12d21d81311e9d572cccb765e44b93f (diff)
downloadcurrent-26d50f213699b051562ecb7d443127a4f1ba2f7e.tar.gz
current-26d50f213699b051562ecb7d443127a4f1ba2f7e.tar.xz
Wed Aug 10 18:50:54 UTC 202220220810185054
a/kernel-firmware-20220810_ad5ae82-noarch-1.txz: Upgraded. d/binutils-2.39-x86_64-1.txz: Upgraded. d/oprofile-1.4.0-x86_64-10.txz: Rebuilt. Recompiled against binutils-2.39. l/gdk-pixbuf2-2.42.9-x86_64-1.txz: Upgraded. l/nodejs-18.7.0-x86_64-1.txz: Upgraded. Might as well go with the latest version of this since everyone else does. Fixed a sed substitution to get the correct lib${LIBDIRSUFFIX} in npm.js. Thanks to conraid and zerouno. n/gpgme-1.18.0-x86_64-1.txz: Upgraded. n/libnftnl-1.2.3-x86_64-1.txz: Upgraded. n/nfs-utils-2.6.2-x86_64-1.txz: Upgraded. n/nftables-1.0.5-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source')
-rwxr-xr-xsource/d/binutils/binutils.SlackBuild13
-rw-r--r--source/d/binutils/patches/binutils-CVE-2019-1010204.patch15
-rw-r--r--source/d/binutils/patches/binutils-use-long-long.patch38
-rwxr-xr-xsource/d/oprofile/oprofile.SlackBuild2
-rwxr-xr-xsource/l/nodejs/nodejs.SlackBuild4
-rwxr-xr-xsource/n/gpgme/gpgme.SlackBuild2
-rw-r--r--source/xap/seamonkey/arc4random_buf.glibc-2.36.diff18
-rwxr-xr-xsource/xap/seamonkey/seamonkey.SlackBuild5
8 files changed, 29 insertions, 68 deletions
diff --git a/source/d/binutils/binutils.SlackBuild b/source/d/binutils/binutils.SlackBuild
index f4733e492..8edcd5b41 100755
--- a/source/d/binutils/binutils.SlackBuild
+++ b/source/d/binutils/binutils.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2005-2021 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2022 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=binutils
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
MARCH=$( uname -m )
@@ -109,18 +109,11 @@ zcat $CWD/patches/binutils-no-config-h-check.patch.gz | patch -p1 --verbose || e
zcat $CWD/patches/binutils-version.patch.gz | patch -p1 --verbose || exit 1
sed -i -e 's/%''{release}/slack151/g' bfd/Makefile{.am,.in}
-# Use the "unsigned long long" type for pointers on hosts where long is a
-# 32-bit type but pointers are a 64-bit type. Necessary because users expect
-# to be able to install both the x86 and x86_64 versions of binutils on the
-# same machine, so they need identical versions of the bfd.h header file.
-zcat $CWD/patches/binutils-use-long-long.patch.gz | patch -p1 --verbose || exit 1
-
# Work around a bug caused by binutils using an ancient libtool:
zcat $CWD/patches/binutils-libtool-lib64.patch.gz | patch -p1 --verbose || exit 1
# Various regression fixes:
zcat $CWD/patches/binutils-2.27-aarch64-ifunc.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/binutils-CVE-2019-1010204.patch.gz | patch -p1 --verbose || exit 1
zcat $CWD/patches/binutils-do-not-link-with-static-libstdc++.patch.gz | patch -p1 --verbose || exit 1
zcat $CWD/patches/binutils-filename-in-error-messages.patch.gz | patch -p1 --verbose || exit 1
zcat $CWD/patches/binutils-gold-i386-gnu-property-notes.patch.gz | patch -p1 --verbose || exit 1
@@ -170,7 +163,7 @@ CFLAGS="$SLKCFLAGS" \
--enable-64-bit-bfd \
--enable-plugins \
--enable-threads \
- --enable-targets=i386-efi-pe,${TARGET} \
+ --enable-targets=i386-efi-pe,bpf-unknown-none,${TARGET} \
--enable-install-libiberty \
--enable-gold=yes \
--enable-ld=default \
diff --git a/source/d/binutils/patches/binutils-CVE-2019-1010204.patch b/source/d/binutils/patches/binutils-CVE-2019-1010204.patch
deleted file mode 100644
index 56434b10d..000000000
--- a/source/d/binutils/patches/binutils-CVE-2019-1010204.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- binutils.orig/gold/fileread.cc 2019-08-06 14:22:08.669313110 +0100
-+++ binutils-2.32/gold/fileread.cc 2019-08-06 14:22:28.799177543 +0100
-@@ -381,6 +381,12 @@ File_read::do_read(off_t start, section_
- ssize_t bytes;
- if (this->whole_file_view_ != NULL)
- {
-+ // See PR 23765 for an example of a testcase that triggers this error.
-+ if (((ssize_t) start) < 0)
-+ gold_fatal(_("%s: read failed, starting offset (%#llx) less than zero"),
-+ this->filename().c_str(),
-+ static_cast<long long>(start));
-+
- bytes = this->size_ - start;
- if (static_cast<section_size_type>(bytes) >= size)
- {
diff --git a/source/d/binutils/patches/binutils-use-long-long.patch b/source/d/binutils/patches/binutils-use-long-long.patch
deleted file mode 100644
index 1ea741811..000000000
--- a/source/d/binutils/patches/binutils-use-long-long.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -up binutils-2.25.orig/bfd/configure.ac binutils-2.25/bfd/configure.ac
---- binutils-2.25.orig/bfd/configure.ac 2014-12-24 10:34:45.590491143 +0000
-+++ binutils-2.25/bfd/configure.ac 2014-12-24 10:36:12.997981992 +0000
-@@ -183,11 +183,13 @@ if test "x${ac_cv_sizeof_long}" = "x8";
- BFD_HOST_64BIT_LONG=1
- test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long"
- test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long"
--elif test "x${ac_cv_sizeof_long_long}" = "x8"; then
-+fi
-+if test "x${ac_cv_sizeof_long_long}" = "x8"; then
- BFD_HOST_64BIT_LONG_LONG=1
- test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long long"
- test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long long"
-- if test "x${ac_cv_sizeof_void_p}" = "x8"; then
-+ if test "x${ac_cv_sizeof_void_p}" = "x8" \
-+ -a "x${ac_cv_sizeof_long}" != "x8"; then
- BFD_HOSTPTR_T="unsigned long long"
- fi
- fi
-diff -up ../binutils-2.20.51.0.7.original/bfd/configure ./bfd/configure
---- a/bfd/configure 2010-04-08 15:23:58.000000000 +0100
-+++ b/bfd/configure 2010-04-08 15:24:06.000000000 +0100
-@@ -12819,11 +12819,13 @@
- BFD_HOST_64BIT_LONG=1
- test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long"
- test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long"
--elif test "x${ac_cv_sizeof_long_long}" = "x8"; then
-+fi
-+if test "x${ac_cv_sizeof_long_long}" = "x8"; then
- BFD_HOST_64BIT_LONG_LONG=1
- test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long long"
- test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long long"
-- if test "x${ac_cv_sizeof_void_p}" = "x8"; then
-+ if test "x${ac_cv_sizeof_void_p}" = "x8" \
-+ -a "x${ac_cv_sizeof_long}" != "x8"; then
- BFD_HOSTPTR_T="unsigned long long"
- fi
- fi
diff --git a/source/d/oprofile/oprofile.SlackBuild b/source/d/oprofile/oprofile.SlackBuild
index cf9e5d13a..a2aa92c60 100755
--- a/source/d/oprofile/oprofile.SlackBuild
+++ b/source/d/oprofile/oprofile.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=oprofile
VERSION=${VERSION:-$(echo oprofile-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-9}
+BUILD=${BUILD:-10}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/l/nodejs/nodejs.SlackBuild b/source/l/nodejs/nodejs.SlackBuild
index 7bff937a1..91633cba3 100755
--- a/source/l/nodejs/nodejs.SlackBuild
+++ b/source/l/nodejs/nodejs.SlackBuild
@@ -85,8 +85,8 @@ find . \
## Fix libdir for 64-bit:
sed -i "s|lib/|lib${LIBDIRSUFFIX}/|g" tools/install.py
-sed -i "s/'lib'/'lib${LIBDIRSUFFIX}'/" lib/module.js
-sed -i "s|\"lib\"|\"lib${LIBDIRSUFFIX}\"|" deps/npm/lib/npm.js
+sed -i "s|'lib'|'lib${LIBDIRSUFFIX}'|g" lib/module.js
+sed -i "s|'lib'|'lib${LIBDIRSUFFIX}'|g" deps/npm/lib/npm.js
# Not sure if this one is really needed.
#sed -i "s|math.h|cmath|" src/node_crypto.cc
diff --git a/source/n/gpgme/gpgme.SlackBuild b/source/n/gpgme/gpgme.SlackBuild
index 265737b7e..2e790226f 100755
--- a/source/n/gpgme/gpgme.SlackBuild
+++ b/source/n/gpgme/gpgme.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=gpgme
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/xap/seamonkey/arc4random_buf.glibc-2.36.diff b/source/xap/seamonkey/arc4random_buf.glibc-2.36.diff
new file mode 100644
index 000000000..d4131c0a2
--- /dev/null
+++ b/source/xap/seamonkey/arc4random_buf.glibc-2.36.diff
@@ -0,0 +1,18 @@
+--- ./ipc/chromium/src/third_party/libevent/arc4random.c.orig 2022-08-04 14:57:57.000000000 -0500
++++ ./ipc/chromium/src/third_party/libevent/arc4random.c 2022-08-06 14:40:21.569033657 -0500
+@@ -484,6 +484,7 @@
+ }
+ #endif
+
++#if 0
+ ARC4RANDOM_EXPORT void
+ arc4random_buf(void *buf_, size_t n)
+ {
+@@ -497,6 +498,7 @@
+ }
+ ARC4_UNLOCK_();
+ }
++#endif
+
+ #ifndef ARC4RANDOM_NOUNIFORM
+ /*
diff --git a/source/xap/seamonkey/seamonkey.SlackBuild b/source/xap/seamonkey/seamonkey.SlackBuild
index 134e2b32a..1af462592 100755
--- a/source/xap/seamonkey/seamonkey.SlackBuild
+++ b/source/xap/seamonkey/seamonkey.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2020, 2021 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2020, 2021, 2022 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -139,6 +139,9 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
+# Don't define a function that's included starting in glibc-2.36:
+zcat $CWD/arc4random_buf.glibc-2.36.diff.gz | patch -p1 --verbose || exit 1
+
# Our building options, in a configure-like display ;)
OPTIONS="\
--prefix=/usr \