diff options
| author |   Francesco Riosa <vivo@gentoo.org> | 2006-06-25 14:08:10 +0000 |
|---|---|---|
| committer | Francesco Riosa <vivo@gentoo.org> | 2006-06-25 14:08:10 +0000 |
| commit | 5f9dcde9ed60ca754041e373370b9a28d5c827e3 (patch) | |
| tree | 6a9d32334b2fa16de89ca658beb7b6112606e347 /net-libs/libwww/files | |
| parent | Stable on hppa. (diff) | |
| download | gentoo-2-5f9dcde9ed60ca754041e373370b9a28d5c827e3.tar.gz gentoo-2-5f9dcde9ed60ca754041e373370b9a28d5c827e3.tar.bz2 gentoo-2-5f9dcde9ed60ca754041e373370b9a28d5c827e3.zip | |
change patches to cope with mysql-4.0
(Portage version: 2.1.1_pre1-r1)
Diffstat (limited to 'net-libs/libwww/files')
| -rw-r--r-- | net-libs/libwww/files/digest-libwww-5.4.0-r6 | 6 | ||||
| -rw-r--r-- | net-libs/libwww/files/libwww-5.4.0-mysql-4.0.patch | 51 |
2 files changed, 57 insertions, 0 deletions
diff --git a/net-libs/libwww/files/digest-libwww-5.4.0-r6 b/net-libs/libwww/files/digest-libwww-5.4.0-r6 new file mode 100644 index 000000000000..7a45b56e4053 --- /dev/null +++ b/net-libs/libwww/files/digest-libwww-5.4.0-r6 @@ -0,0 +1,6 @@ +MD5 dcaddf44692252045090584a7d63082c libwww-5.4.0-debian-autoconf-2.5.patch.bz2 8338 +RMD160 c15263ce045333f03a6f655ff3aaaf0dd14eac35 libwww-5.4.0-debian-autoconf-2.5.patch.bz2 8338 +SHA256 a2e64a286c691075df952763de38bb5f5ad3611d089d3b8b9c8d7c2d2b7d1bbb libwww-5.4.0-debian-autoconf-2.5.patch.bz2 8338 +MD5 c3734ca6caa405707e134cc8c6d7e422 w3c-libwww-5.4.0.tgz 1129121 +RMD160 12e55ecb2435f9048d627e56f8ae60d4c246648b w3c-libwww-5.4.0.tgz 1129121 +SHA256 64841cd99a41c84679cfbc777ebfbb78bdc2a499f7f6866ccf5cead391c867ef w3c-libwww-5.4.0.tgz 1129121 diff --git a/net-libs/libwww/files/libwww-5.4.0-mysql-4.0.patch b/net-libs/libwww/files/libwww-5.4.0-mysql-4.0.patch new file mode 100644 index 000000000000..ad7d91676bf6 --- /dev/null +++ b/net-libs/libwww/files/libwww-5.4.0-mysql-4.0.patch @@ -0,0 +1,51 @@ +--- old/Library/src/HTSQL.c 2005-03-18 15:54:48.170275368 +0100 ++++ w3c-libwww-5.4.0/Library/src/HTSQL.c 2005-03-18 17:11:38.895338616 +0100 +@@ -182,11 +182,25 @@ + { + if (me && me->host) { + HTTRACE(SQL_TRACE, "SQL connect. Open a link to server `%s\'\n" _ me->host); ++#if MYSQL_VERSION_ID>=32200 ++ if (!mysql_init(&(me->server))) { ++ return NO; ++ } ++#endif ++ ++#if MYSQL_VERSION_ID>=40027 ++ if ((me->psvr = mysql_real_connect(&(me->server), me->host, ++ me->user ? me->user : "", ++ me->password ? me->password : "", ++ "", 0 , 0 , 0)) == NULL) { ++#else ++ + if ((me->psvr = mysql_connect(&(me->server), me->host, + me->user ? me->user : "", + me->password ? me->password : "")) == NULL) { +- HTTRACE(SQL_TRACE, "SQL connect. `%s\' errno %d\n" _ +- mysql_error(&me->server) _ mysql_errno(&me->server)); ++#endif ++ HTTRACE(SQL_TRACE, "SQL connect. `%s\' errno %d\n" _ ++ mysql_error(&me->server) _ mysql_errno(&me->server)); + return NO; + } + return YES; +@@ -230,6 +244,7 @@ + PUBLIC BOOL HTSQL_selectDB (HTSQL * me, const char * db) + { + BOOL created = NO; ++ char query[1024]; + if (me && me->psvr && db) { + HTTRACE(SQL_TRACE, "SQL select.. Database `%s\'\n" _ db); + me->db = NULL; +@@ -240,7 +255,12 @@ + + /* If the database couldn't be found then create a new one */ + if (err == 1049) { ++#if MYSQL_VERSION_ID>=40027 ++ sprintf (query, "CREATE DATABASE %s", db); ++ if (mysql_query(me->psvr, query) != 0) { ++#else + if (mysql_create_db(me->psvr, db) < 0) { ++#endif + HTTRACE(SQL_TRACE, "SQL error... `%s\', errno %d\n" _ + mysql_error(me->psvr) _ err); + return NO; |