From 9b843a17c8106c8dd8c35dcda565a457601af02951d3d778c68acd84898719f2 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 1 Mar 2016 16:54:34 +0000 Subject: [PATCH 1/7] Accepting request 363683 from home:lnussel:branches:server:database - explicitly enable readline support - run spec-cleaner OBS-URL: https://build.opensuse.org/request/show/363683 OBS-URL: https://build.opensuse.org/package/show/server:database/sqlite3?expand=0&rev=145 --- sqlite3.changes | 6 ++++++ sqlite3.spec | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/sqlite3.changes b/sqlite3.changes index 3dcf579..6fd3be3 100644 --- a/sqlite3.changes +++ b/sqlite3.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 1 16:18:25 UTC 2016 - lnussel@suse.de + +- explicitly enable readline support +- run spec-cleaner + ------------------------------------------------------------------- Thu Feb 18 15:32:46 UTC 2016 - mpluskal@suse.com diff --git a/sqlite3.spec b/sqlite3.spec index 9bebb9d..a5fb3b1 100644 --- a/sqlite3.spec +++ b/sqlite3.spec @@ -126,17 +126,16 @@ export CFLAGS="%{optflags} \ -DSQLITE_ENABLE_UNLOCK_NOTIFY \ -DSQLITE_ENABLE_JSON1 \ " -%configure --disable-static -make +%configure --disable-static \ + --enable-readline +make %{?_smp_mflags} %install make DESTDIR=%{buildroot} install %{?_smp_mflags} find %{buildroot} -type f -name "*.la" -delete -print %post -n libsqlite3-0 -p /sbin/ldconfig - %postun -n libsqlite3-0 -p /sbin/ldconfig - %files %defattr(-,root,root) %{_bindir}/sqlite3 From 6aaf9cc059bfd1e15764d9b907ed79b4fd8249ba0b44d14f9e64ade2746f74ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sat, 5 Mar 2016 19:55:10 +0000 Subject: [PATCH 2/7] Accepting request 366738 from home:AndreasStieger:branches:server:database SQLite 3.11.1 OBS-URL: https://build.opensuse.org/request/show/366738 OBS-URL: https://build.opensuse.org/package/show/server:database/sqlite3?expand=0&rev=146 --- sqlite-autoconf-3110000.tar.gz | 3 --- sqlite-autoconf-3110100.tar.gz | 3 +++ sqlite-doc-3110000.zip | 3 --- sqlite-doc-3110100.zip | 3 +++ sqlite3.changes | 11 +++++++++++ sqlite3.spec | 4 ++-- 6 files changed, 19 insertions(+), 8 deletions(-) delete mode 100644 sqlite-autoconf-3110000.tar.gz create mode 100644 sqlite-autoconf-3110100.tar.gz delete mode 100644 sqlite-doc-3110000.zip create mode 100644 sqlite-doc-3110100.zip diff --git a/sqlite-autoconf-3110000.tar.gz b/sqlite-autoconf-3110000.tar.gz deleted file mode 100644 index 9b94845..0000000 --- a/sqlite-autoconf-3110000.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:508d4dcbcf7a7181e95c717a1dc4ae3c0880b3d593be0c4b40abb6c3a0e201fb -size 2359347 diff --git a/sqlite-autoconf-3110100.tar.gz b/sqlite-autoconf-3110100.tar.gz new file mode 100644 index 0000000..931ba89 --- /dev/null +++ b/sqlite-autoconf-3110100.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:533ff1d0271c2e666f01591271cef01a31648563affa0c95e80ef735077d4377 +size 2359545 diff --git a/sqlite-doc-3110000.zip b/sqlite-doc-3110000.zip deleted file mode 100644 index 07e3acc..0000000 --- a/sqlite-doc-3110000.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4a942d89d5bf0aa70c0a01267a52961632b27512c293eb6452f6efe909dcec50 -size 5382519 diff --git a/sqlite-doc-3110100.zip b/sqlite-doc-3110100.zip new file mode 100644 index 0000000..62f2544 --- /dev/null +++ b/sqlite-doc-3110100.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3f127c51c7936d13de96255b00a6be3862693ff025f61a1d3d17d3d57ee295d0 +size 5386958 diff --git a/sqlite3.changes b/sqlite3.changes index 6fd3be3..f113852 100644 --- a/sqlite3.changes +++ b/sqlite3.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Mar 4 18:23:17 UTC 2016 - astieger@suse.com + +- SQLite 3.11.1: + * Fix an FTS5 issue in which the 'optimize' command could cause + index corruption. + * Fix a buffer overread that might occur if FTS5 is used to query + a corrupt database file. + * Increase the maximum "scope" value for the spellfix1 extension + from 6 to 30. + ------------------------------------------------------------------- Tue Mar 1 16:18:25 UTC 2016 - lnussel@suse.de diff --git a/sqlite3.spec b/sqlite3.spec index a5fb3b1..c19c10e 100644 --- a/sqlite3.spec +++ b/sqlite3.spec @@ -19,9 +19,9 @@ # Simplify building on RH for Application:Geo (SR#212812). %define pname sqlite3 %define oname sqlite -%define tarversion 3110000 +%define tarversion 3110100 Name: %{pname} -Version: 3.11.0 +Version: 3.11.1 Release: 0 Summary: Embeddable SQL Database Engine License: SUSE-Public-Domain From 710b9b6313036c75bb229a5aa40b22d1afdf0e66832171f337da28f3021b5c42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 7 Mar 2016 14:02:44 +0000 Subject: [PATCH 3/7] - Enable FTS5 support. - Add sqlite-fts5-link.patch to link to math library because FTS5 code uses log(). OBS-URL: https://build.opensuse.org/package/show/server:database/sqlite3?expand=0&rev=147 --- sqlite-fts5-link.patch | 13 +++++++++++++ sqlite3.changes | 7 +++++++ sqlite3.spec | 9 +++++++-- 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 sqlite-fts5-link.patch diff --git a/sqlite-fts5-link.patch b/sqlite-fts5-link.patch new file mode 100644 index 0000000..26751f8 --- /dev/null +++ b/sqlite-fts5-link.patch @@ -0,0 +1,13 @@ +Index: sqlite-autoconf-3110100/Makefile.am +=================================================================== +--- sqlite-autoconf-3110100.orig/Makefile.am ++++ sqlite-autoconf-3110100/Makefile.am +@@ -7,7 +7,7 @@ libsqlite3_la_LDFLAGS = -no-undefined -v + + bin_PROGRAMS = sqlite3 + sqlite3_SOURCES = shell.c sqlite3.c sqlite3.h +-sqlite3_LDADD = @READLINE_LIBS@ ++sqlite3_LDADD = @READLINE_LIBS@ -lm + sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@ + sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS + diff --git a/sqlite3.changes b/sqlite3.changes index f113852..e1b9996 100644 --- a/sqlite3.changes +++ b/sqlite3.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Mar 7 13:53:03 UTC 2016 - idonmez@suse.com + +- Enable FTS5 support. +- Add sqlite-fts5-link.patch to link to math library because FTS5 + code uses log(). + ------------------------------------------------------------------- Fri Mar 4 18:23:17 UTC 2016 - astieger@suse.com diff --git a/sqlite3.spec b/sqlite3.spec index c19c10e..0ba3a05 100644 --- a/sqlite3.spec +++ b/sqlite3.spec @@ -30,11 +30,13 @@ Url: http://www.sqlite.org/ Source0: http://www.sqlite.org/2016/sqlite-autoconf-%{tarversion}.tar.gz Source1: baselibs.conf Source2: http://www.sqlite.org/2016/sqlite-doc-%{tarversion}.zip -# +Patch1: sqlite-fts5-link.patch +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool BuildRequires: pkg-config BuildRequires: readline-devel BuildRequires: unzip -# Requires: libsqlite3-0 = %{version} Provides: %{oname} = %{version} Obsoletes: %{oname} < %{version} @@ -116,13 +118,16 @@ other documentation found on sqlite.org. The files can be found in %prep %setup -q -n sqlite-autoconf-%{tarversion} -a2 +autoreconf -fi rm -v sqlite-doc-%{tarversion}/releaselog/current.html ln -sv `echo %{version} | sed "s/\./_/g"`.html sqlite-doc-%{tarversion}/releaselog/current.html +%patch1 -p1 %build export CFLAGS="%{optflags} \ -DSQLITE_ENABLE_COLUMN_METADATA \ -DSQLITE_ENABLE_FTS4 \ + -DSQLITE_ENABLE_FTS5 \ -DSQLITE_ENABLE_UNLOCK_NOTIFY \ -DSQLITE_ENABLE_JSON1 \ " From e04d3b1cc9710a4331d44957a677464f181750062a0db7d6ed7d6b76395185b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 7 Mar 2016 16:10:49 +0000 Subject: [PATCH 4/7] Updatesqlite-fts5-link.patch OBS-URL: https://build.opensuse.org/package/show/server:database/sqlite3?expand=0&rev=148 --- sqlite-fts5-link.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sqlite-fts5-link.patch b/sqlite-fts5-link.patch index 26751f8..3513024 100644 --- a/sqlite-fts5-link.patch +++ b/sqlite-fts5-link.patch @@ -11,3 +11,15 @@ Index: sqlite-autoconf-3110100/Makefile.am sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@ sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS +Index: sqlite-autoconf-3110100/sqlite3.pc.in +=================================================================== +--- sqlite-autoconf-3110100.orig/sqlite3.pc.in ++++ sqlite-autoconf-3110100/sqlite3.pc.in +@@ -8,6 +8,6 @@ includedir=@includedir@ + Name: SQLite + Description: SQL database engine + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -lsqlite3 ++Libs: -L${libdir} -lsqlite3 -lm + Libs.private: @LIBS@ + Cflags: -I${includedir} From 91edd35a74853cf05a4e7b4652e63dba02bf226d74ccd23a6adedca2c8e6ff7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 7 Mar 2016 16:41:22 +0000 Subject: [PATCH 5/7] Updatesqlite-fts5-link.patch OBS-URL: https://build.opensuse.org/package/show/server:database/sqlite3?expand=0&rev=149 --- sqlite-fts5-link.patch | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/sqlite-fts5-link.patch b/sqlite-fts5-link.patch index 3513024..14b661c 100644 --- a/sqlite-fts5-link.patch +++ b/sqlite-fts5-link.patch @@ -2,7 +2,12 @@ Index: sqlite-autoconf-3110100/Makefile.am =================================================================== --- sqlite-autoconf-3110100.orig/Makefile.am +++ sqlite-autoconf-3110100/Makefile.am -@@ -7,7 +7,7 @@ libsqlite3_la_LDFLAGS = -no-undefined -v +@@ -3,11 +3,11 @@ AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_ + + lib_LTLIBRARIES = libsqlite3.la + libsqlite3_la_SOURCES = sqlite3.c +-libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8 ++libsqlite3_la_LDFLAGS = -lm -no-undefined -version-info 8:6:8 bin_PROGRAMS = sqlite3 sqlite3_SOURCES = shell.c sqlite3.c sqlite3.h @@ -11,15 +16,3 @@ Index: sqlite-autoconf-3110100/Makefile.am sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@ sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS -Index: sqlite-autoconf-3110100/sqlite3.pc.in -=================================================================== ---- sqlite-autoconf-3110100.orig/sqlite3.pc.in -+++ sqlite-autoconf-3110100/sqlite3.pc.in -@@ -8,6 +8,6 @@ includedir=@includedir@ - Name: SQLite - Description: SQL database engine - Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -lsqlite3 -+Libs: -L${libdir} -lsqlite3 -lm - Libs.private: @LIBS@ - Cflags: -I${includedir} From 986bb445a73150b592bab0b145572f02790aa453ae8301c8b50b407bcfc3890e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 7 Mar 2016 17:37:04 +0000 Subject: [PATCH 6/7] Accepting request 367770 from home:dimstar:Factory The changeset I had in my branch - for @namtrac to decide if he wants any of it OBS-URL: https://build.opensuse.org/request/show/367770 OBS-URL: https://build.opensuse.org/package/show/server:database/sqlite3?expand=0&rev=150 --- sqlite-fts5-link.patch | 12 +++--------- sqlite3-link-binary-with-libsqlite3.patch | 15 +++++++++++++++ sqlite3.changes | 11 ++++++++++- sqlite3.spec | 6 ++++-- 4 files changed, 32 insertions(+), 12 deletions(-) create mode 100644 sqlite3-link-binary-with-libsqlite3.patch diff --git a/sqlite-fts5-link.patch b/sqlite-fts5-link.patch index 14b661c..27bbe1e 100644 --- a/sqlite-fts5-link.patch +++ b/sqlite-fts5-link.patch @@ -2,17 +2,11 @@ Index: sqlite-autoconf-3110100/Makefile.am =================================================================== --- sqlite-autoconf-3110100.orig/Makefile.am +++ sqlite-autoconf-3110100/Makefile.am -@@ -3,11 +3,11 @@ AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_ +@@ -3,6 +3,7 @@ AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_ lib_LTLIBRARIES = libsqlite3.la libsqlite3_la_SOURCES = sqlite3.c --libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8 -+libsqlite3_la_LDFLAGS = -lm -no-undefined -version-info 8:6:8 ++libsqlite3_la_LIBADD = -lm + libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8 bin_PROGRAMS = sqlite3 - sqlite3_SOURCES = shell.c sqlite3.c sqlite3.h --sqlite3_LDADD = @READLINE_LIBS@ -+sqlite3_LDADD = @READLINE_LIBS@ -lm - sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@ - sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS - diff --git a/sqlite3-link-binary-with-libsqlite3.patch b/sqlite3-link-binary-with-libsqlite3.patch new file mode 100644 index 0000000..e256fa6 --- /dev/null +++ b/sqlite3-link-binary-with-libsqlite3.patch @@ -0,0 +1,15 @@ +Index: sqlite-autoconf-3110100/Makefile.am +=================================================================== +--- sqlite-autoconf-3110100.orig/Makefile.am ++++ sqlite-autoconf-3110100/Makefile.am +@@ -7,8 +7,8 @@ libsqlite3_la_LIBADD = -lm + libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8 + + bin_PROGRAMS = sqlite3 +-sqlite3_SOURCES = shell.c sqlite3.c sqlite3.h +-sqlite3_LDADD = @READLINE_LIBS@ ++sqlite3_SOURCES = shell.c sqlite3.h ++sqlite3_LDADD = libsqlite3.la @READLINE_LIBS@ + sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@ + sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS + diff --git a/sqlite3.changes b/sqlite3.changes index e1b9996..5fa0bbf 100644 --- a/sqlite3.changes +++ b/sqlite3.changes @@ -1,7 +1,16 @@ +------------------------------------------------------------------- +Mon Mar 7 15:22:53 UTC 2016 - dimstar@opensuse.org + +- Fix sqlite-fts5-link.patch: link libsqlite3.so with libm instead + of the sqlite3 binary: the library is the actual user of log(). +- Add sqlite3-link-binary-with-libsqlite3.patch: dyamically link + /usr/bin/sqlite3 to libsqlite3 instead of statically using it. +- Move autoreconf call to build section, where it belongs. + ------------------------------------------------------------------- Mon Mar 7 13:53:03 UTC 2016 - idonmez@suse.com -- Enable FTS5 support. +- Enable FTS5 support. - Add sqlite-fts5-link.patch to link to math library because FTS5 code uses log(). diff --git a/sqlite3.spec b/sqlite3.spec index 0ba3a05..e38a6c9 100644 --- a/sqlite3.spec +++ b/sqlite3.spec @@ -30,6 +30,7 @@ Url: http://www.sqlite.org/ Source0: http://www.sqlite.org/2016/sqlite-autoconf-%{tarversion}.tar.gz Source1: baselibs.conf Source2: http://www.sqlite.org/2016/sqlite-doc-%{tarversion}.zip +Patch0: sqlite3-link-binary-with-libsqlite3.patch Patch1: sqlite-fts5-link.patch BuildRequires: autoconf BuildRequires: automake @@ -118,12 +119,13 @@ other documentation found on sqlite.org. The files can be found in %prep %setup -q -n sqlite-autoconf-%{tarversion} -a2 -autoreconf -fi +%patch0 -p1 +%patch1 -p1 rm -v sqlite-doc-%{tarversion}/releaselog/current.html ln -sv `echo %{version} | sed "s/\./_/g"`.html sqlite-doc-%{tarversion}/releaselog/current.html -%patch1 -p1 %build +autoreconf -fi export CFLAGS="%{optflags} \ -DSQLITE_ENABLE_COLUMN_METADATA \ -DSQLITE_ENABLE_FTS4 \ From 40b4c2f6484c331256674b46af4629c3c93b0fd74ae9188957d689a9637a1336 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 7 Mar 2016 17:59:37 +0000 Subject: [PATCH 7/7] Add libsqlite3.la dependency OBS-URL: https://build.opensuse.org/package/show/server:database/sqlite3?expand=0&rev=151 --- sqlite3-link-binary-with-libsqlite3.patch | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sqlite3-link-binary-with-libsqlite3.patch b/sqlite3-link-binary-with-libsqlite3.patch index e256fa6..444bde8 100644 --- a/sqlite3-link-binary-with-libsqlite3.patch +++ b/sqlite3-link-binary-with-libsqlite3.patch @@ -2,14 +2,16 @@ Index: sqlite-autoconf-3110100/Makefile.am =================================================================== --- sqlite-autoconf-3110100.orig/Makefile.am +++ sqlite-autoconf-3110100/Makefile.am -@@ -7,8 +7,8 @@ libsqlite3_la_LIBADD = -lm +@@ -6,9 +6,9 @@ libsqlite3_la_SOURCES = sqlite3.c libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8 bin_PROGRAMS = sqlite3 -sqlite3_SOURCES = shell.c sqlite3.c sqlite3.h -sqlite3_LDADD = @READLINE_LIBS@ +-sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@ +sqlite3_SOURCES = shell.c sqlite3.h +sqlite3_LDADD = libsqlite3.la @READLINE_LIBS@ - sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@ ++sqlite3_DEPENDENCIES = libsqlite3.la @EXTRA_SHELL_OBJ@ sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS + include_HEADERS = sqlite3.h sqlite3ext.h