diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2022-10-15 20:28:34 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2022-10-16 07:00:18 +0200 |
commit | 8640934374be30c1d60f9b6b0ebc83a2523d230b (patch) | |
tree | a46aa86600c798da0951ca835f9c95f6993f5cb4 /source | |
parent | 232faa766ea27511929ce11bee49205d2a823fc1 (diff) | |
download | current-8640934374be30c1d60f9b6b0ebc83a2523d230b.tar.gz current-8640934374be30c1d60f9b6b0ebc83a2523d230b.tar.xz |
Sat Oct 15 20:28:34 UTC 202220221015202834
a/kernel-firmware-20221013_49fccf6-noarch-1.txz: Upgraded.
a/kernel-generic-5.19.16-x86_64-1.txz: Upgraded.
a/kernel-huge-5.19.16-x86_64-1.txz: Upgraded.
a/kernel-modules-5.19.16-x86_64-1.txz: Upgraded.
ap/man-db-2.11.0-x86_64-1.txz: Upgraded.
ap/man-pages-6.00-noarch-1.txz: Upgraded.
d/kernel-headers-5.19.16-x86-1.txz: Upgraded.
k/kernel-source-5.19.16-noarch-1.txz: Upgraded.
l/libedit-20221009_3.1-x86_64-1.txz: Upgraded.
l/mozilla-nss-3.84-x86_64-1.txz: Upgraded.
l/nodejs-18.11.0-x86_64-1.txz: Upgraded.
l/zlib-1.2.13-x86_64-1.txz: Upgraded.
Fixed a bug when getting a gzip header extra field with inflateGetHeader().
For more information, see:
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-37434
(* Security fix *)
n/fetchmail-6.4.34-x86_64-1.txz: Upgraded.
n/gnupg2-2.2.40-x86_64-1.txz: Upgraded.
x/bdftopcf-1.1.1-x86_64-1.txz: Upgraded.
x/libwacom-2.5.0-x86_64-1.txz: Upgraded.
x/smproxy-1.0.7-x86_64-1.txz: Upgraded.
x/viewres-1.0.7-x86_64-1.txz: Upgraded.
x/xditview-1.0.6-x86_64-1.txz: Upgraded.
x/xf86-input-vmmouse-13.2.0-x86_64-1.txz: Added.
x/xgc-1.0.6-x86_64-1.txz: Upgraded.
x/xkbprint-1.0.6-x86_64-1.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source')
22 files changed, 91 insertions, 93 deletions
diff --git a/source/ap/man-pages/man-pages.SlackBuild b/source/ap/man-pages/man-pages.SlackBuild index 278d17180..8e6faaac0 100755 --- a/source/ap/man-pages/man-pages.SlackBuild +++ b/source/ap/man-pages/man-pages.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008-2020 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008-2022 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=man-pages -VERSION=${VERSION:-$(echo man-pages-5.*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +VERSION=${VERSION:-$(/bin/ls man-pages-*.tar.?z | head -n 1 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} ARCH=noarch BUILD=${BUILD:-1} @@ -60,7 +60,7 @@ find man-pages-posix-2013-a \ -exec chmod 644 {} \+ mkdir -p $PKG/usr/man -cp -a man-pages-$VERSION/man? $PKG/usr/man +cp -a man-pages-$VERSION/man* $PKG/usr/man # Are these other POSIX manpages of any real usefulness here? # Granted there may be some historical interest, and it's nice diff --git a/source/k/kernel-configs/config-generic-5.19.15 b/source/k/kernel-configs/config-generic-5.19.16 index fbb445b06..1403a5078 100644 --- a/source/k/kernel-configs/config-generic-5.19.15 +++ b/source/k/kernel-configs/config-generic-5.19.16 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.19.15 Kernel Configuration +# Linux/x86 5.19.16 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-generic-5.19.15.x64 b/source/k/kernel-configs/config-generic-5.19.16.x64 index 3ed99e77b..eda8d20fb 100644 --- a/source/k/kernel-configs/config-generic-5.19.15.x64 +++ b/source/k/kernel-configs/config-generic-5.19.16.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.19.15 Kernel Configuration +# Linux/x86 5.19.16 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-generic-smp-5.19.15-smp b/source/k/kernel-configs/config-generic-smp-5.19.16-smp index fe5658ac3..4294260a3 100644 --- a/source/k/kernel-configs/config-generic-smp-5.19.15-smp +++ b/source/k/kernel-configs/config-generic-smp-5.19.16-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.19.15 Kernel Configuration +# Linux/x86 5.19.16 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-huge-5.19.15 b/source/k/kernel-configs/config-huge-5.19.16 index 9f7e5e603..0375d5e1c 100644 --- a/source/k/kernel-configs/config-huge-5.19.15 +++ b/source/k/kernel-configs/config-huge-5.19.16 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.19.15 Kernel Configuration +# Linux/x86 5.19.16 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-huge-5.19.15.x64 b/source/k/kernel-configs/config-huge-5.19.16.x64 index db4c2f496..a6091b732 100644 --- a/source/k/kernel-configs/config-huge-5.19.15.x64 +++ b/source/k/kernel-configs/config-huge-5.19.16.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.19.15 Kernel Configuration +# Linux/x86 5.19.16 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-huge-smp-5.19.15-smp b/source/k/kernel-configs/config-huge-smp-5.19.16-smp index 9a350450d..f85c942a5 100644 --- a/source/k/kernel-configs/config-huge-smp-5.19.15-smp +++ b/source/k/kernel-configs/config-huge-smp-5.19.16-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.19.15 Kernel Configuration +# Linux/x86 5.19.16 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y diff --git a/source/l/mozilla-nss/mozilla-nss.SlackBuild b/source/l/mozilla-nss/mozilla-nss.SlackBuild index 6dd84cee1..faa2abea0 100755 --- a/source/l/mozilla-nss/mozilla-nss.SlackBuild +++ b/source/l/mozilla-nss/mozilla-nss.SlackBuild @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mozilla-nss SRCNAM=nss -VERSION=${VERSION:-3.83} -NSPR=${NSPR:-4.34.1} +VERSION=${VERSION:-3.84} +NSPR=${NSPR:-4.35} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: diff --git a/source/l/zlib/ec3df00224d4b396e2ac6586ab5d25f673caa4c2.patch b/source/l/zlib/ec3df00224d4b396e2ac6586ab5d25f673caa4c2.patch deleted file mode 100644 index 85a6a7e3a..000000000 --- a/source/l/zlib/ec3df00224d4b396e2ac6586ab5d25f673caa4c2.patch +++ /dev/null @@ -1,51 +0,0 @@ -From ec3df00224d4b396e2ac6586ab5d25f673caa4c2 Mon Sep 17 00:00:00 2001 -From: Mark Adler <madler@alumni.caltech.edu> -Date: Wed, 30 Mar 2022 11:14:53 -0700 -Subject: [PATCH] Correct incorrect inputs provided to the CRC functions. - -The previous releases of zlib were not sensitive to incorrect CRC -inputs with bits set above the low 32. This commit restores that -behavior, so that applications with such bugs will continue to -operate as before. ---- - crc32.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/crc32.c b/crc32.c -index a1bdce5c2..451887bc7 100644 ---- a/crc32.c -+++ b/crc32.c -@@ -630,7 +630,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len) - #endif /* DYNAMIC_CRC_TABLE */ - - /* Pre-condition the CRC */ -- crc ^= 0xffffffff; -+ crc = (~crc) & 0xffffffff; - - /* Compute the CRC up to a word boundary. */ - while (len && ((z_size_t)buf & 7) != 0) { -@@ -749,7 +749,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len) - #endif /* DYNAMIC_CRC_TABLE */ - - /* Pre-condition the CRC */ -- crc ^= 0xffffffff; -+ crc = (~crc) & 0xffffffff; - - #ifdef W - -@@ -1077,7 +1077,7 @@ uLong ZEXPORT crc32_combine64(crc1, crc2, len2) - #ifdef DYNAMIC_CRC_TABLE - once(&made, make_crc_table); - #endif /* DYNAMIC_CRC_TABLE */ -- return multmodp(x2nmodp(len2, 3), crc1) ^ crc2; -+ return multmodp(x2nmodp(len2, 3), crc1) ^ (crc2 & 0xffffffff); - } - - /* ========================================================================= */ -@@ -1112,5 +1112,5 @@ uLong crc32_combine_op(crc1, crc2, op) - uLong crc2; - uLong op; - { -- return multmodp(op, crc1) ^ crc2; -+ return multmodp(op, crc1) ^ (crc2 & 0xffffffff); - } diff --git a/source/l/zlib/zlib.SlackBuild b/source/l/zlib/zlib.SlackBuild index a33375835..a7417d991 100755 --- a/source/l/zlib/zlib.SlackBuild +++ b/source/l/zlib/zlib.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=zlib VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | 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 @@ -69,8 +69,6 @@ rm -rf zlib-$VERSION tar xvf $CWD/zlib-$VERSION.tar.xz || exit 1 cd zlib-$VERSION || exit 1 -cat $CWD/ec3df00224d4b396e2ac6586ab5d25f673caa4c2.patch | patch -p1 --verbose || exit 1 - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/x/FTBFSlog b/source/x/FTBFSlog index 0b15e38c0..2ec46b74e 100644 --- a/source/x/FTBFSlog +++ b/source/x/FTBFSlog @@ -1,3 +1,6 @@ +Sat Oct 15 19:21:06 UTC 2022 +x11/xdm: Fixed the arc4random patch. Thanks to nobodino. ++--------------------------+ Wed Mar 2 01:27:59 UTC 2022 x11/igt-gpu-tools: Patched for new meson. Thanks to nobodino. +--------------------------+ diff --git a/source/x/x11/build/bdftopcf b/source/x/x11/build/bdftopcf index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/bdftopcf +++ b/source/x/x11/build/bdftopcf @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/smproxy b/source/x/x11/build/smproxy index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/smproxy +++ b/source/x/x11/build/smproxy @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/viewres b/source/x/x11/build/viewres index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/viewres +++ b/source/x/x11/build/viewres @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xditview b/source/x/x11/build/xditview index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xditview +++ b/source/x/x11/build/xditview @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xf86-input-vmmouse b/source/x/x11/build/xf86-input-vmmouse index f599e28b8..d00491fd7 100644 --- a/source/x/x11/build/xf86-input-vmmouse +++ b/source/x/x11/build/xf86-input-vmmouse @@ -1 +1 @@ -10 +1 diff --git a/source/x/x11/build/xgc b/source/x/x11/build/xgc index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/xgc +++ b/source/x/x11/build/xgc @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/xkbprint b/source/x/x11/build/xkbprint index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xkbprint +++ b/source/x/x11/build/xkbprint @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/package-blacklist b/source/x/x11/package-blacklist index 68cc00705..85fbc7979 100644 --- a/source/x/x11/package-blacklist +++ b/source/x/x11/package-blacklist @@ -13,7 +13,6 @@ xf86-input-joystick xf86-input-keyboard xf86-input-mouse xf86-input-penmount -xf86-input-vmmouse xf86-input-void xf86-video-apm xf86-video-ark diff --git a/source/x/x11/patch/xdm.patch b/source/x/x11/patch/xdm.patch index 936bf1ca4..e9b5ec3cd 100644 --- a/source/x/x11/patch/xdm.patch +++ b/source/x/x11/patch/xdm.patch @@ -1,6 +1,6 @@ zcat $CWD/patch/xdm/xdm.glibc.crypt.diff.gz | patch -p1 --verbose || \ { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } -zcat $CWD/patch/xdm/xdm-1.1.11-arc4random-include.patch.gz | patch -p1 --verbose || \ - { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } zcat $CWD/patch/xdm/xdm-1.1.11-setproctitle-include.patch.gz | patch -p1 --verbose || \ { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +zcat $CWD/patch/xdm/xdm.arc4random.diff.gz | patch -p1 --verbose || \ + { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/x/x11/patch/xdm/xdm-1.1.11-arc4random-include.patch b/source/x/x11/patch/xdm/xdm-1.1.11-arc4random-include.patch deleted file mode 100644 index db948094b..000000000 --- a/source/x/x11/patch/xdm/xdm-1.1.11-arc4random-include.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -ur a/xdm/genauth.c b/xdm/genauth.c ---- a/xdm/genauth.c 2011-09-25 09:35:47.000000000 +0200 -+++ b/xdm/genauth.c 2014-01-06 16:28:09.664060603 +0100 -@@ -40,6 +40,14 @@ - - #include <errno.h> - -+#ifdef HAVE_ARC4RANDOM -+# ifdef __linux__ -+# include <bsd/stdlib.h> -+# else -+# include <stdlib.h> -+# endif -+#endif -+ - #include <time.h> - #define Time_t time_t - diff --git a/source/x/x11/patch/xdm/xdm.arc4random.diff b/source/x/x11/patch/xdm/xdm.arc4random.diff new file mode 100644 index 000000000..06948e63e --- /dev/null +++ b/source/x/x11/patch/xdm/xdm.arc4random.diff @@ -0,0 +1,67 @@ +diff -aurN xdm-1.1.11/xdm/genauth.c xdm-20220911_468b760/xdm/genauth.c +--- xdm-1.1.11/xdm/genauth.c 2011-09-25 09:35:47.000000000 +0200 ++++ xdm-20220911_468b760/xdm/genauth.c 2022-10-08 06:24:57.000000000 +0200 +@@ -40,6 +40,22 @@ + + #include <errno.h> + ++#ifdef HAVE_ARC4RANDOM ++# ifdef __linux__ ++# if defined(__GLIBC__) && defined(__GLIBC_PREREQ) ++# if __GLIBC_PREREQ(2, 36) ++# include <stdlib.h> ++# else ++# include <bsd/stdlib.h> ++# endif ++# else ++# include <bsd/stdlib.h> ++# endif ++# else ++# include <stdlib.h> ++# endif ++#endif ++ + #include <time.h> + #define Time_t time_t + +@@ -372,7 +388,7 @@ + randomDevice, errno); + } + # endif +- /* Try some pseudo-random number genrator daemon next */ ++ /* Try some pseudo-random number generator daemon next */ + if (prngdSocket != NULL || prngdPort != 0) { + if (get_prngd_bytes((char *)tmpkey, sizeof(tmpkey), prngdPort, + prngdSocket) == 0) { +@@ -408,15 +424,20 @@ + static int xdmcpAuthInited; + long ldata[2]; + +-# ifdef ITIMER_REAL ++# ifndef HAVE_ARC4RANDOM ++# ifdef ITIMER_REAL + struct timeval now; + + X_GETTIMEOFDAY (&now); + ldata[0] = now.tv_usec; + ldata[1] = now.tv_sec; +-# else ++# else + ldata[0] = time ((long *) 0); + ldata[1] = getpid (); ++# endif ++# else ++ ldata[0] = arc4random(); ++ ldata[1] = arc4random(); + # endif + + longtochars (ldata[0], data+0); +@@ -462,7 +483,7 @@ + LogError("Cannot open randomDevice \"%s\", errno = %d\n", + randomDevice, errno); + # endif /* DEV_RANDOM */ +- /* Try some pseudo-random number genrator daemon next */ ++ /* Try some pseudo-random number generator daemon next */ + if (prngdSocket != NULL || prngdPort != 0) { + if (get_prngd_bytes(auth, len, prngdPort, prngdSocket) == 0) { + return 1; |