From: "Alexander Kanavin" <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Alexander Kanavin <alex.kanavin@gmail.com>
Subject: [PATCH 13/33] ghostscript: update 9.52 -> 9.53.3
Date: Wed, 28 Oct 2020 22:05:38 +0100 [thread overview]
Message-ID: <20201028210558.21070-13-alex.kanavin@gmail.com> (raw)
In-Reply-To: <20201028210558.21070-1-alex.kanavin@gmail.com>
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.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../ghostscript/CVE-2020-15900.patch | 54 -------------------
.../ghostscript-9.15-parallel-make.patch | 24 +++------
...stscript_9.52.bb => ghostscript_9.53.3.bb} | 8 +--
3 files changed, 12 insertions(+), 74 deletions(-)
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2020-15900.patch
rename meta/recipes-extended/ghostscript/{ghostscript_9.52.bb => ghostscript_9.53.3.bb} (96%)
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 @@
-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
-
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 @@
-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
-
diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.52.bb b/meta/recipes-extended/ghostscript/ghostscript_9.53.3.bb
similarity index 96%
rename from meta/recipes-extended/ghostscript/ghostscript_9.52.bb
rename to 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
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
--
2.29.0
next prev parent reply other threads:[~2020-10-28 21:06 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-28 21:05 [PATCH 01/33] systemd-boot: upgrade 246.2 -> 246.6 Alexander Kanavin
2020-10-28 21:05 ` [PATCH 02/33] glib-2.0: upgrade 2.64.5 -> 2.66.1 Alexander Kanavin
2020-10-29 3:51 ` [OE-core] " Khem Raj
2020-10-29 9:55 ` Alexander Kanavin
2020-10-29 20:13 ` Khem Raj
2020-10-28 21:05 ` [PATCH 03/33] cmake: update 3.18.2 -> 3.18.4 Alexander Kanavin
2020-10-28 21:05 ` [PATCH 04/33] python3-pygobject: upgrade 3.36.1 -> 3.38.0 Alexander Kanavin
2020-10-28 21:56 ` [OE-core] " Khem Raj
2020-10-29 9:49 ` Alexander Kanavin
2020-10-29 20:12 ` Khem Raj
2020-10-28 21:05 ` [PATCH 05/33] libdazzle: upgrade 3.36.0 " Alexander Kanavin
2020-10-28 21:05 ` [PATCH 06/33] gobject-introspection: upgrade 1.64.1 -> 1.66.1 Alexander Kanavin
2020-10-28 21:05 ` [PATCH 07/33] json-glib: upgrade 1.4.4 -> 1.6.0 Alexander Kanavin
2020-10-28 21:05 ` [PATCH 08/33] ovmf: update edk2-stable202005 -> edk2-stable202008 Alexander Kanavin
2020-10-28 21:05 ` [PATCH 09/33] gnu-config: update to latest revision Alexander Kanavin
2020-10-28 21:05 ` [PATCH 10/33] file: enable all built-in compression checkers Alexander Kanavin
2020-10-28 21:05 ` [PATCH 11/33] rpm: update 4.15.1 -> 4.16.0 Alexander Kanavin
2020-10-31 22:30 ` [OE-core] " Khem Raj
2020-10-28 21:05 ` [PATCH 12/33] elfutils: update 0.180 -> 0.181 Alexander Kanavin
2020-10-28 21:05 ` Alexander Kanavin [this message]
2020-10-28 21:05 ` [PATCH 14/33] ltp: update 20200515 -> 20200930 Alexander Kanavin
2020-10-28 21:05 ` [PATCH 15/33] gsettings-desktop-schemas: update 3.36.1 -> 3.38.0 Alexander Kanavin
2020-10-28 21:05 ` [PATCH 16/33] libsecret: update 0.20.3 -> 0.20.4 Alexander Kanavin
2020-10-28 21:05 ` [PATCH 17/33] mesa: update 20.1.8 -> 20.2.1 Alexander Kanavin
2020-10-28 21:05 ` [PATCH 18/33] xf86-video-vesa: update 2.4.0 -> 2.5.0 Alexander Kanavin
2020-10-28 21:05 ` [PATCH 19/33] lttng-modules: update 2.12.2 -> 2.12.3 Alexander Kanavin
2020-10-28 21:05 ` [PATCH 20/33] webkitgtk: update 2.28.4 -> 2.30.1 Alexander Kanavin
2020-11-06 2:42 ` [PATCH] webkitgtk: fix opengl PACKAGECONFIG Martin Jansa
2020-11-06 3:38 ` [PATCH] webkitgtk: fix build with x11 enabled Martin Jansa
2020-10-28 21:05 ` [PATCH 21/33] dos2unix: update 7.4.1 -> 7.4.2 Alexander Kanavin
2020-10-28 21:05 ` [PATCH 22/33] gnutls: update 3.16.4 -> 3.16.5 Alexander Kanavin
2020-10-28 21:05 ` [PATCH 23/33] libcap: update 2.43 -> 2.44 Alexander Kanavin
2020-10-28 21:05 ` [PATCH 24/33] vte: update 0.60.3 -> 0.62.1 Alexander Kanavin
2020-10-28 21:05 ` [PATCH 25/33] libhandy: upgrade 0.0.13 -> 1.0.0 Alexander Kanavin
2020-10-28 22:09 ` [OE-core] " Khem Raj
2020-10-29 9:49 ` Alexander Kanavin
2020-10-28 21:05 ` [PATCH 26/33] libportal: add a recipe Alexander Kanavin
2020-10-28 21:05 ` [PATCH 27/33] epiphany: upgrade 3.36.4 -> 3.38.1 Alexander Kanavin
2020-10-28 21:05 ` [PATCH 28/33] gtk-doc: upgrade 1.32 -> 1.33.0 Alexander Kanavin
2020-10-28 21:05 ` [PATCH 29/33] rpm: adjust MIPS64 N32 support Alexander Kanavin
2020-10-28 21:05 ` [PATCH 30/33] apt: remove host contamination with gtest Alexander Kanavin
2020-10-28 21:05 ` [PATCH 31/33] opkg-utils: correct priority matching in update-alternatives Alexander Kanavin
2020-10-28 21:05 ` [PATCH 32/33] libxml2: add a patch to fix python 3.9 support Alexander Kanavin
2020-10-28 21:05 ` [PATCH 33/33] python: update 3.8.5 -> 3.9.0 Alexander Kanavin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201028210558.21070-13-alex.kanavin@gmail.com \
--to=alex.kanavin@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox