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 <[email protected]>

Cargo.toml

@@ -49,7 +49,7 @@ rlimit = "0.9.0"
 rusqlite = { version = "0.29.0", features = ["bundled"] }
 serde = { version = "1.0.110", features = ["serde_derive", "rc"] }
 serde_json = "1.0.51"
-tar = "0.4.38"
+tar = "0.4.40"
 tokio = { version = "1.24", features = ["macros"] }
 
 # Build static linked openssl library
@@ -75,7 +75,7 @@ vmm-sys-util = { version = "0.11.0", optional = true }
 time = { version = "0.3.14", features = ["formatting"] }
 
 [dev-dependencies]
-xattr = "0.2.3"
+xattr = "1.0.1"
 vmm-sys-util = "0.11.0"
 
 [features]
@@ -107,8 +107,4 @@ backend-registry = ["nydus-storage/backend-registry"]
 backend-s3 = ["nydus-storage/backend-s3"]
 
 [workspace]
-members = ["api", "builder", "clib", "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", "builder", "clib", "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.11.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

@@ -28,7 +28,7 @@ serde = { version = "1.0.110", features = ["serde_derive", "rc"] }
 serde_json = "1.0.53"
 sha1 = { version = "0.10.5", optional = true }
 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", "rt", "rt-multi-thread", "sync", "time"] }
 url = { version = "2.1.1", optional = true }
@@ -41,7 +41,7 @@ nydus-utils = { version = "0.4", path = "../utils", features = ["encryption", "z
 
 [dev-dependencies]
 vmm-sys-util = "0.11"
-tar = "0.4.38"
+tar = "0.4.40"
 regex = "1.7.0"
 
 [features]

utils/Cargo.toml

@@ -36,7 +36,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"]