status-im
/
sqlcipher
mirror of https://github.com/status-im/sqlcipher.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

merge debian patch

This commit is contained in:
Stephen Lombardo 2013-01-09 21:14:37 -05:00
parent cf9fb1e077
commit 226e79762e
5 changed files with 43 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Makefile.in
View File

@ -153,7 +153,7 @@ exec_prefix = @exec_prefix@
libdir = @libdir@ libdir = @libdir@
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
bindir = @bindir@ bindir = @bindir@
includedir = @includedir@ includedir = @includedir@/sqlcipher
INSTALL = @INSTALL@ INSTALL = @INSTALL@
LIBTOOL = ./libtool LIBTOOL = ./libtool
ALLOWRELEASE = @ALLOWRELEASE@ ALLOWRELEASE = @ALLOWRELEASE@
@ -489,28 +489,28 @@ EXTHDR += \
# This is the default Makefile target. The objects listed here # This is the default Makefile target. The objects listed here
# are what get build when you type just "make" with no arguments. # are what get build when you type just "make" with no arguments.
# #
all: sqlite3.h libsqlite3.la sqlite3$(TEXE) $(HAVE_TCL:1=libtclsqlite3.la) all: sqlite3.h libsqlcipher.la sqlcipher$(TEXE) $(HAVE_TCL:1=libtclsqlite3.la)
Makefile: $(TOP)/Makefile.in Makefile: $(TOP)/Makefile.in
./config.status ./config.status
sqlite3.pc: $(TOP)/sqlite3.pc.in sqlcipher.pc: $(TOP)/sqlcipher.pc.in
./config.status ./config.status
libsqlite3.la: $(LIBOBJ) libsqlcipher.la: $(LIBOBJ)
$(LTLINK) -o $@ $(LIBOBJ) $(TLIBS) \ $(LTLINK) -o $@ $(LIBOBJ) $(TLIBS) \
${ALLOWRELEASE} -rpath "$(libdir)" -version-info "8:6:8" ${ALLOWRELEASE} -rpath "$(libdir)" -version-info "8:6:8"
libtclsqlite3.la: tclsqlite.lo libsqlite3.la libtclsqlite3.la: tclsqlite.lo libsqlcipher.la
$(LTLINK) -o $@ tclsqlite.lo \ $(LTLINK) -o $@ tclsqlite.lo \
libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \ libsqlcipher.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
-rpath "$(TCLLIBDIR)" \ -rpath "$(TCLLIBDIR)" \
-version-info "8:6:8" \ -version-info "8:6:8" \
-avoid-version -avoid-version
sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la sqlite3.h sqlcipher$(TEXE): $(TOP)/src/shell.c libsqlcipher.la sqlite3.h
$(LTLINK) $(READLINE_FLAGS) \ $(LTLINK) $(READLINE_FLAGS) \
-o $@ $(TOP)/src/shell.c libsqlite3.la \ -o $@ $(TOP)/src/shell.c libsqlcipher.la \
$(LIBREADLINE) $(TLIBS) -rpath "$(libdir)" $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
# This target creates a directory named "tsrc" and fills it with # This target creates a directory named "tsrc" and fills it with
@ -788,9 +788,9 @@ tclsqlite-shell.lo: $(TOP)/src/tclsqlite.c $(HDR)
tclsqlite-stubs.lo: $(TOP)/src/tclsqlite.c $(HDR) tclsqlite-stubs.lo: $(TOP)/src/tclsqlite.c $(HDR)
$(LTCOMPILE) -DUSE_TCL_STUBS=1 -o $@ -c $(TOP)/src/tclsqlite.c $(LTCOMPILE) -DUSE_TCL_STUBS=1 -o $@ -c $(TOP)/src/tclsqlite.c
tclsqlite3$(TEXE): tclsqlite-shell.lo libsqlite3.la tclsqlcipher$(TEXE): tclsqlite-shell.lo libsqlcipher.la
$(LTLINK) -o $@ tclsqlite-shell.lo \ $(LTLINK) -o $@ tclsqlite-shell.lo \
libsqlite3.la $(LIBTCL) libsqlcipher.la $(LIBTCL)
# Rules to build opcodes.c and opcodes.h # Rules to build opcodes.c and opcodes.h
# #
@ -886,7 +886,7 @@ rtree.lo: $(TOP)/ext/rtree/rtree.c $(HDR) $(EXTHDR)
# Rules to build the 'testfixture' application. # Rules to build the 'testfixture' application.
# #
# If using the amalgamation, use sqlite3.c directly to build the test # If using the amalgamation, use sqlite3.c directly to build the test
# fixture. Otherwise link against libsqlite3.la. (This distinction is # fixture. Otherwise link against libsqlcipher.la. (This distinction is
# necessary because the test fixture requires non-API symbols which are # necessary because the test fixture requires non-API symbols which are
# hidden when the library is built via the amalgamation). # hidden when the library is built via the amalgamation).
# #
@ -894,7 +894,7 @@ TESTFIXTURE_FLAGS = -DTCLSH=1 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1
TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE
TESTFIXTURE_FLAGS += -DBUILD_sqlite TESTFIXTURE_FLAGS += -DBUILD_sqlite
TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.la TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlcipher.la
TESTFIXTURE_SRC1 = sqlite3.c TESTFIXTURE_SRC1 = sqlite3.c
TESTFIXTURE_SRC = $(TESTSRC) $(TOP)/src/tclsqlite.c $(TESTFIXTURE_SRC$(USE_AMALGAMATION)) TESTFIXTURE_SRC = $(TESTSRC) $(TOP)/src/tclsqlite.c $(TESTFIXTURE_SRC$(USE_AMALGAMATION))
@ -903,13 +903,13 @@ testfixture$(TEXE): $(TESTFIXTURE_SRC)
-o $@ $(TESTFIXTURE_SRC) $(LIBTCL) $(TLIBS) -o $@ $(TESTFIXTURE_SRC) $(LIBTCL) $(TLIBS)
fulltest: testfixture$(TEXE) sqlite3$(TEXE) fulltest: testfixture$(TEXE) sqlcipher$(TEXE)
./testfixture$(TEXE) $(TOP)/test/all.test ./testfixture$(TEXE) $(TOP)/test/all.test
soaktest: testfixture$(TEXE) sqlite3$(TEXE) soaktest: testfixture$(TEXE) sqlcipher$(TEXE)
./testfixture$(TEXE) $(TOP)/test/all.test -soak=1 ./testfixture$(TEXE) $(TOP)/test/all.test -soak=1
test: testfixture$(TEXE) sqlite3$(TEXE) test: testfixture$(TEXE) sqlcipher$(TEXE)
./testfixture$(TEXE) $(TOP)/test/veryquick.test ./testfixture$(TEXE) $(TOP)/test/veryquick.test
sqlite3_analyzer.c: sqlite3.c $(TOP)/src/test_stat.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl sqlite3_analyzer.c: sqlite3.c $(TOP)/src/test_stat.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl
@ -925,18 +925,18 @@ sqlite3_analyzer$(TEXE): sqlite3_analyzer.c
# Standard install and cleanup targets # Standard install and cleanup targets
# #
lib_install: libsqlite3.la lib_install: libsqlcipher.la
$(INSTALL) -d $(DESTDIR)$(libdir) $(INSTALL) -d $(DESTDIR)$(libdir)
$(LTINSTALL) libsqlite3.la $(DESTDIR)$(libdir) $(LTINSTALL) libsqlcipher.la $(DESTDIR)$(libdir)
install: sqlite3$(BEXE) lib_install sqlite3.h sqlite3.pc ${HAVE_TCL:1=tcl_install} install: sqlcipher$(BEXE) lib_install sqlite3.h sqlcipher.pc ${HAVE_TCL:1=tcl_install}
$(INSTALL) -d $(DESTDIR)$(bindir) $(INSTALL) -d $(DESTDIR)$(bindir)
$(LTINSTALL) sqlite3$(BEXE) $(DESTDIR)$(bindir) $(LTINSTALL) sqlcipher$(BEXE) $(DESTDIR)$(bindir)
$(INSTALL) -d $(DESTDIR)$(includedir) $(INSTALL) -d $(DESTDIR)$(includedir)
$(INSTALL) -m 0644 sqlite3.h $(DESTDIR)$(includedir) $(INSTALL) -m 0644 sqlite3.h $(DESTDIR)$(includedir)
$(INSTALL) -m 0644 $(TOP)/src/sqlite3ext.h $(DESTDIR)$(includedir) $(INSTALL) -m 0644 $(TOP)/src/sqlite3ext.h $(DESTDIR)$(includedir)
$(INSTALL) -d $(DESTDIR)$(pkgconfigdir) $(INSTALL) -d $(DESTDIR)$(pkgconfigdir)
$(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(pkgconfigdir) $(INSTALL) -m 0644 sqlcipher.pc $(DESTDIR)$(pkgconfigdir)
pkgIndex.tcl: pkgIndex.tcl:
echo 'package ifneeded sqlite3 $(RELEASE) [list load $(TCLLIBDIR)/libtclsqlite3.so sqlite3]' > $@ echo 'package ifneeded sqlite3 $(RELEASE) [list load $(TCLLIBDIR)/libtclsqlite3.so sqlite3]' > $@
@ -947,7 +947,7 @@ tcl_install: lib_install libtclsqlite3.la pkgIndex.tcl
$(INSTALL) -m 0644 pkgIndex.tcl $(DESTDIR)$(TCLLIBDIR) $(INSTALL) -m 0644 pkgIndex.tcl $(DESTDIR)$(TCLLIBDIR)
clean: clean:
rm -f *.lo *.la *.o sqlite3$(TEXE) libsqlite3.la rm -f *.lo *.la *.o sqlcipher$(TEXE) libsqlcipher.la
rm -f sqlite3.h opcodes.* rm -f sqlite3.h opcodes.*
rm -rf .libs .deps rm -rf .libs .deps
rm -f lemon$(BEXE) lempar.c parse.* sqlite*.tar.gz rm -f lemon$(BEXE) lempar.c parse.* sqlite*.tar.gz
@ -956,7 +956,7 @@ clean:
rm -f *.da *.bb *.bbg gmon.out rm -f *.da *.bb *.bbg gmon.out
rm -rf quota2a quota2b quota2c rm -rf quota2a quota2b quota2c
rm -rf tsrc .target_source rm -rf tsrc .target_source
rm -f tclsqlite3$(TEXE) rm -f tclsqlcipher$(TEXE)
rm -f testfixture$(TEXE) test.db rm -f testfixture$(TEXE) test.db
rm -f sqlite3.dll sqlite3.lib sqlite3.exp sqlite3.def rm -f sqlite3.dll sqlite3.lib sqlite3.exp sqlite3.def
rm -f sqlite3.c rm -f sqlite3.c
@ -964,7 +964,7 @@ clean:
rm -f sqlite-output.vsix rm -f sqlite-output.vsix
distclean: clean distclean: clean
rm -f config.log config.status libtool Makefile sqlite3.pc rm -f config.log config.status libtool Makefile sqlcipher.pc
# #
# Windows section # Windows section

2
VERSION
View File

@ -1 +1 @@
3.7.14.1 2.1.1

6
configure.ac
View File

@ -87,7 +87,7 @@
# you don't need (for example BLT) by erasing or commenting out # you don't need (for example BLT) by erasing or commenting out
# the corresponding code. # the corresponding code.
# #
AC_INIT(sqlite, m4_esyscmd([cat VERSION | tr -d '\n'])) AC_INIT(sqlcipher, 2.0.6)
dnl Make sure the local VERSION file matches this configure script dnl Make sure the local VERSION file matches this configure script
sqlite_version_sanity_check=`cat $srcdir/VERSION | tr -d '\n'` sqlite_version_sanity_check=`cat $srcdir/VERSION | tr -d '\n'`
@ -159,6 +159,8 @@ if test "x${TCLLIBDIR+set}" != "xset" ; then
TCLLIBDIR="${TCLLIBDIR}/sqlite3" TCLLIBDIR="${TCLLIBDIR}/sqlite3"
fi fi
AC_CHECK_LIB([crypto], [HMAC_Init_ex], ,
AC_MSG_ERROR([Library crypto not found. Install openssl!"]))
######### #########
# Set up an appropriate program prefix # Set up an appropriate program prefix
@ -700,5 +702,5 @@ AC_CONFIG_HEADERS(config.h)
AC_SUBST(BUILD_CFLAGS) AC_SUBST(BUILD_CFLAGS)
AC_OUTPUT([ AC_OUTPUT([
Makefile Makefile
sqlite3.pc sqlcipher.pc
]) ])

30
sqlite3.1 → sqlcipher.1
View File

@ -2,7 +2,7 @@
.\" First parameter, NAME, should be all caps .\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1) .\" other parameters are allowed: see man(7), man(1)
.TH SQLITE3 1 "Mon Apr 15 23:49:17 2002" .TH SQLCIPHER 1 "Mon Apr 15 23:49:17 2002"
.\" Please adjust this date whenever revising the manpage. .\" Please adjust this date whenever revising the manpage.
.\" .\"
.\" Some roff macros, for reference: .\" Some roff macros, for reference:
@ -16,29 +16,29 @@
.\" .sp <n> insert n+1 empty lines .\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7) .\" for manpage-specific macros, see man(7)
.SH NAME .SH NAME
.B sqlite3 .B sqlcipher
\- A command line interface for SQLite version 3 \- A command line interface for SQLCipher version 2
.SH SYNOPSIS .SH SYNOPSIS
.B sqlite3 .B sqlcipher
.RI [ options ] .RI [ options ]
.RI [ databasefile ] .RI [ databasefile ]
.RI [ SQL ] .RI [ SQL ]
.SH SUMMARY .SH SUMMARY
.PP .PP
.B sqlite3 .B sqlcipher
is a terminal-based front-end to the SQLite library that can evaluate is a terminal-based front-end to the SQLCipher library that can evaluate
queries interactively and display the results in multiple formats. queries interactively and display the results in multiple formats.
.B sqlite3 .B sqlcipher
can also be used within shell scripts and other applications to provide can also be used within shell scripts and other applications to provide
batch processing features. batch processing features.
.SH DESCRIPTION .SH DESCRIPTION
To start a To start a
.B sqlite3 .B sqlcipher
interactive session, invoke the interactive session, invoke the
.B sqlite3 .B sqlcipher
command and optionally provide the name of a database file. If the 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 database file does not exist, it will be created. If the database file
does exist, it will be opened. does exist, it will be opened.
@ -47,9 +47,9 @@ 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: a table named "memos" and insert a couple of records into that table:
.sp .sp
$ $
.B sqlite3 mydata.db .B sqlcipher mydata.db
.br .br
SQLite version 3.1.3 SQLite version 2.0.3
.br .br
Enter ".help" for instructions Enter ".help" for instructions
.br .br
@ -85,7 +85,7 @@ semi-colons.
For example: For example:
.sp .sp
$ $
.B sqlite3 -line mydata.db 'select * from memos where priority > 20;' .B sqlcipher -line mydata.db 'select * from memos where priority > 20;'
.br .br
text = lunch with Christine text = lunch with Christine
.br .br
@ -144,7 +144,7 @@ sqlite>
.fi .fi
.SH OPTIONS .SH OPTIONS
.B sqlite3 .B sqlcipher
has the following options: has the following options:
.TP .TP
.BI \-init\ file .BI \-init\ file
@ -190,7 +190,7 @@ Show help on options and exit.
.SH INIT FILE .SH INIT FILE
.B sqlite3 .B sqlcipher
reads an initialization file to set the configuration of the reads an initialization file to set the configuration of the
interactive environment. Throughout initialization, any previously interactive environment. Throughout initialization, any previously
specified setting can be overridden. The sequence of initialization is specified setting can be overridden. The sequence of initialization is
@ -220,7 +220,7 @@ o If the -init option is present, the specified file is processed.
o All other command line options are processed. o All other command line options are processed.
.SH SEE ALSO .SH SEE ALSO
http://www.sqlite.org/ http://www.sqlcipher.net/
.br .br
The sqlite-doc package The sqlite-doc package
.SH AUTHOR .SH AUTHOR

0
sqlite3.pc.in → sqlcipher.pc.in
View File