3a01d74522
apparmor: - update to AppArmor 2.11.1 - add permissions to several profiles and abstractions (including lp#1650827 and boo#1057900) - several fixes in the aa-* tools (including lp#1689667, lp#1628286, lp#1661766 and boo#1062667) - fix downgrading/converting of 'unix' rules (will be supported in kernel 4.15) to 'network unix' rules in apparmor_parser (boo#1061195) - see http://wiki.apparmor.net/index.php/ReleaseNotes_2_11_1 for upstream changelog - remove upstream(ed) patches - upstream-changes-r3616..3628.diff - upstream-changes-r3629..3648.diff - parser-tests-dbus-duplicated-conditionals.diff - apparmor-fix-podsyntax.patch - sshd-profile-drop-local-include-r3615.diff - refresh apparmor-yast-cleanup.patch - add utils-fix-sorted-save_profiles-regression.diff to fix a regression in displaying the "changed profiles" list in aa-logprof Also add bugzilla reference to the previous change: - add nameservice-libtirpc.diff to fix NIS/YP logins (boo#1062244) libapparmor: - update to AppArmor 2.11.1 - mostly test-related changes in libapparmor - see http://wiki.apparmor.net/index.php/ReleaseNotes_2_11_1 for upstream changelog OBS-URL: https://build.opensuse.org/request/show/536620 OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=190
35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
--- utils/apparmor/aa.py 2017-10-11 21:20:00.789641479 +0200
|
|
+++ utils/apparmor/aa.py 2017-10-22 14:15:00.412193634 +0200
|
|
@@ -1827,16 +1827,18 @@
|
|
if not changed:
|
|
return
|
|
|
|
- q.options = sorted(changed.keys())
|
|
+ options = sorted(changed.keys())
|
|
+ q.options = options
|
|
|
|
ans, arg = q.promptUser()
|
|
+
|
|
+ which = options[arg]
|
|
+
|
|
if ans == 'CMD_SAVE_SELECTED':
|
|
- profile_name = list(changed.keys())[arg]
|
|
- write_profile_ui_feedback(profile_name)
|
|
- reload_base(profile_name)
|
|
+ write_profile_ui_feedback(which)
|
|
+ reload_base(which)
|
|
|
|
elif ans == 'CMD_VIEW_CHANGES':
|
|
- which = list(changed.keys())[arg]
|
|
oldprofile = None
|
|
if aa[which][which].get('filename', False):
|
|
oldprofile = aa[which][which]['filename']
|
|
@@ -1852,7 +1854,6 @@
|
|
display_changes_with_comments(oldprofile, newprofile)
|
|
|
|
elif ans == 'CMD_VIEW_CHANGES_CLEAN':
|
|
- which = list(changed.keys())[arg]
|
|
oldprofile = serialize_profile(original_aa[which], which, '')
|
|
newprofile = serialize_profile(aa[which], which, '')
|
|
|