mirror of
https://git.yoctoproject.org/poky
synced 2026-04-20 00:32:13 +02:00
ghostscript: update 9.52 -> 9.53.3
ghostscript-9.15-parallel-make.patch rebased; one of the chunks removed upstream. Remove bundled jpeg source, as that seems to be the only way to get ghostscript to fall back to system jpeg library. (From OE-Core rev: ad8c8ffc5a008872d40a36ea825da30accd6a11a) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
committed by
Richard Purdie
Richard Purdie
parent
50feea207e
commit
2d787812e8
@@ -1,54 +0,0 @@
|
||||
From 5d499272b95a6b890a1397e11d20937de000d31b Mon Sep 17 00:00:00 2001
|
||||
From: Ray Johnston <ray.johnston@artifex.com>
|
||||
Date: Wed, 22 Jul 2020 09:57:54 -0700
|
||||
Subject: [PATCH] Bug 702582, CVE 2020-15900 Memory Corruption in Ghostscript
|
||||
9.52
|
||||
|
||||
Fix the 'rsearch' calculation for the 'post' size to give the correct
|
||||
size. Previous calculation would result in a size that was too large,
|
||||
and could underflow to max uint32_t. Also fix 'rsearch' to return the
|
||||
correct 'pre' string with empty string match.
|
||||
|
||||
A future change may 'undefine' this undocumented, non-standard operator
|
||||
during initialization as we do with the many other non-standard internal
|
||||
PostScript operators and procedures.
|
||||
|
||||
Upstream-Status: Backport [https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=5d499272b95a6b890a1397e11d20937de000d31b]
|
||||
CVE: CVE-2020-15900
|
||||
Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com>
|
||||
---
|
||||
psi/zstring.c | 17 +++++++++++------
|
||||
1 file changed, 11 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/psi/zstring.c b/psi/zstring.c
|
||||
index 33662dafa..58e1af2b3 100644
|
||||
--- a/psi/zstring.c
|
||||
+++ b/psi/zstring.c
|
||||
@@ -142,13 +142,18 @@ search_impl(i_ctx_t *i_ctx_p, bool forward)
|
||||
return 0;
|
||||
found:
|
||||
op->tas.type_attrs = op1->tas.type_attrs;
|
||||
- op->value.bytes = ptr;
|
||||
- r_set_size(op, size);
|
||||
+ op->value.bytes = ptr; /* match */
|
||||
+ op->tas.rsize = size; /* match */
|
||||
push(2);
|
||||
- op[-1] = *op1;
|
||||
- r_set_size(op - 1, ptr - op[-1].value.bytes);
|
||||
- op1->value.bytes = ptr + size;
|
||||
- r_set_size(op1, count + (!forward ? (size - 1) : 0));
|
||||
+ op[-1] = *op1; /* pre */
|
||||
+ op[-3].value.bytes = ptr + size; /* post */
|
||||
+ if (forward) {
|
||||
+ op[-1].tas.rsize = ptr - op[-1].value.bytes; /* pre */
|
||||
+ op[-3].tas.rsize = count; /* post */
|
||||
+ } else {
|
||||
+ op[-1].tas.rsize = count; /* pre */
|
||||
+ op[-3].tas.rsize -= count + size; /* post */
|
||||
+ }
|
||||
make_true(op);
|
||||
return 0;
|
||||
}
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 84bb692d6b047c09266de154f404af9817fa04aa Mon Sep 17 00:00:00 2001
|
||||
From 04a86a613e0f9bfbbad99874f72217f75e8c53a3 Mon Sep 17 00:00:00 2001
|
||||
From: Robert Yang <liezhi.yang@windriver.com>
|
||||
Date: Thu, 29 Mar 2018 15:59:05 +0800
|
||||
Subject: [PATCH 01/10] contrib.mak: fix for parallel build
|
||||
Subject: [PATCH] contrib.mak: fix for parallel build
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
@@ -9,23 +9,16 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
||||
|
||||
Rebase to 9.23
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
|
||||
---
|
||||
contrib/contrib.mak | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
contrib/contrib.mak | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/contrib/contrib.mak b/contrib/contrib.mak
|
||||
index f5a2fa4..4999752 100644
|
||||
index 2edee7a..c9100e8 100644
|
||||
--- a/contrib/contrib.mak
|
||||
+++ b/contrib/contrib.mak
|
||||
@@ -1067,6 +1067,7 @@ $(DEVOBJ)dviprlib.$(OBJ) : $(JAPSRC)dviprlib.c $(JAPSRC)dviprlib.h \
|
||||
$(DEVCC) $(O_)$@ $(C_) $(JAPSRC)dviprlib.c
|
||||
|
||||
extra-dmprt-install: install-libdata
|
||||
+ mkdir -p $(DESTDIR)$(gsdatadir)$(D)lib
|
||||
$(INSTALL_DATA) $(JAPSRC)dmp_init.ps $(DESTDIR)$(gsdatadir)$(D)lib || exit 1
|
||||
$(INSTALL_DATA) $(JAPSRC)dmp_site.ps $(DESTDIR)$(gsdatadir)$(D)lib || exit 1
|
||||
$(INSTALL_DATA) $(JAPSRC)escp_24.src $(DESTDIR)$(gsdatadir)$(D)lib || exit 1
|
||||
@@ -1235,6 +1236,7 @@ $(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH) \
|
||||
@@ -1241,6 +1241,7 @@ $(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH) \
|
||||
### ----------------- Additional .upp files ---------------- ###
|
||||
|
||||
extra-upp-install: install-libdata
|
||||
@@ -33,6 +26,3 @@ index f5a2fa4..4999752 100644
|
||||
for f in $(CONTRIBSRC)uniprint$(D)*.upp; do \
|
||||
$(INSTALL_DATA) $$f $(DESTDIR)$(gsdatadir)$(D)lib || exit 1; \
|
||||
done
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
||||
@@ -34,7 +34,6 @@ SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/d
|
||||
SRC_URI = "${SRC_URI_BASE} \
|
||||
file://ghostscript-9.21-prevent_recompiling.patch \
|
||||
file://cups-no-gcrypt.patch \
|
||||
file://CVE-2020-15900.patch \
|
||||
"
|
||||
|
||||
SRC_URI_class-native = "${SRC_URI_BASE} \
|
||||
@@ -42,8 +41,7 @@ SRC_URI_class-native = "${SRC_URI_BASE} \
|
||||
file://base-genht.c-add-a-preprocessor-define-to-allow-fope.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "0f6964ab9b83a63b7e373f136243f901"
|
||||
SRC_URI[sha256sum] = "c2501d8e8e0814c4a5aa7e443e230e73d7af7f70287546f7b697e5ef49e32176"
|
||||
SRC_URI[sha256sum] = "6eaf422f26a81854a230b80fd18aaef7e8d94d661485bd2e97e695b9dce7bf7f"
|
||||
|
||||
# Put something like
|
||||
#
|
||||
@@ -84,6 +82,10 @@ BUILD_CFLAGS += "-DHAVE_SYS_TIME_H=1"
|
||||
|
||||
inherit autotools-brokensep
|
||||
|
||||
do_configure_prepend_class-target () {
|
||||
rm -rf ${S}/jpeg/
|
||||
}
|
||||
|
||||
do_configure_append () {
|
||||
# copy tools from the native ghostscript build
|
||||
if [ "${PN}" != "ghostscript-native" ]; then
|
||||
Reference in New Issue
Block a user