From fbfa828ed8fbc0bcfcb693bd8353d65b23eeec2c Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 26 Apr 2019 11:41:53 +0200 Subject: [PATCH] 3.8.0 bump --- .gitignore | 1 + ...essages-FATAL-test-on-upcoming-Postg.patch | 50 ------------------- DBD-Pg-3.8.0-Fix-char-type-in-dbdimp.patch | 12 +++++ perl-DBD-Pg.spec | 13 +++-- sources | 2 +- 5 files changed, 22 insertions(+), 56 deletions(-) delete mode 100644 DBD-Pg-3.7.4-Fix-client_min_messages-FATAL-test-on-upcoming-Postg.patch create mode 100644 DBD-Pg-3.8.0-Fix-char-type-in-dbdimp.patch diff --git a/.gitignore b/.gitignore index 42dbef0..c034881 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ DBD-Pg-2.17.1.tar.gz /DBD-Pg-3.7.0.tar.gz /DBD-Pg-3.7.1.tar.gz /DBD-Pg-3.7.4.tar.gz +/DBD-Pg-3.8.0.tar.gz diff --git a/DBD-Pg-3.7.4-Fix-client_min_messages-FATAL-test-on-upcoming-Postg.patch b/DBD-Pg-3.7.4-Fix-client_min_messages-FATAL-test-on-upcoming-Postg.patch deleted file mode 100644 index b083ec2..0000000 --- a/DBD-Pg-3.7.4-Fix-client_min_messages-FATAL-test-on-upcoming-Postg.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 2b60151aea6f03ac7e846aae0d21e7f335cad99c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dagfinn=20Ilmari=20Manns=C3=A5ker?= -Date: Wed, 9 Jan 2019 21:24:09 +0000 -Subject: [PATCH] Fix client_min_messages=FATAL test on upcoming PostgreSQL - releases - -The upcoming minor releases of PostgreSQL cap client_min_messages to -ERROR to avoid the case this test was testing for. Skip the test if -client_min_messages doesn't come back as 'fatal' after we set it. ---- - t/02attribs.t | 23 ++++++++++++++--------- - 1 file changed, 14 insertions(+), 9 deletions(-) - -diff --git a/t/02attribs.t b/t/02attribs.t -index b9ecd90..75e8f48 100644 ---- a/t/02attribs.t -+++ b/t/02attribs.t -@@ -1204,15 +1204,20 @@ $sth->execute(); - is ($warning, undef, $t); - - ## Special case in which errors are not sent to the client! --$t = q{When client_min_messages is FATAL, we do our best to alert the caller it's a Bad Idea}; --$dbh->do(q{SET client_min_messages = 'FATAL'}); --$dbh->{RaiseError} = 0; --$dbh->{AutoCommit} = 1; --eval { -- $dbh->do('SELECT 1 FROM nonesuh'); --}; --my $errorstring = $dbh->errstr; --like ( $errorstring, qr/Perhaps client_min_messages/, $t); -+SKIP: { -+ $t = q{When client_min_messages is FATAL, we do our best to alert the caller it's a Bad Idea}; -+ $dbh->do(q{SET client_min_messages = 'FATAL'}); -+ skip "This version of PostgreSQL caps client_min_messages to ERROR", 1 -+ unless $dbh->selectrow_array('SHOW client_min_messages') eq 'fatal'; -+ -+ $dbh->{RaiseError} = 0; -+ $dbh->{AutoCommit} = 1; -+ eval { -+ $dbh->do('SELECT 1 FROM nonesuh'); -+ }; -+ my $errorstring = $dbh->errstr; -+ like ( $errorstring, qr/Perhaps client_min_messages/, $t); -+} - $dbh->rollback(); - $dbh->do(q{SET client_min_message = 'NOTICE'}); - $dbh->{RaiseError} = 1; --- -2.20.1 - diff --git a/DBD-Pg-3.8.0-Fix-char-type-in-dbdimp.patch b/DBD-Pg-3.8.0-Fix-char-type-in-dbdimp.patch new file mode 100644 index 0000000..4f626cc --- /dev/null +++ b/DBD-Pg-3.8.0-Fix-char-type-in-dbdimp.patch @@ -0,0 +1,12 @@ +diff -up DBD-Pg-3.8.0/dbdimp.c.orig DBD-Pg-3.8.0/dbdimp.c +--- DBD-Pg-3.8.0/dbdimp.c.orig 2019-04-26 10:50:16.135755577 +0200 ++++ DBD-Pg-3.8.0/dbdimp.c 2019-04-26 10:51:04.838602567 +0200 +@@ -1708,7 +1708,7 @@ static void pg_st_split_statement (pTHX_ + + unsigned char oldch; /* The previous character */ + +- char non_standard_strings = -1; /* Status 0=standard 1=non_standard -1=unknown */ ++ signed char non_standard_strings = -1; /* Status 0=standard 1=non_standard -1=unknown */ + + int xint; + diff --git a/perl-DBD-Pg.spec b/perl-DBD-Pg.spec index f3a6766..0665a20 100644 --- a/perl-DBD-Pg.spec +++ b/perl-DBD-Pg.spec @@ -1,15 +1,15 @@ Name: perl-DBD-Pg Summary: A PostgreSQL interface for perl -Version: 3.7.4 -Release: 6%{?dist} +Version: 3.8.0 +Release: 1%{?dist} # Pg.pm, README: Points to directory which contains GPLv2+ and Artistic # other files: Same as Perl (GPL+ or Artistic) License: GPLv2+ or Artistic Source0: https://cpan.metacpan.org/authors/id/T/TU/TURNSTEP/DBD-Pg-%{version}.tar.gz URL: https://metacpan.org/release/DBD-Pg -# Skip the test if client_min_messages doesn't come back as 'fatal' after -# we set it (CPAN RT#128529) -Patch0: DBD-Pg-3.7.4-Fix-client_min_messages-FATAL-test-on-upcoming-Postg.patch +# Changed type of non_standard_strings to 'signed char' to fix build for +# all architectures +Patch0: DBD-Pg-3.8.0-Fix-char-type-in-dbdimp.patch BuildRequires: findutils BuildRequires: gcc @@ -89,6 +89,9 @@ make test %{_mandir}/man3/*.3* %changelog +* Fri Apr 26 2019 Jitka Plesnikova - 3.8.0-1 +- 3.8.0 bump + * Fri Mar 22 2019 Jitka Plesnikova - 3.7.4-6 - Fix failing test (bug #1679574) diff --git a/sources b/sources index 69d9c47..68714c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (DBD-Pg-3.7.4.tar.gz) = 77c629ce89233345f7893b0cc2799a5efc646e86b62ee91986678f196380ac772ece7b9f6c98dae588fbf8f29def1f997335fa85874562ab648af8665cd9add8 +SHA512 (DBD-Pg-3.8.0.tar.gz) = 183404721630074a7c3c5c68e7805cbed6566e51fd92fba4c73a0ca5961f45e791cffa086fc2d465b9b31c6f45f2416397b35f49f33fe852179a583cc18b1fce