Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

postinst should not fail on patch or apparmor update #258

Merged
merged 2 commits into from
Oct 15, 2024
Merged

postinst should not fail on patch or apparmor update #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aaabe47
postinst should not fail on patch or apparmor update
dmulder Oct 15, 2024
0c0526c
Version 0.6.14
dmulder Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ members = [
resolver = "2"

[workspace.package]
version = "0.6.13"
version = "0.6.14"
authors = [
"David Mulder <dmulder@suse.com>"
]
Expand Down Expand Up @@ -77,7 +77,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.13" }
kanidm_lib_crypto = { path = "./src/crypto", version = "0.6.14" }
kanidm_utils_users = { path = "./src/users" }
walkdir = "2"
csv = "1.2.2"
Expand Down
4 changes: 2 additions & 2 deletions platform/debian/scripts/postinst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ EOF
# Check if the file /etc/apparmor.d/unix-chkpwd exists
if [[ -f /etc/apparmor.d/unix-chkpwd ]]; then
# Apply the patch using the patch command
echo "$UNIX_CHKPWD_PATCH" | patch --fuzz 2 --silent --forward -p0 /etc/apparmor.d/unix-chkpwd
echo "$UNIX_CHKPWD_PATCH" | patch --fuzz 2 --silent --forward -p0 /etc/apparmor.d/unix-chkpwd || echo "apparmor unix-chkpwd patch failed"

# Reload the AppArmor profile to apply the changes
apparmor_parser -r /etc/apparmor.d/unix-chkpwd
apparmor_parser -r /etc/apparmor.d/unix-chkpwd || echo "apparmor reload failed"
fi
Loading