Fixes CVE-2023-28879.
Drop an upstreamed patch.
Signed-off-by: Ross Burton <ross.bur...@arm.com>
---
.../ghostscript/cross-compile.patch | 40 -------------------
...cript_10.0.0.bb => ghostscript_10.01.1.bb} | 3 +-
2 files changed, 1 insertion(+), 42 deletions(-)
delete mode 100644
meta/recipes-extended/ghostscript/ghostscript/cross-compile.patch
rename meta/recipes-extended/ghostscript/{ghostscript_10.0.0.bb =>
ghostscript_10.01.1.bb} (97%)
diff --git a/meta/recipes-extended/ghostscript/ghostscript/cross-compile.patch
b/meta/recipes-extended/ghostscript/ghostscript/cross-compile.patch
deleted file mode 100644
index ba62820df1e..00000000000
--- a/meta/recipes-extended/ghostscript/ghostscript/cross-compile.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 4c3575346b9c7d394ebc73b4e5fabebadd8877ec Mon Sep 17 00:00:00 2001
-From: Chris Liddell <chris.lidd...@artifex.com>
-Date: Thu, 24 Nov 2022 16:33:47 +0000
-Subject: [PATCH] Fix a little bitrot in the cross-compiling logic
-
-Removing the option to disable FAPI meant configuring for cross compiling would
-fail because the option being passed to the sub-call to configure would include
-an unknown command line option.
-
-Upstream-Status: Backport
[https://git.ghostscript.com/?p=ghostpdl.git;a=patch;f=configure.ac;h=4c3575346b9c7d394ebc73b4e5fabebadd8877ec]
-Signed-off-by: Alexander Kanavin <a...@linutronix.de>
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d5c68c4b3..738eb10a9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -138,7 +138,7 @@ if test x"$host" != x"$build" ; then
- echo $AUXFLAGS_MAK_LINE07 >> $AUXFLAGS_MAK.in
-
- AC_MSG_NOTICE([Begin recursive call to configure script (for auxiliary
tools)])
-- "$absolute_source_path/configure" CC="$CCAUX" CFLAGS="$CFLAGSAUX"
CPPFLAGS="$CPPFLAGSAUX" LDFLAGS="$LDFLAGSAUX" CCAUX= CFLAGSAUX= CFLAGSAUX=
MAKEFILE=$AUXFLAGS_MAK --host=$build --build=$build --enable-auxtools_only
--disable-hidden-visibility --with-local-zlib --without-libtiff
--disable-contrib --disable-fontconfig --disable-dbus --disable-freetype
--disable-fapi --disable-cups --disable-openjpeg --disable-gtk
--with-libiconv=no --without-libidn --without-libpaper --without-pdftoraster
--without-ijs --without-jbig2dec --without-x --with-drivers=""
-+ "$absolute_source_path/configure" CC="$CCAUX" CFLAGS="$CFLAGSAUX"
CPPFLAGS="$CPPFLAGSAUX" LDFLAGS="$LDFLAGSAUX" CCAUX= CFLAGSAUX= CFLAGSAUX=
MAKEFILE=$AUXFLAGS_MAK --host=$build --build=$build --enable-auxtools_only
--disable-hidden-visibility --with-local-zlib --without-libtiff
--disable-contrib --disable-fontconfig --disable-dbus --disable-freetype
--disable-cups --disable-openjpeg --disable-gtk --with-libiconv=no
--without-libidn --without-libpaper --without-pdftoraster --without-ijs
--without-jbig2dec --without-x --with-drivers=""
- status=$?
- cp config.log "$olddir/configaux.log"
- if test $status -eq 0 ; then
-@@ -2530,7 +2530,7 @@ PDF=
- PDF_MAK="\$(GLSRCDIR)\$(D)stub.mak"
- PDFROMFS_MAK="\$(GLSRCDIR)\$(D)stub.mak"
-
--if test x"$with_pdf" != x"no" ; then
-+if test x"$with_pdf" != x"no" -a x"$enable_auxtools_only" != x"yes" ; then
-
- if test x"$JBIG2_DECODER" = x""; then
- AC_MSG_ERROR([No JBIG2 decoder available, required for PDF support])
---
-2.25.1
-
diff --git a/meta/recipes-extended/ghostscript/ghostscript_10.0.0.bb
b/meta/recipes-extended/ghostscript/ghostscript_10.01.1.bb
similarity index 97%
rename from meta/recipes-extended/ghostscript/ghostscript_10.0.0.bb
rename to meta/recipes-extended/ghostscript/ghostscript_10.01.1.bb
index 56a93632e29..5d4b8cdc913 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_10.0.0.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_10.01.1.bb
@@ -33,7 +33,6 @@ SRC_URI_BASE =
"https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/d
file://do-not-check-local-libpng-source.patch \
file://avoid-host-contamination.patch \
file://mkdir-p.patch \
- file://cross-compile.patch \
"
SRC_URI = "${SRC_URI_BASE} \
@@ -45,7 +44,7 @@ SRC_URI:class-native = "${SRC_URI_BASE} \
file://base-genht.c-add-a-preprocessor-define-to-allow-fope.patch \
"
-SRC_URI[sha256sum] =
"a57764d70caf85e2fc0b0f59b83b92e25775631714dcdb97cc6e0cea414bb5a3"
+SRC_URI[sha256sum] =
"4df18a808cd4369f25e02dbcec2f133cb6d674627b2c6b1502020e58d43e32ce"
# Put something like
#
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#180822):
https://lists.openembedded.org/g/openembedded-core/message/180822
Mute This Topic: https://lists.openembedded.org/mt/98660715/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
