From e68f6f6283f0a7a497041ac8c1245542481a58d6613fc92151e0560a1f7a8323 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Sat, 13 Sep 2008 10:16:31 +0000
Subject: [PATCH] OBS-URL:
https://build.opensuse.org/package/show/openSUSE:Factory/sqlite3?expand=0&rev=11
---
sqlite-3.6.0.tar.bz2 | 3 -
sqlite-3.6.2.tar.bz2 | 3 +
sqlite-check_fsync_dir.c | 25 -------
sqlite3-upstream-fixes.patch | 126 -----------------------------------
sqlite3.changes | 12 ++++
sqlite3.spec | 36 +++++-----
6 files changed, 35 insertions(+), 170 deletions(-)
delete mode 100644 sqlite-3.6.0.tar.bz2
create mode 100644 sqlite-3.6.2.tar.bz2
delete mode 100644 sqlite-check_fsync_dir.c
delete mode 100644 sqlite3-upstream-fixes.patch
diff --git a/sqlite-3.6.0.tar.bz2 b/sqlite-3.6.0.tar.bz2
deleted file mode 100644
index 4f614f9..0000000
--- a/sqlite-3.6.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c4061b233645f6d719918f7de7f2bc4a78d4124ab924ab91aac10041e3b62ba7
-size 1676870
diff --git a/sqlite-3.6.2.tar.bz2 b/sqlite-3.6.2.tar.bz2
new file mode 100644
index 0000000..4c5a3bf
--- /dev/null
+++ b/sqlite-3.6.2.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:04bff58f5a827876db47a5ae0fce50d6fc3e11a326f361c99a6fcf8b200b45a9
+size 1825910
diff --git a/sqlite-check_fsync_dir.c b/sqlite-check_fsync_dir.c
deleted file mode 100644
index 11bad65..0000000
--- a/sqlite-check_fsync_dir.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-int main (int argc, char **argv)
-{
- int fd, status;
-
- fd = open(".", O_RDONLY);
- if (fd < 0) {
- perror("open");
- exit(1);
- }
- status = fsync(fd);
- if (status != 0) {
- perror("fsync");
- exit(2);
- }
- close(fd);
- printf("OK\n");
- exit(0);
-}
diff --git a/sqlite3-upstream-fixes.patch b/sqlite3-upstream-fixes.patch
deleted file mode 100644
index e2d1d1d..0000000
--- a/sqlite3-upstream-fixes.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-Index: sqlite/Makefile.in
-RCS File: /sqlite/sqlite/Makefile.in,v
-================================================================================
---- Makefile.in
-+++ Makefile.in
-@@ -427,7 +427,7 @@
-
- libtclsqlite3.la: tclsqlite.lo libsqlite3.la
- $(LTLINK) -o $@ tclsqlite.lo \
-- $(LIBOBJ) @TCL_STUB_LIB_SPEC@ $(TLIBS) \
-+ libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
- -rpath "$(libdir)/sqlite" \
- -version-info "8:6:8"
-
-@@ -623,7 +623,7 @@
- $(LTCOMPILE) -c $(TOP)/src/table.c
-
- tclsqlite.lo: $(TOP)/src/tclsqlite.c $(HDR)
-- $(LTCOMPILE) -c $(TOP)/src/tclsqlite.c
-+ $(LTCOMPILE) -DUSE_TCL_STUBS=1 -c $(TOP)/src/tclsqlite.c
-
- tokenize.lo: $(TOP)/src/tokenize.c keywordhash.h $(HDR)
- $(LTCOMPILE) -c $(TOP)/src/tokenize.c
---- src/test_osinst.c
-+++ src/test_osinst.c
-@@ -17,6 +17,7 @@
- ** $Id: test_osinst.c,v 1.17 2008/07/12 15:55:55 danielk1977 Exp $
- */
-
-+#ifdef SQLITE_ENABLE_INSTVFS
- /*
- ** C interface:
- **
-@@ -809,6 +810,7 @@
-
- return pVfs;
- }
-+#endif /* SQLITE_ENABLE_INSTVFS */
-
- /**************************************************************************
- ***************************************************************************
-@@ -818,6 +820,7 @@
-
- #include <tcl.h>
-
-+#ifdef SQLITE_ENABLE_INSTVFS
- struct InstVfsCall {
- Tcl_Interp *interp;
- Tcl_Obj *pScript;
-@@ -1039,10 +1042,28 @@
-
- return TCL_OK;
- }
-+#endif /* SQLITE_ENABLE_INSTVFS */
-+
-+/* Alternative implementation of sqlite3_instvfs when the real
-+** implementation is unavailable.
-+*/
-+#ifndef SQLITE_ENABLE_INSTVFS
-+static int test_sqlite3_instvfs(
-+ void * clientData,
-+ Tcl_Interp *interp,
-+ int objc,
-+ Tcl_Obj *CONST objv[]
-+){
-+ Tcl_AppendResult(interp,
-+ "not compiled with -DSQLITE_ENABLE_INSTVFS; sqlite3_instvfs is "
-+ "unavailable", (char*)0);
-+ return TCL_ERROR;
-+}
-+#endif /* !defined(SQLITE_ENABLE_INSTVFS) */
-
- int SqlitetestOsinst_Init(Tcl_Interp *interp){
- Tcl_CreateObjCommand(interp, "sqlite3_instvfs", test_sqlite3_instvfs, 0, 0);
- return TCL_OK;
- }
-
--#endif
-+#endif /* SQLITE_TEST */
---- test/func.test
-+++ test/func.test
-@@ -298,10 +298,22 @@
- } {0}
- do_test func-8.6 {
- execsql {
-- SELECT sum(x) FROM (SELECT '9223372036' || '854775808' AS x
-+ SELECT typeof(sum(x)) FROM (SELECT '9223372036' || '854775807' AS x
- UNION ALL SELECT -9223372036854775807)
- }
--} {1.0}
-+} {integer}
-+do_test func-8.7 {
-+ execsql {
-+ SELECT typeof(sum(x)) FROM (SELECT '9223372036' || '854775808' AS x
-+ UNION ALL SELECT -9223372036854775807)
-+ }
-+} {real}
-+do_test func-8.8 {
-+ execsql {
-+ SELECT sum(x)>0.0 FROM (SELECT '9223372036' || '854775808' AS x
-+ UNION ALL SELECT -9223372036850000000)
-+ }
-+} {1}
-
- # How do you test the random() function in a meaningful, deterministic way?
- #
---- test/memsubsys1.test
-+++ test/memsubsys1.test
-@@ -133,7 +133,7 @@
- } $max_pagecache
- do_test memsubsys1-4.5 {
- set maxreq [lindex [sqlite3_status SQLITE_STATUS_MALLOC_SIZE 0] 2]
-- expr {$maxreq<4096}
-+ expr {$maxreq<7000}
- } 1
- do_test memsubsys1-4.6 {
- set s_used [lindex [sqlite3_status SQLITE_STATUS_SCRATCH_USED 0] 2]
-@@ -211,7 +211,7 @@
- } 0
- do_test memsubsys1-7.5 {
- set maxreq [lindex [sqlite3_status SQLITE_STATUS_MALLOC_SIZE 0] 2]
-- expr {$maxreq<2500}
-+ expr {$maxreq<4000}
- } 1
- do_test memsubsys1-7.6 {
- set s_used [lindex [sqlite3_status SQLITE_STATUS_SCRATCH_USED 0] 2]
diff --git a/sqlite3.changes b/sqlite3.changes
index 4eb4c91..502b3b9 100644
--- a/sqlite3.changes
+++ b/sqlite3.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Sep 10 14:32:18 CEST 2008 - max@suse.de
+
+- Update to version 3.6.2.
+- This version contains rewrites of the page-cache subsystem and
+ the procedures for matching identifiers to table columns in SQL
+ statements. These changes are designed to better modularize the
+ code and make it more maintainable and reliable moving forward.
+ Nearly 5000 non-comment lines of core code (about 11.3%) have
+ changed from the previous release. Nevertheless, there should
+ be no application-visible changes, other than bug fixes.
+
-------------------------------------------------------------------
Fri Jul 25 13:30:50 CEST 2008 - max@suse.de
diff --git a/sqlite3.spec b/sqlite3.spec
index 1cf3ecf..b6328ff 100644
--- a/sqlite3.spec
+++ b/sqlite3.spec
@@ -1,10 +1,17 @@
#
-# spec file for package sqlite3 (Version 3.6.0)
+# spec file for package sqlite3 (Version 3.6.2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -20,15 +27,13 @@ License: Public Domain, Freeware
Group: Productivity/Databases/Servers
Summary: Embeddable SQL Database Engine
Url: http://www.sqlite.org/
-Version: 3.6.0
+Version: 3.6.2
Release: 1
Requires: libsqlite3-0 = %version
Provides: sqlite = %version
Obsoletes: sqlite < %version
Source0: http://www.sqlite.org/sqlite-%version.tar.bz2
Source1: sqlite.desktop
-Source2: sqlite-check_fsync_dir.c
-Patch0: sqlite3-upstream-fixes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -124,7 +129,6 @@ Authors:
%prep
%setup -q -n sqlite-%version
-%patch0
# does not work due to our ulimits in our build system
rm test/bigfile.test
@@ -144,15 +148,6 @@ autoreconf -f -i
--enable-tempstore=yes \
--sysconfdir=/etc/
make
- #
- # check if fsync() on directories works with the current file
- # system, and skip the test suite if it doesn't.
- # As of this writing, fsync() fails on directories inside tmpfs.
- #
- gcc %optflags -o check_fsync_dir %SOURCE2
- if false && ./check_fsync_dir; then
- make fulltest
- fi
%install
cd build
@@ -193,6 +188,15 @@ autoreconf -f -i
%_libdir/pkgconfig/sqlite3.pc
%changelog
+* Wed Sep 10 2008 max@suse.de
+- Update to version 3.6.2.
+- This version contains rewrites of the page-cache subsystem and
+ the procedures for matching identifiers to table columns in SQL
+ statements. These changes are designed to better modularize the
+ code and make it more maintainable and reliable moving forward.
+ Nearly 5000 non-comment lines of core code (about 11.3%%) have
+ changed from the previous release. Nevertheless, there should
+ be no application-visible changes, other than bug fixes.
* Fri Jul 25 2008 max@suse.de
- Update to version 3.6.0:
* Modifications to the virtual file system interface to support a