Date: Thursday, November 19, 2009 @ 18:17:23 Author: pierre Revision: 59057
Merged revisions 59053,59055 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/php/trunk ........ r59053 | pierre | 2009-11-19 23:00:42 +0100 (Do, 19 Nov 2009) | 1 line hardcode mysql socket for pdo as well ........ r59055 | pierre | 2009-11-19 23:29:02 +0100 (Do, 19 Nov 2009) | 1 line bump pkgrel ........ Modified: php/repos/extra-x86_64/ (properties) php/repos/extra-x86_64/PKGBUILD php/repos/extra-x86_64/mysqlnd-socket.patch ----------------------+ PKGBUILD | 4 ++-- mysqlnd-socket.patch | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) Property changes on: php/repos/extra-x86_64 ___________________________________________________________________ Modified: svnmerge-integrated - /php/trunk:1-59046 + /php/trunk:1-59056 Modified: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2009-11-19 23:12:52 UTC (rev 59056) +++ extra-x86_64/PKGBUILD 2009-11-19 23:17:23 UTC (rev 59057) @@ -21,7 +21,7 @@ 'php-tidy' 'php-xsl') pkgver=5.3.1 -pkgrel=1 +pkgrel=2 _suhosinver=${pkgver}RC1-0.9.8 arch=('i686' 'x86_64') license=('PHP') @@ -39,7 +39,7 @@ 'd6f94150f47047882c6716575e12e99b' '96ca078be6729b665be8a865535a97bf' 'cd3d068931c3715e35634e9885e35374' - '993223e03e6c0cc2d89581550ebbbe67') + 'e3dcd1ea071d0d71bdc1cbb52e9f926e') build() { phpconfig="--prefix=/usr \ Modified: extra-x86_64/mysqlnd-socket.patch =================================================================== --- extra-x86_64/mysqlnd-socket.patch 2009-11-19 23:12:52 UTC (rev 59056) +++ extra-x86_64/mysqlnd-socket.patch 2009-11-19 23:17:23 UTC (rev 59057) @@ -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.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 +