From 73bfecd38cbb60878ae6275f087c754877cc704b Mon Sep 17 00:00:00 2001 From: Saber Haj Rabiee Date: Mon, 4 Mar 2024 23:03:42 -0800 Subject: [PATCH] update toml dep in server for consistency --- server/Cargo.toml | 49 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 39 insertions(+), 10 deletions(-) diff --git a/server/Cargo.toml b/server/Cargo.toml index 41ba886..cad18d9 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -29,7 +29,12 @@ clap = { version = "4.3", features = ["derive", "wrap_help"] } clap_complete = "4.3" colored = "2" dialoguer = { version = "0.10", default-features = false } -hyper = { version = "0.14", default-features = false, features = ["http1", "server", "runtime", "stream"] } +hyper = { version = "0.14", default-features = false, features = [ + "http1", + "server", + "runtime", + "stream", +] } indoc = "2.0.1" ipnet = { version = "2.4", features = ["serde"] } libc = "0.2" @@ -47,7 +52,7 @@ shared = { path = "../shared" } subtle = "2" thiserror = "1" tokio = { version = "1.28.0", features = ["macros", "rt-multi-thread", "time"] } -toml = "0.7.4" +toml = "0.8.10" url = "2" wireguard-control = { path = "../wireguard-control" } @@ -64,18 +69,42 @@ tempfile = "3" [package.metadata.deb] assets = [ - ["target/release/innernet-server", "usr/bin/", "755"], - ["innernet-server@.service", "usr/lib/systemd/system/", "644"], - ["../doc/innernet-server.8.gz", "usr/share/man/man8/", "644"], - ["../doc/innernet-server.completions.zsh", "usr/share/zsh/site-functions/_innernet-server", "644"], - ["../doc/innernet-server.completions.bash", "etc/bash_completion.d/innernet-server", "644"], - ["../doc/innernet-server.completions.fish", "usr/share/fish/vendor_completions.d/innernet-server.fish", "644"], + [ + "target/release/innernet-server", + "usr/bin/", + "755", + ], + [ + "innernet-server@.service", + "usr/lib/systemd/system/", + "644", + ], + [ + "../doc/innernet-server.8.gz", + "usr/share/man/man8/", + "644", + ], + [ + "../doc/innernet-server.completions.zsh", + "usr/share/zsh/site-functions/_innernet-server", + "644", + ], + [ + "../doc/innernet-server.completions.bash", + "etc/bash_completion.d/innernet-server", + "644", + ], + [ + "../doc/innernet-server.completions.fish", + "usr/share/fish/vendor_completions.d/innernet-server.fish", + "644", + ], ] depends = "libc6, libgcc1, libsqlite3-0, zlib1g, systemd" -recommends = "wireguard" maintainer = "tonari " name = "innernet-server" priority = "optional" +recommends = "wireguard" section = "net" [package.metadata.rpm] @@ -86,10 +115,10 @@ buildflags = ["--release"] [package.metadata.rpm.files] "../../doc/innernet-server.8.gz" = { path = "/usr/share/man/man8/innernet-server.8.gz" } -"../innernet-server@.service" = { path = "/usr/lib/systemd/system/innernet-server@.service" } "../../doc/innernet-server.completions.bash" = { path = "/etc/bash_completion.d/innernet-server" } "../../doc/innernet-server.completions.fish" = { path = "/usr/share/fish/vendor_completions.d/innernet-server.fish" } "../../doc/innernet-server.completions.zsh" = { path = "/usr/share/zsh/site-functions/_innernet-server" } +"../innernet-server@.service" = { path = "/usr/lib/systemd/system/innernet-server@.service" } [package.metadata.rpm.targets] innernet-server = { path = "/usr/bin/innernet-server" }