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] 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 fb708a8eb..90d77d9fb 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 2555a44af..ca0360b52 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 8948e7509..6cc93fc03 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 80a1975cf..309e3fc2a 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" ]