Christian Boltz
bc6648ba68
- small additions to gnome, freedesktop.org, ubuntu-browsers.d/java
on openSUSE <= 13.1 x86_64 (bnc#895495)
- drop the apparmorapplet-gnome, apparmor-dbus and profile-editor subpackages
(except abstractions/winbind (bnc#863226), abstractions/fonts and
- add abstractions/mysql
- update usr.lib.dovecot.lmtp (add /proc/*/mounts, /tmp/dovecot.lmtp.*,
- add apparmor-2.8.2-nm-dnsmasq-config.patch - allow dnsmasq read config
created by recent NetworkManager (see
http://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=d82669d3fdaa7ec70ef1b64941c101ac810c394b
will remove AppArmor protection from running processes a last time.
Run aa-status to get a list of processes you need to restart, or reboot
- add apparmor-abstractions-ssl_certs.diff to allow access to
- add apparmor-profiles-samba4.diff - various profile additions for
- add apparmor-fix-url-in-manpages-r2093.diff: fix URL in manpages
- swig for python3 is broken on openSUSE 12.2 - build python-apparmor
- add python3-apparmor subpackage (currently py2 OR py3 package can be
- fix a possible x conflict with hats or child profiles in
- add 0001-fix-for-lp929531.patch to allow reading
- move libapparmor.a and libimmunix.a from libapparmor1 to
- allow loading the libraries for samba "vfs objects" also on 32bit
- update to AppArmor 2.7.0 beta1, for details see
OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=427
51 lines
2.2 KiB
Diff
51 lines
2.2 KiB
Diff
From https://gitlab.com/apparmor/apparmor/-/merge_requests/1439/diffs?commit_id=434e34bb510b4cab04e64cd5b21d635c6be8c8ea
|
|
|
|
diff --git a/utils/apparmor/fail.py b/utils/apparmor/fail.py
|
|
index ece6efc43409fcfbfd8470985fb46c70f385796d..a71ceb66a2326789561c33f1ef0abcd7bc58e966 100644
|
|
--- a/utils/apparmor/fail.py
|
|
+++ b/utils/apparmor/fail.py
|
|
@@ -8,7 +8,11 @@
|
|
#
|
|
# ------------------------------------------------------------------
|
|
|
|
-import cgitb
|
|
+try:
|
|
+ import cgitb
|
|
+except ImportError:
|
|
+ cgitb = None
|
|
+ pass
|
|
import sys
|
|
import traceback
|
|
from tempfile import NamedTemporaryFile
|
|
@@ -32,20 +36,21 @@ def handle_exception(*exc_info):
|
|
print('', file=sys.stderr)
|
|
error(ex.value)
|
|
else:
|
|
- with NamedTemporaryFile('w', prefix='apparmor-bugreport-', suffix='.txt', delete=False) as file:
|
|
- cgitb_hook = cgitb.Hook(display=1, file=file, format='text', context=10)
|
|
- cgitb_hook.handle(exc_info)
|
|
-
|
|
- file.write('Please consider reporting a bug at https://gitlab.com/apparmor/apparmor/-/issues\n')
|
|
- file.write('and attach this file.\n')
|
|
+ if cgitb:
|
|
+ with NamedTemporaryFile('w', prefix='apparmor-bugreport-', suffix='.txt', delete=False) as file:
|
|
+ cgitb_hook = cgitb.Hook(display=1, file=file, format='text', context=10)
|
|
+ cgitb_hook.handle(exc_info)
|
|
+ file.write('Please consider reporting a bug at https://gitlab.com/apparmor/apparmor/-/issues\n')
|
|
+ file.write('and attach this file.\n')
|
|
|
|
print(''.join(traceback.format_exception(*exc_info)), file=sys.stderr)
|
|
- print('', file=sys.stderr)
|
|
print('An unexpected error occurred!', file=sys.stderr)
|
|
print('', file=sys.stderr)
|
|
- print('For details, see %s' % file.name, file=sys.stderr)
|
|
+ if cgitb:
|
|
+ print('For details, see %s' % file.name, file=sys.stderr)
|
|
print('Please consider reporting a bug at https://gitlab.com/apparmor/apparmor/-/issues', file=sys.stderr)
|
|
- print('and attach this file.', file=sys.stderr)
|
|
+ if cgitb:
|
|
+ print('and attach this file.', file=sys.stderr)
|
|
|
|
|
|
def enable_aa_exception_handler():
|