Fixes for bug 172780, compat with 4.x mysql clients

Package-Manager: portage-2.1.2.2

diff --git a/dev-perl/DBD-mysql/ChangeLog b/dev-perl/DBD-mysql/ChangeLog
index 4117f06876b6de2f0c78a2d1ecdae870d43da7ee..eac098abb2d5a3a5b3657593939e3c839b0eb7ca 100644 (file)
--- a/dev-perl/DBD-mysql/ChangeLog
+++ b/dev-perl/DBD-mysql/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-perl/DBD-mysql
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBD-mysql/ChangeLog,v 1.72 2007/03/30 14:18:54 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBD-mysql/ChangeLog,v 1.73 2007/03/31 12:39:36 mcummings Exp $
+
+*DBD-mysql-4.00.4-r1 (31 Mar 2007)
+
+  31 Mar 2007; Michael Cummings <mcummings@gentoo.org>
+  +files/sqlstate-purge.patch, -DBD-mysql-4.00.4.ebuild,
+  +DBD-mysql-4.00.4-r1.ebuild:
+  Fixes for bug 172780, compat with 4.x mysql clients
 
 *DBD-mysql-4.00.4 (30 Mar 2007)
 

diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.00.4.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.00.4-r1.ebuild
similarity index 87%
rename from dev-perl/DBD-mysql/DBD-mysql-4.00.4.ebuild
rename to dev-perl/DBD-mysql/DBD-mysql-4.00.4-r1.ebuild
index 00b723a6d275883a64ecd5a515eb4cc926f2c7e3..702a3bcc7cc98cf55356912de0cf15fe09a5750a 100644 (file)
--- a/dev-perl/DBD-mysql/DBD-mysql-4.00.4.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.00.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBD-mysql/DBD-mysql-4.00.4.ebuild,v 1.1 2007/03/30 14:18:54 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBD-mysql/DBD-mysql-4.00.4-r1.ebuild,v 1.1 2007/03/31 12:39:36 mcummings Exp $
 
 inherit eutils perl-module versionator
 
@@ -17,6 +17,7 @@ LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE=""
+PATCHES="${FILESDIR}/sqlstate-purge.patch"
 
 DEPEND="dev-lang/perl
        dev-perl/DBI

diff --git a/dev-perl/DBD-mysql/Manifest b/dev-perl/DBD-mysql/Manifest
index 4a29833802a74926f5c3874a22f36d8c57fea114..6f2d5325fc13fe0a6913ac0e201bb4fdc40df867 100644 (file)
--- a/dev-perl/DBD-mysql/Manifest
+++ b/dev-perl/DBD-mysql/Manifest
@@ -9,6 +9,10 @@ AUX mysql-5.0-new_bit_type.patch 1404 RMD160 e6d55678d539df03c82fa450a3ef47911eb
 MD5 41410536dd5f7348dda0f6e01bb38c6f files/mysql-5.0-new_bit_type.patch 1404
 RMD160 e6d55678d539df03c82fa450a3ef47911eb3f4a7 files/mysql-5.0-new_bit_type.patch 1404
 SHA256 f1bda16a2faae68bbecd8e56b0e4c793edb9d205b0b56e702f8af2b373958514 files/mysql-5.0-new_bit_type.patch 1404
+AUX sqlstate-purge.patch 2915 RMD160 7212d3905c536442aec8c2cfc9b9b53bfa53868c SHA1 432cc93e96904ca994082eb9452abc798d4e2ea6 SHA256 9bea24531e44aae21df7b270cd42b7eb88d6acf57a67b5f85885a7d3105c93b1
+MD5 e609e469236b6c3c1d2bb0c6ca2b9b67 files/sqlstate-purge.patch 2915
+RMD160 7212d3905c536442aec8c2cfc9b9b53bfa53868c files/sqlstate-purge.patch 2915
+SHA256 9bea24531e44aae21df7b270cd42b7eb88d6acf57a67b5f85885a7d3105c93b1 files/sqlstate-purge.patch 2915
 DIST DBD-mysql-2.9007.tar.gz 116789 RMD160 a09df2418aa77ecfad367cf307bd7207c50adac4 SHA1 73f97a060993d539952a75e07b435120a7f36f28 SHA256 630dc1998a8b41c169da9f5e0ae86c62a24f3a6d0b8c4ae83cfa523acbbe3a49
 DIST DBD-mysql-3.0006.tar.gz 114658 RMD160 711610a81a25e1a59f010987a3cfe005da8a3f67 SHA1 41c555be735a2974d873dd4245ecb0f1478808e3 SHA256 0fc7511fcf31500e9f9bf43ca6424e142c004381f1f5db9849182f2b929087ed
 DIST DBD-mysql-3.0007.tar.gz 115804 RMD160 245935e7be275872dfc192f559b67bf55bf30acf SHA1 ff9dd4e7a8b70f34d4048dde2038d3583c83d624 SHA256 fb127aef1d8591356f456c5e49e1f0bd96e6907d595732910efa26eb9c39b14d
@@ -41,18 +45,18 @@ EBUILD DBD-mysql-4.00.3.ebuild 741 RMD160 99da3e0467dc0537204c04a31f60d7fe762b15
 MD5 719512989791eacb9ecedded7daa08f4 DBD-mysql-4.00.3.ebuild 741
 RMD160 99da3e0467dc0537204c04a31f60d7fe762b1502 DBD-mysql-4.00.3.ebuild 741
 SHA256 968902cc767e5a8d74bc761f08306ed919137a74d2f1a7c61480d1275526e0d2 DBD-mysql-4.00.3.ebuild 741
-EBUILD DBD-mysql-4.00.4.ebuild 741 RMD160 8ef3d835af79ef8fa39dabe2cb0f2af4e8ded461 SHA1 3df8d026919dd9b825369233647962d4064c62dc SHA256 26802ca3ccf28bc17e1244fbdbb46fe1ed2d216b60cdcc994a11a8657af803c7
-MD5 e24f5f6b7420de89d31ddbf07f55a06c DBD-mysql-4.00.4.ebuild 741
-RMD160 8ef3d835af79ef8fa39dabe2cb0f2af4e8ded461 DBD-mysql-4.00.4.ebuild 741
-SHA256 26802ca3ccf28bc17e1244fbdbb46fe1ed2d216b60cdcc994a11a8657af803c7 DBD-mysql-4.00.4.ebuild 741
+EBUILD DBD-mysql-4.00.4-r1.ebuild 787 RMD160 8a4efc38547b359c67b92c2d41e955eedef8b2f4 SHA1 2270e024121ce57809dc30c053eb211bffb0d889 SHA256 54beaa641a9071a2a0b013d9bb6a5c0ef75be8e1554eb2267ce5959a2dcce76b
+MD5 6751a8b58af3e22f49178cd4fd348f70 DBD-mysql-4.00.4-r1.ebuild 787
+RMD160 8a4efc38547b359c67b92c2d41e955eedef8b2f4 DBD-mysql-4.00.4-r1.ebuild 787
+SHA256 54beaa641a9071a2a0b013d9bb6a5c0ef75be8e1554eb2267ce5959a2dcce76b DBD-mysql-4.00.4-r1.ebuild 787
 EBUILD DBD-mysql-4.00.ebuild 641 RMD160 5332934aa5713e94bc294ceb35971a5af4226a1c SHA1 d669b3e4773a027cc68a82545c205155ab859d50 SHA256 b5573aaf8c6430c7bdb335296ee983b08067a5b161a0de6a08b99c97f03936b5
 MD5 3659ffce84af48c0021c2a127cce4e54 DBD-mysql-4.00.ebuild 641
 RMD160 5332934aa5713e94bc294ceb35971a5af4226a1c DBD-mysql-4.00.ebuild 641
 SHA256 b5573aaf8c6430c7bdb335296ee983b08067a5b161a0de6a08b99c97f03936b5 DBD-mysql-4.00.ebuild 641
-MISC ChangeLog 9457 RMD160 e6b2d34b61fe37cabbd26317b75e777a0ab6c9c7 SHA1 12b497ec976f09663ac05308ad2be8260e9d093a SHA256 b245b60bee97b044190d730d8d6a23f7c2950acce52719cd23b5552763f9f6b1
-MD5 b79f4c924c4146d364bd45d620dd0d8a ChangeLog 9457
-RMD160 e6b2d34b61fe37cabbd26317b75e777a0ab6c9c7 ChangeLog 9457
-SHA256 b245b60bee97b044190d730d8d6a23f7c2950acce52719cd23b5552763f9f6b1 ChangeLog 9457
+MISC ChangeLog 9691 RMD160 f08e9b2b02fb1c7aba58505ce91b99dcffea5269 SHA1 24719196ea74097cc71c80c396c4d6182fb59e51 SHA256 78dd928597e0c0868ba90e4ce1a8566050fabcb9d8417d24de30f061f402b9cb
+MD5 473a9999302a91421fa4325adfdbdea9 ChangeLog 9691
+RMD160 f08e9b2b02fb1c7aba58505ce91b99dcffea5269 ChangeLog 9691
+SHA256 78dd928597e0c0868ba90e4ce1a8566050fabcb9d8417d24de30f061f402b9cb ChangeLog 9691
 MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 RMD160 647980838c590f54441a053916ea629e53e551c0 metadata.xml 305
@@ -78,13 +82,13 @@ SHA256 265f951403c19a2b2c8504eade3b41f85183541a95168471ec94fcabd4a12a76 files/di
 MD5 7028466397c19c601e9edc2a152614b9 files/digest-DBD-mysql-4.00.3 247
 RMD160 5f44bb78ad9e78fa71cb63d30bc5a0a2a33ac4b4 files/digest-DBD-mysql-4.00.3 247
 SHA256 d6f46c1d6404247fc983ced5db49cfecc71c67025e508d7a70abb4f1f631ee9e files/digest-DBD-mysql-4.00.3 247
-MD5 27010b111e2acae931bb360f9d8e1fd9 files/digest-DBD-mysql-4.00.4 247
-RMD160 fe649566ba1e293752e579d6a2f0486ad5c75507 files/digest-DBD-mysql-4.00.4 247
-SHA256 8b2019d74e7eae6ba2989da731fc5ba928e3a9530a86bbf5b72d4b9b8c47d501 files/digest-DBD-mysql-4.00.4 247
+MD5 27010b111e2acae931bb360f9d8e1fd9 files/digest-DBD-mysql-4.00.4-r1 247
+RMD160 fe649566ba1e293752e579d6a2f0486ad5c75507 files/digest-DBD-mysql-4.00.4-r1 247
+SHA256 8b2019d74e7eae6ba2989da731fc5ba928e3a9530a86bbf5b72d4b9b8c47d501 files/digest-DBD-mysql-4.00.4-r1 247
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGDRxUtG5z4I8BtQoRAl6jAJ0c+ArYbZ4oI/r7NTQbEh3OR/kJCgCfboPh
-fa4ra3kKgS47Q36irG7UnyU=
-=FzyH
+iD8DBQFGDlaOtG5z4I8BtQoRAjyXAJ0fLeubI874RkcUUJogdAic9y8JBACePypg
+8fgcBVxxEUguGeMi2BB53EA=
+=GQpr
 -----END PGP SIGNATURE-----

diff --git a/dev-perl/DBD-mysql/files/digest-DBD-mysql-4.00.4 b/dev-perl/DBD-mysql/files/digest-DBD-mysql-4.00.4-r1
similarity index 100%
rename from dev-perl/DBD-mysql/files/digest-DBD-mysql-4.00.4
rename to dev-perl/DBD-mysql/files/digest-DBD-mysql-4.00.4-r1

diff --git a/dev-perl/DBD-mysql/files/sqlstate-purge.patch b/dev-perl/DBD-mysql/files/sqlstate-purge.patch
new file mode 100644 (file)
index 0000000..5cec451
--- /dev/null
+++ b/dev-perl/DBD-mysql/files/sqlstate-purge.patch
@@ -0,0 +1,100 @@
+diff -Naurp DBD-mysql-4.004.old/dbdimp.c DBD-mysql-4.004/dbdimp.c
+--- DBD-mysql-4.004.old/dbdimp.c       2007-03-20 09:37:12.000000000 -0400
++++ DBD-mysql-4.004/dbdimp.c   2007-03-31 07:26:48.000000000 -0400
+@@ -3423,11 +3423,7 @@ dbd_st_fetch(SV *sth, imp_sth_t* imp_sth
+   if (!imp_sth->result)
+   {
+     do_error(sth, JW_ERR_SEQUENCE, "fetch() without execute()"
+-#if MYSQL_VERSION_ID >= SQL_STATE_VERSION
+              ,NULL);
+-#else
+-            );
+-#endif
+     return Nullav;
+   }
+ 
+@@ -3587,12 +3583,7 @@ dbd_st_fetch(SV *sth, imp_sth_t* imp_sth
+       if (mysql_errno(&imp_dbh->mysql))
+         do_error(sth, mysql_errno(&imp_dbh->mysql),
+                  mysql_error(&imp_dbh->mysql)
+-#if MYSQL_VERSION_ID >= SQL_STATE_VERSION
+                  , mysql_sqlstate(&imp_dbh->mysql));
+-#else
+-                );
+-#endif
+-
+ 
+ #if MYSQL_VERSION_ID >= MULTIPLE_RESULT_SET_VERSION
+       if (!mysql_more_results(svsock))
+@@ -3925,11 +3916,7 @@ dbd_st_FETCH_internal(
+   /* Are we asking for a legal value? */
+   if (what < 0 ||  what >= AV_ATTRIB_LAST)
+     do_error(sth, JW_ERR_NOT_IMPLEMENTED, "Not implemented"
+-#if MYSQL_VERSION_ID >= SQL_STATE_VERSION
+              , NULL);
+-#else
+-              );
+-#endif
+ 
+   /* Return cached value, if possible */
+   else if (cacheit  &&  imp_sth->av_attr[what])
+@@ -3939,11 +3926,7 @@ dbd_st_FETCH_internal(
+   else if (!res)
+     do_error(sth, JW_ERR_NOT_ACTIVE,
+            "statement contains no result"
+-#if MYSQL_VERSION_ID >= SQL_STATE_VERSION
+              ,NULL);
+-#else
+-            );
+-#endif
+   /* Do the real work. */
+   else
+   {
+@@ -4258,11 +4241,7 @@ int dbd_bind_ph (SV *sth, imp_sth_t *imp
+   {
+     do_error(sth, JW_ERR_ILLEGAL_PARAM_NUM,
+              "Illegal parameter number"
+-#if MYSQL_VERSION_ID >= SQL_STATE_VERSION
+              , NULL);
+-#else
+-            );
+-#endif
+     return FALSE;
+   }
+ 
+@@ -4285,11 +4264,7 @@ int dbd_bind_ph (SV *sth, imp_sth_t *imp
+               "Binding non-numeric field %d, value %s as a numeric!",
+               param_num, neatsvpv(value,0));
+       do_error(sth, JW_ERR_ILLEGAL_PARAM_NUM, err_msg
+-#if MYSQL_VERSION_ID >= SQL_STATE_VERSION
+                ,NULL);
+-#else
+-                );
+-#endif
+     }
+   }
+ 
+@@ -4297,11 +4272,7 @@ int dbd_bind_ph (SV *sth, imp_sth_t *imp
+   {
+     do_error(sth, JW_ERR_NOT_IMPLEMENTED,
+              "Output parameters not implemented"
+-#if MYSQL_VERSION_ID >= SQL_STATE_VERSION
+              ,NULL);
+-#else
+-                );
+-#endif
+     return FALSE;
+   }
+ 
+@@ -4459,11 +4430,7 @@ int mysql_db_reconnect(SV* h)
+   if (!my_login(h, imp_dbh))
+   {
+     do_error(h, mysql_errno(&imp_dbh->mysql), mysql_error(&imp_dbh->mysql)
+-#if MYSQL_VERSION_ID >= SQL_STATE_VERSION
+              , mysql_sqlstate(&imp_dbh->mysql));
+-#else
+-              );
+-#endif
+     memcpy (&imp_dbh->mysql, &save_socket, sizeof(save_socket));
+     ++imp_dbh->stats.auto_reconnects_failed;
+     return FALSE;