diff --git a/sqlite-amalgamation-3.6.20.tar.bz2 b/sqlite-amalgamation-3.6.20.tar.bz2 deleted file mode 100644 index d8f5352..0000000 --- a/sqlite-amalgamation-3.6.20.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6b1733b1062ac6849cda51e1f5d8adcd0d89aa102522d9a4d44b8a8588d6f528 -size 1049205 diff --git a/sqlite-amalgamation-3.6.22.tar.bz2 b/sqlite-amalgamation-3.6.22.tar.bz2 new file mode 100644 index 0000000..a91a395 --- /dev/null +++ b/sqlite-amalgamation-3.6.22.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de4c13acb60430625ca6de2eea82bf95365694d3550c87f2addd9ded41b4d98b +size 1053178 diff --git a/sqlite-tcl.patch b/sqlite-tcl.patch index 5718143..6937312 100644 --- a/sqlite-tcl.patch +++ b/sqlite-tcl.patch @@ -11,20 +11,3 @@ TEA_ADD_CFLAGS([-DSQLITE_ENABLE_FTS3=1]) TEA_ADD_STUB_SOURCES([]) TEA_ADD_TCL_SOURCES([]) -diff '--exclude=configure' -ruBb sqlite-3_6_20-tea/generic/tclsqlite3.c sqlite-3.6.20-amalgamation/tcl/generic/tclsqlite3.c ---- sqlite-tcl/generic/tclsqlite3.c -+++ sqlite-tcl/generic/tclsqlite3.c -@@ -33,10 +33,12 @@ - ** appended to the amalgamation. - */ - #ifndef SQLITE_AMALGAMATION --# include "sqliteInt.h" -+# include "sqlite3.h" - # include - # include - # include -+# include -+ typedef uint8_t u8; - #endif - #include - diff --git a/sqlite-tcl.tar.bz2 b/sqlite-tcl.tar.bz2 index 962db0f..8e1d980 100644 --- a/sqlite-tcl.tar.bz2 +++ b/sqlite-tcl.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:187f24767ef919616c79700aa281ec053f04071bba7d94b5230dc60b35d0df00 -size 131425 +oid sha256:1fb0bc8711e16f301f9e5063a1419d4a3c3d4c3805d52e4c1eec5d7dc577581b +size 131351 diff --git a/sqlite3.1 b/sqlite3.1 deleted file mode 100644 index 5571eb0..0000000 --- a/sqlite3.1 +++ /dev/null @@ -1,229 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH SQLITE3 1 "Mon Apr 15 23:49:17 2002" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -.B sqlite3 -\- A command line interface for SQLite version 3 - -.SH SYNOPSIS -.B sqlite3 -.RI [ options ] -.RI [ databasefile ] -.RI [ SQL ] - -.SH SUMMARY -.PP -.B sqlite3 -is a terminal-based front-end to the SQLite library that can evaluate -queries interactively and display the results in multiple formats. -.B sqlite3 -can also be used within shell scripts and other applications to provide -batch processing features. - -.SH DESCRIPTION -To start a -.B sqlite3 -interactive session, invoke the -.B sqlite3 -command and optionally provide the name of a database file. If the -database file does not exist, it will be created. If the database file -does exist, it will be opened. - -For example, to create a new database file named "mydata.db", create -a table named "memos" and insert a couple of records into that table: -.sp -$ -.B sqlite3 mydata.db -.br -SQLite version 3.1.3 -.br -Enter ".help" for instructions -.br -sqlite> -.B create table memos(text, priority INTEGER); -.br -sqlite> -.B insert into memos values('deliver project description', 10); -.br -sqlite> -.B insert into memos values('lunch with Christine', 100); -.br -sqlite> -.B select * from memos; -.br -deliver project description|10 -.br -lunch with Christine|100 -.br -sqlite> -.sp - -If no database name is supplied, the ATTACH sql command can be used -to attach to existing or create new database files. ATTACH can also -be used to attach to multiple databases within the same interactive -session. This is useful for migrating data between databases, -possibly changing the schema along the way. - -Optionally, a SQL statement or set of SQL statements can be supplied as -a single argument. Multiple statements should be separated by -semi-colons. - -For example: -.sp -$ -.B sqlite3 -line mydata.db 'select * from memos where priority > 20;' -.br - text = lunch with Christine -.br -priority = 100 -.br -.sp - -.SS SQLITE META-COMMANDS -.PP -The interactive interpreter offers a set of meta-commands that can be -used to control the output format, examine the currently attached -database files, or perform administrative operations upon the -attached databases (such as rebuilding indices). Meta-commands are -always prefixed with a dot (.). - -A list of available meta-commands can be viewed at any time by issuing -the '.help' command. For example: -.sp -sqlite> -.B .help -.nf -.cc | -.databases List names and files of attached databases -.dump ?TABLE? ... Dump the database in an SQL text format -.echo ON|OFF Turn command echo on or off -.exit Exit this program -.explain ON|OFF Turn output mode suitable for EXPLAIN on or off. -.header(s) ON|OFF Turn display of headers on or off -.help Show this message -.import FILE TABLE Import data from FILE into TABLE -.indices TABLE Show names of all indices on TABLE -.mode MODE ?TABLE? Set output mode where MODE is one of: - csv Comma-separated values - column Left-aligned columns. (See .width) - html HTML code - insert SQL insert statements for TABLE - line One value per line - list Values delimited by .separator string - tabs Tab-separated values - tcl TCL list elements -.nullvalue STRING Print STRING in place of NULL values -.output FILENAME Send output to FILENAME -.output stdout Send output to the screen -.prompt MAIN CONTINUE Replace the standard prompts -.quit Exit this program -.read FILENAME Execute SQL in FILENAME -.schema ?TABLE? Show the CREATE statements -.separator STRING Change separator used by output mode and .import -.show Show the current values for various settings -.tables ?PATTERN? List names of tables matching a LIKE pattern -.timeout MS Try opening locked tables for MS milliseconds -.width NUM NUM ... Set column widths for "column" mode -sqlite> -|cc . -.sp -.fi - -.SH OPTIONS -.B sqlite3 -has the following options: -.TP -.BI \-init\ file -Read and execute commands from -.I file -, which can contain a mix of SQL statements and meta-commands. -.TP -.B \-echo -Print commands before execution. -.TP -.B \-[no]header -Turn headers on or off. -.TP -.B \-column -Query results will be displayed in a table like form, using -whitespace characters to separate the columns and align the -output. -.TP -.B \-html -Query results will be output as simple HTML tables. -.TP -.B \-line -Query results will be displayed with one value per line, rows -separated by a blank line. Designed to be easily parsed by -scripts or other programs -.TP -.B \-list -Query results will be displayed with the separator (|, by default) -character between each field value. The default. -.TP -.BI \-separator\ separator -Set output field separator. Default is '|'. -.TP -.BI \-nullvalue\ string -Set string used to represent NULL values. Default is '' -(empty string). -.TP -.B \-version -Show SQLite version. -.TP -.B \-help -Show help on options and exit. - - -.SH INIT FILE -.B sqlite3 -reads an initialization file to set the configuration of the -interactive environment. Throughout initialization, any previously -specified setting can be overridden. The sequence of initialization is -as follows: - -o The default configuration is established as follows: - -.sp -.nf -.cc | -mode = LIST -separator = "|" -main prompt = "sqlite> " -continue prompt = " ...> " -|cc . -.sp -.fi - -o If the file -.B ~/.sqliterc -exists, it is processed first. -can be found in the user's home directory, it is -read and processed. It should generally only contain meta-commands. - -o If the -init option is present, the specified file is processed. - -o All other command line options are processed. - -.SH SEE ALSO -http://www.sqlite.org/ -.br -The sqlite-doc package -.SH AUTHOR -This manual page was originally written by Andreas Rottmann -, for the Debian GNU/Linux system (but may be used -by others). It was subsequently revised by Bill Bumgarner . diff --git a/sqlite3.changes b/sqlite3.changes index 1432c73..f793369 100644 --- a/sqlite3.changes +++ b/sqlite3.changes @@ -1,3 +1,43 @@ +------------------------------------------------------------------- +Wed Jan 20 16:02:54 CET 2010 - max@suse.de + +- Add -fno-strict-aliasing to CFLAGS as a temporary workaround + for a crash on (at least) PPC (bnc#571934). + +------------------------------------------------------------------- +Thu Jan 14 17:04:48 UTC 2010 - max@novell.com + +- New version: 3.6.22: + * Fix bugs that can (rarely) lead to incorrect query results + when the CAST or OR operators are used in the WHERE clause of + a query. + * Continuing enhancements and improvements to FTS3. + * The SQL output resulting from sqlite3_trace() is now modified + to include the values of bound parameters. + * Performance optimizations targetting a specific use case from + a single high-profile user of SQLite. A 12% reduction in the + number of CPU operations is achieved (as measured by + valgrind). Actual performance improvements in practice may + vary depending on workload. Changes include: + * The ifnull() and coalesce() SQL functions are now + implemented using in-line VDBE code rather than calling + external functions, so that unused arguments need never be + evaluated. + * The substr() SQL function does not bother to measure the + length its entire input string if it is only computing a + prefix. + * Unnecessary OP_IsNull, OP_Affinity, and OP_MustBeInt VDBE + opcodes are suppressed. + * Various code refactorizations for performance. + * The FTS3 extension has undergone a major rework and + cleanup. New FTS3 documentation is now available. + * The SQLITE_SECURE_DELETE compile-time option fixed to make + sure that content is deleted even when the truncate + optimization applies. + * Improvements to "dot-command" handling in the Command Line + Interface. + * Other minor bug fixes and documentation enhancements. + ------------------------------------------------------------------- Mon Dec 14 16:40:50 CET 2009 - jengelh@medozas.de diff --git a/sqlite3.spec b/sqlite3.spec index c6710d9..3dbb079 100644 --- a/sqlite3.spec +++ b/sqlite3.spec @@ -1,5 +1,5 @@ # -# spec file for package sqlite3 (Version 3.6.20) +# spec file for package sqlite3 (Version 3.6.22) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -38,8 +38,8 @@ License: Public Domain, Freeware Group: Productivity/Databases/Servers Summary: Embeddable SQL Database Engine Url: http://www.sqlite.org/ -Version: 3.6.20 -Release: 2 +Version: 3.6.22 +Release: 1 # bug437293 %ifarch ppc64 Obsoletes: sqlite-64bit @@ -52,7 +52,6 @@ Provides: sqlite = %version Obsoletes: sqlite < %version Source0: http://www.sqlite.org/sqlite-amalgamation-%version.tar.bz2 Source1: sqlite-tcl.tar.bz2 -Source2: sqlite3.1 Source3: baselibs.conf Patch0: sqlite-tcl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -161,6 +160,7 @@ Authors: make cd sqlite-tcl autoconf +export CFLAGS="%optflags -fno-strict-aliasing" %configure --with-tcl=%_libdir make @@ -168,7 +168,6 @@ make make install DESTDIR=%buildroot rm %buildroot/%_libdir/*.la install -d %buildroot%_mandir/man1/ -install -m 0644 %{S:2} %buildroot%_mandir/man1/ cd sqlite-tcl make install DESTDIR=%buildroot libdir=%tcl_archdir cd ..