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.toml

@@ -48,10 +48,10 @@ rlimit = "0.9.0"
 serde = { version = "1.0.110", features = ["serde_derive", "rc"] }
 serde_json = "1.0.51"
 sha2 = "0.10.2"
-tar = "0.4.38"
+tar = "0.4.40"
 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" }
+members = ["api", "app", "blobfs", "clib", "error", "rafs", "storage", "service", "utils"]

builder/Cargo.toml

@@ -19,9 +19,9 @@ nix = "0.24"
 serde = { version = "1.0.110", features = ["serde_derive", "rc"] }
 serde_json = "1.0.53"
 sha2 = "0.10.2"
-tar = "0.4.38"
+tar = "0.4.40"
 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" }

storage/Cargo.toml

@@ -30,7 +30,7 @@ reqwest = { version = "0.11.14", features = [
 serde = { version = "1.0.110", features = ["serde_derive", "rc"] }
 serde_json = "1.0.53"
 sha2 = { version = "0.10.2", optional = true }
-tar = "0.4.38"
+tar = "0.4.40"
 time = { version = "0.3.14", features = ["formatting"], optional = true }
 tokio = { version = "1.19.0", features = [
   "macros",
@@ -51,7 +51,7 @@ sha1 = { version = "0.10.5", optional = true }
 
 [dev-dependencies]
 vmm-sys-util = "0.11"
-tar = "0.4.38"
+tar = "0.4.40"
 regex = "1.7.0"
 
 [features]

utils/Cargo.toml

@@ -35,7 +35,7 @@ flate2 = { version = "1.0.17", features = ["zlib-ng-compat"], default-features =
 
 [dev-dependencies]
 vmm-sys-util = "0.11.0"
-tar = "0.4.38"
+tar = "0.4.40"
 
 [features]
 zran = ["libz-sys"]