mirror of
https://git.yoctoproject.org/poky
synced 2026-03-06 23:39:40 +01:00
ghostscript: move to version 9.21
Eliminate CVE patches that are now in source. Add CUPSCONFIG to configure options. (From OE-Core rev: 3041f94896b50a5a5d19caf0dd0e7910c730e18e) Signed-off-by: Joe Slater <jslater@windriver.com> to be scrunched Signed-off-by: Joe Slater <jslater@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
a16d0f6c49
commit
d3e8504ce7
@@ -1,49 +0,0 @@
|
||||
From 4bef1a1d32e29b68855616020dbff574b9cda08f Mon Sep 17 00:00:00 2001
|
||||
From: Robin Watts <Robin.Watts@artifex.com>
|
||||
Date: Thu, 29 Dec 2016 15:57:43 +0000
|
||||
Subject: [PATCH] Bug 697453: Avoid divide by 0 in scan conversion code.
|
||||
|
||||
Arithmetic overflow due to extreme values in the scan conversion
|
||||
code can cause a division by 0.
|
||||
|
||||
Avoid this with a simple extra check.
|
||||
|
||||
dx_old=cf814d81
|
||||
endp->x_next=b0e859b9
|
||||
alp->x_next=8069a73a
|
||||
|
||||
leads to dx_den = 0
|
||||
|
||||
Upstream-Status: Backport
|
||||
CVE: CVE-2016-10219
|
||||
|
||||
Signed-off-by: Catalin Enache <catalin.enache@windriver.com>
|
||||
---
|
||||
base/gxfill.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/base/gxfill.c b/base/gxfill.c
|
||||
index 99196c0..2f81bb0 100644
|
||||
--- a/base/gxfill.c
|
||||
+++ b/base/gxfill.c
|
||||
@@ -1741,7 +1741,7 @@ intersect(active_line *endp, active_line *alp, fixed y, fixed y1, fixed *p_y_new
|
||||
fixed dx_old = alp->x_current - endp->x_current;
|
||||
fixed dx_den = dx_old + endp->x_next - alp->x_next;
|
||||
|
||||
- if (dx_den <= dx_old)
|
||||
+ if (dx_den <= dx_old || dx_den == 0)
|
||||
return false; /* Intersection isn't possible. */
|
||||
dy = y1 - y;
|
||||
if_debug3('F', "[F]cross: dy=%g, dx_old=%g, dx_new=%g\n",
|
||||
@@ -1750,7 +1750,7 @@ intersect(active_line *endp, active_line *alp, fixed y, fixed y1, fixed *p_y_new
|
||||
/* Do the computation in single precision */
|
||||
/* if the values are small enough. */
|
||||
y_new =
|
||||
- ((dy | dx_old) < 1L << (size_of(fixed) * 4 - 1) ?
|
||||
+ (((ufixed)(dy | dx_old)) < (1L << (size_of(fixed) * 4 - 1)) ?
|
||||
dy * dx_old / dx_den :
|
||||
(INCR_EXPR(mq_cross), fixed_mult_quo(dy, dx_old, dx_den)))
|
||||
+ y;
|
||||
--
|
||||
2.10.2
|
||||
|
||||
@@ -1,55 +0,0 @@
|
||||
From daf85701dab05f17e924a48a81edc9195b4a04e8 Mon Sep 17 00:00:00 2001
|
||||
From: Ken Sharp <ken.sharp@artifex.com>
|
||||
Date: Wed, 21 Dec 2016 16:54:14 +0000
|
||||
Subject: [PATCH] fix crash with bad data supplied to makeimagedevice
|
||||
|
||||
Bug #697450 "Null pointer dereference in gx_device_finalize()"
|
||||
|
||||
The problem here is that the code to finalise a device unconditionally
|
||||
frees the icc_struct member of the device structure. However this
|
||||
particular (weird) device is not setup as a normal device, probably
|
||||
because its very, very ancient. Its possible for the initialisation
|
||||
of the device to abort with an error before calling gs_make_mem_device()
|
||||
which is where the icc_struct member gets allocated (or set to NULL).
|
||||
|
||||
If that happens, then the cleanup code tries to free the device, which
|
||||
calls finalize() which tries to free a garbage pointer.
|
||||
|
||||
Setting the device memory to 0x00 after we allocate it means that the
|
||||
icc_struct member will be NULL< and our memory manager allows for that
|
||||
happily enough, which avoids the problem.
|
||||
|
||||
Upstream-Status: Backport
|
||||
CVE: CVE-2016-10220
|
||||
|
||||
Signed-off-by: Catalin Enache <catalin.enache@windriver.com>
|
||||
---
|
||||
base/gsdevmem.c | 12 ++++++++++++
|
||||
1 file changed, 12 insertions(+)
|
||||
|
||||
diff --git a/base/gsdevmem.c b/base/gsdevmem.c
|
||||
index 97b9cf4..fe75bcc 100644
|
||||
--- a/base/gsdevmem.c
|
||||
+++ b/base/gsdevmem.c
|
||||
@@ -225,6 +225,18 @@ gs_makewordimagedevice(gx_device ** pnew_dev, const gs_matrix * pmat,
|
||||
|
||||
if (pnew == 0)
|
||||
return_error(gs_error_VMerror);
|
||||
+
|
||||
+ /* Bug #697450 "Null pointer dereference in gx_device_finalize()"
|
||||
+ * If we have incorrect data passed to gs_initialise_wordimagedevice() then the
|
||||
+ * initialisation will fail, crucially it will fail *before* it calls
|
||||
+ * gs_make_mem_device() which initialises the device. This means that the
|
||||
+ * icc_struct member will be uninitialsed, but the device finalise method
|
||||
+ * will unconditionally free that memory. Since its a garbage pointer, bad things happen.
|
||||
+ * Apparently we do still need makeimagedevice to be available from
|
||||
+ * PostScript, so in here just zero the device memory, which means that
|
||||
+ * the finalise routine won't have a problem.
|
||||
+ */
|
||||
+ memset(pnew, 0x00, st_device_memory.ssize);
|
||||
code = gs_initialize_wordimagedevice(pnew, pmat, width, height,
|
||||
colors, num_colors, word_oriented,
|
||||
page_device, mem);
|
||||
--
|
||||
2.10.2
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
From 6f749c0c44e7b9e09737b9f29edf29925a34f0cf Mon Sep 17 00:00:00 2001
|
||||
From: Chris Liddell <chris.liddell@artifex.com>
|
||||
Date: Wed, 5 Oct 2016 09:59:25 +0100
|
||||
Subject: [PATCH] Bug 697179: Reference count device icc profile
|
||||
|
||||
when copying a device
|
||||
|
||||
Upstream-Status: Backport
|
||||
CVE: CVE-2016-7978
|
||||
|
||||
Signed-off-by: Catalin Enache <catalin.enache@windriver.com>
|
||||
---
|
||||
base/gsdevice.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/base/gsdevice.c b/base/gsdevice.c
|
||||
index 778106f..aea986a 100644
|
||||
--- a/base/gsdevice.c
|
||||
+++ b/base/gsdevice.c
|
||||
@@ -614,6 +614,7 @@ gx_device_init(gx_device * dev, const gx_device * proto, gs_memory_t * mem,
|
||||
dev->memory = mem;
|
||||
dev->retained = !internal;
|
||||
rc_init(dev, mem, (internal ? 0 : 1));
|
||||
+ rc_increment(dev->icc_struct);
|
||||
}
|
||||
|
||||
void
|
||||
--
|
||||
2.10.2
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
From 875a0095f37626a721c7ff57d606a0f95af03913 Mon Sep 17 00:00:00 2001
|
||||
From: Ken Sharp <ken.sharp@artifex.com>
|
||||
Date: Wed, 5 Oct 2016 10:10:58 +0100
|
||||
Subject: [PATCH] DSC parser - validate parameters
|
||||
|
||||
Bug #697190 ".initialize_dsc_parser doesn't validate the parameter is a dict type before using it."
|
||||
|
||||
Regardless of any security implications, its simply wrong for a PostScript
|
||||
operator not to validate its parameter(s).
|
||||
|
||||
No differences expected.
|
||||
|
||||
Upstream-Status: Backport
|
||||
CVE: CVE-2016-7979
|
||||
|
||||
Signed-off-by: Catalin Enache <catalin.enache@windriver.com>
|
||||
---
|
||||
psi/zdscpars.c | 13 +++++++++----
|
||||
1 file changed, 9 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/psi/zdscpars.c b/psi/zdscpars.c
|
||||
index c05e154..9b4b605 100644
|
||||
--- a/psi/zdscpars.c
|
||||
+++ b/psi/zdscpars.c
|
||||
@@ -150,11 +150,16 @@ zinitialize_dsc_parser(i_ctx_t *i_ctx_p)
|
||||
ref local_ref;
|
||||
int code;
|
||||
os_ptr const op = osp;
|
||||
- dict * const pdict = op->value.pdict;
|
||||
- gs_memory_t * const mem = (gs_memory_t *)dict_memory(pdict);
|
||||
- dsc_data_t * const data =
|
||||
- gs_alloc_struct(mem, dsc_data_t, &st_dsc_data_t, "DSC parser init");
|
||||
+ dict *pdict;
|
||||
+ gs_memory_t *mem;
|
||||
+ dsc_data_t *data;
|
||||
|
||||
+ check_read_type(*op, t_dictionary);
|
||||
+
|
||||
+ pdict = op->value.pdict;
|
||||
+ mem = (gs_memory_t *)dict_memory(pdict);
|
||||
+
|
||||
+ data = gs_alloc_struct(mem, dsc_data_t, &st_dsc_data_t, "DSC parser init");
|
||||
if (!data)
|
||||
return_error(gs_error_VMerror);
|
||||
data->document_level = 0;
|
||||
--
|
||||
2.10.2
|
||||
|
||||
@@ -1,47 +0,0 @@
|
||||
From f5c7555c30393e64ec1f5ab0dfae5b55b3b3fc78 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Liddell <chris.liddell@artifex.com>
|
||||
Date: Sat, 8 Oct 2016 16:10:27 +0100
|
||||
Subject: [PATCH] Bug 697203: check for sufficient params in .sethalftone5
|
||||
|
||||
and param types
|
||||
|
||||
Upstream-Status: Backport
|
||||
CVE: CVE-2016-8602
|
||||
|
||||
Signed-off-by: Catalin Enache <catalin.enache@windriver.com>
|
||||
---
|
||||
psi/zht2.c | 12 ++++++++++--
|
||||
1 file changed, 10 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/psi/zht2.c b/psi/zht2.c
|
||||
index fb4a264..dfa27a4 100644
|
||||
--- a/psi/zht2.c
|
||||
+++ b/psi/zht2.c
|
||||
@@ -82,14 +82,22 @@ zsethalftone5(i_ctx_t *i_ctx_p)
|
||||
gs_memory_t *mem;
|
||||
uint edepth = ref_stack_count(&e_stack);
|
||||
int npop = 2;
|
||||
- int dict_enum = dict_first(op);
|
||||
+ int dict_enum;
|
||||
ref rvalue[2];
|
||||
int cname, colorant_number;
|
||||
byte * pname;
|
||||
uint name_size;
|
||||
int halftonetype, type = 0;
|
||||
gs_gstate *pgs = igs;
|
||||
- int space_index = r_space_index(op - 1);
|
||||
+ int space_index;
|
||||
+
|
||||
+ if (ref_stack_count(&o_stack) < 2)
|
||||
+ return_error(gs_error_stackunderflow);
|
||||
+ check_type(*op, t_dictionary);
|
||||
+ check_type(*(op - 1), t_dictionary);
|
||||
+
|
||||
+ dict_enum = dict_first(op);
|
||||
+ space_index = r_space_index(op - 1);
|
||||
|
||||
mem = (gs_memory_t *) idmemory->spaces_indexed[space_index];
|
||||
|
||||
--
|
||||
2.10.2
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
From 5e57e483298dae8b8d4ec9aab37a526736ac2e97 Mon Sep 17 00:00:00 2001
|
||||
From: Shailesh Mistry <shailesh.mistry@hotmail.co.uk>
|
||||
Date: Wed, 26 Apr 2017 22:12:14 +0100
|
||||
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
|
||||
@@ -12,15 +13,17 @@ Upstream-Status: Backport
|
||||
CVE: CVE-2017-7975
|
||||
|
||||
Signed-off-by: Catalin Enache <catalin.enache@windriver.com>
|
||||
---
|
||||
jbig2dec/jbig2_huffman.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/jbig2dec/jbig2_huffman.c b/jbig2dec/jbig2_huffman.c
|
||||
index 511e461..b4189a1 100644
|
||||
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, const Jbig2HuffmanParams *params)
|
||||
@@ -421,8 +421,8 @@ jbig2_build_huffman_table(Jbig2Ctx *ctx,
|
||||
|
||||
if (PREFLEN == CURLEN) {
|
||||
int RANGELEN = lines[CURTEMP].RANGELEN;
|
||||
@@ -31,6 +34,4 @@ index 511e461..b4189a1 100644
|
||||
byte eflags = 0;
|
||||
|
||||
if (end_j > max_j) {
|
||||
--
|
||||
2.10.2
|
||||
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
Remove hardcode path refer to host to avoid host contamination.
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Kai Kang <kai.kang@windriver.com>
|
||||
---
|
||||
diff --git a/devices/devs.mak b/devices/devs.mak
|
||||
index 3070d2e..df663f0 100644
|
||||
--- a/devices/devs.mak
|
||||
+++ b/devices/devs.mak
|
||||
@@ -546,7 +546,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)
|
||||
- $(CCLD) $(LDFLAGS) -shared -o $(DEVOBJ)X11.so $(x11alt_) $(x11_) -L/usr/X11R6/lib -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS)
|
||||
+ $(CCLD) $(LDFLAGS) -shared -o $(DEVOBJ)X11.so $(x11alt_) $(x11_) -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS)
|
||||
|
||||
###### --------------- Memory-buffered printer devices --------------- ######
|
||||
|
||||
@@ -5,23 +5,26 @@ ghostscrip could work while system-libtiff is
|
||||
disabled.
|
||||
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
Upstream-Status: Pending
|
||||
---
|
||||
configure.ac | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
Updated to apply to ghostscript 9.21.
|
||||
|
||||
Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
|
||||
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1055,6 +1055,7 @@ Disabling tiff output devices.])
|
||||
@@ -1259,6 +1259,7 @@ case "x$with_system_libtiff" in
|
||||
esac
|
||||
|
||||
if test $SHARE_LIBTIFF -eq 0; then
|
||||
if test x"$SHARE_LIBTIFF" = x"0" ; then
|
||||
+ if test -e $LIBTIFFDIR/configure; then
|
||||
echo
|
||||
echo "Running libtiff configure script..."
|
||||
olddir=`pwd`
|
||||
@@ -1069,6 +1070,10 @@ if test $SHARE_LIBTIFF -eq 0; then
|
||||
if ! test -d "$LIBTIFFCONFDIR" ; then
|
||||
@@ -1272,6 +1273,10 @@ if test x"$SHARE_LIBTIFF" = x"0" ; then
|
||||
cd "$olddir"
|
||||
echo
|
||||
echo "Continuing with Ghostscript configuration..."
|
||||
@@ -32,6 +35,3 @@ diff --git a/configure.ac b/configure.ac
|
||||
fi
|
||||
|
||||
AC_SUBST(SHARE_LIBTIFF)
|
||||
--
|
||||
1.8.1.2
|
||||
|
||||
@@ -9,15 +9,13 @@ Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
|
||||
|
||||
Rebase to 9.19
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
---
|
||||
base/unix-aux.mak | 64 +++++++++++++++++++++++++++----------------------------
|
||||
1 file changed, 32 insertions(+), 32 deletions(-)
|
||||
|
||||
diff --git a/base/unix-aux.mak b/base/unix-aux.mak
|
||||
index 0110667..e2eb1a1 100644
|
||||
Rebase to 9.21
|
||||
Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
||||
|
||||
--- a/base/unix-aux.mak
|
||||
+++ b/base/unix-aux.mak
|
||||
@@ -71,44 +71,44 @@ $(GLOBJ)gp_sysv.$(OBJ): $(GLSRC)gp_sysv.c $(stdio__h) $(time__h) $(AK)\
|
||||
@@ -66,45 +66,45 @@ $(GLOBJ)gp_sysv.$(OBJ): $(GLSRC)gp_sysv.
|
||||
|
||||
# -------------------------- Auxiliary programs --------------------------- #
|
||||
|
||||
@@ -61,14 +59,14 @@ index 0110667..e2eb1a1 100644
|
||||
- $(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_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) $(AUXEXTRALIBS)
|
||||
- $(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_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) $(AUXEXTRALIBS)
|
||||
+# $(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
|
||||
-MKROMFS_OBJS_1=$(AUX)gscdefs.$(OBJ) \
|
||||
@@ -77,23 +75,22 @@ index 0110667..e2eb1a1 100644
|
||||
- $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ)
|
||||
-
|
||||
-$(MKROMFS_XE)_1: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_1) $(UNIX_AUX_MAK) $(MAKEDIRS)
|
||||
- $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) $(AUXEXTRALIBS)
|
||||
- $(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)
|
||||
-
|
||||
+#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_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) $(AUXEXTRALIBS)
|
||||
+# $(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
|
||||
--
|
||||
2.8.1
|
||||
|
||||
# they can be overridden by settings from the configure script.
|
||||
36
meta/recipes-extended/ghostscript/ghostscript/mkdir-p.patch
Normal file
36
meta/recipes-extended/ghostscript/ghostscript/mkdir-p.patch
Normal file
@@ -0,0 +1,36 @@
|
||||
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.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
||||
|
||||
|
||||
--- a/base/unix-end.mak
|
||||
+++ b/base/unix-end.mak
|
||||
@@ -17,15 +17,14 @@
|
||||
UNIX_END_MAK=$(GLSRC)unix-end.mak $(TOP_MAKEFILES)
|
||||
# Define the rule for building standard configurations.
|
||||
directories: $(UNIX_END_MAK)
|
||||
- @if test "$(BINDIR)" != "" -a ! -d $(BINDIR); then mkdir $(BINDIR); fi
|
||||
- @if test "$(GLGENDIR)" != "" -a ! -d $(GLGENDIR); then mkdir $(GLGENDIR); fi
|
||||
- @if test "$(GLOBJDIR)" != "" -a ! -d $(GLOBJDIR); then mkdir $(GLOBJDIR); fi
|
||||
- @if test "$(DEVGENDIR)" != "" -a ! -d $(DEVGENDIR); then mkdir $(DEVGENDIR); fi
|
||||
- @if test "$(DEVOBJDIR)" != "" -a ! -d $(DEVOBJDIR); then mkdir $(DEVOBJDIR); fi
|
||||
- @if test "$(AUXDIR)" != "" -a ! -d $(AUXDIR); then mkdir $(AUXDIR); fi
|
||||
- @if test "$(PSGENDIR)" != "" -a ! -d $(PSGENDIR); then mkdir $(PSGENDIR); fi
|
||||
- @if test "$(PSGENDIR)" != "" -a ! -d $(PSGENDIR)/cups; then mkdir $(PSGENDIR)/cups; fi
|
||||
- @if test "$(PSOBJDIR)" != "" -a ! -d $(PSOBJDIR); then mkdir $(PSOBJDIR); fi
|
||||
+ @if test "$(BINDIR)" != "" -a ! -d $(BINDIR); then mkdir -p $(BINDIR); fi
|
||||
+ @if test "$(GLGENDIR)" != "" -a ! -d $(GLGENDIR); then mkdir -p $(GLGENDIR); fi
|
||||
+ @if test "$(GLOBJDIR)" != "" -a ! -d $(GLOBJDIR); then mkdir -p $(GLOBJDIR); fi
|
||||
+ @if test "$(DEVGENDIR)" != "" -a ! -d $(DEVGENDIR); then mkdir -p $(DEVGENDIR); fi
|
||||
+ @if test "$(DEVOBJDIR)" != "" -a ! -d $(DEVOBJDIR); then mkdir -p $(DEVOBJDIR); fi
|
||||
+ @if test "$(AUXDIR)" != "" -a ! -d $(AUXDIR); then mkdir -p $(AUXDIR); fi
|
||||
+ @if test "$(PSGENDIR)" != "" -a ! -d $(PSGENDIR)/cups; then mkdir -p $(PSGENDIR)/cups; fi
|
||||
+ @if test "$(PSOBJDIR)" != "" -a ! -d $(PSOBJDIR); then mkdir -p $(PSOBJDIR); fi
|
||||
|
||||
|
||||
gs: .gssubtarget $(UNIX_END_MAK)
|
||||
@@ -19,42 +19,40 @@ 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/gs920/${BPN}-${PV}.tar.gz \
|
||||
SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs921/${BPN}-${PV}.tar.gz \
|
||||
file://ghostscript-9.15-parallel-make.patch \
|
||||
file://ghostscript-9.16-Werror-return-type.patch \
|
||||
file://png_mak.patch \
|
||||
file://do-not-check-local-libpng-source.patch \
|
||||
file://avoid-host-contamination.patch \
|
||||
file://mkdir-p.patch \
|
||||
"
|
||||
|
||||
SRC_URI = "${SRC_URI_BASE} \
|
||||
file://ghostscript-9.02-prevent_recompiling.patch \
|
||||
file://ghostscript-9.21-prevent_recompiling.patch \
|
||||
file://ghostscript-9.02-genarch.patch \
|
||||
file://objarch.h \
|
||||
file://cups-no-gcrypt.patch \
|
||||
file://CVE-2017-7207.patch \
|
||||
file://CVE-2016-10219.patch \
|
||||
file://CVE-2016-10220.patch \
|
||||
file://CVE-2017-5951.patch \
|
||||
file://CVE-2016-8602.patch \
|
||||
file://CVE-2017-7975.patch \
|
||||
file://CVE-2016-7977.patch \
|
||||
file://CVE-2016-7978.patch \
|
||||
file://CVE-2016-7979.patch \
|
||||
file://CVE-2017-7207.patch \
|
||||
file://CVE-2017-5951.patch \
|
||||
file://CVE-2017-7975.patch \
|
||||
file://CVE-2017-9216.patch \
|
||||
"
|
||||
|
||||
SRC_URI_class-native = "${SRC_URI_BASE} \
|
||||
file://ghostscript-native-fix-disable-system-libtiff.patch \
|
||||
file://ghostscript-9.21-native-fix-disable-system-libtiff.patch \
|
||||
file://base-genht.c-add-a-preprocessor-define-to-allow-fope.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "93c5987cd3ab341108be1ebbaadc24fe"
|
||||
SRC_URI[sha256sum] = "949b64b46ecf8906db54a94ecf83ab97534ebf946f770d3c3f283cb469cb6e14"
|
||||
SRC_URI[md5sum] = "5f213281761d2750fcf27476c404d17f"
|
||||
SRC_URI[sha256sum] = "02bceadbc4dddeb6f2eec9c8b1623d945d355ca11b8b4df035332b217d58ce85"
|
||||
|
||||
EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec \
|
||||
--with-fontpath=${datadir}/fonts \
|
||||
--without-libidn --with-cups-serverbin=${exec_prefix}/lib/cups \
|
||||
--with-cups-datadir=${datadir}/cups \
|
||||
CUPSCONFIG="${STAGING_BINDIR_CROSS}/cups-config" \
|
||||
"
|
||||
|
||||
EXTRA_OECONF_append_mipsarcho32 = " --with-large_color_index=0"
|
||||
Reference in New Issue
Block a user