Skip to content

Commit 226e797

Browse files
sjlombardosjlombardo
committed
merge debian patch
1 parent cf9fb1e commit 226e797

File tree

5 files changed

+43
-41
lines changed

5 files changed

+43
-41
lines changed

‎Makefile.in‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ exec_prefix = @exec_prefix@
153153
libdir = @libdir@
154154
pkgconfigdir = $(libdir)/pkgconfig
155155
bindir = @bindir@
156-
includedir = @includedir@
156+
includedir = @includedir@/sqlcipher
157157
INSTALL = @INSTALL@
158158
LIBTOOL = ./libtool
159159
ALLOWRELEASE = @ALLOWRELEASE@
@@ -489,28 +489,28 @@ EXTHDR += \
489489
# This is the default Makefile target. The objects listed here
490490
# are what get build when you type just "make" with no arguments.
491491
#
492-
all: sqlite3.h libsqlite3.la sqlite3$(TEXE) $(HAVE_TCL:1=libtclsqlite3.la)
492+
all: sqlite3.h libsqlcipher.la sqlcipher$(TEXE) $(HAVE_TCL:1=libtclsqlite3.la)
493493

494494
Makefile: $(TOP)/Makefile.in
495495
./config.status
496496

497-
sqlite3.pc: $(TOP)/sqlite3.pc.in
497+
sqlcipher.pc: $(TOP)/sqlcipher.pc.in
498498
./config.status
499499

500-
libsqlite3.la: $(LIBOBJ)
500+
libsqlcipher.la: $(LIBOBJ)
501501
$(LTLINK) -o $@ $(LIBOBJ) $(TLIBS) \
502502
${ALLOWRELEASE} -rpath "$(libdir)" -version-info "8:6:8"
503503

504-
libtclsqlite3.la: tclsqlite.lo libsqlite3.la
504+
libtclsqlite3.la: tclsqlite.lo libsqlcipher.la
505505
$(LTLINK) -o $@ tclsqlite.lo \
506-
libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
506+
libsqlcipher.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
507507
-rpath "$(TCLLIBDIR)" \
508508
-version-info "8:6:8" \
509509
-avoid-version
510510

511-
sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la sqlite3.h
511+
sqlcipher$(TEXE): $(TOP)/src/shell.c libsqlcipher.la sqlite3.h
512512
$(LTLINK) $(READLINE_FLAGS) \
513-
-o $@ $(TOP)/src/shell.c libsqlite3.la \
513+
-o $@ $(TOP)/src/shell.c libsqlcipher.la \
514514
$(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
515515

516516
# This target creates a directory named "tsrc" and fills it with
@@ -788,9 +788,9 @@ tclsqlite-shell.lo: $(TOP)/src/tclsqlite.c $(HDR)
788788
tclsqlite-stubs.lo: $(TOP)/src/tclsqlite.c $(HDR)
789789
$(LTCOMPILE) -DUSE_TCL_STUBS=1 -o $@ -c $(TOP)/src/tclsqlite.c
790790

791-
tclsqlite3$(TEXE): tclsqlite-shell.lo libsqlite3.la
791+
tclsqlcipher$(TEXE): tclsqlite-shell.lo libsqlcipher.la
792792
$(LTLINK) -o $@ tclsqlite-shell.lo \
793-
libsqlite3.la $(LIBTCL)
793+
libsqlcipher.la $(LIBTCL)
794794

795795
# Rules to build opcodes.c and opcodes.h
796796
#
@@ -886,15 +886,15 @@ rtree.lo: $(TOP)/ext/rtree/rtree.c $(HDR) $(EXTHDR)
886886
# Rules to build the 'testfixture' application.
887887
#
888888
# If using the amalgamation, use sqlite3.c directly to build the test
889-
# fixture. Otherwise link against libsqlite3.la. (This distinction is
889+
# fixture. Otherwise link against libsqlcipher.la. (This distinction is
890890
# necessary because the test fixture requires non-API symbols which are
891891
# hidden when the library is built via the amalgamation).
892892
#
893893
TESTFIXTURE_FLAGS = -DTCLSH=1 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1
894894
TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE
895895
TESTFIXTURE_FLAGS += -DBUILD_sqlite
896896

897-
TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.la
897+
TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlcipher.la
898898
TESTFIXTURE_SRC1 = sqlite3.c
899899
TESTFIXTURE_SRC = $(TESTSRC) $(TOP)/src/tclsqlite.c $(TESTFIXTURE_SRC$(USE_AMALGAMATION))
900900

@@ -903,13 +903,13 @@ testfixture$(TEXE): $(TESTFIXTURE_SRC)
903903
-o $@ $(TESTFIXTURE_SRC) $(LIBTCL) $(TLIBS)
904904

905905

906-
fulltest: testfixture$(TEXE) sqlite3$(TEXE)
906+
fulltest: testfixture$(TEXE) sqlcipher$(TEXE)
907907
./testfixture$(TEXE) $(TOP)/test/all.test
908908

909-
soaktest: testfixture$(TEXE) sqlite3$(TEXE)
909+
soaktest: testfixture$(TEXE) sqlcipher$(TEXE)
910910
./testfixture$(TEXE) $(TOP)/test/all.test -soak=1
911911

912-
test: testfixture$(TEXE) sqlite3$(TEXE)
912+
test: testfixture$(TEXE) sqlcipher$(TEXE)
913913
./testfixture$(TEXE) $(TOP)/test/veryquick.test
914914

915915
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
925925

926926
# Standard install and cleanup targets
927927
#
928-
lib_install: libsqlite3.la
928+
lib_install: libsqlcipher.la
929929
$(INSTALL) -d $(DESTDIR)$(libdir)
930-
$(LTINSTALL) libsqlite3.la $(DESTDIR)$(libdir)
930+
$(LTINSTALL) libsqlcipher.la $(DESTDIR)$(libdir)
931931

932-
install: sqlite3$(BEXE) lib_install sqlite3.h sqlite3.pc ${HAVE_TCL:1=tcl_install}
932+
install: sqlcipher$(BEXE) lib_install sqlite3.h sqlcipher.pc ${HAVE_TCL:1=tcl_install}
933933
$(INSTALL) -d $(DESTDIR)$(bindir)
934-
$(LTINSTALL) sqlite3$(BEXE) $(DESTDIR)$(bindir)
934+
$(LTINSTALL) sqlcipher$(BEXE) $(DESTDIR)$(bindir)
935935
$(INSTALL) -d $(DESTDIR)$(includedir)
936936
$(INSTALL) -m 0644 sqlite3.h $(DESTDIR)$(includedir)
937937
$(INSTALL) -m 0644 $(TOP)/src/sqlite3ext.h $(DESTDIR)$(includedir)
938938
$(INSTALL) -d $(DESTDIR)$(pkgconfigdir)
939-
$(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(pkgconfigdir)
939+
$(INSTALL) -m 0644 sqlcipher.pc $(DESTDIR)$(pkgconfigdir)
940940

941941
pkgIndex.tcl:
942942
echo 'package ifneeded sqlite3 $(RELEASE) [list load $(TCLLIBDIR)/libtclsqlite3.so sqlite3]' > $@
@@ -947,7 +947,7 @@ tcl_install: lib_install libtclsqlite3.la pkgIndex.tcl
947947
$(INSTALL) -m 0644 pkgIndex.tcl $(DESTDIR)$(TCLLIBDIR)
948948

949949
clean:
950-
rm -f *.lo *.la *.o sqlite3$(TEXE) libsqlite3.la
950+
rm -f *.lo *.la *.o sqlcipher$(TEXE) libsqlcipher.la
951951
rm -f sqlite3.h opcodes.*
952952
rm -rf .libs .deps
953953
rm -f lemon$(BEXE) lempar.c parse.* sqlite*.tar.gz
@@ -956,15 +956,15 @@ clean:
956956
rm -f *.da *.bb *.bbg gmon.out
957957
rm -rf quota2a quota2b quota2c
958958
rm -rf tsrc .target_source
959-
rm -f tclsqlite3$(TEXE)
959+
rm -f tclsqlcipher$(TEXE)
960960
rm -f testfixture$(TEXE) test.db
961961
rm -f sqlite3.dll sqlite3.lib sqlite3.exp sqlite3.def
962962
rm -f sqlite3.c
963963
rm -f sqlite3_analyzer$(TEXE) sqlite3_analyzer.c
964964
rm -f sqlite-output.vsix
965965

966966
distclean: clean
967-
rm -f config.log config.status libtool Makefile sqlite3.pc
967+
rm -f config.log config.status libtool Makefile sqlcipher.pc
968968

969969
#
970970
# Windows section

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.7.14.1
1+
2.1.1

‎configure.ac‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
# you don't need (for example BLT) by erasing or commenting out
8888
# the corresponding code.
8989
#
90-
AC_INIT(sqlite, m4_esyscmd([cat VERSION | tr -d '\n']))
90+
AC_INIT(sqlcipher, 2.0.6)
9191

9292
dnl Make sure the local VERSION file matches this configure script
9393
sqlite_version_sanity_check=`cat $srcdir/VERSION | tr -d '\n'`
@@ -159,6 +159,8 @@ if test "x${TCLLIBDIR+set}" != "xset" ; then
159159
TCLLIBDIR="${TCLLIBDIR}/sqlite3"
160160
fi
161161

162+
AC_CHECK_LIB([crypto], [HMAC_Init_ex], ,
163+
AC_MSG_ERROR([Library crypto not found. Install openssl!"]))
162164

163165
#########
164166
# Set up an appropriate program prefix
@@ -700,5 +702,5 @@ AC_CONFIG_HEADERS(config.h)
700702
AC_SUBST(BUILD_CFLAGS)
701703
AC_OUTPUT([
702704
Makefile
703-
sqlite3.pc
705+
sqlcipher.pc
704706
])

sqlite3.1 renamed to sqlcipher.1

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
.\" First parameter, NAME, should be all caps
33
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
44
.\" other parameters are allowed: see man(7), man(1)
5-
.TH SQLITE3 1 "Mon Apr 15 23:49:17 2002"
5+
.TH SQLCIPHER 1 "Mon Apr 15 23:49:17 2002"
66
.\" Please adjust this date whenever revising the manpage.
77
.\"
88
.\" Some roff macros, for reference:
@@ -16,29 +16,29 @@
1616
.\" .sp <n> insert n+1 empty lines
1717
.\" for manpage-specific macros, see man(7)
1818
.SH NAME
19-
.B sqlite3
20-
\- A command line interface for SQLite version 3
19+
.B sqlcipher
20+
\- A command line interface for SQLCipher version 2
2121

2222
.SH SYNOPSIS
23-
.B sqlite3
23+
.B sqlcipher
2424
.RI [ options ]
2525
.RI [ databasefile ]
2626
.RI [ SQL ]
2727

2828
.SH SUMMARY
2929
.PP
30-
.B sqlite3
31-
is a terminal-based front-end to the SQLite library that can evaluate
30+
.B sqlcipher
31+
is a terminal-based front-end to the SQLCipher library that can evaluate
3232
queries interactively and display the results in multiple formats.
33-
.B sqlite3
33+
.B sqlcipher
3434
can also be used within shell scripts and other applications to provide
3535
batch processing features.
3636

3737
.SH DESCRIPTION
3838
To start a
39-
.B sqlite3
39+
.B sqlcipher
4040
interactive session, invoke the
41-
.B sqlite3
41+
.B sqlcipher
4242
command and optionally provide the name of a database file. If the
4343
database file does not exist, it will be created. If the database file
4444
does exist, it will be opened.
@@ -47,9 +47,9 @@ For example, to create a new database file named "mydata.db", create
4747
a table named "memos" and insert a couple of records into that table:
4848
.sp
4949
$
50-
.B sqlite3 mydata.db
50+
.B sqlcipher mydata.db
5151
.br
52-
SQLite version 3.1.3
52+
SQLite version 2.0.3
5353
.br
5454
Enter ".help" for instructions
5555
.br
@@ -85,7 +85,7 @@ semi-colons.
8585
For example:
8686
.sp
8787
$
88-
.B sqlite3 -line mydata.db 'select * from memos where priority > 20;'
88+
.B sqlcipher -line mydata.db 'select * from memos where priority > 20;'
8989
.br
9090
text = lunch with Christine
9191
.br
@@ -144,7 +144,7 @@ sqlite>
144144
.fi
145145

146146
.SH OPTIONS
147-
.B sqlite3
147+
.B sqlcipher
148148
has the following options:
149149
.TP
150150
.BI \-init\ file
@@ -190,7 +190,7 @@ Show help on options and exit.
190190

191191

192192
.SH INIT FILE
193-
.B sqlite3
193+
.B sqlcipher
194194
reads an initialization file to set the configuration of the
195195
interactive environment. Throughout initialization, any previously
196196
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.
220220
o All other command line options are processed.
221221

222222
.SH SEE ALSO
223-
http://www.sqlite.org/
223+
http://www.sqlcipher.net/
224224
.br
225225
The sqlite-doc package
226226
.SH AUTHOR

sqlite3.pc.in renamed to sqlcipher.pc.in

File renamed without changes.

0 commit comments

Comments
 (0)