Accepting request 1243514 from security:apparmor

- add python313.patch to fix build with python 3.13

  - 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 (forwarded request 1243410 from dirkmueller)

OBS-URL: https://build.opensuse.org/request/show/1243514
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apparmor?expand=0&rev=217
This commit is contained in:
Ana Guerrero 2025-02-06 21:02:19 +00:00 committed by Git OBS Bridge
commit 18db02a575
4 changed files with 85 additions and 26 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Feb 5 14:40:53 UTC 2025 - Dirk Müller <dmueller@suse.com>
- add python313.patch to fix build with python 3.13
-------------------------------------------------------------------
Tue Oct 1 20:11:06 UTC 2024 - Christian Boltz <suse-beta@cboltz.de>

View File

@ -1,7 +1,7 @@
#
# spec file for package apparmor
#
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2025 SUSE LLC
# Copyright (c) 2011-2024 Christian Boltz
#
# All modifications and additions to the file contributed by third parties
@ -85,6 +85,9 @@ Patch7: apparmor-enable-precompiled-cache.diff
# Mesa: new cachedir in Mesa 24.2.2 (merged upstream 2024-09-30 https://gitlab.com/apparmor/apparmor/-/merge_requests/1333)
Patch10: mesa-cachedir.diff
# add python 3.13 fixes/workarounds
Patch11: python313.patch
PreReq: sed
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
@ -353,6 +356,7 @@ mv -v profiles/apparmor.d/usr.lib.apache2.mpm-prefork.apache2 profiles/apparmor/
%patch -P 7
%endif
%patch -p1 -P 10
%patch -p1 -P 11
%build
export SUSE_ASNEEDED=0

View File

@ -1,7 +1,7 @@
#
# spec file for package libapparmor
#
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2025 SUSE LLC
# Copyright (c) 2011-2024 Christian Boltz
#
# All modifications and additions to the file contributed by third parties

50
python313.patch Normal file
View File

@ -0,0 +1,50 @@
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():