From a6e40b75eabf0d6a863a91ae17f7d0ae20582d9e Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Sat, 3 Sep 2022 18:37:24 +0200
Subject: [PATCH 1/2] Add feature "system-libs" to enable linking against
 system libraries

If this feature is enabled, libsodium-sys and zstd-sys will link
dynamically against system-provided libraries instead of building
and linking statically the bundled (possibly outdated and vulnerable)
copies of them. This feature is intended mainly for linux package
maintainers.
---
 Cargo.lock            | 1 +
 src/block/Cargo.toml  | 4 ++++
 src/garage/Cargo.toml | 1 +
 src/rpc/Cargo.toml    | 1 +
 4 files changed, 7 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index fb708a8e..90d77d9f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4140,4 +4140,5 @@ checksum = "2daf2f248d9ea44454bfcb2516534e8b8ad2fc91bf818a1885495fc42bc8ac9f"
 dependencies = [
  "cc",
  "libc",
+ "pkg-config",
 ]
diff --git a/src/block/Cargo.toml b/src/block/Cargo.toml
index 2555a44a..ca0360b5 100644
--- a/src/block/Cargo.toml
+++ b/src/block/Cargo.toml
@@ -36,3 +36,7 @@ serde_bytes = "0.11"
 futures = "0.3"
 futures-util = "0.3"
 tokio = { version = "1.0", default-features = false, features = ["rt", "rt-multi-thread", "io-util", "net", "time", "macros", "sync", "signal", "fs"] }
+
+
+[features]
+system-libs = [ "zstd/pkg-config" ]
diff --git a/src/garage/Cargo.toml b/src/garage/Cargo.toml
index 8948e750..6cc93fc0 100644
--- a/src/garage/Cargo.toml
+++ b/src/garage/Cargo.toml
@@ -76,3 +76,4 @@ base64 = "0.13"
 [features]
 kubernetes-discovery = [ "garage_rpc/kubernetes-discovery" ]
 k2v = [ "garage_util/k2v", "garage_api/k2v" ]
+system-libs = [ "garage_block/system-libs", "garage_rpc/system-libs", "sodiumoxide/use-pkg-config" ]
diff --git a/src/rpc/Cargo.toml b/src/rpc/Cargo.toml
index 80a1975c..309e3fc2 100644
--- a/src/rpc/Cargo.toml
+++ b/src/rpc/Cargo.toml
@@ -54,3 +54,4 @@ hyper = { version = "0.14", features = ["client", "http1", "runtime", "tcp"] }
 
 [features]
 kubernetes-discovery = [ "kube", "k8s-openapi", "openssl", "schemars" ]
+system-libs = [ "sodiumoxide/use-pkg-config" ]
-- 
2.43.4


From 7511ba5530d56a446fefe2372409d9c2ceea17c5 Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Sat, 3 Sep 2022 19:05:32 +0200
Subject: [PATCH 2/2] Allow linking against system-provided libsqlite

Unfortunately, rusqlite uses the opposite logic for enabling/disabling
bundled libraries to others (libsodium-sys, zstd-sys). Cargo features
are very limited and doesn't allow to enable feature A in a dependency
iff feature B is disabled.

Note, lmdb-rkv-sys doesn't need any special treatment because it
automatically links against system liblmdb if found via pkgconf.

Linux distros should build garage with
`--no-default-features --features system-libs` to disable bundled-libs
and enable system-libs.
---
 src/db/Cargo.toml     | 3 ++-
 src/garage/Cargo.toml | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/db/Cargo.toml b/src/db/Cargo.toml
index f697054b..230fbaf9 100644
--- a/src/db/Cargo.toml
+++ b/src/db/Cargo.toml
@@ -22,7 +22,7 @@ hexdump = "0.1"
 tracing = "0.1.30"
 
 heed = "0.11"
-rusqlite = { version = "0.27", features = ["bundled"] }
+rusqlite = "0.27"
 sled = "0.34"
 
 # cli deps
@@ -33,4 +33,5 @@ pretty_env_logger = { version = "0.4", optional = true }
 mktemp = "0.4"
 
 [features]
+bundled-libs = [ "rusqlite/bundled" ]
 cli = ["clap", "pretty_env_logger"]
diff --git a/src/garage/Cargo.toml b/src/garage/Cargo.toml
index 6cc93fc0..e19aac50 100644
--- a/src/garage/Cargo.toml
+++ b/src/garage/Cargo.toml
@@ -74,6 +74,14 @@ base64 = "0.13"
 
 
 [features]
+default = [ "bundled-libs" ]
 kubernetes-discovery = [ "garage_rpc/kubernetes-discovery" ]
 k2v = [ "garage_util/k2v", "garage_api/k2v" ]
+
+# NOTE: bundled-libs and system-libs should be treat as mutually exclusive;
+# exactly one of them should be enabled.
+
+# Use bundled libsqlite instead of linking against system-provided.
+bundled-libs = [ "garage_db/bundled-libs" ]
+# Link against system-provided libsodium and libzstd.
 system-libs = [ "garage_block/system-libs", "garage_rpc/system-libs", "sodiumoxide/use-pkg-config" ]
-- 
2.43.4