From 45d19c106616e7785cf57c035e522c7fa9339f14 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Thu, 26 Nov 2020 00:59:34 +0300
Subject: [PATCH] sqlcipher: bump version

---
 ...r-3.4.2.patchset => sqlcipher-4.4.2.patchset} | 16 ++++++++--------
 ...ipher-3.4.2.recipe => sqlcipher-4.4.2.recipe} |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)
 rename dev-db/sqlcipher/patches/{sqlcipher-3.4.2.patchset => sqlcipher-4.4.2.patchset} (84%)
 rename dev-db/sqlcipher/{sqlcipher-3.4.2.recipe => sqlcipher-4.4.2.recipe} (93%)

diff --git a/dev-db/sqlcipher/patches/sqlcipher-3.4.2.patchset b/dev-db/sqlcipher/patches/sqlcipher-4.4.2.patchset
similarity index 84%
rename from dev-db/sqlcipher/patches/sqlcipher-3.4.2.patchset
rename to dev-db/sqlcipher/patches/sqlcipher-4.4.2.patchset
index 91d94bce0..931e330a9 100644
--- a/dev-db/sqlcipher/patches/sqlcipher-3.4.2.patchset
+++ b/dev-db/sqlcipher/patches/sqlcipher-4.4.2.patchset
@@ -8,10 +8,10 @@ define OMIT_MEMLOCK, <sys/mman.h> won't be included, which is needed for
 WAL
 
 diff --git a/src/crypto_impl.c b/src/crypto_impl.c
-index 1fd35ba..b516386 100644
+index 8b024de..e5cb99d 100644
 --- a/src/crypto_impl.c
 +++ b/src/crypto_impl.c
-@@ -40,11 +40,13 @@
+@@ -38,11 +38,13 @@
  #include <errno.h>
  #include <unistd.h>
  #include <sys/resource.h>
@@ -24,10 +24,10 @@ index 1fd35ba..b516386 100644
 +#include <sys/mman.h>
 +#endif
  
- /* the default implementation of SQLCipher uses a cipher_ctx
-    to keep track of read / write state separately. The following
+ static volatile unsigned int default_flags = DEFAULT_CIPHER_FLAGS;
+ static volatile unsigned char hmac_salt_mask = HMAC_SALT_MASK;
 -- 
-2.15.0
+2.28.0
 
 
 From ce7e259cd0d8346f481a1d3e88eaafabe764419f Mon Sep 17 00:00:00 2001
@@ -37,10 +37,10 @@ Subject: test1: fixes for Haiku
 
 
 diff --git a/src/test1.c b/src/test1.c
-index df7685f..f21be6b 100644
+index c3954e9..2ca98e3 100644
 --- a/src/test1.c
 +++ b/src/test1.c
-@@ -6568,10 +6568,16 @@ static int SQLITE_TCLAPI test_getrusage(
+@@ -6967,10 +6967,16 @@ static int SQLITE_TCLAPI test_getrusage(
    getrusage(RUSAGE_SELF, &r);
  
    sqlite3_snprintf(sizeof(buf), buf,
@@ -62,5 +62,5 @@ index df7685f..f21be6b 100644
    Tcl_SetObjResult(interp, Tcl_NewStringObj(buf, -1));
    return TCL_OK;
 -- 
-2.15.0
+2.28.0
 
diff --git a/dev-db/sqlcipher/sqlcipher-3.4.2.recipe b/dev-db/sqlcipher/sqlcipher-4.4.2.recipe
similarity index 93%
rename from dev-db/sqlcipher/sqlcipher-3.4.2.recipe
rename to dev-db/sqlcipher/sqlcipher-4.4.2.recipe
index c7be24b70..2f33bacc2 100644
--- a/dev-db/sqlcipher/sqlcipher-3.4.2.recipe
+++ b/dev-db/sqlcipher/sqlcipher-4.4.2.recipe
@@ -5,11 +5,11 @@ local data storage such as on-the-fly encryption, tamper evidence, \
 and key derivation. Based on SQLite, SQLCipher closely tracks SQLite and \
 periodically integrates stable SQLite release features."
 HOMEPAGE="https://www.zetetic.net/sqlcipher"
-COPYRIGHT="2016 ZETETIC LLC"
+COPYRIGHT="2016-2020 ZETETIC LLC"
 LICENSE="BSD (3-clause)"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://github.com/sqlcipher/sqlcipher/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="69897a5167f34e8a84c7069f1b283aba88cdfa8ec183165c4a5da2c816cfaadb"
+CHECKSUM_SHA256="87458e0e16594b3ba6c7a1f046bc1ba783d002d35e0e7b61bb6b7bb862f362a7"
 SOURCE_FILENAME="sqlcipher-$portVersion.tar.gz"
 PATCHES="sqlcipher-$portVersion.patchset"
 
@@ -19,7 +19,7 @@ SECONDARY_ARCHITECTURES="x86"
 libVersion="0.8.6"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 majorVersion="${portVersion%%.*}"
-tclVersion="8.5"
+tclVersion="8.6"
 
 PROVIDES="
 	sqlcipher$secondaryArchSuffix = $portVersion