dev-perl/DBIx-SearchBuilder: Bump to version 1.680.0

- EAPI7
- Unconditionally remove bad tests
- Rework patch for 'no-dot-inc' as this version fixes it, but only in
  Makefile.PL, the tests are still broken upstream.

Upstream:
- Avoid segfaults at disconnect with MariaDB 10.2+ and DBD::mysql
  ( not actually a bug in this code, but a guard against bugs in
    DBD::mysql / consuming code using an expired database connection,
    indirectly, through this module )
- Fix Makefile.PL for '.'-in-inc

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Kent Fredric <kentnl@gentoo.org>
This commit is contained in:
Kent Fredric
2020-07-15 07:29:40 +12:00
parent f8874cc4fc
commit 0f85ff5206
3 changed files with 376 additions and 0 deletions

View File

@@ -0,0 +1,44 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DIST_AUTHOR=BPS
DIST_VERSION=1.68
DIST_EXAMPLES=("ex/*")
inherit perl-module
DESCRIPTION="Encapsulate SQL queries and rows in simple Perl objects"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~ppc ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND="
>=dev-perl/Cache-Simple-TimedExpiry-0.210.0
dev-perl/Class-Accessor
>=dev-perl/Class-ReturnValue-0.400.0
dev-perl/Clone
dev-perl/DBI
dev-perl/DBIx-DBSchema
>=virtual/perl-Encode-1.990.0
virtual/perl-Scalar-List-Utils
dev-perl/Want
>=dev-perl/capitalization-0.30.0
"
BDEPEND="${RDEPEND}
>=virtual/perl-ExtUtils-MakeMaker-6.360.0
test? (
>=virtual/perl-Test-Simple-0.520.0
dev-perl/DBD-SQLite
virtual/perl-File-Temp
)
"
PATCHES=(
"${FILESDIR}/${PN}-1.68-no-dot-inc.patch"
)
PERL_RM_FILES=(
t/pod.t
)

View File

@@ -1 +1,2 @@
DIST DBIx-SearchBuilder-1.67.tar.gz 115193 BLAKE2B 9ad670069826d0cc109e61834d425f5c2fc29d7709f36f73a23820636b8bed3ac45b563df115b8a5448014672a5b68db2183ca7180eee590aff6ed388715dca0 SHA512 8cade12f01da749356a3c1b167f46e0377934e01832548baebfa629e71c3199ce473a63077ee5ac5ed58f805f7cb883bd8d0886d2ecf27f4740eafbb30f91bae
DIST DBIx-SearchBuilder-1.68.tar.gz 115423 BLAKE2B c7d3b2efb3398d74fa755e3e3a177e413164f7675af912664e1a42a32547f3ab0cd8b5f638397ec0383e463c8c57702e69afd46e94231c3a15930e5c1749fa63 SHA512 5495dcc5ff23c01e4fd917802243a30d94d6a2fdce6f6e761f0eb2df765c9bfa0ba6065bd10b961c61b22483ca2ef08e958fe6aa1dbf20a85cd9aa9d97cf19ee

View File

@@ -0,0 +1,331 @@
From 7557bad8ff9ce5d17b15b5bdf81a03f1fde7a248 Mon Sep 17 00:00:00 2001
From: Kent Fredric <kentfredric@gmail.com>
Date: Sun, 25 Jun 2017 19:16:42 +1200
Subject: Fix for '.' removal from @INC in Perl 5.26
Bug: https://rt.cpan.org/Ticket/Display.html?id=121140
Bug: https://bugs.gentoo.org/615602
Bug: https://github.com/bestpractical/dbix-searchbuilder/pull/5
---
t/01basics.t | 2 +-
t/01nocap_api.t | 2 +-
t/01records.t | 2 +-
t/01searches.t | 2 +-
t/02distinct_values.t | 2 +-
t/02null_order.t | 2 +-
t/02order_outer.t | 2 +-
t/02records_cachable.t | 2 +-
t/02records_datetime.t | 2 +-
t/02records_dt_interval.t | 2 +-
t/02records_integers.t | 2 +-
t/02records_object.t | 2 +-
t/02searches_function.t | 2 +-
t/02searches_joins.t | 2 +-
t/03compatibility.t | 2 +-
t/03cud_from_select.t | 2 +-
t/03rebless.t | 2 +-
t/03transactions.t | 2 +-
t/03versions.t | 2 +-
t/10schema.t | 4 ++--
t/11schema_records.t | 2 +-
t/20set_edge_cases.t | 2 +-
22 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/t/01basics.t b/t/01basics.t
index a46ede6..f0c18df 100644
--- a/t/01basics.t
+++ b/t/01basics.t
@@ -3,7 +3,7 @@
use strict;
use Test::More;
-BEGIN { require "t/utils.pl" }
+BEGIN { require "./t/utils.pl" }
our (@AvailableDrivers);
use constant TESTS_PER_DRIVER => 4;
diff --git a/t/01nocap_api.t b/t/01nocap_api.t
index 1ea417e..be45395 100644
--- a/t/01nocap_api.t
+++ b/t/01nocap_api.t
@@ -3,7 +3,7 @@
use strict;
use Test::More;
-BEGIN { require "t/utils.pl" }
+BEGIN { require "./t/utils.pl" }
use vars qw(@SPEC_METHODS @MODULES);
my @SPEC_METHODS = qw(AUTOLOAD DESTROY CLONE);
diff --git a/t/01records.t b/t/01records.t
index a1f1366..d701e94 100644
--- a/t/01records.t
+++ b/t/01records.t
@@ -4,7 +4,7 @@
use strict;
use warnings;
use Test::More;
-BEGIN { require "t/utils.pl" }
+BEGIN { require "./t/utils.pl" }
our (@AvailableDrivers);
use constant TESTS_PER_DRIVER => 66;
diff --git a/t/01searches.t b/t/01searches.t
index 83a2001..1276544 100644
--- a/t/01searches.t
+++ b/t/01searches.t
@@ -4,7 +4,7 @@
use strict;
use warnings;
use Test::More;
-BEGIN { require "t/utils.pl" }
+BEGIN { require "./t/utils.pl" }
our (@AvailableDrivers);
use constant TESTS_PER_DRIVER => 150;
diff --git a/t/02distinct_values.t b/t/02distinct_values.t
index f20328d..826db21 100644
--- a/t/02distinct_values.t
+++ b/t/02distinct_values.t
@@ -4,7 +4,7 @@
use strict;
use warnings;
use Test::More;
-BEGIN { require "t/utils.pl" }
+BEGIN { require "./t/utils.pl" }
our (@AvailableDrivers);
use constant TESTS_PER_DRIVER => 9;
diff --git a/t/02null_order.t b/t/02null_order.t
index 9feda47..fab111d 100644
--- a/t/02null_order.t
+++ b/t/02null_order.t
@@ -4,7 +4,7 @@
use strict;
use warnings;
use Test::More;
-BEGIN { require "t/utils.pl" }
+BEGIN { require "./t/utils.pl" }
our (@AvailableDrivers);
use constant TESTS_PER_DRIVER => 11;
diff --git a/t/02order_outer.t b/t/02order_outer.t
index 08a236b..14a39fe 100644
--- a/t/02order_outer.t
+++ b/t/02order_outer.t
@@ -4,7 +4,7 @@
use strict;
use warnings;
use Test::More;
-BEGIN { require "t/utils.pl" }
+BEGIN { require "./t/utils.pl" }
our (@AvailableDrivers);
use constant TESTS_PER_DRIVER => 98;
diff --git a/t/02records_cachable.t b/t/02records_cachable.t
index cdbb9da..9418990 100644
--- a/t/02records_cachable.t
+++ b/t/02records_cachable.t
@@ -4,7 +4,7 @@
use strict;
use warnings;
use Test::More;
-BEGIN { require "t/utils.pl" }
+BEGIN { require "./t/utils.pl" }
our (@AvailableDrivers);
use constant TESTS_PER_DRIVER => 16;
diff --git a/t/02records_datetime.t b/t/02records_datetime.t
index f1a0d7a..6882729 100644
--- a/t/02records_datetime.t
+++ b/t/02records_datetime.t
@@ -5,7 +5,7 @@ BEGIN { $ENV{'TZ'} = 'Europe/Moscow' };
use strict;
use warnings;
use Test::More;
-BEGIN { require "t/utils.pl" }
+BEGIN { require "./t/utils.pl" }
our (@AvailableDrivers);
use constant TESTS_PER_DRIVER => 38;
diff --git a/t/02records_dt_interval.t b/t/02records_dt_interval.t
index ef1ead3..283746f 100644
--- a/t/02records_dt_interval.t
+++ b/t/02records_dt_interval.t
@@ -5,7 +5,7 @@ BEGIN { $ENV{'TZ'} = 'Europe/Moscow' };
use strict;
use warnings;
use Test::More;
-BEGIN { require "t/utils.pl" }
+BEGIN { require "./t/utils.pl" }
our (@AvailableDrivers);
use constant TESTS_PER_DRIVER => 17;
diff --git a/t/02records_integers.t b/t/02records_integers.t
index d13e2ee..95b8504 100644
--- a/t/02records_integers.t
+++ b/t/02records_integers.t
@@ -3,7 +3,7 @@
use strict;
use warnings;
use Test::More;
-BEGIN { require "t/utils.pl" }
+BEGIN { require "./t/utils.pl" }
our (@AvailableDrivers);
use constant TESTS_PER_DRIVER => 37;
diff --git a/t/02records_object.t b/t/02records_object.t
index 18c724e..34576db 100644
--- a/t/02records_object.t
+++ b/t/02records_object.t
@@ -5,7 +5,7 @@ use strict;
use warnings;
use Test::More;
-BEGIN { require "t/utils.pl" }
+BEGIN { require "./t/utils.pl" }
our (@AvailableDrivers);
use constant TESTS_PER_DRIVER => 11;
diff --git a/t/02searches_function.t b/t/02searches_function.t
index 2fd6e7e..c8682de 100644
--- a/t/02searches_function.t
+++ b/t/02searches_function.t
@@ -3,7 +3,7 @@
use strict;
use Test::More;
-BEGIN { require "t/utils.pl" }
+BEGIN { require "./t/utils.pl" }
our (@AvailableDrivers);
use constant TESTS_PER_DRIVER => 18;
diff --git a/t/02searches_joins.t b/t/02searches_joins.t
index 1661f2b..cbdc3c9 100644
--- a/t/02searches_joins.t
+++ b/t/02searches_joins.t
@@ -3,7 +3,7 @@
use strict;
use Test::More;
-BEGIN { require "t/utils.pl" }
+BEGIN { require "./t/utils.pl" }
our (@AvailableDrivers);
use constant TESTS_PER_DRIVER => 59;
diff --git a/t/03compatibility.t b/t/03compatibility.t
index 14eb382..3939503 100644
--- a/t/03compatibility.t
+++ b/t/03compatibility.t
@@ -4,7 +4,7 @@
use strict;
use warnings;
use Test::More;
-BEGIN { require "t/utils.pl" }
+BEGIN { require "./t/utils.pl" }
our (@AvailableDrivers);
use constant TESTS_PER_DRIVER => 2;
diff --git a/t/03cud_from_select.t b/t/03cud_from_select.t
index 7f5d21b..2f324b7 100644
--- a/t/03cud_from_select.t
+++ b/t/03cud_from_select.t
@@ -3,7 +3,7 @@
use strict;
use Test::More;
-BEGIN { require "t/utils.pl" }
+BEGIN { require "./t/utils.pl" }
our (@AvailableDrivers);
use constant TESTS_PER_DRIVER => 14;
diff --git a/t/03rebless.t b/t/03rebless.t
index 888bb94..467cf00 100644
--- a/t/03rebless.t
+++ b/t/03rebless.t
@@ -6,7 +6,7 @@ use warnings;
use Test::More;
use DBIx::SearchBuilder::Handle;
-BEGIN { require "t/utils.pl" }
+BEGIN { require "./t/utils.pl" }
our (@AvailableDrivers);
use constant TESTS_PER_DRIVER => 4;
diff --git a/t/03transactions.t b/t/03transactions.t
index e641c19..ef0f973 100644
--- a/t/03transactions.t
+++ b/t/03transactions.t
@@ -4,7 +4,7 @@
use strict;
use warnings;
use Test::More;
-BEGIN { require "t/utils.pl" }
+BEGIN { require "./t/utils.pl" }
our (@AvailableDrivers);
use constant TESTS_PER_DRIVER => 52;
diff --git a/t/03versions.t b/t/03versions.t
index 79bb2e9..4acba37 100644
--- a/t/03versions.t
+++ b/t/03versions.t
@@ -5,7 +5,7 @@ use warnings;
use Test::More;
use DBIx::SearchBuilder::Handle;
-BEGIN { require "t/utils.pl" }
+BEGIN { require "./t/utils.pl" }
our (@AvailableDrivers);
use constant TESTS_PER_DRIVER => 6;
diff --git a/t/10schema.t b/t/10schema.t
index 2ff5ab6..fcf1a7b 100644
--- a/t/10schema.t
+++ b/t/10schema.t
@@ -8,7 +8,7 @@ use constant TESTS_PER_DRIVER => 14;
our @AvailableDrivers;
BEGIN {
- require("t/utils.pl");
+ require("./t/utils.pl");
my $total = 3 + scalar(@AvailableDrivers) * TESTS_PER_DRIVER;
if( not eval { require DBIx::DBSchema } ) {
plan skip_all => "DBIx::DBSchema not installed";
@@ -22,7 +22,7 @@ BEGIN {
use_ok("DBIx::SearchBuilder::Handle");
}
-require_ok("t/testmodels.pl");
+require_ok("./t/testmodels.pl");
foreach my $d ( @AvailableDrivers ) {
SKIP: {
diff --git a/t/11schema_records.t b/t/11schema_records.t
index 4fc4dc4..a586cda 100644
--- a/t/11schema_records.t
+++ b/t/11schema_records.t
@@ -5,7 +5,7 @@ use strict;
use warnings;
use Test::More;
-BEGIN { require "t/utils.pl" }
+BEGIN { require "./t/utils.pl" }
our (@AvailableDrivers);
use constant TESTS_PER_DRIVER => 63;
diff --git a/t/20set_edge_cases.t b/t/20set_edge_cases.t
index 943f76a..d22b1ee 100644
--- a/t/20set_edge_cases.t
+++ b/t/20set_edge_cases.t
@@ -3,7 +3,7 @@
use strict;
use warnings;
use Test::More;
-BEGIN { require "t/utils.pl" }
+BEGIN { require "./t/utils.pl" }
our (@AvailableDrivers);
use constant TESTS_PER_DRIVER => 20;
--
2.27.0