Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package apparmor for openSUSE:Factory 
checked in at 2025-02-06 22:02:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apparmor (Old)
 and      /work/SRC/openSUSE:Factory/.apparmor.new.2316 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "apparmor"

Thu Feb  6 22:02:19 2025 rev:217 rq:1243514 version:4.0.3

Changes:
--------
--- /work/SRC/openSUSE:Factory/apparmor/apparmor.changes        2024-10-02 
21:31:53.158643674 +0200
+++ /work/SRC/openSUSE:Factory/.apparmor.new.2316/apparmor.changes      
2025-02-06 22:02:36.295157995 +0100
@@ -1,0 +2,5 @@
+Wed Feb  5 14:40:53 UTC 2025 - Dirk Müller <dmuel...@suse.com>
+
+- add python313.patch to fix build with python 3.13
+
+-------------------------------------------------------------------

New:
----
  python313.patch

BETA DEBUG BEGIN:
  New:
- add python313.patch to fix build with python 3.13
BETA DEBUG END:

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ apparmor.spec ++++++
--- /var/tmp/diff_new_pack.kCivxY/_old  2025-02-06 22:02:39.419286240 +0100
+++ /var/tmp/diff_new_pack.kCivxY/_new  2025-02-06 22:02:39.423286405 +0100
@@ -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 @@
 # 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 @@
 %patch -P 7
 %endif
 %patch -p1 -P 10
+%patch -p1 -P 11
 
 %build
 export SUSE_ASNEEDED=0

++++++ libapparmor.spec ++++++
--- /var/tmp/diff_new_pack.kCivxY/_old  2025-02-06 22:02:39.451287553 +0100
+++ /var/tmp/diff_new_pack.kCivxY/_new  2025-02-06 22:02:39.455287718 +0100
@@ -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



++++++ python313.patch ++++++
>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():

Reply via email to