diff options
Diffstat (limited to 'debian/patches/d-0021-vendor-remove-windows-dependencies.patch')
-rw-r--r-- | debian/patches/d-0021-vendor-remove-windows-dependencies.patch | 304 |
1 files changed, 169 insertions, 135 deletions
diff --git a/debian/patches/d-0021-vendor-remove-windows-dependencies.patch b/debian/patches/d-0021-vendor-remove-windows-dependencies.patch index 8796a5c92..146c95eff 100644 --- a/debian/patches/d-0021-vendor-remove-windows-dependencies.patch +++ b/debian/patches/d-0021-vendor-remove-windows-dependencies.patch @@ -1,85 +1,101 @@ -From 1a6f5062adaad5d7f1a4f1cf792f4ee8c3c17e9f Mon Sep 17 00:00:00 2001 -From: Fabian Grünbichler <f.gruenbichler@proxmox.com> +From: =?utf-8?q?Fabian_Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com> Date: Wed, 6 Sep 2023 13:23:24 -0600 Subject: [PATCH] Remove Windows dependencies +MIME-Version: 1.0 +Content-Type: text/plain; charset="utf-8" +Content-Transfer-Encoding: 8bit Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> --- - vendor/anstream/Cargo.toml | 6 +---- + vendor/android-tzdata/Cargo.toml | 1 + + vendor/anstream/Cargo.toml | 6 ----- + vendor/anstyle-query/Cargo.toml | 7 ------ vendor/atty/Cargo.toml | 3 --- + vendor/backtrace-0.3.67/Cargo.toml | 14 ------------ vendor/backtrace/Cargo.toml | 13 ----------- - vendor/chrono/Cargo.toml | 11 --------- + vendor/chrono/Cargo.toml | 12 ---------- vendor/colored/Cargo.toml | 4 ---- - vendor/compiletest_rs/Cargo.toml | 6 ----- - vendor/concolor-query/Cargo.toml | 7 ------ - vendor/ctrlc/Cargo.toml | 18 --------------- vendor/curl-sys/Cargo.toml | 10 --------- vendor/curl/Cargo.toml | 10 --------- vendor/dirs-sys-next/Cargo.toml | 3 --- vendor/dirs-sys/Cargo.toml | 3 --- - vendor/errno-0.3.0/Cargo.toml | 7 ------ vendor/errno/Cargo.toml | 6 ----- vendor/fd-lock/Cargo.toml | 8 ------- - vendor/filetime-0.2.20/Cargo.toml | 7 ------ vendor/filetime/Cargo.toml | 7 ------ - vendor/gix-discover/Cargo.toml | 3 --- - vendor/gix-sec/Cargo.toml | 13 ----------- - vendor/home-0.5.4/Cargo.toml | 8 ------- + vendor/gix-sec/Cargo.toml | 12 ---------- vendor/home/Cargo.toml | 7 ------ vendor/iana-time-zone/Cargo.toml | 4 ---- - vendor/ignore-0.4.18/Cargo.toml | 2 -- vendor/ignore/Cargo.toml | 3 --- vendor/io-close/Cargo.toml | 3 --- - vendor/io-lifetimes-1.0.9/Cargo.toml | 13 ----------- vendor/io-lifetimes/Cargo.toml | 13 ----------- - vendor/is-terminal-0.4.6/Cargo.toml | 11 --------- + vendor/is-terminal-0.4.7/Cargo.toml | 11 --------- vendor/is-terminal/Cargo.toml | 11 --------- vendor/libloading/Cargo.toml | 7 ------ - vendor/libssh2-sys/Cargo.toml | 4 ---- + vendor/libssh2-sys/Cargo.toml | 5 ----- vendor/nu-ansi-term/Cargo.toml | 10 --------- - vendor/opener-0.5.0/Cargo.toml | 3 --- vendor/opener/Cargo.toml | 4 ---- vendor/os_info/Cargo.toml | 15 ------------- vendor/parking_lot_core-0.8.6/Cargo.toml | 12 ---------- - vendor/parking_lot_core-0.9.6/Cargo.toml | 9 -------- - vendor/parking_lot_core/Cargo.toml | 9 -------- + vendor/parking_lot_core/Cargo.toml | 3 --- vendor/pretty_assertions/Cargo.toml | 6 ----- - vendor/remove_dir_all/Cargo.toml | 3 --- - vendor/rustix-0.37.6/Cargo.toml | 12 ---------- - vendor/rustix-0.37.7/Cargo.toml | 12 ---------- + vendor/rustix-0.37.11/Cargo.toml | 11 --------- + vendor/rustix-0.37.20/Cargo.toml | 16 -------------- vendor/rustix/Cargo.toml | 17 -------------- vendor/same-file/Cargo.toml | 2 -- - vendor/snapbox/Cargo.toml | 11 --------- - vendor/socket2-0.4.1/Cargo.toml | 3 --- + vendor/snapbox/Cargo.toml | 6 ----- vendor/socket2/Cargo.toml | 8 ------- vendor/stacker/Cargo.toml | 10 --------- vendor/sysinfo/Cargo.toml | 38 -------------------------------- - vendor/tempfile-3.3.0/Cargo.toml | 3 --- vendor/tempfile/Cargo.toml | 7 ------ vendor/term/Cargo.toml | 6 ----- vendor/termcolor/Cargo.toml | 3 --- vendor/terminal_size/Cargo.toml | 7 ------ vendor/termize/Cargo.toml | 3 --- - vendor/tokio/Cargo.toml | 6 ----- + vendor/tokio/Cargo.toml | 21 ------------------ vendor/uuid/Cargo.toml | 4 ---- - vendor/walkdir-2.3.2/Cargo.toml | 6 ----- vendor/walkdir/Cargo.toml | 3 --- - 59 files changed, 1 insertion(+), 462 deletions(-) + vendor/yansi-term/Cargo.toml | 3 --- + 48 files changed, 1 insertion(+), 397 deletions(-) +diff --git a/vendor/android-tzdata/Cargo.toml b/vendor/android-tzdata/Cargo.toml +index 805128a..0682717 100644 +--- a/vendor/android-tzdata/Cargo.toml ++++ b/vendor/android-tzdata/Cargo.toml +@@ -32,3 +32,4 @@ repository = "https://github.com/RumovZ/android-tzdata" + + [dev-dependencies.zip] + version = "0.6.4" ++repository = "https://github.com/rust-cli/concolor" diff --git a/vendor/anstream/Cargo.toml b/vendor/anstream/Cargo.toml -index eb04906..7e2ed64 100644 +index 75d78e2..a0eddb4 100644 --- a/vendor/anstream/Cargo.toml +++ b/vendor/anstream/Cargo.toml -@@ -137,8 +137,4 @@ default = [ +@@ -136,10 +136,4 @@ auto = [ + ] + default = [ "auto", - "wincon", +- "wincon", ] -wincon = ["dep:anstyle-wincon"] - -[target."cfg(windows)".dependencies.anstyle-wincon] --version = "0.2.0" +-version = "1.0.1" -optional = true -+wincon = [] +diff --git a/vendor/anstyle-query/Cargo.toml b/vendor/anstyle-query/Cargo.toml +index 63a431c..0cf859b 100644 +--- a/vendor/anstyle-query/Cargo.toml ++++ b/vendor/anstyle-query/Cargo.toml +@@ -70,10 +70,3 @@ replace = """ + <!-- next-url --> + [Unreleased]: https://github.com/rust-cli/anstyle/compare/{{tag_name}}...HEAD""" + exactly = 1 +- +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.48.0" +-features = [ +- "Win32_System_Console", +- "Win32_Foundation", +-] diff --git a/vendor/atty/Cargo.toml b/vendor/atty/Cargo.toml index d6bf2d0..7cebc31 100644 --- a/vendor/atty/Cargo.toml @@ -94,7 +110,7 @@ index d6bf2d0..7cebc31 100644 [badges.travis-ci] repository = "softprops/atty" diff --git a/vendor/backtrace/Cargo.toml b/vendor/backtrace/Cargo.toml -index 96f4146..4a48f6e 100644 +index f33884a..b43a0dd 100644 --- a/vendor/backtrace/Cargo.toml +++ b/vendor/backtrace/Cargo.toml @@ -127,18 +127,5 @@ serialize-serde = ["serde"] @@ -117,10 +133,10 @@ index 96f4146..4a48f6e 100644 -version = "0.3.9" -optional = true diff --git a/vendor/chrono/Cargo.toml b/vendor/chrono/Cargo.toml -index eaf0e69..79ab5f9 100644 +index 7f49bad..6229f0a 100644 --- a/vendor/chrono/Cargo.toml +++ b/vendor/chrono/Cargo.toml -@@ -114,7 +114,6 @@ __internal_bench = ["criterion"] +@@ -107,7 +107,6 @@ __internal_bench = ["criterion"] alloc = [] clock = [ "std", @@ -128,7 +144,7 @@ index eaf0e69..79ab5f9 100644 "iana-time-zone", ] default = [ -@@ -150,13 +149,3 @@ version = "0.3" +@@ -146,14 +145,3 @@ version = "0.1.1" version = "0.1.45" features = ["fallback"] optional = true @@ -140,6 +156,7 @@ index eaf0e69..79ab5f9 100644 - "minwinbase", - "minwindef", - "timezoneapi", +- "sysinfoapi", -] -optional = true diff --git a/vendor/colored/Cargo.toml b/vendor/colored/Cargo.toml @@ -154,37 +171,8 @@ index 3a6b59b..065eecb 100644 -version = "0.3" -features = ["consoleapi", "processenv", "winbase"] -default-features = false -diff --git a/vendor/compiletest_rs/Cargo.toml b/vendor/compiletest_rs/Cargo.toml -index c1b3ecd..cae8c30 100644 ---- a/vendor/compiletest_rs/Cargo.toml -+++ b/vendor/compiletest_rs/Cargo.toml -@@ -75,9 +75,3 @@ tmp = ["tempfile"] - [target."cfg(unix)".dependencies.libc] - version = "0.2" - --[target."cfg(windows)".dependencies.miow] --version = "0.3" -- --[target."cfg(windows)".dependencies.winapi] --version = "0.3" --features = ["winerror"] -diff --git a/vendor/concolor-query/Cargo.toml b/vendor/concolor-query/Cargo.toml -index a25ce89..c578c4c 100644 ---- a/vendor/concolor-query/Cargo.toml -+++ b/vendor/concolor-query/Cargo.toml -@@ -33,10 +33,3 @@ keywords = [ - categories = ["command-line-interface"] - license = "MIT OR Apache-2.0" - repository = "https://github.com/rust-cli/concolor" -- --[target."cfg(windows)".dependencies.windows-sys] --version = "0.45.0" --features = [ -- "Win32_System_Console", -- "Win32_Foundation", --] diff --git a/vendor/curl-sys/Cargo.toml b/vendor/curl-sys/Cargo.toml -index 04b9800..4a4968d 100644 +index 6d89163..0b17324 100644 --- a/vendor/curl-sys/Cargo.toml +++ b/vendor/curl-sys/Cargo.toml @@ -73,16 +73,6 @@ zlib-ng-compat = [ @@ -239,10 +227,10 @@ index e9d8d0c..acb2eb7 100644 [badges.maintenance] status = "as-is" diff --git a/vendor/dirs-sys/Cargo.toml b/vendor/dirs-sys/Cargo.toml -index 6c41007..4d79134 100644 +index 9951d24..0a86f4d 100644 --- a/vendor/dirs-sys/Cargo.toml +++ b/vendor/dirs-sys/Cargo.toml -@@ -23,6 +23,3 @@ version = "0.4" +@@ -22,6 +22,3 @@ version = "0.4" default-features = false [target."cfg(unix)".dependencies.libc] version = "0.2" @@ -295,16 +283,15 @@ index 8547ec3..4ecd973 100644 - "Win32_Storage_FileSystem", -] diff --git a/vendor/gix-sec/Cargo.toml b/vendor/gix-sec/Cargo.toml -index 44a3e884..041a6bb 100644 +index 254f82f..65248eb 100644 --- a/vendor/gix-sec/Cargo.toml +++ b/vendor/gix-sec/Cargo.toml -@@ -61,16 +61,3 @@ serde = [ - +@@ -63,15 +63,3 @@ serde = [ [target."cfg(not(windows))".dependencies.libc] version = "0.2.123" -- + -[target."cfg(windows)".dependencies.gix-path] --version = "^0.8.0" +-version = "^0.8.1" - -[target."cfg(windows)".dependencies.windows] -version = "0.48" @@ -331,7 +318,7 @@ index cd608b1..eecfb89 100644 - "Win32_UI_Shell", -] diff --git a/vendor/iana-time-zone/Cargo.toml b/vendor/iana-time-zone/Cargo.toml -index 5cdc175..271a062 100644 +index e06c705..572a8fd 100644 --- a/vendor/iana-time-zone/Cargo.toml +++ b/vendor/iana-time-zone/Cargo.toml @@ -52,7 +52,3 @@ version = "0.1.5" @@ -365,7 +352,7 @@ index 5e36444..82f9ce5 100644 -version = "0.3.9" -features = ["handleapi", "std", "winsock2"] diff --git a/vendor/io-lifetimes/Cargo.toml b/vendor/io-lifetimes/Cargo.toml -index b9ed913..0fd300a 100644 +index ef92ff0..c2733fb 100644 --- a/vendor/io-lifetimes/Cargo.toml +++ b/vendor/io-lifetimes/Cargo.toml @@ -43,7 +43,6 @@ optional = true @@ -393,10 +380,10 @@ index b9ed913..0fd300a 100644 -] -optional = true diff --git a/vendor/is-terminal/Cargo.toml b/vendor/is-terminal/Cargo.toml -index 7957a9c..0ab2ae1 100644 +index e0baea0..7790abd 100644 --- a/vendor/is-terminal/Cargo.toml +++ b/vendor/is-terminal/Cargo.toml -@@ -53,14 +53,3 @@ features = ["termios"] +@@ -54,14 +54,3 @@ features = ["stdio"] [target."cfg(target_os = \"hermit\")".dependencies.hermit-abi] version = "0.3.0" @@ -427,7 +414,7 @@ index 65168d5..7785a7e 100644 - "libloaderapi", -] diff --git a/vendor/libssh2-sys/Cargo.toml b/vendor/libssh2-sys/Cargo.toml -index 45f4a71..b0d3e26 100644 +index 45f4a71..f791ce9 100644 --- a/vendor/libssh2-sys/Cargo.toml +++ b/vendor/libssh2-sys/Cargo.toml @@ -43,7 +43,6 @@ version = "1.0.25" @@ -523,22 +510,16 @@ index 6981516..9fb8bd2 100644 - "handleapi", -] diff --git a/vendor/parking_lot_core/Cargo.toml b/vendor/parking_lot_core/Cargo.toml -index 361186b..e00c191 100644 +index d76740d..7da23fc 100644 --- a/vendor/parking_lot_core/Cargo.toml +++ b/vendor/parking_lot_core/Cargo.toml -@@ -57,12 +57,3 @@ version = "0.2.8" +@@ -57,6 +57,3 @@ version = "0.3" [target."cfg(unix)".dependencies.libc] version = "0.2.95" - --[target."cfg(windows)".dependencies.windows-sys] --version = "0.45.0" --features = [ -- "Win32_Foundation", -- "Win32_System_LibraryLoader", -- "Win32_System_SystemServices", -- "Win32_System_WindowsProgramming", --] +-[target."cfg(windows)".dependencies.windows-targets] +-version = "0.48.0" diff --git a/vendor/pretty_assertions/Cargo.toml b/vendor/pretty_assertions/Cargo.toml index f8370f7..4531652 100644 --- a/vendor/pretty_assertions/Cargo.toml @@ -553,22 +534,54 @@ index f8370f7..4531652 100644 - -[target."cfg(windows)".dependencies.output_vt100] -version = "0.1.2" -diff --git a/vendor/remove_dir_all/Cargo.toml b/vendor/remove_dir_all/Cargo.toml -index a847288..aaf637f 100644 ---- a/vendor/remove_dir_all/Cargo.toml -+++ b/vendor/remove_dir_all/Cargo.toml -@@ -23,6 +23,3 @@ license = "MIT/Apache-2.0" - repository = "https://github.com/XAMPPRocky/remove_dir_all.git" - [dev-dependencies.doc-comment] - version = "0.3" --[target."cfg(windows)".dependencies.winapi] --version = "0.3" --features = ["std", "errhandlingapi", "winerror", "fileapi", "winbase"] +diff --git a/vendor/rustix-0.37.11/Cargo.toml b/vendor/rustix-0.37.11/Cargo.toml +index a0ea91d..e5d57b1 100644 +--- a/vendor/rustix-0.37.11/Cargo.toml ++++ b/vendor/rustix-0.37.11/Cargo.toml +@@ -234,14 +234,3 @@ package = "errno" + version = "1.5.2" + optional = true + +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.48.0" +-features = [ +- "Win32_Foundation", +- "Win32_Networking_WinSock", +- "Win32_NetworkManagement_IpHelper", +- "Win32_System_Threading", +-] +- +-[target."cfg(windows)".dev-dependencies.ctor] +-version = "0.2.0" +diff --git a/vendor/rustix-0.37.20/Cargo.toml b/vendor/rustix-0.37.20/Cargo.toml +index 1a23dff..666da7b 100644 +--- a/vendor/rustix-0.37.20/Cargo.toml ++++ b/vendor/rustix-0.37.20/Cargo.toml +@@ -240,19 +240,3 @@ package = "errno" + version = "1.5.2" + optional = true + +-[target."cfg(windows)".dependencies.libc_errno] +-version = "0.3.1" +-default-features = false +-package = "errno" +- +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.48.0" +-features = [ +- "Win32_Foundation", +- "Win32_Networking_WinSock", +- "Win32_NetworkManagement_IpHelper", +- "Win32_System_Threading", +-] +- +-[target."cfg(windows)".dev-dependencies.ctor] +-version = "0.2.0" diff --git a/vendor/rustix/Cargo.toml b/vendor/rustix/Cargo.toml -index c928526..6b7cff3 100644 +index dd40b25..95b35ba 100644 --- a/vendor/rustix/Cargo.toml +++ b/vendor/rustix/Cargo.toml -@@ -233,20 +233,3 @@ package = "errno" +@@ -235,20 +235,3 @@ package = "errno" [target."cfg(any(target_os = \"android\", target_os = \"linux\"))".dependencies.once_cell] version = "1.5.2" optional = true @@ -600,10 +613,10 @@ index 4f66820..11ef472 100644 -[target."cfg(windows)".dependencies.winapi-util] -version = "0.1.1" diff --git a/vendor/snapbox/Cargo.toml b/vendor/snapbox/Cargo.toml -index a9a74e1..8b0bf63 100644 +index 5ca8579..8f438dd 100644 --- a/vendor/snapbox/Cargo.toml +++ b/vendor/snapbox/Cargo.toml -@@ -161,7 +157,6 @@ cmd = [ +@@ -161,7 +161,6 @@ cmd = [ "dep:os_pipe", "dep:wait-timeout", "dep:libc", @@ -611,7 +624,7 @@ index a9a74e1..8b0bf63 100644 ] color = [ "dep:anstream", -@@ -196,8 +190,3 @@ structured-data = ["dep:serde_json"] +@@ -199,8 +198,3 @@ structured-data = ["dep:serde_json"] [target."cfg(unix)".dependencies.libc] version = "0.2.137" optional = true @@ -701,16 +714,16 @@ index f8719a4..deb2e40 100644 - "std", -] diff --git a/vendor/tempfile/Cargo.toml b/vendor/tempfile/Cargo.toml -index 85006d8..013e986 100644 +index 1af1206..f665e00 100644 --- a/vendor/tempfile/Cargo.toml +++ b/vendor/tempfile/Cargo.toml -@@ -50,10 +50,3 @@ features = ["fs"] +@@ -53,10 +53,3 @@ features = ["fs"] [target."cfg(target_os = \"redox\")".dependencies.redox_syscall] version = "0.3" - -[target."cfg(windows)".dependencies.windows-sys] --version = "0.45" +-version = "0.48" -features = [ - "Win32_Storage_FileSystem", - "Win32_Foundation", @@ -772,41 +785,62 @@ index d248f4d..9bd9f37 100644 [badges.cirrus-ci] repository = "JohnTitor/termize" diff --git a/vendor/tokio/Cargo.toml b/vendor/tokio/Cargo.toml -index 11ec0c0..bf2ad39 100644 +index da1e4d1..55afa86 100644 --- a/vendor/tokio/Cargo.toml +++ b/vendor/tokio/Cargo.toml -@@ -95,11 +95,11 @@ full = ["fs", "io-util", "io-std", "macros", "net", "parking_lot", "process", "r - io-std = [] - io-util = ["memchr", "bytes"] - macros = ["tokio-macros"] --net = ["libc", "mio/os-poll", "mio/os-util", "mio/tcp", "mio/udp", "mio/uds", "winapi/namedpipeapi"] --process = ["bytes", "once_cell", "libc", "mio/os-poll", "mio/os-util", "mio/uds", "signal-hook-registry", "winapi/threadpoollegacyapiset"] -+net = ["libc", "mio/os-poll", "mio/os-util", "mio/tcp", "mio/udp", "mio/uds"] -+process = ["bytes", "once_cell", "libc", "mio/os-poll", "mio/os-util", "mio/uds", "signal-hook-registry"] +@@ -122,11 +122,6 @@ net = [ + "mio/os-ext", + "mio/net", + "socket2", +- "windows-sys/Win32_Foundation", +- "windows-sys/Win32_Security", +- "windows-sys/Win32_Storage_FileSystem", +- "windows-sys/Win32_System_Pipes", +- "windows-sys/Win32_System_SystemServices", + ] + process = [ + "bytes", +@@ -135,9 +130,6 @@ process = [ + "mio/os-ext", + "mio/net", + "signal-hook-registry", +- "windows-sys/Win32_Foundation", +- "windows-sys/Win32_System_Threading", +- "windows-sys/Win32_System_WindowsProgramming", + ] rt = [] - rt-multi-thread = ["num_cpus", "rt"] --signal = ["once_cell", "libc", "mio/os-poll", "mio/uds", "mio/os-util", "signal-hook-registry", "winapi/consoleapi"] -+signal = ["once_cell", "libc", "mio/os-poll", "mio/uds", "mio/os-util", "signal-hook-registry"] + rt-multi-thread = [ +@@ -150,8 +142,6 @@ signal = [ + "mio/net", + "mio/os-ext", + "signal-hook-registry", +- "windows-sys/Win32_Foundation", +- "windows-sys/Win32_System_Console", + ] + stats = [] sync = [] - test-util = [] - time = [] -@@ -123,9 +123,3 @@ version = "0.2.42" - - [target."cfg(unix)".dev-dependencies.nix] - version = "0.22.0" --[target."cfg(windows)".dependencies.winapi] --version = "0.3.8" +@@ -217,14 +207,3 @@ features = [ + "socket", + ] + default-features = false +- +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.48" -optional = true --default-features = false --[target."cfg(windows)".dev-dependencies.ntapi] --version = "0.3.6" +- +-[target."cfg(windows)".dev-dependencies.windows-sys] +-version = "0.48" +-features = [ +- "Win32_Foundation", +- "Win32_Security_Authorization", +-] diff --git a/vendor/uuid/Cargo.toml b/vendor/uuid/Cargo.toml -index b783688..4e98553 100644 +index b806036..4094678 100644 --- a/vendor/uuid/Cargo.toml +++ b/vendor/uuid/Cargo.toml -@@ -180,10 +180,6 @@ package = "wasm-bindgen" - [target."cfg(target_arch = \"wasm32\")".dev-dependencies.wasm-bindgen-test] - version = "0.3" +@@ -185,10 +185,6 @@ version = "0.3" + version = "0.2" + package = "wasm-bindgen" -[target."cfg(windows)".dev-dependencies.windows-sys] -version = "0.48.0" |