mart-w/kanidm
1
0
Fork 0
mirror of https://github.com/kanidm/kanidm.git synced 2025-02-23 20:47:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update to latest dev version (#2486)

Browse source
This commit is contained in:
Firstyear 2024-02-08 09:54:07 +10:00 committed by GitHub
parent 7567514044
commit e3e77fe7b4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 41 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
Cargo.lock generated
View file

@ -1079,7 +1079,7 @@ dependencies = [
[[package]] [[package]]
name = "daemon" name = "daemon"
version = "1.1.0-rc.16" version = "1.2.0-dev"
dependencies = [ dependencies = [
"clap", "clap",
"clap_complete", "clap_complete",
@ -2931,7 +2931,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidm-ipa-sync" name = "kanidm-ipa-sync"
version = "1.1.0-rc.16" version = "1.2.0-dev"
dependencies = [ dependencies = [
"base64urlsafedata", "base64urlsafedata",
"chrono", "chrono",
@ -2956,7 +2956,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidm-ldap-sync" name = "kanidm-ldap-sync"
version = "1.1.0-rc.16" version = "1.2.0-dev"
dependencies = [ dependencies = [
"base64urlsafedata", "base64urlsafedata",
"chrono", "chrono",
@ -2982,7 +2982,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidm_build_profiles" name = "kanidm_build_profiles"
version = "1.1.0-rc.16" version = "1.2.0-dev"
dependencies = [ dependencies = [
"base64 0.21.7", "base64 0.21.7",
"gix", "gix",
@ -2992,7 +2992,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidm_client" name = "kanidm_client"
version = "1.1.0-rc.16" version = "1.2.0-dev"
dependencies = [ dependencies = [
"hyper", "hyper",
"kanidm_lib_file_permissions", "kanidm_lib_file_permissions",
@ -3011,7 +3011,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidm_lib_crypto" name = "kanidm_lib_crypto"
version = "1.1.0-rc.15-dev" version = "1.2.0-dev"
dependencies = [ dependencies = [
"argon2", "argon2",
"base64 0.21.7", "base64 0.21.7",
@ -3030,7 +3030,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidm_lib_file_permissions" name = "kanidm_lib_file_permissions"
version = "1.1.0-rc.16" version = "1.2.0-dev"
dependencies = [ dependencies = [
"kanidm_utils_users", "kanidm_utils_users",
"whoami", "whoami",
@ -3038,7 +3038,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidm_proto" name = "kanidm_proto"
version = "1.1.0-rc.16" version = "1.2.0-dev"
dependencies = [ dependencies = [
"base32", "base32",
"base64urlsafedata", "base64urlsafedata",
@ -3058,7 +3058,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidm_tools" name = "kanidm_tools"
version = "1.1.0-rc.16" version = "1.2.0-dev"
dependencies = [ dependencies = [
"async-recursion", "async-recursion",
"clap", "clap",
@ -3090,7 +3090,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidm_unix_int" name = "kanidm_unix_int"
version = "1.1.0-rc.16" version = "1.2.0-dev"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"base64urlsafedata", "base64urlsafedata",
@ -3129,14 +3129,14 @@ dependencies = [
[[package]] [[package]]
name = "kanidm_utils_users" name = "kanidm_utils_users"
version = "1.1.0-rc.16" version = "1.2.0-dev"
dependencies = [ dependencies = [
"libc", "libc",
] ]
[[package]] [[package]]
name = "kanidmd_core" name = "kanidmd_core"
version = "1.1.0-rc.16" version = "1.2.0-dev"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"axum", "axum",
@ -3189,7 +3189,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidmd_lib" name = "kanidmd_lib"
version = "1.1.0-rc.16" version = "1.2.0-dev"
dependencies = [ dependencies = [
"base64 0.21.7", "base64 0.21.7",
"base64urlsafedata", "base64urlsafedata",
@ -3246,7 +3246,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidmd_lib_macros" name = "kanidmd_lib_macros"
version = "1.1.0-rc.15-dev" version = "1.2.0-dev"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -3255,7 +3255,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidmd_testkit" name = "kanidmd_testkit"
version = "1.1.0-rc.16" version = "1.2.0-dev"
dependencies = [ dependencies = [
"assert_cmd", "assert_cmd",
"compact_jwt 0.3.3", "compact_jwt 0.3.3",
@ -3293,7 +3293,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidmd_web_ui_admin" name = "kanidmd_web_ui_admin"
version = "1.1.0-rc.16" version = "1.2.0-dev"
dependencies = [ dependencies = [
"gloo", "gloo",
"gloo-utils 0.2.0", "gloo-utils 0.2.0",
@ -3314,7 +3314,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidmd_web_ui_login_flows" name = "kanidmd_web_ui_login_flows"
version = "1.1.0-rc.16" version = "1.2.0-dev"
dependencies = [ dependencies = [
"gloo", "gloo",
"gloo-utils 0.2.0", "gloo-utils 0.2.0",
@ -3335,7 +3335,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidmd_web_ui_shared" name = "kanidmd_web_ui_shared"
version = "1.1.0-rc.16" version = "1.2.0-dev"
dependencies = [ dependencies = [
"gloo", "gloo",
"js-sys", "js-sys",
@ -3354,7 +3354,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidmd_web_ui_user" name = "kanidmd_web_ui_user"
version = "1.1.0-rc.16" version = "1.2.0-dev"
dependencies = [ dependencies = [
"gloo", "gloo",
"gloo-timers 0.3.0", "gloo-timers 0.3.0",
@ -3771,7 +3771,7 @@ dependencies = [
[[package]] [[package]]
name = "nss_kanidm" name = "nss_kanidm"
version = "1.1.0-rc.16" version = "1.2.0-dev"
dependencies = [ dependencies = [
"kanidm_unix_int", "kanidm_unix_int",
"lazy_static", "lazy_static",
@ -4170,7 +4170,7 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
[[package]] [[package]]
name = "orca" name = "orca"
version = "1.1.0-rc.16" version = "1.2.0-dev"
dependencies = [ dependencies = [
"clap", "clap",
"crossbeam", "crossbeam",
@ -4214,7 +4214,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]] [[package]]
name = "pam_kanidm" name = "pam_kanidm"
version = "1.1.0-rc.16" version = "1.2.0-dev"
dependencies = [ dependencies = [
"kanidm_unix_int", "kanidm_unix_int",
"libc", "libc",
@ -5352,7 +5352,7 @@ dependencies = [
[[package]] [[package]]
name = "sketching" name = "sketching"
version = "1.1.0-rc.16" version = "1.2.0-dev"
dependencies = [ dependencies = [
"gethostname", "gethostname",
"num_enum", "num_enum",

26
Cargo.toml
View file

@ -32,7 +32,7 @@ members = [
] ]
[workspace.package] [workspace.package]
version = "1.1.0-rc.16" version = "1.2.0-dev"
authors = [ authors = [
"William Brown <william@blackhats.net.au>", "William Brown <william@blackhats.net.au>",
"James Hodgkinson <james@terminaloutcomes.com>", "James Hodgkinson <james@terminaloutcomes.com>",
@ -78,19 +78,19 @@ sshkey-attest = { git = "https://github.com/kanidm/webauthn-rs.git", rev = "5f4d
# kanidm-hsm-crypto = { path = "../hsm-crypto" } # kanidm-hsm-crypto = { path = "../hsm-crypto" }
[workspace.dependencies] [workspace.dependencies]
kanidmd_core = { path = "./server/core", version = "1.1.0-rc.16" } kanidmd_core = { path = "./server/core", version = "=1.2.0-dev" }
kanidmd_lib = { path = "./server/lib", version = "1.1.0-rc.16" } kanidmd_lib = { path = "./server/lib", version = "=1.2.0-dev" }
kanidmd_lib_macros = { path = "./server/lib-macros", version = "1.1.0-rc.16" } kanidmd_lib_macros = { path = "./server/lib-macros", version = "=1.2.0-dev" }
kanidmd_testkit = { path = "./server/testkit", version = "1.1.0-rc.16" } kanidmd_testkit = { path = "./server/testkit", version = "=1.2.0-dev" }
kanidm_build_profiles = { path = "./libs/profiles", version = "1.1.0-rc.16" } kanidm_build_profiles = { path = "./libs/profiles", version = "=1.2.0-dev" }
kanidm_client = { path = "./libs/client", version = "1.1.0-rc.16" } kanidm_client = { path = "./libs/client", version = "=1.2.0-dev" }
kanidm-hsm-crypto = "^0.1.5" kanidm-hsm-crypto = "^0.1.5"
kanidm_lib_crypto = { path = "./libs/crypto", version = "1.1.0-rc.16" } kanidm_lib_crypto = { path = "./libs/crypto", version = "=1.2.0-dev" }
kanidm_lib_file_permissions = { path = "./libs/file_permissions", version = "1.1.0-rc.16" } kanidm_lib_file_permissions = { path = "./libs/file_permissions", version = "=1.2.0-dev" }
kanidm_proto = { path = "./proto", version = "1.1.0-rc.16" } kanidm_proto = { path = "./proto", version = "=1.2.0-dev" }
kanidm_unix_int = { path = "./unix_integration", version = "1.1.0-rc.16" } kanidm_unix_int = { path = "./unix_integration", version = "=1.2.0-dev" }
kanidm_utils_users = { path = "./libs/users", version = "1.1.0-rc.16" } kanidm_utils_users = { path = "./libs/users", version = "=1.2.0-dev" }
sketching = { path = "./libs/sketching", version = "1.1.0-rc.16" } sketching = { path = "./libs/sketching", version = "=1.2.0-dev" }
serde_with = "3.4.0" serde_with = "3.4.0"
argon2 = { version = "0.5.2", features = ["alloc"] } argon2 = { version = "0.5.2", features = ["alloc"] }

2
Makefile
View file

@ -1,6 +1,6 @@
IMAGE_BASE ?= kanidm IMAGE_BASE ?= kanidm
IMAGE_VERSION ?= devel IMAGE_VERSION ?= devel
IMAGE_EXT_VERSION ?= 1.1.0-rc.16 IMAGE_EXT_VERSION ?= 1.2.0-dev
CONTAINER_TOOL_ARGS ?= CONTAINER_TOOL_ARGS ?=
IMAGE_ARCH ?= "linux/amd64,linux/arm64" IMAGE_ARCH ?= "linux/amd64,linux/arm64"
CONTAINER_BUILD_ARGS ?= CONTAINER_BUILD_ARGS ?=

2
libs/crypto/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "kanidm_lib_crypto" name = "kanidm_lib_crypto"
version = "1.1.0-rc.15-dev" version = { workspace = true }
edition = { workspace = true } edition = { workspace = true }
description = "Kanidm cryptographic functionality" description = "Kanidm cryptographic functionality"
license = { workspace = true } license = { workspace = true }

4
project_docs/RELEASE_CHECKLIST.md
View file

@ -62,16 +62,16 @@ cargo install wasm-bindgen-cli
- [ ] publish `sketching` - [ ] publish `sketching`
- [ ] publish `kanidm_utils_users` - [ ] publish `kanidm_utils_users`
- [ ] publish `kanidm_lib_file_permissions` - [ ] publish `kanidm_lib_file_permissions`
- [ ] publish `kanidm_client`
- [ ] publish `kanidm_lib_crypto` - [ ] publish `kanidm_lib_crypto`
- [ ] publish `kanidm_build_profiles` - [ ] publish `kanidm_build_profiles`
- [ ] publish `kanidm_client`
- [ ] publish `kanidm_tools` - [ ] publish `kanidm_tools`
### Docker ### Docker
- [ ] docker buildx use cluster - [ ] docker buildx use cluster
- [ ] `make buildx/kanidmd/x86_64_v3 buildx/kanidmd buildx/kanidm_tools buildx/radiusd` - [ ] `make buildx/kanidmd/x86_64_v3 buildx/kanidmd buildx/kanidm_tools buildx/radiusd`
- [ ] `IMAGE_VERSION=latest make buildx/kanidmd/x86_64_v3 buildx/kanidmd buildx/kanidm_tools buildx/radiusd` - [ ] `IMAGE_VERSION=latest make buildx`
- [ ] Update the readme on docker <https://hub.docker.com/repository/docker/kanidm/server> - [ ] Update the readme on docker <https://hub.docker.com/repository/docker/kanidm/server>
### Distro ### Distro

2
server/lib-macros/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "kanidmd_lib_macros" name = "kanidmd_lib_macros"
version = "1.1.0-rc.15-dev" version = { workspace = true }
edition = { workspace = true } edition = { workspace = true }
[lib] [lib]