[meego-commits] 5796: Changes to Trunk:Testing/sqlite
Fathi Boudra
fathi.boudra at nokia.com
Fri Jul 16 12:03:03 UTC 2010
Hi,
I have made the following changes to sqlite in project Trunk:Testing. Please review and accept ASAP.
Thank You,
Fathi Boudra
[This message was auto-generated]
---
Request #5796:
submit: home:boudra:branches:Trunk:Testing/sqlite(r3)(cleanup) -> Trunk:Testing/sqlite
Message:
* Fri Jul 16 2010 Fathi Boudra <fathi.boudra at nokia.com> - 3.6.23.1
- Update to 3.6.23.1
- Update lemon snprintf patch
- Improve libdl patch
State: new 2010-07-15T23:57:35 boudra
Comment: None
changes files:
--------------
--- sqlite.changes
+++ sqlite.changes
@@ -0,0 +1,5 @@
+* Fri Jul 16 2010 Fathi Boudra <fathi.boudra at nokia.com> - 3.6.23.1
+- Update to 3.6.23.1
+- Update lemon snprintf patch
+- Improve libdl patch
+
old:
----
sqlite-3.6.22.tar.gz
new:
----
sqlite-3.6.23.1.tar.gz
spec files:
-----------
--- sqlite.spec
+++ sqlite.spec
@@ -1,13 +1,13 @@
#
# Do not Edit! Generated by:
-# spectacle version 0.17
+# spectacle version 0.16
#
# >> macros
# << macros
Name: sqlite
Summary: Library that implements an embeddable SQL database engine
-Version: 3.6.22
+Version: 3.6.23.1
Release: 1
Group: Applications/Databases
License: Public Domain
@@ -22,7 +22,6 @@
BuildRequires: readline-devel
BuildRequires: tcl
-
%description
SQLite is a C library that implements an SQL database engine. A large
subset of SQL92 is supported. A complete database is stored in a
other changes:
--------------
++++++ sqlite-3.6.12-libdl.patch
--- sqlite-3.6.12-libdl.patch
+++ sqlite-3.6.12-libdl.patch
@@ -1,11 +1,41 @@
-diff -up sqlite-3.6.4/configure.ac.orig sqlite-3.6.4/configure.ac
---- sqlite-3.6.4/configure.ac.orig 2008-11-08 11:37:15.000000000 +0200
-+++ sqlite-3.6.4/configure.ac 2008-11-08 11:35:50.000000000 +0200
-@@ -606,6 +606,7 @@ AC_ARG_ENABLE(load-extension, AC_HELP_ST
- [use_loadextension=$enableval],[use_loadextension=no])
- if test "${use_loadextension}" = "yes" ; then
- OPT_FEATURE_FLAGS=""
-+ AC_SEARCH_LIBS(dlopen, [dl])
- else
- OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
- fi
+--- a/configure.ac
++++ b/configure.ac
+@@ -233,6 +233,38 @@ fi
+ AC_SUBST(BUILD_CC)
+
+ ##########
++# Do we want to support load_extension()?
++#
++AC_ARG_ENABLE(load-extension,
++AC_HELP_STRING([--enable-load-extension],
++ [Include SQL functions for loading extension libraries]),,
++ enable_load_extension=auto)
++
++if test "x$enable_load_extension" = xyes ||
++ test "x$enable_load_extension" = xauto; then
++
++ can_load_extension=yes
++ # libtool will already have looked for <dlfcn.h>
++ if test $ac_cv_header_dlfcn_h = no; then
++ can_load_extension=no
++ else
++ AC_SEARCH_LIBS(dlopen, dl, , [can_load_extension=no])
++ fi
++elif test "x$enable_load_extension" = xno; then
++ can_load_extension=no
++else
++ AC_MSG_ERROR([invalid argument to --enable-load-extension])
++fi
++
++if test $can_load_extension = no; then
++ if test "x$enable_load_extension" = xyes; then
++ AC_MSG_ERROR([<dlfcn.h> routines missing, load_extension() not supported])
++ fi
++ AC_DEFINE(SQLITE_OMIT_LOAD_EXTENSION, 1,
++ [Define if the load_extension() sql function should be omitted.])
++fi
++
++##########
+ # Do we want to support multithreaded use of sqlite
+ #
+ AC_ARG_ENABLE(threadsafe,
++++++ sqlite-3.6.17-tkt3951.patch
--- sqlite-3.6.17-tkt3951.patch
+++ sqlite-3.6.17-tkt3951.patch
@@ -1,6 +1,5 @@
-diff -up sqlite-3.6.17/test/tkt3922.test.tkt3951 sqlite-3.6.17/test/tkt3922.test
---- sqlite-3.6.17/test/tkt3922.test.tkt3951 2009-06-26 17:19:55.000000000 +0300
-+++ sqlite-3.6.17/test/tkt3922.test 2009-08-21 13:12:27.000000000 +0300
+--- a/test/tkt3922.test
++++ b/test/tkt3922.test
@@ -36,20 +36,20 @@ if {[working_64bit_int]} {
}
} {-1 integer}
++++++ sqlite-3.6.22.tar.gz -> sqlite-3.6.23.1.tar.gz
18840 lines of diff (skipped)
++++++ sqlite-3.6.6.2-lemon-snprintf.patch
--- sqlite-3.6.6.2-lemon-snprintf.patch
+++ sqlite-3.6.6.2-lemon-snprintf.patch
@@ -1,26 +1,15 @@
-diff -up sqlite-3.6.6.2/tool/lemon.c.lemparpath sqlite-3.6.6.2/tool/lemon.c
---- sqlite-3.6.6.2/tool/lemon.c.lemparpath 2008-12-05 20:37:49.000000000 +0200
-+++ sqlite-3.6.6.2/tool/lemon.c 2008-12-05 20:44:08.000000000 +0200
-@@ -1324,15 +1324,15 @@ void ErrorMsg(const char *filename, int
- va_start(ap, format);
- /* Prepare a prefix to be prepended to every output line */
- if( lineno>0 ){
-- sprintf(prefix,"%.*s:%d: ",PREFIXLIMIT-10,filename,lineno);
-+ snprintf(prefix,sizeof prefix,"%.*s:%d: ",PREFIXLIMIT-10,filename,lineno);
- }else{
-- sprintf(prefix,"%.*s: ",PREFIXLIMIT-10,filename);
-+ snprintf(prefix,sizeof prefix,"%.*s: ",PREFIXLIMIT-10,filename);
- }
- prefixsize = lemonStrlen(prefix);
- availablewidth = LINEWIDTH - prefixsize;
-
- /* Generate the error message */
-- vsprintf(errmsg,format,ap);
-+ vsnprintf(errmsg,sizeof errmsg,format,ap);
- va_end(ap);
- errmsgsize = lemonStrlen(errmsg);
- /* Remove trailing '\n's from the error message. */
-@@ -2911,7 +2911,7 @@ struct lemon *lemp;
+--- a/tool/lemon.c
++++ b/tool/lemon.c
+@@ -2357,7 +2357,7 @@ to follow the previous rule.");
+ for(z=psp->filename, nBack=0; *z; z++){
+ if( *z=='\\' ) nBack++;
+ }
+- sprintf(zLine, "#line %d ", psp->tokenlineno);
++ snprintf(zLine,sizeof zLine, "#line %d ", psp->tokenlineno);
+ nLine = lemonStrlen(zLine);
+ n += nLine + lemonStrlen(psp->filename) + nBack;
+ }
+@@ -2927,7 +2927,7 @@ void ReportOutput(struct lemon *lemp)
while( cfp ){
char buf[20];
if( cfp->dot==cfp->rp->nrhs ){
@@ -29,41 +18,15 @@
fprintf(fp," %5s ",buf);
}else{
fprintf(fp," ");
-@@ -2966,6 +2966,7 @@ int modemask;
- {
- char *pathlist;
+@@ -2981,6 +2981,7 @@ PRIVATE char *pathsearch(char *argv0, ch
+ char *pathbufptr;
+ char *pathbuf;
char *path,*cp;
+ size_t pathsz;
char c;
#ifdef __WIN32__
-@@ -2976,21 +2977,21 @@ int modemask;
- if( cp ){
- c = *cp;
- *cp = 0;
-- path = (char *)malloc( lemonStrlen(argv0) + lemonStrlen(name) + 2 );
-- if( path ) sprintf(path,"%s/%s",argv0,name);
-+ path = (char *)malloc((pathsz=lemonStrlen(argv0) + lemonStrlen(name) + 2));
-+ if( path ) snprintf(path,pathsz,"%s/%s",argv0,name);
- *cp = c;
- }else{
- extern char *getenv();
- pathlist = getenv("PATH");
- if( pathlist==0 ) pathlist = ".:/bin:/usr/bin";
-- path = (char *)malloc( lemonStrlen(pathlist)+lemonStrlen(name)+2 );
-+ path = (char *)malloc((pathsz=lemonStrlen(pathlist)+lemonStrlen(name)+2));
- if( path!=0 ){
- while( *pathlist ){
- cp = strchr(pathlist,':');
- if( cp==0 ) cp = &pathlist[lemonStrlen(pathlist)];
- c = *cp;
- *cp = 0;
-- sprintf(path,"%s/%s",pathlist,name);
-+ snprintf(path,pathsz,"%s/%s",pathlist,name);
- *cp = c;
- if( c==0 ) pathlist = "";
- else pathlist = &cp[1];
-@@ -3070,14 +3071,16 @@ struct lemon *lemp;
+@@ -3098,14 +3099,16 @@ PRIVATE FILE *tplt_open(struct lemon *le
cp = strrchr(lemp->filename,'.');
if( cp ){
@@ -82,7 +45,7 @@
}else{
tpltname = pathsearch(lemp->argv0,templatename,0);
}
-@@ -3089,7 +3092,7 @@ struct lemon *lemp;
+@@ -3117,7 +3120,7 @@ PRIVATE FILE *tplt_open(struct lemon *le
}
in = fopen(tpltname,"rb");
if( in==0 ){
@@ -91,7 +54,16 @@
lemp->errorcnt++;
return 0;
}
-@@ -3827,7 +3830,7 @@ int mhflag; /* Output in makeheaders
+@@ -3251,7 +3254,7 @@ PRIVATE char *append_str(const char *zTe
+ while( n-- > 0 ){
+ c = *(zText++);
+ if( c=='%' && n>0 && zText[0]=='d' ){
+- sprintf(zInt, "%d", p1);
++ snprintf(zInt,sizeof zInt, "%d", p1);
+ p1 = p2;
+ strcpy(&z[used], zInt);
+ used += lemonStrlen(&z[used]);
+@@ -3863,7 +3866,7 @@ void ReportTable(
/* Generate a table containing the symbolic name of every symbol
*/
for(i=0; i<lemp->nsymbol; i++){
@@ -100,7 +72,7 @@
fprintf(out," %-15s",line);
if( (i&3)==3 ){ fprintf(out,"\n"); lineno++; }
}
-@@ -3983,7 +3986,7 @@ struct lemon *lemp;
+@@ -4029,7 +4032,7 @@ void ReportHeader(struct lemon *lemp)
in = file_open(lemp,".h","rb");
if( in ){
for(i=1; i<lemp->nterminal && fgets(line,LINESIZE,in); i++){
++++++ sqlite.yaml
--- sqlite.yaml
+++ sqlite.yaml
@@ -1,6 +1,6 @@
Name: sqlite
Summary: Library that implements an embeddable SQL database engine
-Version: 3.6.22
+Version: 3.6.23.1
Release: 1
Group: Applications/Databases
License: Public Domain
More information about the MeeGo-commits
mailing list