mirror of
https://git.yoctoproject.org/poky
synced 2026-04-20 18:32:12 +02:00
ghostscript: upgrade 10.05.1 -> 10.06.0
Dropped 0001-Bug-708160-Fix-compatibility-with-C23-compilers.patch Added 0001-Fix-32-bit-build.patch to fix 32-bit archs build Added fPIC flag needed to prevent a linker error during the build process. This upgrade addresses CVEs: CVE-2025-59798, CVE-2025-59799, CVE-2025-59800, CVE-2025-59801 Changelog: https://ghostscript.readthedocs.io/en/gs10.06.0/News.html (From OE-Core rev: 0144e22195394ce2b21b476a1dcfde9129eaf615) Signed-off-by: Vijay Anusuri <vanusuri@mvista.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Vijay Anusuri
committed by
Richard Purdie
Richard Purdie
parent
21349d54a1
commit
e02f0d06a3
@@ -1,67 +0,0 @@
|
||||
From c595086bfe206776676e290df98cd09e91210e27 Mon Sep 17 00:00:00 2001
|
||||
From: Alex Cherepanov <alex@coscript.biz>
|
||||
Date: Thu, 3 Apr 2025 17:19:41 +0100
|
||||
Subject: [PATCH] Bug 708160: Fix compatibility with C23 compilers
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
* fixes:
|
||||
http://errors.yoctoproject.org/Errors/Details/853021/
|
||||
|
||||
In file included from ./base/genconf.c:18:
|
||||
./base/stdpre.h:348:13: error: ‘bool’ cannot be defined via ‘typedef’
|
||||
348 | typedef int bool;
|
||||
| ^~~~
|
||||
./base/stdpre.h:348:13: note: ‘bool’ is a keyword with ‘-std=c23’ onwards
|
||||
./base/stdpre.h:348:1: warning: useless type name in empty declaration
|
||||
348 | typedef int bool;
|
||||
| ^~~~~~~
|
||||
|
||||
Upstream-Status: Backport [Partial backport of https://cgit.ghostscript.com/cgi-bin/cgit.cgi/ghostpdl.git/commit/base/stdpre.h?id=ae940946473ceb8c5353bc6e7f04673c6e60502d]
|
||||
|
||||
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
|
||||
---
|
||||
base/stdpre.h | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/base/stdpre.h b/base/stdpre.h
|
||||
index dda30b6..2f9c84e 100644
|
||||
--- a/base/stdpre.h
|
||||
+++ b/base/stdpre.h
|
||||
@@ -1,4 +1,4 @@
|
||||
-/* Copyright (C) 2001-2023 Artifex Software, Inc.
|
||||
+/* Copyright (C) 2001-2025 Artifex Software, Inc.
|
||||
All Rights Reserved.
|
||||
|
||||
This software is provided AS-IS with no warranty, either express or
|
||||
@@ -341,7 +341,9 @@ typedef signed char schar;
|
||||
* and the MetroWerks C++ compiler insists that bool be equivalent to
|
||||
* unsigned char.
|
||||
*/
|
||||
-#ifndef __cplusplus
|
||||
+
|
||||
+/* C23 has bool as a builtin type. */
|
||||
+#if !defined(__cplusplus) && (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 202311L)
|
||||
#ifdef __BEOS__
|
||||
typedef unsigned char bool;
|
||||
#else
|
||||
diff --git a/base/gp.h b/base/gp.h
|
||||
index ad5bb61..cf2c9cf 100644
|
||||
--- a/base/gp.h
|
||||
+++ b/base/gp.h
|
||||
@@ -1,4 +1,4 @@
|
||||
-/* Copyright (C) 2001-2023 Artifex Software, Inc.
|
||||
+/* Copyright (C) 2001-2025 Artifex Software, Inc.
|
||||
All Rights Reserved.
|
||||
|
||||
This software is provided AS-IS with no warranty, either express or
|
||||
@@ -646,7 +646,7 @@ int gp_fseek_impl(FILE *strm, gs_offset_t offset, int origin);
|
||||
/* Create a second open gp_file on the basis of a given one */
|
||||
FILE *gp_fdup_impl(FILE *f, const char *mode);
|
||||
|
||||
-int gp_fseekable_impl(FILE *f);
|
||||
+bool gp_fseekable_impl(FILE *f);
|
||||
|
||||
/* Force given file into binary mode (no eol translations, etc) */
|
||||
/* if 2nd param true, text mode if 2nd param false */
|
||||
@@ -0,0 +1,63 @@
|
||||
From 3c0be6e4fcffa63e4a5a1b0aec057cebc4d2562f Mon Sep 17 00:00:00 2001
|
||||
From: Ken Sharp <Ken.Sharp@artifex.com>
|
||||
Date: Wed, 10 Sep 2025 08:55:30 +0100
|
||||
Subject: [PATCH] Fix 32-bit build
|
||||
|
||||
Bug #708824 "ghostscript 10.06.0 compilation failure on 32-bit archs"
|
||||
|
||||
nbytes shiouldn't be an intptr_t, it doesn't get used for pointer
|
||||
arithmetic. Previously it was a uint, should be a int64_t, to fit with
|
||||
all the other devices.
|
||||
|
||||
Checked other warnings, and found a (very minor) one in gdevdbit.c, fix
|
||||
that while we're here (signed/unsigned mismatch, we don't really care).
|
||||
|
||||
Upstream-Status: Backport [https://github.com/ArtifexSoftware/ghostpdl/commit/3c0be6e4fcffa63e4a5a1b0aec057cebc4d2562f]
|
||||
|
||||
Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
|
||||
---
|
||||
base/gdevdbit.c | 2 +-
|
||||
base/gdevmpla.c | 6 +++---
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/base/gdevdbit.c b/base/gdevdbit.c
|
||||
index e07cc3f3b8..1b5c69325b 100644
|
||||
--- a/base/gdevdbit.c
|
||||
+++ b/base/gdevdbit.c
|
||||
@@ -191,7 +191,7 @@ gx_default_copy_alpha_hl_color(gx_device * dev, const byte * data, int data_x,
|
||||
fit_copy(dev, data, data_x, raster, id, x, y, width, height);
|
||||
row_alpha = data;
|
||||
out_raster = bitmap_raster(width * (size_t)byte_depth);
|
||||
- if (check_64bit_multiply(out_raster, ncomps, &product) != 0)
|
||||
+ if (check_64bit_multiply(out_raster, ncomps, (int64_t *) &product) != 0)
|
||||
return gs_note_error(gs_error_undefinedresult);
|
||||
gb_buff = gs_alloc_bytes(mem, product, "copy_alpha_hl_color(gb_buff)");
|
||||
if (gb_buff == 0) {
|
||||
diff --git a/base/gdevmpla.c b/base/gdevmpla.c
|
||||
index 2f0d522561..ffc5ff42e6 100644
|
||||
--- a/base/gdevmpla.c
|
||||
+++ b/base/gdevmpla.c
|
||||
@@ -1954,12 +1954,12 @@ mem_planar_strip_copy_rop2(gx_device * dev,
|
||||
int i;
|
||||
int j;
|
||||
intptr_t chunky_sraster;
|
||||
- intptr_t nbytes;
|
||||
+ int64_t nbytes;
|
||||
byte **line_ptrs;
|
||||
byte *sbuf, *buf;
|
||||
|
||||
chunky_sraster = sraster * (intptr_t)mdev->num_planar_planes;
|
||||
- if (check_64bit_multiply(height, chunky_sraster, (size_t *)&nbytes) != 0)
|
||||
+ if (check_64bit_multiply(height, chunky_sraster, &nbytes) != 0)
|
||||
return gs_note_error(gs_error_undefinedresult);
|
||||
buf = gs_alloc_bytes(mdev->memory, nbytes, "mem_planar_strip_copy_rop(buf)");
|
||||
if (buf == NULL) {
|
||||
@@ -2003,7 +2003,7 @@ mem_planar_strip_copy_rop2(gx_device * dev,
|
||||
intptr_t i;
|
||||
intptr_t chunky_t_raster;
|
||||
int chunky_t_height;
|
||||
- intptr_t nbytes;
|
||||
+ int64_t nbytes;
|
||||
byte **line_ptrs;
|
||||
byte *tbuf, *buf;
|
||||
gx_strip_bitmap newtex;
|
||||
@@ -24,10 +24,10 @@ def gs_verdir(v):
|
||||
SRC_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${@gs_verdir("${PV}")}/${BPN}-${PV}.tar.gz \
|
||||
file://ghostscript-9.16-Werror-return-type.patch \
|
||||
file://avoid-host-contamination.patch \
|
||||
file://0001-Bug-708160-Fix-compatibility-with-C23-compilers.patch \
|
||||
file://0001-Fix-32-bit-build.patch \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "121861b6d29b2461dec6575c9f3cab665b810bd408d4ec02c86719fa708b0a49"
|
||||
SRC_URI[sha256sum] = "5bd6da34794928cc7e616f288e32bd0be7f9a5ca2d3c206a0af2c19a4e3a318f"
|
||||
|
||||
PACKAGECONFIG ??= ""
|
||||
PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3"
|
||||
@@ -47,7 +47,7 @@ EXTRA_OECONF:append:mipsarcho32 = " --with-large_color_index=0"
|
||||
EXTRA_OECONF:append:armv7a = "${@bb.utils.contains('TUNE_FEATURES','neon','',' --disable-neon',d)}"
|
||||
EXTRA_OECONF:append:armv7ve = "${@bb.utils.contains('TUNE_FEATURES','neon','',' --disable-neon',d)}"
|
||||
|
||||
TARGET_CFLAGS += "-std=gnu17"
|
||||
TARGET_CFLAGS += "-std=gnu17 -fPIC"
|
||||
|
||||
# Uses autoconf but not automake, can't do out-of-tree
|
||||
inherit autotools-brokensep pkgconfig
|
||||
Reference in New Issue
Block a user