Hello community,
here is the log from the commit of package yast2
checked in at Tue Sep 16 12:47:53 CEST 2008.
--------
--- yast2/yast2.changes 2008-09-12 15:58:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2008-09-16 08:47:35.000000000 +0200
@@ -1,0 +2,14 @@
+Tue Sep 16 08:46:18 CEST 2008 - locilka@suse.cz
+
+- Fixed ncurses menu (bnc #426507).
+- 2.17.24
+
+-------------------------------------------------------------------
+Mon Sep 15 12:36:02 CEST 2008 - locilka@suse.cz
+
+- Ignoring backslashes at ends of lines in SuSEfirewall
+ configuration file (bnc #426000).
+- Using one-record-perl-line style in SuSEfirewall for some
+ variables to keep them human-readable (bnc #426000).
+
+-------------------------------------------------------------------
Old:
----
yast2-2.17.23.tar.bz2
New:
----
yast2-2.17.24.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.r31906/_old 2008-09-16 12:47:37.000000000 +0200
+++ /var/tmp/diff_new_pack.r31906/_new 2008-09-16 12:47:37.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.17.23)
+# spec file for package yast2 (Version 2.17.24)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2
-Version: 2.17.23
+Version: 2.17.24
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.17.23.tar.bz2
+Source0: yast2-2.17.24.tar.bz2
Prefix: /usr
Source1: yast2-rpmlintrc
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-testsuite
@@ -147,7 +147,7 @@
Steffen Winterfeldt
%prep
-%setup -n yast2-2.17.23
+%setup -n yast2-2.17.24
%build
%{prefix}/bin/y2tool y2autoconf
@@ -251,6 +251,14 @@
%doc %{prefix}/share/doc/packages/yast2/types
%doc %{prefix}/share/doc/packages/yast2/wizard
%changelog
+* Tue Sep 16 2008 locilka@suse.cz
+- Fixed ncurses menu (bnc #426507).
+- 2.17.24
+* Mon Sep 15 2008 locilka@suse.cz
+- Ignoring backslashes at ends of lines in SuSEfirewall
+ configuration file (bnc #426000).
+- Using one-record-perl-line style in SuSEfirewall for some
+ variables to keep them human-readable (bnc #426000).
* Fri Sep 12 2008 lslezak@suse.cz
- display a warning when a package installation or download error
is ignored, suggest verification of the system (fate#303527)
++++++ yast2-2.17.23.tar.bz2 -> yast2-2.17.24.tar.bz2 ++++++
++++ 5439 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.17.23/configure.in new/yast2-2.17.24/configure.in
--- old/yast2-2.17.23/configure.in 2008-09-12 15:57:09.000000000 +0200
+++ new/yast2-2.17.24/configure.in 2008-09-12 16:10:36.000000000 +0200
@@ -1,6 +1,6 @@
dnl configure.in for yast2
dnl
-dnl -- This file is generated by y2autoconf 2.17.3 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
AC_INIT(yast2, 2.17.23, http://bugs.opensuse.org/, yast2)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.17.23/library/desktop/src/menu.ycp new/yast2-2.17.24/library/desktop/src/menu.ycp
--- old/yast2-2.17.23/library/desktop/src/menu.ycp 2008-09-09 16:39:14.000000000 +0200
+++ new/yast2-2.17.24/library/desktop/src/menu.ycp 2008-09-16 08:47:56.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: NCurses Control Center
* Authors: Michal Svec
*
- * $Id: menu.ycp 50435 2008-08-28 11:02:06Z locilka $
+ * $Id: menu.ycp 51168 2008-09-16 06:47:57Z locilka $
*
* Provides a list of available yast2 modules. This module is inteded for use
* with ncurses, for X the yast2 control center should be used.
@@ -75,9 +75,12 @@
),
`VSpacing(1.0),
- `ButtonBox (
+ `HBox (
+ `HSpacing (1),
`PushButton(`id(`help), `opt(`key_F1, `helpButton), Label::HelpButton()),
- `PushButton(`id(`quit), `opt(`key_F9, `cancelButton), Label::QuitButton())
+ `HStretch(),
+ `PushButton(`id(`quit), `opt(`key_F9, `cancelButton), Label::QuitButton()),
+ `HSpacing (1)
),
`VSpacing(1)
));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.17.23/library/modules/Version.ycp new/yast2-2.17.24/library/modules/Version.ycp
--- old/yast2-2.17.23/library/modules/Version.ycp 2008-09-12 15:57:25.000000000 +0200
+++ new/yast2-2.17.24/library/modules/Version.ycp 2008-09-16 08:48:12.000000000 +0200
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.17.23";
+global string yast2 = "2.17.24";
/* EOF */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.17.23/library/network/src/SuSEFirewall.ycp new/yast2-2.17.24/library/network/src/SuSEFirewall.ycp
--- old/yast2-2.17.23/library/network/src/SuSEFirewall.ycp 2008-09-09 16:39:06.000000000 +0200
+++ new/yast2-2.17.24/library/network/src/SuSEFirewall.ycp 2008-09-15 12:58:02.000000000 +0200
@@ -6,7 +6,7 @@
* Summary: Interface manipulation of /etc/sysconfig/SuSEFirewall
* Authors: Lukas Ocilka
*
- * $Id: SuSEFirewall.ycp 49749 2008-08-06 08:36:31Z locilka $
+ * $Id: SuSEFirewall.ycp 51148 2008-09-15 10:58:02Z locilka $
*
* Module for handling SuSEfirewall2.
*/
@@ -152,6 +152,8 @@
"FW_CONFIGURATIONS_EXT", "FW_CONFIGURATIONS_INT", "FW_CONFIGURATIONS_DMZ",
];
+ list <string> one_line_per_record = ["FW_FORWARD_MASQ", "FW_SERVICES_ACCEPT_EXT", "FW_SERVICES_ACCEPT_INT", "FW_SERVICES_ACCEPT_DMZ"];
+
// FATE #300970: Firewall support for SMB browsing
string broadcast_related_module = "nf_conntrack_netbios_ns";
@@ -160,6 +162,17 @@
// <!-- SuSEFirewall GLOBAL FUNCTIONS USED BY LOCAL ONES //-->
/**
+ * Returns whether records in variable should be written one record on one line.
+ * @return boolean if wolpr
+ */
+ boolean WriteOneRecordPerLine (string key_name) {
+ if (key_name == nil && key_name == "")
+ return true;
+
+ return (contains (one_line_per_record, key_name));
+ }
+
+ /**
* Function sets internal variable, which indicates, that any
* "firewall settings were modified", to "true".
*/
@@ -289,11 +302,21 @@
if (value == nil || value == "")
value = GetDefaultValue(variable);
- // see bugzilla #194419
+ // BNC #426000
+ // backslash at the end
+ if (regexpmatch (value, "[ \t]*\\\\[ \t]*\n")) {
+ list <string> rules = splitstring (value, "\\ \t\n");
+ rules = filter (string one_rule, rules, {
+ return (one_rule != nil && one_rule != "");
+ });
+ value = mergestring (rules, " ");
+ }
+ // BNC #194419
// replace all "\n" with " " in variables
if (regexpmatch(value, "\n"))
value = mergestring(splitstring(value, "\n"), " ");
+
// replace all "\t" with " " in variables
if (regexpmatch(value, "\t"))
value = mergestring(splitstring(value, "\t"), " ");
@@ -324,12 +347,19 @@
*/
boolean WriteSysconfigSuSEFirewall (list<string> variables) {
boolean write_status = true;
+ string value = "";
foreach (string variable, variables, {
+ // if variable is undefined, get default value
+ value = SETTINGS[variable]:GetDefaultValue(variable);
+
+ if (WriteOneRecordPerLine (variable) == true) {
+ value = mergestring (splitstring (value, " "), "\n");
+ }
+
write_status = (boolean) SCR::Write(
add(.sysconfig.SuSEfirewall2,variable),
- // if variable is undefined, get default value
- SETTINGS[variable]:GetDefaultValue(variable)
+ value
);
if (! write_status) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.17.23/VERSION new/yast2-2.17.24/VERSION
--- old/yast2-2.17.23/VERSION 2008-09-12 15:50:16.000000000 +0200
+++ new/yast2-2.17.24/VERSION 2008-09-16 08:47:45.000000000 +0200
@@ -1 +1 @@
-2.17.23
+2.17.24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org