New Upstream Snapshot - libdbd-mariadb-perl

Ready changes

Summary

Merged new upstream version: 1.22+git20221206.1.fb28901 (was: 1.22).

Resulting package

Built on 2023-02-08T13:56 (took 7m40s)

The resulting binary packages can be installed (if you have the apt repository enabled) by running one of: 

apt install -t fresh-snapshots libdbd-mariadb-perl-dbgsymapt install -t fresh-snapshots libdbd-mariadb-perl

Lintian Result

Diff

diff --git a/Changes b/Changes
index f7e440f..33179f8 100644
--- a/Changes
+++ b/Changes
@@ -1,7 +1,7 @@
 1.22 2022-04-22
  - Disable usage of libmysqld.a from MySQL 8.x series
  - Install README.pod into DBD/MariaDB/ subdirectory
-   (https://github.com/gooddata/DBD-MariaDB/issues/146)
+   (https://github.com/perl5-dbi/DBD-MariaDB/issues/146)
  - Do not export driver private C functions
  - Fix typo in error message
  - Fix compatibility with new MariaDB client and server versions
@@ -12,7 +12,7 @@
 1.21 2019-02-27
  - Fix skipping test t/14destruct.t
  - Revert "MySQL bug #93276 is fixed in 8.0.15"
-   (https://github.com/gooddata/DBD-MariaDB/issues/137)
+   (https://github.com/perl5-dbi/DBD-MariaDB/issues/137)
 
 1.20 2019-02-22
  - Fix compilation on Windows
@@ -21,7 +21,7 @@
  - Cover a protocol design error for multi result statements
  - Fix $dbh->last_insert_id for async calls and multi result statements
  - Add more robust solution to prevent deinitializing OpenSSL functions
-   (https://github.com/gooddata/DBD-MariaDB/issues/119)
+   (https://github.com/perl5-dbi/DBD-MariaDB/issues/119)
  - Set $sth->{Active} to off after fetching all data
    (https://github.com/jhthorsen/mojo-mysql/pull/47#issuecomment-448095164)
  - Fix $sth->rows for async, multi results and when error occurred
@@ -30,12 +30,12 @@
 
 1.11 2019-01-02
  - Fix breakage of Net::SSLeay / OpenSSL library after DBI disconnect
-   (https://github.com/gooddata/DBD-MariaDB/issues/119)
+   (https://github.com/perl5-dbi/DBD-MariaDB/issues/119)
 
 1.10 2018-12-05
- - Fix spelling error (https://github.com/gooddata/DBD-MariaDB/issues/82)
- - Fix MinGW build (https://github.com/gooddata/DBD-MariaDB/issues/91)
- - Fix DBI SQL types (https://github.com/gooddata/DBD-MariaDB/issues/109)
+ - Fix spelling error (https://github.com/perl5-dbi/DBD-MariaDB/issues/82)
+ - Fix MinGW build (https://github.com/perl5-dbi/DBD-MariaDB/issues/91)
+ - Fix DBI SQL types (https://github.com/perl5-dbi/DBD-MariaDB/issues/109)
  - Fix overflow in mariadb_thread_id and mariadb_warning_count attributes
  - Fix parsing LIMIT keyword (case-insensitive + allow whitespaces around)
  - Fix allocating and releasing memory when using Embedded Server
@@ -141,7 +141,7 @@
 
  [7. List of fixed issues]
  - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=866821#17
- - https://github.com/gooddata/DBD-MariaDB/issues/13
+ - https://github.com/perl5-dbi/DBD-MariaDB/issues/13
  - https://github.com/perl5-dbi/DBD-mysql/issues/78
  - https://github.com/perl5-dbi/DBD-mysql/issues/110
  - https://github.com/perl5-dbi/DBD-mysql/issues/120
diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
index 374e437..60f43b7 100644
--- a/MANIFEST.SKIP
+++ b/MANIFEST.SKIP
@@ -12,8 +12,7 @@
 ^\.git/.*$
 ^\.gitignore$
 ^\.mailmap$
-^\.travis\.yml$
-^appveyor\.yml$
+^\.appveyor\.yml$
 ^blib/.*$
 ^dll\.base$
 ^dll\.exp$
diff --git a/META.json b/META.json
index 40024ea..f74ae38 100644
--- a/META.json
+++ b/META.json
@@ -4,7 +4,7 @@
       "Pali <pali@cpan.org>"
    ],
    "dynamic_config" : 0,
-   "generated_by" : "ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version 2.150010",
+   "generated_by" : "ExtUtils::MakeMaker version 7.64, CPAN::Meta::Converter version 2.150010",
    "license" : [
       "perl_5"
    ],
@@ -83,16 +83,16 @@
    "release_status" : "stable",
    "resources" : {
       "bugtracker" : {
-         "web" : "https://github.com/gooddata/DBD-MariaDB/issues"
+         "web" : "https://github.com/perl5-dbi/DBD-MariaDB/issues"
       },
-      "homepage" : "https://github.com/gooddata/DBD-MariaDB",
+      "homepage" : "https://github.com/perl5-dbi/DBD-MariaDB",
       "license" : [
          "http://dev.perl.org/licenses/"
       ],
       "repository" : {
          "type" : "git",
-         "url" : "git://github.com/gooddata/DBD-MariaDB.git",
-         "web" : "https://github.com/gooddata/DBD-MariaDB"
+         "url" : "https://github.com/perl5-dbi/DBD-MariaDB.git",
+         "web" : "https://github.com/perl5-dbi/DBD-MariaDB"
       },
       "x_IRC" : "irc://irc.perl.org/#dbi",
       "x_MailingList" : "mailto:dbi-dev@perl.org"
@@ -161,5 +161,5 @@
       "zefram <zefram@fysh.org>",
       "zentooo <ankerasoy@gmail.com>"
    ],
-   "x_serialization_backend" : "JSON::PP version 2.97001"
+   "x_serialization_backend" : "JSON::PP version 4.07"
 }
diff --git a/META.yml b/META.yml
index bfbb612..09c05c8 100644
--- a/META.yml
+++ b/META.yml
@@ -32,7 +32,7 @@ configure_requires:
   utf8: '0'
   warnings: '0'
 dynamic_config: 0
-generated_by: 'ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version 2.150010'
+generated_by: 'ExtUtils::MakeMaker version 7.64, CPAN::Meta::Converter version 2.150010'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -51,10 +51,10 @@ requires:
 resources:
   IRC: irc://irc.perl.org/#dbi
   MailingList: mailto:dbi-dev@perl.org
-  bugtracker: https://github.com/gooddata/DBD-MariaDB/issues
-  homepage: https://github.com/gooddata/DBD-MariaDB
+  bugtracker: https://github.com/perl5-dbi/DBD-MariaDB/issues
+  homepage: https://github.com/perl5-dbi/DBD-MariaDB
   license: http://dev.perl.org/licenses/
-  repository: git://github.com/gooddata/DBD-MariaDB.git
+  repository: https://github.com/perl5-dbi/DBD-MariaDB.git
 version: '1.22'
 x_contributors:
   - 'Alexandr Ciornii <alexchorny@gmail.com>'
diff --git a/Makefile.PL b/Makefile.PL
index f28a8df..bfb8f46 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -285,7 +285,7 @@ my $have_deinitialize_ssl = check_lib(
 );
 
 # Check if mysql_server_end() deinitialize OpenSSL library functions
-# See: https://github.com/gooddata/DBD-MariaDB/issues/119
+# See: https://github.com/perl5-dbi/DBD-MariaDB/issues/119
 my $have_problem_with_openssl = !check_lib(
   LIBS => (join ' ', @libdirs, $main_lib),
   ccflags => $opt->{cflags},
@@ -480,16 +480,16 @@ if (eval { ExtUtils::MakeMaker->VERSION(5.43) }) {
       dynamic_config => 0,
       resources => {
         repository  => {
-          url  => 'git://github.com/gooddata/DBD-MariaDB.git',
-          web  => 'https://github.com/gooddata/DBD-MariaDB',
+          url  => 'https://github.com/perl5-dbi/DBD-MariaDB.git',
+          web  => 'https://github.com/perl5-dbi/DBD-MariaDB',
           type => 'git',
         },
         bugtracker => {
-          web  => 'https://github.com/gooddata/DBD-MariaDB/issues',
+          web  => 'https://github.com/perl5-dbi/DBD-MariaDB/issues',
         },
         x_MailingList => 'mailto:dbi-dev@perl.org',
         license     => [ 'http://dev.perl.org/licenses/' ],
-        homepage    => 'https://github.com/gooddata/DBD-MariaDB',
+        homepage    => 'https://github.com/perl5-dbi/DBD-MariaDB',
         x_IRC       => 'irc://irc.perl.org/#dbi',
       },
       x_contributors => [
diff --git a/MariaDB.xs b/MariaDB.xs
index 7758fd7..933dd1d 100644
--- a/MariaDB.xs
+++ b/MariaDB.xs
@@ -1,7 +1,7 @@
 /* Hej, Emacs, this is -*- C -*- mode!
 
    Copyright (c) 2018      GoodData Corporation
-   Copyright (c) 2015-2017 Pali Rohár
+   Copyright (c) 2015-2022 Pali Rohár
    Copyright (c) 2004-2017 Patrick Galbraith
    Copyright (c) 2013-2017 Michiel Beijen
    Copyright (c) 2004-2007 Alexey Stroganov
@@ -65,7 +65,7 @@ BOOT:
 #undef newTypeSub
 #if defined(HAVE_DEINITIALIZE_SSL) && defined(HAVE_PROBLEM_WITH_OPENSSL)
   /* Do not deinitialize OpenSSL library after mysql_server_end()
-   * See: https://github.com/gooddata/DBD-MariaDB/issues/119 */
+   * See: https://github.com/perl5-dbi/DBD-MariaDB/issues/119 */
   mariadb_deinitialize_ssl = 0;
 #endif
 #ifndef _WIN32
diff --git a/README.pod b/README.pod
index ca40a70..e17be01 100644
--- a/README.pod
+++ b/README.pod
@@ -3,11 +3,8 @@
 =begin html
 
 <p>
-<a href="https://travis-ci.org/gooddata/DBD-MariaDB/branches">
-<img src="https://travis-ci.org/gooddata/DBD-MariaDB.svg?branch=master"
-  alt="Travis CI Build Status"></a>
-<a href="https://ci.appveyor.com/project/gooddata/dbd-mariadb/branch/master">
-<img src="https://ci.appveyor.com/api/projects/status/github/gooddata/dbd-mariadb?branch=master&amp;svg=true"
+<a href="https://ci.appveyor.com/project/perl5-dbi/dbd-mariadb/branch/master">
+<img src="https://ci.appveyor.com/api/projects/status/github/perl5-dbi/dbd-mariadb?branch=master&amp;svg=true"
   alt="AppVeyor Build Status"></a>
 </p>
 
diff --git a/dbdimp.c b/dbdimp.c
index 433a1c0..7f50050 100644
--- a/dbdimp.c
+++ b/dbdimp.c
@@ -2,7 +2,7 @@
  *  DBD::MariaDB - DBI driver for the MariaDB and MySQL database
  *
  *  Copyright (c) 2018      GoodData Corporation
- *  Copyright (c) 2015-2017 Pali Rohár
+ *  Copyright (c) 2015-2022 Pali Rohár
  *  Copyright (c) 2004-2017 Patrick Galbraith
  *  Copyright (c) 2013-2017 Michiel Beijen 
  *  Copyright (c) 2004-2007 Alexey Stroganov 
@@ -4802,6 +4802,7 @@ static int mariadb_st_describe(SV* sth, imp_sth_t* imp_sth)
       case MYSQL_TYPE_NULL:
         buffer->buffer_length= 0;
         buffer->buffer= NULL;
+        break;
 
       case MYSQL_TYPE_TINY:
         buffer->buffer_length= sizeof(fbh->numeric_val.tval);
@@ -5378,8 +5379,10 @@ int mariadb_st_finish(SV* sth, imp_sth_t* imp_sth) {
   D_imp_xxh(sth);
   D_imp_dbh_from_sth;
 
-  if(imp_dbh->async_query_in_flight) {
-    mariadb_db_async_result(sth, &imp_sth->result);
+  if (imp_dbh->async_query_in_flight)
+  {
+    if (mariadb_db_async_result(sth, &imp_sth->result) == (my_ulonglong)-1)
+      return 0;
   }
 
   if (DBIc_TRACE_LEVEL(imp_xxh) >= 2)
diff --git a/debian/changelog b/debian/changelog
index 641e409..dbf2627 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdbd-mariadb-perl (1.22+git20221206.1.fb28901-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Wed, 08 Feb 2023 13:49:19 -0000
+
 libdbd-mariadb-perl (1.22-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/fix-mysql-8.0.22.patch b/debian/patches/fix-mysql-8.0.22.patch
index bc0bb51..45786d0 100644
--- a/debian/patches/fix-mysql-8.0.22.patch
+++ b/debian/patches/fix-mysql-8.0.22.patch
@@ -3,8 +3,10 @@ Bug: https://github.com/gooddata/DBD-MariaDB/issues/160
 Author: Dimitri John Ledkov <xnox@ubuntu.com>
 Bug-Debian: https://bugs.debian.org/980640
 
---- libdbd-mariadb-perl-1.21.orig/t/rt122541-decimals.t
-+++ libdbd-mariadb-perl-1.21/t/rt122541-decimals.t
+Index: libdbd-mariadb-perl.git/t/rt122541-decimals.t
+===================================================================
+--- libdbd-mariadb-perl.git.orig/t/rt122541-decimals.t
++++ libdbd-mariadb-perl.git/t/rt122541-decimals.t
 @@ -14,6 +14,6 @@ plan tests => 2;
  
  for my $mariadb_server_prepare (0, 1) {
diff --git a/lib/DBD/MariaDB.pod b/lib/DBD/MariaDB.pod
index ea4d505..daa1d5b 100644
--- a/lib/DBD/MariaDB.pod
+++ b/lib/DBD/MariaDB.pod
@@ -1333,15 +1333,16 @@ Since 2004 DBD::mysql has been maintained by Patrick Galbraith
 developers who keep sending patches to help continue improving DBD::mysql.
 
 In 2018 unreleased version 4.042_01 of DBD::mysql was forked and DBD::MariaDB
-was created to fix long standing Unicode bugs and MariaDB support. Currently it
-is developed in GoodData and maintained by Pali (I<pali@cpan.org>).
+was created to fix long standing Unicode bugs and MariaDB support. Development
+at that time was supported by GoodData. Currently it is hosted on Github as
+part of the big perl5-dbi project and maintained by Pali (I<pali@cpan.org>).
 
 =head1 CONTRIBUTIONS
 
 Anyone who desires to contribute to this project is encouraged to do so.
 Currently, the source code for this project can be found at Github:
 
-L<https://github.com/gooddata/DBD-MariaDB>
+L<https://github.com/perl5-dbi/DBD-MariaDB>
 
 Either fork this repository and produce a branch with your changeset that the
 maintainer can merge to his tree, or create a diff with git. The maintainer is
@@ -1360,7 +1361,7 @@ Large Portions Copyright (c) 2018 GoodData Corporation
 
 =item *
 
-Large Portions Copyright (c) 2015-2017 Pali Rohár
+Large Portions Copyright (c) 2015-2022 Pali Rohár
 
 =item *
 
@@ -1430,7 +1431,7 @@ Information on DBD::MariaDB specifically can be gained by typing:
 Please report bugs, including all the information needed such as DBD::MariaDB
 version, MariaDB/MySQL version, OS type/version, etc to this link:
 
-L<https://github.com/gooddata/DBD-MariaDB/issues>
+L<https://github.com/perl5-dbi/DBD-MariaDB/issues>
 
 In past for DBD::mysql, MySQL/Sun/Oracle responded to bugs and assisted in
 fixing bugs which many thanks should be given for their help! This driver is
diff --git a/t/40types.t b/t/40types.t
index 197d194..8d8cc0f 100644
--- a/t/40types.t
+++ b/t/40types.t
@@ -160,7 +160,7 @@ is_deeply($sth->{mariadb_type}, [ DBD::MariaDB::TYPE_LONG ], "checking mariadb c
 
 ok($dbh->do(qq{DROP TABLE t_dbd_40types}), "cleaning up");
 
-# https://github.com/gooddata/DBD-MariaDB/issues/109: Check DBI::SQL_BIGINT type
+# https://github.com/perl5-dbi/DBD-MariaDB/issues/109: Check DBI::SQL_BIGINT type
 ok($dbh->do(qq{CREATE TABLE t_dbd_40types (num BIGINT)}), "creating table for bigint");
 $sth = $dbh->prepare("SELECT * FROM t_dbd_40types");
 ok($sth->execute());

Debdiff

[The following lists of changes regard files as different if they have different names, permissions or owners.]

Files in second set of .debs but not in first

-rw-r--r--  root/root   /usr/lib/debug/.build-id/c9/e9f48989e258178397eb295456d92a1cb0f631.debug

Files in first set of .debs but not in second

-rw-r--r--  root/root   /usr/lib/debug/.build-id/52/0e0dfeab2fd5871deb31f38e84f106f2e441ab.debug

No differences were encountered between the control files of package libdbd-mariadb-perl

Control files of package libdbd-mariadb-perl-dbgsym: lines which differ (wdiff format)

  • Build-Ids: 520e0dfeab2fd5871deb31f38e84f106f2e441ab c9e9f48989e258178397eb295456d92a1cb0f631

More details

Full run details

© 2018-2023 Jelmer Vernooij. File a bug. Source code. Published under the GNU GPLv2 or later.