0001-Replace-bundled-C-C-libraries-with-system-provided.patch

From 4a1af8fc878daefa5d00a697e9b1d9aa33193873 Mon Sep 17 00:00:00 2001
From: Ivan Mironov <mironov.ivan@gmail.com>
Date: Thu, 18 Feb 2021 17:17:32 +0500
Subject: [PATCH 1/3] Replace bundled C/C++ libraries with system provided

---
 Cargo.lock                  | 13 +++++++------
 account-decoder/Cargo.toml  |  2 +-
 remote-wallet/Cargo.toml    |  2 +-
 runtime/Cargo.toml          |  2 +-
 storage-bigtable/Cargo.toml |  2 +-
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7cdbfb4f3ef8..d06f76dbeae6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7116,18 +7116,18 @@ dependencies = [
 
 [[package]]
 name = "zstd"
-version = "0.5.3+zstd.1.4.5"
+version = "0.5.4+zstd.1.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01b32eaf771efa709e8308605bbf9319bf485dc1503179ec0469b611937c0cd8"
+checksum = "69996ebdb1ba8b1517f61387a883857818a66c8a295f487b1ffd8fd9d2c82910"
 dependencies = [
  "zstd-safe",
 ]
 
 [[package]]
 name = "zstd-safe"
-version = "2.0.5+zstd.1.4.5"
+version = "2.0.6+zstd.1.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cfb642e0d27f64729a639c52db457e0ae906e7bc6f5fe8f5c453230400f1055"
+checksum = "98aa931fb69ecee256d44589d19754e61851ae4769bf963b385119b1cc37a49e"
 dependencies = [
  "libc",
  "zstd-sys",
@@ -7135,12 +7135,13 @@ dependencies = [
 
 [[package]]
 name = "zstd-sys"
-version = "1.4.17+zstd.1.4.5"
+version = "1.4.18+zstd.1.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b89249644df056b522696b1bb9e7c18c87e8ffa3e2f0dc3b0155875d6498f01b"
+checksum = "a1e6e8778706838f43f771d80d37787cb2fe06dafe89dd3aebaf6721b9eaec81"
 dependencies = [
  "cc",
  "glob",
  "itertools 0.9.0",
  "libc",
+ "pkg-config",
 ]
diff --git a/account-decoder/Cargo.toml b/account-decoder/Cargo.toml
index 21c29215f6b4..6a6b8162f8a8 100644
--- a/account-decoder/Cargo.toml
+++ b/account-decoder/Cargo.toml
@@ -24,7 +24,7 @@ solana-sdk = { path = "../sdk", version = "=1.7.8" }
 solana-vote-program = { path = "../programs/vote", version = "=1.7.8" }
 spl-token-v2-0 = { package = "spl-token", version = "=3.2.0", features = ["no-entrypoint"] }
 thiserror = "1.0"
-zstd = "0.5.1"
+zstd = { version = "0.5.4", features = ["pkg-config"] }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/remote-wallet/Cargo.toml b/remote-wallet/Cargo.toml
index a032470fe274..9481cb930f6c 100644
--- a/remote-wallet/Cargo.toml
+++ b/remote-wallet/Cargo.toml
@@ -25,7 +25,7 @@ thiserror = "1.0"
 uriparse = "0.6.3"
 
 [features]
-default = ["linux-static-hidraw"]
+default = ["linux-shared-hidraw"]
 linux-static-libusb = ["hidapi/linux-static-libusb"]
 linux-static-hidraw = ["hidapi/linux-static-hidraw"]
 linux-shared-libusb = ["hidapi/linux-shared-libusb"]
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
index 434e30412506..7d59baec17cc 100644
--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -51,7 +51,7 @@ symlink = "0.1.0"
 tar = "0.4.28"
 tempfile = "3.1.0"
 thiserror = "1.0"
-zstd = "0.5.1"
+zstd = { version = "0.5.4", features = ["pkg-config"] }
 
 [lib]
 crate-type = ["lib"]
diff --git a/storage-bigtable/Cargo.toml b/storage-bigtable/Cargo.toml
index 2adc38311f45..ed85703f0055 100644
--- a/storage-bigtable/Cargo.toml
+++ b/storage-bigtable/Cargo.toml
@@ -30,7 +30,7 @@ solana-transaction-status = { path = "../transaction-status", version = "=1.7.8"
 thiserror = "1.0"
 futures = "0.3.8"
 tonic = { version = "0.5.0", features = ["tls", "transport"] }
-zstd = "0.5.1"
+zstd = { version = "0.5.4", features = ["pkg-config"] }
 
 [lib]
 crate-type = ["lib"]
-- 
2.31.1