Hello community, here is the log from the commit of package yast2-apparmor for openSUSE:Factory checked in at 2019-02-04 16:09:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-apparmor (Old) and /work/SRC/openSUSE:Factory/.yast2-apparmor.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-apparmor" Mon Feb 4 16:09:24 2019 rev:74 rq:670216 version:4.1.7 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-apparmor/yast2-apparmor.changes 2019-01-26 22:21:01.938922857 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-apparmor.new.28833/yast2-apparmor.changes 2019-02-04 16:09:31.938005948 +0100 @@ -1,0 +2,15 @@ +Wed Jan 30 15:51:08 UTC 2019 - Stefan Hundhammer <[email protected]> + +- Implemented "changes" dialog for "scan audit logs" (bsc#1120043) +- Properly line up radio buttons +- Allow to translate "OK" button +- 4.1.7 + +------------------------------------------------------------------- +Mon Jan 28 13:16:50 UTC 2019 - Stefan Hundhammer <[email protected]> + +- Permit new aa-status parser also for one earlier aa-status version + (bsc#1123258) +- 4.1.6 + +------------------------------------------------------------------- Old: ---- yast2-apparmor-4.1.5.tar.bz2 New: ---- yast2-apparmor-4.1.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-apparmor.spec ++++++ --- /var/tmp/diff_new_pack.vtmt6T/_old 2019-02-04 16:09:33.654004876 +0100 +++ /var/tmp/diff_new_pack.vtmt6T/_new 2019-02-04 16:09:33.654004876 +0100 @@ -17,7 +17,7 @@ Name: yast2-apparmor -Version: 4.1.5 +Version: 4.1.7 Release: 0 Summary: YaST2 - Plugins for AppArmor Profile Management License: GPL-2.0-only @@ -33,8 +33,8 @@ # New JSON output format in aa-status; upstream change: # aa-status: split profile from exec name -# bsc#1121274 / PR#35 -Conflicts: apparmor-utils < 2.13 +# bsc#1121274 / PR#35, bsc#1123258 / PR#36 +Conflicts: apparmor-utils < 2.12 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ yast2-apparmor-4.1.5.tar.bz2 -> yast2-apparmor-4.1.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-apparmor-4.1.5/package/yast2-apparmor.changes new/yast2-apparmor-4.1.7/package/yast2-apparmor.changes --- old/yast2-apparmor-4.1.5/package/yast2-apparmor.changes 2019-01-24 16:29:16.000000000 +0100 +++ new/yast2-apparmor-4.1.7/package/yast2-apparmor.changes 2019-01-30 23:41:21.000000000 +0100 @@ -1,4 +1,19 @@ ------------------------------------------------------------------- +Wed Jan 30 15:51:08 UTC 2019 - Stefan Hundhammer <[email protected]> + +- Implemented "changes" dialog for "scan audit logs" (bsc#1120043) +- Properly line up radio buttons +- Allow to translate "OK" button +- 4.1.7 + +------------------------------------------------------------------- +Mon Jan 28 13:16:50 UTC 2019 - Stefan Hundhammer <[email protected]> + +- Permit new aa-status parser also for one earlier aa-status version + (bsc#1123258) +- 4.1.6 + +------------------------------------------------------------------- Thu Jan 24 12:39:46 UTC 2019 - Stefan Hundhammer <[email protected]> - Adapted aa-status parser to new output format to prevent crash diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-apparmor-4.1.5/package/yast2-apparmor.spec new/yast2-apparmor-4.1.7/package/yast2-apparmor.spec --- old/yast2-apparmor-4.1.5/package/yast2-apparmor.spec 2019-01-24 16:29:16.000000000 +0100 +++ new/yast2-apparmor-4.1.7/package/yast2-apparmor.spec 2019-01-30 23:41:21.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-apparmor -Version: 4.1.5 +Version: 4.1.7 Release: 0 Summary: YaST2 - Plugins for AppArmor Profile Management Url: https://github.com/yast/yast-apparmor @@ -33,8 +33,8 @@ # New JSON output format in aa-status; upstream change: # aa-status: split profile from exec name -# bsc#1121274 / PR#35 -Conflicts: apparmor-utils < 2.13 +# bsc#1121274 / PR#35, bsc#1123258 / PR#36 +Conflicts: apparmor-utils < 2.12 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-apparmor-4.1.5/src/lib/apparmor/apparmor_ui_dialog.rb new/yast2-apparmor-4.1.7/src/lib/apparmor/apparmor_ui_dialog.rb --- old/yast2-apparmor-4.1.5/src/lib/apparmor/apparmor_ui_dialog.rb 2019-01-24 16:29:16.000000000 +0100 +++ new/yast2-apparmor-4.1.7/src/lib/apparmor/apparmor_ui_dialog.rb 2019-01-30 23:41:21.000000000 +0100 @@ -125,7 +125,7 @@ VSpacing(0.3), InputField(Id(:str), Opt(:hstretch), @text, @default), VSpacing(0.3), - PushButton('&OK') + PushButton(Label.OKButton) ) ) Yast::UI.UserInput() @@ -214,10 +214,10 @@ return box if @options.nil? @options.each_with_index do |opt, i| log.info "opt #{opt} i #{i}" - box << RadioButton(Id(i.to_s), opt.to_s, i == 0) + box << Left(RadioButton(Id(i.to_s), opt.to_s, i == 0)) box << VSpacing(1) end - VBox(RadioButtonGroup(Id(:options), box)) + VBox(RadioButtonGroup(Id(:options), HSquash(box))) end def menu_to_text_key(menu) @@ -238,6 +238,54 @@ end end + # Dialog that shows the changes (the diff) between the old and the new profile + class ChangesDialog + include Yast::UIShortcuts + include Yast::I18n + include Yast::Logger + include Yast + + def initialize(hm) + log.info "Hash map #{hm}" + @header = hm["header"] + @filename = hm["filename"] + end + + def run + UI.OpenDialog( + Opt(:decorated, :defaultsize), + VBox( + dialog_header, + VSpacing(0.3), + RichText(Opt(:plainText), changes_content), + VSpacing(0.3), + PushButton(Label.OKButton) + ) + ) + + Yast::UI.UserInput + Yast::UI.CloseDialog + + { + "dialog" => "changes", + "response" => "ignored" + } + end + + private + + def dialog_header + return Empty() if @header.nil? + # Not using a Heading widget here for consistency with the rest of this module + Label(@header) + end + + def changes_content + return "" if @filename.nil? + File.read(@filename) + end + end + # Checks JSON version of the tool and if we are compatible class AAJSONVersion include Yast::I18n @@ -277,6 +325,7 @@ l = get_dialog(hm) r = l.run unless r.nil? + log.info("Sending reply #{r.to_json}") f.puts r.to_json f.flush end @@ -295,6 +344,7 @@ 'getstring' => GetStringDialog, 'getfile' => GetFileDialog, 'promptuser' => PromptDialog, + 'changes' => ChangesDialog, 'apparmor-json-version' => AAJSONVersion }
