From 821dee8a8f7fd809229c01aca08b29a547473614 Mon Sep 17 00:00:00 2001 From: David Mulder Date: Thu, 3 Oct 2024 08:04:24 -0600 Subject: [PATCH 1/5] Debian build requires libdbus-1-dev Signed-off-by: David Mulder --- .github/workflows/build_debian_source_package.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_debian_source_package.yml b/.github/workflows/build_debian_source_package.yml index bb2cf608..6e462c76 100644 --- a/.github/workflows/build_debian_source_package.yml +++ b/.github/workflows/build_debian_source_package.yml @@ -364,7 +364,8 @@ jobs: patchelf \ pkgconf \ debhelper-compat \ - devscripts + devscripts \ + libdbus-1-dev - name: '[general] - Download Debian source package artifacts' uses: actions/download-artifact@v4 From 04aeeb430a4aa776ff1a39495050a46666e5d57f Mon Sep 17 00:00:00 2001 From: David Mulder Date: Thu, 3 Oct 2024 08:05:06 -0600 Subject: [PATCH 2/5] Version 0.6.1 Signed-off-by: David Mulder --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a22b6743..b67724d7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ members = [ resolver = "2" [workspace.package] -version = "0.6.0" +version = "0.6.1" authors = [ "David Mulder " ] @@ -76,7 +76,7 @@ tracing-forest = "^0.1.6" rusqlite = "^0.32.0" hashbrown = { version = "0.14.0", features = ["serde", "inline-more", "ahash"] } lru = "^0.12.3" -kanidm_lib_crypto = { path = "./src/crypto", version = "0.6.0" } +kanidm_lib_crypto = { path = "./src/crypto", version = "0.6.1" } kanidm_utils_users = { path = "./src/users" } walkdir = "2" csv = "1.2.2" From 87cb2e2b336f0562626dcab5bab277f430242e2e Mon Sep 17 00:00:00 2001 From: David Mulder Date: Thu, 3 Oct 2024 08:31:21 -0600 Subject: [PATCH 3/5] Add libdbus-1-dev dep Signed-off-by: David Mulder --- .github/workflows/build_debian_source_package.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_debian_source_package.yml b/.github/workflows/build_debian_source_package.yml index 6e462c76..0faa0cba 100644 --- a/.github/workflows/build_debian_source_package.yml +++ b/.github/workflows/build_debian_source_package.yml @@ -57,7 +57,8 @@ jobs: pkgconf \ debhelper-compat \ devscripts \ - libclang-14-dev + libclang-14-dev \ + libdbus-1-dev - name: "[general] - Fetch submodules" run: | From c070b2ebcc41f01d3c9e98edda654c61e7903c70 Mon Sep 17 00:00:00 2001 From: David Mulder Date: Thu, 3 Oct 2024 08:57:37 -0600 Subject: [PATCH 4/5] Makefile typo fixes Signed-off-by: David Mulder --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5fb9b4d1..442221ef 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ install-opensuse: install -m 0644 ./platform/opensuse/himmelblaud.service /usr/lib/systemd/system install -m 0644 ./platform/opensuse/himmelblaud-tasks.service /usr/lib/systemd/system -install-debian: +install-ubuntu: install -D -d -m 0755 /etc/himmelblau install -m 0644 ./src/config/himmelblau.conf.example /etc/himmelblau/himmelblau.conf install -m 0755 ./target/release/libnss_himmelblau.so /usr/lib/x86_64-linux-gnu/libnss_himmelblau.so.2 @@ -38,7 +38,7 @@ install-debian: install: ifeq ($(PLATFORM), debian) - $(MAKE) install-debian + $(MAKE) install-ubuntu else ifeq ($(PLATFORM), ubuntu) $(MAKE) install-ubuntu else ifneq (,$(findstring opensuse,$(PLATFORM))) From d72561434c2f6a03ae894f843266cc72e92ac585 Mon Sep 17 00:00:00 2001 From: David Mulder Date: Fri, 4 Oct 2024 11:01:51 -0600 Subject: [PATCH 5/5] Correct installation directory of the deb pam module Signed-off-by: David Mulder --- src/pam/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pam/Cargo.toml b/src/pam/Cargo.toml index 15a913c8..816d9adf 100644 --- a/src/pam/Cargo.toml +++ b/src/pam/Cargo.toml @@ -27,5 +27,5 @@ pkg-config.workspace = true name = "pam-himmelblau" maintainer = "David Mulder " assets = [ - ["target/release/libpam_himmelblau.so", "usr/lib/x86_64-linux-gnu/pam_himmelblau.so", "755"], + ["target/release/libpam_himmelblau.so", "usr/lib/x86_64-linux-gnu/security/pam_himmelblau.so", "755"], ]