rpms/perl-DBD-SQLite/devel DBD-SQLite-1.11-VIEW-type-information-segv.patch, NONE, 1.1 DBD-SQLite-1.11-build-with-system-sqlite-3.3.x.patch, NONE, 1.1 perl-DBD-SQLite.spec, 1.8, 1.9

[Jose Pedro Oliveira (jpo)]

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-SQLite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13844

Modified Files:
	perl-DBD-SQLite.spec 
Added Files:
	DBD-SQLite-1.11-VIEW-type-information-segv.patch 
	DBD-SQLite-1.11-build-with-system-sqlite-3.3.x.patch 
Log Message:
- Patch to build with system sqlite 3.3.x (#183530).
- Patch to avoid VIEW type information segv (#187873).


DBD-SQLite-1.11-VIEW-type-information-segv.patch:

--- NEW FILE DBD-SQLite-1.11-VIEW-type-information-segv.patch ---
diff -ur DBD-SQLite-1.11.orig/dbdimp.c DBD-SQLite-1.11/dbdimp.c
--- DBD-SQLite-1.11.orig/dbdimp.c	2005-12-02 17:28:53.000000000 +0000
+++ DBD-SQLite-1.11/dbdimp.c	2006-02-06 12:10:31.000000000 +0000
@@ -677,11 +677,15 @@
         retsv = sv_2mortal(newRV(sv_2mortal((SV*)av)));
         for (n = 0; n < i; n++) {
             const char *fieldtype = sqlite3_column_decltype(imp_sth->stmt, n);
-            int type = sqlite3_column_type(imp_sth->stmt, n);
+            /* int type = sqlite3_column_type(imp_sth->stmt, n); */
             /* warn("got type: %d = %s\n", type, fieldtype); */
-            type = type_to_odbc_type(type);
+            /* type = type_to_odbc_type(type); */
             /* av_store(av, n, newSViv(type)); */
-            av_store(av, n, newSVpv(fieldtype, 0));
+	    if (fieldtype == NULL) {
+		av_store(av, n, newSVpv("INTEGER", 0));
+	    } else {
+                av_store(av, n, newSVpv(fieldtype, 0));
+	    }
         }
     }
     else if (strEQ(key, "NULLABLE")) {

DBD-SQLite-1.11-build-with-system-sqlite-3.3.x.patch:

--- NEW FILE DBD-SQLite-1.11-build-with-system-sqlite-3.3.x.patch ---
diff -durN DBD-SQLite-1.11/dbdimp.c DBD-SQLite-1.11.new/dbdimp.c
--- DBD-SQLite-1.11/dbdimp.c	Sat Dec  3 01:28:53 2005
+++ DBD-SQLite-1.11.new/dbdimp.c	Mon Mar 27 09:18:19 2006
@@ -260,7 +260,7 @@
     imp_sth->retval = SQLITE_OK;
     imp_sth->params = newAV();
 
-    if ((retval = sqlite3_prepare(imp_dbh->db, statement, 0, &(imp_sth->stmt), &extra))
+    if ((retval = sqlite3_prepare(imp_dbh->db, statement, -1, &(imp_sth->stmt), &extra))
         != SQLITE_OK)
     {
         if (imp_sth->stmt) {
@@ -320,7 +320,7 @@
         psv = hv_fetch((HV*)SvRV(sth), "Statement", 9, 0);
         statement = (psv && SvOK(*psv)) ? SvPV_nolen(*psv) : "";
         sqlite_trace(3, "re-prepare statement %s", statement);
-        if ((retval = sqlite3_prepare(imp_dbh->db, statement, 0, &(imp_sth->stmt), &extra))
+        if ((retval = sqlite3_prepare(imp_dbh->db, statement, -1, &(imp_sth->stmt), &extra))
             != SQLITE_OK)
         {
             if (imp_sth->stmt) {


Index: perl-DBD-SQLite.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-SQLite/devel/perl-DBD-SQLite.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-DBD-SQLite.spec	9 Mar 2006 19:59:28 -0000	1.8
+++ perl-DBD-SQLite.spec	5 Apr 2006 16:53:21 -0000	1.9
@@ -1,12 +1,14 @@
 Name:           perl-DBD-SQLite
 Version:        1.11
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Self Contained RDBMS in a DBI Driver
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/DBD-SQLite/
 Source0:        http://www.cpan.org/authors/id/M/MS/MSERGEANT/DBD-SQLite-%{version}.tar.gz
+Patch0:         DBD-SQLite-1.11-build-with-system-sqlite-3.3.x.patch
+Patch1:         DBD-SQLite-1.11-VIEW-type-information-segv.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl-DBI >= 1.03
@@ -30,10 +32,12 @@
 
 %prep
 %setup -q -n DBD-SQLite-%{version}
+%patch0 -p1
+%patch1 -p1
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor USE_LOCAL_SQLITE=1
+CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
 
 
@@ -63,6 +67,10 @@
 
 
 %changelog
+* Wed Apr  5 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.11-4
+- Patch to build with system sqlite 3.3.x (#183530).
+- Patch to avoid VIEW type information segv (#187873).
+
 * Thu Mar  9 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.11-3
 - DBD::SQLite fails to build with the current FC-5 sqlite version (3.3.3);
   see bugzilla entry #183530.