From 75937fc235873abcb8179d18cb05ae581dae3603 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Feb 11 2018 07:46:11 +0000 Subject: Apply Debian patch to adjust tests to SQLite 3.22.0 --- diff --git a/perl-CGI-Application-Plugin-Authentication.spec b/perl-CGI-Application-Plugin-Authentication.spec index abddfe4..eecac8d 100644 --- a/perl-CGI-Application-Plugin-Authentication.spec +++ b/perl-CGI-Application-Plugin-Authentication.spec @@ -1,11 +1,13 @@ Name: perl-CGI-Application-Plugin-Authentication Version: 0.22 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Authentication framework for CGI::Application License: GPL+ or Artistic URL: http://search.cpan.org/dist/CGI-Application-Plugin-Authentication/ Source0: http://www.cpan.org/authors/id/W/WE/WESM/CGI-Application-Plugin-Authentication-%{version}.tar.gz +# https://github.com/cees/cgi-application-plugin-authentication/pull/4 +Patch0: sqlite3-3.22.0.patch BuildArch: noarch BuildRequires: findutils @@ -63,6 +65,7 @@ CGI::Application::Plugin::Authentication plugin. %prep %setup -q -n CGI-Application-Plugin-Authentication-%{version} +%patch0 -p1 %build %{__perl} Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 @@ -81,6 +84,9 @@ make test %{_mandir}/man3/* %changelog +* Sun Feb 11 2018 Emmanuel Seyman - 0.22-2 +- Apply Debian patch to adjust tests to SQLite 3.22.0 (#1543899) + * Thu Feb 08 2018 Emmanuel Seyman - 0.22-1 - Update to 0.22 diff --git a/sqlite3-3.22.0.patch b/sqlite3-3.22.0.patch new file mode 100644 index 0000000..4616474 --- /dev/null +++ b/sqlite3-3.22.0.patch @@ -0,0 +1,21 @@ +Description: Adjust tests to SQLite 3.22.0 which outputs a different error message. +Origin: vendor +Author: gregor herrmann +Last-Update: 2018-01-31 +Forwarded: https://github.com/cees/cgi-application-plugin-authentication/pull/4 +Bug: https://github.com/cees/cgi-application-plugin-authentication/pull/4 + +--- a/t/53_driver_dbi_bad.t ++++ b/t/53_driver_dbi_bad.t +@@ -98,9 +98,9 @@ + [ 'user1', '123' ], + [ 'user2', '123' ], + );} +- qr/Error executing class callback in prerun stage: Failed to prepare SQL statement: near " "/, ++ qr/Error executing class callback in prerun stage: Failed to prepare SQL statement: (near " "|incomplete input)/, + "DBI syntax error";} +- qr/DBD::SQLite::db prepare_cached failed: near " ": syntax error/, "DBD:SQLite"; ++ qr/DBD::SQLite::db prepare_cached failed: (near " ": syntax error|incomplete input)/, "DBD:SQLite"; + } + + {