From be4efad97a6acb0caeb8b9e2b81a8a57905e61753669c1d1c5771fb22a8860a9 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 8 Feb 2008 19:21:57 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/perl-DBD-SQLite?expand=0&rev=3 --- perl-DBD-SQLite.changes | 5 +++++ perl-DBD-SQLite.spec | 26 +++++++++++++++----------- sqlite3-finalize.diff | 20 ++++++++++++++++++++ 3 files changed, 40 insertions(+), 11 deletions(-) create mode 100644 sqlite3-finalize.diff diff --git a/perl-DBD-SQLite.changes b/perl-DBD-SQLite.changes index 3e47cb7..de9edd7 100644 --- a/perl-DBD-SQLite.changes +++ b/perl-DBD-SQLite.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 7 13:35:24 CET 2008 - schwab@suse.de + +- Don't call sqlite3_finalize twice. + ------------------------------------------------------------------- Sun Jan 13 21:09:52 CET 2008 - coolo@suse.de diff --git a/perl-DBD-SQLite.spec b/perl-DBD-SQLite.spec index ca333f9..d079887 100644 --- a/perl-DBD-SQLite.spec +++ b/perl-DBD-SQLite.spec @@ -14,12 +14,13 @@ Name: perl-DBD-SQLite BuildRequires: perl-DBI sqlite-devel Summary: The DBD::SQLite is a self contained RDBMS in a DBI driver Version: 1.14 -Release: 1 +Release: 11 License: Artistic License; GPL v2 or later Group: Development/Libraries/Perl Source0: http://search.cpan.org/CPAN/authors/id/M/MS/MSERGEANT/DBD-SQLite-%{version}.tar.gz Patch0: makefile-forgiving.diff Patch1: dbimp-no_uninit.diff +Patch2: sqlite3-finalize.diff Url: http://www.cpan.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: perl-DBI sqlite @@ -49,6 +50,7 @@ Authors: %setup -q -n DBD-SQLite-%{version} #%patch -p1 %patch1 -p1 +%patch2 %build perl Makefile.PL OPTIMIZE="$RPM_OPT_FLAGS" @@ -73,28 +75,30 @@ rm -rf $RPM_BUILD_ROOT /var/adm/perl-modules/* %changelog -* Sun Jan 13 2008 - coolo@suse.de +* Thu Feb 07 2008 schwab@suse.de +- Don't call sqlite3_finalize twice. +* Sun Jan 13 2008 coolo@suse.de - update to 1.14 - disable test suite for now -* Fri Sep 08 2006 - jw@suse.de +* Fri Sep 08 2006 jw@suse.de - painless update to 1.13 -* Mon May 29 2006 - jw@suse.de +* Mon May 29 2006 jw@suse.de - update to 1.12, to make it compile again. Using SQLite 3.3.5 and Perl 5.8.8 -* Mon Mar 13 2006 - jw@suse.de +* Mon Mar 13 2006 jw@suse.de - fixed bugzilla#156965, unintialized variable. -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Sun Dec 04 2005 - jw@suse.de +* Sun Dec 04 2005 jw@suse.de - update to 1.11, feature++ -* Fri Dec 02 2005 - jw@suse.de +* Fri Dec 02 2005 jw@suse.de - update to 1.10 be more forgiving to sqlite3.h, it is buggy again. -* Tue Oct 04 2005 - dmueller@suse.de +* Tue Oct 04 2005 dmueller@suse.de - add norootforbuild -* Thu Jun 30 2005 - schwab@suse.de +* Thu Jun 30 2005 schwab@suse.de - Fix neededforbuild. -* Wed Jun 29 2005 - jw@suse.de +* Wed Jun 29 2005 jw@suse.de - initial version 1.09 Since 1.09 it can link against a system provided sqlite library, but uses its own copy due to a buggy sqlite3.h diff --git a/sqlite3-finalize.diff b/sqlite3-finalize.diff new file mode 100644 index 0000000..bfa77e9 --- /dev/null +++ b/sqlite3-finalize.diff @@ -0,0 +1,20 @@ +--- dbdimp.c ++++ dbdimp.c +@@ -399,7 +399,7 @@ sqlite_st_execute (SV *sth, imp_sth_t *i + continue; + } + /* There are bug reports that say this should be sqlite3_reset() */ +- sqlite3_finalize(imp_sth->stmt); ++ sqlite3_reset(imp_sth->stmt); + sqlite_error(sth, (imp_xxh_t*)imp_sth, imp_sth->retval, (char*)sqlite3_errmsg(imp_dbh->db)); + return -5; + } +@@ -419,7 +419,7 @@ sqlite_st_execute (SV *sth, imp_sth_t *i + sqlite_trace(5, "exec ok - %d rows, %d cols\n", imp_sth->nrow, DBIc_NUM_FIELDS(imp_sth)); + return 0; + /* There are bug reports that say this should be sqlite3_reset() */ +- default: sqlite3_finalize(imp_sth->stmt); ++ default: sqlite3_reset(imp_sth->stmt); + sqlite_error(sth, (imp_xxh_t*)imp_sth, imp_sth->retval, (char*)sqlite3_errmsg(imp_dbh->db)); + return -6; + }