diff --git a/.gitignore b/.gitignore index 2defa78..b138d2a 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ DBD-SQLite-1.29.tar.gz /DBD-SQLite-1.66.tar.gz /DBD-SQLite-1.68.tar.gz /DBD-SQLite-1.70.tar.gz +/DBD-SQLite-1.72.tar.gz diff --git a/DBD-SQLite-1.70-Lowercase-datatype.patch b/DBD-SQLite-1.70-Lowercase-datatype.patch deleted file mode 100644 index 58cc155..0000000 --- a/DBD-SQLite-1.70-Lowercase-datatype.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 1fa475684275fb7fb089b2fc84a843d2d16068f0 Mon Sep 17 00:00:00 2001 -From: Kenichi Ishigaki -Date: Sat, 26 Feb 2022 11:20:41 +0900 -Subject: [PATCH] Lowercase datatype -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Petr Písař: Ported to 1.70 from -abc241d7114e3fdf8a2336aef96e290ec6b59a75. - -Signed-off-by: Petr Písař ---- - dbdimp.c | 17 ++++++++++++++++- - 1 file changed, 16 insertions(+), 1 deletion(-) - -diff --git a/dbdimp.c b/dbdimp.c -index ca89c7c..c38600f 100644 ---- a/dbdimp.c -+++ b/dbdimp.c -@@ -1924,6 +1924,21 @@ sqlite_db_load_extension(pTHX_ SV *dbh, const char *file, const char *proc) - - #endif - -+SV* _lc(SV* sv) { -+ int i, l; -+ char* pv; -+ if (SvPOK(sv)) { -+ pv = SvPV_nolen(sv); -+ l = strlen(pv); -+ for(i = 0; i < l; i++) { -+ if (pv[i] >= 'A' && pv[i] <= 'Z') { -+ pv[i] = pv[i] - 'A' + 'a'; -+ } -+ } -+ } -+ return sv; -+} -+ - HV* - sqlite_db_table_column_metadata(pTHX_ SV *dbh, SV *dbname, SV *tablename, SV *columnname) - { -@@ -1960,7 +1975,7 @@ sqlite_db_table_column_metadata(pTHX_ SV *dbh, SV *dbname, SV *tablename, SV *co - #endif - - if (rc == SQLITE_OK) { -- hv_stores(metadata, "data_type", datatype ? newSVpv(datatype, 0) : newSV(0)); -+ hv_stores(metadata, "data_type", datatype ? _lc(newSVpv(datatype, 0)) : newSV(0)); - hv_stores(metadata, "collation_name", collseq ? newSVpv(collseq, 0) : newSV(0)); - hv_stores(metadata, "not_null", newSViv(notnull)); - hv_stores(metadata, "primary", newSViv(primary)); --- -2.34.1 - diff --git a/DBD-SQLite-1.71_04-THX.patch b/DBD-SQLite-1.71_04-THX.patch deleted file mode 100644 index 2333989..0000000 --- a/DBD-SQLite-1.71_04-THX.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b6a4eb43a7ae3e5e6edaf347f91520853f727a24 Mon Sep 17 00:00:00 2001 -From: Kenichi Ishigaki -Date: Sat, 26 Feb 2022 11:28:39 +0900 -Subject: [PATCH 2/2] THX -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Petr Písař ---- - dbdimp.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/dbdimp.c b/dbdimp.c -index 95232b7..2c5b32d 100644 ---- a/dbdimp.c -+++ b/dbdimp.c -@@ -1928,7 +1928,7 @@ sqlite_db_load_extension(pTHX_ SV *dbh, const char *file, const char *proc) - - #endif - --SV* _lc(SV* sv) { -+SV* _lc(pTHX_ SV* sv) { - int i, l; - char* pv; - if (SvPOK(sv)) { -@@ -1979,7 +1979,7 @@ sqlite_db_table_column_metadata(pTHX_ SV *dbh, SV *dbname, SV *tablename, SV *co - #endif - - if (rc == SQLITE_OK) { -- hv_stores(metadata, "data_type", datatype ? _lc(newSVpv(datatype, 0)) : newSV(0)); -+ hv_stores(metadata, "data_type", datatype ? _lc(aTHX_ newSVpv(datatype, 0)) : newSV(0)); - hv_stores(metadata, "collation_name", collseq ? newSVpv(collseq, 0) : newSV(0)); - hv_stores(metadata, "not_null", newSViv(notnull)); - hv_stores(metadata, "primary", newSViv(primary)); --- -2.34.1 - diff --git a/perl-DBD-SQLite.spec b/perl-DBD-SQLite.spec index ffc9aa3..f63cebc 100644 --- a/perl-DBD-SQLite.spec +++ b/perl-DBD-SQLite.spec @@ -2,17 +2,17 @@ %bcond_without perl_DBD_SQLite_enables_optional_test Name: perl-DBD-SQLite -Version: 1.70 -Release: 5%{?dist} +Version: 1.72 +Release: 1%{?dist} Summary: SQLite DBI Driver -# lib/DBD/SQLite.pm: GPL+ or Artistic -# LICENSE: GPL+ or Artistic +# lib/DBD/SQLite.pm: GPL-1.0-or-later OR Artistic-1.0-Perl +# LICENSE: GPL-1.0-or-later OR Artistic-1.0-Perl ## unbundled -# inc/Test/FailWarnings.pm: ASL 2.0 +# inc/Test/FailWarnings.pm: Apache-2.0 # sqlite3.c: Public Domain (copied from sqlite) # sqlite3.h: Public Domain (copied from sqlite) # sqlite3ext.h: Public Domain (copied from sqlite) -License: (GPL+ or Artistic) and Public Domain +License: (GPL-1.0-or-later OR Artistic-1.0-Perl) and LicenseRef-Fedora-Public-Domain URL: https://metacpan.org/release/DBD-SQLite Source0: https://cpan.metacpan.org/authors/id/I/IS/ISHIGAKI/DBD-SQLite-%{version}.tar.gz # Use system sqlite if it is available @@ -21,12 +21,6 @@ Patch0: perl-DBD-SQLite-bz543982.patch Patch1: DBD-SQLite-1.62-Remove-bundled-source-extentions.patch # Adapt tests to unbundled Test::FailWarnings Patch2: DBD-SQLite-1.64-Unbundle-Test-FailWarnings.patch -# 1/2 Adapt to SQLite-3.38.0, bug #2065567, upstream bug GH#92, -# in upstream 1.71_05 -Patch3: DBD-SQLite-1.70-Lowercase-datatype.patch -# 2/2 Adapt to SQLite-3.38.0, bug #2065567, upstream bug GH#92, -# in upstream 1.71_05 -Patch4: DBD-SQLite-1.71_04-THX.patch # if sqlite >= 3.6.0 then # perl-DBD-SQLite uses the external library # else @@ -92,8 +86,6 @@ SQLite. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 # Remove bundled sqlite libraries (BZ#1059154) # System libraries will be used rm sqlite* @@ -127,6 +119,9 @@ make test %{_mandir}/man3/*.3pm* %changelog +* Fri Nov 04 2022 Jitka Plesnikova - 1.72-1 +- 1.72 bump + * Fri Jul 22 2022 Fedora Release Engineering - 1.70-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index df425a1..5fa6906 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (DBD-SQLite-1.70.tar.gz) = 163d53a8a214202a39b346ae023f9d10255c69dde537bc764a4ef312b62ef7b02ae1400e6c1a59d0483fd98abba6c36939214c13f5d9b3a2727c41753ba59060 +SHA512 (DBD-SQLite-1.72.tar.gz) = 67a90c618a3626b3ae0b333b5eb4d4d0c8c13712bbcd50c135bf74e83dc252301664089803597c1bcbebf7f1eda040673d4438e70e2dae0aef3b8ebeeecd2f79