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