From ccfc649ab09ad1b8dfaef612fa5a9a9a67f6504b Mon Sep 17 00:00:00 2001
From: Jiahao XU <Jiahao_XU@outlook.com>
Date: Sat, 10 Sep 2022 14:17:21 +1000
Subject: [PATCH] Fix `tar` by temporarily using a fork

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
---
 Cargo.lock            | 24 ++++++++++++------------
 crates/lib/Cargo.toml |  6 +++++-
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b9e7d2004..e41a4558e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -80,6 +80,7 @@ name = "binstall"
 version = "0.0.0"
 dependencies = [
  "async-trait",
+ "binstall-tar",
  "bytes",
  "bzip2",
  "cargo_toml",
@@ -108,7 +109,6 @@ dependencies = [
  "serde_json",
  "strum",
  "strum_macros",
- "tar",
  "tempfile",
  "thiserror",
  "tinytemplate",
@@ -121,6 +121,17 @@ dependencies = [
  "zstd",
 ]
 
+[[package]]
+name = "binstall-tar"
+version = "0.4.39"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01db907e07c37309ea816c183ffe548daaa66ef640a291408f232d6ca4089dbb"
+dependencies = [
+ "filetime",
+ "libc",
+ "xattr",
+]
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -1819,17 +1830,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "tar"
-version = "0.4.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6"
-dependencies = [
- "filetime",
- "libc",
- "xattr",
-]
-
 [[package]]
 name = "tempfile"
 version = "3.3.0"
diff --git a/crates/lib/Cargo.toml b/crates/lib/Cargo.toml
index c65d40b27..91fec39b8 100644
--- a/crates/lib/Cargo.toml
+++ b/crates/lib/Cargo.toml
@@ -38,7 +38,11 @@ serde-tuple-vec-map = "1.0.1"
 serde_json = "1.0.83"
 strum = "0.24.1"
 strum_macros = "0.24.3"
-tar = "0.4.38"
+# Use a fork here since we need PAX support, but the upstream
+# does not hav the PR merged yet.
+#
+#tar = "0.4.38"
+tar = { package = "binstall-tar", version = "0.4.39" }
 tempfile = "3.3.0"
 thiserror = "1.0.32"
 tinytemplate = "1.2.1"