Hello community, here is the log from the commit of package yast2-audit-laf for openSUSE:Factory checked in at 2014-06-25 15:24:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-audit-laf (Old) and /work/SRC/openSUSE:Factory/.yast2-audit-laf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-audit-laf" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-audit-laf/yast2-audit-laf.changes 2013-10-11 09:05:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-audit-laf.new/yast2-audit-laf.changes 2014-06-25 15:24:38.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jun 25 10:18:56 CEST 2014 - [email protected] + +- Adapt start of audit daemon to systemd +- 3.1.1 + +------------------------------------------------------------------- Old: ---- yast2-audit-laf-3.1.0.tar.bz2 New: ---- yast2-audit-laf-3.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-audit-laf.spec ++++++ --- /var/tmp/diff_new_pack.1J7nQ2/_old 2014-06-25 15:24:39.000000000 +0200 +++ /var/tmp/diff_new_pack.1J7nQ2/_new 2014-06-25 15:24:39.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-audit-laf # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: yast2-audit-laf -Version: 3.1.0 +Version: 3.1.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -28,7 +28,7 @@ BuildRequires: perl-XML-Writer BuildRequires: update-desktop-files BuildRequires: yast2 -BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: yast2-testsuite BuildArch: noarch ++++++ yast2-audit-laf-3.1.0.tar.bz2 -> yast2-audit-laf-3.1.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-audit-laf-3.1.0/CONTRIBUTING.md new/yast2-audit-laf-3.1.1/CONTRIBUTING.md --- old/yast2-audit-laf-3.1.0/CONTRIBUTING.md 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-audit-laf-3.1.1/CONTRIBUTING.md 2014-06-25 10:50:20.000000000 +0200 @@ -0,0 +1,87 @@ +YaST Contribution Guidelines +============================ + +YaST is an open source project and as such it welcomes all kinds of +contributions. If you decide to contribute, please follow these guidelines to +ensure the process is effective and pleasant both for you and YaST maintainers. + +There are two main forms of contribution: reporting bugs and performing code +changes. + +Bug Reports +----------- + +If you find a problem, please report it either using +[Bugzilla](https://bugzilla.novell.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2) +or [GitHub issues](../../issues). (For Bugzilla, use the [simplified +registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp) +if you don't have an account yet.) + +If you find a problem, please report it either using +[Bugzilla](https://bugzilla.novell.com/) or GitHub issues. We can't guarantee +that every bug will be fixed, but we'll try. + +When creating a bug report, please follow our [bug reporting +guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug). + +Code Changes +------------ + +We welcome all kinds of code contributions, from simple bug fixes to significant +refactorings and implementation of new features. However, before making any +non-trivial contribution, get in touch with us first — this can prevent wasted +effort on both sides. Also, have a look at our [development +documentation](http://en.opensuse.org/openSUSE:YaST_development). + +To send us your code change, use GitHub pull requests. The workflow is as +follows: + + 1. Fork the project. + + 2. Create a topic branch based on `master`. + + 3. Implement your change, including tests (if possible). Make sure you adhere + to the [Ruby style + guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md). + + 4. Make sure your change didn't break anything by building the RPM package + (`rake osc:build`). The build process includes running the full testsuite. + + 5. Publish the branch and create a pull request. + + 6. YaST developers will review your change and possibly point out issues. + Adapt the code under their guidance until they are all resolved. + + 7. Finally, the pull request will get merged or rejected. + +See also [GitHub's guide on +contributing](https://help.github.com/articles/fork-a-repo). + +If you want to do multiple unrelated changes, use separate branches and pull +requests. + +Do not change the `VERSION` and `*.changes` files as this could lead to +conflicts. + +### Commits + +Each commit in the pull request should do only one thing, which is clearly +described by its commit message. Especially avoid mixing formatting changes and +functional changes into one commit. When writing commit messages, adhere to +[widely used +conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html). + +If your commit is related to a bug in Buzgilla or an issue on GitHub, make sure +you mention it in the commit message for cross-reference. Use format like +bnc#775814 or gh#yast/yast-foo#42. See also [GitHub +autolinking](https://help.github.com/articles/github-flavored-markdown#references) +and [openSUSE abbreviation +reference](http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Current_set_of_abbreviations). + +Additional Information +---------------------- + +If you have any question, feel free to ask at the [development mailing +list](http://lists.opensuse.org/yast-devel/) or at the +[#yast](http://webchat.freenode.net/?channels=%23yast) IRC channel on freenode. +We'll do our best to provide a timely and accurate answer. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-audit-laf-3.1.0/VERSION new/yast2-audit-laf-3.1.1/VERSION --- old/yast2-audit-laf-3.1.0/VERSION 2013-10-08 15:12:47.000000000 +0200 +++ new/yast2-audit-laf-3.1.1/VERSION 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -3.1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-audit-laf-3.1.0/package/yast2-audit-laf.changes new/yast2-audit-laf-3.1.1/package/yast2-audit-laf.changes --- old/yast2-audit-laf-3.1.0/package/yast2-audit-laf.changes 2013-10-08 15:12:47.000000000 +0200 +++ new/yast2-audit-laf-3.1.1/package/yast2-audit-laf.changes 2014-06-25 10:50:20.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jun 25 10:18:56 CEST 2014 - [email protected] + +- Adapt start of audit daemon to systemd +- 3.1.1 + +------------------------------------------------------------------- Wed Sep 18 10:49:02 UTC 2013 - [email protected] - do not use *.spec.in template, use *.spec file with RPM macros diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-audit-laf-3.1.0/package/yast2-audit-laf.spec new/yast2-audit-laf-3.1.1/package/yast2-audit-laf.spec --- old/yast2-audit-laf-3.1.0/package/yast2-audit-laf.spec 2013-10-08 15:12:47.000000000 +0200 +++ new/yast2-audit-laf-3.1.1/package/yast2-audit-laf.spec 2014-06-25 10:50:20.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-audit-laf -Version: 3.1.0 +Version: 3.1.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -28,7 +28,7 @@ # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 2.21.22 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-testsuite -BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-devtools >= 3.1.10 BuildArchitectures: noarch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-audit-laf-3.1.0/src/include/audit-laf/complex.rb new/yast2-audit-laf-3.1.1/src/include/audit-laf/complex.rb --- old/yast2-audit-laf-3.1.0/src/include/audit-laf/complex.rb 2013-10-08 15:12:47.000000000 +0200 +++ new/yast2-audit-laf-3.1.1/src/include/audit-laf/complex.rb 2014-06-25 10:50:20.000000000 +0200 @@ -615,12 +615,12 @@ "*.rules", _("Select an example") ) - example_rules = Convert.to_string( - SCR.Read(path(".target.string"), file_name) - ) - - UI.ChangeWidget(Id("rules"), :Value, example_rules) - Builtins.y2milestone("Example rules loaded: %1", file_name) + if file_name != nil + example_rules = Convert.to_string( + SCR.Read(path(".target.string"), file_name)) + UI.ChangeWidget(Id("rules"), :Value, example_rules) + Builtins.y2milestone("Example rules loaded: %1", file_name) + end end nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-audit-laf-3.1.0/src/modules/AuditLaf.rb new/yast2-audit-laf-3.1.1/src/modules/AuditLaf.rb --- old/yast2-audit-laf-3.1.0/src/modules/AuditLaf.rb 2013-10-08 15:12:47.000000000 +0200 +++ new/yast2-audit-laf-3.1.1/src/modules/AuditLaf.rb 2014-06-25 10:50:20.000000000 +0200 @@ -350,9 +350,9 @@ end def CheckAuditdStatus - auditd_stat = Service.Status("auditd") + auditd_active = Service.active?("auditd") - if auditd_stat != 0 + if !auditd_active Report.Error( _( "Cannot start the audit daemon.\n" + @@ -376,7 +376,7 @@ caption = _("Initializing Audit Configuration") # Set the right number of stages - steps = 3 + steps = 4 sl = 500 Builtins.sleep(sl) @@ -452,39 +452,41 @@ Builtins.sleep(sl) Progress.NextStage - auditd_stat = Service.Status("auditd") - Builtins.y2milestone( - "Auditd running: %1", - auditd_stat == 0 ? "yes" : "no" - ) + auditd_active = Service.active?("auditd") + Builtins.y2milestone("Auditd running: %1", auditd_active) - apparmor_stat = Convert.to_integer( - SCR.Execute(path(".target.bash"), "rcapparmor status") - ) + apparmor_active = Service.active?("apparmor") + Builtins.y2milestone("Apparmor loaded: %1", apparmor_active) - Builtins.y2milestone( - "Apparmor loaded: %1", - apparmor_stat == 0 ? "yes" : "no" - ) + if !auditd_active + # question shown in a popup about start of audit daemon + start_question = _("Do you want to start it and enable start at boot\n" + + # question continues + "or only start the daemon for now?") - if auditd_stat != 0 - message = _( - "The audit daemon doesn't run.\nDo you want to start it now?" - ) + message = _("The daemon 'auditd' doesn't run.\n") + start_question - if apparmor_stat == 0 + if apparmor_active + # message about loaded kernel module message = _( - " The 'apparmor' kernel module is loaded.\n" + - "The kernel uses a running audit daemon to log audit\n" + - "events to /var/log/audit/audit.log (default). \n" + - "Do you want to start the daemon now?" - ) + "The 'apparmor' kernel module is loaded.\n" + + # message continues + "The kernel uses a running audit daemon to log audit\n" + + # message continues + "events to /var/log/audit/audit.log (default).\n") + + start_question end + # Headline of a popup + enable = Popup.AnyQuestion3(_("Start of Audit Daemon"), message, + # label of three buttons belonging to the popup + _("Start and &Enable"), _("&Start"), _("&Do not start"), + :focus_yes) + + if enable == :yes || enable == :no + success = Service.Start("auditd") + Service.Enable("auditd") if enable == :yes - start = Popup.YesNoHeadline(_("Audit daemon not running."), message) - if start - exit_code = Service.RunInitScript("auditd", "start") - if exit_code != 0 + if !success go_on = Popup.ContinueCancelHeadline( _("Cannot start the audit daemon."), _( @@ -604,10 +606,10 @@ if write_success # restart auditd - exit_code = Service.RunInitScript("auditd", "restart") - Builtins.y2milestone("'auditd restart' returned: %1", exit_code) + success = Service.Restart("auditd") + Builtins.y2milestone("'auditd restart' returned: %1", success) - if exit_code != 0 + if !success # Error message Report.Error(_("Restart of the audit daemon failed.")) ret = false -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
