Hello community,
here is the log from the commit of package yast2-audit-laf
checked in at Thu Sep 25 23:53:08 CEST 2008.
--------
--- yast2-audit-laf/yast2-audit-laf.changes 2008-09-10 09:36:05.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-audit-laf/yast2-audit-laf.changes 2008-09-25 17:33:28.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Sep 24 13:12:25 CEST 2008 - gs@suse.de
+
+- fixed typos, improved help text, set title icon,
+ prepare for AutoYaST
+- 2.17.2
+
+-------------------------------------------------------------------
Old:
----
yast2-audit-laf-2.17.1.tar.bz2
New:
----
yast2-audit-laf-2.17.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-audit-laf.spec ++++++
--- /var/tmp/diff_new_pack.cr9909/_old 2008-09-25 23:52:54.000000000 +0200
+++ /var/tmp/diff_new_pack.cr9909/_new 2008-09-25 23:52:54.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-audit-laf (Version 2.17.1)
+# spec file for package yast2-audit-laf (Version 2.17.2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-audit-laf
-Version: 2.17.1
+Version: 2.17.2
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-audit-laf-2.17.1.tar.bz2
+Source0: yast2-audit-laf-2.17.2.tar.bz2
Prefix: /usr
Requires: yast2
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
@@ -42,7 +42,7 @@
Gabriele Mohr
%prep
-%setup -n yast2-audit-laf-2.17.1
+%setup -n yast2-audit-laf-2.17.2
%build
%{prefix}/bin/y2tool y2autoconf
@@ -79,8 +79,11 @@
%dir /usr/share/YaST2/scrconf
/usr/share/YaST2/scrconf/auditd.scr
%doc %{prefix}/share/doc/packages/yast2-audit-laf
-
%changelog
+* Wed Sep 24 2008 gs@suse.de
+- fixed typos, improved help text, set title icon,
+ prepare for AutoYaST
+- 2.17.2
* Wed Sep 10 2008 gs@suse.de
- @scrconfdir@ added in spec file
- 2.17.1
++++++ yast2-audit-laf-2.17.1.tar.bz2 -> yast2-audit-laf-2.17.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-audit-laf-2.17.1/src/audit-laf.desktop new/yast2-audit-laf-2.17.2/src/audit-laf.desktop
--- old/yast2-audit-laf-2.17.1/src/audit-laf.desktop 2008-09-08 10:09:16.000000000 +0200
+++ new/yast2-audit-laf-2.17.2/src/audit-laf.desktop 2008-09-24 15:50:02.000000000 +0200
@@ -11,9 +11,11 @@
X-SuSE-YaST-Group=Security
X-SuSE-YaST-Argument=
X-SuSE-YaST-RootOnly=true
-X-SuSE-YaST-AutoInst=
+X-SuSE-YaST-AutoInst=all
X-SuSE-YaST-Geometry=
X-SuSE-YaST-SortKey=
+X-SuSE-YaST-AutoInstClonable=true
+X-SuSE-YaST-AutoInstRequires=audit
X-SuSE-YaST-AutoInstResource=audit-laf
Icon=yast-audit-laf
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-audit-laf-2.17.1/src/AuditLaf.ycp new/yast2-audit-laf-2.17.2/src/AuditLaf.ycp
--- old/yast2-audit-laf-2.17.1/src/AuditLaf.ycp 2008-09-09 11:40:02.000000000 +0200
+++ new/yast2-audit-laf-2.17.2/src/AuditLaf.ycp 2008-09-25 17:22:20.000000000 +0200
@@ -95,6 +95,7 @@
return config_file;
}
+// Testing only
global list <string> GetWatches() {
return ( [ "exit,always watch=/etc/passwd perm=rwx",
"entry,always watch=/etc/sysconfig/yast2 perm=rwx"] );
@@ -113,7 +114,7 @@
* Mark as modified, for Autoyast.
*/
global void SetModified(boolean value) {
- modified = true;
+ modified = value;
}
global boolean ProposalValid() {
@@ -234,7 +235,8 @@
global boolean SetAuditdOption( string key, string value ) {
list <string> option_list = [];
- if ( value != "" )
+ // FIXME - allow empty values, e.g. for computer name (but not if FORMAT is set to USER)
+ if ( value != "" )
{
option_list = add( option_list, value );
SETTINGS[key] = option_list;
@@ -564,24 +566,33 @@
}
/**
- * Get all auditd settings from the first parameter
+ * Get all audit settings from the first parameter
* (For use by autoinstallation.)
* @param settings The YCP structure to be imported.
* @return boolean True on success
*/
-global boolean Import (map settings) {
- // TODO FIXME: your code here (fill the above mentioned variables)...
+global boolean Import ( map settings ) {
+
+ SETTINGS = (map< string, list<string> >)settings ["auditd"]:DEFAULT_CONFIG;
+ RULES = (string)settings["rules"]:"";
+
+ SetModified( true );
+ y2milestone ("Configuration has been imported");
+
return true;
}
/**
- * Dump the auditd settings to a single map
+ * Dump the auditd settings and the rules to a single map
* (For use by autoinstallation.)
* @return map Dumped settings (later acceptable by Import ())
*/
global map Export () {
- // TODO FIXME: your code here (return the above mentioned variables)...
- return $[];
+
+ return $[
+ "auditd" : SETTINGS,
+ "rules" : RULES
+ ];
}
/**
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-audit-laf-2.17.1/src/complex.ycp new/yast2-audit-laf-2.17.2/src/complex.ycp
--- old/yast2-audit-laf-2.17.1/src/complex.ycp 2008-09-09 11:40:54.000000000 +0200
+++ new/yast2-audit-laf-2.17.2/src/complex.ycp 2008-09-25 17:26:51.000000000 +0200
@@ -389,6 +389,9 @@
}
void StoreRulesDialog( string id, map event) {
+
+ AuditLaf::SetModified( true );
+
string rules = (string)UI::QueryWidget( `id("rules"), `Value );
AuditLaf::SetRules( rules );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-audit-laf-2.17.1/src/dialogs.ycp new/yast2-audit-laf-2.17.2/src/dialogs.ycp
--- old/yast2-audit-laf-2.17.1/src/dialogs.ycp 2008-09-09 11:03:35.000000000 +0200
+++ new/yast2-audit-laf-2.17.2/src/dialogs.ycp 2008-09-24 11:53:18.000000000 +0200
@@ -219,11 +219,11 @@
)
),
`VStretch(),
- `Frame(
+ `Frame(
// Frame label - keep it short!
_("Action on Error or Disk Full"),
`VBox(
- `ComboBox(`id("disk_full_action"), `opt(`editable),
+ `ComboBox(`id("disk_full_action"), `opt(`editable, `hstretch),
// ComboBox label - select an action which is performed if disk is full
_("Disk Full Action"),
[`item(`id("IGNORE"), "IGNORE" ),
@@ -233,7 +233,7 @@
`item(`id("HALT"), "HALT" ),
`item(`id("EXEC"), "EXEC" )
]),
- `ComboBox(`id("disk_error_action"), `opt(`editable ),
+ `ComboBox(`id("disk_error_action"), `opt(`editable, `hstretch ),
// ComboBox label - select an action which is performed on error
_("Disk Error Action"),
[`item(`id("IGNORE"), "IGNORE" ),
@@ -258,12 +258,12 @@
`VWeight( 20, `VBox(
// label of a combo box with the possibilitiy to enable/disable auditing or lock the rules
`Left(`ComboBox( `id("audit_enabled"), `opt(`notify), _("&Set Enabled Flag"),
- // ComboBox item
- [`item(`id("enabled"), _("Auditing enabled"), true ), // -e 1
- // ComboBox item
- `item(`id("disabled"), _("Auditing disabled") ), // -e 0
- // ComboBox item
- `item(`id("locked"), _("Rules are locked (until next boot)")) // -e 2
+ // combo box item
+ [`item(`id("enabled"), _("Auditing enabled"), true ),
+ // combo box item
+ `item(`id("disabled"), _("Auditing disabled") ),
+ // combo box item
+ `item(`id("locked"), _("Rules are locked (until next boot)"))
]
) ),
`VStretch()
@@ -285,7 +285,7 @@
// label of push button (please keep it short)
`PushButton( `id( "reset" ), _("R&estore and Reset") ),
`HSpacing(2.0),
- // label of push button
+ // label of a push button
`PushButton( `id( "load" ), _("&Load ") )
)
)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-audit-laf-2.17.1/src/helps.ycp new/yast2-audit-laf-2.17.2/src/helps.ycp
--- old/yast2-audit-laf-2.17.1/src/helps.ycp 2008-09-09 11:36:02.000000000 +0200
+++ new/yast2-audit-laf-2.17.2/src/helps.ycp 2008-09-24 13:06:21.000000000 +0200
@@ -80,54 +80,54 @@
value is reached in <b>Size and Action</b> frame. If action is set to
<b>ROTATE</b> the <b>Number of Log Files</b> specifies the number of files to keep.</p>") +
/* logfile_settings dialog help 7/7 */
- _("<p><b>Computer Name Format</b> describes how to the computer name is written
-to the log file. If <i>User</i> is set the <b>User Defined Name</b> is used.</p> "),
+ _("<p><b>Computer Name Format</b> describes how to write the computer name to the log file.
+If <i>User</i> is set the <b>User Defined Name</b> is used.</p> "),
/* dispatcher dialog help 1/3 */
"dispatcher" : _("<p><b><big>Auditd Dispatcher Configuration</big></b><br>
Detailed information about the dispatcher settings can be obtained from 'man auditd.conf'.<br></p>") +
/* dispatcher dialog help 2/3 */
_("<p><b>Dispatcher</b>: The dispatcher program is started by the audit daemon and
-gets all all audit events on stdin.</p>") +
+gets all audit events on stdin.</p>") +
/* dispatcher dialog help 3/3 */
_("<p><b>Communication</b>: Controls the communication
between the daemon and the dispatcher program.<p>"),
- /* disksapce dialog help 1/4 */
+ /* disk space dialog help 1/4 */
"diskspace_settings" : _("<p><b><big>Auditd Disk Space Configuration</big></b><br>
-Detailed information about the settings can be obtained from 'man auditd.conf'</p>
+The settings made here refer to disk space on log partition.
+Detailed information can be obtained from 'man auditd.conf'</p>
") +
- /* disksapce dialog help 2/4 */
+ /* disk space dialog help 2/4 */
_("<p><b>Space Left</b> and <b>Action</b> describe how much disk space (in megabytes)
to left and which action to perform if the system is starting to run low on space.</p>") +
- /* disksapce dialog help 3/4 */
+ /* disk space dialog help 3/4 */
_("<p><b>Admin Space Left</b> and <b>Action</b> describe how much disk space (in megabytes)
to left and which action to perform if the system <b>is running low</b>.</p>") +
- /* disksapce dialog help 3/4 */
+ /* disk space dialog help 3/4 */
_("<p>You can also specify a <b>Disk Full Action</b> (disk has become full already) and
a <b>Disk Error Action</b> (performed whenever an error is detected while writing to disk).</p>"),
- /* rules dialog help 1/5*/
+ /* rules dialog help 1/6 */
"audit_rules" : _("<p><b><big>Rules for auditctl</big></b><br>
This dialog offers the possibiltiy to enable or to disable the syscall
auditing as well as to lock the audit configuration.
The selected flag from <b>Set Enabled Flag</b> will be added to the rules.</p>" ) +
- /* rules dialog help 2/5*/
+ /* rules dialog help 2/6 */
_("<p><b>Please note:</b><br>Locking the rules means they cannot be changed until next reboot! </p>" ) +
- /* rules dialog help 3/5 */
+ /* rules dialog help 3/6 */
_("<p>To enable the auditing whithout additional rules will cause the
applications which use <i>libaudit</i>, e.g. PAM to log to /var/log/audit/audit.log (default).</p> ") +
- /* rules dialog help 4/5 */
- _("<p>This module also allows you to edit the rules manually. Detailed information
-about all options gives 'man auditctl'.<br>
-<b>Check Syntax</b> sends the rules via <i>auditctl</i> to the audit subsystem and tells
-whether the syntax is correct.</p>") +
- /* rules dialog help 5/5 */
- _("<p>Use the <b>Restore and Reset</b> to restore previous rules and reset the changes
-by calling <i>auditctl</i> with it.<br>
-The <b>Load</b> button opens an file selection dialog and you are able to load
+ /* rules dialog help 4/6 */
+ _("<p>This module also allows you to edit the rules manually. <br>
+Detailed information about all options gives 'man auditctl'.</p>") +
+ /* rules dialog help 5/6 */
+ _("<b>Check Syntax</b> sends the rules via <i>auditctl</i> to the audit subsystem and tells whether the syntax is correct.</p>") +
+ /* rules dialog help 6/6 */
+ _("<p>Use the <b>Restore and Reset</b> button to restore previous rules and reset the changes by calling <i>auditctl</i> with it.<br>
+The <b>Load</b> button opens a file selection dialog and you are able to load
an example rules file.</p>")
];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-audit-laf-2.17.1/src/wizards.ycp new/yast2-audit-laf-2.17.2/src/wizards.ycp
--- old/yast2-audit-laf-2.17.1/src/wizards.ycp 2008-09-09 10:44:46.000000000 +0200
+++ new/yast2-audit-laf-2.17.2/src/wizards.ycp 2008-09-24 13:51:30.000000000 +0200
@@ -92,14 +92,15 @@
"contents" : DispatcherDialogContent(),
],
"diskspace_settings" : $[
- // Header of tab in tab widget (keep it short!)
- "header" : _("Disk &Space on Log Partion"),
+ // Header of tab in tab widget
+ "header" : _("Disk &Space"),
"widget_names" : ["disk"],
"contents" : DiskspaceSettingsDialogContent(),
],
"audit_rules" : $[
- // Header of tab in tab widget
- "header" : _("&Rules for auditctl"),
+ // Header of tab in tab widget
+ // (auditctl is a program which sends the rules to the audit subsystem)
+ "header" : _("&Rules for 'auditctl'"),
"widget_names" : ["rules"],
"contents" : RulesDialogContent(),
],
@@ -137,7 +138,7 @@
Label::FinishButton()
);
Wizard::DisableBackButton ();
- //Wizard::SetTitleIcon("yast-audit-laf");
+ Wizard::SetTitleIcon("yast-audit-laf");
return CWM::Run (w, $[`abort : ReallyExit]);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-audit-laf-2.17.1/VERSION new/yast2-audit-laf-2.17.2/VERSION
--- old/yast2-audit-laf-2.17.1/VERSION 2008-09-10 09:35:26.000000000 +0200
+++ new/yast2-audit-laf-2.17.2/VERSION 2008-09-25 17:31:56.000000000 +0200
@@ -1 +1 @@
-2.17.1
+2.17.2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org