diff --git a/Cargo.lock b/Cargo.lock index 1683a7f1a..9e0f2e29b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -973,18 +973,18 @@ dependencies = [ [[package]] name = "daemon" -version = "1.1.0-beta.13" +version = "1.1.0-rc.14" dependencies = [ "clap", "clap_complete", "fs2", "futures", "is-terminal", + "kanidm_build_profiles", "kanidm_lib_file_permissions", "kanidm_proto", "kanidm_utils_users", "kanidmd_core", - "profiles", "reqwest", "sd-notify", "serde", @@ -2087,7 +2087,7 @@ dependencies = [ [[package]] name = "kanidm-ipa-sync" -version = "1.1.0-beta.13" +version = "1.1.0-rc.14" dependencies = [ "base64urlsafedata", "chrono", @@ -2111,7 +2111,7 @@ dependencies = [ [[package]] name = "kanidm-ldap-sync" -version = "1.1.0-beta.13" +version = "1.1.0-rc.14" dependencies = [ "base64urlsafedata", "chrono", @@ -2133,9 +2133,19 @@ dependencies = [ "uuid", ] +[[package]] +name = "kanidm_build_profiles" +version = "1.1.0-rc.14" +dependencies = [ + "base64 0.21.2", + "git2", + "serde", + "toml", +] + [[package]] name = "kanidm_client" -version = "1.1.0-beta.13" +version = "1.1.0-rc.14" dependencies = [ "kanidm_proto", "reqwest", @@ -2178,7 +2188,7 @@ dependencies = [ [[package]] name = "kanidm_proto" -version = "1.1.0-beta.13" +version = "1.1.0-rc.14" dependencies = [ "base32", "base64urlsafedata", @@ -2196,7 +2206,7 @@ dependencies = [ [[package]] name = "kanidm_tools" -version = "1.1.0-beta.13" +version = "1.1.0-rc.14" dependencies = [ "async-recursion", "clap", @@ -2204,10 +2214,10 @@ dependencies = [ "compact_jwt", "dialoguer", "futures-concurrency", + "kanidm_build_profiles", "kanidm_client", "kanidm_proto", "libc", - "profiles", "qrcode", "rpassword 7.2.0", "serde", @@ -2225,7 +2235,7 @@ dependencies = [ [[package]] name = "kanidm_unix_int" -version = "1.1.0-beta.13" +version = "1.1.0-rc.14" dependencies = [ "async-trait", "base64urlsafedata", @@ -2235,6 +2245,7 @@ dependencies = [ "csv", "futures", "hashbrown 0.14.0", + "kanidm_build_profiles", "kanidm_client", "kanidm_lib_crypto", "kanidm_lib_file_permissions", @@ -2245,7 +2256,6 @@ dependencies = [ "libsqlite3-sys", "lru 0.8.1", "notify-debouncer-full", - "profiles", "rpassword 7.2.0", "rusqlite", "selinux", @@ -2263,14 +2273,14 @@ dependencies = [ [[package]] name = "kanidm_utils_users" -version = "1.1.0-beta.13" +version = "1.1.0-rc.14" dependencies = [ "libc", ] [[package]] name = "kanidmd_core" -version = "1.1.0-beta.13" +version = "1.1.0-rc.14" dependencies = [ "async-trait", "axum", @@ -2286,13 +2296,13 @@ dependencies = [ "futures-util", "http", "hyper", + "kanidm_build_profiles", "kanidm_proto", "kanidm_utils_users", "kanidmd_lib", "ldap3_proto", "libc", "openssl", - "profiles", "rand", "regex", "serde", @@ -2313,7 +2323,7 @@ dependencies = [ [[package]] name = "kanidmd_lib" -version = "1.1.0-beta.13" +version = "1.1.0-rc.14" dependencies = [ "base64 0.21.2", "base64urlsafedata", @@ -2326,6 +2336,7 @@ dependencies = [ "futures", "hashbrown 0.14.0", "idlset", + "kanidm_build_profiles", "kanidm_lib_crypto", "kanidm_proto", "kanidm_utils_users", @@ -2338,7 +2349,6 @@ dependencies = [ "num_enum", "openssl", "openssl-sys", - "profiles", "rand", "regex", "rusqlite", @@ -2376,18 +2386,18 @@ dependencies = [ [[package]] name = "kanidmd_testkit" -version = "1.1.0-beta.13" +version = "1.1.0-rc.14" dependencies = [ "compact_jwt", "fantoccini", "futures", "hyper-tls", + "kanidm_build_profiles", "kanidm_client", "kanidm_proto", "kanidmd_core", "kanidmd_lib", "oauth2", - "profiles", "reqwest", "serde_json", "sketching", @@ -2401,7 +2411,7 @@ dependencies = [ [[package]] name = "kanidmd_web_ui" -version = "1.1.0-beta.13" +version = "1.1.0-rc.14" dependencies = [ "gloo", "js-sys", @@ -2815,7 +2825,7 @@ dependencies = [ [[package]] name = "nss_kanidm" -version = "1.1.0-beta.13" +version = "1.1.0-rc.14" dependencies = [ "kanidm_unix_int", "lazy_static", @@ -3047,7 +3057,7 @@ dependencies = [ [[package]] name = "orca" -version = "1.1.0-beta.13" +version = "1.1.0-rc.14" dependencies = [ "clap", "crossbeam", @@ -3055,12 +3065,12 @@ dependencies = [ "dialoguer", "futures-util", "hashbrown 0.14.0", + "kanidm_build_profiles", "kanidm_client", "kanidm_proto", "ldap3_proto", "mathru", "openssl", - "profiles", "rand", "serde", "serde_json", @@ -3082,7 +3092,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "pam_kanidm" -version = "1.1.0-beta.13" +version = "1.1.0-rc.14" dependencies = [ "kanidm_unix_int", "libc", @@ -3384,16 +3394,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "profiles" -version = "1.1.0-beta.13" -dependencies = [ - "base64 0.21.2", - "git2", - "serde", - "toml", -] - [[package]] name = "prokio" version = "0.1.0" @@ -4035,7 +4035,7 @@ dependencies = [ [[package]] name = "sketching" -version = "1.1.0-beta.13" +version = "1.1.0-rc.14" dependencies = [ "num_enum", "tracing", diff --git a/Cargo.toml b/Cargo.toml index 0f4a63bae..febf6b1d5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,7 +28,7 @@ members = [ ] [workspace.package] -version = "1.1.0-rc.14" +version = "1.1.0-rc.14-dev" authors = [ "William Brown ", "James Hodgkinson ", @@ -40,6 +40,17 @@ homepage = "https://github.com/kanidm/kanidm/" repository = "https://github.com/kanidm/kanidm/" [workspace.dependencies] +kanidmd_core = { path = "./server/core" } +kanidmd_lib = { path = "./server/lib" } +kanidmd_lib_macros = { path = "./server/lib-macros" } +kanidm_build_profiles = { path = "./libs/profiles", version = "1.1.0-rc.14-dev" } +kanidm_lib_crypto = { path = "./libs/crypto" } +kanidm_lib_file_permissions = { path = "./libs/file_permissions" } +kanidm_client = { path = "./libs/client", version = "1.1.0-rc.14-dev" } +kanidm_proto = { path = "./proto", version = "1.1.0-rc.14-dev" } +kanidm_unix_int = { path = "./unix_integration" } +kanidm_utils_users = { path = "./libs/users" } + argon2 = { version = "0.5.1", features = ["alloc"] } async-recursion = "1.0.4" async-trait = "^0.1.72" @@ -78,15 +89,6 @@ hyper-tls = "0.5.0" idlset = "^0.2.4" # idlset = { path = "../idlset" } js-sys = "^0.3.63" -kanidmd_core = { path = "./server/core" } -kanidmd_lib = { path = "./server/lib" } -kanidmd_lib_macros = { path = "./server/lib-macros" } -kanidm_lib_crypto = { path = "./libs/crypto" } -kanidm_lib_file_permissions = { path = "./libs/file_permissions" } -kanidm_client = { path = "./libs/client", version = "1.1.0-alpha.11" } -kanidm_proto = { path = "./proto", version = "1.1.0-alpha.11" } -kanidm_unix_int = { path = "./unix_integration" } -kanidm_utils_users = { path = "./libs/users" } # REMOVE this lazy_static = "^1.4.0" ldap3_client = "^0.3.5" @@ -110,7 +112,6 @@ openssl = "^0.10.55" paste = "^1.0.14" pkg-config = "^0.3.27" proc-macro2 = "1.0.66" -profiles = { path = "./libs/profiles" } qrcode = "^0.12.0" quote = "1" rand = "^0.8.5" @@ -181,5 +182,3 @@ yew-router = "^0.17.0" zxcvbn = "^2.2.2" nonempty = "0.8.1" -# link time optimization using using whole-program analysis -# lto = true diff --git a/Makefile b/Makefile index b744712fb..4668c6c83 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ IMAGE_BASE ?= kanidm IMAGE_VERSION ?= devel -IMAGE_EXT_VERSION ?= 1.1.0-rc.14 +IMAGE_EXT_VERSION ?= 1.1.0-rc.14-dev CONTAINER_TOOL_ARGS ?= IMAGE_ARCH ?= "linux/amd64,linux/arm64" CONTAINER_BUILD_ARGS ?= diff --git a/libs/profiles/Cargo.toml b/libs/profiles/Cargo.toml index 22ae9e808..8f84e1da7 100644 --- a/libs/profiles/Cargo.toml +++ b/libs/profiles/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "profiles" +name = "kanidm_build_profiles" description = "Kanidm Build System Profiles" documentation = "https://docs.rs/kanidm/latest/kanidm/" # We do not have tests in this pkg diff --git a/server/core/Cargo.toml b/server/core/Cargo.toml index b14dc2107..48970cc78 100644 --- a/server/core/Cargo.toml +++ b/server/core/Cargo.toml @@ -51,4 +51,4 @@ kanidm_utils_users = { workspace = true } uuid = { workspace = true, features = ["serde", "v4" ] } [build-dependencies] -profiles = { workspace = true } +kanidm_build_profiles = { workspace = true } diff --git a/server/daemon/Cargo.toml b/server/daemon/Cargo.toml index e22d13f7d..fb73eff34 100644 --- a/server/daemon/Cargo.toml +++ b/server/daemon/Cargo.toml @@ -47,4 +47,4 @@ tikv-jemallocator = { workspace = true } serde = { workspace = true, features = ["derive"] } clap = { workspace = true, features = ["derive"] } clap_complete = { workspace = true } -profiles = { workspace = true } +kanidm_build_profiles = { workspace = true } diff --git a/server/lib/Cargo.toml b/server/lib/Cargo.toml index 13824d6b6..30ce85ab1 100644 --- a/server/lib/Cargo.toml +++ b/server/lib/Cargo.toml @@ -86,5 +86,5 @@ futures = { workspace = true } kanidmd_lib_macros = { workspace = true } [build-dependencies] -profiles = { workspace = true } +kanidm_build_profiles = { workspace = true } diff --git a/server/testkit/Cargo.toml b/server/testkit/Cargo.toml index d319d3152..a4d9a8503 100644 --- a/server/testkit/Cargo.toml +++ b/server/testkit/Cargo.toml @@ -41,7 +41,7 @@ tokio = { workspace = true, features = ["net", "sync", "io-util", "macros"] } [build-dependencies] -profiles = { workspace = true } +kanidm_build_profiles = { workspace = true } [dev-dependencies] compact_jwt = { workspace = true } diff --git a/server/web_ui/Cargo.toml b/server/web_ui/Cargo.toml index 07ad481f6..60c524cc8 100644 --- a/server/web_ui/Cargo.toml +++ b/server/web_ui/Cargo.toml @@ -3,7 +3,7 @@ name = "kanidmd_web_ui" description = "Kanidm Server Web User Interface" documentation = "https://docs.rs/kanidm/latest/kanidm/" -version = "1.1.0-rc.14" +version = "1.1.0-rc.14-dev" authors = [ "William Brown ", "James Hodgkinson ", diff --git a/tools/cli/Cargo.toml b/tools/cli/Cargo.toml index 5cdfbd67e..ec4d43543 100644 --- a/tools/cli/Cargo.toml +++ b/tools/cli/Cargo.toml @@ -54,7 +54,7 @@ zxcvbn = { workspace=true } [build-dependencies] clap = { workspace = true, features = ["derive"] } clap_complete = { workspace=true } -profiles = { workspace = true } +kanidm_build_profiles = { workspace = true } uuid = { workspace=true } url = { workspace = true } diff --git a/tools/orca/Cargo.toml b/tools/orca/Cargo.toml index af8a84d5f..d692bbe49 100644 --- a/tools/orca/Cargo.toml +++ b/tools/orca/Cargo.toml @@ -42,4 +42,4 @@ uuid = { workspace = true, features = ["serde", "v4" ] } tikv-jemallocator = { workspace = true } [build-dependencies] -profiles = { workspace = true } +kanidm_build_profiles = { workspace = true } diff --git a/unix_integration/Cargo.toml b/unix_integration/Cargo.toml index d4025eebd..d0fe9a3a5 100644 --- a/unix_integration/Cargo.toml +++ b/unix_integration/Cargo.toml @@ -81,4 +81,4 @@ kanidmd_core = { workspace = true } [build-dependencies] clap = { workspace = true, features = ["derive"] } clap_complete = { workspace = true } -profiles = { workspace = true } +kanidm_build_profiles = { workspace = true }