Skip to content

Commit

Permalink
Merge branch 'stable-0.6.x' into stable-0.6.x_pam_fix
Browse files Browse the repository at this point in the history
  • Loading branch information
dmulder authored Oct 7, 2024
2 parents 2acc3d2 + d7ccd40 commit e2ed22a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/build_debian_source_package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ jobs:
pkgconf \
debhelper-compat \
devscripts \
libclang-14-dev
libclang-14-dev \
libdbus-1-dev
- name: "[general] - Fetch submodules"
run: |
Expand Down Expand Up @@ -364,7 +365,8 @@ jobs:
patchelf \
pkgconf \
debhelper-compat \
devscripts
devscripts \
libdbus-1-dev
- name: '[general] - Download Debian source package artifacts'
uses: actions/download-artifact@v4
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)))
Expand Down
2 changes: 1 addition & 1 deletion src/pam/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ pkg-config.workspace = true
name = "pam-himmelblau"
maintainer = "David Mulder <dmulder@suse.com>"
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"],
]

0 comments on commit e2ed22a

Please sign in to comment.