From fbc667c457485cb36f8f86cee7fd7abc6264b4d2 Mon Sep 17 00:00:00 2001
From: benthecarman <benthecarman@live.com>
Date: Mon, 13 May 2024 23:48:23 -0500
Subject: [PATCH] Add feature flag for vendored sqlcipher

---
 .gitignore    |   2 ++
 Cargo.lock    |  24 ++++++++++++++++++++++++
 Cargo.toml    |   4 ++++
 harbor.sqlite | Bin 24576 -> 0 bytes
 justfile      |  14 ++++++++++----
 5 files changed, 40 insertions(+), 4 deletions(-)
 delete mode 100644 harbor.sqlite

diff --git a/.gitignore b/.gitignore
index ea8c4bf..9037669 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 /target
+.env
+harbor.sqlite
diff --git a/Cargo.lock b/Cargo.lock
index c106249..71caeab 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3336,6 +3336,8 @@ version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f"
 dependencies = [
+ "cc",
+ "openssl-sys",
  "pkg-config",
  "vcpkg",
 ]
@@ -3819,6 +3821,28 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
+[[package]]
+name = "openssl-src"
+version = "300.2.3+3.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.102"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2"
+dependencies = [
+ "cc",
+ "libc",
+ "openssl-src",
+ "pkg-config",
+ "vcpkg",
+]
+
 [[package]]
 name = "orbclient"
 version = "0.3.47"
diff --git a/Cargo.toml b/Cargo.toml
index 6858094..b4a4e16 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,6 +3,10 @@ name = "harbor"
 version = "0.1.0"
 edition = "2021"
 
+[features]
+default = []
+vendored = ["rusqlite/bundled-sqlcipher-vendored-openssl"]
+
 [dependencies]
 anyhow = "1"
 log = "0.4"
diff --git a/harbor.sqlite b/harbor.sqlite
deleted file mode 100644
index c978d5ded875d9b0b86e73372df44ab22c9aabcf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 24576
zcmeI&zi!h&90%~bCUGHZ5|}b%xq%_34RY+bs>;F<jHpOLa2!O`;bfX?u#`WoofIUd
zvNG`uya*$YfOrUIMlQyUNF_5OHTs@x`F^>dle^E)i(~g*wt~52r?YV4&zVK;5K74-
z#t0!hYS+|$)s}JgDo{uIS3j-0LmpgwDirUNT;Z4$zm>iez88**pVQLuIRqd80SG_<
z0uX=z1Rwx`8!7N1w_UDO=w*BEzZuK3aCRE34%w#baL-{Lf826dGRCTTrdlv$&1c-L
zTKhWdx<_s94%l;Nz&bBH*6FuedvR7I<xsqvg~RAiwrSh?DkZOXvs!s~mk#3Jj?TyG
zCQn52d?BYN@>-Z%o6EJq>eQdeJ$0sD{7Odup$;`oEAt8^!E`9!CzJ6P^I05=L`u|?
zj#m0bZY^hZ`I>H*Ij0{V#w!+L7|2MDMRf93PJA&5Mxj3sX45ErWNXbKJufMfs?>!H
zBlVr^6?fx`*~Y&rrcMYKQ=#&`qqfuYc)PnQ7<=M8<^7h&ntj)GI-Xdi<n`W`Rvz&*
zk@R_rdiq#Kk;QHW)uE*yL~UpgfB*y_009U<00Izz00bZa0SMeUfqOKgTc%+)47+Zb
zR^z}jmr>2IYxM>*%)^FpXz%CMx@hSqQ5zZrAOHafKmY;|fB*y_009U<00J8!a5tmh
zUjIvA`TSqK^p6Gs2tWV=5P$##AOHafKmY;|fWQU|;QoJui;JZ}00Izz00bZa0SG_<
o0uX=z1QLPe`~P_UkIMl95P$##AOHafKmY;|fB*y_u-O8?0Y$#h<p2Nx

diff --git a/justfile b/justfile
index f7b792a..3158950 100644
--- a/justfile
+++ b/justfile
@@ -1,11 +1,17 @@
-test:
-    cargo test
+# Load environment variables from .env file
+set dotenv-load := true
+
+# Define a variable that holds the feature flag if USE_VENDOR_FEATURE is set
+FEATURE_FLAG := if env('USE_VENDOR_FEATURE', '0') == "1" { "--features vendored" } else { "" }
 
 run:
-    RUST_LOG=harbor=debug,info cargo run
+    RUST_LOG=harbor=debug,info cargo run {{FEATURE_FLAG}}
+
+test:
+    cargo test {{FEATURE_FLAG}}
 
 release:
-    cargo run --release
+    cargo run --release {{FEATURE_FLAG}}
 
 clippy:
     cargo clippy --all-features --tests -- -D warnings