[arch-commits] Commit in php/repos (3 files)

Pierre Schmitz pierre at archlinux.org
Mon Nov 23 21:49:46 UTC 2009


    Date: Monday, November 23, 2009 @ 16:49:45
  Author: pierre
Revision: 59438

Merged revisions 59391,59430 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/php/trunk

........
  r59391 | pierre | 2009-11-23 12:22:57 +0100 (Mo, 23 Nov 2009) | 1 line
  
   
........
  r59430 | pierre | 2009-11-23 21:55:25 +0100 (Mo, 23 Nov 2009) | 1 line
  
   
........

Modified:
  php/repos/extra-x86_64/	(properties)
  php/repos/extra-x86_64/PKGBUILD
  php/repos/extra-x86_64/mysqlnd-socket.patch

----------------------+
 PKGBUILD             |    8 ++++++--
 mysqlnd-socket.patch |   11 +++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)


Property changes on: php/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /php/trunk:1-59056
   + /php/trunk:1-59437

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-11-23 21:44:46 UTC (rev 59437)
+++ extra-x86_64/PKGBUILD	2009-11-23 21:49:45 UTC (rev 59438)
@@ -21,7 +21,7 @@
          'php-tidy'
          'php-xsl')
 pkgver=5.3.1
-pkgrel=2
+pkgrel=3
 _suhosinver=${pkgver}RC1-0.9.8
 arch=('i686' 'x86_64')
 license=('PHP')
@@ -39,9 +39,12 @@
          'd6f94150f47047882c6716575e12e99b'
          '96ca078be6729b665be8a865535a97bf'
          'cd3d068931c3715e35634e9885e35374'
-         'e3dcd1ea071d0d71bdc1cbb52e9f926e')
+         '65aaf083ff570fa19ffb4679bdda1ada')
 
 build() {
+	# ldap-sasl does not compile with --as-needed
+	export LDFLAGS="-Wl,--hash-style=gnu"
+
 	phpconfig="--prefix=/usr \
 		--sysconfdir=/etc/php \
 		--with-layout=GNU \
@@ -94,6 +97,7 @@
 		--with-imap=shared \
 		--with-jpeg-dir=shared,/usr \
 		--with-ldap=shared \
+		--with-ldap-sasl \
 		--with-mcrypt=shared \
 		--with-mysql-sock=/var/run/mysqld/mysqld.sock \
 		--with-mysql=shared,mysqlnd \

Modified: extra-x86_64/mysqlnd-socket.patch
===================================================================
--- extra-x86_64/mysqlnd-socket.patch	2009-11-23 21:44:46 UTC (rev 59437)
+++ extra-x86_64/mysqlnd-socket.patch	2009-11-23 21:49:45 UTC (rev 59438)
@@ -20,3 +20,14 @@
  # 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)




More information about the arch-commits mailing list