From 84adbba77776469130179dac35a19800eab16c7d Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 22 Apr 2013 12:39:57 +0000
Subject: main/ghostscript: upgrade to 9.07

---
 main/ghostscript/APKBUILD            | 49 ++++++++++++++++++++----------------
 main/ghostscript/CVE-2012-4405.patch | 15 -----------
 main/ghostscript/ijs-automake.patch  | 10 ++++++++
 3 files changed, 37 insertions(+), 37 deletions(-)
 delete mode 100644 main/ghostscript/CVE-2012-4405.patch
 create mode 100644 main/ghostscript/ijs-automake.patch

(limited to 'main')

diff --git a/main/ghostscript/APKBUILD b/main/ghostscript/APKBUILD
index 88872ca3f9..69806d87b4 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.06
-pkgrel=3
+pkgver=9.07
+pkgrel=0
 pkgdesc="An interpreter for the PostScript language and for PDF"
 url="http://ghostscript.com/"
 arch="all"
@@ -11,17 +11,16 @@ makedepends="autoconf automake libjpeg-turbo-dev libpng-dev jasper-dev expat-dev
 	zlib-dev tiff-dev freetype-dev libiconv-dev lcms-dev gtk+3.0-dev
 	libtool"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-gtk"
-patches="CVE-2012-4405.patch"
 source="http://downloads.ghostscript.com/public/$pkgname-$pkgver.tar.gz
-	$patches"
+	ijs-automake.patch"
 
 _builddir="$srcdir/ghostscript-$pkgver"
 prepare() {
 	cd "$_builddir"
-
-	for i in $patches; do
-		msg $i
-		patch -p1 -i "$srcdir"/$i || return 1
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
 	done
 
 	# force it to use system-libs
@@ -31,9 +30,20 @@ prepare() {
 	sed -i -e 's/ECHO_XE/ECHOGS_XE/g' \
 		-e 's/^\($(GLOBJ)md5.$(OBJ) :.*\)/\1 $(ECHOGS_XE)/' \
 		base/lib.mak || return 1
-	
-	./autogen.sh \
-		--prefix=/usr \
+	aclocal && autoconf --force
+
+	cd $_builddir/ijs
+	libtoolize --force && aclocal && autoconf && automake --add-missing
+}
+
+build(){
+	# build ijs
+	cd "$_builddir"/ijs
+	./configure --prefix=/usr --enable-shared --disable-static || return 1
+	make
+
+	cd "$_builddir"
+	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
@@ -47,15 +57,6 @@ prepare() {
 		--with-drivers=FILES \
 		--with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \
 		--disable-compile-inits # needed for linking with system-zlib
-}
-
-build(){
-	# build ijs
-	cd "$_builddir"/ijs
-	./autogen.sh --prefix=/usr --enable-shared --disable-static || return 1
-	make
-
-	cd "$_builddir"
 	make so all || return 1 
 }
 
@@ -91,5 +92,9 @@ gtk() {
 	mv "$pkgdir"/usr/bin/gsx "$subpkgdir"/usr/bin/
 }
 
-md5sums="153ddb0622cb155d2f600146f1e28d84  ghostscript-9.06.tar.gz
-9b77fb067f77c15116bd9c5b2ab58805  CVE-2012-4405.patch"
+md5sums="57ebf17c5abcf0fc95a386bfff08c1a4  ghostscript-9.07.tar.gz
+859759dbc83ac035ee5ee23e212d3f5a  ijs-automake.patch"
+sha256sums="44800d004c53f13192d1b5db413119198ddfc8a11c4d2a030aac2f2fda822ebf  ghostscript-9.07.tar.gz
+974fe579aa96290cd85e70552aef7e80159f304686e11c8eb3b701a108dfcc6c  ijs-automake.patch"
+sha512sums="32935ecd1f0dd6faaa1568bce26c1f24a7e19f169ea586ec50039c616f1555b01324261e139ed1910dea1055b0fb548888d230c202d5d7b7fd8d44ae9f001b58  ghostscript-9.07.tar.gz
+4ba7f19015d6f4a668188abb9b872585141a9ebc95792378d09853ee52983d1fb2c9e5e2b0a3d7bd8ea5cf85724881c5db81c8f01aa0b64d93cf82755701ad36  ijs-automake.patch"
diff --git a/main/ghostscript/CVE-2012-4405.patch b/main/ghostscript/CVE-2012-4405.patch
deleted file mode 100644
index a589992aee..0000000000
--- a/main/ghostscript/CVE-2012-4405.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./icclib/icc.c.orig
-+++ ./icclib/icc.c
-@@ -4996,6 +4996,11 @@
-         p->clutPoints = read_UInt8Number(bp+10);
- 
-         /* Sanity check */
-+	if (p->inputChan < 1) {
-+		sprintf(icp->err,"icmLut_read: No input channels!");
-+		return icp->errc = 1;
-+	}
-+
-         if (p->inputChan > MAX_CHAN) {
-                 sprintf(icp->err,"icmLut_read: Can't handle > %d input channels\n",MAX_CHAN);
-                 return icp->errc = 1;
-
diff --git a/main/ghostscript/ijs-automake.patch b/main/ghostscript/ijs-automake.patch
new file mode 100644
index 0000000000..9f7c7f5cff
--- /dev/null
+++ b/main/ghostscript/ijs-automake.patch
@@ -0,0 +1,10 @@
+--- ./ijs/configure.ac.orig	2013-04-22 11:10:04.145988521 +0000
++++ ./ijs/configure.ac	2013-04-22 11:10:18.756135737 +0000
+@@ -117,7 +117,6 @@
+ dnl Checks for programs
+ 
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AM_PROG_LIBTOOL
+ AC_SUBST(LIBTOOL_DEPS)
+ AC_ISC_POSIX
-- 
cgit v1.2.3