Hello community, here is the log from the commit of package apparmor for openSUSE:Factory checked in at 2019-06-07 12:17:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apparmor (Old) and /work/SRC/openSUSE:Factory/.apparmor.new.4811 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apparmor" Fri Jun 7 12:17:17 2019 rev:128 rq:707833 version:2.13.2 Changes: -------- --- /work/SRC/openSUSE:Factory/apparmor/apparmor.changes 2019-04-30 12:55:22.822185438 +0200 +++ /work/SRC/openSUSE:Factory/.apparmor.new.4811/apparmor.changes 2019-06-07 12:17:18.504810630 +0200 @@ -1,0 +2,6 @@ +Wed Jun 5 11:36:25 UTC 2019 - Christian Boltz <[email protected]> + +- add upstream libapparmor-swig-4.diff: fix libapparmor tests with swig + 4.0 (boo#1135751) + +------------------------------------------------------------------- New: ---- libapparmor-swig-4.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apparmor.spec ++++++ --- /var/tmp/diff_new_pack.60MqOh/_old 2019-06-07 12:17:19.192810411 +0200 +++ /var/tmp/diff_new_pack.60MqOh/_new 2019-06-07 12:17:19.196810410 +0200 @@ -81,6 +81,9 @@ # fix usrmerge (and accidently also update-alternatives) test failures (boo#1127877, from upstream https://gitlab.com/apparmor/apparmor/merge_requests/331) Patch13: usrmerge-fixes.diff +# fix libapparmor tests with swig 4.0 (from upstream https://gitlab.com/apparmor/apparmor/merge_requests/384) +Patch14: libapparmor-swig-4.diff + PreReq: sed BuildRoot: %{_tmppath}/%{name}-%{version}-build %define apparmor_bin_prefix /lib/apparmor @@ -374,6 +377,7 @@ %patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 %build %define _lto_cflags %{nil} ++++++ libapparmor-swig-4.diff ++++++ commit a6ac6f4cfcc3d4fe1064087389004c3cc8b41207 Author: John Johansen <[email protected]> Date: Tue Jun 4 13:16:43 2019 -0700 libapparmor python: Fix 'aa_log_record' object has no attribute '__getattr__' When building with swig 4 we are seeing the error AttributeError: 'aa_log_record' object has no attribute '__getattr__' Which forces swig to use modern classes which do not generate __getattr__ methods. issue: https://gitlab.com/apparmor/apparmor/issues/33 Acked-by: Seth Arnold <[email protected]> Acked-by: Steve Beattie <[email protected]> Signed-off-by: John Johansen <[email protected]> diff --git a/libraries/libapparmor/swig/python/test/test_python.py.in b/libraries/libapparmor/swig/python/test/test_python.py.in index 54bd70a9..75c71415 100644 --- a/libraries/libapparmor/swig/python/test/test_python.py.in +++ b/libraries/libapparmor/swig/python/test/test_python.py.in @@ -109,7 +109,7 @@ class AAPythonBindingsTests(unittest.TestCase): new_record = dict() for key in [x for x in dir(record) if not (x.startswith('_') or x == 'this')]: - value = record.__getattr__(key) + value = getattr(record, key) if key == "event" and value in EVENT_MAP: new_record[key] = EVENT_MAP[value] elif key == "version":
