Merging upstream version 1.76.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 14 insertions, 31 deletions

diff --git a/vendor/filetime/.cargo-checksum.json b/vendor/filetime/.cargo-checksum.json
index e53066aba..0e5e3c63a 100644
--- a/vendor/filetime/.cargo-checksum.json
+++ b/vendor/filetime/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"ca0c0554a36d5523989bc1a47d85d71724bc4f2c881fdb3ad285b7e46bad234e","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"6cd295d9f4efe412971b1855ecaf7b19ef3956006a652ea205c456a5d33550c1","src/lib.rs":"eec6b5e3be2c1d5e068a9724b503e729a1e11dae4cd1bc816110c94a0bc14fa0","src/redox.rs":"898997b73c20818cf4601a1f4bcdf1b7dbf3b5d9d071cdc9fce5d1652f6bfc43","src/unix/android.rs":"d929826a9a92003b7aaa6435adc220efbb70c15308f9eed5ee517d88451fcaf6","src/unix/linux.rs":"648498bdf715766eeffdc2dff6a58db51cf6b244c431a6d53c33cbc73f1998d4","src/unix/macos.rs":"1b19a24bee240aba8d564405991bb0ee36ba72217461c8ac6829144d28f7e046","src/unix/mod.rs":"52512c922e1dbb47a6c7f0354c6198ca1ac61ea4d540bc0d73d3a3fd08908ba1","src/unix/utimensat.rs":"0876aa32393689fcb5eec913c5d34954956a715913d611749b04243a2dbcf897","src/unix/utimes.rs":"d2d8ca5daed3d1ec0a0aed1fc03450deb4b7f1fcdb96ed40b8d2cfefd0e827ee","src/wasm.rs":"a82734259846a3349d42da011c1065d21f3981bd20d6eb43495e34808b83af9a","src/windows.rs":"3314a0def8028d8f2a4bc01377d5874ab9ddf8684aad13573c89b427bf2d9911"},"package":"d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0"}
\ No newline at end of file
+{"files":{"Cargo.toml":"8d85b719c7034a8267e62b0d9c49995a52a25e3fcc13265dcde8229b3f3a1764","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"6cd295d9f4efe412971b1855ecaf7b19ef3956006a652ea205c456a5d33550c1","src/lib.rs":"eec6b5e3be2c1d5e068a9724b503e729a1e11dae4cd1bc816110c94a0bc14fa0","src/redox.rs":"898997b73c20818cf4601a1f4bcdf1b7dbf3b5d9d071cdc9fce5d1652f6bfc43","src/unix/android.rs":"d929826a9a92003b7aaa6435adc220efbb70c15308f9eed5ee517d88451fcaf6","src/unix/linux.rs":"648498bdf715766eeffdc2dff6a58db51cf6b244c431a6d53c33cbc73f1998d4","src/unix/macos.rs":"1b19a24bee240aba8d564405991bb0ee36ba72217461c8ac6829144d28f7e046","src/unix/mod.rs":"a34faf9cfb0bd0f18d3d99f5e5b2733fb3c8cb4ef0d948084b62a98186b3595e","src/unix/utimensat.rs":"0876aa32393689fcb5eec913c5d34954956a715913d611749b04243a2dbcf897","src/unix/utimes.rs":"d2d8ca5daed3d1ec0a0aed1fc03450deb4b7f1fcdb96ed40b8d2cfefd0e827ee","src/wasm.rs":"a82734259846a3349d42da011c1065d21f3981bd20d6eb43495e34808b83af9a","src/windows.rs":"3314a0def8028d8f2a4bc01377d5874ab9ddf8684aad13573c89b427bf2d9911"},"package":"1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"}
\ No newline at end of file
diff --git a/vendor/filetime/Cargo.toml b/vendor/filetime/Cargo.toml
index 5c28c6cdd..0540ffb89 100644
--- a/vendor/filetime/Cargo.toml
+++ b/vendor/filetime/Cargo.toml
@@ -12,7 +12,7 @@
 [package]
 edition = "2018"
 name = "filetime"
-version = "0.2.22"
+version = "0.2.23"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 description = """
 Platform-agnostic accessors of timestamps in File metadata
@@ -34,13 +34,13 @@ version = "1.0.0"
 version = "3"
 
 [target."cfg(target_os = \"redox\")".dependencies.redox_syscall]
-version = "0.3.5"
+version = "0.4.1"
 
 [target."cfg(unix)".dependencies.libc]
 version = "0.2.27"
 
 [target."cfg(windows)".dependencies.windows-sys]
-version = "0.48.0"
+version = "0.52.0"
 features = [
     "Win32_Foundation",
     "Win32_Storage_FileSystem",
diff --git a/vendor/filetime/src/unix/mod.rs b/vendor/filetime/src/unix/mod.rs
index df62de429..f5a48b29d 100644
--- a/vendor/filetime/src/unix/mod.rs
+++ b/vendor/filetime/src/unix/mod.rs
@@ -85,34 +85,17 @@ pub fn from_last_access_time(meta: &fs::Metadata) -> FileTime {
 }
 
 pub fn from_creation_time(meta: &fs::Metadata) -> Option<FileTime> {
-    macro_rules! birthtim {
-        ($(($e:expr, $i:ident)),*) => {
-            #[cfg(any($(target_os = $e),*))]
-            fn imp(meta: &fs::Metadata) -> Option<FileTime> {
-                $(
-                    #[cfg(target_os = $e)]
-                    use std::os::$i::fs::MetadataExt;
-                )*
-                Some(FileTime {
-                    seconds: meta.st_birthtime(),
-                    nanos: meta.st_birthtime_nsec() as u32,
-                })
-            }
-
-            #[cfg(all($(not(target_os = $e)),*))]
-            fn imp(_meta: &fs::Metadata) -> Option<FileTime> {
-                None
-            }
-        }
+    #[cfg(target_os = "bitrig")]
+    {
+        use std::os::bitrig::fs::MetadataExt;
+        Some(FileTime {
+            seconds: meta.st_birthtime(),
+            nanos: meta.st_birthtime_nsec() as u32,
+        })
     }
 
-    birthtim! {
-        ("bitrig", bitrig),
-        ("freebsd", freebsd),
-        ("ios", ios),
-        ("macos", macos),
-        ("openbsd", openbsd)
+    #[cfg(not(target_os = "bitrig"))]
+    {
+        meta.created().map(|i| i.into()).ok()
     }
-
-    imp(meta)
 }