main/php: security upgrade to 5.3.8

ref #764

CVE-2006-7243
CVE-2009-5016
CVE-2010-1128
CVE-2010-1129
CVE-2010-1130
CVE-2010-1860
CVE-2010-1861
CVE-2010-1862
CVE-2010-1864
CVE-2010-1866
CVE-2010-1868
CVE-2010-1914
CVE-2010-1915
CVE-2010-1917
CVE-2010-2093
CVE-2010-2094
CVE-2010-2097
CVE-2010-2100
CVE-2010-2101
CVE-2010-2190
CVE-2010-2191
CVE-2010-2225
CVE-2010-2484
CVE-2010-2531
CVE-2010-2950
CVE-2010-3062
CVE-2010-3063
CVE-2010-3064
CVE-2010-3065
CVE-2010-3436
CVE-2010-3709
CVE-2010-3709
CVE-2010-3710
CVE-2010-3710
CVE-2010-3870
CVE-2010-4150
CVE-2010-4409
CVE-2010-4645
CVE-2010-4697
CVE-2010-4698
CVE-2010-4699
CVE-2010-4700
CVE-2011-0420
CVE-2011-0421
CVE-2011-0708
CVE-2011-0752
CVE-2011-0753
CVE-2011-0755
CVE-2011-1092
CVE-2011-1148
CVE-2011-1153
CVE-2011-1464
CVE-2011-1466
CVE-2011-1467
CVE-2011-1468
CVE-2011-1469
CVE-2011-1470
CVE-2011-1471
CVE-2011-1657
CVE-2011-1938
CVE-2011-2202
CVE-2011-2483
CVE-2011-3182
CVE-2011-3189
CVE-2011-3267
CVE-2011-3268

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=4
+pkgver=5.3.8
+_suhosinver=5.3.7-0.9.10
+pkgrel=0
 pkgdesc="The PHP language runtime engine"
 url="http://www.php.net/"
 license="PHP-3"
@@ -63,26 +63,25 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-cli $pkgname-pear
 	"
 
 source="http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2
-        http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz
+        suhosin-patch-${_suhosinver}.patch
 	php-install-pear-xml.patch
-	php-uclibc.patch
 	"
 
 _extdir="/usr/lib/php/20090626"
 
 prepare() {
         cd "$srcdir/$pkgname-$pkgver"
-	# 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
+	for i in $source; do
+		case $i in
+		*.patch)
+			msg $i; patch -p1 -i "$srcdir"/$i || return 1 ;;
+		esac
+	done
 }
 
 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 \
@@ -363,7 +362,6 @@ 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
-5111e3be06d391f8772587c675240fab  php-install-pear-xml.patch
-26adfe0e744ec05fa9e368bbdee83176  php-uclibc.patch"
+md5sums="704cd414a0565d905e1074ffdc1fadfb  php-5.3.8.tar.bz2
+8bd8840465d6bcd8e1e5d2cec80a1bfc  suhosin-patch-5.3.7-0.9.10.patch
+5111e3be06d391f8772587c675240fab  php-install-pear-xml.patch"

main/php/php-uclibc.patch

@@ -1,11 +0,0 @@
---- ./ext/standard/php_crypt_r.c.orig
-+++ ./ext/standard/php_crypt_r.c
-@@ -94,7 +94,7 @@
- 	if (!initialized) {
- #ifdef PHP_WIN32
- 		InterlockedIncrement(&initialized);
--#elif (defined(__GNUC__) && (__GNUC__ >= 4 && __GNUC_MINOR >= 2))
-+#elif (defined(__GNUC__) && (__GNUC__ >= 4 && __GNUC_MINOR >= 2)) || defined(__UCLIBC__)
- 		__sync_fetch_and_add(&initialized, 1);
- #elif defined(HAVE_ATOMIC_H) /* Solaris 10 defines atomic API within */
- 		membar_producer();