summaryrefslogtreecommitdiff
path: root/source/l
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2022-02-02 04:17:39 +0000
committerEric Hameleers <alien@slackware.com>2022-02-02 08:59:53 +0100
commit8b3ff193a856f7dfb046794bc6bb235804372552 (patch)
tree15ff7f0b80e89ac0a5b805249a463c9d51caff9d /source/l
parentba74260aeb31600cdee80934088739a8e9869f21 (diff)
downloadcurrent-8b3ff193a856f7dfb046794bc6bb235804372552.tar.gz
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/l')
-rw-r--r--source/l/lcms2/fdbfb7694f9d7048d53674b79ddfc38068bfdaf7.patch41
-rwxr-xr-xsource/l/lcms2/lcms2.SlackBuild4
2 files changed, 44 insertions, 1 deletions
diff --git a/source/l/lcms2/fdbfb7694f9d7048d53674b79ddfc38068bfdaf7.patch b/source/l/lcms2/fdbfb7694f9d7048d53674b79ddfc38068bfdaf7.patch
new file mode 100644
index 00000000..c9646799
--- /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 6151d9e7..16aabc24 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 \