diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2022-02-02 04:17:39 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2022-02-02 08:59:53 +0100 |
commit | 8b3ff193a856f7dfb046794bc6bb235804372552 (patch) | |
tree | 15ff7f0b80e89ac0a5b805249a463c9d51caff9d /source | |
parent | ba74260aeb31600cdee80934088739a8e9869f21 (diff) | |
download | current-8b3ff193a856f7dfb046794bc6bb235804372552.tar.gz current-8b3ff193a856f7dfb046794bc6bb235804372552.tar.xz |
Wed Feb 2 04:17:39 UTC 202220220202041739
fortune -m "I will be finished tomorrow" fortunes2
a/kernel-generic-5.15.19-x86_64-1.txz: Upgraded.
a/kernel-huge-5.15.19-x86_64-1.txz: Upgraded.
a/kernel-modules-5.15.19-x86_64-1.txz: Upgraded.
ap/screen-4.9.0-x86_64-1.txz: Upgraded.
Patched possible denial of service via a crafted UTF-8 character sequence.
For more information, see:
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-26937
(* Security fix *)
d/kernel-headers-5.15.19-x86-1.txz: Upgraded.
k/kernel-source-5.15.19-noarch-1.txz: Upgraded.
RTC_INTF_DEV_UIE_EMUL y -> n
RTC_SYSTOHC n -> y
+RTC_SYSTOHC_DEVICE "rtc0"
l/lcms2-2.13-x86_64-2.txz: Rebuilt.
[PATCH] Fix for optimization error on grayscale.
Thanks to Aaron Boxer for reporting this issue.
Thanks to gmgf.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
testing/source/linux-5.16.5-configs/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source')
-rwxr-xr-x | source/ap/screen/screen.SlackBuild | 16 | ||||
-rw-r--r-- | source/k/kernel-configs/config-generic-5.15.19 (renamed from source/k/kernel-configs/config-generic-5.15.18) | 7 | ||||
-rw-r--r-- | source/k/kernel-configs/config-generic-5.15.19.x64 (renamed from source/k/kernel-configs/config-generic-5.15.18.x64) | 7 | ||||
-rw-r--r-- | source/k/kernel-configs/config-generic-smp-5.15.19-smp (renamed from source/k/kernel-configs/config-generic-smp-5.15.18-smp) | 7 | ||||
-rw-r--r-- | source/k/kernel-configs/config-huge-5.15.19 (renamed from source/k/kernel-configs/config-huge-5.15.18) | 7 | ||||
-rw-r--r-- | source/k/kernel-configs/config-huge-5.15.19.x64 (renamed from source/k/kernel-configs/config-huge-5.15.18.x64) | 7 | ||||
-rw-r--r-- | source/k/kernel-configs/config-huge-smp-5.15.19-smp (renamed from source/k/kernel-configs/config-huge-smp-5.15.18-smp) | 7 | ||||
-rw-r--r-- | source/l/lcms2/fdbfb7694f9d7048d53674b79ddfc38068bfdaf7.patch | 41 | ||||
-rwxr-xr-x | source/l/lcms2/lcms2.SlackBuild | 4 |
9 files changed, 81 insertions, 22 deletions
diff --git a/source/ap/screen/screen.SlackBuild b/source/ap/screen/screen.SlackBuild index 4301e396d..960c38d3e 100755 --- a/source/ap/screen/screen.SlackBuild +++ b/source/ap/screen/screen.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2013, 2014, 2015, 2016, 2018, 2019, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011, 2013, 2014, 2015, 2016, 2018, 2019, 2020, 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=screen VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -100,6 +100,13 @@ else fi # Configure: +if [ ! -r configure ]; then + if [ -x ./autogen.sh ]; then + NOCONFIGURE=1 ./autogen.sh + else + autoreconf -vif + fi +fi CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ @@ -120,7 +127,10 @@ CFLAGS="$SLKCFLAGS" \ --build=$ARCH-slackware-linux || exit 1 # Substitutions: -perl -pi -e 's|.*#undef HAVE_BRAILLE.*|#define HAVE_BRAILLE 1|' config.h +# It appears the change directly below is broken. We'll issue errata for +# it if a fix appears, but meanwhile we have a CVE to worry about. +# Tought choice. +#perl -pi -e 's|.*#undef HAVE_BRAILLE.*|#define HAVE_BRAILLE 1|' config.h perl -pi -e 's|/usr/local/etc/screenrc|/etc/screenrc|' etc/etcscreenrc doc/* perl -pi -e 's|/local/etc/screenrc|/etc/screenrc|' doc/* diff --git a/source/k/kernel-configs/config-generic-5.15.18 b/source/k/kernel-configs/config-generic-5.15.19 index 9d0e07b7d..7023bbeeb 100644 --- a/source/k/kernel-configs/config-generic-5.15.18 +++ b/source/k/kernel-configs/config-generic-5.15.19 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.15.18 Kernel Configuration +# Linux/x86 5.15.19 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_IS_GCC=y @@ -7718,7 +7718,8 @@ CONFIG_RTC_LIB=y CONFIG_RTC_MC146818_LIB=y CONFIG_RTC_CLASS=y # CONFIG_RTC_HCTOSYS is not set -# CONFIG_RTC_SYSTOHC is not set +CONFIG_RTC_SYSTOHC=y +CONFIG_RTC_SYSTOHC_DEVICE="rtc0" # CONFIG_RTC_DEBUG is not set CONFIG_RTC_NVMEM=y @@ -7728,7 +7729,7 @@ CONFIG_RTC_NVMEM=y CONFIG_RTC_INTF_SYSFS=y CONFIG_RTC_INTF_PROC=y CONFIG_RTC_INTF_DEV=y -CONFIG_RTC_INTF_DEV_UIE_EMUL=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set CONFIG_RTC_DRV_TEST=m # diff --git a/source/k/kernel-configs/config-generic-5.15.18.x64 b/source/k/kernel-configs/config-generic-5.15.19.x64 index 4b003a75b..30fcb74fb 100644 --- a/source/k/kernel-configs/config-generic-5.15.18.x64 +++ b/source/k/kernel-configs/config-generic-5.15.19.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.15.18 Kernel Configuration +# Linux/x86 5.15.19 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_IS_GCC=y @@ -7685,7 +7685,8 @@ CONFIG_RTC_LIB=y CONFIG_RTC_MC146818_LIB=y CONFIG_RTC_CLASS=y # CONFIG_RTC_HCTOSYS is not set -# CONFIG_RTC_SYSTOHC is not set +CONFIG_RTC_SYSTOHC=y +CONFIG_RTC_SYSTOHC_DEVICE="rtc0" # CONFIG_RTC_DEBUG is not set CONFIG_RTC_NVMEM=y @@ -7695,7 +7696,7 @@ CONFIG_RTC_NVMEM=y CONFIG_RTC_INTF_SYSFS=y CONFIG_RTC_INTF_PROC=y CONFIG_RTC_INTF_DEV=y -CONFIG_RTC_INTF_DEV_UIE_EMUL=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set CONFIG_RTC_DRV_TEST=m # diff --git a/source/k/kernel-configs/config-generic-smp-5.15.18-smp b/source/k/kernel-configs/config-generic-smp-5.15.19-smp index faaa59c9a..bcaf65e3e 100644 --- a/source/k/kernel-configs/config-generic-smp-5.15.18-smp +++ b/source/k/kernel-configs/config-generic-smp-5.15.19-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.15.18 Kernel Configuration +# Linux/x86 5.15.19 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_IS_GCC=y @@ -7772,7 +7772,8 @@ CONFIG_RTC_LIB=y CONFIG_RTC_MC146818_LIB=y CONFIG_RTC_CLASS=y # CONFIG_RTC_HCTOSYS is not set -# CONFIG_RTC_SYSTOHC is not set +CONFIG_RTC_SYSTOHC=y +CONFIG_RTC_SYSTOHC_DEVICE="rtc0" # CONFIG_RTC_DEBUG is not set CONFIG_RTC_NVMEM=y @@ -7782,7 +7783,7 @@ CONFIG_RTC_NVMEM=y CONFIG_RTC_INTF_SYSFS=y CONFIG_RTC_INTF_PROC=y CONFIG_RTC_INTF_DEV=y -CONFIG_RTC_INTF_DEV_UIE_EMUL=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set CONFIG_RTC_DRV_TEST=m # diff --git a/source/k/kernel-configs/config-huge-5.15.18 b/source/k/kernel-configs/config-huge-5.15.19 index c7f8abab3..bcd0bea6c 100644 --- a/source/k/kernel-configs/config-huge-5.15.18 +++ b/source/k/kernel-configs/config-huge-5.15.19 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.15.18 Kernel Configuration +# Linux/x86 5.15.19 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_IS_GCC=y @@ -7718,7 +7718,8 @@ CONFIG_RTC_LIB=y CONFIG_RTC_MC146818_LIB=y CONFIG_RTC_CLASS=y # CONFIG_RTC_HCTOSYS is not set -# CONFIG_RTC_SYSTOHC is not set +CONFIG_RTC_SYSTOHC=y +CONFIG_RTC_SYSTOHC_DEVICE="rtc0" # CONFIG_RTC_DEBUG is not set CONFIG_RTC_NVMEM=y @@ -7728,7 +7729,7 @@ CONFIG_RTC_NVMEM=y CONFIG_RTC_INTF_SYSFS=y CONFIG_RTC_INTF_PROC=y CONFIG_RTC_INTF_DEV=y -CONFIG_RTC_INTF_DEV_UIE_EMUL=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set CONFIG_RTC_DRV_TEST=m # diff --git a/source/k/kernel-configs/config-huge-5.15.18.x64 b/source/k/kernel-configs/config-huge-5.15.19.x64 index b996a3189..e83ac6feb 100644 --- a/source/k/kernel-configs/config-huge-5.15.18.x64 +++ b/source/k/kernel-configs/config-huge-5.15.19.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.15.18 Kernel Configuration +# Linux/x86 5.15.19 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_IS_GCC=y @@ -7685,7 +7685,8 @@ CONFIG_RTC_LIB=y CONFIG_RTC_MC146818_LIB=y CONFIG_RTC_CLASS=y # CONFIG_RTC_HCTOSYS is not set -# CONFIG_RTC_SYSTOHC is not set +CONFIG_RTC_SYSTOHC=y +CONFIG_RTC_SYSTOHC_DEVICE="rtc0" # CONFIG_RTC_DEBUG is not set CONFIG_RTC_NVMEM=y @@ -7695,7 +7696,7 @@ CONFIG_RTC_NVMEM=y CONFIG_RTC_INTF_SYSFS=y CONFIG_RTC_INTF_PROC=y CONFIG_RTC_INTF_DEV=y -CONFIG_RTC_INTF_DEV_UIE_EMUL=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set CONFIG_RTC_DRV_TEST=m # diff --git a/source/k/kernel-configs/config-huge-smp-5.15.18-smp b/source/k/kernel-configs/config-huge-smp-5.15.19-smp index 37e6c93d5..d120eacb0 100644 --- a/source/k/kernel-configs/config-huge-smp-5.15.18-smp +++ b/source/k/kernel-configs/config-huge-smp-5.15.19-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.15.18 Kernel Configuration +# Linux/x86 5.15.19 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_IS_GCC=y @@ -7772,7 +7772,8 @@ CONFIG_RTC_LIB=y CONFIG_RTC_MC146818_LIB=y CONFIG_RTC_CLASS=y # CONFIG_RTC_HCTOSYS is not set -# CONFIG_RTC_SYSTOHC is not set +CONFIG_RTC_SYSTOHC=y +CONFIG_RTC_SYSTOHC_DEVICE="rtc0" # CONFIG_RTC_DEBUG is not set CONFIG_RTC_NVMEM=y @@ -7782,7 +7783,7 @@ CONFIG_RTC_NVMEM=y CONFIG_RTC_INTF_SYSFS=y CONFIG_RTC_INTF_PROC=y CONFIG_RTC_INTF_DEV=y -CONFIG_RTC_INTF_DEV_UIE_EMUL=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set CONFIG_RTC_DRV_TEST=m # diff --git a/source/l/lcms2/fdbfb7694f9d7048d53674b79ddfc38068bfdaf7.patch b/source/l/lcms2/fdbfb7694f9d7048d53674b79ddfc38068bfdaf7.patch new file mode 100644 index 000000000..c9646799b --- /dev/null +++ b/source/l/lcms2/fdbfb7694f9d7048d53674b79ddfc38068bfdaf7.patch @@ -0,0 +1,41 @@ +From fdbfb7694f9d7048d53674b79ddfc38068bfdaf7 Mon Sep 17 00:00:00 2001 +From: Marti Maria <marti.maria@littlecms.com> +Date: Sun, 30 Jan 2022 16:56:48 +0100 +Subject: [PATCH] Fix for optimisation error on grayscale + +Thanks to Aaron Boxer for reporting this issue +--- + src/cmsintrp.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/cmsintrp.c b/src/cmsintrp.c +index 5cd6d16c..5eb98e6c 100644 +--- a/src/cmsintrp.c ++++ b/src/cmsintrp.c +@@ -278,10 +278,10 @@ void Eval1Input(CMSREGISTER const cmsUInt16Number Input[], + // if last value... + if (Input[0] == 0xffff || p16->Domain[0] == 0) { + +- cmsUInt16Number y0 = LutTable[p16->Domain[0]]; +- ++ cmsUInt32Number y0 = p16->Domain[0] * p16->opta[0]; ++ + for (OutChan = 0; OutChan < p16->nOutputs; OutChan++) { +- Output[OutChan] = y0; ++ Output[OutChan] = LutTable[y0 + OutChan]; + } + } + else +@@ -324,10 +324,10 @@ void Eval1InputFloat(const cmsFloat32Number Value[], + // if last value... + if (val2 == 1.0 || p->Domain[0] == 0) { + +- y0 = LutTable[p->Domain[0]]; ++ cmsUInt32Number start = p->Domain[0] * p->opta[0]; + + for (OutChan = 0; OutChan < p->nOutputs; OutChan++) { +- Output[OutChan] = y0; ++ Output[OutChan] = LutTable[start + OutChan]; + } + } + else diff --git a/source/l/lcms2/lcms2.SlackBuild b/source/l/lcms2/lcms2.SlackBuild index 6151d9e7a..16aabc241 100755 --- a/source/l/lcms2/lcms2.SlackBuild +++ b/source/l/lcms2/lcms2.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=lcms2 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) "} @@ -89,6 +89,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +zcat $CWD/fdbfb7694f9d7048d53674b79ddfc38068bfdaf7.patch.gz | patch -p1 --verbose || exit 1 + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ |