From cb5a77187de8b308a379dcd4d69a8ebcf33cf305 Mon Sep 17 00:00:00 2001 From: Billy Gray Date: Wed, 12 Oct 2011 15:36:51 -0400 Subject: [PATCH 1/6] Revert "remove the customizations that were merged in with the project file changes we made on the ditto branch" Doing this to restore Ditto includes on our down-stream branch. Note: no changes should be made to this branch for up-stream merging! This reverts commit ff64398d847db721f3e177104752fac8c5c75752. --- sqlcipher.xcodeproj/project.pbxproj | 2 ++ src/func.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/sqlcipher.xcodeproj/project.pbxproj b/sqlcipher.xcodeproj/project.pbxproj index 3feaac8a9b..a5d9a3a365 100644 --- a/sqlcipher.xcodeproj/project.pbxproj +++ b/sqlcipher.xcodeproj/project.pbxproj @@ -192,6 +192,7 @@ HEADER_SEARCH_PATHS = ( "$(PROJECT_DIR)", "$(OPENSSL_SRC)/include", + "$(DITTO_SRC)", ); INSTALL_PATH = /usr/local/lib; OTHER_CFLAGS = ( @@ -214,6 +215,7 @@ HEADER_SEARCH_PATHS = ( "$(PROJECT_DIR)", "$(OPENSSL_SRC)/include", + "$(DITTO_SRC)", ); INSTALL_PATH = /usr/local/lib; OTHER_CFLAGS = ( diff --git a/src/func.c b/src/func.c index d461412725..ab72665cba 100644 --- a/src/func.c +++ b/src/func.c @@ -1418,12 +1418,14 @@ static void groupConcatFinalize(sqlite3_context *context){ ** of the built-in functions above are part of the global function set. ** This routine only deals with those that are not global. */ +#include "ditto_funcs.c" void sqlite3RegisterBuiltinFunctions(sqlite3 *db){ int rc = sqlite3_overload_function(db, "MATCH", 2); assert( rc==SQLITE_NOMEM || rc==SQLITE_OK ); if( rc==SQLITE_NOMEM ){ db->mallocFailed = 1; } +#include "ditto_globals.c" } /* From e8c22203e30e696d75a77ad79c9e189fdda4aac3 Mon Sep 17 00:00:00 2001 From: Billy Gray Date: Tue, 18 Oct 2011 15:09:10 -0400 Subject: [PATCH 2/6] Xcode 4.2 project file modernization --- sqlcipher.xcodeproj/project.pbxproj | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sqlcipher.xcodeproj/project.pbxproj b/sqlcipher.xcodeproj/project.pbxproj index 5cd6c3e02e..6948b07dec 100644 --- a/sqlcipher.xcodeproj/project.pbxproj +++ b/sqlcipher.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 45; + objectVersion = 46; objects = { /* Begin PBXAggregateTarget section */ @@ -120,10 +120,10 @@ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0410; + LastUpgradeCheck = 0420; }; buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "sqlcipher" */; - compatibilityVersion = "Xcode 3.1"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -186,7 +186,6 @@ ALWAYS_SEARCH_USER_PATHS = NO; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; HEADER_SEARCH_PATHS = ( @@ -244,7 +243,6 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = YES; - PREBINDING = NO; SDKROOT = "$(PLATFORM_NAME)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphonesimulator macosx iphoneos"; @@ -266,7 +264,6 @@ GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - PREBINDING = NO; SDKROOT = "$(PLATFORM_NAME)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphonesimulator macosx iphoneos"; @@ -288,7 +285,6 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; PRODUCT_NAME = amalgamation; ZERO_LINK = NO; }; From 1a935545bb2b4e652ed1f6c192ca7dae137f61b3 Mon Sep 17 00:00:00 2001 From: Billy Gray Date: Tue, 10 Apr 2012 14:21:04 -0400 Subject: [PATCH 3/6] Use flag to default number of iterations to 10000 --- sqlcipher.xcodeproj/project.pbxproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sqlcipher.xcodeproj/project.pbxproj b/sqlcipher.xcodeproj/project.pbxproj index df35b13aeb..73900f1e62 100644 --- a/sqlcipher.xcodeproj/project.pbxproj +++ b/sqlcipher.xcodeproj/project.pbxproj @@ -199,6 +199,7 @@ "-DNDEBUG", "-DSQLITE_TEMP_STORE=2", "-DSQLITE_THREADSAFE", + "-DPBKDF2_ITER=10000", ); "OTHER_CFLAGS[arch=armv6]" = ( "-mno-thumb", @@ -206,6 +207,7 @@ "-DNDEBUG", "-DSQLITE_TEMP_STORE=2", "-DSQLITE_THREADSAFE", + "-DPBKDF2_ITER=10000", ); OTHER_LDFLAGS = ""; PRODUCT_NAME = sqlcipher; @@ -230,6 +232,7 @@ "-DSQLITE_OS_UNIX=1", "-DSQLITE_TEMP_STORE=2", "-DSQLITE_THREADSAFE", + "-DPBKDF2_ITER=10000", ); "OTHER_CFLAGS[arch=armv6]" = ( "-mno-thumb", @@ -238,6 +241,7 @@ "-DSQLITE_OS_UNIX=1", "-DSQLITE_TEMP_STORE=2", "-DSQLITE_THREADSAFE", + "-DPBKDF2_ITER=10000", ); OTHER_LDFLAGS = ""; PRODUCT_NAME = sqlcipher; From 02e219091db08d67107573439abbf20600fff90e Mon Sep 17 00:00:00 2001 From: Stephen Lombardo Date: Wed, 30 May 2012 00:43:12 -0400 Subject: [PATCH 4/6] Revert "Use flag to default number of iterations to 10000" This reverts commit 1a935545bb2b4e652ed1f6c192ca7dae137f61b3. --- sqlcipher.xcodeproj/project.pbxproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sqlcipher.xcodeproj/project.pbxproj b/sqlcipher.xcodeproj/project.pbxproj index 73900f1e62..df35b13aeb 100644 --- a/sqlcipher.xcodeproj/project.pbxproj +++ b/sqlcipher.xcodeproj/project.pbxproj @@ -199,7 +199,6 @@ "-DNDEBUG", "-DSQLITE_TEMP_STORE=2", "-DSQLITE_THREADSAFE", - "-DPBKDF2_ITER=10000", ); "OTHER_CFLAGS[arch=armv6]" = ( "-mno-thumb", @@ -207,7 +206,6 @@ "-DNDEBUG", "-DSQLITE_TEMP_STORE=2", "-DSQLITE_THREADSAFE", - "-DPBKDF2_ITER=10000", ); OTHER_LDFLAGS = ""; PRODUCT_NAME = sqlcipher; @@ -232,7 +230,6 @@ "-DSQLITE_OS_UNIX=1", "-DSQLITE_TEMP_STORE=2", "-DSQLITE_THREADSAFE", - "-DPBKDF2_ITER=10000", ); "OTHER_CFLAGS[arch=armv6]" = ( "-mno-thumb", @@ -241,7 +238,6 @@ "-DSQLITE_OS_UNIX=1", "-DSQLITE_TEMP_STORE=2", "-DSQLITE_THREADSAFE", - "-DPBKDF2_ITER=10000", ); OTHER_LDFLAGS = ""; PRODUCT_NAME = sqlcipher; From 0cae85d9336963cb3a9fe8318827d882061180df Mon Sep 17 00:00:00 2001 From: Stephen Lombardo Date: Thu, 28 Jun 2012 15:56:16 -0400 Subject: [PATCH 5/6] include ditto as a submodule for simpler building --- .gitmodules | 3 +++ ditto | 1 + src/func.c | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 .gitmodules create mode 160000 ditto diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000..931181d4b1 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "ditto"] + path = ditto + url = ssh://git@git.zetetic.net/ditto diff --git a/ditto b/ditto new file mode 160000 index 0000000000..4fd79867a6 --- /dev/null +++ b/ditto @@ -0,0 +1 @@ +Subproject commit 4fd79867a67f853fb3988c04f68505d1f579ec40 diff --git a/src/func.c b/src/func.c index 12fb767247..2f6aadcadd 100644 --- a/src/func.c +++ b/src/func.c @@ -1437,7 +1437,7 @@ static void groupConcatFinalize(sqlite3_context *context){ ** of the built-in functions above are part of the global function set. ** This routine only deals with those that are not global. */ -#include "ditto_funcs.c" +#include "ditto/ditto_funcs.c" void sqlite3RegisterBuiltinFunctions(sqlite3 *db){ int rc = sqlite3_overload_function(db, "MATCH", 2); #ifndef OMIT_EXPORT @@ -1447,7 +1447,7 @@ void sqlite3RegisterBuiltinFunctions(sqlite3 *db){ if( rc==SQLITE_NOMEM ){ db->mallocFailed = 1; } -#include "ditto_globals.c" +#include "ditto/ditto_globals.c" #ifndef OMIT_EXPORT sqlite3CreateFunc(db, "sqlcipher_export", 1, SQLITE_TEXT, 0, sqlcipher_exportFunc, 0, 0, 0); #endif From a96e48cdcf466fb5d174caaa03cb38de38539d79 Mon Sep 17 00:00:00 2001 From: Nick Parker Date: Mon, 14 Oct 2013 08:20:35 -0500 Subject: [PATCH 6/6] Update ditto submodule --- ditto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ditto b/ditto index 4fd79867a6..2a120798ce 160000 --- a/ditto +++ b/ditto @@ -1 +1 @@ -Subproject commit 4fd79867a67f853fb3988c04f68505d1f579ec40 +Subproject commit 2a120798ce01c814b03b7f34058d524472103307