Hello community,
here is the log from the commit of package yast2
checked in at Fri Aug 8 17:30:19 CEST 2008.
--------
--- yast2/yast2.changes 2008-07-25 16:04:32.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2008-08-08 13:19:33.000000000 +0200
@@ -1,0 +2,29 @@
+Fri Aug 8 13:19:03 CEST 2008 - locilka@suse.cz
+
+- Fixed the latest Progress patch to pass the testsuite.
+- 2.17.10
+
+-------------------------------------------------------------------
+Fri Aug 8 10:28:38 CEST 2008 - jsuchome@suse.cz
+
+- anyxml agent documentation added to anyxml.scr (bnc#405291)
+
+-------------------------------------------------------------------
+Wed Aug 6 14:23:14 CEST 2008 - tgoettlicher@suse.de
+
+- Fixed bnc #413516: HideBackButton() always hides back button
+ in wizard
+
+-------------------------------------------------------------------
+Wed Aug 6 10:34:07 CEST 2008 - locilka@suse.cz
+
+- Converting old built-in allowed services configuration in
+ firewall to services defined by packages (bnc #399217).
+
+-------------------------------------------------------------------
+Wed Jul 30 11:53:35 CEST 2008 - lslezak@suse.cz
+
+- PackageLock::Connect() - display more details about owner of the
+ zypp lock (bnc#280537)
+
+-------------------------------------------------------------------
Old:
----
yast2-2.17.9.tar.bz2
New:
----
yast2-2.17.10.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.V14845/_old 2008-08-08 17:30:09.000000000 +0200
+++ /var/tmp/diff_new_pack.V14845/_new 2008-08-08 17:30:09.000000000 +0200
@@ -1,10 +1,17 @@
#
-# spec file for package yast2 (Version 2.17.9)
+# spec file for package yast2 (Version 2.17.10)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -12,12 +19,12 @@
Name: yast2
-Version: 2.17.9
+Version: 2.17.10
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.17.9.tar.bz2
+Source0: yast2-2.17.10.tar.bz2
Prefix: /usr
Source1: yast2-rpmlintrc
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-testsuite
@@ -141,7 +148,7 @@
Steffen Winterfeldt
%prep
-%setup -n yast2-2.17.9
+%setup -n yast2-2.17.10
%build
%{prefix}/bin/y2tool y2autoconf
@@ -244,7 +251,22 @@
%doc %{prefix}/share/doc/packages/yast2/system
%doc %{prefix}/share/doc/packages/yast2/types
%doc %{prefix}/share/doc/packages/yast2/wizard
+
%changelog
+* Fri Aug 08 2008 locilka@suse.cz
+- Fixed the latest Progress patch to pass the testsuite.
+- 2.17.10
+* Fri Aug 08 2008 jsuchome@suse.cz
+- anyxml agent documentation added to anyxml.scr (bnc#405291)
+* Wed Aug 06 2008 tgoettlicher@suse.de
+- Fixed bnc #413516: HideBackButton() always hides back button
+ in wizard
+* Wed Aug 06 2008 locilka@suse.cz
+- Converting old built-in allowed services configuration in
+ firewall to services defined by packages (bnc #399217).
+* Wed Jul 30 2008 lslezak@suse.cz
+- PackageLock::Connect() - display more details about owner of the
+ zypp lock (bnc#280537)
* Fri Jul 25 2008 mzugec@suse.cz
- support for tunnel devices in NetworkInterfaces (FaTE#302184)
- 2.17.9
++++++ yast2-2.17.9.tar.bz2 -> yast2-2.17.10.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.9/configure new/yast2-2.17.10/configure
--- old/yast2-2.17.9/configure 2008-07-25 15:57:49.000000000 +0200
+++ new/yast2-2.17.10/configure 2008-08-08 13:13:28.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 2.17.8.
+# Generated by GNU Autoconf 2.61 for yast2 2.17.9.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2'
PACKAGE_TARNAME='yast2'
-PACKAGE_VERSION='2.17.8'
-PACKAGE_STRING='yast2 2.17.8'
+PACKAGE_VERSION='2.17.9'
+PACKAGE_STRING='yast2 2.17.9'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1199,7 +1199,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 2.17.8 to adapt to many kinds of systems.
+\`configure' configures yast2 2.17.9 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1270,7 +1270,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2 2.17.8:";;
+ short | recursive ) echo "Configuration of yast2 2.17.9:";;
esac
cat <<\_ACEOF
@@ -1348,7 +1348,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2 configure 2.17.8
+yast2 configure 2.17.9
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1362,7 +1362,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 $as_me 2.17.8, which was
+It was created by yast2 $as_me 2.17.9, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2183,7 +2183,7 @@
# Define the identity of the package.
PACKAGE='yast2'
- VERSION='2.17.8'
+ VERSION='2.17.9'
cat >>confdefs.h <<_ACEOF
@@ -2411,7 +2411,7 @@
-VERSION="2.17.8"
+VERSION="2.17.9"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
@@ -3412,7 +3412,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2 $as_me 2.17.8, which was
+This file was extended by yast2 $as_me 2.17.9, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3455,7 +3455,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2 config.status 2.17.8
+yast2 config.status 2.17.9
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-2.17.9/configure.in new/yast2-2.17.10/configure.in
--- old/yast2-2.17.9/configure.in 2008-07-25 15:57:41.000000000 +0200
+++ new/yast2-2.17.10/configure.in 2008-08-08 13:13:25.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2
dnl
-dnl -- This file is generated by y2autoconf 2.17.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.17.5 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.17.8, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.17.9, http://bugs.opensuse.org/, yast2)
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.8"
+VERSION="2.17.9"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.9/library/agents/anyxml.scr new/yast2-2.17.10/library/agents/anyxml.scr
--- old/yast2-2.17.9/library/agents/anyxml.scr 2008-05-13 13:13:43.000000000 +0200
+++ new/yast2-2.17.10/library/agents/anyxml.scr 2008-08-08 10:50:44.000000000 +0200
@@ -1,13 +1,66 @@
/**
* File: anyxml.scr
*
- * Summary: Agent for reading any XML files.
+ * Summary: Agent for reading and writing simple XML files.
+
+ * Description: Agent is using Perl XML::Simple library.
+ * Write access is supported, but check the limitations
+ * at XML-Simple page (e.g. order of elements is lost in the
+ * maps)
*
* Authors: Jiri Suchomel
*
- * Example: SCR::Read (.anyxml, "/root/some_file.xml")
+ * See: http://search.cpan.org/dist/XML-Simple/lib/XML/Simple.pm
+ *
+ * Example:
+ *
+ * Read a file /tmp/in.xml into YCP map:
+ *
+ * map config = (map)SCR::Read (.anyxml, "/tmp/in.xml")
+ *
+ * Using the agent this way, these default options of XML::Simple library
+ * will be used for reading:
+ *
+ * ForceContent => 1
+ * ForceArray => 1
+ * KeepRoot => 1,
+ * KeyAttr => [],
+ *
+ * Find the description of these arguments in the XML::Simple documentaion.
+ * For example, ForceArray set to 1 "forces nested elements to be represented
+ * as arrays even when there is only one".
+ *
+ * Alternative way of reading is using the argument map. This way it is
+ * possible to specify non-default read options in the "args" submap:
+ *
+ * map config = (map)SCR::Read (.anyxml, $[
+ * "file" : "/tmp/in.xml",
+ * "args" : $[
+ * "ForceArray" : 0,
+ * "KeepRoot" : 1
+ * ]
+ * ])
+ *
+ * Example:
+ *
+ * Writing with the default options:
+ *
+ * Write (.anyxml, $[
+ * "file" : "/tmp/config.xml",
+ * "xml" : config,
+ * ])
+ *
+ * Non-default write options could be used by passing extra submap with
+ * "args" key in the write map:
*
- * $Id:$
+ * Write (.anyxml, $[
+ * "file" : "c.xml",
+ * "xml" : config,
+ * "args : $[
+ * "XMLDecl" : <?xml version="123456789"?>,
+ * "RootName" : "test"
+ * ]
+ * ]);
*/
.anyxml
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.9/library/log/src/ALog.ycp new/yast2-2.17.10/library/log/src/ALog.ycp
--- old/yast2-2.17.9/library/log/src/ALog.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-2.17.10/library/log/src/ALog.ycp 2008-08-07 11:51:28.000000000 +0200
@@ -0,0 +1,83 @@
+/**
+ * File: modules/ALog.ycp
+ * Package: YaST2
+ * Summary: Admin's Log, producing a summary of what YaST did to the system
+ * Authors: Martin Vidner
+ *
+ * $Id: ALog.ycp 49776 2008-08-06 13:50:01Z mvidner $
+ * FATE#303700
+ * TODO stability tag.
+ *
+ * <pre>
+ * ALog::Item("/etc/ntp.conf: added 'server ntp.example.org'");
+ * ALog::Item("enabled /etd/init.d/ntp");
+ * ALog::Item("started /etd/init.d/ntp");
+ *
+ * ALog::CommitPopup();
+ * ALog::Note("set up ntp from local server");
+ * </pre>
+ */
+
+{
+module "ALog";
+textdomain "base";
+
+import "Label";
+
+void doLog(string type, string msg) {
+ // TODO make a separate log, this is just a prototype
+ y2internal("{%1} %2", type, msg);
+}
+
+/**
+ * Log a change to the system from the system point of view.
+ * msg should include the file being changed, and what changes are made
+ * (TODO: with all detail? or summary?)
+ * Example "/etc/ntp.conf: added 'server ntp.example.org'"
+ * @param msg message
+ */
+global void Item(string msg) {
+ doLog ("item", msg);
+}
+
+/**
+ * Log a change to the system from the human point of view.
+ * (It will appear slightly differently in the log)
+ * Example "get proper time from the corporate time server
+ * as requested in ticket bofh#327"
+ * @param msg message
+ */
+global void Note(string msg) {
+ doLog ("note", msg);
+}
+
+string uiInput(string label) {
+ // TODO more lines?
+ term d = `VBox(
+ `InputField (`id (`val), label, ""),
+ `PushButton (`id (`ok), `opt (`default, `key_F10), Label::OKButton ())
+ );
+ UI::OpenDialog (d);
+ any ui = nil;
+ do {
+ ui = UI::UserInput ();
+ } while (ui != `ok || ui != `cancel);
+
+ string val = nil;
+ if (ui == `ok) {
+ val = (string) UI::QueryWidget (`id (`val), `Value);
+ }
+ return val;
+}
+
+/**
+ * Prompt the user for a message to describe the changes
+ * that she did using YaST, logs it using @ref Note
+ */
+global void CommitPopup() {
+ string i = uiInput(_("Enter a log message to describe the changes that you did"));
+ string msg = (i == nil)? "*empty log message*": i;
+ Note(msg);
+}
+
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.9/library/log/src/Makefile.am new/yast2-2.17.10/library/log/src/Makefile.am
--- old/yast2-2.17.9/library/log/src/Makefile.am 2008-04-10 08:47:35.000000000 +0200
+++ new/yast2-2.17.10/library/log/src/Makefile.am 2008-08-07 11:51:28.000000000 +0200
@@ -1,6 +1,7 @@
# Makefile.am for yast2/library/log/src
module_DATA = \
+ ALog.ycp \
LogView.ycp \
LogViewCore.ycp
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.9/library/log/src/Makefile.in new/yast2-2.17.10/library/log/src/Makefile.in
--- old/yast2-2.17.9/library/log/src/Makefile.in 2008-07-25 15:57:54.000000000 +0200
+++ new/yast2-2.17.10/library/log/src/Makefile.in 2008-08-08 13:13:30.000000000 +0200
@@ -178,6 +178,7 @@
yncludedir = @yncludedir@
ystartupdir = @ystartupdir@
module_DATA = \
+ ALog.ycp \
LogView.ycp \
LogViewCore.ycp
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.9/library/modules/Version.ycp new/yast2-2.17.10/library/modules/Version.ycp
--- old/yast2-2.17.9/library/modules/Version.ycp 2008-07-25 16:02:10.000000000 +0200
+++ new/yast2-2.17.10/library/modules/Version.ycp 2008-08-08 13:15:44.000000000 +0200
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.17.9";
+global string yast2 = "2.17.10";
/* EOF */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.9/library/network/src/SuSEFirewallServices.ycp new/yast2-2.17.10/library/network/src/SuSEFirewallServices.ycp
--- old/yast2-2.17.9/library/network/src/SuSEFirewallServices.ycp 2008-07-24 14:53:23.000000000 +0200
+++ new/yast2-2.17.10/library/network/src/SuSEFirewallServices.ycp 2008-08-06 10:52:19.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Definition of Supported Firewall Services and Port Aliases.
* Authors: Lukas Ocilka
*
- * $Id: SuSEFirewallServices.ycp 49191 2008-07-16 16:42:13Z locilka $
+ * $Id: SuSEFirewallServices.ycp 49750 2008-08-06 08:52:18Z locilka $
*
* Global Definition of Firewall Services
* Defined using TCP, UDP and RPC ports and IP protocols and Broadcast UDP
@@ -25,6 +25,7 @@
// MORE INFORMATION IN FEATURE #300687: Ports for SuSEfirewall added via packages.
// ANOTHER REFERENCE: Bugzilla #246911.
//
+ // See also http://en.opensuse.org/SuSEfirewall2/Service_Definitions_Added_via_Packages
//
/***
@@ -77,14 +78,14 @@
/**
* Services definitions for conversion to the new ones.
*/
- define map > OLD_SERVICES = $[
+ global define map > OLD_SERVICES = $[
"http" : $[
"tcp_ports" : [ "http" ],
- "convert_to" : [ "apache2", "lighttpd" ],
+ "convert_to" : [ "service:apache2", "service:lighttpd" ],
],
"https" : $[
"tcp_ports" : [ "https" ],
- "convert_to" : [ "apache2-ssl", "lighttpd-ssl" ],
+ "convert_to" : [ "service:apache2-ssl", "service:lighttpd-ssl" ],
],
"smtp" : $[
"tcp_ports" : [ "smtp" ],
@@ -100,11 +101,11 @@
],
"imap" : $[
"tcp_ports" : [ "imap" ],
- "convert_to" : [ "courier-imapd" ],
+ "convert_to" : [ "service:courier-imapd" ],
],
"imaps" : $[
"tcp_ports" : [ "imaps" ],
- "convert_to" : [ "courier-imap-ssl" ],
+ "convert_to" : [ "service:courier-imap-ssl" ],
],
"samba-server" : $[
"tcp_ports" : [ "netbios-ssn", "microsoft-ds" ], // TCP: 139, 445
@@ -114,7 +115,7 @@
],
"ssh" : $[
"tcp_ports" : [ "ssh" ],
- "convert_to" : [ "sshd" ],
+ "convert_to" : [ "service:sshd" ],
],
"rsync" : $[
"tcp_ports" : [ "rsync" ],
@@ -123,7 +124,7 @@
"dhcp-server" : $[
"udp_ports" : [ "bootps" ],
"broadcast_ports" : [ "bootps" ],
- "convert_to" : [ "dhcp-server" ],
+ "convert_to" : [ "service:dhcp-server" ],
],
"dhcp-client" : $[
"udp_ports" : [ "bootpc" ],
@@ -132,11 +133,11 @@
"dns-server" : $[
"tcp_ports" : [ "domain" ],
"udp_ports" : [ "domain" ],
- "convert_to" : [ "bind" ],
+ "convert_to" : [ "service:bind" ],
],
"nfs-client" : $[
"rpc_ports" : [ "portmap", "status", "nlockmgr" ],
- "convert_to" : [ "nfs-client" ],
+ "convert_to" : [ "service:nfs-client" ],
],
"nfs-server" : $[
"rpc_ports" : [ "portmap", "status", "nlockmgr", "mountd", "nfs", "nfs_acl" ],
@@ -144,7 +145,7 @@
],
"nis-client" : $[
"rpc_ports" : [ "portmap", "ypbind" ],
- "convert_to" : [ "ypserv" ],
+ "convert_to" : [ "service:ypserv" ],
],
"nis-server" : $[
"rpc_ports" : [ "portmap", "ypserv", "fypxfrd", "ypbind", "yppasswdd" ],
@@ -174,11 +175,11 @@
"ntp-server" : $[
"udp_ports" : [ "ntp" ],
"broadcast_ports" : [ "ntp" ],
- "convert_to" : [ "ntp" ],
+ "convert_to" : [ "service:ntp" ],
],
"ldap" : $[
"tcp_ports" : [ "ldap" ],
- "convert_to" : [ "openldap" ],
+ "convert_to" : [ "service:openldap" ],
],
"ldaps" : $[
"tcp_ports" : [ "ldaps" ],
@@ -216,11 +217,11 @@
],
"mysql-server" : $[
"tcp_ports" : [ "mysql" ],
- "convert_to" : [ "mysql" ],
+ "convert_to" : [ "service:mysql" ],
],
"iscsi-server" : $[
"tcp_ports" : [ "iscsi-target" ],
- "convert_to" : [ "iscsitarget" ],
+ "convert_to" : [ "service:iscsitarget" ],
],
];
@@ -388,7 +389,7 @@
/**
* Function returns the map of supported (known) services.
*
- * @return map
+ * @return map supported services
*
* @struct
* $[ service_id : localized_service_name ]
@@ -525,6 +526,7 @@
if (! IsKnownService(service)) {
y2error("Uknown service '%1'", service);
+ y2milestone("Known services: %1", SERVICES);
return nil;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.9/library/network/src/SuSEFirewall.ycp new/yast2-2.17.10/library/network/src/SuSEFirewall.ycp
--- old/yast2-2.17.9/library/network/src/SuSEFirewall.ycp 2008-07-24 14:53:23.000000000 +0200
+++ new/yast2-2.17.10/library/network/src/SuSEFirewall.ycp 2008-08-06 10:36:32.000000000 +0200
@@ -6,7 +6,7 @@
* Summary: Interface manipulation of /etc/sysconfig/SuSEFirewall
* Authors: Lukas Ocilka
*
- * $Id: SuSEFirewall.ycp 49191 2008-07-16 16:42:13Z locilka $
+ * $Id: SuSEFirewall.ycp 49749 2008-08-06 08:36:31Z locilka $
*
* Module for handling SuSEfirewall2.
*/
@@ -25,6 +25,8 @@
import "Progress";
import "PortRanges";
import "PackageSystem";
+ import "FileUtils";
+ import "Directory";
// <!-- SuSEFirewall VARIABLES //-->
@@ -2213,6 +2215,15 @@
ReadSysconfigSuSEFirewall ( GetListOfSuSEFirewallVariables() );
}
+ // old internal services definitions are converted to new services defined by packages
+ // but only once
+ string converted_to_services_dbp_file = Directory::vardir + "/yast2-firewall-already-converted-to-sdbp";
+
+ // services have been already converted
+ boolean already_converted = false;
+
+ global void ConvertToServicesDefinedByPackages();
+
/**
* Function for reading SuSEFirewall configuration.
* Fills internal variables only.
@@ -2322,6 +2333,10 @@
if (have_progress) Progress::NextStage();
+ // bnc #399217
+ // Converting built-in service definitions to services defined by packages
+ ConvertToServicesDefinedByPackages();
+
if (have_progress) Progress::Finish();
return true;
@@ -2481,6 +2496,13 @@
if (have_progress) Progress::NextStage();
+ if (already_converted && ! FileUtils::Exists (converted_to_services_dbp_file)) {
+ y2milestone ("Writing %1: %2",
+ converted_to_services_dbp_file,
+ SCR::Write (.target.string, converted_to_services_dbp_file, "")
+ );
+ }
+
if (have_progress) Progress::Finish();
return true;
@@ -2570,7 +2592,7 @@
// only when the service is allowed in zone - remove all its needed ports
if (IsServiceSupportedInZone(service_id, zone) == true) {
- // all needed ports etc for service/protocol, well, I'm not good at function pointers :-<
+ // all needed ports etc for service/protocol
list <string> needed_all = [];
if (protocol == "TCP") {
needed_all = SuSEFirewallServices::GetNeededTCPPorts(service_id);
@@ -3259,6 +3281,124 @@
}
}
+ /**
+ * Removes old-service definitions before they are added as services defined
+ * by packages.
+ */
+ void RemoveOldAllowedServiceFromZone (map old_service_def, string zone) {
+ y2milestone ("Removing: %1 from zone %2", old_service_def, zone);
+
+ if (old_service_def["tcp_ports"]:[] != []) {
+ foreach (string one_service, old_service_def["tcp_ports"]:[], {
+ RemoveService (one_service, "TCP", zone);
+ });
+ }
+
+ if (old_service_def["udp_ports"]:[] != []) {
+ foreach (string one_service, old_service_def["udp_ports"]:[], {
+ RemoveService (one_service, "UDP", zone);
+ });
+ }
+
+ if (old_service_def["rpc_ports"]:[] != []) {
+ foreach (string one_service, old_service_def["rpc_ports"]:[], {
+ RemoveService (one_service, "RPC", zone);
+ });
+ }
+
+ if (old_service_def["ip_protocols"]:[] != []) {
+ foreach (string one_service, old_service_def["ip_protocols"]:[], {
+ RemoveService (one_service, "IP", zone);
+ });
+ }
+
+ if (old_service_def["broadcast_ports"]:[] != []) {
+ map broadcast = GetBroadcastAllowedPorts();
+
+ broadcast[zone] = filter (string one_port, broadcast[zone]:[], {
+ return (! contains (old_service_def["broadcast_ports"]:[], one_port));
+ });
+
+ SetBroadcastAllowedPorts (broadcast);
+ }
+ }
+
+ /**
+ * Converts old built-in service definitions to services defined by packages.
+ *
+ * @see #bnc 399217
+ */
+ global void ConvertToServicesDefinedByPackages () {
+ if (already_converted) {
+ return;
+ }
+
+ if (FileUtils::Exists (converted_to_services_dbp_file)) {
+ y2milestone ("Configuration has been already converted");
+ already_converted = true;
+ return;
+ }
+
+ // $[ zone : $[ protocol : [ list of ports ] ] ]
+ map > current_conf = $[];
+
+ foreach (string zone, GetKnownFirewallZones (), {
+ current_conf[zone] = $[];
+
+ foreach (string protocol, supported_protocols, {
+ current_conf[zone, protocol] = GetAllowedServicesForZoneProto (zone, protocol);
+ current_conf[zone, "broadcast"] = splitstring (GetBroadcastConfiguration (zone), " \n");
+ });
+ });
+
+ y2milestone ("Current conf: %1", current_conf);
+
+ foreach (string zone, GetKnownFirewallZones (), {
+ foreach (string old_service_id, map old_service_def, SuSEFirewallServices::OLD_SERVICES, {
+ y2milestone ("Checking %1 in %2 zone", old_service_id, zone);
+
+ if (old_service_def["tcp_ports"]:[] != [] && ArePortsOrServicesAllowed (old_service_def["tcp_ports"]:[], "TCP", zone, true) != true)
+ return;
+
+ if (old_service_def["udp_ports"]:[] != [] && ArePortsOrServicesAllowed (old_service_def["udp_ports"]:[], "UDP", zone, true) != true)
+ return;
+
+ if (old_service_def["rpc_ports"]:[] != [] && ArePortsOrServicesAllowed (old_service_def["rpc_ports"]:[], "RPC", zone, false) != true)
+ return;
+
+ if (old_service_def["ip_protocols"]:[] != [] && ArePortsOrServicesAllowed (old_service_def["ip_protocols"]:[], "IP", zone, false) != true)
+ return;
+
+ if (old_service_def["broadcast_ports"]:[] != [] && IsBroadcastAllowed (old_service_def["broadcast_ports"]:[], zone) != true)
+ return;
+
+ if (old_service_def["convert_to"]:[] == []) {
+ y2milestone ("Service %1 supported, but it doesn't have any replacement", old_service_id);
+ return;
+ }
+
+ boolean replaced = false;
+
+ foreach (string replacement, old_service_def["convert_to"]:[], {
+ if (SuSEFirewallServices::IsKnownService (replacement)) {
+ y2milestone ("Old service %1 matches %2", old_service_id, replacement);
+ RemoveOldAllowedServiceFromZone (old_service_def, zone);
+ SetServicesForZones ([replacement], [zone], true);
+ replaced = true;
+ break;
+ }
+ });
+
+ if (! replaced) {
+ y2warning ("Old service %1 matches %2 but none are installed", old_service_id, old_service_def["convert_to"]:[]);
+ }
+ });
+ });
+
+ y2milestone ("Converting done");
+ already_converted = true;
+ }
+
// <!-- SuSEFirewall GLOBAL FUNCTIONS //-->
/* EOF */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.9/library/packages/src/PackageLock.ycp new/yast2-2.17.10/library/packages/src/PackageLock.ycp
--- old/yast2-2.17.9/library/packages/src/PackageLock.ycp 2008-06-06 11:47:21.000000000 +0200
+++ new/yast2-2.17.10/library/packages/src/PackageLock.ycp 2008-08-04 11:55:30.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Packages manipulation (system)
* Authors: Martin Vidner
*
- * $Id: PackageLock.ycp 48079 2008-06-04 15:25:51Z lslezak $
+ * $Id: PackageLock.ycp 49511 2008-07-30 09:58:25Z lslezak $
*
* This should be used everywhere before Pkg is first used. #160319
*/
@@ -43,11 +43,9 @@
try_again = (Popup::AnyQuestion (
// TRANSLATORS: a popup headline
_("Accessing the Package Management Failed"),
+ Pkg::LastError() + "\n\n" +
// TRANSLATORS: an error message with question
- _("Another process is accessing the package database.
-Package management cannot be used now.
-
-Would you like to continue without having access
+ _("Would you like to continue without having access
to the package management or retry to access it?
"),
Label::ContinueButton(),
@@ -89,11 +87,8 @@
symbol ret = Popup::AnyQuestion3(
// TRANSLATORS: a popup headline
_("Accessing the Package Management Failed"),
+ Pkg::LastError() + "\n\n" +
// TRANSLATORS: an error message with question
- _("Another process is accessing the package database.
-Package management cannot be used now.
-")
- + "\n" +
_("Would you like to retry to access it,
continue without having access to the package management
or abort?
@@ -118,11 +113,8 @@
boolean ret = Popup::AnyQuestion(
// TRANSLATORS: a popup headline
_("Accessing the Package Management Failed"),
+ Pkg::LastError() + "\n\n" +
// TRANSLATORS: an error message with question
- _("Another process is accessing the package database.
-Package management cannot be used now.
-")
- + "\n" +
_("Would you like to abort or retry to access it?
"),
Label::RetryButton(),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.9/library/wizard/src/Progress.ycp new/yast2-2.17.10/library/wizard/src/Progress.ycp
--- old/yast2-2.17.9/library/wizard/src/Progress.ycp 2008-06-06 17:26:25.000000000 +0200
+++ new/yast2-2.17.10/library/wizard/src/Progress.ycp 2008-08-08 13:19:43.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Progress bar
* Authors: Petr Blahos
*
- * $Id: Progress.ycp 48107 2008-06-06 10:52:39Z locilka $
+ * $Id: Progress.ycp 49864 2008-08-08 11:19:43Z locilka $
*
* Functions for progress bar.<br>
* <pre>
@@ -489,7 +489,8 @@
}
}
- UI::ReplaceWidget (`id (`contents), bar);
+ // patch from Michal Srb https://bugzilla.novell.com/show_bug.cgi?id=406890#c7
+ if (! Mode::test() && UI::WidgetExists (`id (`contents))) UI::ReplaceWidget (`id (`contents), bar);
if (! UI::WizardCommand(`SetDialogHeading( window_title ) ) )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.9/library/wizard/src/Wizard.ycp new/yast2-2.17.10/library/wizard/src/Wizard.ycp
--- old/yast2-2.17.9/library/wizard/src/Wizard.ycp 2008-07-16 18:21:23.000000000 +0200
+++ new/yast2-2.17.10/library/wizard/src/Wizard.ycp 2008-08-07 11:51:28.000000000 +0200
@@ -785,47 +785,6 @@
Wizard::SetContents("", `Empty(), "", false, false);
}
-
- /**
- * Set contents and Buttons of wizard dialog
- *
- * Additionally set its title, help_text and buttons labels. Enables both back and next button.
- *
- * @params
- *
- * @param title title of window
- * @param contents contents of dialog
- * @param help_text help text
- * @param back_label label of back button
- * @param next_label label of next button
- **/
- global void SetContentsButtons( string title,
- term contents,
- string help_text,
- string back_label,
- string next_label )
- {
- UI::PostponeShortcutCheck ();
-
- if ( UI::WizardCommand(`SetBackButtonLabel( back_label ) ) == true )
- {
- UI::WizardCommand(`SetNextButtonLabel( next_label ) );
- Wizard::SetContents( title, contents, help_text, true, true );
- }
- else
- {
- // Set button labels first to avoid geometry problems: SetContents()
- // calls ReplaceWidget() wich triggers a re-layout.
-
- if ( UI::WidgetExists(`id(`back ) ) ) UI::ChangeWidget(`id (`back), `Label, back_label);
- if ( UI::WidgetExists(`id(`next ) ) ) UI::ChangeWidget(`id (`next), `Label, next_label);
- Wizard::SetContents( title, contents, help_text, true, true );
- }
- SetHelpText( help_text );
- UI::CheckShortcuts ();
- }
-
-
/**
* Set the dialog's "Next" button with a new label and a new ID
*
@@ -991,6 +950,53 @@
}
+
+ /**
+ * Set contents and Buttons of wizard dialog
+ *
+ * Additionally set its title, help_text and buttons labels. Enables both back and next button.
+ *
+ * @params
+ *
+ * @param title title of window
+ * @param contents contents of dialog
+ * @param help_text help text
+ * @param back_label label of back button
+ * @param next_label label of next button
+ **/
+ global void SetContentsButtons( string title,
+ term contents,
+ string help_text,
+ string back_label,
+ string next_label )
+ {
+
+
+ UI::PostponeShortcutCheck ();
+
+ Wizard::RestoreBackButton();
+ Wizard::RestoreNextButton();
+
+ if ( UI::WizardCommand(`SetBackButtonLabel( back_label ) ) == true )
+ {
+ UI::WizardCommand(`SetNextButtonLabel( next_label ) );
+ Wizard::SetContents( title, contents, help_text, true, true );
+ }
+ else
+ {
+ // Set button labels first to avoid geometry problems: SetContents()
+ // calls ReplaceWidget() wich triggers a re-layout.
+
+ if ( UI::WidgetExists(`id(`back ) ) ) UI::ChangeWidget(`id (`back), `Label, back_label);
+ if ( UI::WidgetExists(`id(`next ) ) ) UI::ChangeWidget(`id (`next), `Label, next_label);
+ Wizard::SetContents( title, contents, help_text, true, true );
+ }
+ SetHelpText( help_text );
+ UI::CheckShortcuts ();
+
+ }
+
+
/**
* Sets the wizard 'title' icon to the specified icon from the standard icon
* directory.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.9/VERSION new/yast2-2.17.10/VERSION
--- old/yast2-2.17.9/VERSION 2008-07-25 16:00:40.000000000 +0200
+++ new/yast2-2.17.10/VERSION 2008-08-08 13:15:13.000000000 +0200
@@ -1 +1 @@
-2.17.9
+2.17.10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org