diff options
| -rw-r--r-- | main/ghostscript/APKBUILD | 36 | ||||
| -rw-r--r-- | main/ghostscript/CVE-2015-3228.patch | 29 | ||||
| -rw-r--r-- | main/ghostscript/ghostscript-system-zlib.patch | 35 | ||||
| -rw-r--r-- | main/ghostscript/ghostscript-wrf-snprintf.patch | 22 |
4 files changed, 28 insertions, 94 deletions
diff --git a/main/ghostscript/APKBUILD b/main/ghostscript/APKBUILD index 17f4f507b8..05ad3ddfe9 100644 --- a/main/ghostscript/APKBUILD +++ b/main/ghostscript/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Cameron Banta <cbanta@gmail.com> # Maintainer: Cameron Banta <cbanta@gmail.com> pkgname=ghostscript -pkgver=9.16 -pkgrel=2 +pkgver=9.18 +pkgrel=0 pkgdesc="An interpreter for the PostScript language and for PDF" url="http://ghostscript.com/" arch="all" @@ -14,9 +14,7 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname-gtk" source="http://downloads.ghostscript.com/public/$pkgname-$pkgver.tar.gz ghostscript-system-zlib.patch ghostscript-system-openjpeg2.patch - ghostscript-wrf-snprintf.patch fix-sprintf.patch - CVE-2015-3228.patch " _builddir="$srcdir/ghostscript-$pkgver" @@ -29,7 +27,7 @@ prepare() { done # force it to use system-libs - rm -r jpeg libpng zlib expat tiff lcms2 cups/libs jbig2dec \ + rm -r jpeg libpng zlib tiff lcms2 cups/libs jbig2dec \ freetype openjpeg || return 1 # fix parallel builds @@ -76,7 +74,7 @@ build(){ --with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \ --disable-compile-inits \ || return 1 - make so all || return 1 + make so all || return 1 } package() { @@ -97,7 +95,7 @@ package() { install -m644 -D "$srcdir/$pkgname-$pkgver/doc/COPYING" \ "$pkgdir/usr/share/licenses/$pkgname/COPYING" - # make the doc and examples more alpine like + # make the doc and examples more alpine like # (the --docdir above doesn't seem to work so good) mkdir -p "$pkgdir/usr/share/doc/$pkgname" mv "$pkgdir/usr/share/$pkgname/$pkgver/doc" "$pkgdir/usr/share/doc/$pkgname" @@ -110,21 +108,15 @@ gtk() { mv "$pkgdir"/usr/bin/gsx "$subpkgdir"/usr/bin/ } -md5sums="829319325bbdb83f5c81379a8f86f38f ghostscript-9.16.tar.gz -c180cac458c6ab7bcd319fe092abb9cd ghostscript-system-zlib.patch +md5sums="33a47567d7a591c00a253caddd12a88a ghostscript-9.18.tar.gz +bdad7bbdc1d8a0cba5817ad722003fcc ghostscript-system-zlib.patch 7bc12888cccf6d2827d0ff012813220f ghostscript-system-openjpeg2.patch -f5129f6cc01a3d593cf02fe1ef94cbe8 ghostscript-wrf-snprintf.patch -ed14fa288463e08e1e6074a5d1ebbcbb fix-sprintf.patch -27971c7530ffd4e4046d1ffb61cac13d CVE-2015-3228.patch" -sha256sums="746d77280cca8afdd3d4c2c1389e332ed9b0605bd107bcaae1d761b061d1a68d ghostscript-9.16.tar.gz -bcbd4154fc186b3564fa6140d57117f243a5d703823c03443434c09aeef20684 ghostscript-system-zlib.patch +ed14fa288463e08e1e6074a5d1ebbcbb fix-sprintf.patch" +sha256sums="5fc93079749a250be5404c465943850e3ed5ffbc0d5c07e10c7c5ee8afbbdb1b ghostscript-9.18.tar.gz +ef2a7546592561c27a6f0a61c28cc76ec5aa1f569f5c2c344c6228de059b60cd ghostscript-system-zlib.patch 0d029c98b2149715b63d2eae9634eca0d427bf77e713dd355854412fc92b35ac ghostscript-system-openjpeg2.patch -3ca8f75d743aae7f2baa109a2a9217c33867c13e88e0ddbc96dc9be39157ae72 ghostscript-wrf-snprintf.patch -3051dff937ab9ced9f88b36384400b10bc9cdb39b2abd3ece8f4c41a0246874e fix-sprintf.patch -e6407cc5d74b6963242efec942c92b093a076c835451e6b949417b85d24c85d1 CVE-2015-3228.patch" -sha512sums="cd7da12f55379f7d388bd2573a307426da230a2220766a7138ab49990fb34343801a6d5e76ba0f4d6c97a5871359658ca043fcc700242b02f30de30a15b2847f ghostscript-9.16.tar.gz -6449fe3594d2b61aa4a96762a91db847242dbbb407c6743af8a5db0f7f18bb82df3c89e974e6b23deecaaf7b6bf1fb6930713cbe6229ec3d8b26dd65115893a8 ghostscript-system-zlib.patch +3051dff937ab9ced9f88b36384400b10bc9cdb39b2abd3ece8f4c41a0246874e fix-sprintf.patch" +sha512sums="e204648f7c21f4c48854c5fe9fc1b5a2914b8234a20a9b8b7670c7d9688360f5122f439b1396abcdb357562ad2a95384b90ffff2c5570fdaa811dfe2f6acc1a8 ghostscript-9.18.tar.gz +25af145eff059a5c854e5e290541b53ffaf4dea67f3f3ea4a608c14c2bbb151983d2a986265fae2e75651a5df212d0754d05ca64ac245fcaf6e3645a063a5aac ghostscript-system-zlib.patch f874540fc53f85a3587253aaf8a29fc7792590938daf7f44e573cbbdac258b39db8baccce9569737c5c1a0a3816c6a8ff55b97f60dbefbba0c1729fd202d0ddd ghostscript-system-openjpeg2.patch -86f30dd61c4ee87e1cf72686da4ee6d0dd89100e122279c038dd7cb813a72b95d170ca2ae8cf6a10f2a01b18e49c704dc6aca5cbb5253886908332a90b7a7c2b ghostscript-wrf-snprintf.patch -300712709ec75f728c703f6a2a5abd992b7c2137df81cc1dd4f6e96c690077e0d5a4afd0e06ce55660061911ddfbf1e68d7020ec3e5f2124602133a10451ec42 fix-sprintf.patch -142772a600d69e48e2a58d84ebf08fb89a8794cfa0424b81f35b7bb99399a07ed2bbfb2a2e7c60663f3e8cfcc223c04c23433cb81a3ab5dbd59cd8252f930367 CVE-2015-3228.patch" +300712709ec75f728c703f6a2a5abd992b7c2137df81cc1dd4f6e96c690077e0d5a4afd0e06ce55660061911ddfbf1e68d7020ec3e5f2124602133a10451ec42 fix-sprintf.patch" diff --git a/main/ghostscript/CVE-2015-3228.patch b/main/ghostscript/CVE-2015-3228.patch deleted file mode 100644 index ebd87f7bf7..0000000000 --- a/main/ghostscript/CVE-2015-3228.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0c0b0859ae1aba64861599f0e7f74f143f305932 Mon Sep 17 00:00:00 2001 -From: Chris Liddell <chris.liddell@artifex.com> -Date: Tue, 7 Jul 2015 16:57:41 +0100 -Subject: [PATCH] Bug 696041: sanity check for memory allocation. - -In gs_heap_alloc_bytes(), add a sanity check to ensure we don't overflow the -variable holding the actual number of bytes we allocate. - -No cluster differences ---- - gs/base/gsmalloc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gs/base/gsmalloc.c b/gs/base/gsmalloc.c -index 624552d..cad79c2 100644 ---- a/base/gsmalloc.c -+++ b/base/gsmalloc.c -@@ -178,7 +178,7 @@ gs_heap_alloc_bytes(gs_memory_t * mem, uint size, client_name_t cname) - } else { - uint added = size + sizeof(gs_malloc_block_t); - -- if (mmem->limit - added < mmem->used) -+ if (added <= size || mmem->limit - added < mmem->used) - set_msg("exceeded limit"); - else if ((ptr = (byte *) Memento_label(malloc(added), cname)) == 0) - set_msg("failed"); --- -2.4.6 - diff --git a/main/ghostscript/ghostscript-system-zlib.patch b/main/ghostscript/ghostscript-system-zlib.patch index ef1e3ac17e..ea70c1100c 100644 --- a/main/ghostscript/ghostscript-system-zlib.patch +++ b/main/ghostscript/ghostscript-system-zlib.patch @@ -1,21 +1,14 @@ -diff -up ghostscript-9.16/devices/devs.mak.system-zlib ghostscript-9.16/devices/devs.mak ---- ghostscript-9.16/devices/devs.mak.system-zlib 2015-03-30 17:47:57.931725800 +0100 -+++ ghostscript-9.16/devices/devs.mak 2015-03-30 17:48:14.539673024 +0100 -@@ -1231,7 +1231,7 @@ $(libtiff_dev) $(MAKEDIRS) - - $(DEVOBJ)gdevxps.$(OBJ) : $(DEVVECSRC)gdevxps.c $(gdevvec_h) \ - $(string__h) $(stdio__h) $(libtiff_dev) $(gx_h) $(gserrors_h) \ --$(gxpath_h) $(gzcpath_h) $(stream_h) $(zlib_h) \ -+$(gxpath_h) $(gzcpath_h) $(stream_h) \ - $(stdint__h) $(gdevtifs_h) $(gsicc_create_h) $(gsicc_cache_h) \ - $(gximdecode_h) $(MAKEDIRS) - $(XPSDEVCC) $(I_)$(TI_)$(_I) $(GLO_)gdevxps.$(OBJ) $(C_) $(DEVVECSRC)gdevxps.c -@@ -1683,7 +1683,7 @@ $(DD)pngalpha.dev : $(DEVS_MAK) $(libpng - fpng_=$(DEVOBJ)gdevfpng.$(OBJ) $(DEVOBJ)gdevpccm.$(OBJ) - - $(DEVOBJ)gdevfpng_0.$(OBJ) : $(DEVSRC)gdevfpng.c\ -- $(gdevprn_h) $(gdevpccm_h) $(gscdefs_h) $(zlib_h) $(MAKEDIRS) -+ $(gdevprn_h) $(gdevpccm_h) $(gscdefs_h) $(MAKEDIRS) - $(CC_) $(I_)$(DEVI_) $(II)$(PI_)$(_I) $(PCF_) $(GLF_) $(DEVO_)gdevfpng_0.$(OBJ) $(C_) $(DEVSRC)gdevfpng.c - - $(DEVOBJ)gdevfpng_1.$(OBJ) : $(DEVSRC)gdevfpng.c\ +diff --git a/base/lib.mak b/base/lib.mak +index de78333..b9e7dfa 100644 +--- a/base/lib.mak ++++ b/base/lib.mak +@@ -582,7 +582,9 @@ srlx_h=$(GLSRC)srlx.h + sstring_h=$(GLSRC)sstring.h + strimpl_h=$(GLSRC)strimpl.h $(scommon_h) $(gstypes_h) $(gsstruct_h) + szlibx_h=$(GLSRC)szlibx.h ++ifneq ($(SHARE_ZLIB),1) + zlib_h=$(ZSRCDIR)$(D)zlib.h ++endif + # We have two of the following, for shared zlib (_1) + # and 'local' zlib (_0) + szlibxx_h_1=$(GLSRC)szlibxx.h $(szlibx_h) diff --git a/main/ghostscript/ghostscript-wrf-snprintf.patch b/main/ghostscript/ghostscript-wrf-snprintf.patch deleted file mode 100644 index 74d8c2a5c6..0000000000 --- a/main/ghostscript/ghostscript-wrf-snprintf.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up ghostscript-9.07/base/wrfont.c.wrf-snprintf ghostscript-9.07/base/wrfont.c ---- ghostscript-9.07/base/wrfont.c.wrf-snprintf 2013-07-01 13:02:33.373244683 +0100 -+++ ghostscript-9.07/base/wrfont.c 2013-07-01 13:04:55.022864299 +0100 -@@ -72,7 +72,8 @@ WRF_wfloat(WRF_output * a_output, double - { - char buffer[32]; - -- gs_sprintf(buffer, "%f", a_float); -+ if (gs_snprintf(buffer, sizeof (buffer), "%f", a_float) >= sizeof (buffer)) -+ abort(); - WRF_wstring(a_output, buffer); - } - -@@ -81,6 +82,7 @@ WRF_wint(WRF_output * a_output, long a_i - { - char buffer[32]; - -- gs_sprintf(buffer, "%ld", a_int); -+ if (gs_snprintf(buffer, sizeof (buffer), "%ld", a_int) >= sizeof (buffer)) -+ abort(); - WRF_wstring(a_output, buffer); - } |