diff options
Diffstat (limited to 'debian/patches/20-change-name-to-sqlcipher.patch')
| -rw-r--r-- | debian/patches/20-change-name-to-sqlcipher.patch | 217 |
1 files changed, 217 insertions, 0 deletions
diff --git a/debian/patches/20-change-name-to-sqlcipher.patch b/debian/patches/20-change-name-to-sqlcipher.patch new file mode 100644 index 0000000..d8b3c26 --- /dev/null +++ b/debian/patches/20-change-name-to-sqlcipher.patch @@ -0,0 +1,217 @@ +diff --git a/VERSION b/VERSION +index c77a7de..50ffc5a 100644 +--- a/VERSION ++++ b/VERSION +@@ -1 +1 @@ +-3.7.9 ++2.0.3 +diff --git a/configure.ac b/configure.ac +index 46afeb7..eb69607 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.3) + + 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 +@@ -698,5 +732,5 @@ AC_CONFIG_HEADERS(config.h) + AC_SUBST(BUILD_CFLAGS) + AC_OUTPUT([ + Makefile +-sqlite3.pc ++sqlcipher.pc + ]) +--- a/Makefile.in 2012-03-31 11:10:44.000000000 -0400 ++++ b/Makefile.in 2012-03-31 18:02:26.000000000 -0400 +@@ -153,7 +153,7 @@ + libdir = @libdir@ + pkgconfigdir = $(libdir)/pkgconfig + bindir = @bindir@ +-includedir = @includedir@ ++includedir = @includedir@/sqlcipher + INSTALL = @INSTALL@ + LIBTOOL = ./libtool + ALLOWRELEASE = @ALLOWRELEASE@ +@@ -489,30 +489,30 @@ + # 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" + sed -i "/dependency_libs/s/'.*'/''/" $@ + +-libtclsqlite3.la: tclsqlite.lo libsqlite3.la ++libtclsqlite3.la: tclsqlite.lo libsqlcipher.la + $(LTLINK) -o $@ tclsqlite.lo \ +- libsqlite3.la @TCL_STUB_LIB_SPEC@ \ ++ libsqlcipher.la @TCL_STUB_LIB_SPEC@ \ + -rpath "$(TCLLIBDIR)" \ + -version-info "8:6:8" \ + -avoid-version + sed -i "/dependency_libs/s/'.*'/''/" $@ + +-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) -rpath "$(libdir)" + + # This target creates a directory named "tsrc" and fills it with +@@ -790,9 +790,9 @@ + 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 + # +@@ -882,7 +882,7 @@ + # 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). + # +@@ -890,7 +890,7 @@ + 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)) + +@@ -899,13 +899,13 @@ + -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 +@@ -921,18 +921,18 @@ + + # 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]' > $@ +@@ -943,7 +943,7 @@ + $(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 +@@ -951,14 +951,14 @@ + rm -f $(PUBLISH) + rm -f *.da *.bb *.bbg gmon.out + 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 + rm -f sqlite3_analyzer$(TEXE) sqlite3_analyzer.c + + 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/sqlite3.pc.in b/sqlite3.pc.in +deleted file mode 100644 +index c8d0aa9..0000000 +--- a/sqlite3.pc.in ++++ /dev/null +@@ -1,13 +0,0 @@ +-# Package Information for pkg-config +- +-prefix=@prefix@ +-exec_prefix=@exec_prefix@ +-libdir=@libdir@ +-includedir=@includedir@ +- +-Name: SQLite +-Description: SQL database engine +-Version: @RELEASE@ +-Libs: -L${libdir} -lsqlite3 +-Libs.private: @LIBS@ +-Cflags: -I${includedir} +--- /dev/null 2012-03-31 10:49:42.330855572 -0400 ++++ b/sqlcipher.pc.in 2012-03-31 18:07:59.000000000 -0400 +@@ -0,0 +1,13 @@ ++# Package Information for pkg-config ++ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: SQLite ++Description: SQL database engine ++Version: @RELEASE@ ++Libs: -L${libdir} -lsqlite3 ++Libs.private: @LIBS@ ++Cflags: -I${includedir} |