rpms/sqlite/devel sqlite-3.5.9-libdl.patch, NONE, 1.1 sqlite-3.5.9-remove-temporary.patch, NONE, 1.1 sqlite.spec, 1.40, 1.41

Panu Matilainen pmatilai at fedoraproject.org
Tue Sep 30 05:43:46 UTC 2008


Author: pmatilai

Update of /cvs/pkgs/rpms/sqlite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20892

Modified Files:
	sqlite.spec 
Added Files:
	sqlite-3.5.9-libdl.patch sqlite-3.5.9-remove-temporary.patch 
Log Message:
- Remove references to temporary registers from cache on release (#463061)
- Enable loading of external extensions (#457433)


sqlite-3.5.9-libdl.patch:

--- NEW FILE sqlite-3.5.9-libdl.patch ---
diff -up sqlite-3.5.9/configure.libdl sqlite-3.5.9/configure
--- sqlite-3.5.9/configure.libdl	2008-09-22 18:37:55.000000000 +0300
+++ sqlite-3.5.9/configure	2008-09-22 18:38:11.000000000 +0300
@@ -12067,6 +12067,7 @@ else
 fi;
 if test "${use_loadextension}" = "yes" ; then
   LOADEXTENSION_FLAGS=""
+  LIBS="-ldl $LIBS"
 else
   LOADEXTENSION_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
 fi

sqlite-3.5.9-remove-temporary.patch:

--- NEW FILE sqlite-3.5.9-remove-temporary.patch ---
diff -up sqlite-3.5.9/src/expr.c.remove-temp sqlite-3.5.9/src/expr.c
--- sqlite-3.5.9/src/expr.c.remove-temp	2008-05-13 15:50:50.000000000 +0300
+++ sqlite-3.5.9/src/expr.c	2008-09-22 18:04:39.000000000 +0300
@@ -3428,6 +3428,7 @@ int sqlite3GetTempReg(Parse *pParse){
 }
 void sqlite3ReleaseTempReg(Parse *pParse, int iReg){
   if( iReg && pParse->nTempReg<ArraySize(pParse->aTempReg) ){
+    sqlite3ExprWritableRegister(pParse, iReg, iReg);
     pParse->aTempReg[pParse->nTempReg++] = iReg;
   }
 }


Index: sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/devel/sqlite.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sqlite.spec	17 Jun 2008 14:04:16 -0000	1.40
+++ sqlite.spec	30 Sep 2008 05:43:16 -0000	1.41
@@ -6,12 +6,16 @@
 Summary: Library that implements an embeddable SQL database engine
 Name: sqlite
 Version: 3.5.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: 	Applications/Databases
 URL: http://www.sqlite.org/
 Source: http://www.sqlite.org/sqlite-%{version}.tar.gz
 Patch1: sqlite-3.5.8-pkgconfig-version.patch
+# Kludge -ldl into LIBS for load-extension
+Patch2: sqlite-3.5.9-libdl.patch
+# Upstream fix for http://www.sqlite.org/cvstrac/tktview?tn=3201
+Patch3: sqlite-3.5.9-remove-temporary.patch
 Obsoletes: sqlite3 sqlite3-devel
 BuildRequires: ncurses-devel readline-devel glibc-devel
 BuildRequires: /usr/bin/tclsh
@@ -52,12 +56,15 @@
 %prep
 %setup -q
 %patch1 -p1 -b .pkgconf
+%patch2 -p1 -b .libdl
+%patch3 -p1 -b .remove-temp
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_DISABLE_DIRSYNC=1 -Wall"
 %configure %{!?with_tcl:--disable-tcl} \
            --enable-threadsafe \
-           --enable-threads-override-locks
+           --enable-threads-override-locks \
+           --enable-load-extension 
 
 make %{?_smp_mflags}
 make doc
@@ -109,6 +116,10 @@
 %endif
 
 %changelog
+* Mon Sep 22 2008 Panu Matilainen <pmatilai at redhat.com> - 3.5.9-2
+- Remove references to temporary registers from cache on release (#463061)
+- Enable loading of external extensions (#457433)
+
 * Tue Jun 17 2008 Stepan Kasal <skasal at redhat.com> - 3.5.9-1
 - update to 3.5.9
 




More information about the fedora-extras-commits mailing list