* [gentoo-commits] repo/gentoo:master commit in: dev-perl/DBD-mysql/files/
@ 2019-08-29 9:52 Kent Fredric
0 siblings, 0 replies; 2+ messages in thread
From: Kent Fredric @ 2019-08-29 9:52 UTC (permalink / raw
To: gentoo-commits
commit: 17f105f2cdfb6bffec9efaaba24a61e3c7f1e4fa
Author: Kent Fredric <kentnl <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 29 06:07:27 2019 +0000
Commit: Kent Fredric <kentnl <AT> gentoo <DOT> org>
CommitDate: Thu Aug 29 09:49:13 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17f105f2
dev-perl/DBD-mysql: Add missing patch
Something messed up in a git rebase/sync somehow and I didn't notice
till too late.
Package-Manager: Portage-2.3.72, Repoman-2.3.16
Signed-off-by: Kent Fredric <kentnl <AT> gentoo.org>
.../files/DBD-mysql-4.050-no-dot-inc.patch | 166 +++++++++++++++++++++
1 file changed, 166 insertions(+)
diff --git a/dev-perl/DBD-mysql/files/DBD-mysql-4.050-no-dot-inc.patch b/dev-perl/DBD-mysql/files/DBD-mysql-4.050-no-dot-inc.patch
new file mode 100644
index 00000000000..d5a0fe0b524
--- /dev/null
+++ b/dev-perl/DBD-mysql/files/DBD-mysql-4.050-no-dot-inc.patch
@@ -0,0 +1,166 @@
+From 4e5417cbdd97bfc6dd53130de69f9173af59c273 Mon Sep 17 00:00:00 2001
+From: Pali <pali@cpan.org>
+Date: Mon, 17 Apr 2017 21:38:58 +0200
+Subject: Fix tests on Perl On 5.25.10 or greater with
+ -Ddefault_inc_excludes_dot
+
+Some tests do not include dot in %INC and fails with error:
+Can't locate t/lib.pl in @INC
+
+Fixes: https://rt.cpan.org/Public/Bug/Display.html?id=120709
+---
+ t/40server_prepare_crash.t | 3 ++-
+ t/lib.pl | 5 +++--
+ t/rt110983-valid-mysqlfd.t | 3 ++-
+ t/rt118977-zerofill.t | 2 +-
+ t/rt25389-bin-case.t | 3 ++-
+ t/rt50304-column_info_parentheses.t | 3 ++-
+ t/rt61849-bind-param-buffer-overflow.t | 3 ++-
+ t/rt75353-innodb-lock-timeout.t | 3 ++-
+ t/rt83494-quotes-comments.t | 3 ++-
+ 9 files changed, 18 insertions(+), 10 deletions(-)
+
+diff --git a/t/40server_prepare_crash.t b/t/40server_prepare_crash.t
+index 103276d..80bc9b7 100644
+--- a/t/40server_prepare_crash.t
++++ b/t/40server_prepare_crash.t
+@@ -5,7 +5,8 @@ use Test::More;
+ use DBI;
+
+ use vars qw($test_dsn $test_user $test_password);
+-require "t/lib.pl";
++use lib 't', '.';
++require "lib.pl";
+
+ my $dbh = eval { DBI->connect($test_dsn, $test_user, $test_password, { PrintError => 1, RaiseError => 1, AutoCommit => 0, mysql_server_prepare => 1, mysql_server_prepare_disable_fallback => 1 }) };
+ plan skip_all => "no database connection" if $@ or not $dbh;
+diff --git a/t/lib.pl b/t/lib.pl
+index 2221c40..0c756a0 100644
+--- a/t/lib.pl
++++ b/t/lib.pl
+@@ -2,6 +2,7 @@ use strict;
+ use warnings;
+
+ use Test::More;
++use File::Spec ();
+ use DBI::Const::GetInfoType;
+ use vars qw($mdriver $dbdriver $childPid $test_dsn $test_user $test_password);
+
+@@ -31,7 +32,7 @@ if (-f ($file = "t/$dbdriver.dbtest") ||
+ -f ($file = "$dbdriver.dbtest") ||
+ -f ($file = "../tests/$dbdriver.dbtest") ||
+ -f ($file = "tests/$dbdriver.dbtest")) {
+- eval { require $file; };
++ eval { require File::Spec->rel2abs($file); };
+ if ($@) {
+ print STDERR "Cannot execute $file: $@.\n";
+ print "1..0\n";
+@@ -45,7 +46,7 @@ if (-f ($file = "t/$mdriver.mtest") ||
+ -f ($file = "$mdriver.mtest") ||
+ -f ($file = "../tests/$mdriver.mtest") ||
+ -f ($file = "tests/$mdriver.mtest")) {
+- eval { require $file; };
++ eval { require File::Spec->rel2abs($file); };
+ if ($@) {
+ print STDERR "Cannot execute $file: $@.\n";
+ print "1..0\n";
+diff --git a/t/rt110983-valid-mysqlfd.t b/t/rt110983-valid-mysqlfd.t
+index c5af2fa..a6ec8fb 100644
+--- a/t/rt110983-valid-mysqlfd.t
++++ b/t/rt110983-valid-mysqlfd.t
+@@ -5,7 +5,8 @@ use Test::More;
+ use DBI;
+
+ use vars qw($test_dsn $test_user $test_password);
+-require "t/lib.pl";
++use lib 't', '.';
++require "lib.pl";
+
+ my $dbh = eval { DBI->connect($test_dsn, $test_user, $test_password, { RaiseError => 1, AutoCommit => 0 }) };
+ plan skip_all => "no database connection" if $@ or not $dbh;
+diff --git a/t/rt118977-zerofill.t b/t/rt118977-zerofill.t
+index 27ba1b7..86edb8e 100644
+--- a/t/rt118977-zerofill.t
++++ b/t/rt118977-zerofill.t
+@@ -5,7 +5,7 @@ use Test::More;
+ use DBI;
+
+ use vars qw($test_dsn $test_user $test_password);
+-require "t/lib.pl";
++require "./t/lib.pl";
+
+ my $dbh = eval { DBI->connect($test_dsn, $test_user, $test_password, { PrintError => 1, RaiseError => 1 }) };
+ plan skip_all => "no database connection" if $@ or not $dbh;
+diff --git a/t/rt25389-bin-case.t b/t/rt25389-bin-case.t
+index 37bffb9..9d091b3 100644
+--- a/t/rt25389-bin-case.t
++++ b/t/rt25389-bin-case.t
+@@ -4,7 +4,8 @@ use warnings;
+ use DBI;
+
+ use vars qw($test_dsn $test_user $test_password);
+-require "t/lib.pl";
++use lib 't', '.';
++require "lib.pl";
+
+ use Test::More;
+
+diff --git a/t/rt50304-column_info_parentheses.t b/t/rt50304-column_info_parentheses.t
+index 28b2128..e03e332 100644
+--- a/t/rt50304-column_info_parentheses.t
++++ b/t/rt50304-column_info_parentheses.t
+@@ -4,7 +4,8 @@ use warnings;
+ use DBI;
+
+ use vars qw($test_dsn $test_user $test_password $state);
+-require "t/lib.pl";
++use lib 't', '.';
++require "lib.pl";
+
+ use Test::More;
+
+diff --git a/t/rt61849-bind-param-buffer-overflow.t b/t/rt61849-bind-param-buffer-overflow.t
+index f1fb254..a457d57 100644
+--- a/t/rt61849-bind-param-buffer-overflow.t
++++ b/t/rt61849-bind-param-buffer-overflow.t
+@@ -5,7 +5,8 @@ use Test::More;
+ use DBI;
+
+ use vars qw($test_dsn $test_user $test_password);
+-require "t/lib.pl";
++use lib 't', '.';
++require "lib.pl";
+
+ my $INSECURE_VALUE_FROM_USER = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
+
+diff --git a/t/rt75353-innodb-lock-timeout.t b/t/rt75353-innodb-lock-timeout.t
+index 9c97d60..35fa5a7 100644
+--- a/t/rt75353-innodb-lock-timeout.t
++++ b/t/rt75353-innodb-lock-timeout.t
+@@ -5,7 +5,8 @@ use Test::More;
+ use DBI;
+
+ use vars qw($test_dsn $test_user $test_password);
+-require "t/lib.pl";
++use lib 't', '.';
++require "lib.pl";
+
+ my $dbh1 = eval { DBI->connect($test_dsn, $test_user, $test_password, { RaiseError => 1, AutoCommit => 0 }) };
+ plan skip_all => "no database connection" if $@ or not $dbh1;
+diff --git a/t/rt83494-quotes-comments.t b/t/rt83494-quotes-comments.t
+index 9df0d90..c42afe4 100644
+--- a/t/rt83494-quotes-comments.t
++++ b/t/rt83494-quotes-comments.t
+@@ -9,7 +9,8 @@ use DBI;
+ use Test::More;
+
+ use vars qw($test_dsn $test_user $test_password $state);
+-require "t/lib.pl";
++use lib 't', '.';
++require "lib.pl";
+
+ my $dbh;
+ eval {$dbh= DBI->connect($test_dsn, $test_user, $test_password,
+--
+2.23.0
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-perl/DBD-mysql/files/
@ 2021-07-10 21:16 Conrad Kostecki
0 siblings, 0 replies; 2+ messages in thread
From: Conrad Kostecki @ 2021-07-10 21:16 UTC (permalink / raw
To: gentoo-commits
commit: b347780101cfbdf0bc46e5d6aa3954df98f2cbe4
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat May 1 17:54:21 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Jul 10 21:03:30 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3477801
dev-perl/DBD-mysql: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/20632
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
dev-perl/DBD-mysql/files/4.041-mariadb-10.2.patch | 35 -----
.../DBD-mysql-4.044-amvis-type-conversions.patch | 56 --------
.../files/DBD-mysql-4.044-no-dot-inc.patch | 151 ---------------------
3 files changed, 242 deletions(-)
diff --git a/dev-perl/DBD-mysql/files/4.041-mariadb-10.2.patch b/dev-perl/DBD-mysql/files/4.041-mariadb-10.2.patch
deleted file mode 100644
index 13fa2775a3c..00000000000
--- a/dev-perl/DBD-mysql/files/4.041-mariadb-10.2.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 509fd6a054de9408ce9032e93fff61f6bdbc568a Mon Sep 17 00:00:00 2001
-From: Brian Evans <grknight@gentoo.org>
-Date: Fri, 13 Oct 2017 15:03:50 -0400
-Subject: Fix building/linking against MariaDB 10.2
-
-Bug: https://bugs.gentoo.org/634192
----
- mysql.xs | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/mysql.xs b/mysql.xs
-index 13c6a57..6de3c8e 100644
---- a/mysql.xs
-+++ b/mysql.xs
-@@ -790,7 +790,7 @@ dbd_mysql_get_info(dbh, sql_info_type)
- D_imp_dbh(dbh);
- IV type = 0;
- SV* retsv=NULL;
--#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50709
-+#if ( !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50709 ) || MYSQL_VERSION_ID >= 100202
- /* MariaDB 10 is not MySQL source level compatible so this only applies to MySQL*/
- IV buffer_len;
- #endif
-@@ -822,7 +822,7 @@ dbd_mysql_get_info(dbh, sql_info_type)
- retsv = newSVpvn("`", 1);
- break;
- case SQL_MAXIMUM_STATEMENT_LENGTH:
--#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50709
-+#if ( !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50709 ) || MYSQL_VERSION_ID >= 100202
- /* MariaDB 10 is not MySQL source level compatible so this
- only applies to MySQL*/
- /* mysql_get_option() was added in mysql 5.7.3 */
---
-2.14.2
-
diff --git a/dev-perl/DBD-mysql/files/DBD-mysql-4.044-amvis-type-conversions.patch b/dev-perl/DBD-mysql/files/DBD-mysql-4.044-amvis-type-conversions.patch
deleted file mode 100644
index 9cf9ff91fc8..00000000000
--- a/dev-perl/DBD-mysql/files/DBD-mysql-4.044-amvis-type-conversions.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From eb7eddaa2341b853df045ad4a3690c60fc38c6c8 Mon Sep 17 00:00:00 2001
-From: Pali <pali@cpan.org>
-Date: Fri, 24 Feb 2017 19:51:36 +0100
-Subject: 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
----
- dbdimp.c | 9 +++------
- 1 file changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/dbdimp.c b/dbdimp.c
-index 9c33994..7fdfba1 100644
---- a/dbdimp.c
-+++ b/dbdimp.c
-@@ -4380,8 +4380,7 @@ process:
- if (!(fields[i].flags & ZEROFILL_FLAG))
- {
- /* Coerce to dobule and set scalar as NV */
-- (void) SvNV(sv);
-- SvNOK_only(sv);
-+ sv_setnv(sv, SvNV(sv));
- }
- break;
-
-@@ -4392,13 +4391,11 @@ process:
- /* 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;
---
-2.15.1
-
diff --git a/dev-perl/DBD-mysql/files/DBD-mysql-4.044-no-dot-inc.patch b/dev-perl/DBD-mysql/files/DBD-mysql-4.044-no-dot-inc.patch
deleted file mode 100644
index 5e0829384be..00000000000
--- a/dev-perl/DBD-mysql/files/DBD-mysql-4.044-no-dot-inc.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From 35931a7465f19da53b97cd1bc5369a69aeac2ff6 Mon Sep 17 00:00:00 2001
-From: Pali <pali@cpan.org>
-Date: Mon, 17 Apr 2017 21:38:58 +0200
-Subject: Fix tests on Perl On 5.25.10 or greater with
- -Ddefault_inc_excludes_dot
-
-Some tests do not include dot in %INC and fails with error:
-Can't locate t/lib.pl in @INC
-
-Fixes: https://rt.cpan.org/Public/Bug/Display.html?id=120709
----
- t/40server_prepare_crash.t | 3 ++-
- t/lib.pl | 5 +++--
- t/rt118977-zerofill.t | 2 +-
- t/rt25389-bin-case.t | 3 ++-
- t/rt50304-column_info_parentheses.t | 3 ++-
- t/rt61849-bind-param-buffer-overflow.t | 3 ++-
- t/rt75353-innodb-lock-timeout.t | 3 ++-
- t/rt83494-quotes-comments.t | 3 ++-
- 8 files changed, 16 insertions(+), 9 deletions(-)
-
-diff --git a/t/40server_prepare_crash.t b/t/40server_prepare_crash.t
-index df6e2b3..e2c8c9f 100644
---- a/t/40server_prepare_crash.t
-+++ b/t/40server_prepare_crash.t
-@@ -5,7 +5,8 @@ use Test::More;
- use DBI;
-
- use vars qw($test_dsn $test_user $test_password);
--require "t/lib.pl";
-+use lib 't', '.';
-+require "lib.pl";
-
- my $dbh = eval { DBI->connect($test_dsn, $test_user, $test_password, { PrintError => 1, RaiseError => 1, AutoCommit => 0, mysql_server_prepare => 1, mysql_server_prepare_disable_fallback => 1 }) };
- plan skip_all => "no database connection" if $@ or not $dbh;
-diff --git a/t/lib.pl b/t/lib.pl
-index 2221c40..0c756a0 100644
---- a/t/lib.pl
-+++ b/t/lib.pl
-@@ -2,6 +2,7 @@ use strict;
- use warnings;
-
- use Test::More;
-+use File::Spec ();
- use DBI::Const::GetInfoType;
- use vars qw($mdriver $dbdriver $childPid $test_dsn $test_user $test_password);
-
-@@ -31,7 +32,7 @@ if (-f ($file = "t/$dbdriver.dbtest") ||
- -f ($file = "$dbdriver.dbtest") ||
- -f ($file = "../tests/$dbdriver.dbtest") ||
- -f ($file = "tests/$dbdriver.dbtest")) {
-- eval { require $file; };
-+ eval { require File::Spec->rel2abs($file); };
- if ($@) {
- print STDERR "Cannot execute $file: $@.\n";
- print "1..0\n";
-@@ -45,7 +46,7 @@ if (-f ($file = "t/$mdriver.mtest") ||
- -f ($file = "$mdriver.mtest") ||
- -f ($file = "../tests/$mdriver.mtest") ||
- -f ($file = "tests/$mdriver.mtest")) {
-- eval { require $file; };
-+ eval { require File::Spec->rel2abs($file); };
- if ($@) {
- print STDERR "Cannot execute $file: $@.\n";
- print "1..0\n";
-diff --git a/t/rt118977-zerofill.t b/t/rt118977-zerofill.t
-index 27ba1b7..86edb8e 100644
---- a/t/rt118977-zerofill.t
-+++ b/t/rt118977-zerofill.t
-@@ -5,7 +5,7 @@ use Test::More;
- use DBI;
-
- use vars qw($test_dsn $test_user $test_password);
--require "t/lib.pl";
-+require "./t/lib.pl";
-
- my $dbh = eval { DBI->connect($test_dsn, $test_user, $test_password, { PrintError => 1, RaiseError => 1 }) };
- plan skip_all => "no database connection" if $@ or not $dbh;
-diff --git a/t/rt25389-bin-case.t b/t/rt25389-bin-case.t
-index 37bffb9..9d091b3 100644
---- a/t/rt25389-bin-case.t
-+++ b/t/rt25389-bin-case.t
-@@ -4,7 +4,8 @@ use warnings;
- use DBI;
-
- use vars qw($test_dsn $test_user $test_password);
--require "t/lib.pl";
-+use lib 't', '.';
-+require "lib.pl";
-
- use Test::More;
-
-diff --git a/t/rt50304-column_info_parentheses.t b/t/rt50304-column_info_parentheses.t
-index 5b6d799..8c31bf6 100644
---- a/t/rt50304-column_info_parentheses.t
-+++ b/t/rt50304-column_info_parentheses.t
-@@ -4,7 +4,8 @@ use warnings;
- use DBI;
-
- use vars qw($test_dsn $test_user $test_password $state);
--require "t/lib.pl";
-+use lib 't', '.';
-+require "lib.pl";
-
- use Test::More;
-
-diff --git a/t/rt61849-bind-param-buffer-overflow.t b/t/rt61849-bind-param-buffer-overflow.t
-index 99a4ccc..494f985 100644
---- a/t/rt61849-bind-param-buffer-overflow.t
-+++ b/t/rt61849-bind-param-buffer-overflow.t
-@@ -5,7 +5,8 @@ use Test::More;
- use DBI;
-
- use vars qw($test_dsn $test_user $test_password);
--require "t/lib.pl";
-+use lib 't', '.';
-+require "lib.pl";
-
- my $INSECURE_VALUE_FROM_USER = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
-
-diff --git a/t/rt75353-innodb-lock-timeout.t b/t/rt75353-innodb-lock-timeout.t
-index 69b740e..41d1b8f 100644
---- a/t/rt75353-innodb-lock-timeout.t
-+++ b/t/rt75353-innodb-lock-timeout.t
-@@ -5,7 +5,8 @@ use Test::More;
- use DBI;
-
- use vars qw($test_dsn $test_user $test_password);
--require "t/lib.pl";
-+use lib 't', '.';
-+require "lib.pl";
-
- my $dbh1 = eval { DBI->connect($test_dsn, $test_user, $test_password, { RaiseError => 1, AutoCommit => 0 }) };
- plan skip_all => "no database connection" if $@ or not $dbh1;
-diff --git a/t/rt83494-quotes-comments.t b/t/rt83494-quotes-comments.t
-index 9df0d90..c42afe4 100644
---- a/t/rt83494-quotes-comments.t
-+++ b/t/rt83494-quotes-comments.t
-@@ -9,7 +9,8 @@ use DBI;
- use Test::More;
-
- use vars qw($test_dsn $test_user $test_password $state);
--require "t/lib.pl";
-+use lib 't', '.';
-+require "lib.pl";
-
- my $dbh;
- eval {$dbh= DBI->connect($test_dsn, $test_user, $test_password,
---
-2.15.1
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-07-10 21:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-07-10 21:16 [gentoo-commits] repo/gentoo:master commit in: dev-perl/DBD-mysql/files/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2019-08-29 9:52 Kent Fredric
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox