From 5a49d5b166c9b5d778f7f1425cb7344758f3e886 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster?= Date: Thu, 29 Aug 2019 11:49:48 +0200 Subject: [PATCH] [dev-perl/DBD-mysql] rm, in tree --- dev-perl/DBD-mysql/DBD-mysql-4.50.0.ebuild | 66 ------------------- dev-perl/DBD-mysql/Manifest | 1 - ...ysql-4.050-fix-float-type-conversion.patch | 48 -------------- ...fix-for-MariaDB-10.3.13-with-zerofil.patch | 36 ---------- 4 files changed, 151 deletions(-) delete mode 100644 dev-perl/DBD-mysql/DBD-mysql-4.50.0.ebuild delete mode 100644 dev-perl/DBD-mysql/Manifest delete mode 100644 dev-perl/DBD-mysql/files/DBD-mysql-4.050-fix-float-type-conversion.patch delete mode 100644 dev-perl/DBD-mysql/files/DBD-mysql-4.050-fix-for-MariaDB-10.3.13-with-zerofil.patch diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.50.0.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.50.0.ebuild deleted file mode 100644 index 4240010..0000000 --- a/dev-perl/DBD-mysql/DBD-mysql-4.50.0.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DIST_AUTHOR=DVEEDEN -DIST_VERSION=4.050 -inherit eutils perl-module - -DESCRIPTION="MySQL driver for the Perl5 Database Interface (DBI)" - -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" - -IUSE="test +ssl" - -RDEPEND=">=dev-perl/DBI-1.609.0 - >=dev-perl/Devel-CheckLib-1.109.0 - dev-db/mysql-connector-c:= -" -DEPEND="${RDEPEND} - virtual/perl-ExtUtils-MakeMaker - virtual/perl-Data-Dumper - dev-perl/Devel-CheckLib - test? ( - dev-perl/Test-Deep - >=virtual/perl-Test-Simple-0.900.0 - virtual/perl-Time-HiRes - ) -" -PATCHES=( - "${FILESDIR}"/DBD-mysql-4.050-fix-float-type-conversion.patch - "${FILESDIR}"/DBD-mysql-4.050-fix-for-MariaDB-10.3.13-with-zerofil.patch -) - -src_configure() { - if use test; then - myconf="${myconf} --testdb=test \ - --testhost=localhost \ - --testuser=test \ - --testpassword=test" - fi - myconf="${myconf} --$(usex ssl ssl nossl)" - perl-module_src_configure -} - -# Parallel testing is broken as 2 tests create the same table -# and mysql isn't acid compliant and can't limit visibility of tables -# to a transaction... -DIST_TEST="do" - -src_test() { - einfo - einfo "If tests fail, you have to configure your MySQL instance to create" - einfo "and grant some privileges to the test user." - einfo "You can run the following commands at the MySQL prompt: " - einfo "> CREATE USER 'test'@'localhost' IDENTIFIED BY 'test';" - einfo "> CREATE DATABASE test;" - einfo "> GRANT ALL PRIVILEGES ON test.* TO 'test'@'localhost';" - einfo - sleep 5 - perl_rm_files t/pod.t t/manifest.t - # Don't be a hero and try to do EXTENDED_TESTING=1 unless you can figure - # out why 60leaks.t fails - perl-module_src_test -} diff --git a/dev-perl/DBD-mysql/Manifest b/dev-perl/DBD-mysql/Manifest deleted file mode 100644 index af5b640..0000000 --- a/dev-perl/DBD-mysql/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST DBD-mysql-4.050.tar.gz 161579 BLAKE2B fb17e151db730fd6955d3e4424dd495a9fcf5f3f4e2b6b79d9fdc86bc42c3314b68771f1d3c393fd80ea14aeda626a5c5d21f5b921d487350ffd79802edab1f6 SHA512 910f5b4ba7a7890d50a79f37d04ec8971a4f62acd0fe30bf3ab634f66e3128f0cd6513e5c9da8c807a0f4477d0cc766682ea8dd0d8072d02821b78df51f37879 diff --git a/dev-perl/DBD-mysql/files/DBD-mysql-4.050-fix-float-type-conversion.patch b/dev-perl/DBD-mysql/files/DBD-mysql-4.050-fix-float-type-conversion.patch deleted file mode 100644 index cda1cab..0000000 --- a/dev-perl/DBD-mysql/files/DBD-mysql-4.050-fix-float-type-conversion.patch +++ /dev/null @@ -1,48 +0,0 @@ -From: Pali -Date: Fri, 24 Feb 2017 19:51:36 +0100 -Subject: [PATCH] Fix type conversions - Calling SvNV() for magical scalar is not enough for float type conversion. - It caused problem for Amavis in tainted mode -- all float values were zero. - On the other hand SvIV() and SvUV() seems to work fine. To be sure that - correct value of float is in scalar use sv_setnv() with explicit NV float - value. Similar code is changed also for integers IV/UV. - . - This patch should fix reported Amavis bug: - https://github.com/perl5-dbi/DBD-mysql/issues/78 - . - See also reported perl bug about SvNV(): - https://rt.perl.org/Public/Bug/Display.html?id=130801 -Bugs: https://github.com/perl5-dbi/DBD-mysql/issues/78 -Bugs-Debian: https://bugs.debian.org/856064 -Last-Update: 2019-01-09 -Reviewed-By: Xavier Guimard , - gregor herrmann - ---- a/dbdimp.c -+++ b/dbdimp.c -@@ -4447,8 +4447,7 @@ - if (!(fields[i].flags & ZEROFILL_FLAG)) - { - /* Coerce to double and set scalar as NV */ -- (void) SvNV(sv); -- SvNOK_only(sv); -+ sv_setnv(sv, SvNV(sv)); - } - break; - -@@ -4459,13 +4458,11 @@ - /* Coerce to integer and set scalar as UV resp. IV */ - if (fields[i].flags & UNSIGNED_FLAG) - { -- (void) SvUV(sv); -- SvIOK_only_UV(sv); -+ sv_setuv(sv, SvUV(sv)); - } - else - { -- (void) SvIV(sv); -- SvIOK_only(sv); -+ sv_setiv(sv, SvIV(sv)); - } - } - break; diff --git a/dev-perl/DBD-mysql/files/DBD-mysql-4.050-fix-for-MariaDB-10.3.13-with-zerofil.patch b/dev-perl/DBD-mysql/files/DBD-mysql-4.050-fix-for-MariaDB-10.3.13-with-zerofil.patch deleted file mode 100644 index f3d5e5b..0000000 --- a/dev-perl/DBD-mysql/files/DBD-mysql-4.050-fix-for-MariaDB-10.3.13-with-zerofil.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 8b5ba5f9c8d239328ecbc862aba203d44819e2f5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= -Date: Tue, 5 Mar 2019 16:24:17 +0100 -Subject: [PATCH] Fix for MariaDB 10.3.13 with zerofil - -Issue: #304 - -Bug: https://github.com/perl5-dbi/DBD-mysql/issues/304 -Bug-Debian: https://bugs.debian.org/923541 - ---- - dbdimp.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/dbdimp.c b/dbdimp.c -index a9c37cf..82c96d2 100644 ---- a/dbdimp.c -+++ b/dbdimp.c -@@ -4055,9 +4055,13 @@ int dbd_describe(SV* sth, imp_sth_t* imp_sth) - break; - - default: --#if MYSQL_VERSION_ID > 100300 -+#if (MYSQL_VERSION_ID > 100300) && (MYSQL_VERSION_ID < 100313) - // https://jira.mariadb.org/browse/MDEV-18143 - buffer->buffer_length= fields[i].max_length ? fields[i].max_length : 2; -+#elif MYSQL_VERSION_ID > 100312 -+ // https://jira.mariadb.org/browse/MDEV-18823 -+ buffer->buffer_length= fields[i].max_length ? fields[i].max_length + 1 : 2; -+ buffer->buffer_length= fields[i].length > fields[i].max_length ? fields[i].length + 1 : 2; - #else - buffer->buffer_length= fields[i].max_length ? fields[i].max_length : 1; - #endif --- -2.20.1 -