From f6e659cf6c5013f309c98bca305753b3bf4351b1 Mon Sep 17 00:00:00 2001 From: David Mulder Date: Mon, 15 Jul 2024 08:38:29 -0600 Subject: [PATCH 1/3] himmelblaud stops working after suspend BUG: https://github.com/himmelblau-idm/himmelblau/issues/155 Signed-off-by: David Mulder --- platform/opensuse/himmelblaud-tasks.service | 2 +- platform/opensuse/himmelblaud.service | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/opensuse/himmelblaud-tasks.service b/platform/opensuse/himmelblaud-tasks.service index e20fa9d..4f3d4ae 100644 --- a/platform/opensuse/himmelblaud-tasks.service +++ b/platform/opensuse/himmelblaud-tasks.service @@ -3,7 +3,7 @@ [Unit] Description=Himmelblau Local Tasks -After=chronyd.service ntpd.service network-online.target himmelblaud.service +After=chronyd.service ntpd.service network-online.target suspend.target himmelblaud.service [Service] User=root diff --git a/platform/opensuse/himmelblaud.service b/platform/opensuse/himmelblaud.service index 04a30e5..e9d2582 100644 --- a/platform/opensuse/himmelblaud.service +++ b/platform/opensuse/himmelblaud.service @@ -3,7 +3,7 @@ [Unit] Description=Himmelblau Authentication Daemon -After=chronyd.service ntpd.service network-online.target +After=chronyd.service ntpd.service network-online.target suspend.target [Service] DynamicUser=yes From f0cc5b3a51dcd932c78e561bf85523a34b001354 Mon Sep 17 00:00:00 2001 From: David Mulder Date: Mon, 15 Jul 2024 08:46:29 -0600 Subject: [PATCH 2/3] update libnss requirement from 0.7.0 to 0.8.0 Signed-off-by: David Mulder --- src/nss/Cargo.toml | 2 +- src/nss/src/lib.rs | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/nss/Cargo.toml b/src/nss/Cargo.toml index 0c94583..9d65c49 100644 --- a/src/nss/Cargo.toml +++ b/src/nss/Cargo.toml @@ -17,7 +17,7 @@ path = "src/lib.rs" [dependencies] himmelblau_unix_common = { workspace = true } kanidm_unix_common = { workspace = true } -libnss = "0.7.0" +libnss = "0.8.0" libc = { workspace = true } paste = { workspace = true } lazy_static = { workspace = true } diff --git a/src/nss/src/lib.rs b/src/nss/src/lib.rs index 4d1cdbb..4831c0d 100644 --- a/src/nss/src/lib.rs +++ b/src/nss/src/lib.rs @@ -14,8 +14,6 @@ #[macro_use] extern crate libnss; #[cfg(target_family = "unix")] -#[macro_use] -extern crate lazy_static; #[cfg(target_family = "unix")] mod implementation; From 167ca0cb42df2baafbeb337b244e223dead86faf Mon Sep 17 00:00:00 2001 From: David Mulder Date: Mon, 15 Jul 2024 09:05:26 -0600 Subject: [PATCH 3/3] Version 0.4.3 Signed-off-by: David Mulder --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 65343ce..395388f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ members = [ resolver = "2" [workspace.package] -version = "0.4.2" +version = "0.4.3" authors = [ "David Mulder " ] @@ -79,7 +79,7 @@ tracing-forest = "^0.1.6" rusqlite = "^0.31.0" hashbrown = { version = "0.14.0", features = ["serde", "inline-more", "ahash"] } lru = "^0.12.3" -kanidm_lib_crypto = { path = "./src/kanidm/libs/crypto", version = "0.4.2" } +kanidm_lib_crypto = { path = "./src/kanidm/libs/crypto", version = "0.4.3" } kanidm_utils_users = { path = "./src/kanidm/libs/users" } walkdir = "2" csv = "1.2.2"