Alyssa Ross: 9 ratman-configure: use in-tree netmod-mem libqaul: update crossbeam-channel to 0.5 netmod-mem: update crossbeam-channel to 0.5 libopus-sys: update bindgen to 0.57 ratman-identify: update cfg-if to 1.0 libqaul: update base64 to 0.12 ratman-netmod: remove unused conjoiner-engine dep clients/hubd: update ipnetwork to 0.17.0 qrpc-broker: update signal-hook to 0.3.6 18 files changed, 63 insertions(+), 247 deletions(-)
Copy & paste the following snippet into your terminal to import this patchset into git:
curl -s https://lists.sr.ht/~qaul/community/patches/20715/mbox | git am -3Learn more about email & git
When this was changed to use the crates.io version, the netmod-mem in tree didn't build. But now it does, so we can use it again. --- Cargo.lock | 86 ++++++++----------------------------- ratman/configure/Cargo.toml | 2 +- 2 files changed, 19 insertions(+), 69 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7db1cbad..0e011869 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -21,7 +21,7 @@ dependencies = [ "hex", "keybob", "rand 0.7.3", - "ratman-identity 0.6.0", + "ratman-identity", "serde", "serde_json", "sodiumoxide", @@ -1170,7 +1170,7 @@ dependencies = [ "libqaul-types", "log 0.4.14", "mime", - "netmod-mem 0.2.0", + "netmod-mem", "qrpc-sdk", "rand 0.7.3", "ratman", @@ -1199,7 +1199,7 @@ dependencies = [ "async-trait", "bincode", "qrpc-sdk", - "ratman-identity 0.6.0", + "ratman-identity", "serde", "serde_json", ] @@ -1277,19 +1277,6 @@ dependencies = [ "socket2", ] -[[package]] -name = "netmod-mem" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f69ebb700154b418c574cccdfc3b9b94badee8f8e0a456106af13d3b41ffb867" -dependencies = [ - "async-std", - "async-trait", - "crossbeam-channel", - "ratman-identity 0.4.0", - "ratman-netmod 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "netmod-mem" version = "0.2.0" @@ -1297,8 +1284,8 @@ dependencies = [ "async-std", "async-trait", "crossbeam-channel", - "ratman-identity 0.6.0", - "ratman-netmod 0.3.0", + "ratman-identity", + "ratman-netmod", ] [[package]] @@ -1309,8 +1296,8 @@ dependencies = [ "async-trait", "bincode", "byteorder", - "ratman-identity 0.6.0", - "ratman-netmod 0.3.0", + "ratman-identity", + "ratman-netmod", "serde", "thiserror", "tracing", @@ -1324,8 +1311,8 @@ dependencies = [ "async-std", "async-trait", "bincode", - "ratman-identity 0.6.0", - "ratman-netmod 0.3.0", + "ratman-identity", + "ratman-netmod", "serde", "task-notify", "tracing", @@ -1340,7 +1327,7 @@ dependencies = [ "async-trait", "bincode", "jni", - "ratman-netmod 0.3.0", + "ratman-netmod", ] [[package]] @@ -1669,7 +1656,7 @@ dependencies = [ "capnp", "lazy_static", "qrpc-sdk", - "ratman-identity 0.6.0", + "ratman-identity", "signal-hook 0.1.17", "socket2", "tracing", @@ -1696,7 +1683,7 @@ dependencies = [ "byteorder", "capnp", "capnpc", - "ratman-identity 0.6.0", + "ratman-identity", "tracing", ] @@ -1805,9 +1792,9 @@ dependencies = [ "chrono", "clockctrl", "futures", - "netmod-mem 0.2.0", - "ratman-identity 0.6.0", - "ratman-netmod 0.3.0", + "netmod-mem", + "ratman-identity", + "ratman-netmod", "serde", "task-notify", "tracing", @@ -1820,7 +1807,7 @@ name = "ratman-configure" version = "0.1.0" dependencies = [ "async-std", - "netmod-mem 0.1.0", + "netmod-mem", "netmod-tcp", "netmod-udp", "ratman", @@ -1833,35 +1820,11 @@ name = "ratman-harness" version = "0.1.0" dependencies = [ "arbitrary", - "netmod-mem 0.2.0", + "netmod-mem", "ratman", "tempfile", ] -[[package]] -name = "ratman-identity" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6e396d9351440014492c178d86a24adb7ab831b429205c43ca4521cbeb35bc3" -dependencies = [ - "blake2 0.8.1", - "hex", - "rand 0.7.3", - "serde", -] - -[[package]] -name = "ratman-identity" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e94cc012804fd49daa7e0eecb6e3831f58b517dd0152c9533912c09bc5b8972" -dependencies = [ - "blake2 0.8.1", - "cfg-if 0.1.10", - "hex", - "serde", -] - [[package]] name = "ratman-identity" version = "0.6.0" @@ -1881,20 +1844,7 @@ version = "0.3.0" dependencies = [ "async-trait", "conjoiner-engine", - "ratman-identity 0.6.0", - "serde", - "twox-hash", -] - -[[package]] -name = "ratman-netmod" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e04e347dd4b001090e535f966d62c6abf60f8de29b01daf68689d3c832c1c8f" -dependencies = [ - "async-trait", - "conjoiner-engine", - "ratman-identity 0.3.0", + "ratman-identity", "serde", "twox-hash", ] diff --git a/ratman/configure/Cargo.toml b/ratman/configure/Cargo.toml index 490a7390..03f8a125 100644 --- a/ratman/configure/Cargo.toml +++ b/ratman/configure/Cargo.toml @@ -8,7 +8,7 @@ license = "AGPL-3.0-or-later" [dependencies] async-std = { version = "1.0", features = ["attributes"] } -netmod-mem = { version = "0.1" } # TODO: update this dependency +netmod-mem = { version = "0.2", path = "../../netmods/netmod-mem" } netmod-tcp = { version = "0.2", path = "../../netmods/netmod-tcp" } netmod-udp = { version = "0.1", path = "../../netmods/netmod-udp" } ratman = { version = "0.1", path = ".." } -- 2.30.0
--- Cargo.lock | 14 ++++++++++++-- libqaul/Cargo.toml | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0e011869..f170597c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -562,6 +562,16 @@ dependencies = [ "maybe-uninit", ] +[[package]] +name = "crossbeam-channel" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils 0.8.3", +] + [[package]] name = "crossbeam-utils" version = "0.7.2" @@ -1163,7 +1173,7 @@ dependencies = [ "base64 0.10.1", "bincode", "blake2 0.8.1", - "crossbeam-channel", + "crossbeam-channel 0.5.0", "futures", "hex", "jni", @@ -1283,7 +1293,7 @@ version = "0.2.0" dependencies = [ "async-std", "async-trait", - "crossbeam-channel", + "crossbeam-channel 0.4.4", "ratman-identity", "ratman-netmod", ] diff --git a/libqaul/Cargo.toml b/libqaul/Cargo.toml index a7e7a2f1..981230e8 100644 --- a/libqaul/Cargo.toml +++ b/libqaul/Cargo.toml @@ -18,7 +18,7 @@ async-trait = "0.1" base64 = "0.10" bincode = "1.0" blake2 = "0.8" -crossbeam-channel = "0.4" +crossbeam-channel = "0.5" futures = "0.3" hex = "0.4" jni = { version = "0.14", optional = true, default-features = false } -- 2.30.0
--- Cargo.lock | 35 ++++------------------------------- netmods/netmod-mem/Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 32 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f170597c..d4bb2887 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -204,7 +204,7 @@ dependencies = [ "async-io", "async-lock", "async-process", - "crossbeam-utils 0.8.3", + "crossbeam-utils", "futures-channel", "futures-core", "futures-io", @@ -552,16 +552,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" -[[package]] -name = "crossbeam-channel" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" -dependencies = [ - "crossbeam-utils 0.7.2", - "maybe-uninit", -] - [[package]] name = "crossbeam-channel" version = "0.5.0" @@ -569,18 +559,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.3", -] - -[[package]] -name = "crossbeam-utils" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg", - "cfg-if 0.1.10", - "lazy_static", + "crossbeam-utils", ] [[package]] @@ -1173,7 +1152,7 @@ dependencies = [ "base64 0.10.1", "bincode", "blake2 0.8.1", - "crossbeam-channel 0.5.0", + "crossbeam-channel", "futures", "hex", "jni", @@ -1259,12 +1238,6 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - [[package]] name = "memchr" version = "2.3.4" @@ -1293,7 +1266,7 @@ version = "0.2.0" dependencies = [ "async-std", "async-trait", - "crossbeam-channel 0.4.4", + "crossbeam-channel", "ratman-identity", "ratman-netmod", ] diff --git a/netmods/netmod-mem/Cargo.toml b/netmods/netmod-mem/Cargo.toml index 20c14708..eb3003f8 100644 --- a/netmods/netmod-mem/Cargo.toml +++ b/netmods/netmod-mem/Cargo.toml @@ -9,6 +9,6 @@ license = "AGPL-3.0" [dependencies] async-std = { version = "1.0", features = ["attributes", "unstable"] } async-trait = "0.1" -crossbeam-channel = "0.4" +crossbeam-channel = "0.5" ratman-identity = { version ="0.6.0", path = "../../ratman/identity", package = "ratman-identity", features = [ "digest" ] } ratman-netmod = { version = "0.3", path = "../../ratman/netmod", package = "ratman-netmod" } -- 2.30.0
--- Cargo.lock | 32 +++++++++++--------------------- utils/libopus-sys/Cargo.toml | 2 +- 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d4bb2887..29740d42 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -299,13 +299,12 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.54.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66c0bb6167449588ff70803f4127f0684f9063097eca5016f37eb52b92c2cf36" +checksum = "fd4865004a46a0aafb2a0a5eb19d3c9fc46ee5f063a6cfc605c69ac9ecf5263d" dependencies = [ "bitflags 1.2.1", "cexpr", - "cfg-if 0.1.10", "clang-sys", "clap", "env_logger", @@ -473,9 +472,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "0.29.3" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe6837df1d5cba2397b835c8530f51723267e16abbf83892e9e5af4f0e5dd10a" +checksum = "f54d78e30b388d4815220c8dd03fea5656b6c6d32adb59e89061552a102f8da1" dependencies = [ "glob 0.3.0", "libc", @@ -686,9 +685,9 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] name = "env_logger" -version = "0.7.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f" dependencies = [ "atty", "humantime", @@ -979,12 +978,9 @@ dependencies = [ [[package]] name = "humantime" -version = "1.3.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -dependencies = [ - "quick-error", -] +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "idna" @@ -1126,11 +1122,11 @@ checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c" [[package]] name = "libloading" -version = "0.5.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" +checksum = "6f84d96438c15fcd6c3f244c8fce01d1e2b9c6b5623e9c711dc9286d8fc92d6a" dependencies = [ - "cc", + "cfg-if 1.0.0", "winapi 0.3.9", ] @@ -1670,12 +1666,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - [[package]] name = "quote" version = "1.0.9" diff --git a/utils/libopus-sys/Cargo.toml b/utils/libopus-sys/Cargo.toml index 17c27224..d843ba62 100644 --- a/utils/libopus-sys/Cargo.toml +++ b/utils/libopus-sys/Cargo.toml @@ -12,7 +12,7 @@ license = "Apache-2.0" [build-dependencies] cmake = "0.1" -bindgen = { version = "0.54", optional = true } +bindgen = { version = "0.57", optional = true } [features] # Used internally to generate lib.rs -- 2.30.0
--- Cargo.lock | 2 +- ratman/identity/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 29740d42..e445c4ac 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1804,7 +1804,7 @@ version = "0.6.0" dependencies = [ "bincode", "blake2 0.8.1", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "hex", "rand 0.7.3", "serde", diff --git a/ratman/identity/Cargo.toml b/ratman/identity/Cargo.toml index 5b431988..dd757323 100644 --- a/ratman/identity/Cargo.toml +++ b/ratman/identity/Cargo.toml @@ -19,7 +19,7 @@ aligned = [] serde = { version = "1.0", features = ["derive"] } blake2 = { version = "0.8.0", optional = true } rand = { version = "0.7", optional = true } -cfg-if = "0.1" +cfg-if = "1.0" hex = "0.4" [dev-dependencies] -- 2.30.0
--- Cargo.lock | 15 +++------------ libqaul/Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e445c4ac..0658cacf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -272,15 +272,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" -[[package]] -name = "base64" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" -dependencies = [ - "byteorder", -] - [[package]] name = "base64" version = "0.12.3" @@ -1084,7 +1075,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae8038be446bbffb5bebe247ab05a1b1cb4c33363e204102a01e44f5933e7451" dependencies = [ - "base64 0.12.3", + "base64", "blake2 0.9.1", "hmac", "pbkdf2", @@ -1145,7 +1136,7 @@ dependencies = [ "alexandria", "async-std", "async-trait", - "base64 0.10.1", + "base64", "bincode", "blake2 0.8.1", "crossbeam-channel", @@ -1386,7 +1377,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd" dependencies = [ - "base64 0.12.3", + "base64", "crypto-mac 0.8.0", "hmac", "rand 0.7.3", diff --git a/libqaul/Cargo.toml b/libqaul/Cargo.toml index 981230e8..edb73ba9 100644 --- a/libqaul/Cargo.toml +++ b/libqaul/Cargo.toml @@ -15,7 +15,7 @@ ratman = { path = "../ratman" } async-std = { version = "1.0", features = ["attributes", "unstable"] } async-trait = "0.1" -base64 = "0.10" +base64 = "0.12" bincode = "1.0" blake2 = "0.8" crossbeam-channel = "0.5" -- 2.30.0
--- Cargo.lock | 78 ---------------------------------------- ratman/netmod/Cargo.toml | 1 - 2 files changed, 79 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0658cacf..cd96d1cd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -69,18 +69,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "698b65a961a9d730fb45b6b0327e20207810c9f61ee421b082b27ba003f49e2b" -[[package]] -name = "as-slice" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb4d1c23475b74e3672afa8c2be22040b8b7783ad9b461021144ed10a46bb0e6" -dependencies = [ - "generic-array 0.12.3", - "generic-array 0.13.2", - "generic-array 0.14.4", - "stable_deref_trait", -] - [[package]] name = "ascii" version = "0.9.3" @@ -526,16 +514,6 @@ dependencies = [ "cache-padded", ] -[[package]] -name = "conjoiner-engine" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60abd3730920fc7cb3488fb17d8ede5f99b1b24d6c2dac1ccfd6497e28967dfd" -dependencies = [ - "postcard", - "serde", -] - [[package]] name = "cpuid-bool" version = "0.1.2" @@ -843,15 +821,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "generic-array" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed1e761351b56f54eb9dcd0cfaca9fd0daecf93918e1cfc01c8a3d26ee7adcd" -dependencies = [ - "typenum", -] - [[package]] name = "generic-array" version = "0.14.4" @@ -909,28 +878,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "hash32" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4041af86e63ac4298ce40e5cca669066e75b6f1aa3390fe2561ffa5e1d9f4cc" -dependencies = [ - "byteorder", -] - -[[package]] -name = "heapless" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74911a68a1658cfcfb61bc0ccfbd536e3b6e906f8c2f7883ee50157e3e2184f1" -dependencies = [ - "as-slice", - "generic-array 0.13.2", - "hash32", - "serde", - "stable_deref_trait", -] - [[package]] name = "hermit-abi" version = "0.1.18" @@ -1552,24 +1499,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "postcard" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61f42c9617f3d7b447ee300bf80cb16c7cd7b28ca88555822793f073f69719f" -dependencies = [ - "byteorder", - "heapless", - "postcard-cobs", - "serde", -] - -[[package]] -name = "postcard-cobs" -version = "0.1.5-pre" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c68cb38ed13fd7bc9dd5db8f165b7c8d9c1a315104083a2b10f11354c2af97f" - [[package]] name = "ppv-lite86" version = "0.2.10" @@ -1807,7 +1736,6 @@ name = "ratman-netmod" version = "0.3.0" dependencies = [ "async-trait", - "conjoiner-engine", "ratman-identity", "serde", "twox-hash", @@ -2024,12 +1952,6 @@ dependencies = [ "serde", ] -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - [[package]] name = "static_assertions" version = "1.1.0" diff --git a/ratman/netmod/Cargo.toml b/ratman/netmod/Cargo.toml index 7d3b5efb..f234db59 100644 --- a/ratman/netmod/Cargo.toml +++ b/ratman/netmod/Cargo.toml @@ -13,7 +13,6 @@ license = "AGPL-3.0" [dependencies] identity = { version ="0.6.0", path = "../identity", features = ["digest", "random"], package = "ratman-identity" } -conjoiner = { version = "1.0", package = "conjoiner-engine" } serde = { version = "1.0", features = ["derive"] } twox-hash = "1.5" async-trait = "0.1" -- 2.30.0
--- Cargo.lock | 15 +++------------ clients/hubd/Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cd96d1cd..e9cafe79 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -953,15 +953,6 @@ dependencies = [ "cfg-if 1.0.0", ] -[[package]] -name = "ipnetwork" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8eca9f51da27bc908ef3dd85c21e1bbba794edaf94d7841e37356275b82d31e" -dependencies = [ - "serde", -] - [[package]] name = "ipnetwork" version = "0.17.0" @@ -1404,7 +1395,7 @@ version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b657d5b9a98a2c81b82549922b8b15984e49f8120cd130b11a09f81b9b55d633" dependencies = [ - "ipnetwork 0.17.0", + "ipnetwork", "pnet_base", "pnet_datalink", "pnet_packet", @@ -1424,7 +1415,7 @@ version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59001c9c4d9d23bf2f61afaaf134a766fd6932ba2557c606b9112157053b9ac7" dependencies = [ - "ipnetwork 0.17.0", + "ipnetwork", "libc", "pnet_base", "pnet_sys", @@ -1534,7 +1525,7 @@ dependencies = [ "clap", "directories-next", "igd", - "ipnetwork 0.16.0", + "ipnetwork", "libqaul", "netmod-tcp", "netmod-udp", diff --git a/clients/hubd/Cargo.toml b/clients/hubd/Cargo.toml index 18e7dc97..e4a86825 100644 --- a/clients/hubd/Cargo.toml +++ b/clients/hubd/Cargo.toml @@ -21,4 +21,4 @@ igd = "0.11" tracing = "0.1" tracing-subscriber = { version = "0.2", features = ["fmt", "env-filter"] } pnet = "0.27" -ipnetwork = "0.16" \ No newline at end of file +ipnetwork = "0.17" -- 2.30.0
--- Cargo.lock | 16 +++------------- rpc-core/qrpc-broker/Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e9cafe79..f9fee00a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -176,7 +176,7 @@ dependencies = [ "event-listener", "futures-lite", "once_cell", - "signal-hook 0.3.6", + "signal-hook", "winapi 0.3.9", ] @@ -1082,7 +1082,7 @@ dependencies = [ "hex", "jni", "libqaul-types", - "log 0.4.14", + "log 0.3.9", "mime", "netmod-mem", "qrpc-sdk", @@ -1547,7 +1547,7 @@ dependencies = [ "lazy_static", "qrpc-sdk", "ratman-identity", - "signal-hook 0.1.17", + "signal-hook", "socket2", "tracing", ] @@ -1874,16 +1874,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" -[[package]] -name = "signal-hook" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e31d442c16f047a671b5a71e2161d6e68814012b7f5379d269ebd915fac2729" -dependencies = [ - "libc", - "signal-hook-registry", -] - [[package]] name = "signal-hook" version = "0.3.6" diff --git a/rpc-core/qrpc-broker/Cargo.toml b/rpc-core/qrpc-broker/Cargo.toml index 3f277e5e..33acad79 100644 --- a/rpc-core/qrpc-broker/Cargo.toml +++ b/rpc-core/qrpc-broker/Cargo.toml @@ -14,6 +14,6 @@ async-std = "1.0" byteorder = "1.0" capnp = "0.13" lazy_static = "1.0" -signal-hook = "0.1.16" +signal-hook = "0.3" socket2 = { version = "0.3", features = ["unix"] } tracing = "0.1" -- 2.30.0