Date: Thursday, March 4, 2010 @ 10:07:40
Author: pierre
Revision: 71135
update to PHP 5.3.2
Modified:
php/trunk/PKGBUILD
php/trunk/db-configure.patch
Deleted:
php/trunk/mysqlnd-socket.patch
----------------------+
PKGBUILD | 19 +++++++------------
db-configure.patch | 6 +++---
mysqlnd-socket.patch | 33 ---------------------------------
3 files changed, 10 insertions(+), 48 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-03-04 14:35:31 UTC (rev 71134)
+++ PKGBUILD 2010-03-04 15:07:40 UTC (rev 71135)
@@ -21,9 +21,9 @@
'php-sqlite'
'php-tidy'
'php-xsl')
-pkgver=5.3.1
-pkgrel=7
-_suhosinver=${pkgver}-0.9.8
+pkgver=5.3.2
+pkgrel=1
+_suhosinver=${pkgver}-0.9.9
arch=('i686' 'x86_64')
license=('PHP')
url='http://www.php.net'
@@ -34,13 +34,12 @@
options=('!makeflags')
source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
"http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz"
- 'php.ini.patch' 'apache.conf' 'db-configure.patch' 'mysqlnd-socket.patch')
-md5sums=('63e97ad450f0f7259e785100b634c797'
- 'bf75fe3a9bda8c7a041d86197d6da09a'
+ 'php.ini.patch' 'apache.conf' 'db-configure.patch')
+md5sums=('46f500816125202c48a458d0133254a4'
+ 'dec154e470dc22f4a88a39d591e11f2c'
'd6f94150f47047882c6716575e12e99b'
'96ca078be6729b665be8a865535a97bf'
- 'cd3d068931c3715e35634e9885e35374'
- '65aaf083ff570fa19ffb4679bdda1ada')
+ 'e04e6a3abf327dd40ddb2b7dc21677c4')
build() {
# ldap-sasl does not compile with --as-needed
@@ -136,10 +135,6 @@
# avoid linking against old db version
patch -p0 -i ${srcdir}/db-configure.patch || return 1
- # use /var/run/mysqld/mysqld.sock as default socket for mysql
- # Review if this is still needed in 5.3.2
- patch -p0 -i ${srcdir}/mysqlnd-socket.patch || return 1
-
# apply suhosin patch
patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch || return 1
Modified: db-configure.patch
===================================================================
--- db-configure.patch 2010-03-04 14:35:31 UTC (rev 71134)
+++ db-configure.patch 2010-03-04 15:07:40 UTC (rev 71135)
@@ -1,6 +1,6 @@
---- configure 2009-11-18 21:11:57.000000000 +0100
-+++ configure 2009-11-19 12:42:50.881918639 +0100
-@@ -29292,43 +29292,15 @@
+--- configure 2010-03-03 17:52:37.000000000 +0100
++++ configure 2010-03-04 15:30:05.254690404 +0100
+@@ -28907,43 +28907,15 @@
unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT
Deleted: mysqlnd-socket.patch
===================================================================
--- mysqlnd-socket.patch 2010-03-04 14:35:31 UTC (rev 71134)
+++ mysqlnd-socket.patch 2010-03-04 15:07:40 UTC (rev 71135)
@@ -1,33 +0,0 @@
---- ext/mysqlnd/mysqlnd.c 2009-11-19 14:02:01.934775092 +0100
-+++ ext/mysqlnd/mysqlnd.c 2009-11-19 14:08:04.598072581 +0100
-@@ -547,7 +547,7 @@
- #ifndef PHP_WIN32
- if (host_len == sizeof("localhost") - 1 && !strncasecmp(host, "localhost", host_len)) {
- if (!socket) {
-- socket = "/tmp/mysql.sock";
-+ socket = "/var/run/mysqld/mysqld.sock";
- }
- transport_len = spprintf(&transport, 0, "unix://%s", socket);
- unix_socket = TRUE;
---- ext/pdo_mysql/pdo_mysql.c 2009-10-14 15:51:25.000000000 +0200
-+++ ext/pdo_mysql/pdo_mysql.c 2009-11-19 22:52:13.460628605 +0100
-@@ -40,7 +40,7 @@
-
- #ifndef PHP_WIN32
- # ifndef PDO_MYSQL_UNIX_ADDR
--# define PDO_MYSQL_UNIX_ADDR "/tmp/mysql.sock"
-+# define PDO_MYSQL_UNIX_ADDR "/var/run/mysqld/mysqld.sock"
- # endif
- #endif
-
---- ext/pdo_mysql/pdo_mysql.c 2009-10-14 16:51:25.000000000 +0300
-+++ ext/pdo_mysql/pdo_mysql.c 2009-11-20 14:08:04.000000000 +0200
-@@ -49,7 +49,7 @@ ZEND_DECLARE_MODULE_GLOBALS(pdo_mysql);
- */
- PHP_INI_BEGIN()
- #ifndef PHP_WIN32
-- STD_PHP_INI_ENTRY("pdo_mysql.default_socket", PDO_MYSQL_UNIX_ADDR, PHP_INI_SYSTEM, OnUpdateString, default_socket, zend_pdo_mysql_globals, pdo_mysql_globals)
-+ STD_PHP_INI_ENTRY("pdo_mysql.default_socket", PDO_MYSQL_UNIX_ADDR, PHP_INI_SYSTEM, OnUpdateStringUnempty, default_socket, zend_pdo_mysql_globals, pdo_mysql_globals)
- #endif
- #if PDO_DBG_ENABLED
- STD_PHP_INI_ENTRY("pdo_mysql.debug", NULL, PHP_INI_SYSTEM, OnUpdateString, debug, zend_pdo_mysql_globals, pdo_mysql_globals)