summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-10-28 22:05:38 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-10-30 13:22:48 +0000
commit2d787812e8619b2f114697dbc51f7fad39206ef5 (patch)
treea25fc0317edd35a7a6c16e009a805c77d4159f16 /meta/recipes-extended
parent50feea207e01cfe7d0324aba98cbc8e6d11dd018 (diff)
downloadpoky-2d787812e8619b2f114697dbc51f7fad39206ef5.tar.gz
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>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/CVE-2020-15900.patch54
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch24
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript_9.53.3.bb (renamed from meta/recipes-extended/ghostscript/ghostscript_9.52.bb)8
3 files changed, 12 insertions, 74 deletions
diff --git a/meta/recipes-extended/ghostscript/ghostscript/CVE-2020-15900.patch b/meta/recipes-extended/ghostscript/ghostscript/CVE-2020-15900.patch
deleted file mode 100644
index d7c5f034e5..0000000000
--- a/meta/recipes-extended/ghostscript/ghostscript/CVE-2020-15900.patch
+++ /dev/null
@@ -1,54 +0,0 @@
1From 5d499272b95a6b890a1397e11d20937de000d31b Mon Sep 17 00:00:00 2001
2From: Ray Johnston <ray.johnston@artifex.com>
3Date: Wed, 22 Jul 2020 09:57:54 -0700
4Subject: [PATCH] Bug 702582, CVE 2020-15900 Memory Corruption in Ghostscript
5 9.52
6
7Fix the 'rsearch' calculation for the 'post' size to give the correct
8size. Previous calculation would result in a size that was too large,
9and could underflow to max uint32_t. Also fix 'rsearch' to return the
10correct 'pre' string with empty string match.
11
12A future change may 'undefine' this undocumented, non-standard operator
13during initialization as we do with the many other non-standard internal
14PostScript operators and procedures.
15
16Upstream-Status: Backport [https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=5d499272b95a6b890a1397e11d20937de000d31b]
17CVE: CVE-2020-15900
18Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com>
19---
20 psi/zstring.c | 17 +++++++++++------
21 1 file changed, 11 insertions(+), 6 deletions(-)
22
23diff --git a/psi/zstring.c b/psi/zstring.c
24index 33662dafa..58e1af2b3 100644
25--- a/psi/zstring.c
26+++ b/psi/zstring.c
27@@ -142,13 +142,18 @@ search_impl(i_ctx_t *i_ctx_p, bool forward)
28 return 0;
29 found:
30 op->tas.type_attrs = op1->tas.type_attrs;
31- op->value.bytes = ptr;
32- r_set_size(op, size);
33+ op->value.bytes = ptr; /* match */
34+ op->tas.rsize = size; /* match */
35 push(2);
36- op[-1] = *op1;
37- r_set_size(op - 1, ptr - op[-1].value.bytes);
38- op1->value.bytes = ptr + size;
39- r_set_size(op1, count + (!forward ? (size - 1) : 0));
40+ op[-1] = *op1; /* pre */
41+ op[-3].value.bytes = ptr + size; /* post */
42+ if (forward) {
43+ op[-1].tas.rsize = ptr - op[-1].value.bytes; /* pre */
44+ op[-3].tas.rsize = count; /* post */
45+ } else {
46+ op[-1].tas.rsize = count; /* pre */
47+ op[-3].tas.rsize -= count + size; /* post */
48+ }
49 make_true(op);
50 return 0;
51 }
52--
532.17.1
54
diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch
index ffa269e3b2..5b57da2a97 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch
+++ b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch
@@ -1,7 +1,7 @@
1From 84bb692d6b047c09266de154f404af9817fa04aa Mon Sep 17 00:00:00 2001 1From 04a86a613e0f9bfbbad99874f72217f75e8c53a3 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com> 2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Thu, 29 Mar 2018 15:59:05 +0800 3Date: Thu, 29 Mar 2018 15:59:05 +0800
4Subject: [PATCH 01/10] contrib.mak: fix for parallel build 4Subject: [PATCH] contrib.mak: fix for parallel build
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7 7
@@ -9,23 +9,16 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
9 9
10Rebase to 9.23 10Rebase to 9.23
11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
12
12--- 13---
13 contrib/contrib.mak | 2 ++ 14 contrib/contrib.mak | 1 +
14 1 file changed, 2 insertions(+) 15 1 file changed, 1 insertion(+)
15 16
16diff --git a/contrib/contrib.mak b/contrib/contrib.mak 17diff --git a/contrib/contrib.mak b/contrib/contrib.mak
17index f5a2fa4..4999752 100644 18index 2edee7a..c9100e8 100644
18--- a/contrib/contrib.mak 19--- a/contrib/contrib.mak
19+++ b/contrib/contrib.mak 20+++ b/contrib/contrib.mak
20@@ -1067,6 +1067,7 @@ $(DEVOBJ)dviprlib.$(OBJ) : $(JAPSRC)dviprlib.c $(JAPSRC)dviprlib.h \ 21@@ -1241,6 +1241,7 @@ $(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH) \
21 $(DEVCC) $(O_)$@ $(C_) $(JAPSRC)dviprlib.c
22
23 extra-dmprt-install: install-libdata
24+ mkdir -p $(DESTDIR)$(gsdatadir)$(D)lib
25 $(INSTALL_DATA) $(JAPSRC)dmp_init.ps $(DESTDIR)$(gsdatadir)$(D)lib || exit 1
26 $(INSTALL_DATA) $(JAPSRC)dmp_site.ps $(DESTDIR)$(gsdatadir)$(D)lib || exit 1
27 $(INSTALL_DATA) $(JAPSRC)escp_24.src $(DESTDIR)$(gsdatadir)$(D)lib || exit 1
28@@ -1235,6 +1236,7 @@ $(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH) \
29 ### ----------------- Additional .upp files ---------------- ### 22 ### ----------------- Additional .upp files ---------------- ###
30 23
31 extra-upp-install: install-libdata 24 extra-upp-install: install-libdata
@@ -33,6 +26,3 @@ index f5a2fa4..4999752 100644
33 for f in $(CONTRIBSRC)uniprint$(D)*.upp; do \ 26 for f in $(CONTRIBSRC)uniprint$(D)*.upp; do \
34 $(INSTALL_DATA) $$f $(DESTDIR)$(gsdatadir)$(D)lib || exit 1; \ 27 $(INSTALL_DATA) $$f $(DESTDIR)$(gsdatadir)$(D)lib || exit 1; \
35 done 28 done
36--
371.8.3.1
38
diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.52.bb b/meta/recipes-extended/ghostscript/ghostscript_9.53.3.bb
index 65135f5821..cbf60c8c85 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_9.52.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_9.53.3.bb
@@ -34,7 +34,6 @@ SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/d
34SRC_URI = "${SRC_URI_BASE} \ 34SRC_URI = "${SRC_URI_BASE} \
35 file://ghostscript-9.21-prevent_recompiling.patch \ 35 file://ghostscript-9.21-prevent_recompiling.patch \
36 file://cups-no-gcrypt.patch \ 36 file://cups-no-gcrypt.patch \
37 file://CVE-2020-15900.patch \
38 " 37 "
39 38
40SRC_URI_class-native = "${SRC_URI_BASE} \ 39SRC_URI_class-native = "${SRC_URI_BASE} \
@@ -42,8 +41,7 @@ SRC_URI_class-native = "${SRC_URI_BASE} \
42 file://base-genht.c-add-a-preprocessor-define-to-allow-fope.patch \ 41 file://base-genht.c-add-a-preprocessor-define-to-allow-fope.patch \
43 " 42 "
44 43
45SRC_URI[md5sum] = "0f6964ab9b83a63b7e373f136243f901" 44SRC_URI[sha256sum] = "6eaf422f26a81854a230b80fd18aaef7e8d94d661485bd2e97e695b9dce7bf7f"
46SRC_URI[sha256sum] = "c2501d8e8e0814c4a5aa7e443e230e73d7af7f70287546f7b697e5ef49e32176"
47 45
48# Put something like 46# Put something like
49# 47#
@@ -84,6 +82,10 @@ BUILD_CFLAGS += "-DHAVE_SYS_TIME_H=1"
84 82
85inherit autotools-brokensep 83inherit autotools-brokensep
86 84
85do_configure_prepend_class-target () {
86 rm -rf ${S}/jpeg/
87}
88
87do_configure_append () { 89do_configure_append () {
88 # copy tools from the native ghostscript build 90 # copy tools from the native ghostscript build
89 if [ "${PN}" != "ghostscript-native" ]; then 91 if [ "${PN}" != "ghostscript-native" ]; then