Merge pull request #324 from himmelblau-idm/stable-0.7.x_deb12

Stable 0.7.x Add Debian 12 packaging

Cargo.toml

@@ -19,7 +19,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "0.7.11"
+version = "0.7.12"
 authors = [
     "David Mulder <[email protected]>"
 ]

Makefile

@@ -59,10 +59,10 @@ DOCKER := $(shell command -v podman || command -v docker)
 deb:
 	mkdir -p ./packaging/
 	git submodule init; git submodule update
-	for v in 22.04 24.04; do \
+	for v in ubuntu22.04 ubuntu24.04 debian12; do \
 		echo "Building Ubuntu $$v packages"; \
-		$(DOCKER) build -t himmelblau-ubuntu$$v-build -f images/ubuntu/Dockerfile.$$v .; \
-		$(DOCKER) run --rm -it -v ./:/himmelblau himmelblau-ubuntu$$v-build; \
+		$(DOCKER) build -t himmelblau-$$v-build -f images/deb/Dockerfile.$$v .; \
+		$(DOCKER) run --rm -it -v ./:/himmelblau himmelblau-$$v-build; \
 		mv ./target/debian/*.deb ./packaging/; \
 	done
 

images/deb/Dockerfile.debian12

@@ -0,0 +1,58 @@
+# Use the official Debian 12 image as the base
+FROM debian:12
+
+# Set environment variables for non-interactive installs
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Install essential build dependencies
+RUN apt-get update && apt-get install -y \
+    curl \
+    git \
+    build-essential \
+    libssl-dev \
+    libsss-idmap-dev \
+    libdbus-1-dev \
+    libtool \
+    pkg-config \
+    autoconf \
+    libpam0g-dev \
+    libudev-dev \
+    tpm-udev \
+    libtss2-dev \
+    libcap-dev \
+    libtalloc-dev \
+    libtevent-dev \
+    libldb-dev \
+    libdhash-dev \
+    libkrb5-dev \
+    libpcre2-dev \
+    libclang-dev \
+    gettext \
+    libsqlite3-dev \
+    libutf8proc-dev \
+    libgirepository1.0-dev \
+    libcairo2-dev \
+    libgdk-pixbuf2.0-dev \
+    libsoup-3.0-dev \
+    libpango1.0-dev \
+    libatk1.0-dev \
+    libgtk-3-dev \
+    libwebkit2gtk-4.1-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install Rust (latest stable)
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
+
+# Set environment for Rust
+ENV PATH="/root/.cargo/bin:${PATH}"
+
+VOLUME /himmelblau
+
+# Change directory to the repository
+WORKDIR /himmelblau
+
+# Install the cargo-deb tool
+RUN cargo install cargo-deb
+
+# Build the project and create the .deb package
+CMD cargo clean && cargo deb --deb-revision=debian12 -p himmelblaud && cargo deb --deb-revision=debian12 -p nss_himmelblau && cargo deb --deb-revision=debian12 -p pam_himmelblau && cargo deb --deb-revision=debian12 -p sshd-config && cargo deb --deb-revision=debian12 -p sso

images/ubuntu/Dockerfile.22.04 → images/deb/Dockerfile.ubuntu22.04

@@ -29,7 +29,6 @@ RUN apt-get update && apt-get install -y \
     libpcre2-dev \
     libclang-dev \
     gettext \
-    cargo \
     libsqlite3-dev \
     libutf8proc-dev \
     libgirepository1.0-dev \

images/ubuntu/Dockerfile.24.04 → images/deb/Dockerfile.ubuntu24.04

@@ -29,7 +29,6 @@ RUN apt-get update && apt-get install -y \
     libpcre2-dev \
     libclang-dev \
     gettext \
-    cargo \
     libsqlite3-dev \
     libutf8proc-dev \
     libgirepository1.0-dev \