Skip to content

Commit

Permalink
Refactor dependencies and remove unused code
Browse files Browse the repository at this point in the history
  • Loading branch information
LeChatP committed Oct 20, 2024
1 parent 0d9daec commit 17fdf01
Show file tree
Hide file tree
Showing 4 changed files with 58 additions and 61 deletions.
5 changes: 4 additions & 1 deletion .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
[alias]
xtask = "run --package xtask --release --bin xtask --"
xtask = "run --package xtask --release --bin xtask --"

[target.x86_64-unknown-linux-gnu]
rustflags = ["-C", "linker=clang"]
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"rust-analyzer.linkedProjects": [
//"sudoers-reader/Cargo.toml",
"Cargo.toml",
"./capable/Cargo.toml"
//"./capable/Cargo.toml"
],
"c-cpp-flylint.clang.includePaths": [
"${workspaceFolder}/src"
Expand Down
64 changes: 30 additions & 34 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,46 +49,42 @@ finder = ["dep:pcre2", "rar-common/pcre2", "rar-common/finder"]
[lints.rust]
unexpected_cfgs = { level = "allow", check-cfg = ['cfg(tarpaulin_include)'] }


[build-dependencies]
serde_json = "1.0.128"
toml = "0.8.13"
#bindgen = "^0.66.1"
serde_json = "1.0"
toml = "0.8"

[dependencies]
rar-common = { path = "rar-common", version = "3.0.0", package = "rootasrole-core" }
tracing = "0.1.40"
tracing-subscriber = "0.3.18"
libc = "0.2.159"
strum = { version = "0.26.3", features = ["derive"] }
semver = { version = "1.0.23", features = ["serde"] }
nix = { version = "0.29.0", features = ["user","process", "signal", "fs"] }
capctl = "0.2.4"
pcre2 = { version = "0.2.7", optional = true }
serde = { version = "1.0.210", features=["rc"] }
serde_json = "1.0.128"
ciborium = "0.2.2"
glob = "0.3.1"
pam-client = { version = "0.5.0", git = "https://gitlab.com/LeChatP/rust-pam-client.git" }
pam-sys = { version = "1.0.0-alpha.5", git = "https://github.com/LeChatP/pam-sys.git" }
bitflags = { version = "2.6.0" }
shell-words = "1.1.0"
syslog-tracing = "0.3.0"
linked_hash_set = { version = "0.1.4" }
derivative = "2.2.0"
sha2 = "0.10.8"
chrono = "0.4.38"
pty-process = "0.4.0"
once_cell = "1.20.2"
pest = "2.7.14"
pest_derive = "2.7.14"
const_format = "0.2.33"
hex = "0.4.3"
log = "0.4"
libc = "0.2"
strum = { version = "0.26", features = ["derive"] }
semver = { version = "1.0", features = ["serde"] }
nix = { version = "0.29", features = ["user","process", "signal", "fs"] }
capctl = "0.2"
pcre2 = { version = "0.2", optional = true }
serde = { version = "1.0", features=["rc"] }
serde_json = "1.0"
ciborium = "0.2"
glob = "0.3"
pam-client2 = { version = "0.5.1", git = "https://gitlab.com/LeChatP/rust-pam-client.git" }
bitflags = { version = "2.6" }
shell-words = "1.1"
linked_hash_set = { version = "0.1" }
derivative = "2.2"
sha2 = "0.10"
chrono = "0.4"
pty-process = "0.4"
once_cell = "1.20"
pest = "2.7"
pest_derive = "2.7"
const_format = "0.2"
hex = "0.4"

[dev-dependencies]
env_logger = "0.11.5"
test-log = { version = "0.2.12", features = ["trace"] }
tracing = "0.1.37"
tracing-subscriber = { version = "0.3.16", default-features = false, features = ["env-filter", "fmt"] }
log = "0.4"
env_logger = "0.11"
test-log = { version = "0.2" }


[package.metadata.deb]
Expand Down
48 changes: 23 additions & 25 deletions rar-common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,31 @@ description = "This core crate contains the RBAC and main features for the RootA
license = "GPL-3.0-or-later"

[dependencies]
tracing = "0.1.40"
tracing-subscriber = "0.3.18"
libc = "0.2.159"
strum = { version = "0.26.3", features = ["derive"] }
semver = { version = "1.0.23", features = ["serde"] }
nix = { version = "0.29.0", features = ["user","process", "signal", "fs"] }
#sudoers-reader = { path = "sudoers-reader" }
capctl = "0.2.4"
pcre2 = { version = "0.2.7", optional = true }
serde = { version = "1.0.202", features=["rc"] }
serde_json = "1.0.117"
glob = { version = "0.3.1", optional = true }
bitflags = { version = "2.5.0" }
shell-words = "1.1.0"
syslog-tracing = "0.3.0"
linked_hash_set = { version = "0.1.4" }
derivative = "2.2.0"
sha2 = "0.10.8"
chrono = "0.4.37"
once_cell = "1.19.0"
hex = "0.4.3"
libc = "0.2"
strum = { version = "0.26", features = ["derive"] }
semver = { version = "1.0", features = ["serde"] }
nix = { version = "0.29", features = ["user","process", "signal", "fs", "hostname"] }
capctl = "0.2"
pcre2 = { version = "0.2", optional = true }
serde = { version = "1.0", features=["rc"] }
serde_json = "1.0"
glob = { version = "0.3", optional = true }
bitflags = { version = "2.5" }
shell-words = "1.1"
linked_hash_set = { version = "0.1" }
derivative = "2.2"
sha2 = "0.10"
chrono = "0.4"
once_cell = "1.19"
hex = "0.4"
log = "0.4"
syslog = "7.0"
env_logger = "0.11"

[dev-dependencies]
env_logger = "0.11.5"
test-log = { version = "0.2.12", features = ["trace"] }
tracing = "0.1.37"
tracing-subscriber = { version = "0.3.16", default-features = false, features = ["env-filter", "fmt"] }
log = "0.4"
env_logger = "0.11"
test-log = { version = "0.2" }

[features]
pcre2 = ["dep:pcre2"]
Expand Down

0 comments on commit 17fdf01

Please sign in to comment.