[arch-commits] Commit in php/trunk (PKGBUILD mysqlnd-socket.patch)
Date: Wednesday, February 3, 2010 @ 17:25:59
Author: pierre
Revision: 67127
revert upstream patch; see FS#17930
Modified:
php/trunk/PKGBUILD
php/trunk/mysqlnd-socket.patch
--+
PKGBUILD |8 +-
mysqlnd-socket.patch | 175 ++---
2 files changed, 27 insertions(+), 156 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-02-03 20:44:14 UTC (rev 67126)
+++ PKGBUILD2010-02-03 22:25:59 UTC (rev 67127)
@@ -21,7 +21,7 @@
'php-tidy'
'php-xsl')
pkgver=5.3.1
-pkgrel=4
+pkgrel=5
_suhosinver=${pkgver}-0.9.8
arch=('i686' 'x86_64')
license=('PHP')
@@ -39,7 +39,7 @@
'd6f94150f47047882c6716575e12e99b'
'96ca078be6729b665be8a865535a97bf'
'cd3d068931c3715e35634e9885e35374'
- '247b79def0a407f5886ae06247a18881')
+ '65aaf083ff570fa19ffb4679bdda1ada')
build() {
# ldap-sasl does not compile with --as-needed
@@ -135,8 +135,8 @@
# avoid linking against old db version
patch -p0 -i ${srcdir}/db-configure.patch || return 1
- # Fixed bug #50231 (Socket path passed using
- # --with-mysql-sock is ignored when mysqlnd is enabled)
+ # 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
Modified: mysqlnd-socket.patch
===
--- mysqlnd-socket.patch2010-02-03 20:44:14 UTC (rev 67126)
+++ mysqlnd-socket.patch2010-02-03 22:25:59 UTC (rev 67127)
@@ -1,157 +1,28 @@
ext/mysql/config.m42009/11/30 15:07:41 291500
-+++ ext/mysql/config.m42009/11/30 15:11:29 291501
-@@ -58,18 +58,6 @@
- PHP_MYSQLND_ENABLED=yes
+--- 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.0 +0200
ext/pdo_mysql/pdo_mysql.c 2009-11-19 22:52:13.460628605 +0100
+@@ -40,7 +40,7 @@
- elif test $PHP_MYSQL != no; then
--
-- AC_MSG_CHECKING([for MySQL UNIX socket location])
-- if test $PHP_MYSQL_SOCK != no test $PHP_MYSQL_SOCK != yes; then
--MYSQL_SOCK=$PHP_MYSQL_SOCK
--AC_DEFINE_UNQUOTED(PHP_MYSQL_UNIX_SOCK_ADDR, $MYSQL_SOCK, [ ])
--AC_MSG_RESULT([$MYSQL_SOCK])
-- elif test $PHP_MYSQL = yes || test $PHP_MYSQL_SOCK = yes; then
--PHP_MYSQL_SOCKET_SEARCH
-- else
--AC_MSG_RESULT([no])
-- fi
--
- MYSQL_DIR=
- MYSQL_INC_DIR=
+ #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
-@@ -152,6 +140,17 @@
-
- dnl Enable extension
- if test $PHP_MYSQL != no; then
-+ AC_MSG_CHECKING([for MySQL UNIX socket location])
-+ if test $PHP_MYSQL_SOCK != no test $PHP_MYSQL_SOCK != yes; then
-+MYSQL_SOCK=$PHP_MYSQL_SOCK
-+AC_DEFINE_UNQUOTED(PHP_MYSQL_UNIX_SOCK_ADDR, $MYSQL_SOCK, [ ])
-+AC_MSG_RESULT([$MYSQL_SOCK])
-+ elif test $PHP_MYSQL = yes || test $PHP_MYSQL_SOCK = yes; then
-+PHP_MYSQL_SOCKET_SEARCH
-+ else
-+AC_MSG_RESULT([no])
-+ fi
-+
- AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL])
- PHP_NEW_EXTENSION(mysql, php_mysql.c, $ext_shared)
- PHP_SUBST(MYSQL_SHARED_LIBADD)
ext/pdo_mysql/config.m42009/11/30 15:07:41 291500
-+++ ext/pdo_mysql/config.m42009/11/30 15:11:29 291501
-@@ -28,46 +28,42 @@
- done
- ])
-
-+ if test -f $PHP_PDO_MYSQL test -x $PHP_PDO_MYSQL ; then
-+PDO_MYSQL_CONFIG=$PHP_PDO_MYSQL
-+ elif test $PHP_PDO_MYSQL != yes; then
-+if test -d $PHP_PDO_MYSQL ; then
-+ if test -x $PHP_PDO_MYSQL/bin/mysql_config ; then
-+PDO_MYSQL_CONFIG=$PHP_PDO_MYSQL/bin/mysql_config
-+ else
-+PDO_MYSQL_DIR=$PHP_PDO_MYSQL
-+ fi
-+fi
-+ else
-+for i in /usr/local /usr ; do
-+ if test -x $i/bin/mysql_config ; then
-+PDO_MYSQL_CONFIG=$i/bin/mysql_config
-+break;
-+ fi
-+ if test -r $i/include/mysql/mysql.h || test -r $i/include/mysql.h ; then
-+PDO_MYSQL_DIR=$i
-+break;
-+ fi
-+done
-+ fi
-+
- if test $PHP_PDO_MYSQL = mysqlnd; then
- dnl enables build of mysqnd library
- PHP_MYSQLND_ENABLED=yes
- AC_DEFINE([PDO_USE_MYSQLND], 1, [Whether pdo_mysql uses mysqlnd])
- else
-
[arch-commits] Commit in php/trunk (PKGBUILD mysqlnd-socket.patch)
Date: Monday, November 30, 2009 @ 11:42:35
Author: pierre
Revision: 60021
use upstream patch
Modified:
php/trunk/PKGBUILD
php/trunk/mysqlnd-socket.patch
--+
PKGBUILD |5 -
mysqlnd-socket.patch | 175 ++---
2 files changed, 155 insertions(+), 25 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2009-11-30 16:03:48 UTC (rev 60020)
+++ PKGBUILD2009-11-30 16:42:35 UTC (rev 60021)
@@ -39,7 +39,7 @@
'd6f94150f47047882c6716575e12e99b'
'96ca078be6729b665be8a865535a97bf'
'cd3d068931c3715e35634e9885e35374'
- '65aaf083ff570fa19ffb4679bdda1ada')
+ '247b79def0a407f5886ae06247a18881')
build() {
# ldap-sasl does not compile with --as-needed
@@ -135,7 +135,8 @@
# 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
+ # Fixed bug #50231 (Socket path passed using
+ # --with-mysql-sock is ignored when mysqlnd is enabled)
patch -p0 -i ${srcdir}/mysqlnd-socket.patch || return 1
# apply suhosin patch
Modified: mysqlnd-socket.patch
===
--- mysqlnd-socket.patch2009-11-30 16:03:48 UTC (rev 60020)
+++ mysqlnd-socket.patch2009-11-30 16:42:35 UTC (rev 60021)
@@ -1,28 +1,157 @@
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.0 +0200
-+++ ext/pdo_mysql/pdo_mysql.c 2009-11-19 22:52:13.460628605 +0100
-@@ -40,7 +40,7 @@
+--- ext/mysql/config.m42009/11/30 15:07:41 291500
ext/mysql/config.m42009/11/30 15:11:29 291501
+@@ -58,18 +58,6 @@
+ PHP_MYSQLND_ENABLED=yes
- #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
+ elif test $PHP_MYSQL != no; then
+-
+- AC_MSG_CHECKING([for MySQL UNIX socket location])
+- if test $PHP_MYSQL_SOCK != no test $PHP_MYSQL_SOCK != yes; then
+-MYSQL_SOCK=$PHP_MYSQL_SOCK
+-AC_DEFINE_UNQUOTED(PHP_MYSQL_UNIX_SOCK_ADDR, $MYSQL_SOCK, [ ])
+-AC_MSG_RESULT([$MYSQL_SOCK])
+- elif test $PHP_MYSQL = yes || test $PHP_MYSQL_SOCK = yes; then
+-PHP_MYSQL_SOCKET_SEARCH
+- else
+-AC_MSG_RESULT([no])
+- fi
+-
+ MYSQL_DIR=
+ MYSQL_INC_DIR=
ext/pdo_mysql/pdo_mysql.c 2009-10-14 16:51:25.0 +0300
-+++ ext/pdo_mysql/pdo_mysql.c 2009-11-20 14:08:04.0 +0200
-@@ -49,7 +49,7 @@ ZEND_DECLARE_MODULE_GLOBALS(pdo_mysql);
+@@ -152,6 +140,17 @@
+
+ dnl Enable extension
+ if test $PHP_MYSQL != no; then
++ AC_MSG_CHECKING([for MySQL UNIX socket location])
++ if test $PHP_MYSQL_SOCK != no test $PHP_MYSQL_SOCK != yes; then
++MYSQL_SOCK=$PHP_MYSQL_SOCK
++AC_DEFINE_UNQUOTED(PHP_MYSQL_UNIX_SOCK_ADDR, $MYSQL_SOCK, [ ])
++AC_MSG_RESULT([$MYSQL_SOCK])
++ elif test $PHP_MYSQL = yes || test $PHP_MYSQL_SOCK = yes; then
++PHP_MYSQL_SOCKET_SEARCH
++ else
++AC_MSG_RESULT([no])
++ fi
++
+ AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL])
+ PHP_NEW_EXTENSION(mysql, php_mysql.c, $ext_shared)
+ PHP_SUBST(MYSQL_SHARED_LIBADD)
+--- ext/pdo_mysql/config.m42009/11/30 15:07:41 291500
ext/pdo_mysql/config.m42009/11/30 15:11:29 291501
+@@ -28,46 +28,42 @@
+ done
+ ])
+
++ if test -f $PHP_PDO_MYSQL test -x $PHP_PDO_MYSQL ; then
++PDO_MYSQL_CONFIG=$PHP_PDO_MYSQL
++ elif test $PHP_PDO_MYSQL != yes; then
++if test -d $PHP_PDO_MYSQL ; then
++ if test -x $PHP_PDO_MYSQL/bin/mysql_config ; then
++PDO_MYSQL_CONFIG=$PHP_PDO_MYSQL/bin/mysql_config
++ else
++PDO_MYSQL_DIR=$PHP_PDO_MYSQL
++ fi
++fi
++ else
++for i in /usr/local /usr ; do
++ if test -x $i/bin/mysql_config ; then
++PDO_MYSQL_CONFIG=$i/bin/mysql_config
++break;
++ fi
++ if test -r $i/include/mysql/mysql.h || test -r $i/include/mysql.h ; then
++PDO_MYSQL_DIR=$i
++break;
++ fi
++done
++ fi
++
+ if test $PHP_PDO_MYSQL = mysqlnd; then
+ dnl enables build of mysqnd library
+ PHP_MYSQLND_ENABLED=yes
+ AC_DEFINE([PDO_USE_MYSQLND], 1, [Whether pdo_mysql uses mysqlnd])
+ else
+ AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL])
+-
[arch-commits] Commit in php/trunk (PKGBUILD mysqlnd-socket.patch)
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
===
--- PKGBUILD2009-11-23 11:09:53 UTC (rev 59390)
+++ PKGBUILD2009-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.patch2009-11-23 11:09:53 UTC (rev 59390)
+++ mysqlnd-socket.patch2009-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.0 +0300
ext/pdo_mysql/pdo_mysql.c 2009-11-20 14:08:04.0 +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)
[arch-commits] Commit in php/trunk (PKGBUILD mysqlnd-socket.patch)
Date: Thursday, November 19, 2009 @ 11:11:32
Author: pierre
Revision: 59035
Added:
php/trunk/mysqlnd-socket.patch
Modified:
php/trunk/PKGBUILD
--+
PKGBUILD |8 ++--
mysqlnd-socket.patch | 11 +++
2 files changed, 17 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2009-11-19 16:09:54 UTC (rev 59034)
+++ PKGBUILD2009-11-19 16:11:32 UTC (rev 59035)
@@ -33,12 +33,13 @@
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')
+'php.ini.patch' 'apache.conf' 'db-configure.patch'
'mysqlnd-socket.patch')
md5sums=('63e97ad450f0f7259e785100b634c797'
'c3ff0cb5fa728420d56f8ed139446647'
'd6f94150f47047882c6716575e12e99b'
'96ca078be6729b665be8a865535a97bf'
- 'cd3d068931c3715e35634e9885e35374')
+ 'cd3d068931c3715e35634e9885e35374'
+ '993223e03e6c0cc2d89581550ebbbe67')
build() {
phpconfig=--prefix=/usr \
@@ -129,6 +130,9 @@
# 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
+ patch -p0 -i ${srcdir}/mysqlnd-socket.patch || return 1
+
# apply suhosin patch
patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch || return 1
Added: mysqlnd-socket.patch
===
--- mysqlnd-socket.patch(rev 0)
+++ mysqlnd-socket.patch2009-11-19 16:11:32 UTC (rev 59035)
@@ -0,0 +1,11 @@
+--- 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;
[arch-commits] Commit in php/trunk (PKGBUILD mysqlnd-socket.patch)
Date: Thursday, November 19, 2009 @ 17:00:42
Author: pierre
Revision: 59053
hardcode mysql socket for pdo as well
Modified:
php/trunk/PKGBUILD
php/trunk/mysqlnd-socket.patch
--+
PKGBUILD |2 +-
mysqlnd-socket.patch | 11 +++
2 files changed, 12 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2009-11-19 19:05:07 UTC (rev 59052)
+++ PKGBUILD2009-11-19 22:00:42 UTC (rev 59053)
@@ -39,7 +39,7 @@
'd6f94150f47047882c6716575e12e99b'
'96ca078be6729b665be8a865535a97bf'
'cd3d068931c3715e35634e9885e35374'
- '993223e03e6c0cc2d89581550ebbbe67')
+ 'e3dcd1ea071d0d71bdc1cbb52e9f926e')
build() {
phpconfig=--prefix=/usr \
Modified: mysqlnd-socket.patch
===
--- mysqlnd-socket.patch2009-11-19 19:05:07 UTC (rev 59052)
+++ mysqlnd-socket.patch2009-11-19 22:00:42 UTC (rev 59053)
@@ -9,3 +9,14 @@
}
transport_len = spprintf(transport, 0, unix://%s, socket);
unix_socket = TRUE;
+--- ext/pdo_mysql/pdo_mysql.c 2009-10-14 15:51:25.0 +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
+
