8f0fcf5e40
- Update to AppArmor 4.0.1 Too many changes to list them here. See https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_4.0.1 for the detailed upstream release notes - add tools-fix-redefinition.diff: fix redefinition of _ in tools - add test-aa-notify.diff: relax test-aa-notify to avoid a mismatch with argparse on Leap 15.5 - drop upstreamed patches: - apparmor-abstractions-openssl-allow-version-specific-en.patch - dovecot-unix_chkpwd.diff - smbd-unix_chkpwd.diff - apparmor-lessopen-profile.patch: update lessopen profile to abi/4.0 - mark local/* as %ghost so that these dummy files don't get installed anymore (changed existing local/files will be kept, unchanged files will be deleted) - switch to gitlab tarballs (without pregenerated libapparmor configure script and prebuilt techdoc.pdf) - run libapparmor autogen.sh (needs additional BuildRequires autoconf, autoconf-archive, automake and libtool) - no longer package techdoc.pdf - old documentation, not worth the texlive BuildRequires we would need to build it - drop old (up to 2.12) cache location /var/lib/apparmor/ and the /etc/apparmor.d/cache symlink pointing to it - drop apparmor-samba-include-permissions-for-shares.diff - no longer needed, update-apparmor-samba-profile in Tumbleweed works without a pre-existing local/usr.sbin.smbd-shares file - drop ruby-2_0-mkmf-destdir.patch - this ancient patch doesn't change a single bit in the resulting build (anymore?) - drop apparmor-lessopen-nfs-workaround.diff - no longer needed OBS-URL: https://build.opensuse.org/request/show/1176504 OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=404
31 lines
1023 B
Diff
31 lines
1023 B
Diff
https://gitlab.com/apparmor/apparmor/-/merge_requests/1226
|
|
|
|
From 715cb711ba26d3ccff490f35f80721cf3678abb6 Mon Sep 17 00:00:00 2001
|
|
From: Christian Boltz <apparmor@cboltz.de>
|
|
Date: Sun, 5 May 2024 22:05:43 +0200
|
|
Subject: [PATCH] Don't rely on argparse saying "options:"
|
|
|
|
Some argparse versions (for example on openSUSE Leap 15.5) instead say
|
|
"optional arguments:"
|
|
|
|
Don't rely on the "options:" line to allow both wordings.
|
|
---
|
|
utils/test/test-aa-notify.py | 1 -
|
|
1 file changed, 1 deletion(-)
|
|
|
|
diff --git a/utils/test/test-aa-notify.py b/utils/test/test-aa-notify.py
|
|
index 4f3e540e9..abffd0631 100644
|
|
--- a/utils/test/test-aa-notify.py
|
|
+++ b/utils/test/test-aa-notify.py
|
|
@@ -194,7 +194,6 @@ Display AppArmor notifications or messages for DENIED entries.
|
|
|
|
expected_output_2 = \
|
|
'''
|
|
-options:
|
|
-h, --help show this help message and exit
|
|
-p, --poll poll AppArmor logs and display notifications
|
|
--display DISPLAY set the DISPLAY environment variable (might be needed if
|
|
--
|
|
GitLab
|
|
|