mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
ghostscript: 9.21 -> 9.23
1. Drop backported patches - CVE-2017-7207.patch - CVE-2017-5951.patch - CVE-2017-7975.patch - CVE-2017-9216.patch - CVE-2017-9611.patch - CVE-2017-9612.patch - CVE-2017-9739.patch - CVE-2017-9726.patch - CVE-2017-9727.patch - CVE-2017-9835.patch - CVE-2017-11714.patch 2. Rebase to 9.23 - ghostscript-9.15-parallel-make.patch - ghostscript-9.16-Werror-return-type.patch - do-not-check-local-libpng-source.patch - avoid-host-contamination.patch - mkdir-p.patch - ghostscript-9.21-prevent_recompiling.patch - ghostscript-9.02-genarch.patch - cups-no-gcrypt.patch - ghostscript-9.21-native-fix-disable-system-libtiff.patch - base-genht.c-add-a-preprocessor-define-to-allow-fope.patch 3. Add packps from (native to target) to support cross compiling. 4. Add remove-direct-symlink.patch to fix do_populate_sysroot failure (From OE-Core rev: f8b4636472c6784fb78ca09a7dd7ebe53011f631) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Hongxu Jia
committed by
Richard Purdie
Richard Purdie
parent
4b155ccd4b
commit
49e0838e1d
@@ -1,7 +1,7 @@
|
||||
From 5ef8b85bc98f3bd9a15d5f47e24d3e23ae27c265 Mon Sep 17 00:00:00 2001
|
||||
From a954bf29a5f906b3151dffbecb5856e02e1565da Mon Sep 17 00:00:00 2001
|
||||
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
Date: Mon, 18 Jan 2016 01:00:30 -0500
|
||||
Subject: [PATCH] configure.ac: do not check local png source
|
||||
Subject: [PATCH 03/10] configure.ac: do not check local png source
|
||||
|
||||
In oe-core, it did not need to compile local libpng
|
||||
source in ghostscript, so do not check local png
|
||||
@@ -16,10 +16,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index bf6d3f5..01df03f 100644
|
||||
index 9341930..80a60b1 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -930,11 +930,11 @@ AC_SUBST(ZLIBDIR)
|
||||
@@ -1114,11 +1114,11 @@ AC_SUBST(ZLIBDIR)
|
||||
AC_SUBST(FT_SYS_ZLIB)
|
||||
|
||||
dnl png for the png output device; it also requires zlib
|
||||
@@ -34,5 +34,5 @@ index bf6d3f5..01df03f 100644
|
||||
SHARE_LIBPNG=0
|
||||
LIBPNGDIR=$srcdir/libpng
|
||||
--
|
||||
2.8.1
|
||||
1.8.3.1
|
||||
|
||||
|
||||
@@ -1,61 +0,0 @@
|
||||
From 671fd59eb657743aa86fbc1895cb15872a317caa Mon Sep 17 00:00:00 2001
|
||||
From: Chris Liddell <chris.liddell@artifex.com>
|
||||
Date: Thu, 6 Jul 2017 14:54:02 +0100
|
||||
Subject: [PATCH] Bug 698158: prevent trying to reloc a freed object
|
||||
|
||||
In the token reader, we pass the scanner state structure around as a
|
||||
t_struct ref on the Postscript operand stack.
|
||||
|
||||
But we explicitly free the scanner state when we're done, which leaves a
|
||||
dangling reference on the operand stack and, unless that reference gets
|
||||
overwritten before the next garbager run, we can end up with the garbager
|
||||
trying to deal with an already freed object - that can cause a crash, or
|
||||
memory corruption.
|
||||
---
|
||||
psi/ztoken.c | 14 +++++++++++++-
|
||||
1 file changed, 13 insertions(+), 1 deletion(-)
|
||||
|
||||
--- end of original header
|
||||
|
||||
CVE: CVE-2017-11714
|
||||
|
||||
Upstream-Status: Backport [git://git.ghostscript.com/ghostpdl.git]
|
||||
|
||||
Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
||||
|
||||
diff --git a/psi/ztoken.c b/psi/ztoken.c
|
||||
index 4dba7c5..af1ceeb 100644
|
||||
--- a/psi/ztoken.c
|
||||
+++ b/psi/ztoken.c
|
||||
@@ -107,6 +107,12 @@ token_continue(i_ctx_t *i_ctx_p, scanner_state * pstate, bool save)
|
||||
int code;
|
||||
ref token;
|
||||
|
||||
+ /* Since we might free pstate below, and we're dealing with
|
||||
+ * gc memory referenced by the stack, we need to explicitly
|
||||
+ * remove the reference to pstate from the stack, otherwise
|
||||
+ * the garbager will fall over
|
||||
+ */
|
||||
+ make_null(osp);
|
||||
/* Note that gs_scan_token may change osp! */
|
||||
pop(1); /* remove the file or scanner state */
|
||||
again:
|
||||
@@ -183,8 +189,14 @@ ztokenexec_continue(i_ctx_t *i_ctx_p)
|
||||
static int
|
||||
tokenexec_continue(i_ctx_t *i_ctx_p, scanner_state * pstate, bool save)
|
||||
{
|
||||
- os_ptr op;
|
||||
+ os_ptr op = osp;
|
||||
int code;
|
||||
+ /* Since we might free pstate below, and we're dealing with
|
||||
+ * gc memory referenced by the stack, we need to explicitly
|
||||
+ * remove the reference to pstate from the stack, otherwise
|
||||
+ * the garbager will fall over
|
||||
+ */
|
||||
+ make_null(osp);
|
||||
/* Note that gs_scan_token may change osp! */
|
||||
pop(1);
|
||||
again:
|
||||
--
|
||||
1.7.9.5
|
||||
|
||||
@@ -1,44 +0,0 @@
|
||||
From bfa6b2ecbe48edc69a7d9d22a12419aed25960b8 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Liddell <chris.liddell@artifex.com>
|
||||
Date: Thu, 6 Apr 2017 16:44:54 +0100
|
||||
Subject: [PATCH] Bug 697548: use the correct param list enumerator
|
||||
|
||||
When we encountered dictionary in a ref_param_list, we were using the enumerator
|
||||
for the "parent" param_list, rather than the enumerator for the param_list
|
||||
we just created for the dictionary. That parent was usually the stack
|
||||
list enumerator, and caused a segfault.
|
||||
|
||||
Using the correct enumerator works better.
|
||||
|
||||
Upstream-Status: Backport
|
||||
CVE: CVE-2017-5951
|
||||
|
||||
Signed-off-by: Catalin Enache <catalin.enache@windriver.com>
|
||||
---
|
||||
psi/iparam.c | 7 ++++---
|
||||
1 file changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/psi/iparam.c b/psi/iparam.c
|
||||
index 4e63b6d..b2fa85f 100644
|
||||
--- a/psi/iparam.c
|
||||
+++ b/psi/iparam.c
|
||||
@@ -770,12 +770,13 @@ ref_param_read_typed(gs_param_list * plist, gs_param_name pkey,
|
||||
gs_param_enumerator_t enumr;
|
||||
gs_param_key_t key;
|
||||
ref_type keytype;
|
||||
+ dict_param_list *dlist = (dict_param_list *) pvalue->value.d.list;
|
||||
|
||||
param_init_enumerator(&enumr);
|
||||
- if (!(*((iparam_list *) plist)->enumerate)
|
||||
- ((iparam_list *) pvalue->value.d.list, &enumr, &key, &keytype)
|
||||
+ if (!(*(dlist->enumerate))
|
||||
+ ((iparam_list *) dlist, &enumr, &key, &keytype)
|
||||
&& keytype == t_integer) {
|
||||
- ((dict_param_list *) pvalue->value.d.list)->int_keys = 1;
|
||||
+ dlist->int_keys = 1;
|
||||
pvalue->type = gs_param_type_dict_int_keys;
|
||||
}
|
||||
}
|
||||
--
|
||||
2.10.2
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
From 0e88bee1304993668fede72498d656a2dd33a35e Mon Sep 17 00:00:00 2001
|
||||
From: Ken Sharp <ken.sharp@artifex.com>
|
||||
Date: Mon, 20 Mar 2017 09:34:11 +0000
|
||||
Subject: [PATCH] Ensure a device has raster memory, before trying to read it.
|
||||
|
||||
Bug #697676 "Null pointer dereference in mem_get_bits_rectangle()"
|
||||
|
||||
This is only possible by abusing/mis-using Ghostscript-specific
|
||||
language extensions, so cannot happen in a general PostScript program.
|
||||
|
||||
Nevertheless, Ghostscript should not crash. So this commit checks the
|
||||
memory device to see if raster memory has been allocated, before trying
|
||||
to read from it.
|
||||
|
||||
Upstream-Status: Backport
|
||||
CVE: CVE-2017-7207
|
||||
|
||||
Author: Ken Sharp <ken.sharp@artifex.com>
|
||||
Signed-off-by: Catalin Enache <catalin.enache@windriver.com>
|
||||
---
|
||||
base/gdevmem.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/base/gdevmem.c b/base/gdevmem.c
|
||||
index 41108ba..183f96d 100644
|
||||
--- a/base/gdevmem.c
|
||||
+++ b/base/gdevmem.c
|
||||
@@ -605,6 +605,8 @@ mem_get_bits_rectangle(gx_device * dev, const gs_int_rect * prect,
|
||||
GB_PACKING_CHUNKY | GB_COLORS_NATIVE | GB_ALPHA_NONE;
|
||||
return_error(gs_error_rangecheck);
|
||||
}
|
||||
+ if (mdev->line_ptrs == 0x00)
|
||||
+ return_error(gs_error_rangecheck);
|
||||
if ((w <= 0) | (h <= 0)) {
|
||||
if ((w | h) < 0)
|
||||
return_error(gs_error_rangecheck);
|
||||
--
|
||||
2.10.2
|
||||
|
||||
@@ -1,37 +0,0 @@
|
||||
From b39be1019b4acc1aa50c6026463c543332e95a31 Mon Sep 17 00:00:00 2001
|
||||
From: Catalin Enache <catalin.enache@windriver.com>
|
||||
Date: Mon, 8 May 2017 16:18:14 +0300
|
||||
|
||||
Subject: [PATCH] Bug 697693: Prevent SEGV due to integer overflow.
|
||||
|
||||
While building a Huffman table, the start and end points were susceptible
|
||||
to integer overflow.
|
||||
|
||||
Thank you to Jiaqi for finding this issue and suggesting a patch.
|
||||
|
||||
Upstream-Status: Backport
|
||||
CVE: CVE-2017-7975
|
||||
|
||||
Signed-off-by: Catalin Enache <catalin.enache@windriver.com>
|
||||
|
||||
Contents of this patch were extracted from a larger patch which addressed
|
||||
two CVE's. The context (location of {) was also modified to apply to
|
||||
ghostscript 9.21.
|
||||
|
||||
Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
||||
|
||||
|
||||
--- a/jbig2dec/jbig2_huffman.c
|
||||
+++ b/jbig2dec/jbig2_huffman.c
|
||||
@@ -421,8 +421,8 @@ jbig2_build_huffman_table(Jbig2Ctx *ctx,
|
||||
|
||||
if (PREFLEN == CURLEN) {
|
||||
int RANGELEN = lines[CURTEMP].RANGELEN;
|
||||
- int start_j = CURCODE << shift;
|
||||
- int end_j = (CURCODE + 1) << shift;
|
||||
+ uint32_t start_j = CURCODE << shift;
|
||||
+ uint32_t end_j = (CURCODE + 1) << shift;
|
||||
byte eflags = 0;
|
||||
|
||||
if (end_j > max_j) {
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
From 3ebffb1d96ba0cacec23016eccb4047dab365853 Mon Sep 17 00:00:00 2001
|
||||
From: Shailesh Mistry <shailesh.mistry@hotmail.co.uk>
|
||||
Date: Wed, 24 May 2017 19:29:57 +0100
|
||||
Subject: [PATCH] Bug 697934: Fix SEGV due to error code being ignored.
|
||||
|
||||
The return code from jbig2_decode_text_region was being ignored so the
|
||||
code continued to try and parse the invalid file using incomplete/empty
|
||||
structures.
|
||||
|
||||
Upstream-Status: Backport
|
||||
CVE: CVE-2017-9216
|
||||
|
||||
Signed-off-by: Catalin Enache <catalin.enache@windriver.com>
|
||||
---
|
||||
jbig2dec/jbig2_symbol_dict.c | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/jbig2dec/jbig2_symbol_dict.c b/jbig2dec/jbig2_symbol_dict.c
|
||||
index 3cc1731..672425d 100644
|
||||
--- a/jbig2dec/jbig2_symbol_dict.c
|
||||
+++ b/jbig2dec/jbig2_symbol_dict.c
|
||||
@@ -493,8 +493,10 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
|
||||
}
|
||||
|
||||
/* multiple symbols are handled as a text region */
|
||||
- jbig2_decode_text_region(ctx, segment, tparams, (const Jbig2SymbolDict * const *)refagg_dicts,
|
||||
+ code = jbig2_decode_text_region(ctx, segment, tparams, (const Jbig2SymbolDict * const *)refagg_dicts,
|
||||
n_refagg_dicts, image, data, size, GR_stats, as, ws);
|
||||
+ if (code < 0)
|
||||
+ goto cleanup4;
|
||||
|
||||
SDNEWSYMS->glyphs[NSYMSDECODED] = image;
|
||||
refagg_dicts[0]->glyphs[params->SDNUMINSYMS + NSYMSDECODED] = jbig2_image_clone(ctx, SDNEWSYMS->glyphs[NSYMSDECODED]);
|
||||
--
|
||||
2.10.2
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
From c7c55972758a93350882c32147801a3485b010fe Mon Sep 17 00:00:00 2001
|
||||
From: Chris Liddell <chris.liddell@artifex.com>
|
||||
Date: Mon, 12 Jun 2017 13:08:40 +0100
|
||||
Subject: [PATCH] Bug 698024: bounds check zone pointer in Ins_MIRP()
|
||||
|
||||
---
|
||||
base/ttinterp.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
--- end of original header
|
||||
|
||||
CVE: CVE-2017-9611
|
||||
|
||||
Upstream-Status: Backport [git://git.ghostscript.com/ghostpdl.git]
|
||||
|
||||
Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
||||
|
||||
diff --git a/base/ttinterp.c b/base/ttinterp.c
|
||||
index e56aec6..f6a6d95 100644
|
||||
--- a/base/ttinterp.c
|
||||
+++ b/base/ttinterp.c
|
||||
@@ -3858,7 +3858,8 @@ static int nInstrCount=0;
|
||||
/* XXX: UNDOCUMENTED! cvt[-1] = 0 always */
|
||||
|
||||
if ( BOUNDS( args[0], CUR.zp1.n_points ) ||
|
||||
- BOUNDS( args[1]+1, CUR.cvtSize+1 ) )
|
||||
+ BOUNDS( args[1]+1, CUR.cvtSize+1 ) ||
|
||||
+ BOUNDS(CUR.GS.rp0, CUR.zp0.n_points) )
|
||||
{
|
||||
CUR.error = TT_Err_Invalid_Reference;
|
||||
return;
|
||||
--
|
||||
1.7.9.5
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
From 98f6da60b9d463c617e631fc254cf6d66f2e8e3c Mon Sep 17 00:00:00 2001
|
||||
From: Chris Liddell <chris.liddell@artifex.com>
|
||||
Date: Mon, 12 Jun 2017 13:15:17 +0100
|
||||
Subject: [PATCH] Bug 698026: bounds check zone pointers in Ins_IP()
|
||||
|
||||
---
|
||||
base/ttinterp.c | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
--- end of original header
|
||||
|
||||
CVE: CVE-2017-9612
|
||||
|
||||
Upstream-Status: Backport [git://git.ghostscript.com/ghostpdl.git]
|
||||
|
||||
Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
||||
|
||||
diff --git a/base/ttinterp.c b/base/ttinterp.c
|
||||
index f6a6d95..e7c9d68 100644
|
||||
--- a/base/ttinterp.c
|
||||
+++ b/base/ttinterp.c
|
||||
@@ -4129,7 +4129,9 @@ static int nInstrCount=0;
|
||||
Int point;
|
||||
(void)args;
|
||||
|
||||
- if ( CUR.top < CUR.GS.loop )
|
||||
+ if ( CUR.top < CUR.GS.loop ||
|
||||
+ BOUNDS(CUR.GS.rp1, CUR.zp0.n_points) ||
|
||||
+ BOUNDS(CUR.GS.rp2, CUR.zp1.n_points))
|
||||
{
|
||||
CUR.error = TT_Err_Invalid_Reference;
|
||||
return;
|
||||
--
|
||||
1.7.9.5
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
From 7755e67116e8973ee0e3b22d653df026a84fa01b Mon Sep 17 00:00:00 2001
|
||||
From: Chris Liddell <chris.liddell@artifex.com>
|
||||
Date: Thu, 15 Jun 2017 08:58:31 +0100
|
||||
Subject: [PATCH] Bug 698055: bounds check zone pointer in Ins_MDRP
|
||||
|
||||
---
|
||||
base/ttinterp.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
--- end of original header
|
||||
|
||||
CVE: CVE-2017-9726
|
||||
|
||||
Upstream-Status: Backport [git://git.ghostscript.com/ghostpdl.git]
|
||||
|
||||
Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
||||
diff --git a/base/ttinterp.c b/base/ttinterp.c
|
||||
index e7c9d68..af457e8 100644
|
||||
--- a/base/ttinterp.c
|
||||
+++ b/base/ttinterp.c
|
||||
@@ -3770,7 +3770,8 @@ static int nInstrCount=0;
|
||||
|
||||
point = (Int)args[0];
|
||||
|
||||
- if ( BOUNDS( args[0], CUR.zp1.n_points ) )
|
||||
+ if ( BOUNDS( args[0], CUR.zp1.n_points ) ||
|
||||
+ BOUNDS( CUR.GS.rp0, CUR.zp0.n_points) )
|
||||
{
|
||||
/* Current version of FreeType silently ignores this out of bounds error
|
||||
* and drops the instruction, see bug #691121
|
||||
--
|
||||
1.7.9.5
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
From 937ccd17ac65935633b2ebc06cb7089b91e17e6b Mon Sep 17 00:00:00 2001
|
||||
From: Chris Liddell <chris.liddell@artifex.com>
|
||||
Date: Thu, 15 Jun 2017 09:05:20 +0100
|
||||
Subject: [PATCH] Bug 698056: make bounds check in gx_ttfReader__Read more
|
||||
robust
|
||||
|
||||
---
|
||||
base/gxttfb.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
--- end of original header
|
||||
|
||||
CVE: CVE-2017-9727
|
||||
|
||||
Upstream-Status: Backport [git://git.ghostscript.com/ghostpdl.git]
|
||||
|
||||
Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
||||
|
||||
diff --git a/base/gxttfb.c b/base/gxttfb.c
|
||||
index 0e9a444..e1561af 100644
|
||||
--- a/base/gxttfb.c
|
||||
+++ b/base/gxttfb.c
|
||||
@@ -79,7 +79,8 @@ static void gx_ttfReader__Read(ttfReader *self, void *p, int n)
|
||||
if (!r->error) {
|
||||
if (r->extra_glyph_index != -1) {
|
||||
q = r->glyph_data.bits.data + r->pos;
|
||||
- r->error = (r->glyph_data.bits.size - r->pos < n ?
|
||||
+ r->error = ((r->pos >= r->glyph_data.bits.size ||
|
||||
+ r->glyph_data.bits.size - r->pos < n) ?
|
||||
gs_note_error(gs_error_invalidfont) : 0);
|
||||
if (r->error == 0)
|
||||
memcpy(p, q, n);
|
||||
--
|
||||
1.7.9.5
|
||||
|
||||
@@ -1,37 +0,0 @@
|
||||
From c501a58f8d5650c8ba21d447c0d6f07eafcb0f15 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Liddell <chris.liddell@artifex.com>
|
||||
Date: Fri, 16 Jun 2017 08:29:25 +0100
|
||||
Subject: [PATCH] Bug 698063: Bounds check Ins_JMPR
|
||||
|
||||
---
|
||||
base/ttinterp.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
--- end of original header
|
||||
|
||||
CVE: CVE-2017-9739
|
||||
|
||||
Upstream-Status: Backport [git://git.ghostscript.com/ghostpdl.git]
|
||||
|
||||
Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
||||
|
||||
diff --git a/base/ttinterp.c b/base/ttinterp.c
|
||||
index af457e8..adf3f0c 100644
|
||||
--- a/base/ttinterp.c
|
||||
+++ b/base/ttinterp.c
|
||||
@@ -1794,6 +1794,12 @@ static int nInstrCount=0;
|
||||
|
||||
static void Ins_JMPR( INS_ARG )
|
||||
{
|
||||
+ if ( BOUNDS(CUR.IP + args[0], CUR.codeSize ) )
|
||||
+ {
|
||||
+ CUR.error = TT_Err_Invalid_Reference;
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
CUR.IP += (Int)(args[0]);
|
||||
CUR.step_ins = FALSE;
|
||||
|
||||
--
|
||||
1.7.9.5
|
||||
|
||||
@@ -1,125 +0,0 @@
|
||||
From cfde94be1d4286bc47633c6e6eaf4e659bd78066 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Liddell <chris.liddell@artifex.com>
|
||||
Date: Wed, 7 Jun 2017 14:55:12 +0100
|
||||
Subject: [PATCH] Bug 697985: bounds check the array allocations methods
|
||||
|
||||
The clump allocator has four allocation functions that use 'number of elements'
|
||||
and 'size of elements' parameters (rather than a simple 'number of bytes').
|
||||
|
||||
Those need specific bounds checking.
|
||||
---
|
||||
base/gsalloc.c | 42 ++++++++++++++++++++++++++++--------------
|
||||
1 file changed, 28 insertions(+), 14 deletions(-)
|
||||
|
||||
--- end of original header
|
||||
|
||||
CVE: CVE-2017-9835
|
||||
|
||||
Upstream-Status: Backport [git://git.ghostscript.com/ghostpdl.git]
|
||||
|
||||
Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
||||
|
||||
diff --git a/base/gsalloc.c b/base/gsalloc.c
|
||||
index 741ba00..10c04dd 100644
|
||||
--- a/base/gsalloc.c
|
||||
+++ b/base/gsalloc.c
|
||||
@@ -1248,19 +1248,32 @@ i_alloc_struct_immovable(gs_memory_t * mem, gs_memory_type_ptr_t pstype,
|
||||
alloc_trace("|+<.", imem, cname, pstype, size, obj);
|
||||
return obj;
|
||||
}
|
||||
+
|
||||
+static inline bool
|
||||
+alloc_array_check_size(ulong num_elements, ulong elt_size, ulong *lsize)
|
||||
+{
|
||||
+ int64_t s = (int64_t)num_elements * elt_size;
|
||||
+ if (s > max_uint) {
|
||||
+ return false;
|
||||
+ }
|
||||
+ *lsize = (ulong)s;
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
static byte *
|
||||
i_alloc_byte_array(gs_memory_t * mem, uint num_elements, uint elt_size,
|
||||
client_name_t cname)
|
||||
{
|
||||
gs_ref_memory_t * const imem = (gs_ref_memory_t *)mem;
|
||||
obj_header_t *obj;
|
||||
-
|
||||
+ ulong lsize;
|
||||
#ifdef MEMENTO
|
||||
if (Memento_failThisEvent())
|
||||
return NULL;
|
||||
#endif
|
||||
-
|
||||
- obj = alloc_obj(imem, (ulong) num_elements * elt_size,
|
||||
+ if (alloc_array_check_size(num_elements, elt_size, &lsize) == false)
|
||||
+ return NULL;
|
||||
+ obj = alloc_obj(imem, lsize,
|
||||
&st_bytes, ALLOC_DIRECT, cname);
|
||||
|
||||
if_debug6m('A', mem, "[a%d:+b.]%s -bytes-*(%lu=%u*%u) = 0x%lx\n",
|
||||
@@ -1275,13 +1288,14 @@ i_alloc_byte_array_immovable(gs_memory_t * mem, uint num_elements,
|
||||
{
|
||||
gs_ref_memory_t * const imem = (gs_ref_memory_t *)mem;
|
||||
obj_header_t *obj;
|
||||
-
|
||||
+ ulong lsize;
|
||||
#ifdef MEMENTO
|
||||
if (Memento_failThisEvent())
|
||||
return NULL;
|
||||
#endif
|
||||
-
|
||||
- obj = alloc_obj(imem, (ulong) num_elements * elt_size,
|
||||
+ if (alloc_array_check_size(num_elements, elt_size, &lsize) == false)
|
||||
+ return NULL;
|
||||
+ obj = alloc_obj(imem, lsize,
|
||||
&st_bytes, ALLOC_IMMOVABLE | ALLOC_DIRECT,
|
||||
cname);
|
||||
|
||||
@@ -1297,7 +1311,7 @@ i_alloc_struct_array(gs_memory_t * mem, uint num_elements,
|
||||
{
|
||||
gs_ref_memory_t * const imem = (gs_ref_memory_t *)mem;
|
||||
obj_header_t *obj;
|
||||
-
|
||||
+ ulong lsize;
|
||||
#ifdef MEMENTO
|
||||
if (Memento_failThisEvent())
|
||||
return NULL;
|
||||
@@ -1311,9 +1325,9 @@ i_alloc_struct_array(gs_memory_t * mem, uint num_elements,
|
||||
return NULL; /* fail */
|
||||
}
|
||||
#endif
|
||||
- obj = alloc_obj(imem,
|
||||
- (ulong) num_elements * pstype->ssize,
|
||||
- pstype, ALLOC_DIRECT, cname);
|
||||
+ if (alloc_array_check_size(num_elements, pstype->ssize, &lsize) == false)
|
||||
+ return NULL;
|
||||
+ obj = alloc_obj(imem, lsize, pstype, ALLOC_DIRECT, cname);
|
||||
if_debug7m('A', mem, "[a%d:+<.]%s %s*(%lu=%u*%u) = 0x%lx\n",
|
||||
alloc_trace_space(imem), client_name_string(cname),
|
||||
struct_type_name_string(pstype),
|
||||
@@ -1327,16 +1341,16 @@ i_alloc_struct_array_immovable(gs_memory_t * mem, uint num_elements,
|
||||
{
|
||||
gs_ref_memory_t * const imem = (gs_ref_memory_t *)mem;
|
||||
obj_header_t *obj;
|
||||
-
|
||||
+ ulong lsize;
|
||||
#ifdef MEMENTO
|
||||
if (Memento_failThisEvent())
|
||||
return NULL;
|
||||
#endif
|
||||
|
||||
ALLOC_CHECK_SIZE(mem,pstype);
|
||||
- obj = alloc_obj(imem,
|
||||
- (ulong) num_elements * pstype->ssize,
|
||||
- pstype, ALLOC_IMMOVABLE | ALLOC_DIRECT, cname);
|
||||
+ if (alloc_array_check_size(num_elements, pstype->ssize, &lsize) == false)
|
||||
+ return NULL;
|
||||
+ obj = alloc_obj(imem, lsize, pstype, ALLOC_IMMOVABLE | ALLOC_DIRECT, cname);
|
||||
if_debug7m('A', mem, "[a%d|+<.]%s %s*(%lu=%u*%u) = 0x%lx\n",
|
||||
alloc_trace_space(imem), client_name_string(cname),
|
||||
struct_type_name_string(pstype),
|
||||
--
|
||||
1.7.9.5
|
||||
|
||||
@@ -1,14 +1,25 @@
|
||||
From 0ccbaa134093bf6afc79f2d20d061bca5a8754ed Mon Sep 17 00:00:00 2001
|
||||
From: Kai Kang <kai.kang@windriver.com>
|
||||
Date: Thu, 29 Mar 2018 16:02:05 +0800
|
||||
Subject: [PATCH 04/10] avoid host contamination
|
||||
|
||||
Remove hardcode path refer to host to avoid host contamination.
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Kai Kang <kai.kang@windriver.com>
|
||||
|
||||
Rebase to 9.23
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
---
|
||||
devices/devs.mak | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/devices/devs.mak b/devices/devs.mak
|
||||
index 3070d2e..df663f0 100644
|
||||
index 846aa50..9570182 100644
|
||||
--- a/devices/devs.mak
|
||||
+++ b/devices/devs.mak
|
||||
@@ -546,7 +546,7 @@ $(DEVOBJ)gdevxalt.$(OBJ) : $(DEVSRC)gdevxalt.c $(GDEVX) $(math__h) $(memory__h)\
|
||||
@@ -393,7 +393,7 @@ $(DEVOBJ)gdevxalt.$(OBJ) : $(DEVSRC)gdevxalt.c $(GDEVX) $(math__h) $(memory__h)\
|
||||
### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT
|
||||
|
||||
$(DEVOBJ)X11.so : $(x11alt_) $(x11_) $(DEVS_MAK) $(MAKEDIRS)
|
||||
@@ -17,3 +28,6 @@ index 3070d2e..df663f0 100644
|
||||
|
||||
###### --------------- Memory-buffered printer devices --------------- ######
|
||||
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
||||
+10
-4
@@ -1,4 +1,8 @@
|
||||
base/genht.c: add a preprocessor define to allow fopen calling
|
||||
From 9ca6f795409b988d38dd98bc2a6ecb68a9392312 Mon Sep 17 00:00:00 2001
|
||||
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
Date: Thu, 29 Mar 2018 16:37:40 +0800
|
||||
Subject: [PATCH 10/10] base/genht.c: add a preprocessor define to allow fopen
|
||||
calling
|
||||
|
||||
The commit in upstream:
|
||||
http://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=773c69e46e70bdd5482676437dafd2ca83397643
|
||||
@@ -7,17 +11,19 @@ Replace all fopen calls with gp_fopen and add a preprocessor define so
|
||||
that any unintential calls directly to fopen will cause an error.
|
||||
|
||||
Only exceptions are those in the platform specific code, and mkromfs.c.
|
||||
This patch add a preprocessor define to allow fopen calling in base/genht.c.
|
||||
This patch add a preprocessor define to allow fopen calling in
|
||||
base/genht.c.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Rebase to 9.23
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
---
|
||||
base/genht.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/base/genht.c b/base/genht.c
|
||||
index 4b04085..cc82fff 100644
|
||||
index e597e72..e96bfb5 100644
|
||||
--- a/base/genht.c
|
||||
+++ b/base/genht.c
|
||||
@@ -16,6 +16,10 @@
|
||||
@@ -32,5 +38,5 @@ index 4b04085..cc82fff 100644
|
||||
#include "string_.h"
|
||||
#include "gscdefs.h"
|
||||
--
|
||||
1.8.1.2
|
||||
1.8.3.1
|
||||
|
||||
|
||||
@@ -1,6 +1,12 @@
|
||||
Subject: [PATCH] Don't build-depend on libgcrypt, as nothing is used from it
|
||||
From 9129eb7fa9dc160d64a7d9df9279a3b1dae4d793 Mon Sep 17 00:00:00 2001
|
||||
From: Jackie Huang <jackie.huang@windriver.com>
|
||||
Date: Thu, 29 Mar 2018 16:16:18 +0800
|
||||
Subject: [PATCH 08/10] cups no gcrypt
|
||||
|
||||
Backported from http://www.cups.org/strfiles.php/3308/cups-no-gcrypt.patch
|
||||
Don't build-depend on libgcrypt, as nothing is used from it
|
||||
|
||||
Backported from
|
||||
http://www.cups.org/strfiles.php/3308/cups-no-gcrypt.patch
|
||||
|
||||
This addresses the cryto dependency seen during build.
|
||||
|
||||
@@ -8,7 +14,7 @@ Upstream-Status: Backport
|
||||
|
||||
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
|
||||
|
||||
Rebase the patch to ghostscript-9.15
|
||||
Rebase to 9.23
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
---
|
||||
cups/libs/cups/http-private.h | 1 -
|
||||
@@ -27,5 +33,5 @@ index 99a85c3..a674852 100644
|
||||
# include <CoreFoundation/CoreFoundation.h>
|
||||
# include <Security/Security.h>
|
||||
--
|
||||
1.9.1
|
||||
1.8.3.1
|
||||
|
||||
|
||||
@@ -1,22 +1,28 @@
|
||||
Import patch from windriver linux for cross compilation, and split patches
|
||||
into oe way under different directories such as i586, powerpc etc according
|
||||
to Richard's opinion.
|
||||
From 94850954b88440df6c41d2dd133c422ffc84d9aa Mon Sep 17 00:00:00 2001
|
||||
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
Date: Thu, 29 Mar 2018 16:12:48 +0800
|
||||
Subject: [PATCH 07/10] not generate objarch.h at compile time
|
||||
|
||||
Import patch from windriver linux for cross compilation, and split
|
||||
patches into oe way under different directories such as i586, powerpc etc
|
||||
according to Richard's opinion.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Kang Kai <kai.kang@windriver.com>
|
||||
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
|
||||
|
||||
# Author: Chi Xu <chi.xu@windriver.com>
|
||||
# Date: Feb 26 2010
|
||||
# Summary: Generate arch.h for ppc32
|
||||
#
|
||||
Rebase to 9.23
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
---
|
||||
base/lib.mak | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
Index: ghostscript-9.21/base/lib.mak
|
||||
===================================================================
|
||||
--- ghostscript-9.21.orig/base/lib.mak
|
||||
+++ ghostscript-9.21/base/lib.mak
|
||||
@@ -73,8 +73,8 @@ arch_h=$(GLGEN)arch.h
|
||||
diff --git a/base/lib.mak b/base/lib.mak
|
||||
index 0036d1e..302877e 100644
|
||||
--- a/base/lib.mak
|
||||
+++ b/base/lib.mak
|
||||
@@ -87,8 +87,8 @@ arch_h=$(GLGEN)arch.h
|
||||
stdpre_h=$(GLSRC)stdpre.h
|
||||
stdint__h=$(GLSRC)stdint_.h $(std_h)
|
||||
|
||||
@@ -27,3 +33,6 @@ Index: ghostscript-9.21/base/lib.mak
|
||||
|
||||
# Platform interfaces
|
||||
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
||||
+13
-15
@@ -1,25 +1,23 @@
|
||||
From 14937d9247330065359ca0fb648c28dfa5c3b224 Mon Sep 17 00:00:00 2001
|
||||
From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
|
||||
Date: Tue, 13 Dec 2016 18:16:41 +0900
|
||||
Subject: [PATCH] ghostscript-9.15-parallel-make
|
||||
From 84bb692d6b047c09266de154f404af9817fa04aa 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
|
||||
|
||||
From 767bdf8a412b0cce2b734998e9b7e55abeaf932c Mon Sep 17 00:00:00 2001
|
||||
From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
|
||||
Date: Tue, 13 Dec 2016 17:55:54 +0900
|
||||
Subject: [PATCH] Robert Yang <liezhi.yang@windriver.com> Date: Fri, 30 Jan
|
||||
2015 00:40:22 -0800 Subject: [PATCH] contrib.mak: fix for parallel build
|
||||
|
||||
Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
|
||||
Upstream-Status: Pending
|
||||
|
||||
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(+)
|
||||
|
||||
diff --git a/contrib/contrib.mak b/contrib/contrib.mak
|
||||
index 55415b3..0b6b5ae 100644
|
||||
index f5a2fa4..4999752 100644
|
||||
--- a/contrib/contrib.mak
|
||||
+++ b/contrib/contrib.mak
|
||||
@@ -1099,6 +1099,7 @@ $(DEVOBJ)dviprlib.$(OBJ) : $(JAPSRC)dviprlib.c $(JAPSRC)dviprlib.h \
|
||||
@@ -1067,6 +1067,7 @@ $(DEVOBJ)dviprlib.$(OBJ) : $(JAPSRC)dviprlib.c $(JAPSRC)dviprlib.h \
|
||||
$(DEVCC) $(O_)$@ $(C_) $(JAPSRC)dviprlib.c
|
||||
|
||||
extra-dmprt-install: install-libdata
|
||||
@@ -27,7 +25,7 @@ index 55415b3..0b6b5ae 100644
|
||||
$(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
|
||||
@@ -1267,6 +1268,7 @@ $(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH) \
|
||||
@@ -1235,6 +1236,7 @@ $(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH) \
|
||||
### ----------------- Additional .upp files ---------------- ###
|
||||
|
||||
extra-upp-install: install-libdata
|
||||
@@ -36,5 +34,5 @@ index 55415b3..0b6b5ae 100644
|
||||
$(INSTALL_DATA) $$f $(DESTDIR)$(gsdatadir)$(D)lib || exit 1; \
|
||||
done
|
||||
--
|
||||
2.7.4
|
||||
1.8.3.1
|
||||
|
||||
|
||||
+5
-5
@@ -1,7 +1,7 @@
|
||||
From 5d5c83c89be0cff29dde2267fa168e6f7146be8c Mon Sep 17 00:00:00 2001
|
||||
From c481b055cd464734a3c2d80719ead4c1c92a40c9 Mon Sep 17 00:00:00 2001
|
||||
From: Robert Yang <liezhi.yang@windriver.com>
|
||||
Date: Mon, 4 May 2015 22:31:48 -0700
|
||||
Subject: [PATCH] base/gendev.c: fix for -Werror=return-type
|
||||
Subject: [PATCH 02/10] base/gendev.c: fix for -Werror=return-type
|
||||
|
||||
Fixed:
|
||||
base/gendev.c:80:1: error: return type defaults to 'int' [-Werror=return-type]
|
||||
@@ -10,11 +10,11 @@ Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
||||
---
|
||||
base/gendev.c | 1 +
|
||||
base/gendev.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/base/gendev.c b/base/gendev.c
|
||||
index 68a745f..8058b5a 100644
|
||||
index 59d5999..7766b08 100644
|
||||
--- a/base/gendev.c
|
||||
+++ b/base/gendev.c
|
||||
@@ -77,6 +77,7 @@ static const char *indent_item = "";
|
||||
@@ -26,5 +26,5 @@ index 68a745f..8058b5a 100644
|
||||
{
|
||||
config conf;
|
||||
--
|
||||
1.7.9.5
|
||||
1.8.3.1
|
||||
|
||||
|
||||
+19
-10
@@ -1,22 +1,28 @@
|
||||
ghostscript-native:fix disable-system-libtiff
|
||||
From 0124b1c29b9cfe46d73ae82ce023dd7c5b055744 Mon Sep 17 00:00:00 2001
|
||||
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
Date: Thu, 29 Mar 2018 16:36:12 +0800
|
||||
Subject: [PATCH 09/10] ghostscript-native:fix disable-system-libtiff
|
||||
|
||||
Modify configure to add the check to make sure
|
||||
ghostscrip could work while system-libtiff is
|
||||
disabled.
|
||||
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
|
||||
Updated to apply to ghostscript 9.21.
|
||||
|
||||
Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
|
||||
Rebase to ghostscript 9.23.
|
||||
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
---
|
||||
configure.ac | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 80a60b1..f3e9efb 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1259,6 +1259,7 @@ case "x$with_system_libtiff" in
|
||||
@@ -1284,6 +1284,7 @@ case "x$with_system_libtiff" in
|
||||
esac
|
||||
|
||||
if test x"$SHARE_LIBTIFF" = x"0" ; then
|
||||
@@ -24,8 +30,8 @@ Upstream-Status: Pending
|
||||
echo "Running libtiff configure script..."
|
||||
olddir=`pwd`
|
||||
if ! test -d "$LIBTIFFCONFDIR" ; then
|
||||
@@ -1272,6 +1273,10 @@ if test x"$SHARE_LIBTIFF" = x"0" ; then
|
||||
cd "$olddir"
|
||||
@@ -1302,6 +1303,10 @@ if test x"$SHARE_LIBTIFF" = x"0" ; then
|
||||
|
||||
echo
|
||||
echo "Continuing with Ghostscript configuration..."
|
||||
+ else
|
||||
@@ -35,3 +41,6 @@ Upstream-Status: Pending
|
||||
fi
|
||||
|
||||
AC_SUBST(SHARE_LIBTIFF)
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
||||
+30
-49
@@ -1,32 +1,40 @@
|
||||
Just use commands provided by ghostscript-native, preventing recompile them when
|
||||
compile ghostscript.
|
||||
Way to enable cross compile.
|
||||
From 239d681306a8d97ed10954788d32ba2f4b55f77c Mon Sep 17 00:00:00 2001
|
||||
From: Kang Kai <kai.kang@windriver.com>
|
||||
Date: Thu, 29 Mar 2018 16:10:16 +0800
|
||||
Subject: [PATCH 06/10] prevent recompiling
|
||||
|
||||
Just use commands provided by ghostscript-native, preventing recompile
|
||||
them when compile ghostscript. Way to enable cross compile.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Kang Kai <kai.kang@windriver.com>
|
||||
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
|
||||
|
||||
Rebase to 9.19
|
||||
Rebase to 9.23
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
---
|
||||
base/unix-aux.mak | 44 --------------------------------------------
|
||||
1 file changed, 44 deletions(-)
|
||||
|
||||
Rebase to 9.21
|
||||
Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
||||
|
||||
diff --git a/base/unix-aux.mak b/base/unix-aux.mak
|
||||
index 5bf72e9..9cb39d7 100644
|
||||
--- a/base/unix-aux.mak
|
||||
+++ b/base/unix-aux.mak
|
||||
@@ -66,45 +66,45 @@ $(GLOBJ)gp_sysv.$(OBJ): $(GLSRC)gp_sysv.
|
||||
|
||||
# -------------------------- Auxiliary programs --------------------------- #
|
||||
@@ -64,50 +64,6 @@ $(GLOBJ)gp_sysv.$(OBJ): $(GLSRC)gp_sysv.c $(stdio__h) $(time__h) $(AK)\
|
||||
$(UNIX_AUX_MAK) $(MAKEDIRS)
|
||||
$(GLCC) $(GLO_)gp_sysv.$(OBJ) $(C_) $(GLSRC)gp_sysv.c
|
||||
|
||||
-# -------------------------- Auxiliary programs --------------------------- #
|
||||
-
|
||||
-$(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h) $(UNIX_AUX_MAK) $(MAKEDIRS)
|
||||
- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c $(AUXEXTRALIBS)
|
||||
-
|
||||
+#$(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h) $(UNIX_AUX_MAK) $(MAKEDIRS)
|
||||
+# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c $(AUXEXTRALIBS)
|
||||
+#
|
||||
# On the RS/6000 (at least), compiling genarch.c with gcc with -O
|
||||
# produces a buggy executable.
|
||||
-$(PACKPS_XE): $(GLSRC)pack_ps.c $(stdpre_h) $(UNIX_AUX_MAK) $(MAKEDIRS)
|
||||
- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(PACKPS_XE) $(GLSRC)pack_ps.c $(AUXEXTRALIBS)
|
||||
-
|
||||
-# On the RS/6000 (at least), compiling genarch.c with gcc with -O
|
||||
-# produces a buggy executable.
|
||||
-$(GENARCH_XE): $(GLSRC)genarch.c $(AK) $(GENARCH_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS)
|
||||
- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENARCH_XE) $(GLSRC)genarch.c $(AUXEXTRALIBS)
|
||||
-
|
||||
@@ -39,21 +47,9 @@ Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
||||
-$(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS)
|
||||
- $(CCAUX_) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c $(AUXEXTRALIBS)
|
||||
-
|
||||
+#$(GENARCH_XE): $(GLSRC)genarch.c $(AK) $(GENARCH_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS)
|
||||
+# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENARCH_XE) $(GLSRC)genarch.c $(AUXEXTRALIBS)
|
||||
+#
|
||||
+#$(GENCONF_XE): $(GLSRC)genconf.c $(AK) $(GENCONF_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS)
|
||||
+# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENCONF_XE) $(GLSRC)genconf.c $(AUXEXTRALIBS)
|
||||
+#
|
||||
+#$(GENDEV_XE): $(GLSRC)gendev.c $(AK) $(GENDEV_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS)
|
||||
+# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENDEV_XE) $(GLSRC)gendev.c $(AUXEXTRALIBS)
|
||||
+#
|
||||
+#$(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS)
|
||||
+# $(CCAUX_) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c $(AUXEXTRALIBS)
|
||||
+#
|
||||
# To get GS to use the system zlib, you remove/hide the gs/zlib directory
|
||||
# which means that the mkromfs build can't find the zlib source it needs.
|
||||
# So it's split into two targets, one using the zlib source directly.....
|
||||
-# To get GS to use the system zlib, you remove/hide the gs/zlib directory
|
||||
-# which means that the mkromfs build can't find the zlib source it needs.
|
||||
-# So it's split into two targets, one using the zlib source directly.....
|
||||
-MKROMFS_OBJS_0=$(MKROMFS_ZLIB_OBJS) $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \
|
||||
- $(AUX)gscdefs.$(OBJ) $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \
|
||||
- $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) $(AUX)memento.$(OBJ)
|
||||
@@ -61,14 +57,7 @@ Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
||||
-$(MKROMFS_XE)_0: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_0) $(UNIX_AUX_MAK) $(MAKEDIRS)
|
||||
- $(CCAUX_) $(GENOPTAUX) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) $(AUXEXTRALIBS)
|
||||
-
|
||||
+#MKROMFS_OBJS_0=$(MKROMFS_ZLIB_OBJS) $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \
|
||||
+# $(AUX)gscdefs.$(OBJ) $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \
|
||||
+# $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) $(AUX)memento.$(OBJ)
|
||||
+#
|
||||
+#$(MKROMFS_XE)_0: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_0) $(UNIX_AUX_MAK) $(MAKEDIRS)
|
||||
+# $(CCAUX_) $(GENOPTAUX) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) $(AUXEXTRALIBS)
|
||||
+#
|
||||
# .... and one using the zlib library linked via the command line
|
||||
-# .... and one using the zlib library linked via the command line
|
||||
-MKROMFS_OBJS_1=$(AUX)gscdefs.$(OBJ) \
|
||||
- $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \
|
||||
- $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \
|
||||
@@ -80,17 +69,9 @@ Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
||||
-$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(UNIX_AUX_MAK) $(MAKEDIRS)
|
||||
- $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE)
|
||||
-
|
||||
+#MKROMFS_OBJS_1=$(AUX)gscdefs.$(OBJ) \
|
||||
+# $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \
|
||||
+# $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \
|
||||
+# $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ)
|
||||
+#
|
||||
+#$(MKROMFS_XE)_1: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_1) $(UNIX_AUX_MAK) $(MAKEDIRS)
|
||||
+# $(CCAUX_) $(GENOPTAUX) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) $(AUXEXTRALIBS)
|
||||
+#
|
||||
+#$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(UNIX_AUX_MAK) $(MAKEDIRS)
|
||||
+# $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE)
|
||||
+#
|
||||
# Query the environment to construct gconfig_.h.
|
||||
# These are all defined conditionally (except the JasPER one), so that
|
||||
# they can be overridden by settings from the configure script.
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
||||
@@ -1,4 +1,8 @@
|
||||
ghostscript: allow directories to be created more than once
|
||||
From 2b23026f8e2a352417fb1c4da94bf69b19bef267 Mon Sep 17 00:00:00 2001
|
||||
From: Joe Slater <joe.slater@windriver.com>
|
||||
Date: Thu, 29 Mar 2018 16:04:32 +0800
|
||||
Subject: [PATCH 05/10] ghostscript: allow directories to be created more than
|
||||
once
|
||||
|
||||
When doing parallel builds, we might try to create directories
|
||||
more than once. This should not cause an error.
|
||||
@@ -7,7 +11,14 @@ Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
||||
|
||||
Rebase to 9.23
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
---
|
||||
base/unix-end.mak | 17 ++++++++---------
|
||||
1 file changed, 8 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/base/unix-end.mak b/base/unix-end.mak
|
||||
index 9ce599a..feff5a6 100644
|
||||
--- a/base/unix-end.mak
|
||||
+++ b/base/unix-end.mak
|
||||
@@ -17,15 +17,14 @@
|
||||
@@ -34,3 +45,6 @@ Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
||||
|
||||
|
||||
gs: .gssubtarget $(UNIX_END_MAK)
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
From 2ce79942ca509663ddf8171f45d1d324bb71bad6 Mon Sep 17 00:00:00 2001
|
||||
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
Date: Thu, 29 Mar 2018 17:22:35 +0800
|
||||
Subject: [PATCH] remove direct symlink
|
||||
|
||||
The upstream create a direct symlink to stay backward
|
||||
compatible, a symlink is automatically created to point
|
||||
from the old location (/usr/share/ghostscript/<version>/doc)
|
||||
to the new location.
|
||||
|
||||
It caused do_populate_sysroot failure
|
||||
...
|
||||
|ERROR: ghostscript-9.23-r0 do_populate_sysroot: sstate found an absolute
|
||||
path symlink
|
||||
...
|
||||
|
||||
Without the symlink is no harm for OE
|
||||
|
||||
Upstream-Status: Inappropriate [OE specific]
|
||||
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
---
|
||||
base/unixinst.mak | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/base/unixinst.mak b/base/unixinst.mak
|
||||
index 7fec86c..0cf2361 100644
|
||||
--- a/base/unixinst.mak
|
||||
+++ b/base/unixinst.mak
|
||||
@@ -165,7 +165,6 @@ install-doc: $(PSDOCDIR)/News.htm
|
||||
$(SH) -c 'for f in $(DOC_PAGES) ;\
|
||||
do if ( test -f $(PSDOCDIR)/$$f ); then $(INSTALL_DATA) $(PSDOCDIR)/$$f $(DESTDIR)$(docdir); fi;\
|
||||
done'
|
||||
- ln -s $(DESTDIR)$(docdir) $(DESTDIR)$(gsdatadir)/doc
|
||||
|
||||
# install the man pages for each locale
|
||||
MAN_LCDIRS=. de
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
+7
-17
@@ -19,12 +19,13 @@ DEPENDS_class-native = "libpng-native"
|
||||
UPSTREAM_CHECK_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases"
|
||||
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
|
||||
|
||||
SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs921/${BPN}-${PV}.tar.gz \
|
||||
SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs923/${BPN}-${PV}.tar.gz \
|
||||
file://ghostscript-9.15-parallel-make.patch \
|
||||
file://ghostscript-9.16-Werror-return-type.patch \
|
||||
file://do-not-check-local-libpng-source.patch \
|
||||
file://avoid-host-contamination.patch \
|
||||
file://mkdir-p.patch \
|
||||
file://remove-direct-symlink.patch \
|
||||
"
|
||||
|
||||
SRC_URI = "${SRC_URI_BASE} \
|
||||
@@ -32,17 +33,6 @@ SRC_URI = "${SRC_URI_BASE} \
|
||||
file://ghostscript-9.02-genarch.patch \
|
||||
file://objarch.h \
|
||||
file://cups-no-gcrypt.patch \
|
||||
file://CVE-2017-7207.patch \
|
||||
file://CVE-2017-5951.patch \
|
||||
file://CVE-2017-7975.patch \
|
||||
file://CVE-2017-9216.patch \
|
||||
file://CVE-2017-9611.patch \
|
||||
file://CVE-2017-9612.patch \
|
||||
file://CVE-2017-9739.patch \
|
||||
file://CVE-2017-9726.patch \
|
||||
file://CVE-2017-9727.patch \
|
||||
file://CVE-2017-9835.patch \
|
||||
file://CVE-2017-11714.patch \
|
||||
"
|
||||
|
||||
SRC_URI_class-native = "${SRC_URI_BASE} \
|
||||
@@ -50,8 +40,8 @@ SRC_URI_class-native = "${SRC_URI_BASE} \
|
||||
file://base-genht.c-add-a-preprocessor-define-to-allow-fope.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "5f213281761d2750fcf27476c404d17f"
|
||||
SRC_URI[sha256sum] = "02bceadbc4dddeb6f2eec9c8b1623d945d355ca11b8b4df035332b217d58ce85"
|
||||
SRC_URI[md5sum] = "5a47ab47cd22dec1eb5f51c06f1c9d9c"
|
||||
SRC_URI[sha256sum] = "f65964807a3c97a2c0810d4b9806585367e73129e57ae33378cea18e07a1ed9b"
|
||||
|
||||
# Put something like
|
||||
#
|
||||
@@ -104,7 +94,7 @@ do_configure_append () {
|
||||
# copy tools from the native ghostscript build
|
||||
if [ "${PN}" != "ghostscript-native" ]; then
|
||||
mkdir -p obj/aux soobj
|
||||
for i in genarch genconf mkromfs echogs gendev genht; do
|
||||
for i in genarch genconf mkromfs echogs gendev genht packps; do
|
||||
cp ${STAGING_BINDIR_NATIVE}/ghostscript-${PV}/$i obj/aux/$i
|
||||
done
|
||||
fi
|
||||
@@ -118,14 +108,14 @@ do_install_append () {
|
||||
|
||||
do_compile_class-native () {
|
||||
mkdir -p obj
|
||||
for i in genarch genconf mkromfs echogs gendev genht; do
|
||||
for i in genarch genconf mkromfs echogs gendev genht packps; do
|
||||
oe_runmake obj/aux/$i
|
||||
done
|
||||
}
|
||||
|
||||
do_install_class-native () {
|
||||
install -d ${D}${bindir}/ghostscript-${PV}
|
||||
for i in genarch genconf mkromfs echogs gendev genht; do
|
||||
for i in genarch genconf mkromfs echogs gendev genht packps; do
|
||||
install -m 755 obj/aux/$i ${D}${bindir}/ghostscript-${PV}/$i
|
||||
done
|
||||
}
|
||||
Reference in New Issue
Block a user