*/php: move php-5.3 to testing and downgrade main/php to 5.2.10

many apps needs 5.2
fixes #165

2 files changed, 37 insertions, 20 deletions

diff --git a/main/php/APKBUILD b/main/php/APKBUILD
index 6d9724953f..b006055a04 100644
--- a/main/php/APKBUILD
+++ b/main/php/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Carlo Landmeter <clandmeter at gmail>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=php
-pkgver=5.3.0
-_suhosinver=${pkgver}-0.9.8-BETA-1
+pkgver=5.2.10
+_suhosinver=${pkgver}-0.9.7
 pkgrel=2
 pkgdesc="The PHP language runtime engine"
 url="http://www.php.net/"
@@ -28,10 +28,10 @@ subpackages="$pkgname-dev $pkgname-doc
 	$pkgname-gmp
 	$pkgname-iconv
 	$pkgname-imap
-	$pkgname-intl
 	$pkgname-json
 	$pkgname-ldap
 	$pkgname-mcrypt
+	$pkgname-mime_magic
 	$pkgname-mysql
 	$pkgname-mysqli
 	$pkgname-odbc
@@ -42,7 +42,6 @@ subpackages="$pkgname-dev $pkgname-doc
 	$pkgname-pdo_pgsql
 	$pkgname-pdo_sqlite
 	$pkgname-pgsql
-	$pkgname-phar
 	$pkgname-posix
 	$pkgname-pspell
 	$pkgname-shmop
@@ -50,7 +49,6 @@ subpackages="$pkgname-dev $pkgname-doc
 	$pkgname-soap
 	$pkgname-sockets
 	$pkgname-sqlite
-	$pkgname-sqlite3
 	$pkgname-sysvmsg
 	$pkgname-sysvsem
 	$pkgname-sysvshm
@@ -63,7 +61,7 @@ subpackages="$pkgname-dev $pkgname-doc
 
 source="http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2
         http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz
-	gd-info-segfault.patch
+	curl-flush.patch
 	"
 
 build() {
@@ -73,8 +71,8 @@ build() {
 	gunzip -c ${srcdir}/suhosin-patch-${_suhosinver}.patch.gz \
 		| patch -p1 || return 1
 
-	# fix gd segfault; http://bugs.php.net/bug.php?id=49193
-	patch -p0 -i ${srcdir}/gd-info-segfault.patch || return 1
+	# fix curl regression; should be fixed upstream with PHP >= 5.2.11
+	patch -p3 -i ${srcdir}/curl-flush.patch || return 1
 
 	phpextensions="--enable-bcmath=shared \
 		--enable-calendar=shared \
@@ -113,12 +111,13 @@ build() {
 		--with-jpeg-dir=shared,/usr \
 		--with-ldap=shared \
 		--with-mcrypt=shared \
+		--with-mime-magic=shared \
 		--with-mysql-sock=/tmp/mysql.sock \
-		--with-mysql=shared,mysqlnd \
-		--with-mysqli=shared,mysqlnd \
+		--with-mysql=shared \
+		--with-mysqli=shared \
 		--with-openssl=shared \
 		--with-pcre-regex=/usr \
-		--with-pdo-mysql=shared,mysqlnd \
+		--with-pdo-mysql=shared \
 		--with-pdo-odbc=shared,unixODBC,/usr \
 		--with-pdo-pgsql=shared \
 		--with-pdo-sqlite=shared,/usr \
@@ -162,12 +161,12 @@ build() {
 
         make || return 1
         make -j1 INSTALL_ROOT="$pkgdir" install || return 1
-        install -D -m644 php.ini-production "$pkgdir"/etc/php/php.ini
+        install -D -m644 php.ini-recommended "$pkgdir"/etc/php/php.ini
 }
 
 _mv_mod() {
 	pkgdesc="$1 php extension"
-	local d=usr/lib/php/20090626
+	local d=usr/lib/php/20060613
 	mkdir -p "$subpkgdir/$d"
 	mv "$pkgdir/$d/${1}.so" "$subpkgdir/$d/" || return 1
 	install -d "$subpkgdir"/etc/php/conf.d
@@ -188,10 +187,11 @@ gettext()	{ _mv_mod gettext; }
 gmp()		{ _mv_mod gmp; }
 iconv()		{ _mv_mod iconv; }
 imap()		{ _mv_mod imap; }
-intl()		{ _mv_mod intl; }
+#intl()		{ _mv_mod intl; }
 json()		{ _mv_mod json; }
 ldap()		{ _mv_mod ldap; }
 mcrypt()	{ _mv_mod mcrypt; }
+mime_magic()	{ _mv_mod mime_magic; }
 mysql()		{ _mv_mod mysql; }
 mysqli()	{ _mv_mod mysqli; }
 odbc()		{ _mv_mod odbc; }
@@ -201,9 +201,9 @@ pdo_mysql()	{ _mv_mod pdo_mysql; }
 pdo_odbc()	{ _mv_mod pdo_odbc; }
 pdo_pgsql()	{ _mv_mod pdo_pgsql; }
 pdo_sqlite()	{ _mv_mod pdo_sqlite; }
-phar()		{ _mv_mod phar; }
-posix()		{ _mv_mod posix; }
+#phar()		{ _mv_mod phar; }
 pgsql()		{ _mv_mod pgsql; }
+posix()		{ _mv_mod posix; }
 pspell()	{ _mv_mod pspell; }
 #session()	{ _mv_mod session; }
 shmop()		{ _mv_mod shmop; }
@@ -211,7 +211,7 @@ snmp()		{ _mv_mod snmp; }
 soap()		{ _mv_mod soap; }
 sockets()	{ _mv_mod sockets; }
 sqlite()	{ _mv_mod sqlite; }
-sqlite3()	{ _mv_mod sqlite3; }
+#sqlite3()	{ _mv_mod sqlite3; }
 sysvmsg()	{ _mv_mod sysvmsg; }
 sysvsem()	{ _mv_mod sysvsem; }
 sysvshm()	{ _mv_mod sysvshm; }
@@ -229,6 +229,6 @@ dev() {
 	mv "$pkgdir"/usr/bin/phpize "$subpkgdir"/usr/bin/
 }
 
-md5sums="846760cd655c98dfd86d6d97c3d964b0  php-5.3.0.tar.bz2
-62dc36545b86bf86e44ada1fccc17d0a  suhosin-patch-5.3.0-0.9.8-BETA-1.patch.gz
-1c1a50aae7207b12d27bdecd8967e7ce  gd-info-segfault.patch"
+md5sums="15c7b5a87f57332d6fc683528e28247b  php-5.2.10.tar.bz2
+41b475a469eef0eb0e7aa10a820f12b2  suhosin-patch-5.2.10-0.9.7.patch.gz
+648c83c991a187cd0f2be435cb022947  curl-flush.patch"
diff --git a/main/php/curl-flush.patch b/main/php/curl-flush.patch
new file mode 100644
index 0000000000..14fc31a0bc
--- /dev/null
+++ b/main/php/curl-flush.patch
@@ -0,0 +1,17 @@
+--- /repository/php-src/ext/curl/interface.c	2009/06/15 12:38:11	1.62.2.14.2.57
++++ /repository/php-src/ext/curl/interface.c	2009/06/28 10:00:28	1.62.2.14.2.58
+@@ -1827,6 +1827,14 @@
+ 	if (ch->handlers->write->method == PHP_CURL_RETURN && ch->handlers->write->buf.len > 0) {
+ 		smart_str_0(&ch->handlers->write->buf);
+ 		RETURN_STRINGL(ch->handlers->write->buf.c, ch->handlers->write->buf.len, 1);
++	}
++
++	/* flush the file handle, so any remaining data is synched to disk */
++	if (ch->handlers->write->method == PHP_CURL_FILE && ch->handlers->write->fp) {
++		fflush(ch->handlers->write->fp);
++	}
++	if (ch->handlers->write_header->method == PHP_CURL_FILE && ch->handlers->write_header->fp) {
++		fflush(ch->handlers->write_header->fp);
+ 	}
+ 
+ 	if (ch->handlers->write->method == PHP_CURL_RETURN) {