[arch-commits] Commit in php/trunk (PKGBUILD mysqlnd-socket.patch)

Pierre Schmitz pierre at archlinux.org
Mon Nov 23 06:22:57 EST 2009


    Date: Monday, November 23, 2009 @ 06:22:57
  Author: pierre
Revision: 59391

Modified:
  php/trunk/PKGBUILD
  php/trunk/mysqlnd-socket.patch

----------------------+
 PKGBUILD             |    9 +++++----
 mysqlnd-socket.patch |   11 +++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-11-23 11:09:53 UTC (rev 59390)
+++ PKGBUILD	2009-11-23 11:22:57 UTC (rev 59391)
@@ -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')
@@ -29,7 +29,7 @@
 makedepends=('apache' 'imap' 'postgresql-libs' 'mysql' 'libldap' 'postfix'
              'sqlite3' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file'
              'libmcrypt' 'tidyhtml' 'aspell' 'libtool' 'gd'  'icu'
-             'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp')
+             'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'libsasl')
 options=('!makeflags')
 source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
         "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz"
@@ -39,7 +39,7 @@
          'd6f94150f47047882c6716575e12e99b'
          '96ca078be6729b665be8a865535a97bf'
          'cd3d068931c3715e35634e9885e35374'
-         'e3dcd1ea071d0d71bdc1cbb52e9f926e')
+         '65aaf083ff570fa19ffb4679bdda1ada')
 
 build() {
 	phpconfig="--prefix=/usr \
@@ -94,6 +94,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 \
@@ -267,7 +268,7 @@
 }
 
 package_php-ldap() {
-	depends=('php' 'libldap')
+	depends=('php' 'libldap' 'libsasl')
 	pkgdesc="ldap module for PHP"
 	install -D -m755 ${srcdir}/build-php/modules/ldap.so ${pkgdir}/usr/lib/php/modules/ldap.so
 }

Modified: mysqlnd-socket.patch
===================================================================
--- mysqlnd-socket.patch	2009-11-23 11:09:53 UTC (rev 59390)
+++ mysqlnd-socket.patch	2009-11-23 11:22:57 UTC (rev 59391)
@@ -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