From a64ad11cea67058e1d505f9498771d69dfc4c084 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 20 Dec 2010 07:35:22 +0000
Subject: main/php: upgrade to 5.3.4

---
 main/php/APKBUILD | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'main/php/APKBUILD')

diff --git a/main/php/APKBUILD b/main/php/APKBUILD
index 443ba3e3b..35df4927c 100644
--- a/main/php/APKBUILD
+++ b/main/php/APKBUILD
@@ -1,9 +1,9 @@
 # Contributor: Carlo Landmeter <clandmeter at gmail>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=php
-pkgver=5.3.3
-_suhosinver=${pkgver}-0.9.10
-pkgrel=5
+pkgver=5.3.4
+_suhosinver=5.3.4-0.9.10
+pkgrel=0
 pkgdesc="The PHP language runtime engine"
 url="http://www.php.net/"
 arch="x86 x86_64"
@@ -63,11 +63,12 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-cli $pkgname-fpm $pkgname-pear
 	$pkgname-zlib
 	"
 
+#  http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz
 source="http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2
-        http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz
 	php-install-pear-xml.patch
 	php-uclibc.patch
 	php-fpm.init
+	suhosin-patch-5.3.4-0.9.10.patch
 	"
 
 _extdir="/usr/lib/php/20090626"
@@ -77,15 +78,14 @@ prepare() {
 	# beat the pear installer into using xml.so
 	patch -p1 -i "$srcdir"/php-install-pear-xml.patch || return 1
 	patch -p1 -i "$srcdir"/php-uclibc.patch || return 1
+
+	# apply suhosin patch
+	patch -p1 -i "${srcdir}"/suhosin-patch-${_suhosinver}.patch || return 1
 }
 
 build() {
         cd "$srcdir/$pkgname-$pkgver"
 
-	# apply suhosin patch
-	gunzip -c ${srcdir}/suhosin-patch-${_suhosinver}.patch.gz \
-		| patch -p1 || return 1
-
 	phpextensions="--enable-bcmath=shared \
 		--enable-calendar=shared \
 		--enable-dba=shared \
@@ -375,8 +375,8 @@ dev() {
 	mv "$pkgdir"/usr/bin/phpize "$subpkgdir"/usr/bin/
 }
 
-md5sums="21ceeeb232813c10283a5ca1b4c87b48  php-5.3.3.tar.bz2
-b66b27c43b1332400ef8982944c3b95b  suhosin-patch-5.3.3-0.9.10.patch.gz
+md5sums="2c069d8f690933e3bf6a8741ed818150  php-5.3.4.tar.bz2
 5111e3be06d391f8772587c675240fab  php-install-pear-xml.patch
 26adfe0e744ec05fa9e368bbdee83176  php-uclibc.patch
-8f2bb2b744a2de50025842cb51fb6a3a  php-fpm.init"
+8f2bb2b744a2de50025842cb51fb6a3a  php-fpm.init
+289ca647771170f096985951047174e7  suhosin-patch-5.3.4-0.9.10.patch"
-- 
cgit v1.2.3