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

Resolve issue with publishing (#1925)

Browse source 
* Resolve issue with publishing

* Fix version
This commit is contained in:
Firstyear 2023-08-01 17:25:32 +10:00 committed by GitHub
parent 0fe5ff0f87
commit bf3e16cbd3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 55 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
Cargo.lock generated
View file

@ -973,18 +973,18 @@ dependencies = [
[[package]] [[package]]
name = "daemon" name = "daemon"
version = "1.1.0-beta.13" version = "1.1.0-rc.14"
dependencies = [ dependencies = [
"clap", "clap",
"clap_complete", "clap_complete",
"fs2", "fs2",
"futures", "futures",
"is-terminal", "is-terminal",
"kanidm_build_profiles",
"kanidm_lib_file_permissions", "kanidm_lib_file_permissions",
"kanidm_proto", "kanidm_proto",
"kanidm_utils_users", "kanidm_utils_users",
"kanidmd_core", "kanidmd_core",
"profiles",
"reqwest", "reqwest",
"sd-notify", "sd-notify",
"serde", "serde",
@ -2087,7 +2087,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidm-ipa-sync" name = "kanidm-ipa-sync"
version = "1.1.0-beta.13" version = "1.1.0-rc.14"
dependencies = [ dependencies = [
"base64urlsafedata", "base64urlsafedata",
"chrono", "chrono",
@ -2111,7 +2111,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidm-ldap-sync" name = "kanidm-ldap-sync"
version = "1.1.0-beta.13" version = "1.1.0-rc.14"
dependencies = [ dependencies = [
"base64urlsafedata", "base64urlsafedata",
"chrono", "chrono",
@ -2133,9 +2133,19 @@ dependencies = [
"uuid", "uuid",
] ]
[[package]]
name = "kanidm_build_profiles"
version = "1.1.0-rc.14"
dependencies = [
"base64 0.21.2",
"git2",
"serde",
"toml",
]
[[package]] [[package]]
name = "kanidm_client" name = "kanidm_client"
version = "1.1.0-beta.13" version = "1.1.0-rc.14"
dependencies = [ dependencies = [
"kanidm_proto", "kanidm_proto",
"reqwest", "reqwest",
@ -2178,7 +2188,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidm_proto" name = "kanidm_proto"
version = "1.1.0-beta.13" version = "1.1.0-rc.14"
dependencies = [ dependencies = [
"base32", "base32",
"base64urlsafedata", "base64urlsafedata",
@ -2196,7 +2206,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidm_tools" name = "kanidm_tools"
version = "1.1.0-beta.13" version = "1.1.0-rc.14"
dependencies = [ dependencies = [
"async-recursion", "async-recursion",
"clap", "clap",
@ -2204,10 +2214,10 @@ dependencies = [
"compact_jwt", "compact_jwt",
"dialoguer", "dialoguer",
"futures-concurrency", "futures-concurrency",
"kanidm_build_profiles",
"kanidm_client", "kanidm_client",
"kanidm_proto", "kanidm_proto",
"libc", "libc",
"profiles",
"qrcode", "qrcode",
"rpassword 7.2.0", "rpassword 7.2.0",
"serde", "serde",
@ -2225,7 +2235,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidm_unix_int" name = "kanidm_unix_int"
version = "1.1.0-beta.13" version = "1.1.0-rc.14"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"base64urlsafedata", "base64urlsafedata",
@ -2235,6 +2245,7 @@ dependencies = [
"csv", "csv",
"futures", "futures",
"hashbrown 0.14.0", "hashbrown 0.14.0",
"kanidm_build_profiles",
"kanidm_client", "kanidm_client",
"kanidm_lib_crypto", "kanidm_lib_crypto",
"kanidm_lib_file_permissions", "kanidm_lib_file_permissions",
@ -2245,7 +2256,6 @@ dependencies = [
"libsqlite3-sys", "libsqlite3-sys",
"lru 0.8.1", "lru 0.8.1",
"notify-debouncer-full", "notify-debouncer-full",
"profiles",
"rpassword 7.2.0", "rpassword 7.2.0",
"rusqlite", "rusqlite",
"selinux", "selinux",
@ -2263,14 +2273,14 @@ dependencies = [
[[package]] [[package]]
name = "kanidm_utils_users" name = "kanidm_utils_users"
version = "1.1.0-beta.13" version = "1.1.0-rc.14"
dependencies = [ dependencies = [
"libc", "libc",
] ]
[[package]] [[package]]
name = "kanidmd_core" name = "kanidmd_core"
version = "1.1.0-beta.13" version = "1.1.0-rc.14"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"axum", "axum",
@ -2286,13 +2296,13 @@ dependencies = [
"futures-util", "futures-util",
"http", "http",
"hyper", "hyper",
"kanidm_build_profiles",
"kanidm_proto", "kanidm_proto",
"kanidm_utils_users", "kanidm_utils_users",
"kanidmd_lib", "kanidmd_lib",
"ldap3_proto", "ldap3_proto",
"libc", "libc",
"openssl", "openssl",
"profiles",
"rand", "rand",
"regex", "regex",
"serde", "serde",
@ -2313,7 +2323,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidmd_lib" name = "kanidmd_lib"
version = "1.1.0-beta.13" version = "1.1.0-rc.14"
dependencies = [ dependencies = [
"base64 0.21.2", "base64 0.21.2",
"base64urlsafedata", "base64urlsafedata",
@ -2326,6 +2336,7 @@ dependencies = [
"futures", "futures",
"hashbrown 0.14.0", "hashbrown 0.14.0",
"idlset", "idlset",
"kanidm_build_profiles",
"kanidm_lib_crypto", "kanidm_lib_crypto",
"kanidm_proto", "kanidm_proto",
"kanidm_utils_users", "kanidm_utils_users",
@ -2338,7 +2349,6 @@ dependencies = [
"num_enum", "num_enum",
"openssl", "openssl",
"openssl-sys", "openssl-sys",
"profiles",
"rand", "rand",
"regex", "regex",
"rusqlite", "rusqlite",
@ -2376,18 +2386,18 @@ dependencies = [
[[package]] [[package]]
name = "kanidmd_testkit" name = "kanidmd_testkit"
version = "1.1.0-beta.13" version = "1.1.0-rc.14"
dependencies = [ dependencies = [
"compact_jwt", "compact_jwt",
"fantoccini", "fantoccini",
"futures", "futures",
"hyper-tls", "hyper-tls",
"kanidm_build_profiles",
"kanidm_client", "kanidm_client",
"kanidm_proto", "kanidm_proto",
"kanidmd_core", "kanidmd_core",
"kanidmd_lib", "kanidmd_lib",
"oauth2", "oauth2",
"profiles",
"reqwest", "reqwest",
"serde_json", "serde_json",
"sketching", "sketching",
@ -2401,7 +2411,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidmd_web_ui" name = "kanidmd_web_ui"
version = "1.1.0-beta.13" version = "1.1.0-rc.14"
dependencies = [ dependencies = [
"gloo", "gloo",
"js-sys", "js-sys",
@ -2815,7 +2825,7 @@ dependencies = [
[[package]] [[package]]
name = "nss_kanidm" name = "nss_kanidm"
version = "1.1.0-beta.13" version = "1.1.0-rc.14"
dependencies = [ dependencies = [
"kanidm_unix_int", "kanidm_unix_int",
"lazy_static", "lazy_static",
@ -3047,7 +3057,7 @@ dependencies = [
[[package]] [[package]]
name = "orca" name = "orca"
version = "1.1.0-beta.13" version = "1.1.0-rc.14"
dependencies = [ dependencies = [
"clap", "clap",
"crossbeam", "crossbeam",
@ -3055,12 +3065,12 @@ dependencies = [
"dialoguer", "dialoguer",
"futures-util", "futures-util",
"hashbrown 0.14.0", "hashbrown 0.14.0",
"kanidm_build_profiles",
"kanidm_client", "kanidm_client",
"kanidm_proto", "kanidm_proto",
"ldap3_proto", "ldap3_proto",
"mathru", "mathru",
"openssl", "openssl",
"profiles",
"rand", "rand",
"serde", "serde",
"serde_json", "serde_json",
@ -3082,7 +3092,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]] [[package]]
name = "pam_kanidm" name = "pam_kanidm"
version = "1.1.0-beta.13" version = "1.1.0-rc.14"
dependencies = [ dependencies = [
"kanidm_unix_int", "kanidm_unix_int",
"libc", "libc",
@ -3384,16 +3394,6 @@ dependencies = [
"unicode-ident", "unicode-ident",
] ]
[[package]]
name = "profiles"
version = "1.1.0-beta.13"
dependencies = [
"base64 0.21.2",
"git2",
"serde",
"toml",
]
[[package]] [[package]]
name = "prokio" name = "prokio"
version = "0.1.0" version = "0.1.0"
@ -4035,7 +4035,7 @@ dependencies = [
[[package]] [[package]]
name = "sketching" name = "sketching"
version = "1.1.0-beta.13" version = "1.1.0-rc.14"
dependencies = [ dependencies = [
"num_enum", "num_enum",
"tracing", "tracing",

25
Cargo.toml
View file

@ -28,7 +28,7 @@ members = [
] ]
[workspace.package] [workspace.package]
version = "1.1.0-rc.14" version = "1.1.0-rc.14-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>",
@ -40,6 +40,17 @@ homepage = "https://github.com/kanidm/kanidm/"
repository = "https://github.com/kanidm/kanidm/" repository = "https://github.com/kanidm/kanidm/"
[workspace.dependencies] [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"] } argon2 = { version = "0.5.1", features = ["alloc"] }
async-recursion = "1.0.4" async-recursion = "1.0.4"
async-trait = "^0.1.72" async-trait = "^0.1.72"
@ -78,15 +89,6 @@ hyper-tls = "0.5.0"
idlset = "^0.2.4" idlset = "^0.2.4"
# idlset = { path = "../idlset" } # idlset = { path = "../idlset" }
js-sys = "^0.3.63" 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 # REMOVE this
lazy_static = "^1.4.0" lazy_static = "^1.4.0"
ldap3_client = "^0.3.5" ldap3_client = "^0.3.5"
@ -110,7 +112,6 @@ openssl = "^0.10.55"
paste = "^1.0.14" paste = "^1.0.14"
pkg-config = "^0.3.27" pkg-config = "^0.3.27"
proc-macro2 = "1.0.66" proc-macro2 = "1.0.66"
profiles = { path = "./libs/profiles" }
qrcode = "^0.12.0" qrcode = "^0.12.0"
quote = "1" quote = "1"
rand = "^0.8.5" rand = "^0.8.5"
@ -181,5 +182,3 @@ yew-router = "^0.17.0"
zxcvbn = "^2.2.2" zxcvbn = "^2.2.2"
nonempty = "0.8.1" nonempty = "0.8.1"
# link time optimization using using whole-program analysis
# lto = true

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.14 IMAGE_EXT_VERSION ?= 1.1.0-rc.14-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/profiles/Cargo.toml
View file

@ -1,5 +1,5 @@
[package] [package]
name = "profiles" name = "kanidm_build_profiles"
description = "Kanidm Build System Profiles" description = "Kanidm Build System Profiles"
documentation = "https://docs.rs/kanidm/latest/kanidm/" documentation = "https://docs.rs/kanidm/latest/kanidm/"
# We do not have tests in this pkg # We do not have tests in this pkg

2
server/core/Cargo.toml
View file

@ -51,4 +51,4 @@ kanidm_utils_users = { workspace = true }
uuid = { workspace = true, features = ["serde", "v4" ] } uuid = { workspace = true, features = ["serde", "v4" ] }
[build-dependencies] [build-dependencies]
profiles = { workspace = true } kanidm_build_profiles = { workspace = true }

2
server/daemon/Cargo.toml
View file

@ -47,4 +47,4 @@ tikv-jemallocator = { workspace = true }
serde = { workspace = true, features = ["derive"] } serde = { workspace = true, features = ["derive"] }
clap = { workspace = true, features = ["derive"] } clap = { workspace = true, features = ["derive"] }
clap_complete = { workspace = true } clap_complete = { workspace = true }
profiles = { workspace = true } kanidm_build_profiles = { workspace = true }

2
server/lib/Cargo.toml
View file

@ -86,5 +86,5 @@ futures = { workspace = true }
kanidmd_lib_macros = { workspace = true } kanidmd_lib_macros = { workspace = true }
[build-dependencies] [build-dependencies]
profiles = { workspace = true } kanidm_build_profiles = { workspace = true }

2
server/testkit/Cargo.toml
View file

@ -41,7 +41,7 @@ tokio = { workspace = true, features = ["net", "sync", "io-util", "macros"] }
[build-dependencies] [build-dependencies]
profiles = { workspace = true } kanidm_build_profiles = { workspace = true }
[dev-dependencies] [dev-dependencies]
compact_jwt = { workspace = true } compact_jwt = { workspace = true }

2
server/web_ui/Cargo.toml
View file

@ -3,7 +3,7 @@ name = "kanidmd_web_ui"
description = "Kanidm Server Web User Interface" description = "Kanidm Server Web User Interface"
documentation = "https://docs.rs/kanidm/latest/kanidm/" documentation = "https://docs.rs/kanidm/latest/kanidm/"
version = "1.1.0-rc.14" version = "1.1.0-rc.14-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>",

2
tools/cli/Cargo.toml
View file

@ -54,7 +54,7 @@ zxcvbn = { workspace=true }
[build-dependencies] [build-dependencies]
clap = { workspace = true, features = ["derive"] } clap = { workspace = true, features = ["derive"] }
clap_complete = { workspace=true } clap_complete = { workspace=true }
profiles = { workspace = true } kanidm_build_profiles = { workspace = true }
uuid = { workspace=true } uuid = { workspace=true }
url = { workspace = true } url = { workspace = true }

2
tools/orca/Cargo.toml
View file

@ -42,4 +42,4 @@ uuid = { workspace = true, features = ["serde", "v4" ] }
tikv-jemallocator = { workspace = true } tikv-jemallocator = { workspace = true }
[build-dependencies] [build-dependencies]
profiles = { workspace = true } kanidm_build_profiles = { workspace = true }

2
unix_integration/Cargo.toml
View file

@ -81,4 +81,4 @@ kanidmd_core = { workspace = true }
[build-dependencies] [build-dependencies]
clap = { workspace = true, features = ["derive"] } clap = { workspace = true, features = ["derive"] }
clap_complete = { workspace = true } clap_complete = { workspace = true }
profiles = { workspace = true } kanidm_build_profiles = { workspace = true }