From 226e79762eb3296c8fabf1c67dd2049b3a789520 Mon Sep 17 00:00:00 2001 From: Stephen Lombardo Date: Wed, 9 Jan 2013 21:14:37 -0500 Subject: [PATCH] merge debian patch --- Makefile.in | 46 ++++++++++++++++---------------- VERSION | 2 +- configure.ac | 6 +++-- sqlite3.1 => sqlcipher.1 | 30 ++++++++++----------- sqlite3.pc.in => sqlcipher.pc.in | 0 5 files changed, 43 insertions(+), 41 deletions(-) rename sqlite3.1 => sqlcipher.1 (93%) rename sqlite3.pc.in => sqlcipher.pc.in (100%) diff --git a/Makefile.in b/Makefile.in index dcda29b..14bf06f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -153,7 +153,7 @@ exec_prefix = @exec_prefix@ libdir = @libdir@ pkgconfigdir = $(libdir)/pkgconfig bindir = @bindir@ -includedir = @includedir@ +includedir = @includedir@/sqlcipher INSTALL = @INSTALL@ LIBTOOL = ./libtool ALLOWRELEASE = @ALLOWRELEASE@ @@ -489,28 +489,28 @@ EXTHDR += \ # This is the default Makefile target. The objects listed here # 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 ./config.status -sqlite3.pc: $(TOP)/sqlite3.pc.in +sqlcipher.pc: $(TOP)/sqlcipher.pc.in ./config.status -libsqlite3.la: $(LIBOBJ) +libsqlcipher.la: $(LIBOBJ) $(LTLINK) -o $@ $(LIBOBJ) $(TLIBS) \ ${ALLOWRELEASE} -rpath "$(libdir)" -version-info "8:6:8" -libtclsqlite3.la: tclsqlite.lo libsqlite3.la +libtclsqlite3.la: tclsqlite.lo libsqlcipher.la $(LTLINK) -o $@ tclsqlite.lo \ - libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \ + libsqlcipher.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \ -rpath "$(TCLLIBDIR)" \ -version-info "8:6:8" \ -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) \ - -o $@ $(TOP)/src/shell.c libsqlite3.la \ + -o $@ $(TOP)/src/shell.c libsqlcipher.la \ $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)" # 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) $(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 \ - libsqlite3.la $(LIBTCL) + libsqlcipher.la $(LIBTCL) # 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. # # 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 # 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 += -DBUILD_sqlite -TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.la +TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlcipher.la TESTFIXTURE_SRC1 = sqlite3.c TESTFIXTURE_SRC = $(TESTSRC) $(TOP)/src/tclsqlite.c $(TESTFIXTURE_SRC$(USE_AMALGAMATION)) @@ -903,13 +903,13 @@ testfixture$(TEXE): $(TESTFIXTURE_SRC) -o $@ $(TESTFIXTURE_SRC) $(LIBTCL) $(TLIBS) -fulltest: testfixture$(TEXE) sqlite3$(TEXE) +fulltest: testfixture$(TEXE) sqlcipher$(TEXE) ./testfixture$(TEXE) $(TOP)/test/all.test -soaktest: testfixture$(TEXE) sqlite3$(TEXE) +soaktest: testfixture$(TEXE) sqlcipher$(TEXE) ./testfixture$(TEXE) $(TOP)/test/all.test -soak=1 -test: testfixture$(TEXE) sqlite3$(TEXE) +test: testfixture$(TEXE) sqlcipher$(TEXE) ./testfixture$(TEXE) $(TOP)/test/veryquick.test 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 # -lib_install: libsqlite3.la +lib_install: libsqlcipher.la $(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) - $(LTINSTALL) sqlite3$(BEXE) $(DESTDIR)$(bindir) + $(LTINSTALL) sqlcipher$(BEXE) $(DESTDIR)$(bindir) $(INSTALL) -d $(DESTDIR)$(includedir) $(INSTALL) -m 0644 sqlite3.h $(DESTDIR)$(includedir) $(INSTALL) -m 0644 $(TOP)/src/sqlite3ext.h $(DESTDIR)$(includedir) $(INSTALL) -d $(DESTDIR)$(pkgconfigdir) - $(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(pkgconfigdir) + $(INSTALL) -m 0644 sqlcipher.pc $(DESTDIR)$(pkgconfigdir) pkgIndex.tcl: 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) 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 -rf .libs .deps rm -f lemon$(BEXE) lempar.c parse.* sqlite*.tar.gz @@ -956,7 +956,7 @@ clean: rm -f *.da *.bb *.bbg gmon.out rm -rf quota2a quota2b quota2c rm -rf tsrc .target_source - rm -f tclsqlite3$(TEXE) + rm -f tclsqlcipher$(TEXE) rm -f testfixture$(TEXE) test.db rm -f sqlite3.dll sqlite3.lib sqlite3.exp sqlite3.def rm -f sqlite3.c @@ -964,7 +964,7 @@ clean: rm -f sqlite-output.vsix distclean: clean - rm -f config.log config.status libtool Makefile sqlite3.pc + rm -f config.log config.status libtool Makefile sqlcipher.pc # # Windows section diff --git a/VERSION b/VERSION index b36faa1..3e3c2f1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.7.14.1 +2.1.1 diff --git a/configure.ac b/configure.ac index 882c3cc..828778f 100644 --- a/configure.ac +++ b/configure.ac @@ -87,7 +87,7 @@ # you don't need (for example BLT) by erasing or commenting out # 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 sqlite_version_sanity_check=`cat $srcdir/VERSION | tr -d '\n'` @@ -159,6 +159,8 @@ if test "x${TCLLIBDIR+set}" != "xset" ; then TCLLIBDIR="${TCLLIBDIR}/sqlite3" fi +AC_CHECK_LIB([crypto], [HMAC_Init_ex], , + AC_MSG_ERROR([Library crypto not found. Install openssl!"])) ######### # Set up an appropriate program prefix @@ -700,5 +702,5 @@ AC_CONFIG_HEADERS(config.h) AC_SUBST(BUILD_CFLAGS) AC_OUTPUT([ Makefile -sqlite3.pc +sqlcipher.pc ]) diff --git a/sqlite3.1 b/sqlcipher.1 similarity index 93% rename from sqlite3.1 rename to sqlcipher.1 index 785995b..3a83046 100644 --- a/sqlite3.1 +++ b/sqlcipher.1 @@ -2,7 +2,7 @@ .\" 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" +.TH SQLCIPHER 1 "Mon Apr 15 23:49:17 2002" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -16,29 +16,29 @@ .\" .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 +.B sqlcipher +\- A command line interface for SQLCipher version 2 .SH SYNOPSIS -.B sqlite3 +.B sqlcipher .RI [ options ] .RI [ databasefile ] .RI [ SQL ] .SH SUMMARY .PP -.B sqlite3 -is a terminal-based front-end to the SQLite library that can evaluate +.B sqlcipher +is a terminal-based front-end to the SQLCipher library that can evaluate 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 batch processing features. .SH DESCRIPTION To start a -.B sqlite3 +.B sqlcipher interactive session, invoke the -.B sqlite3 +.B sqlcipher 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. @@ -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: .sp $ -.B sqlite3 mydata.db +.B sqlcipher mydata.db .br -SQLite version 3.1.3 +SQLite version 2.0.3 .br Enter ".help" for instructions .br @@ -85,7 +85,7 @@ semi-colons. For example: .sp $ -.B sqlite3 -line mydata.db 'select * from memos where priority > 20;' +.B sqlcipher -line mydata.db 'select * from memos where priority > 20;' .br text = lunch with Christine .br @@ -144,7 +144,7 @@ sqlite> .fi .SH OPTIONS -.B sqlite3 +.B sqlcipher has the following options: .TP .BI \-init\ file @@ -190,7 +190,7 @@ Show help on options and exit. .SH INIT FILE -.B sqlite3 +.B sqlcipher 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 @@ -220,7 +220,7 @@ 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/ +http://www.sqlcipher.net/ .br The sqlite-doc package .SH AUTHOR diff --git a/sqlite3.pc.in b/sqlcipher.pc.in similarity index 100% rename from sqlite3.pc.in rename to sqlcipher.pc.in