From 247630432b48747da1cc2b71524fab57e2263139 Mon Sep 17 00:00:00 2001 From: Luca Longinotti Date: Sun, 4 Mar 2007 21:19:28 +0000 Subject: [PATCH] Fix charset settings. Package-Manager: portage-2.1.2-r13 --- dev-php5/pecl-pdo-mysql/ChangeLog | 11 ++- dev-php5/pecl-pdo-mysql/Manifest | 40 +++----- .../pecl-pdo-mysql/files/config-sed.patch | 12 --- .../files/digest-pecl-pdo-mysql-1.0.1 | 3 - .../pecl-pdo-mysql-1.0.2-charsetphpini.patch | 98 +++++++++++++++++++ .../pecl-pdo-mysql-1.0.2-ztsclientlib.patch | 67 +++++++++++++ .../files/pecl-pdo_mysql-readmycnf.patch | 33 ------- .../pecl-pdo-mysql-1.0.1.ebuild | 51 ---------- .../pecl-pdo-mysql-1.0.2.ebuild | 17 ++-- 9 files changed, 199 insertions(+), 133 deletions(-) delete mode 100644 dev-php5/pecl-pdo-mysql/files/config-sed.patch delete mode 100644 dev-php5/pecl-pdo-mysql/files/digest-pecl-pdo-mysql-1.0.1 create mode 100644 dev-php5/pecl-pdo-mysql/files/pecl-pdo-mysql-1.0.2-charsetphpini.patch create mode 100644 dev-php5/pecl-pdo-mysql/files/pecl-pdo-mysql-1.0.2-ztsclientlib.patch delete mode 100644 dev-php5/pecl-pdo-mysql/files/pecl-pdo_mysql-readmycnf.patch delete mode 100644 dev-php5/pecl-pdo-mysql/pecl-pdo-mysql-1.0.1.ebuild diff --git a/dev-php5/pecl-pdo-mysql/ChangeLog b/dev-php5/pecl-pdo-mysql/ChangeLog index c68e7a6215d0..035448d73ad0 100644 --- a/dev-php5/pecl-pdo-mysql/ChangeLog +++ b/dev-php5/pecl-pdo-mysql/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-php5/pecl-pdo-mysql -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-mysql/ChangeLog,v 1.18 2006/11/23 20:18:03 vivo Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-mysql/ChangeLog,v 1.19 2007/03/04 21:19:28 chtekk Exp $ + + 04 Mar 2007; Luca Longinotti + +files/pecl-pdo-mysql-1.0.2-charsetphpini.patch, + +files/pecl-pdo-mysql-1.0.2-ztsclientlib.patch, -files/config-sed.patch, + -files/pecl-pdo_mysql-readmycnf.patch, -pecl-pdo-mysql-1.0.1.ebuild, + pecl-pdo-mysql-1.0.2.ebuild: + Fix charset settings, be in sync with dev-lang/php. 23 Nov 2006; Francesco Riosa pecl-pdo-mysql-1.0.1.ebuild, pecl-pdo-mysql-1.0.2.ebuild: diff --git a/dev-php5/pecl-pdo-mysql/Manifest b/dev-php5/pecl-pdo-mysql/Manifest index d2d0b302fab8..315016654ad1 100644 --- a/dev-php5/pecl-pdo-mysql/Manifest +++ b/dev-php5/pecl-pdo-mysql/Manifest @@ -1,32 +1,24 @@ -AUX config-sed.patch 490 RMD160 6672ed8210d1b19301cb1bf7b653dbfbcfc6c17b SHA1 f6df68846dc0931ffcfa40857595c8cc229371fd SHA256 796f61b3156a17269f3dc3ec3044a8b547c57b8bfc1c470171764c0bcfc40200 -MD5 3056c682a94fb76a1c8adeb30bf69c6b files/config-sed.patch 490 -RMD160 6672ed8210d1b19301cb1bf7b653dbfbcfc6c17b files/config-sed.patch 490 -SHA256 796f61b3156a17269f3dc3ec3044a8b547c57b8bfc1c470171764c0bcfc40200 files/config-sed.patch 490 -AUX pecl-pdo_mysql-readmycnf.patch 949 RMD160 052232e62b3c51ff62a8875c7d0901c115264ea2 SHA1 aebacc2ae1d95861d6a40b81d04a5d028d51a74f SHA256 0357637b43cf4096039a77c6018928e7cc308333cbe825cad07257fe87176831 -MD5 782fcb1dbe361a624309096cad87cc83 files/pecl-pdo_mysql-readmycnf.patch 949 -RMD160 052232e62b3c51ff62a8875c7d0901c115264ea2 files/pecl-pdo_mysql-readmycnf.patch 949 -SHA256 0357637b43cf4096039a77c6018928e7cc308333cbe825cad07257fe87176831 files/pecl-pdo_mysql-readmycnf.patch 949 -DIST PDO_MYSQL-1.0.1.tgz 13002 RMD160 b7f09c74696cf293c971186fd1dcc5ab0de5681e SHA1 3c60399aa71b4d065b9f0c597667f16d522eeff1 SHA256 20fe26e0f3761902fbecf95992a27a886c847b4528cc7fe4b681e6c8ad12a991 +AUX pecl-pdo-mysql-1.0.2-charsetphpini.patch 2901 RMD160 0fc78537f4f3cf60067e4f87ada1cdb9f6db3570 SHA1 f2d2a70f2fad975192504cf2a392ba498aef9bf3 SHA256 e750ece9573228770e7d1cf08c48c6afbf354a18c3b801a08e3672b668b41235 +MD5 ee088d08d2c608850abf0d596e34901e files/pecl-pdo-mysql-1.0.2-charsetphpini.patch 2901 +RMD160 0fc78537f4f3cf60067e4f87ada1cdb9f6db3570 files/pecl-pdo-mysql-1.0.2-charsetphpini.patch 2901 +SHA256 e750ece9573228770e7d1cf08c48c6afbf354a18c3b801a08e3672b668b41235 files/pecl-pdo-mysql-1.0.2-charsetphpini.patch 2901 +AUX pecl-pdo-mysql-1.0.2-ztsclientlib.patch 2111 RMD160 490f7d2a10a3befbc2b552ad6a55166ec36d669a SHA1 b3bdb5e3aaee72a17d2af4804707006196f21dc7 SHA256 ee3b91f0c274a2d3df4394f7908e2654f17b99ddc591b4f7ed5738ab6081c80f +MD5 a2c58d40a0f18b024d0bef8377f2ba16 files/pecl-pdo-mysql-1.0.2-ztsclientlib.patch 2111 +RMD160 490f7d2a10a3befbc2b552ad6a55166ec36d669a files/pecl-pdo-mysql-1.0.2-ztsclientlib.patch 2111 +SHA256 ee3b91f0c274a2d3df4394f7908e2654f17b99ddc591b4f7ed5738ab6081c80f files/pecl-pdo-mysql-1.0.2-ztsclientlib.patch 2111 DIST PDO_MYSQL-1.0.2.tgz 14778 RMD160 b630a67bd8d50f84ff6590d3817b43800c5a1ec4 SHA1 0106536a60c3e5789f58aee0aa45d5b6b07f3973 SHA256 233bdef458b223e1894b3c261f9d99b4feb4fd9df44ae0191d4d5b49c64dc202 -EBUILD pecl-pdo-mysql-1.0.1.ebuild 1186 RMD160 c6d5c9c849d3c39c72d34c182ee01b0959a7491c SHA1 53802e43af263e85ec35ac634910ea862f676d59 SHA256 073aaad9b6dd89911cc6e1cf90fc74eab2b785e753a4eea4b0d2405b9467d126 -MD5 b4e40dcee8ffab138e640711973048a5 pecl-pdo-mysql-1.0.1.ebuild 1186 -RMD160 c6d5c9c849d3c39c72d34c182ee01b0959a7491c pecl-pdo-mysql-1.0.1.ebuild 1186 -SHA256 073aaad9b6dd89911cc6e1cf90fc74eab2b785e753a4eea4b0d2405b9467d126 pecl-pdo-mysql-1.0.1.ebuild 1186 -EBUILD pecl-pdo-mysql-1.0.2.ebuild 1210 RMD160 feee07acae3f89803a5aea86762ee0e2a49e51a8 SHA1 357025108ce00612462e953131628fa026046fdb SHA256 37c3b523b019163d018138e66097727c6eb6cc4d3e718499620ec0f56d47d476 -MD5 d14d39f12d3658c5a3006ddbdce83c0c pecl-pdo-mysql-1.0.2.ebuild 1210 -RMD160 feee07acae3f89803a5aea86762ee0e2a49e51a8 pecl-pdo-mysql-1.0.2.ebuild 1210 -SHA256 37c3b523b019163d018138e66097727c6eb6cc4d3e718499620ec0f56d47d476 pecl-pdo-mysql-1.0.2.ebuild 1210 -MISC ChangeLog 2475 RMD160 0dd8321fdf8e29a3d5f4039867f66d1311d93379 SHA1 362d99336a0e3cb401d647664f0bc7bc8b6aafc3 SHA256 cef1c5948ec4c9585f999213703b22a3c37c1d2de305f6f6ff0705c3042b8555 -MD5 227a5664ba198dd0fe49419a2791e325 ChangeLog 2475 -RMD160 0dd8321fdf8e29a3d5f4039867f66d1311d93379 ChangeLog 2475 -SHA256 cef1c5948ec4c9585f999213703b22a3c37c1d2de305f6f6ff0705c3042b8555 ChangeLog 2475 +EBUILD pecl-pdo-mysql-1.0.2.ebuild 1267 RMD160 b978b60dc1c1ba7848370567ad29ef08a48af045 SHA1 08bc95c26e484156df831d9d6732b2b0ac883520 SHA256 4d51f39003270910f049646e63647162f7b4c8260ad0b0f197444fe8a2f293d5 +MD5 3dab181ee1ab415530211b95207742fa pecl-pdo-mysql-1.0.2.ebuild 1267 +RMD160 b978b60dc1c1ba7848370567ad29ef08a48af045 pecl-pdo-mysql-1.0.2.ebuild 1267 +SHA256 4d51f39003270910f049646e63647162f7b4c8260ad0b0f197444fe8a2f293d5 pecl-pdo-mysql-1.0.2.ebuild 1267 +MISC ChangeLog 2811 RMD160 c3b95af2bbcc33f0c4b55f9a394e5d4b49323d29 SHA1 766310607f807254023e38d12614333b5f073cff SHA256 f28bb229246bdd86d4d4cbb387db86cc0fe53898e44377a78b693fe25adecff0 +MD5 f2bc9ebe258f68b87fdd594c416fe6e6 ChangeLog 2811 +RMD160 c3b95af2bbcc33f0c4b55f9a394e5d4b49323d29 ChangeLog 2811 +SHA256 f28bb229246bdd86d4d4cbb387db86cc0fe53898e44377a78b693fe25adecff0 ChangeLog 2811 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 metadata.xml 157 -MD5 8615751b9b23de53fc7771daa992884d files/digest-pecl-pdo-mysql-1.0.1 235 -RMD160 c50f3a553d7511aaf8177946734eb057e190efa1 files/digest-pecl-pdo-mysql-1.0.1 235 -SHA256 8f6db9c1aadd2a8f4ef3768a95c5e8fa4a13ec440862c6706e5fcf9b3b54a975 files/digest-pecl-pdo-mysql-1.0.1 235 MD5 8984cf80222b7785c963368604cac717 files/digest-pecl-pdo-mysql-1.0.2 235 RMD160 ba0ff600656cdb7b776e687e08835c3c2fa78f9b files/digest-pecl-pdo-mysql-1.0.2 235 SHA256 c7cef941d344237fe10a4b495e5c3ac7ae4f858d7dc65677d12eac09d93ba8ba files/digest-pecl-pdo-mysql-1.0.2 235 diff --git a/dev-php5/pecl-pdo-mysql/files/config-sed.patch b/dev-php5/pecl-pdo-mysql/files/config-sed.patch deleted file mode 100644 index 2fdb7f731864..000000000000 --- a/dev-php5/pecl-pdo-mysql/files/config-sed.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- config.m4 2005-12-18 22:18:10.000000000 +0100 -+++ config.m4 2005-12-18 22:18:52.000000000 +0100 -@@ -50,6 +50,9 @@ - - if test -n "$PDO_MYSQL_CONFIG" && test -x "$PDO_MYSQL_CONFIG" ; then - AC_MSG_RESULT($PDO_MYSQL_CONFIG) -+ if test "x$SED" = "x"; then -+ AC_PATH_PROG(SED, sed) -+ fi - PDO_MYSQL_INCLUDE=`$PDO_MYSQL_CONFIG --cflags | $SED -e "s/'//g"` - PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs | $SED -e "s/'//g"` - PDO_MYSQL_SOCKET=`$PDO_MYSQL_CONFIG --socket` diff --git a/dev-php5/pecl-pdo-mysql/files/digest-pecl-pdo-mysql-1.0.1 b/dev-php5/pecl-pdo-mysql/files/digest-pecl-pdo-mysql-1.0.1 deleted file mode 100644 index 6dfcb1a90c73..000000000000 --- a/dev-php5/pecl-pdo-mysql/files/digest-pecl-pdo-mysql-1.0.1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 cfa8e0c6cfe8df78b31842d9757bd3d7 PDO_MYSQL-1.0.1.tgz 13002 -RMD160 b7f09c74696cf293c971186fd1dcc5ab0de5681e PDO_MYSQL-1.0.1.tgz 13002 -SHA256 20fe26e0f3761902fbecf95992a27a886c847b4528cc7fe4b681e6c8ad12a991 PDO_MYSQL-1.0.1.tgz 13002 diff --git a/dev-php5/pecl-pdo-mysql/files/pecl-pdo-mysql-1.0.2-charsetphpini.patch b/dev-php5/pecl-pdo-mysql/files/pecl-pdo-mysql-1.0.2-charsetphpini.patch new file mode 100644 index 000000000000..e85e43ca4a3d --- /dev/null +++ b/dev-php5/pecl-pdo-mysql/files/pecl-pdo-mysql-1.0.2-charsetphpini.patch @@ -0,0 +1,98 @@ +--- mysql_driver.c 2006-12-02 12:43:22.000000000 +0100 ++++ mysql_driver.c 2006-12-02 12:43:39.000000000 +0100 +@@ -408,6 +408,7 @@ + pdo_mysql_db_handle *H; + int i, ret = 0; + char *host = NULL, *unix_socket = NULL; ++ char *connect_charset = NULL; + unsigned int port = 3306; + char *dbname; + struct pdo_data_src_parser vars[] = { +@@ -528,6 +529,13 @@ + if (vars[2].optval && !strcmp("localhost", vars[2].optval)) { + unix_socket = vars[4].optval; + } ++ ++ connect_charset = PDOMYSQLG(connect_charset); ++ ++ if (connect_charset != NULL) { ++ mysql_options(H->server, MYSQL_SET_CHARSET_NAME, connect_charset); ++ } ++ + if (mysql_real_connect(H->server, host, dbh->username, dbh->password, dbname, port, unix_socket, connect_opts) == NULL) { + pdo_mysql_error(dbh); + goto cleanup; +--- pdo_mysql.c 2006-12-02 12:43:22.000000000 +0100 ++++ pdo_mysql.c 2006-12-02 12:43:39.000000000 +0100 +@@ -30,6 +30,8 @@ + #include "php_pdo_mysql.h" + #include "php_pdo_mysql_int.h" + ++ZEND_DECLARE_MODULE_GLOBALS(pdo_mysql) ++ + /* {{{ pdo_mysql_functions[] */ + zend_function_entry pdo_mysql_functions[] = { + {NULL, NULL, NULL} +@@ -69,12 +71,24 @@ + ZEND_GET_MODULE(pdo_mysql) + #endif + ++PHP_INI_BEGIN() ++ STD_PHP_INI_ENTRY("pdo_mysql.connect_charset", NULL, PHP_INI_ALL, OnUpdateString, connect_charset, zend_pdo_mysql_globals, pdo_mysql_globals) ++PHP_INI_END() ++ ++static void php_pdo_mysql_init_globals(zend_pdo_mysql_globals *pdo_mysql_globals) ++{ ++ pdo_mysql_globals->connect_charset = NULL; ++} ++ + /* true global environment */ + + /* {{{ PHP_MINIT_FUNCTION + */ + PHP_MINIT_FUNCTION(pdo_mysql) + { ++ ZEND_INIT_MODULE_GLOBALS(pdo_mysql, php_pdo_mysql_init_globals, NULL); ++ REGISTER_INI_ENTRIES(); ++ + REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_USE_BUFFERED_QUERY", (long)PDO_MYSQL_ATTR_USE_BUFFERED_QUERY); + REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_LOCAL_INFILE", (long)PDO_MYSQL_ATTR_LOCAL_INFILE); + REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_INIT_COMMAND", (long)PDO_MYSQL_ATTR_INIT_COMMAND); +@@ -91,6 +105,7 @@ + */ + PHP_MSHUTDOWN_FUNCTION(pdo_mysql) + { ++ UNREGISTER_INI_ENTRIES(); + php_pdo_unregister_driver(&pdo_mysql_driver); + return SUCCESS; + } +@@ -103,6 +118,8 @@ + php_info_print_table_start(); + php_info_print_table_header(2, "PDO Driver for MySQL, client library version", mysql_get_client_info()); + php_info_print_table_end(); ++ ++ DISPLAY_INI_ENTRIES(); + } + /* }}} */ + +--- php_pdo_mysql.h 2006-12-02 12:43:22.000000000 +0100 ++++ php_pdo_mysql.h 2006-12-02 13:04:41.000000000 +0100 +@@ -40,6 +40,18 @@ + PHP_RSHUTDOWN_FUNCTION(pdo_mysql); + PHP_MINFO_FUNCTION(pdo_mysql); + ++ZEND_BEGIN_MODULE_GLOBALS(pdo_mysql) ++ char *connect_charset; ++ZEND_END_MODULE_GLOBALS(pdo_mysql) ++ ++#ifdef ZTS ++# define PDOMYSQLG(v) TSRMG(pdo_mysql_globals_id, zend_pdo_mysql_globals *, v) ++#else ++# define PDOMYSQLG(v) (pdo_mysql_globals.v) ++#endif ++ ++ZEND_EXTERN_MODULE_GLOBALS(pdo_mysql) ++ + #endif /* PHP_PDO_MYSQL_H */ + + diff --git a/dev-php5/pecl-pdo-mysql/files/pecl-pdo-mysql-1.0.2-ztsclientlib.patch b/dev-php5/pecl-pdo-mysql/files/pecl-pdo-mysql-1.0.2-ztsclientlib.patch new file mode 100644 index 000000000000..1cb09f87957c --- /dev/null +++ b/dev-php5/pecl-pdo-mysql/files/pecl-pdo-mysql-1.0.2-ztsclientlib.patch @@ -0,0 +1,67 @@ +--- config.m4 2006/05/02 00:59:22 1.25.2.7 ++++ config.m4 2006/06/01 19:14:48 1.25.2.7.2.2 +@@ -5,7 +5,7 @@ + if test "$PHP_PDO" != "no"; then + + AC_DEFUN([PDO_MYSQL_LIB_CHK], [ +- str="$PDO_MYSQL_DIR/$1/libmysqlclient.*" ++ str="$PDO_MYSQL_DIR/$1/libmysqlclient*" + for j in `echo $str`; do + if test -r $j; then + PDO_MYSQL_LIB_DIR=$MYSQL_DIR/$1 +@@ -53,8 +53,14 @@ + if test "x$SED" = "x"; then + AC_PATH_PROG(SED, sed) + fi ++ if test "$enable_maintainer_zts" = "yes"; then ++ PDO_MYSQL_LIBNAME=mysqlclient_r ++ PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs_r | $SED -e "s/'//g"` ++ else ++ PDO_MYSQL_LIBNAME=mysqlclient ++ PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs | $SED -e "s/'//g"` ++ fi + PDO_MYSQL_INCLUDE=`$PDO_MYSQL_CONFIG --cflags | $SED -e "s/'//g"` +- PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs | $SED -e "s/'//g"` + PDO_MYSQL_SOCKET=`$PDO_MYSQL_CONFIG --socket` + elif test -z "$PDO_MYSQL_DIR"; then + AC_MSG_RESULT([not found]) +@@ -80,17 +86,15 @@ + AC_MSG_ERROR([Unable to find your mysql installation]) + fi + +- PHP_ADD_LIBRARY_WITH_PATH(mysqlclient, $PDO_MYSQL_LIB_DIR, PDO_MYSQL_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH($PDO_MYSQL_LIBNAME, $PDO_MYSQL_LIB_DIR, PDO_MYSQL_SHARED_LIBADD) + PHP_ADD_INCLUDE($PDO_MYSQL_INC_DIR) + PDO_MYSQL_INCLUDE=-I$PDO_MYSQL_INC_DIR + fi + + AC_DEFINE_UNQUOTED(PDO_MYSQL_UNIX_ADDR, "$PDO_MYSQL_SOCKET", [ ]) + +- +- _SAVE_LIBS=$LIBS +- LIBS="$LIBS $PDO_MYSQL_LIBS" +- PHP_CHECK_LIBRARY(mysqlclient, mysql_query, ++ ++ PHP_CHECK_LIBRARY($PDO_MYSQL_LIBNAME, mysql_query, + [ + PHP_EVAL_LIBLINE($PDO_MYSQL_LIBS, PDO_MYSQL_SHARED_LIBADD) + ],[ +@@ -98,6 +102,8 @@ + ],[ + $PDO_MYSQL_LIBS + ]) ++ _SAVE_LIBS=$LIBS ++ LIBS="$LIBS $PDO_MYSQL_LIBS" + AC_CHECK_FUNCS([mysql_commit mysql_stmt_prepare mysql_next_result mysql_sqlstate]) + LIBS=$_SAVE_LIBS + +@@ -124,8 +130,7 @@ + PHP_ADD_EXTENSION_DEP(pdo_mysql, pdo) + ]) + PDO_MYSQL_MODULE_TYPE=external +- +- PDO_MYSQL_SHARED_LIBADD=$PDO_MYSQL_LIBS ++ + PHP_SUBST(PDO_MYSQL_SHARED_LIBADD) + PHP_SUBST_OLD(PDO_MYSQL_MODULE_TYPE) + fi diff --git a/dev-php5/pecl-pdo-mysql/files/pecl-pdo_mysql-readmycnf.patch b/dev-php5/pecl-pdo-mysql/files/pecl-pdo_mysql-readmycnf.patch deleted file mode 100644 index fe3aef076593..000000000000 --- a/dev-php5/pecl-pdo-mysql/files/pecl-pdo_mysql-readmycnf.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- mysql_driver.c 2006-04-13 19:39:36.000000000 +0200 -+++ mysql_driver.c 2006-04-13 19:42:30.000000000 +0200 -@@ -32,7 +32,7 @@ - #include "php_pdo_mysql_int.h" - #include - #include "zend_exceptions.h" -- -+#include "SAPI.h" - - const char *pdo_mysql_get_sqlstate(unsigned int my_errno) { - switch (my_errno) { -@@ -390,7 +390,7 @@ - { - pdo_mysql_db_handle *H; - int i, ret = 0; -- char *host = NULL, *unix_socket = NULL; -+ char *host = NULL, *unix_socket = NULL, *option_section = NULL; - unsigned int port = 3306; - char *dbname; - struct pdo_data_src_parser vars[] = { -@@ -475,6 +475,12 @@ - } - } - -+ /* Read settings from my.cnf */ -+ option_section = emalloc(strlen("php-%s") + strlen(sapi_module.name)); -+ sprintf(option_section, "php-%s", sapi_module.name); -+ mysql_options(H->server, MYSQL_READ_DEFAULT_GROUP, option_section); -+ efree(option_section); -+ - dbname = vars[1].optval; - host = vars[2].optval; - if(vars[3].optval) { diff --git a/dev-php5/pecl-pdo-mysql/pecl-pdo-mysql-1.0.1.ebuild b/dev-php5/pecl-pdo-mysql/pecl-pdo-mysql-1.0.1.ebuild deleted file mode 100644 index ad6370cc7b51..000000000000 --- a/dev-php5/pecl-pdo-mysql/pecl-pdo-mysql-1.0.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-mysql/pecl-pdo-mysql-1.0.1.ebuild,v 1.12 2006/11/23 20:18:03 vivo Exp $ - -PHP_EXT_NAME="pdo_mysql" -PHP_EXT_PECL_PKG="PDO_MYSQL" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" - -inherit php-ext-pecl-r1 - -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86" -DESCRIPTION="PHP Data Objects (PDO) Driver For MySQL Server." -LICENSE="PHP" -SLOT="0" -IUSE="" - -DEPEND="${DEPEND} - dev-php5/pecl-pdo - virtual/mysql" - -need_php_by_category - -pkg_setup() { - has_php - - # if the user has compiled in PDO, he can't use this package - if built_with_use =${PHP_PKG} pdo ; then - eerror - eerror "You have built ${PHP_PKG} to use the bundled PDO support." - eerror "If you want to use the PECL PDO packages, you must rebuild" - eerror "your PHP with the 'pdo-external' USE flag instead." - eerror - die "PHP built to use bundled PDO support" - fi -} - -src_unpack() { - unpack ${A} - - cd "${S}" - - # Fix Gentoo bug #115921 - epatch "${FILESDIR}/config-sed.patch" -} - -src_compile() { - has_php - my_conf="--with-pdo-mysql=/usr" - php-ext-pecl-r1_src_compile -} diff --git a/dev-php5/pecl-pdo-mysql/pecl-pdo-mysql-1.0.2.ebuild b/dev-php5/pecl-pdo-mysql/pecl-pdo-mysql-1.0.2.ebuild index ba23b3d629b7..55fcf387460a 100644 --- a/dev-php5/pecl-pdo-mysql/pecl-pdo-mysql-1.0.2.ebuild +++ b/dev-php5/pecl-pdo-mysql/pecl-pdo-mysql-1.0.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-mysql/pecl-pdo-mysql-1.0.2.ebuild,v 1.2 2006/11/23 20:18:03 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-mysql/pecl-pdo-mysql-1.0.2.ebuild,v 1.3 2007/03/04 21:19:28 chtekk Exp $ PHP_EXT_NAME="pdo_mysql" PHP_EXT_PECL_PKG="PDO_MYSQL" @@ -9,15 +9,16 @@ PHP_EXT_ZENDEXT="no" inherit php-ext-pecl-r1 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86" + DESCRIPTION="PHP Data Objects (PDO) Driver For MySQL Server." LICENSE="PHP" SLOT="0" IUSE="" -DEPEND="${DEPEND} - dev-php5/pecl-pdo +DEPEND="dev-php5/pecl-pdo virtual/mysql" +RDEPEND="${DEPEND}" need_php_by_category @@ -37,11 +38,11 @@ pkg_setup() { src_unpack() { unpack ${A} - cd "${S}" - # Fix Gentoo bug #129761 - epatch "${FILESDIR}/pecl-pdo_mysql-readmycnf.patch" + # Fix charset settings and library linking + epatch "${FILESDIR}/${P}-charsetphpini.patch" + epatch "${FILESDIR}/${P}-ztsclientlib.patch" } src_compile() { -- 2.26.2