ripping out some extra packages (#3146)

This commit is contained in:
James Hodgkinson 2024-10-26 12:27:56 +10:00 committed by GitHub
parent 5a709520dc
commit 151a9ad90f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 14 additions and 29 deletions

17
Cargo.lock generated
View file

@ -407,18 +407,6 @@ dependencies = [
"tracing", "tracing",
] ]
[[package]]
name = "axum-auth"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8169113a185f54f68614fcfc3581df585d30bf8542bcb99496990e1025e4120a"
dependencies = [
"async-trait",
"axum-core 0.4.5",
"base64 0.21.7",
"http 1.1.0",
]
[[package]] [[package]]
name = "axum-core" name = "axum-core"
version = "0.3.4" version = "0.3.4"
@ -1238,7 +1226,6 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"sketching", "sketching",
"tempfile",
"tokio", "tokio",
"tokio-util", "tokio-util",
"toml", "toml",
@ -3467,7 +3454,6 @@ dependencies = [
"askama_axum", "askama_axum",
"async-trait", "async-trait",
"axum 0.7.7", "axum 0.7.7",
"axum-auth",
"axum-extra", "axum-extra",
"axum-htmx", "axum-htmx",
"axum-macros", "axum-macros",
@ -3530,7 +3516,6 @@ dependencies = [
"criterion", "criterion",
"dhat", "dhat",
"dyn-clone", "dyn-clone",
"enum-iterator",
"fernet", "fernet",
"futures", "futures",
"hashbrown 0.14.5", "hashbrown 0.14.5",
@ -3598,7 +3583,6 @@ dependencies = [
"fantoccini", "fantoccini",
"futures", "futures",
"http 1.1.0", "http 1.1.0",
"hyper-tls",
"jsonschema", "jsonschema",
"kanidm_build_profiles", "kanidm_build_profiles",
"kanidm_client", "kanidm_client",
@ -3615,7 +3599,6 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"sketching", "sketching",
"tempfile",
"testkit-macros", "testkit-macros",
"time", "time",
"tokio", "tokio",

View file

@ -190,7 +190,6 @@ hyper = { version = "1.5.0", features = [
"full", "full",
] } # hyper full includes client/server/http2 ] } # hyper full includes client/server/http2
hyper-util = { version = "0.1.9", features = ["server", "tokio"] } hyper-util = { version = "0.1.9", features = ["server", "tokio"] }
hyper-tls = "0.6.0"
idlset = "^0.2.5" idlset = "^0.2.5"
image = { version = "0.24.9", default-features = false, features = [ image = { version = "0.24.9", default-features = false, features = [
"gif", "gif",

View file

@ -2,7 +2,7 @@ use std::env;
fn main() { fn main() {
// Allows openssl3 as a cfg flag // Allows openssl3 as a cfg flag
println!("cargo::rustc-check-cfg=cfg(openssl3)"); println!("cargo:rustc-check-cfg=cfg(openssl3)");
println!("cargo:rerun-if-changed=build.rs"); println!("cargo:rerun-if-changed=build.rs");
println!("cargo:rerun-if-env-changed=DEP_OPENSSL_VERSION_NUMBER"); println!("cargo:rerun-if-env-changed=DEP_OPENSSL_VERSION_NUMBER");

View file

@ -27,9 +27,9 @@ time = { workspace = true, features = [
"parsing", "parsing",
"serde", "serde",
] } ] }
tracing = { workspace = true }
url = { workspace = true, features = ["serde"] } url = { workspace = true, features = ["serde"] }
utoipa = { workspace = true } utoipa = { workspace = true }
uuid = { workspace = true, features = ["serde"] } uuid = { workspace = true, features = ["serde"] }
[dev-dependencies] [dev-dependencies]
tracing = { workspace = true }
tracing-subscriber = { workspace = true } tracing-subscriber = { workspace = true }

View file

@ -30,7 +30,6 @@ num_enum = { workspace = true }
scim_proto = { workspace = true } scim_proto = { workspace = true }
serde = { workspace = true, features = ["derive"] } serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true } serde_json = { workspace = true }
serde_urlencoded = { workspace = true }
serde_with = { workspace = true, features = ["time_0_3", "base64", "hex"] } serde_with = { workspace = true, features = ["time_0_3", "base64", "hex"] }
smartstring = { workspace = true, features = ["serde"] } smartstring = { workspace = true, features = ["serde"] }
time = { workspace = true, features = ["serde", "std"] } time = { workspace = true, features = ["serde", "std"] }
@ -45,3 +44,4 @@ sshkeys = { workspace = true }
[dev-dependencies] [dev-dependencies]
enum-iterator = { workspace = true } enum-iterator = { workspace = true }
serde_urlencoded = { workspace = true }

View file

@ -26,7 +26,6 @@ askama = { workspace = true, features = ["with-axum"] }
askama_axum = { workspace = true } askama_axum = { workspace = true }
axum = { workspace = true } axum = { workspace = true }
axum-htmx = { workspace = true } axum-htmx = { workspace = true }
axum-auth = "0.7.0"
axum-extra = { version = "0.9.4", features = ["cookie"] } axum-extra = { version = "0.9.4", features = ["cookie"] }
axum-macros = "0.4.1" axum-macros = "0.4.1"
axum-server = { version = "0.7.1", features = ["tls-openssl"] } axum-server = { version = "0.7.1", features = ["tls-openssl"] }

View file

@ -38,7 +38,6 @@ serde = { workspace = true, features = ["derive"] }
tokio = { workspace = true, features = ["rt-multi-thread", "macros", "signal"] } tokio = { workspace = true, features = ["rt-multi-thread", "macros", "signal"] }
tokio-util = { workspace = true, features = ["codec"] } tokio-util = { workspace = true, features = ["codec"] }
toml = { workspace = true } toml = { workspace = true }
tempfile = { workspace = true }
tracing = { workspace = true } tracing = { workspace = true }
serde_json.workspace = true serde_json.workspace = true

View file

@ -39,7 +39,6 @@ compact_jwt = { workspace = true, features = ["openssl", "hsm-crypto"] }
concread = { workspace = true } concread = { workspace = true }
dhat = { workspace = true, optional = true } dhat = { workspace = true, optional = true }
dyn-clone = { workspace = true } dyn-clone = { workspace = true }
enum-iterator = { workspace = true }
fernet = { workspace = true, features = ["fernet_danger_timestamps"] } fernet = { workspace = true, features = ["fernet_danger_timestamps"] }
# futures-util = { workspace = true } # futures-util = { workspace = true }
hashbrown = { workspace = true } hashbrown = { workspace = true }

View file

@ -25,7 +25,6 @@ webdriver = []
dev-oauth2-device-flow = [] dev-oauth2-device-flow = []
[dependencies] [dependencies]
hyper-tls = { workspace = true }
http = { workspace = true } http = { workspace = true }
kanidm_client = { workspace = true } kanidm_client = { workspace = true }
kanidm_proto = { workspace = true } kanidm_proto = { workspace = true }
@ -37,7 +36,6 @@ regex = { workspace = true }
reqwest = { workspace = true, default-features = false, features = ["cookies"] } reqwest = { workspace = true, default-features = false, features = ["cookies"] }
serde = { workspace = true } serde = { workspace = true }
sketching = { workspace = true } sketching = { workspace = true }
tempfile = { workspace = true }
testkit-macros = { workspace = true } testkit-macros = { workspace = true }
tokio = { workspace = true, features = [ tokio = { workspace = true, features = [
"net", "net",

View file

@ -90,9 +90,17 @@ maintainer = "James Hodgkinson <james@terminaloutcomes.com>"
depends = ["libc6", "libudev1", "libssl3 | libssl3t64"] depends = ["libc6", "libudev1", "libssl3 | libssl3t64"]
section = "admin" section = "admin"
priority = "optional" priority = "optional"
changelog = "../../target/debian/changelog" # Generated by packaging scripts changelog = "../../target/debian/changelog" # Generated by packaging scripts
assets = [ assets = [
[ "target/release/kanidm", "usr/bin/", "755" ], [
[ "../../examples/config", "usr/share/kanidm/", "444" ], "target/release/kanidm",
"usr/bin/",
"755",
],
[
"../../examples/config",
"usr/share/kanidm/",
"444",
],
] ]
maintainer-scripts = "debian/" maintainer-scripts = "debian/"