From f758b2eec8bb25a6118db7f2581da3df4cd7b190 Mon Sep 17 00:00:00 2001
From: Qinqi Qu <quqinqi@linux.alibaba.com>
Date: Tue, 8 Aug 2023 14:36:46 +0800
Subject: [PATCH] deps: change tar-rs to upstream version

Since upstream tar-rs merged our fix for reading large uids/gids from
the PAX extension, so change tar-rs back to the upstream version.

Update tar-rs dependency xattr to 1.0.1 as well.

Signed-off-by: Qinqi Qu <quqinqi@linux.alibaba.com>
---
 Cargo.lock         | 13 +++++++------
 Cargo.toml         |  8 ++------
 builder/Cargo.toml |  2 +-
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e32eae34479..8a7d879bfd1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -884,9 +884,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.139"
+version = "0.2.147"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
 
 [[package]]
 name = "libz-sys"
@@ -1795,8 +1795,9 @@ dependencies = [
 
 [[package]]
 name = "tar"
-version = "0.4.39"
-source = "git+https://github.com/nydusaccelerator/tar-rs.git#17f97d22c66d0d6137665844ac8f8ef5a007255c"
+version = "0.4.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb"
 dependencies = [
  "filetime",
  "libc",
@@ -2311,9 +2312,9 @@ dependencies = [
 
 [[package]]
 name = "xattr"
-version = "0.2.3"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc"
+checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985"
 dependencies = [
  "libc",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 0479ef6b937..f536f4f3300 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -51,7 +51,7 @@ sha2 = "0.10.2"
 tar = "0.4.38"
 tokio = { version = "1.24", features = ["macros"] }
 vmm-sys-util = "0.11.0"
-xattr = "0.2.3"
+xattr = "1.0.1"
 
 # Build static linked openssl library
 openssl = { version = "0.10.55", features = ["vendored"] }
@@ -97,8 +97,4 @@ backend-registry = ["nydus-storage/backend-registry"]
 backend-s3 = ["nydus-storage/backend-s3"]
 
 [workspace]
-members = ["api", "app", "blobfs", "clib", "error", "rafs", "storage", "service", "utils"]
-
-[patch.crates-io]
-# Due to the slow processing of PR by the upstream, temporarily fork tar-rs for this project
-tar = { git = "https://github.com/nydusaccelerator/tar-rs.git" }
\ No newline at end of file
+members = ["api", "app", "blobfs", "clib", "error", "rafs", "storage", "service", "utils"]
\ No newline at end of file
diff --git a/builder/Cargo.toml b/builder/Cargo.toml
index b42c31c6265..6b3f10e35a0 100644
--- a/builder/Cargo.toml
+++ b/builder/Cargo.toml
@@ -21,7 +21,7 @@ serde_json = "1.0.53"
 sha2 = "0.10.2"
 tar = "0.4.38"
 vmm-sys-util = "0.10.0"
-xattr = "0.2.3"
+xattr = "1.0.1"
 
 nydus-api = { version = "0.3", path = "../api" }
 nydus-rafs = { version = "0.3", path = "../rafs" }