Hello community,
here is the log from the commit of package sqlite3 for openSUSE:Factory checked
in at 2016-03-09 19:01:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sqlite3 (Old)
and /work/SRC/openSUSE:Factory/.sqlite3.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sqlite3"
Changes:
--------
--- /work/SRC/openSUSE:Factory/sqlite3/sqlite3.changes 2016-02-25
21:54:52.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.sqlite3.new/sqlite3.changes 2016-03-09
19:01:39.000000000 +0100
@@ -1,0 +2,33 @@
+Mon Mar 7 15:22:53 UTC 2016 - dims...@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 - idon...@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 - astie...@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 - lnus...@suse.de
+
+- explicitly enable readline support
+- run spec-cleaner
+
+-------------------------------------------------------------------
Old:
----
sqlite-autoconf-3110000.tar.gz
sqlite-doc-3110000.zip
New:
----
sqlite-autoconf-3110100.tar.gz
sqlite-doc-3110100.zip
sqlite-fts5-link.patch
sqlite3-link-binary-with-libsqlite3.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sqlite3.spec ++++++
--- /var/tmp/diff_new_pack.awncO3/_old 2016-03-09 19:01:40.000000000 +0100
+++ /var/tmp/diff_new_pack.awncO3/_new 2016-03-09 19:01:40.000000000 +0100
@@ -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
@@ -30,11 +30,14 @@
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
+BuildRequires: libtool
BuildRequires: pkg-config
BuildRequires: readline-devel
BuildRequires: unzip
-#
Requires: libsqlite3-0 = %{version}
Provides: %{oname} = %{version}
Obsoletes: %{oname} < %{version}
@@ -116,27 +119,30 @@
%prep
%setup -q -n sqlite-autoconf-%{tarversion} -a2
+%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
%build
+autoreconf -fi
export CFLAGS="%{optflags} \
-DSQLITE_ENABLE_COLUMN_METADATA \
-DSQLITE_ENABLE_FTS4 \
+ -DSQLITE_ENABLE_FTS5 \
-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
++++++ sqlite-autoconf-3110000.tar.gz -> sqlite-autoconf-3110100.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sqlite-autoconf-3110000/Makefile.msc
new/sqlite-autoconf-3110100/Makefile.msc
--- old/sqlite-autoconf-3110000/Makefile.msc 2016-02-15 18:36:46.000000000
+0100
+++ new/sqlite-autoconf-3110100/Makefile.msc 2016-03-03 17:37:12.000000000
+0100
@@ -204,27 +204,43 @@
# This is the name to use for the SQLite dynamic link library (DLL).
#
!IFNDEF SQLITE3DLL
+!IF $(FOR_WIN10)!=0
+SQLITE3DLL = winsqlite3.dll
+!ELSE
SQLITE3DLL = sqlite3.dll
!ENDIF
+!ENDIF
# This is the name to use for the SQLite import library (LIB).
#
!IFNDEF SQLITE3LIB
+!IF $(FOR_WIN10)!=0
+SQLITE3LIB = winsqlite3.lib
+!ELSE
SQLITE3LIB = sqlite3.lib
!ENDIF
+!ENDIF
# This is the name to use for the SQLite shell executable (EXE).
#
!IFNDEF SQLITE3EXE
+!IF $(FOR_WIN10)!=0
+SQLITE3EXE = winsqlite3shell.exe
+!ELSE
SQLITE3EXE = sqlite3.exe
!ENDIF
+!ENDIF
# This is the argument used to set the program database (PDB) file for the
# SQLite shell executable (EXE).
#
!IFNDEF SQLITE3EXEPDB
+!IF $(FOR_WIN10)!=0
+SQLITE3EXEPDB =
+!ELSE
SQLITE3EXEPDB = /pdb:sqlite3sh.pdb
!ENDIF
+!ENDIF
# These are the "standard" SQLite compilation options used when compiling for
# the Windows platform.
@@ -402,15 +418,6 @@
TCC = $(TCC) -DSQLITE_OS_WIN=1 -I. -I$(TOP) -fp:precise
RCC = $(RC) -DSQLITE_OS_WIN=1 -I. -I$(TOP) $(RCOPTS) $(RCCOPTS)
-# Adjust the names of the primary targets for use with Windows 10.
-#
-!IF $(FOR_WIN10)!=0
-SQLITE3DLL = winsqlite3.dll
-SQLITE3LIB = winsqlite3.lib
-SQLITE3EXE = winsqlite3shell.exe
-SQLITE3EXEPDB =
-!ENDIF
-
# Check if we want to use the "stdcall" calling convention when compiling.
# This is not supported by the compilers for non-x86 platforms. It should
# also be noted here that building any target with these "stdcall" options
@@ -450,7 +457,9 @@
# when linking.
#
!IFNDEF CORE_LINK_DEP
-!IF $(DYNAMIC_SHELL)!=0 || $(FOR_WIN10)!=0
+!IF $(DYNAMIC_SHELL)!=0
+CORE_LINK_DEP =
+!ELSEIF $(FOR_WIN10)==0 || "$(PLATFORM)"=="x86"
CORE_LINK_DEP =
!ELSE
CORE_LINK_DEP =
@@ -460,7 +469,9 @@
# These are additional linker options used for the core library.
#
!IFNDEF CORE_LINK_OPTS
-!IF $(DYNAMIC_SHELL)!=0 || $(FOR_WIN10)!=0
+!IF $(DYNAMIC_SHELL)!=0
+CORE_LINK_OPTS =
+!ELSEIF $(FOR_WIN10)==0 || "$(PLATFORM)"=="x86"
CORE_LINK_OPTS =
!ELSE
CORE_LINK_OPTS =
@@ -863,21 +874,18 @@
# This is the default Makefile target. The objects listed here
# are what get build when you type just "make" with no arguments.
#
-all: dll libsqlite3.lib shell
+all: dll shell
# Dynamic link library section.
#
-dll: $(SQLITE3DLL)
+dll: $(SQLITE3DLL)
# Shell executable.
#
-shell: $(SQLITE3EXE)
-
-libsqlite3.lib: $(LIBOBJ)
- $(LTLIB) $(LTLIBOPTS) /OUT:$@ $(LIBOBJ) $(TLIBS)
+shell: $(SQLITE3EXE)
-$(SQLITE3DLL): $(LIBOBJ) $(LIBRESOBJS) $(CORE_LINK_DEP)
+$(SQLITE3DLL): $(LIBOBJ) $(LIBRESOBJS) $(CORE_LINK_DEP)
$(LD) $(LDFLAGS) $(LTLINKOPTS) $(LTLIBPATHS) /DLL $(CORE_LINK_OPTS)
/OUT:$@ $(LIBOBJ) $(LIBRESOBJS) $(LTLIBS) $(TLIBS)
@@ -918,4 +926,5 @@
clean:
del /Q *.exp *.lo *.ilk *.lib *.obj *.ncb *.pdb *.sdf *.suo 2>NUL
- del /Q *.bsc *.cod *.da *.bb *.bbg *.vc gmon.out 2>NUL
+ del /Q *.bsc *.def *.cod *.da *.bb *.bbg *.vc gmon.out 2>NUL
+ del /Q $(SQLITE3EXE) $(SQLITE3DLL) 2>NUL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sqlite-autoconf-3110000/configure
new/sqlite-autoconf-3110100/configure
--- old/sqlite-autoconf-3110000/configure 2016-02-15 18:36:50.000000000
+0100
+++ new/sqlite-autoconf-3110100/configure 2016-03-03 17:37:17.000000000
+0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for sqlite 3.11.0.
+# Generated by GNU Autoconf 2.69 for sqlite 3.11.1.
#
# Report bugs to <http://www.sqlite.org>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='sqlite'
PACKAGE_TARNAME='sqlite'
-PACKAGE_VERSION='3.11.0'
-PACKAGE_STRING='sqlite 3.11.0'
+PACKAGE_VERSION='3.11.1'
+PACKAGE_STRING='sqlite 3.11.1'
PACKAGE_BUGREPORT='http://www.sqlite.org'
PACKAGE_URL=''
@@ -1328,7 +1328,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures sqlite 3.11.0 to adapt to many kinds of systems.
+\`configure' configures sqlite 3.11.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1398,7 +1398,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of sqlite 3.11.0:";;
+ short | recursive ) echo "Configuration of sqlite 3.11.1:";;
esac
cat <<\_ACEOF
@@ -1518,7 +1518,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-sqlite configure 3.11.0
+sqlite configure 3.11.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1842,7 +1842,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by sqlite $as_me 3.11.0, which was
+It was created by sqlite $as_me 3.11.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2708,7 +2708,7 @@
# Define the identity of the package.
PACKAGE='sqlite'
- VERSION='3.11.0'
+ VERSION='3.11.1'
cat >>confdefs.h <<_ACEOF
@@ -14088,7 +14088,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by sqlite $as_me 3.11.0, which was
+This file was extended by sqlite $as_me 3.11.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14145,7 +14145,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-sqlite config.status 3.11.0
+sqlite config.status 3.11.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sqlite-autoconf-3110000/configure.ac
new/sqlite-autoconf-3110100/configure.ac
--- old/sqlite-autoconf-3110000/configure.ac 2016-02-15 18:36:46.000000000
+0100
+++ new/sqlite-autoconf-3110100/configure.ac 2016-03-03 17:37:13.000000000
+0100
@@ -10,7 +10,7 @@
#
AC_PREREQ(2.61)
-AC_INIT(sqlite, 3.11.0, http://www.sqlite.org)
+AC_INIT(sqlite, 3.11.1, http://www.sqlite.org)
AC_CONFIG_SRCDIR([sqlite3.c])
# Use automake.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sqlite-autoconf-3110000/sqlite3.c
new/sqlite-autoconf-3110100/sqlite3.c
--- old/sqlite-autoconf-3110000/sqlite3.c 2016-02-15 18:36:46.000000000
+0100
+++ new/sqlite-autoconf-3110100/sqlite3.c 2016-03-03 17:37:12.000000000
+0100
@@ -1,6 +1,6 @@
/******************************************************************************
** This file is an amalgamation of many separate C source files from SQLite
-** version 3.11.0. By combining all the individual C code files into this
+** version 3.11.1. By combining all the individual C code files into this
** single large file, the entire code can be compiled as a single translation
** unit. This allows many compilers to do optimizations that would not be
** possible if the files were compiled separately. Performance improvements
@@ -328,9 +328,9 @@
** [sqlite3_libversion_number()], [sqlite3_sourceid()],
** [sqlite_version()] and [sqlite_source_id()].
*/
-#define SQLITE_VERSION "3.11.0"
-#define SQLITE_VERSION_NUMBER 3011000
-#define SQLITE_SOURCE_ID "2016-02-15 17:29:24
3d862f207e3adc00f78066799ac5a8c282430a5f"
+#define SQLITE_VERSION "3.11.1"
+#define SQLITE_VERSION_NUMBER 3011001
+#define SQLITE_SOURCE_ID "2016-03-03 16:17:53
f047920ce16971e573bc6ec9a48b118c9de2b3a7"
/*
** CAPI3REF: Run-Time Library Version Numbers
@@ -176167,6 +176167,7 @@
return pRet;
}
+
/*
** Release a reference to data record returned by an earlier call to
** fts5DataRead().
@@ -177623,6 +177624,10 @@
iPgidx = szLeaf;
iPgidx += fts5GetVarint32(&a[iPgidx], iTermOff);
iOff = iTermOff;
+ if( iOff>n ){
+ p->rc = FTS5_CORRUPT;
+ return;
+ }
while( 1 ){
@@ -179968,7 +179973,10 @@
if( pLvl->aSeg ){
int iLvl, iSeg;
int iSegOut = 0;
- for(iLvl=0; iLvl<pStruct->nLevel; iLvl++){
+ /* Iterate through all segments, from oldest to newest. Add them to
+ ** the new Fts5Level object so that pLvl->aSeg[0] is the oldest
+ ** segment in the data structure. */
+ for(iLvl=pStruct->nLevel-1; iLvl>=0; iLvl--){
for(iSeg=0; iSeg<pStruct->aLevel[iLvl].nSeg; iSeg++){
pLvl->aSeg[iSegOut] = pStruct->aLevel[iLvl].aSeg[iSeg];
iSegOut++;
@@ -184355,7 +184363,7 @@
){
assert( nArg==0 );
UNUSED_PARAM2(nArg, apUnused);
- sqlite3_result_text(pCtx, "fts5: 2016-02-15 17:29:24
3d862f207e3adc00f78066799ac5a8c282430a5f", -1, SQLITE_TRANSIENT);
+ sqlite3_result_text(pCtx, "fts5: 2016-03-03 16:17:53
f047920ce16971e573bc6ec9a48b118c9de2b3a7", -1, SQLITE_TRANSIENT);
}
static int fts5Init(sqlite3 *db){
@@ -184416,6 +184424,17 @@
);
}
}
+
+ /* If SQLITE_FTS5_ENABLE_TEST_MI is defined, assume that the file
+ ** fts5_test_mi.c is compiled and linked into the executable. And call
+ ** its entry point to enable the matchinfo() demo. */
+#ifdef SQLITE_FTS5_ENABLE_TEST_MI
+ if( rc==SQLITE_OK ){
+ extern int sqlite3Fts5TestRegisterMatchinfo(sqlite3*);
+ rc = sqlite3Fts5TestRegisterMatchinfo(db);
+ }
+#endif
+
return rc;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sqlite-autoconf-3110000/sqlite3.h
new/sqlite-autoconf-3110100/sqlite3.h
--- old/sqlite-autoconf-3110000/sqlite3.h 2016-02-15 18:36:46.000000000
+0100
+++ new/sqlite-autoconf-3110100/sqlite3.h 2016-03-03 17:37:12.000000000
+0100
@@ -111,9 +111,9 @@
** [sqlite3_libversion_number()], [sqlite3_sourceid()],
** [sqlite_version()] and [sqlite_source_id()].
*/
-#define SQLITE_VERSION "3.11.0"
-#define SQLITE_VERSION_NUMBER 3011000
-#define SQLITE_SOURCE_ID "2016-02-15 17:29:24
3d862f207e3adc00f78066799ac5a8c282430a5f"
+#define SQLITE_VERSION "3.11.1"
+#define SQLITE_VERSION_NUMBER 3011001
+#define SQLITE_SOURCE_ID "2016-03-03 16:17:53
f047920ce16971e573bc6ec9a48b118c9de2b3a7"
/*
** CAPI3REF: Run-Time Library Version Numbers
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sqlite-autoconf-3110000/tea/configure
new/sqlite-autoconf-3110100/tea/configure
--- old/sqlite-autoconf-3110000/tea/configure 2016-02-15 18:36:51.000000000
+0100
+++ new/sqlite-autoconf-3110100/tea/configure 2016-03-03 17:37:18.000000000
+0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for sqlite 3.11.0.
+# Generated by GNU Autoconf 2.69 for sqlite 3.11.1.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@
# Identity of this package.
PACKAGE_NAME='sqlite'
PACKAGE_TARNAME='sqlite'
-PACKAGE_VERSION='3.11.0'
-PACKAGE_STRING='sqlite 3.11.0'
+PACKAGE_VERSION='3.11.1'
+PACKAGE_STRING='sqlite 3.11.1'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1292,7 +1292,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures sqlite 3.11.0 to adapt to many kinds of systems.
+\`configure' configures sqlite 3.11.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1353,7 +1353,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of sqlite 3.11.0:";;
+ short | recursive ) echo "Configuration of sqlite 3.11.1:";;
esac
cat <<\_ACEOF
@@ -1455,7 +1455,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-sqlite configure 3.11.0
+sqlite configure 3.11.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1866,7 +1866,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by sqlite $as_me 3.11.0, which was
+It was created by sqlite $as_me 3.11.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -9365,7 +9365,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by sqlite $as_me 3.11.0, which was
+This file was extended by sqlite $as_me 3.11.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -9418,7 +9418,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-sqlite config.status 3.11.0
+sqlite config.status 3.11.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sqlite-autoconf-3110000/tea/configure.ac
new/sqlite-autoconf-3110100/tea/configure.ac
--- old/sqlite-autoconf-3110000/tea/configure.ac 2016-02-15
18:36:51.000000000 +0100
+++ new/sqlite-autoconf-3110100/tea/configure.ac 2016-03-03
17:37:17.000000000 +0100
@@ -19,7 +19,7 @@
# so you can encode the package version directly into the source files.
#-----------------------------------------------------------------------
-AC_INIT([sqlite], [3.11.0])
+AC_INIT([sqlite], [3.11.1])
#--------------------------------------------------------------------
# Call TEA_INIT as the first TEA_ macro to set up initial vars.
++++++ sqlite-fts5-link.patch ++++++
Index: sqlite-autoconf-3110100/Makefile.am
===================================================================
--- sqlite-autoconf-3110100.orig/Makefile.am
+++ sqlite-autoconf-3110100/Makefile.am
@@ -3,6 +3,7 @@ AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_
lib_LTLIBRARIES = libsqlite3.la
libsqlite3_la_SOURCES = sqlite3.c
+libsqlite3_la_LIBADD = -lm
libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
bin_PROGRAMS = sqlite3
++++++ sqlite3-link-binary-with-libsqlite3.patch ++++++
Index: sqlite-autoconf-3110100/Makefile.am
===================================================================
--- sqlite-autoconf-3110100.orig/Makefile.am
+++ sqlite-autoconf-3110100/Makefile.am
@@ -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 = libsqlite3.la @EXTRA_SHELL_OBJ@
sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS
include_HEADERS = sqlite3.h sqlite3ext.h
