Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2015Q1

Browse Source
This commit is contained in:
Lionel Sambuc
2015-04-22 14:34:26 +02:00
committed by Lionel Sambuc
parent 9a8c06dafb
commit 4af1cdf7a9
25114 changed files with 870550 additions and 795435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
print/ghostscript-gpl/DESCR
View File

@@ -4,4 +4,4 @@ and some displays.
Support for Cups is enabled by the "cups" option (off by default).
This package contains Ghostscript 9.05, released under the GPL.
This package contains Ghostscript 9.06, released under the GPL.

15
print/ghostscript-gpl/MESSAGE Normal file
View File

@@ -0,0 +1,15 @@
===========================================================================
$NetBSD: MESSAGE,v 1.1 2014/04/26 13:52:00 wiz Exp $
To customize cidfmap, copy
${GS_RESOURCEDIR}/Init/cidfmap.dist
to
${GS_RESOURCEDIR}/Init/cidfmap
and modify it.
Please consider installing another companion package
fonts/ghostscript-cidfonts-ryumin for above purpose.
Please note that the above statement only applies when the option
disable-compile-inits selected while build time. Otherwise you may
set GS_LIB environment variable to give search path for setup files.
===========================================================================

25
print/ghostscript-gpl/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.10 2014/03/13 11:08:52 jperkin Exp $
# $NetBSD: Makefile,v 1.16 2015/03/11 20:58:26 spz Exp $
DISTNAME= ghostscript-${GS_VERSION}
PKGNAME= ${DISTNAME:S/ghostscript/ghostscript-gpl/}
PKGREVISION= 8
PKGREVISION= 4
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ghostscript/}
MASTER_SITES+= http://ghostscript.com/releases/
@@ -12,9 +12,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://ghostscript.sourceforge.net/
COMMENT= Postscript interpreter
# iconfig.c compiled before gconfig.h is created
MAKE_JOBS_SAFE=no
# Plus adobe verbatim for Resources/CMap.
LICENSE= gnu-gpl-v3
@@ -23,10 +20,12 @@ LICENSE= gnu-gpl-v3
DEPENDS+= ghostscript-fonts>=6.0:../../fonts/ghostscript-fonts
CONFLICTS+= ghostscript-afpl-[0-9]*
CONFLICTS+= ghostscript-esp{,-nox11}-[0-9]*
CONFLICTS+= ghostscript-gnu{,-nox11,-x11}-[0-9]*
# To avoid flag from pkglint
CONFLICTS+= ghostscript-esp-[0-9]*
CONFLICTS+= ghostscript-esp-nox11-[0-9]*
CONFLICTS+= ghostscript-gnu-x11-[0-9]*
CONFLICTS+= ghostscript-gnu-nox11-[0-9]*
USE_GCC_RUNTIME= yes
USE_TOOLS+= gmake perl:run lex pkg-config
USE_LANGUAGES+= c c++
GNU_CONFIGURE= yes
@@ -89,6 +88,11 @@ CONFIGURE_ENV+= LPLIBDIR=${PREFIX}/lib
# On OpenBSD 5.3, libxcb is required libXt.
LDFLAGS.OpenBSD+= -lxcb
.if ${OS_VARIANT} == "SCOOSR5"
# SCO OpenServer 5.0.7/3.2 has windows.h, and configure expacts it for MS Windows.
CONFIGURE_ENV+= ac_cv_header_windows_h=no
.endif
.include "options.mk"
post-extract:
@@ -97,7 +101,10 @@ post-extract:
# ${RM} -rf ${WRKSRC}/jasper
${RM} -rf ${WRKSRC}/libpng
# ${RM} -rf ${WRKSRC}/tiff
# ${RM} -rf ${WRKSRC}/zlib
# UX:i386ld: ERROR: symbol: 'deflate_copyright' defined in two shared objects: libgs.so: size = 53, libz.so.1: size = 68
.if ${OS_VARIANT} == "SCOOSR5"
${RM} -rf ${WRKSRC}/zlib
.endif
${RM} -rf ${WRKSRC}/freetype
#
# To allow outside customization, rename cidfmap

7
print/ghostscript-gpl/Makefile.common
View File

@@ -1,6 +1,7 @@
# $NetBSD: Makefile.common,v 1.3 2014/01/10 01:35:42 mef Exp $
# $NetBSD: Makefile.common,v 1.5 2014/10/05 16:41:08 wiz Exp $
# used by print/ghostscript-gpl/Makefile
# used by fonts/ghostscript-cidfonts/Makefile
# used (potentially) by fonts/ghostscript-cidfonts/Makefile
# used (potentially) by fonts/ghostscript-cidfonts-ryumin/Makefile
# used by fonts/ghostscript-cidfonts-ryumin/Makefile
GS_VERSION= 9.05
GS_VERSION= 9.06

17
print/ghostscript-gpl/PLIST
View File

@@ -1,5 +1,4 @@
@comment $NetBSD: PLIST,v 1.1 2013/03/16 21:32:00 dholland Exp $
bin/dumphint
@comment $NetBSD: PLIST,v 1.2 2014/04/26 13:51:40 wiz Exp $
bin/dvipdf
bin/eps2eps
bin/font2c
@@ -371,7 +370,9 @@ ${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/SubstCID/GB1-WMode
${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/SubstCID/Japan1-WMode
${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/SubstCID/Korea1-WMode
share/ghostscript/${PKGVERSION}/doc/API.htm
share/ghostscript/${PKGVERSION}/doc/AUTHORS
share/ghostscript/${PKGVERSION}/doc/C-style.htm
share/ghostscript/${PKGVERSION}/doc/COPYING
share/ghostscript/${PKGVERSION}/doc/Changes.htm
share/ghostscript/${PKGVERSION}/doc/Commprod.htm
share/ghostscript/${PKGVERSION}/doc/DLL.htm
@@ -383,6 +384,8 @@ share/ghostscript/${PKGVERSION}/doc/Develop.htm
share/ghostscript/${PKGVERSION}/doc/Devices.htm
share/ghostscript/${PKGVERSION}/doc/Drivers.htm
share/ghostscript/${PKGVERSION}/doc/Fonts.htm
share/ghostscript/${PKGVERSION}/doc/GS9_Color_Management.pdf
share/ghostscript/${PKGVERSION}/doc/GS9_Color_Management.tex
share/ghostscript/${PKGVERSION}/doc/Helpers.htm
share/ghostscript/${PKGVERSION}/doc/Hershey.htm
share/ghostscript/${PKGVERSION}/doc/History1.htm
@@ -404,15 +407,21 @@ share/ghostscript/${PKGVERSION}/doc/Projects.htm
share/ghostscript/${PKGVERSION}/doc/Ps-style.htm
share/ghostscript/${PKGVERSION}/doc/Ps2epsi.htm
share/ghostscript/${PKGVERSION}/doc/Ps2pdf.htm
share/ghostscript/${PKGVERSION}/doc/Ps2ps2.htm
share/ghostscript/${PKGVERSION}/doc/Psfiles.htm
share/ghostscript/${PKGVERSION}/doc/Readme.htm
share/ghostscript/${PKGVERSION}/doc/Release.htm
share/ghostscript/${PKGVERSION}/doc/Source.htm
share/ghostscript/${PKGVERSION}/doc/Unix-lpr.htm
share/ghostscript/${PKGVERSION}/doc/Use.htm
share/ghostscript/${PKGVERSION}/doc/WhatIsGS.htm
share/ghostscript/${PKGVERSION}/doc/Xfonts.htm
share/ghostscript/${PKGVERSION}/doc/gs-vms.hlp
share/ghostscript/${PKGVERSION}/doc/gs.css
share/ghostscript/${PKGVERSION}/doc/gsdoc.el
share/ghostscript/${PKGVERSION}/doc/index.html
share/ghostscript/${PKGVERSION}/doc/pscet_status.txt
share/ghostscript/${PKGVERSION}/doc/thirdparty.htm
share/ghostscript/${PKGVERSION}/examples/alphabet.ps
share/ghostscript/${PKGVERSION}/examples/annots.pdf
share/ghostscript/${PKGVERSION}/examples/chess.ps
@@ -435,7 +444,10 @@ share/ghostscript/${PKGVERSION}/examples/golfer.eps
share/ghostscript/${PKGVERSION}/examples/grayalph.ps
share/ghostscript/${PKGVERSION}/examples/ridt91.eps
share/ghostscript/${PKGVERSION}/examples/snowflak.ps
share/ghostscript/${PKGVERSION}/examples/text_graph_image_cmyk_rgb.pdf
share/ghostscript/${PKGVERSION}/examples/text_graphic_image.pdf
share/ghostscript/${PKGVERSION}/examples/tiger.eps
share/ghostscript/${PKGVERSION}/examples/transparency_example.ps
share/ghostscript/${PKGVERSION}/examples/vasarely.ps
share/ghostscript/${PKGVERSION}/examples/waterfal.ps
${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/iccprofiles/default_cmyk.icc
@@ -509,7 +521,6 @@ share/ghostscript/${PKGVERSION}/lib/dmp_site.ps
share/ghostscript/${PKGVERSION}/lib/dnj750c.upp
share/ghostscript/${PKGVERSION}/lib/dnj750m.upp
share/ghostscript/${PKGVERSION}/lib/docie.ps
share/ghostscript/${PKGVERSION}/lib/dumphint.ps
share/ghostscript/${PKGVERSION}/lib/escp_24.src
share/ghostscript/${PKGVERSION}/lib/font2c.ps
share/ghostscript/${PKGVERSION}/lib/font2pcl.ps

4
print/ghostscript-gpl/buildlink3.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.4 2014/02/12 23:18:29 tron Exp $
# $NetBSD: buildlink3.mk,v 1.6 2014/06/18 09:26:11 wiz Exp $
BUILDLINK_TREE+= ghostscript-gpl
@@ -16,7 +16,7 @@ pkgbase := ghostscript-gpl
.include "../../mk/pkg-build-options.mk"
.if !empty(PKG_BUILD_OPTIONS.ghostscript-gpl:Mcups)
.include "../../print/cups/buildlink3.mk"
.include "../../print/cups15/buildlink3.mk"
.endif
.if !empty(PKG_BUILD_OPTIONS.ghostscript-gpl:Mfontconfig)

23
print/ghostscript-gpl/distinfo
View File

@@ -1,16 +1,21 @@
$NetBSD: distinfo,v 1.2 2013/10/05 05:13:07 ryoon Exp $
$NetBSD: distinfo,v 1.9 2015/03/11 20:58:26 spz Exp $
SHA1 (ghostscript-9.05.tar.bz2) = 1a54a846e90ae95b5307f4f0459d044b9597d8cf
RMD160 (ghostscript-9.05.tar.bz2) = 27935f60083b788b2793b19ee42f3663082ba084
Size (ghostscript-9.05.tar.bz2) = 28279634 bytes
SHA1 (ghostscript-9.06.tar.bz2) = 4c1c2b4cddd16d86b21f36ad4fc15f6100162238
RMD160 (ghostscript-9.06.tar.bz2) = 11ef74cf783ec5f7cde0ceaaf2823a1f62fb4d1d
Size (ghostscript-9.06.tar.bz2) = 29246039 bytes
SHA1 (patch-CVE-2012-4405) = 1dcb4cfeceb366c144e0a1337c6ccc2d8e13e4ca
SHA1 (patch-af) = 79b06a2b5b73486a0b7e0a6e2b14e105579f8a1f
SHA1 (patch-ah) = 35d6e3a4623bb28e59526f61a3062874cc363429
SHA1 (patch-CVE-2014-8137) = 5375f56f3d7cdfed0c9f900d291d75bbc3182b96
SHA1 (patch-CVE-2014-8138) = be161051680e3c6c9246f31237019470a447ee49
SHA1 (patch-CVE-2014-8157) = 18822069b9791fc3553e812878cfca483d881cd4
SHA1 (patch-CVE-2014-8158) = 71387f152a205caaef0fcc518dbb0fbb7b78e531
SHA1 (patch-CVE-2014-9029) = 9636c7d6909fc0dec7ad2102b59fb14d599bac6a
SHA1 (patch-af) = 79af4d253001f879f1b5d3ef93584ae7300361de
SHA1 (patch-ah) = 73a05ee51845ca70e1b18c50dee98d6799a46d52
SHA1 (patch-ai) = 8a3de7e097d3d893a0de4ea2936acf192f770c65
SHA1 (patch-aj) = 620d921210b5c0efec0a84e33bc416e4ab4bd11c
SHA1 (patch-al) = 86489b704c60320385794c3eb68170d9b9f1f6cc
SHA1 (patch-al) = e5a5be44f997a450afef15e172acc771b4818ac9
SHA1 (patch-an) = 22ed9965aec5d540adb31334d8dd9e05eab8e0c2
SHA1 (patch-base_configure_ac) = c0f5ee586df05d1d136b7c89b4776c0bf480cc57
SHA1 (patch-base_gdevpng.c) = 24120e26bd2a846f6d4c8ab9753dfe91f151343f
SHA1 (patch-base_gserrors_h) = fde64bd096a6e6f94005c8352a6295df06c19bae
SHA1 (patch-configure.ac) = 450053cef6948c638bf8f72cfcba7391edb33600
SHA1 (patch-openjpeg_libopenjpeg_opj_malloc_h) = 4be081d6c4c9bc632ef8d9685fe4167ea3c51484
SHA1 (patch-openjpeg_libopenjpeg_opj_malloc_h) = 24f15c55cd7961afc1254f6c4bccd6d0c2a5e737

2
print/ghostscript-gpl/hacks.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: hacks.mk,v 1.1 2013/03/16 21:32:00 dholland Exp $
# $NetBSD: hacks.mk,v 1.2 2014/04/26 13:51:40 wiz Exp $
### [Tue Jan 9 15:57:05 EST 2007 : tv]
### Interix has u_int64_t, but not uint64_t

10
print/ghostscript-gpl/options.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: options.mk,v 1.2 2014/02/21 18:09:02 richard Exp $
# $NetBSD: options.mk,v 1.6 2014/06/18 09:26:11 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.ghostscript
PKG_SUPPORTED_OPTIONS= x11 cups debug fontconfig disable-compile-inits utf8
@@ -15,6 +15,11 @@ CONFIGURE_ARGS+= --with-x
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
. if !empty(X11_TYPE:Mnative)
. include "../../x11/libxcb/buildlink3.mk"
. include "../../graphics/freetype2/buildlink3.mk"
. endif
.else
CONFIGURE_ARGS+= --without-x
CONFIGURE_ARGS+= --disable-freetype
@@ -24,6 +29,7 @@ PLIST_VARS+= cups
.if !empty(PKG_OPTIONS:Mcups)
CONFIGURE_ARGS+= --enable-cups
PLIST.cups= yes
BUILD_TARGET+= cups
INSTALL_TARGET+= install-cups
CUPS_CONFDIR?= ${PKG_SYSCONFBASEDIR}/cups
@@ -36,7 +42,7 @@ SUBST_MESSAGE.cupsetc= Fixing CUPS etc directory path to install as example
SUBST_FILES.cupsetc= cups/cups.mak
SUBST_SED.cupsetc= -e 's|$$(CUPSSERVERROOT)|${CUPS_EGDIR}|g'
.include "../../print/cups/buildlink3.mk"
.include "../../print/cups15/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
.else
CONFIGURE_ARGS+= --disable-cups

2
print/ghostscript-gpl/patches/patch-CVE-2012-4405
View File

@@ -1,4 +1,4 @@
$NetBSD: patch-CVE-2012-4405,v 1.1 2013/03/16 21:32:01 dholland Exp $
$NetBSD: patch-CVE-2012-4405,v 1.2 2014/04/26 13:51:40 wiz Exp $
from RedHat bug #854227

62
print/ghostscript-gpl/patches/patch-CVE-2014-8137 Normal file
View File

@@ -0,0 +1,62 @@
$NetBSD: patch-CVE-2014-8137,v 1.1 2015/03/11 20:58:26 spz Exp $
patch for CVE-2014-8137 taken from
http://pkgs.fedoraproject.org/cgit/jasper.git/tree/jasper-CVE-2014-8137.patch
--- jasper/src/libjasper/base/jas_icc.c.orig 2012-08-08 08:01:36.000000000 +0000
+++ jasper/src/libjasper/base/jas_icc.c
@@ -1024,7 +1024,6 @@ static int jas_icccurv_input(jas_iccattr
return 0;
error:
- jas_icccurv_destroy(attrval);
return -1;
}
@@ -1144,7 +1143,6 @@ static int jas_icctxtdesc_input(jas_icca
#endif
return 0;
error:
- jas_icctxtdesc_destroy(attrval);
return -1;
}
@@ -1223,8 +1221,6 @@ static int jas_icctxt_input(jas_iccattrv
goto error;
return 0;
error:
- if (txt->string)
- jas_free(txt->string);
return -1;
}
@@ -1349,7 +1345,6 @@ static int jas_icclut8_input(jas_iccattr
goto error;
return 0;
error:
- jas_icclut8_destroy(attrval);
return -1;
}
@@ -1520,7 +1515,6 @@ static int jas_icclut16_input(jas_iccatt
goto error;
return 0;
error:
- jas_icclut16_destroy(attrval);
return -1;
}
--- jasper/src/libjasper/jp2/jp2_dec.c.orig 2012-08-08 08:01:36.000000000 +0000
+++ jasper/src/libjasper/jp2/jp2_dec.c
@@ -325,7 +325,10 @@ jas_image_t *jp2_decode(jas_stream_t *in
case JP2_COLR_ICC:
iccprof = jas_iccprof_createfrombuf(dec->colr->data.colr.iccp,
dec->colr->data.colr.iccplen);
- assert(iccprof);
+ if (!iccprof) {
+ jas_eprintf("error: failed to parse ICC profile\n");
+ goto error;
+ }
jas_iccprof_gethdr(iccprof, &icchdr);
if (jas_getdbglevel() >= 1) {
jas_eprintf("ICC Profile CS %08x\n", icchdr.colorspc);

16
print/ghostscript-gpl/patches/patch-CVE-2014-8138 Normal file
View File

@@ -0,0 +1,16 @@
$NetBSD: patch-CVE-2014-8138,v 1.1 2015/03/11 20:58:26 spz Exp $
--- jasper/src/libjasper/jp2/jp2_dec.c.orig 2012-08-08 08:01:36.000000000 +0000
+++ jasper/src/libjasper/jp2/jp2_dec.c
@@ -444,6 +447,11 @@ jas_image_t *jp2_decode(jas_stream_t *in
/* Determine the type of each component. */
if (dec->cdef) {
for (i = 0; i < dec->numchans; ++i) {
+ /* Is the channel number reasonable? */
+ if (dec->cdef->data.cdef.ents[i].channo >= dec->numchans) {
+ jas_eprintf("error: invalid channel number in CDEF box\n");
+ goto error;
+ }
jas_image_setcmpttype(dec->image,
dec->chantocmptlut[dec->cdef->data.cdef.ents[i].channo],
jp2_getct(jas_image_clrspc(dec->image),

16
print/ghostscript-gpl/patches/patch-CVE-2014-8157 Normal file
View File

@@ -0,0 +1,16 @@
$NetBSD: patch-CVE-2014-8157,v 1.1 2015/03/11 20:58:26 spz Exp $
patch for CVE-2014-8157 from
http://pkgs.fedoraproject.org/cgit/jasper.git/tree/jasper-CVE-2014-8157.patch
--- jasper/src/libjasper/jpc/jpc_dec.c.orig 2012-08-08 08:01:36.000000000 +0000
+++ jasper/src/libjasper/jpc/jpc_dec.c
@@ -496,7 +496,7 @@ static int jpc_dec_process_sot(jpc_dec_t
dec->curtileendoff = 0;
}
- if (JAS_CAST(int, sot->tileno) > dec->numtiles) {
+ if (JAS_CAST(int, sot->tileno) >= dec->numtiles) {
jas_eprintf("invalid tile number in SOT marker segment\n");
return -1;
}

93
print/ghostscript-gpl/patches/patch-CVE-2014-8158 Normal file
View File

@@ -0,0 +1,93 @@
$NetBSD: patch-CVE-2014-8158,v 1.1 2015/03/11 20:58:26 spz Exp $
patch for CVE-2014-8158 loosely based on
http://pkgs.fedoraproject.org/cgit/jasper.git/plain/jasper-CVE-2014-8158.patch
eradicate all code-paths activated by HAVE_VLA
--- jasper/src/libjasper/jpc/jpc_qmfb.c.orig 2012-08-08 08:01:36.000000000 +0000
+++ jasper/src/libjasper/jpc/jpc_qmfb.c
@@ -158,12 +158,8 @@ static void jpc_qmfb1d_split(jpc_fix_t *
jpc_fix_t *hstartptr, int hstartind, int hendind)
{
int bufsize = JPC_CEILDIVPOW2(endind - startind, 2);
-#if !defined(HAVE_VLA)
#define QMFB_SPLITBUFSIZE 4096
jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE];
-#else
- jpc_fix_t splitbuf[bufsize];
-#endif
jpc_fix_t *buf = splitbuf;
int llen;
int hlen;
@@ -179,7 +175,6 @@ static void jpc_qmfb1d_split(jpc_fix_t *
llen = lendind - lstartind;
hlen = hendind - hstartind;
-#if !defined(HAVE_VLA)
/* Get a buffer. */
if (bufsize > QMFB_SPLITBUFSIZE) {
if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
@@ -190,7 +185,6 @@ static void jpc_qmfb1d_split(jpc_fix_t *
return;
}
}
-#endif
if (hstartind < lstartind) {
/* The first sample in the input signal is to appear
@@ -272,12 +266,10 @@ static void jpc_qmfb1d_split(jpc_fix_t *
}
}
-#if !defined(HAVE_VLA)
/* If the split buffer was allocated on the heap, free this memory. */
if (buf != splitbuf) {
jas_free(buf);
}
-#endif
}
static void jpc_qmfb1d_join(jpc_fix_t *startptr, int startind, int endind,
@@ -285,12 +277,8 @@ static void jpc_qmfb1d_join(jpc_fix_t *s
jpc_fix_t *hstartptr, int hstartind, int hendind)
{
int bufsize = JPC_CEILDIVPOW2(endind - startind, 2);
-#if !defined(HAVE_VLA)
#define QMFB_JOINBUFSIZE 4096
jpc_fix_t joinbuf[QMFB_JOINBUFSIZE];
-#else
- jpc_fix_t joinbuf[bufsize];
-#endif
jpc_fix_t *buf = joinbuf;
int llen;
int hlen;
@@ -302,7 +290,6 @@ static void jpc_qmfb1d_join(jpc_fix_t *s
register int n;
int state;
-#if !defined(HAVE_VLA)
/* Allocate memory for the join buffer from the heap. */
if (bufsize > QMFB_JOINBUFSIZE) {
if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
@@ -313,7 +300,6 @@ static void jpc_qmfb1d_join(jpc_fix_t *s
return;
}
}
-#endif
twostep = step << 1;
llen = lendind - lstartind;
@@ -400,12 +386,10 @@ static void jpc_qmfb1d_join(jpc_fix_t *s
}
}
-#if !defined(HAVE_VLA)
/* If the join buffer was allocated on the heap, free this memory. */
if (buf != joinbuf) {
jas_free(buf);
}
-#endif
}
/******************************************************************************\

35
print/ghostscript-gpl/patches/patch-CVE-2014-9029 Normal file
View File

@@ -0,0 +1,35 @@
$NetBSD: patch-CVE-2014-9029,v 1.1 2014/12/30 07:52:41 dholland Exp $
Patch for CVE-2014-9029 from https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2014-9029
(adjusted very slightly to match the jasper shipped with ghostscript)
--- jasper/src/libjasper/jpc/jpc_dec.c.orig 2012-08-08 08:01:36.000000000 +0000
+++ jasper/src/libjasper/jpc/jpc_dec.c
@@ -1294,7 +1294,7 @@ static int jpc_dec_process_coc(jpc_dec_t
jpc_coc_t *coc = &ms->parms.coc;
jpc_dec_tile_t *tile;
- if (JAS_CAST(int, coc->compno) > dec->numcomps) {
+ if (JAS_CAST(int, coc->compno) >= dec->numcomps) {
jas_eprintf(
"invalid component number in COC marker segment\n");
return -1;
@@ -1321,7 +1321,7 @@ static int jpc_dec_process_rgn(jpc_dec_t
jpc_rgn_t *rgn = &ms->parms.rgn;
jpc_dec_tile_t *tile;
- if (JAS_CAST(int, rgn->compno) > dec->numcomps) {
+ if (JAS_CAST(int, rgn->compno) >= dec->numcomps) {
jas_eprintf(
"invalid component number in RGN marker segment\n");
return -1;
@@ -1371,7 +1371,7 @@ static int jpc_dec_process_qcc(jpc_dec_t
jpc_qcc_t *qcc = &ms->parms.qcc;
jpc_dec_tile_t *tile;
- if (JAS_CAST(int, qcc->compno) > dec->numcomps) {
+ if (JAS_CAST(int, qcc->compno) >= dec->numcomps) {
jas_eprintf(
"invalid component number in QCC marker segment\n");
return -1;

14
print/ghostscript-gpl/patches/patch-af
View File

@@ -1,4 +1,4 @@
$NetBSD: patch-af,v 1.2 2013/10/05 05:13:07 ryoon Exp $
$NetBSD: patch-af,v 1.3 2014/04/26 13:51:40 wiz Exp $
(From the log for revision 1.4 of print/ghostscript/patches/patch-af)
date: 2008/11/13 17:36:54; author: chuck; state: Exp; lines: +22 -4
@@ -14,9 +14,9 @@ XXX: this still leaves the issue of libgs.so (et al.) being hardwired
in PLIST, instead of using libgs.dylib (et al.). i'm not sure of
the best way to fix that. at least it compiles now....
--- base/unix-dll.mak.orig 2012-02-08 08:48:48.000000000 +0000
+++ base/unix-dll.mak
@@ -58,13 +58,12 @@ LDFLAGS_SO=-shared -Wl,$(LD_SET_DT_SONAM
--- base/unix-dll.mak.orig 2012-08-08 17:01:36.000000000 +0900
+++ base/unix-dll.mak 2012-10-10 10:03:50.000000000 +0900
@@ -59,13 +59,12 @@
# MacOS X
@@ -35,17 +35,17 @@ the best way to fix that. at least it compiles now....
GS_SO=$(BINDIR)/$(GS_SONAME)
GS_SO_MAJOR=$(BINDIR)/$(GS_SONAME_MAJOR)
@@ -85,11 +84,11 @@ $(GS_SO_MAJOR): $(GS_SO_MAJOR_MINOR)
@@ -86,11 +85,11 @@
# Build the small Ghostscript loaders, with Gtk+ and without
$(GSSOC_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER)
$(GLCC) -g -o $(GSSOC_XE) $(PSSRC)dxmainc.c \
- -L$(BINDIR) -l$(GS)
+ -L$(BINDIR) -Wl,-R$(PREFIX)/lib -l$(GS) ${LDFLAGS}
+ -L$(BINDIR) -Wl,-R$(PREFIX)/lib -l$(GS)
$(GSSOX_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER)
$(GLCC) -g $(SOC_CFLAGS) -o $(GSSOX_XE) $(PSSRC)$(SOC_LOADER) \
- -L$(BINDIR) -l$(GS) $(SOC_LIBS)
+ -L$(BINDIR) -l$(GS) -Wl,-R$(PREFIX)/lib -l$(GS) $(SOC_LIBS) ${LDFLAGS}
+ -L$(BINDIR) -l$(GS) -Wl,-R$(PREFIX)/lib -l$(GS) $(SOC_LIBS)
# ------------------------- Recursive make targets ------------------------- #

45
print/ghostscript-gpl/patches/patch-ah
View File

@@ -1,14 +1,28 @@
$NetBSD: patch-ah,v 1.1 2013/03/16 21:32:01 dholland Exp $
$NetBSD: patch-ah,v 1.6 2015/02/24 08:21:07 markd Exp $
(1) First chunk to fix the X11_TYPE=native problem, which
freetype2 in /usr/X11R7/ is way old, and work around to
use ghostscript-provided freetype2.
This part is not necessary for NetBSD 6.0, 6.1.
(2) Second chunk existed from old days, and no idea, sorry (mef@).
(2) Second chunk for X11_TYPE=native, will have following problem without
this patch:
| Shared object "libpaper.so.1" not found
--- configure.orig 2012-08-08 17:04:57.000000000 +0900
(3) SCO_SV chunk for SCO OpenServer 5.0.7/3.2's linker.
--- configure.orig 2012-08-08 08:04:57.000000000 +0000
+++ configure
@@ -3786,13 +3786,13 @@
@@ -3756,7 +3756,7 @@ $as_echo "$as_me: WARNING: disabling con
;;
*)
# This is just an arbitrary file in contrib to check
- if !(test -f contrib/gdevbjc_.c); then
+ if ! (test -f contrib/gdevbjc_.c); then
enable_contrib=no
fi
;;
@@ -3786,13 +3786,13 @@ case `uname` in
;;
*BSD)
if test $ac_cv_c_compiler_gnu = yes; then
@@ -24,7 +38,17 @@ $NetBSD: patch-ah,v 1.1 2013/03/16 21:32:01 dholland Exp $
CC_DBG_FLAGS_TO_TRY="-g -O0"
fi
SET_DT_SONAME=""
@@ -5331,7 +5331,7 @@
@@ -3806,6 +3806,9 @@ case `uname` in
fi
CC_DBG_FLAGS_TO_TRY="-g -O0"
;;
+ SCO_SV)
+ SET_DT_SONAME="-h,"
+ ;;
esac
@@ -5331,7 +5334,7 @@ fi
fi
if test x$with_libpaper != xno; then
@@ -33,3 +57,14 @@ $NetBSD: patch-ah,v 1.1 2013/03/16 21:32:01 dholland Exp $
$as_echo "#define USE_LIBPAPER 1" >>confdefs.h
@@ -6474,7 +6477,9 @@ done
LCUPSINCLUDE="include \$(GLSRCDIR)/lcups.mak"
LCUPSIINCLUDE="include \$(GLSRCDIR)/lcupsi.mak"
if ( test x$with_pdftoraster != xno ); then
- if test "$CUPSVERSION" ">" "1.2"; then
+ if echo "$CUPSVERSION" | grep -q '^1\.[2-9]'; then
+ CUPSPDFTORASTER="1"
+ elif echo "$CUPSVERSION" | grep -q '^[2-9]\.[0-9]'; then
CUPSPDFTORASTER="1"
fi
fi

2
print/ghostscript-gpl/patches/patch-ai
View File

@@ -1,4 +1,4 @@
$NetBSD: patch-ai,v 1.1 2013/03/16 21:32:01 dholland Exp $
$NetBSD: patch-ai,v 1.2 2014/04/26 13:51:40 wiz Exp $
replace BSD/Linux specific "qd" printf format specifier by "lld",
should fix build problem on Solaris reported by Joern Clausen

2
print/ghostscript-gpl/patches/patch-aj
View File

@@ -1,4 +1,4 @@
$NetBSD: patch-aj,v 1.1 2013/03/16 21:32:01 dholland Exp $
$NetBSD: patch-aj,v 1.2 2014/04/26 13:51:40 wiz Exp $
http://bugs.ghostscript.com/show_bug.cgi?id=690883

10
print/ghostscript-gpl/patches/patch-al
View File

@@ -1,4 +1,12 @@
$NetBSD: patch-al,v 1.1 2013/03/16 21:32:01 dholland Exp $
$NetBSD: patch-al,v 1.2 2014/04/26 13:51:40 wiz Exp $
Echogs is almost strings command and accepts some glue to output
from its command line. The output, in this case ldt.tr, will be really
shell script for ld command. The adding words with this patch,
$(LDFLAGS_SO), will be included in the argument of ld command.
$(LDFLAGS_SO) is defined in patch-af, for Mac OS X, Darwin.
-- added by mef@ --
--- base/unixlink.mak.orig 2010-02-18 12:08:31.000000000 +0000
+++ base/unixlink.mak

2
print/ghostscript-gpl/patches/patch-an
View File

@@ -1,4 +1,4 @@
$NetBSD: patch-an,v 1.1 2013/03/16 21:32:01 dholland Exp $
$NetBSD: patch-an,v 1.2 2014/04/26 13:51:40 wiz Exp $
Do some initialization of global stuff earlier, in particular before
"@file" args get processed, fixes PR pkg/42984 from T. M. Pederson.

31
print/ghostscript-gpl/patches/patch-base_configure_ac Normal file
View File

@@ -0,0 +1,31 @@
$NetBSD: patch-base_configure_ac,v 1.1 2014/04/26 13:51:40 wiz Exp $
The source for configure, see patch-ah
--- base/configure.ac.orig 2012-08-08 17:01:36.000000000 +0900
+++ base/configure.ac 2013-04-08 10:51:50.000000000 +0900
@@ -142,13 +142,13 @@
;;
*BSD)
if test $ac_cv_prog_gcc = yes; then
- CC_OPT_FLAGS_TO_TRY="-O2"
+ CC_OPT_FLAGS_TO_TRY="-O2 -I./freetype/include"
CC_DBG_FLAGS_TO_TRY="-g -O0"
fi
;;
Darwin*)
if test $ac_cv_prog_gcc = yes; then
- CC_OPT_FLAGS_TO_TRY="-O2"
+ CC_OPT_FLAGS_TO_TRY="-O2 -I./freetype/include"
CC_DBG_FLAGS_TO_TRY="-g -O0"
fi
SET_DT_SONAME=""
@@ -457,7 +457,7 @@
fi
if test x$with_libpaper != xno; then
- LIBS="$LIBS -lpaper"
+ LIBS="$LIBS -L${LPLIBDIR} -Wl,-R${LPLIBDIR} -lpaper"
AC_DEFINE(USE_LIBPAPER, 1, [Using libpaper])
CFLAGS="$CFLAGS -DUSE_LIBPAPER"
fi

2
print/ghostscript-gpl/patches/patch-base_gdevpng.c
View File

@@ -1,4 +1,4 @@
$NetBSD: patch-base_gdevpng.c,v 1.1 2013/03/16 21:32:01 dholland Exp $
$NetBSD: patch-base_gdevpng.c,v 1.2 2014/04/26 13:51:40 wiz Exp $
The patch was included in patches/patch-ak:
revision 1.5

2
print/ghostscript-gpl/patches/patch-base_gserrors_h
View File

@@ -1,4 +1,4 @@
$NetBSD: patch-base_gserrors_h,v 1.1 2013/03/16 21:32:01 dholland Exp $
$NetBSD: patch-base_gserrors_h,v 1.2 2014/04/26 13:51:40 wiz Exp $
# This suppresses the noisy warning that __func__ redefined
--- base/gserrors.h.orig 2012-02-08 17:48:48.000000000 +0900

15
print/ghostscript-gpl/patches/patch-configure.ac
View File

@@ -1,15 +0,0 @@
$NetBSD: patch-configure.ac,v 1.1 2013/03/16 21:32:01 dholland Exp $
See patch-ah (configure)
--- base/configure.ac.orig 2011-08-05 20:12:20.000000000 +0900
+++ base/configure.ac 2011-08-22 19:10:30.000000000 +0900
@@ -404,7 +404,7 @@
fi
if test x$with_libpaper != xno; then
- LIBS="$LIBS -lpaper"
+ LIBS="$LIBS -L${LPLIBDIR} -Wl,-R${LPLIBDIR} -lpaper"
AC_DEFINE(USE_LIBPAPER, 1, [Using libpaper])
CFLAGS="$CFLAGS -DUSE_LIBPAPER"
fi

10
print/ghostscript-gpl/patches/patch-openjpeg_libopenjpeg_opj_malloc_h
View File

@@ -1,4 +1,4 @@
$NetBSD: patch-openjpeg_libopenjpeg_opj_malloc_h,v 1.1 2013/03/16 21:32:01 dholland Exp $
$NetBSD: patch-openjpeg_libopenjpeg_opj_malloc_h,v 1.2 2014/04/26 13:51:40 wiz Exp $
To avoid following problem:
| gcc .. (omitted).. g -o ./sobin/gsc ./psi/dxmainc.c \
@@ -6,14 +6,14 @@ To avoid following problem:
| ./sobin/libgs.so: undefined reference to `memalign'
| gmake[2]: *** [sobin/gsc] Error 1
--- openjpeg/libopenjpeg/opj_malloc.h.orig 2012-04-18 22:36:57.000000000 +0900
+++ openjpeg/libopenjpeg/opj_malloc.h 2012-04-18 22:54:13.000000000 +0900
--- openjpeg/libopenjpeg/opj_malloc.h.orig 2012-08-08 17:01:36.000000000 +0900
+++ openjpeg/libopenjpeg/opj_malloc.h 2012-10-08 09:17:03.000000000 +0900
@@ -84,7 +84,7 @@
#if defined(__sun)
#define HAVE_MEMALIGN
/* Linux x86_64 and OSX always align allocations to 16 bytes */
- #elif !defined(__amd64__) && !defined(__APPLE__)
+ #elif !defined(__amd64__) && !defined(__APPLE__) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__OpenBSD__)
- #elif !defined(__amd64__) && !defined(__APPLE__) && !defined(_AIX) && !defined(__FreeBSD__)
+ #elif !defined(__amd64__) && !defined(__APPLE__) && !defined(_AIX) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
#define HAVE_MEMALIGN
#include <malloc.h>
#endif