Hello community,
here is the log from the commit of package yast2-security
checked in at Fri Sep 26 15:16:59 CEST 2008.
--------
--- yast2-security/yast2-security.changes 2008-09-17 09:36:17.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-security/yast2-security.changes 2008-09-26 10:10:04.588291000 +0200
@@ -1,0 +2,12 @@
+Fri Sep 26 10:02:20 CEST 2008 - lslezak@suse.cz
+
+- fixed the Security Overview dialog in ncurses mode (use a table
+ widget instead of richtext) (bnc#429965)
+- 2.17.4
+
+-------------------------------------------------------------------
+Tue Sep 23 13:16:26 CEST 2008 - jsrain@suse.cz
+
+- fixed incorrect tags in helps (bnc #429063)
+
+-------------------------------------------------------------------
Old:
----
yast2-security-2.17.3.tar.bz2
New:
----
yast2-security-2.17.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-security.spec ++++++
--- /var/tmp/diff_new_pack.Jr9214/_old 2008-09-26 15:16:35.000000000 +0200
+++ /var/tmp/diff_new_pack.Jr9214/_new 2008-09-26 15:16:35.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-security (Version 2.17.3)
+# spec file for package yast2-security (Version 2.17.4)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-security
-Version: 2.17.3
+Version: 2.17.4
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-security-2.17.3.tar.bz2
+Source0: yast2-security-2.17.4.tar.bz2
Prefix: /usr
BuildRequires: doxygen perl-XML-Writer pkg-config update-desktop-files yast2-devtools yast2-pam yast2-testsuite
# new Pam.ycp API
@@ -49,7 +49,7 @@
Jiri Suchomel
%prep
-%setup -n yast2-security-2.17.3
+%setup -n yast2-security-2.17.4
%build
%{prefix}/bin/y2tool y2autoconf
@@ -83,6 +83,12 @@
/usr/share/YaST2/schema/autoyast/rnc/security.rnc
%doc %{prefix}/share/doc/packages/yast2-security
%changelog
+* Fri Sep 26 2008 lslezak@suse.cz
+- fixed the Security Overview dialog in ncurses mode (use a table
+ widget instead of richtext) (bnc#429965)
+- 2.17.4
+* Tue Sep 23 2008 jsrain@suse.cz
+- fixed incorrect tags in helps (bnc #429063)
* Tue Sep 16 2008 lslezak@suse.cz
- check enabled services in runlevel 3 and 5, activate changes
in Security::Write() (bnc#425864)
++++++ yast2-security-2.17.3.tar.bz2 -> yast2-security-2.17.4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-security-2.17.3/configure new/yast2-security-2.17.4/configure
--- old/yast2-security-2.17.3/configure 2008-09-17 09:29:49.000000000 +0200
+++ new/yast2-security-2.17.4/configure 2008-09-26 10:08:31.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-security 2.17.3.
+# Generated by GNU Autoconf 2.61 for yast2-security 2.17.4.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-security'
PACKAGE_TARNAME='yast2-security'
-PACKAGE_VERSION='2.17.3'
-PACKAGE_STRING='yast2-security 2.17.3'
+PACKAGE_VERSION='2.17.4'
+PACKAGE_STRING='yast2-security 2.17.4'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1197,7 +1197,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-security 2.17.3 to adapt to many kinds of systems.
+\`configure' configures yast2-security 2.17.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1268,7 +1268,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-security 2.17.3:";;
+ short | recursive ) echo "Configuration of yast2-security 2.17.4:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-security configure 2.17.3
+yast2-security configure 2.17.4
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-security $as_me 2.17.3, which was
+It was created by yast2-security $as_me 2.17.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2181,7 +2181,7 @@
# Define the identity of the package.
PACKAGE='yast2-security'
- VERSION='2.17.3'
+ VERSION='2.17.4'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.17.3"
+VERSION="2.17.4"
RPMNAME="yast2-security"
MAINTAINER="Jiri Suchomel "
@@ -3304,7 +3304,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-security $as_me 2.17.3, which was
+This file was extended by yast2-security $as_me 2.17.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3347,7 +3347,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-security config.status 2.17.3
+yast2-security config.status 2.17.4
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-security-2.17.3/configure.in new/yast2-security-2.17.4/configure.in
--- old/yast2-security-2.17.3/configure.in 2008-09-17 09:29:44.000000000 +0200
+++ new/yast2-security-2.17.4/configure.in 2008-09-26 10:08:25.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.3 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-security, 2.17.3, http://bugs.opensuse.org/, yast2-security)
+AC_INIT(yast2-security, 2.17.4, http://bugs.opensuse.org/, yast2-security)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.3"
+VERSION="2.17.4"
RPMNAME="yast2-security"
MAINTAINER="Jiri Suchomel "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-security-2.17.3/src/dialogs.ycp new/yast2-security-2.17.4/src/dialogs.ycp
--- old/yast2-security-2.17.3/src/dialogs.ycp 2008-09-16 19:01:22.000000000 +0200
+++ new/yast2-security-2.17.4/src/dialogs.ycp 2008-09-26 10:06:30.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Michal Svec
*
- * $Id: dialogs.ycp 51199 2008-09-16 17:01:23Z lslezak $
+ * $Id: dialogs.ycp 51560 2008-09-26 08:06:27Z lslezak $
*/
{
@@ -25,7 +25,7 @@
"RUNLEVEL5_MANDATORY_SERVICES", "RUNLEVEL3_EXTRA_SERVICES", "RUNLEVEL5_EXTRA_SERVICES" ];
-string SecurityStatus(string option)
+string SecurityStatus(string option, boolean plaintext)
{
string ret = "";
@@ -51,6 +51,11 @@
return _("Unknown");
}
+ if (plaintext)
+ {
+ return ret;
+ }
+
ret = sformat("%2</A>", option, ret);
return ret;
@@ -74,23 +79,29 @@
"IP_TCP_SYNCOOKIES" : _("Enable TCP syncookies"),
"IP_FORWARD" : _("Disable IPv4 forwarding"),
"IPV6_FORWARD" : _("Disable IPv6 forwarding"),
- "RUNLEVEL3_MANDATORY_SERVICES" : _("Enable basic system services in runlevel 3 (multiuser with network)"),
- "RUNLEVEL5_MANDATORY_SERVICES" : _("Enable basic system services in runlevel 5 (multiuser with network and graphical login)"),
+ "RUNLEVEL3_MANDATORY_SERVICES" : _("Enable basic system services in runlevel 3\n (multiuser with network)"),
+ "RUNLEVEL5_MANDATORY_SERVICES" : _("Enable basic system services in runlevel 5\n (multiuser with network and graphical login)"),
"RUNLEVEL3_EXTRA_SERVICES" : _("Enable extra services in runlevel 3"),
"RUNLEVEL5_EXTRA_SERVICES" : _("Enable extra services in runlevel 5"),
];
-string OverviewText()
+any OverviewText(symbol type)
{
- // open a table
- string ret = sformat("<TABLE><TR> <TD><BIG><B>%1</B></BIG></TD>
+ string ret = "";
+ list<term> ret_table = [];
+
+ if (type == `richtext)
+ {
+ // open a table
+ ret = sformat("<TABLE><TR> <TD><BIG><B>%1</B></BIG></TD>
<TD ALIGN=center><BIG><B> %2 </B></BIG></TD>
<TD ALIGN=center><BIG><B> %3 </B></BIG></TD>
<TD></TD>
</TR> <TR></TR>",
- // table header
- _("Security Setting"), _("Status"), _("Security Status"));
+ // table header
+ _("Security Setting"), _("Status"), _("Security Status"));
+ }
list<map> security_mapping = [
$[
@@ -186,21 +197,42 @@
string id = setting["id"]:"";
- // add one line for each security setting
- ret = ret + sformat("<TR><TD>%1 </TD><TD ALIGN=center>%2</TD><TD ALIGN=center> %3</TD><TD>%4</TD></TR>",
- label_mapping[id]:"",
- SecurityStatus(id),
- setting["is_secure"]:false ?
- "<SUP><FONT COLOR=green SIZE=20>✔</FONT></SUP>" : "<FONT COLOR=red SIZE=20><SUP>✘</SUP></FONT>",
- haskey(help_mapping, id) ? sformat("%2</A> ", id, _("Help")) : ""
- );
+ if (type == `table)
+ {
+ ret_table = add(ret_table, `item(`id(id), label_mapping[id]:"", SecurityStatus(id, true),
+ setting["is_secure"]:false ? "✔" : "✘"));
+ }
+ else if (type == `richtext)
+ {
+ // add one line for each security setting
+ ret = ret + sformat("<TR><TD>%1 </TD><TD ALIGN=center>%2</TD><TD ALIGN=center> %3</TD><TD>%4</TD></TR>",
+ label_mapping[id]:"",
+ SecurityStatus(id, false),
+ setting["is_secure"]:false ?
+ "<SUP><FONT COLOR=green SIZE=20>✔</FONT></SUP>" : "<FONT COLOR=red SIZE=20><SUP>✘</SUP></FONT>",
+ haskey(help_mapping, id) ? sformat("%2</A> <BR>", id, _("Help")) : ""
+ );
+ }
}
);
- // close the table
- ret = ret + "</TABLE>";
+ if (type == `table)
+ {
+ y2milestone("Overview table: %1", ret_table);
+ return ret_table;
+ }
+ else if (type == `richtext)
+ {
+ // close the table
+ ret = ret + "</TABLE>";
+
+ y2milestone("Overview text: %1", ret);
+ return ret;
+ }
- return ret;
+ y2error("Unknown type: %1", type);
+
+ return nil;;
}
// mapping for "Enable" and "Disable" links
@@ -237,7 +269,7 @@
string help = help_mapping[help_id]:"";
// add the warning if the option is unknown
- if (SecurityStatus(help_id) == _("Unknown"))
+ if (SecurityStatus(help_id, true) == _("Unknown"))
{
help = help + HELPS["unknown_status"]:"";
}
@@ -286,8 +318,31 @@
/* Overview dialog caption */
string caption = _("Security Overview");
string help = HELPS["overview"]:"";
+ boolean textmode = UI::GetDisplayInfo()["TextMode"]:false;
- term contents = `RichText(`id(`rtext), OverviewText());
+ // table header
+ term tabheader = `header(_("Security Setting"), _("Status"), `Center(_("Security Status")));
+
+ term contents = textmode ?
+ `Table(`id(`table), tabheader, OverviewText(`table)) :
+ `RichText(`id(`rtext), OverviewText(`richtext));
+
+ if (textmode)
+ {
+ // add a button box below the table
+ contents = `VBox(
+ contents,
+ `VSpacing(1),
+ `HBox(
+ // push button label
+ `PushButton(`id(`change), _("Change &Status")),
+ `HSpacing(2),
+ // push button label
+ `PushButton(`id(`descr), _("&Description"))
+ ),
+ `VSpacing(1)
+ );
+ }
Wizard::SetContentsButtons(caption, contents, help,
Label::BackButton(), Label::OKButton());
@@ -323,8 +378,14 @@
break;
}
// user clicked a link in the richtext
- else if (is(ret, string) && haskey(Security::Settings, ret))
+ else if ((is(ret, string) && haskey(Security::Settings, ret)) || ret == `change)
{
+ if (ret == `change)
+ {
+ // query the table in textmode
+ ret = (string)UI::QueryWidget(`id(`table), `CurrentItem);
+ }
+
y2milestone("Clicked %1 link", ret);
string current_value = Security::Settings[(string)ret]:"";
@@ -339,7 +400,16 @@
// the config has been changed
Security::SetModified();
- UI::ChangeWidget(`id(`rtext), `Value, OverviewText());
+ if (textmode)
+ {
+ UI::ChangeWidget(`id(`table), `Items, OverviewText(`table));
+ UI::ChangeWidget(`id(`table), `CurrentItem, ret);
+ UI::SetFocus(`id(`table));
+ }
+ else
+ {
+ UI::ChangeWidget(`id(`rtext), `Value, OverviewText(`richtext));
+ }
}
else if (haskey(link_config_mapping, ret))
{
@@ -365,6 +435,18 @@
{
eval(link_update_mapping[ret]:nil);
}
+
+ // update the overview
+ if (textmode)
+ {
+ UI::ChangeWidget(`id(`table), `Items, OverviewText(`table));
+ UI::ChangeWidget(`id(`table), `CurrentItem, ret);
+ UI::SetFocus(`id(`table));
+ }
+ else
+ {
+ UI::ChangeWidget(`id(`rtext), `Value, OverviewText(`richtext));
+ }
}
}
}
@@ -373,12 +455,20 @@
y2error("Unknown action for link %1", ret);
}
}
- else if (is(ret, string) && regexpmatch((string)ret, "^help_"))
+ else if ((is(ret, string) && regexpmatch((string)ret, "^help_")) || ret == `descr)
{
- string help_id = regexpsub((string)ret, "^help_(.*)", "\\1");
+ string help_id = textmode ?
+ (string)UI::QueryWidget(`id(`table), `CurrentItem)
+ : regexpsub((string)ret, "^help_(.*)", "\\1");
y2milestone("Clicked help link: %1", help_id);
DisplayHelpPopup(help_id);
+
+ // switch the focus back to the table in textmode UI
+ if (textmode)
+ {
+ UI::SetFocus(`id(`table));
+ }
}
else {
y2error("Unexpected return code: %1", ret);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-security-2.17.3/src/helps.ycp new/yast2-security-2.17.4/src/helps.ycp
--- old/yast2-security-2.17.3/src/helps.ycp 2008-09-16 17:34:38.000000000 +0200
+++ new/yast2-security-2.17.4/src/helps.ycp 2008-09-24 08:54:30.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Helps definition
* Authors: Michal Svec
*
- * $Id: helps.ycp 51197 2008-09-16 15:34:40Z lslezak $
+ * $Id: helps.ycp 51398 2008-09-23 11:16:56Z jsrain $
*
* This file contains all helps for the security module screens.
* They are in one huge map called HELPS.
@@ -265,9 +265,9 @@
"IP_TCP_SYNCOOKIES" : _("<P>A system can be overwhelmed with numerous connection attempts so that the system runs out of memory, leading to a Denial of Service (DoS) vulnerability.</P><P>The use of syncookies is a method that can help in such situations, but in configurations with a very large number of legitimate connection attempts from one source the <EM>Enabled</EM> setting can bring problems with denied TCP connections under high load.</P><P>Still, for most environments, the syncookies are the first line of defense against SYN flood DoS attacks, so the secure setting is <EM>Enabled</EM>.</P>"),
- "IP_FORWARD" : _("<P>IP forwarding means to pass on network packets that have been received, but that are not destined for one of the system's configured network interfaces, e.g. network interface addresses.</P><P>If a system forwards network traffic on ISO/OSI layer 3, it is called a router. If you do not need that routing functionality, then disable this option.</P>") + _("</P>This setting applies to <EM>IPV4</EM> only.</P>"),
+ "IP_FORWARD" : _("<P>IP forwarding means to pass on network packets that have been received, but that are not destined for one of the system's configured network interfaces, e.g. network interface addresses.</P><P>If a system forwards network traffic on ISO/OSI layer 3, it is called a router. If you do not need that routing functionality, then disable this option.</P>") + _("<P>This setting applies to <EM>IPv4</EM> only.</P>"),
- "IPV6_FORWARD" : _("<P>IP forwarding means to pass on network packets that have been received, but that are not destined for one of the system's configured network interfaces, eg network interface addresses.</P><P>If a system forwards network traffic on ISO/OSI layer 3, it is called a router. If you do not need that routing functionality, then disable this option.</P>") + _("</P>This setting applies to <EM>IPV6</EM> only.</P>"),
+ "IPV6_FORWARD" : _("<P>IP forwarding means to pass on network packets that have been received, but that are not destined for one of the system's configured network interfaces, eg network interface addresses.</P><P>If a system forwards network traffic on ISO/OSI layer 3, it is called a router. If you do not need that routing functionality, then disable this option.</P>") + _("<P>This setting applies to <EM>IPv6</EM> only.</P>"),
"ENABLE_SYSRQ": _("<P>Magic SysRq Keys enable some control over the system even if it crashes (e.g. during kernel debugging) or if the system does not respond.</P>"),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-security-2.17.3/VERSION new/yast2-security-2.17.4/VERSION
--- old/yast2-security-2.17.3/VERSION 2008-09-17 09:23:08.000000000 +0200
+++ new/yast2-security-2.17.4/VERSION 2008-09-26 10:01:21.000000000 +0200
@@ -1 +1 @@
-2.17.3
+2.17.4
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org