From 357001dabcef3252af6eabe98a412c7bd9e231fe Mon Sep 17 00:00:00 2001 From: Terts Diepraam Date: Thu, 9 Feb 2023 14:02:40 +0100 Subject: [PATCH] fix double dependency of memoffset by upgrading nix, libc and ctrlc --- Cargo.lock | 35 ++++++++++++++++------------------- Cargo.toml | 2 +- deny.toml | 4 ---- src/uu/cat/Cargo.toml | 2 +- src/uu/env/Cargo.toml | 2 +- src/uu/kill/Cargo.toml | 2 +- src/uu/more/Cargo.toml | 2 +- src/uu/nice/Cargo.toml | 2 +- src/uu/stty/Cargo.toml | 2 +- src/uu/sync/Cargo.toml | 2 +- src/uu/tail/Cargo.toml | 2 +- src/uu/timeout/Cargo.toml | 2 +- src/uu/tty/Cargo.toml | 2 +- src/uu/wc/Cargo.toml | 2 +- src/uu/yes/Cargo.toml | 2 +- src/uucore/Cargo.toml | 2 +- 16 files changed, 30 insertions(+), 37 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2ceb88f79..6541cb7f5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -570,7 +570,7 @@ dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset 0.7.1", + "memoffset", "scopeguard", ] @@ -636,12 +636,12 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.2.3" +version = "3.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d91974fbbe88ec1df0c24a4f00f99583667a7e2e6272b2b92d294d81e462173" +checksum = "1631ca6e3c59112501a9d87fd86f21591ff77acd31331e8a73f8d80a65bbdd71" dependencies = [ "nix", - "winapi", + "windows-sys", ] [[package]] @@ -1206,9 +1206,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.137" +version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] name = "libloading" @@ -1293,15 +1293,6 @@ dependencies = [ "libc", ] -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.7.1" @@ -1340,16 +1331,16 @@ dependencies = [ [[package]] name = "nix" -version = "0.25.0" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ - "autocfg", "bitflags", "cfg-if", "libc", - "memoffset 0.6.5", + "memoffset", "pin-utils", + "static_assertions", ] [[package]] @@ -2105,6 +2096,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + [[package]] name = "strsim" version = "0.10.0" diff --git a/Cargo.toml b/Cargo.toml index 90cc76f4d..0df012ea0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -411,7 +411,7 @@ procfs = { version = "0.14", default-features = false } rlimit = "0.8.3" [target.'cfg(unix)'.dev-dependencies] -nix = { version = "0.25", default-features = false, features = ["process", "signal", "user"] } +nix = { version = "0.26", default-features = false, features = ["process", "signal", "user"] } rust-users = { version="0.11", package="users" } rand_pcg = "0.3" diff --git a/deny.toml b/deny.toml index a2578384d..849b45da8 100644 --- a/deny.toml +++ b/deny.toml @@ -65,10 +65,6 @@ skip = [ { name = "env_logger", version = "=0.8.4" }, # tempfile { name = "remove_dir_all", version = "=0.5.3" }, - # console (via indicatif) - { name = "terminal_size", version = "=0.1.17" }, - # nix - { name = "memoffset", version = "=0.6.5"}, # blake2b_simd { name = "constant_time_eq", version = "=0.1.5"}, ] diff --git a/src/uu/cat/Cargo.toml b/src/uu/cat/Cargo.toml index 524179567..fda4bd1eb 100644 --- a/src/uu/cat/Cargo.toml +++ b/src/uu/cat/Cargo.toml @@ -21,7 +21,7 @@ atty = "0.2" uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["fs", "pipes"] } [target.'cfg(unix)'.dependencies] -nix = { version = "0.25", default-features = false } +nix = { version = "0.26", default-features = false } [[bin]] name = "cat" diff --git a/src/uu/env/Cargo.toml b/src/uu/env/Cargo.toml index 311d34c06..1ac3cf6af 100644 --- a/src/uu/env/Cargo.toml +++ b/src/uu/env/Cargo.toml @@ -20,7 +20,7 @@ rust-ini = "0.18.0" uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["signals"]} [target.'cfg(unix)'.dependencies] -nix = { version = "0.25", default-features = false, features = ["signal"] } +nix = { version = "0.26", default-features = false, features = ["signal"] } [[bin]] diff --git a/src/uu/kill/Cargo.toml b/src/uu/kill/Cargo.toml index 21431e3fe..c3855978f 100644 --- a/src/uu/kill/Cargo.toml +++ b/src/uu/kill/Cargo.toml @@ -16,7 +16,7 @@ path = "src/kill.rs" [dependencies] clap = { version = "4.0", features = ["wrap_help", "cargo"] } -nix = { version = "0.25", features = ["signal"] } +nix = { version = "0.26", features = ["signal"] } uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["signals"] } [[bin]] diff --git a/src/uu/more/Cargo.toml b/src/uu/more/Cargo.toml index b52ed1880..c0023924f 100644 --- a/src/uu/more/Cargo.toml +++ b/src/uu/more/Cargo.toml @@ -23,7 +23,7 @@ unicode-width = "0.1.7" unicode-segmentation = "1.9.0" [target.'cfg(all(unix, not(target_os = "fuchsia")))'.dependencies] -nix = { version = "0.25", default-features = false } +nix = { version = "0.26", default-features = false } [[bin]] name = "more" diff --git a/src/uu/nice/Cargo.toml b/src/uu/nice/Cargo.toml index b3f013bde..857036498 100644 --- a/src/uu/nice/Cargo.toml +++ b/src/uu/nice/Cargo.toml @@ -17,7 +17,7 @@ path = "src/nice.rs" [dependencies] clap = { version = "4.0", features = ["wrap_help", "cargo"] } libc = "0.2.137" -nix = { version = "0.25", default-features = false } +nix = { version = "0.26", default-features = false } uucore = { version=">=0.0.17", package="uucore", path="../../uucore" } [[bin]] diff --git a/src/uu/stty/Cargo.toml b/src/uu/stty/Cargo.toml index 06e926e68..b1e15427d 100644 --- a/src/uu/stty/Cargo.toml +++ b/src/uu/stty/Cargo.toml @@ -17,7 +17,7 @@ path = "src/stty.rs" [dependencies] clap = { version = "4.0", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.17", package="uucore", path="../../uucore" } -nix = { version="0.25", features = ["term"] } +nix = { version="0.26", features = ["term"] } [[bin]] name = "stty" diff --git a/src/uu/sync/Cargo.toml b/src/uu/sync/Cargo.toml index f357cdc62..a7036f852 100644 --- a/src/uu/sync/Cargo.toml +++ b/src/uu/sync/Cargo.toml @@ -20,7 +20,7 @@ libc = "0.2.137" uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["wide"] } [target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies] -nix = "0.25" +nix = "0.26" [target.'cfg(target_os = "windows")'.dependencies] windows-sys = { version = "0.42.0", default-features = false, features = ["Win32_Storage_FileSystem", "Win32_System_WindowsProgramming", "Win32_Foundation"] } diff --git a/src/uu/tail/Cargo.toml b/src/uu/tail/Cargo.toml index 9ad6d8609..6b00b4f3d 100644 --- a/src/uu/tail/Cargo.toml +++ b/src/uu/tail/Cargo.toml @@ -29,7 +29,7 @@ windows-sys = { version = "0.42.0", default-features = false, features = ["Win32 winapi-util = { version="0.1.5" } [target.'cfg(unix)'.dependencies] -nix = { version = "0.25", features = ["fs"] } +nix = { version = "0.26", features = ["fs"] } [[bin]] name = "tail" diff --git a/src/uu/timeout/Cargo.toml b/src/uu/timeout/Cargo.toml index ab71bad9a..2422e669a 100644 --- a/src/uu/timeout/Cargo.toml +++ b/src/uu/timeout/Cargo.toml @@ -17,7 +17,7 @@ path = "src/timeout.rs" [dependencies] clap = { version = "4.0", features = ["wrap_help", "cargo"] } libc = "0.2.137" -nix = { version = "0.25", default-features = false, features = ["signal"] } +nix = { version = "0.26", default-features = false, features = ["signal"] } uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["process", "signals"] } [[bin]] diff --git a/src/uu/tty/Cargo.toml b/src/uu/tty/Cargo.toml index d71f08d10..484870e85 100644 --- a/src/uu/tty/Cargo.toml +++ b/src/uu/tty/Cargo.toml @@ -16,7 +16,7 @@ path = "src/tty.rs" [dependencies] clap = { version = "4.0", features = ["wrap_help", "cargo"] } -nix = "0.25" +nix = "0.26" atty = "0.2" uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["fs"] } diff --git a/src/uu/wc/Cargo.toml b/src/uu/wc/Cargo.toml index 6d30267a8..060edf312 100644 --- a/src/uu/wc/Cargo.toml +++ b/src/uu/wc/Cargo.toml @@ -22,7 +22,7 @@ utf-8 = "0.7.6" unicode-width = "0.1.8" [target.'cfg(unix)'.dependencies] -nix = { version = "0.25", default-features = false } +nix = { version = "0.26", default-features = false } libc = "0.2" [[bin]] diff --git a/src/uu/yes/Cargo.toml b/src/uu/yes/Cargo.toml index ff52de031..4ba10df3f 100644 --- a/src/uu/yes/Cargo.toml +++ b/src/uu/yes/Cargo.toml @@ -20,7 +20,7 @@ libc = "0.2.137" uucore = { version=">=0.0.17", package="uucore", path="../../uucore", features=["pipes"] } [target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies] -nix = { version = "0.25", default-features = false } +nix = { version = "0.26", default-features = false } [[bin]] name = "yes" diff --git a/src/uucore/Cargo.toml b/src/uucore/Cargo.toml index 6264d7665..0f42a7941 100644 --- a/src/uucore/Cargo.toml +++ b/src/uucore/Cargo.toml @@ -38,7 +38,7 @@ os_display = "0.1.3" [target.'cfg(unix)'.dependencies] walkdir = { version="2.3.2", optional=true } -nix = { version = "0.25", default-features = false, features = ["fs", "uio", "zerocopy"] } +nix = { version = "0.26", default-features = false, features = ["fs", "uio", "zerocopy"] } [dev-dependencies] clap = "4.0"