Hello community, here is the log from the commit of package yast2-firewall checked in at Mon Sep 1 02:39:33 CEST 2008. -------- --- yast2-firewall/yast2-firewall.changes 2008-07-15 19:10:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-firewall/yast2-firewall.changes 2008-08-28 14:08:29.000000000 +0200 @@ -1,0 +2,13 @@ +Thu Aug 28 14:06:47 CEST 2008 - locilka@suse.cz + +- Pup-up dialogs adapted to new ButtonBox widget (FATE #303446). +- TextEntry -> InputField. +- Adapted RPM dependencies. +- 2.17.2 + +------------------------------------------------------------------- +Wed Jul 16 18:50:14 CEST 2008 - locilka@suse.cz + +- No more built-in YaST Firewall services... + +------------------------------------------------------------------- Old: ---- yast2-firewall-2.17.1.tar.bz2 New: ---- yast2-firewall-2.17.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-firewall.spec ++++++ --- /var/tmp/diff_new_pack.W20958/_old 2008-09-01 02:39:23.000000000 +0200 +++ /var/tmp/diff_new_pack.W20958/_new 2008-09-01 02:39:23.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package yast2-firewall (Version 2.17.1) +# spec file for package yast2-firewall (Version 2.17.2) # # 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,17 +19,19 @@ Name: yast2-firewall -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-firewall-2.17.1.tar.bz2 +Source0: yast2-firewall-2.17.2.tar.bz2 Prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite BuildRequires: yast2 >= 2.16.47 # SuSEFirewall::SetInstallPackagesIfMissing, bnc #388773 Requires: yast2 >= 2.17.6 +# ButtonBox widget +Conflicts: yast2-ycp-ui-bindings < 2.17.3 Provides: yast2-config-firewall Obsoletes: yast2-config-firewall Provides: yast2-trans-firewall @@ -42,7 +51,7 @@ Lukas Ocilka <locilka@suse.de> %prep -%setup -n yast2-firewall-2.17.1 +%setup -n yast2-firewall-2.17.2 %build %{prefix}/bin/y2tool y2autoconf @@ -76,6 +85,13 @@ %doc %{prefix}/share/doc/packages/yast2-firewall %changelog +* Thu Aug 28 2008 locilka@suse.cz +- Pup-up dialogs adapted to new ButtonBox widget (FATE #303446). +- TextEntry -> InputField. +- Adapted RPM dependencies. +- 2.17.2 +* Wed Jul 16 2008 locilka@suse.cz +- No more built-in YaST Firewall services... * Tue Jul 15 2008 locilka@suse.cz - SuSEFirewallUI and SuSEFirewallCMDLine YCP modules marked as internal. ++++++ yast2-firewall-2.17.1.tar.bz2 -> yast2-firewall-2.17.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.17.1/configure new/yast2-firewall-2.17.2/configure --- old/yast2-firewall-2.17.1/configure 2008-04-09 16:45:18.000000000 +0200 +++ new/yast2-firewall-2.17.2/configure 2008-08-28 14:08:58.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-firewall 2.16.1. +# Generated by GNU Autoconf 2.61 for yast2-firewall 2.17.2. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-firewall' PACKAGE_TARNAME='yast2-firewall' -PACKAGE_VERSION='2.16.1' -PACKAGE_STRING='yast2-firewall 2.16.1' +PACKAGE_VERSION='2.17.2' +PACKAGE_STRING='yast2-firewall 2.17.2' 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-firewall 2.16.1 to adapt to many kinds of systems. +\`configure' configures yast2-firewall 2.17.2 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-firewall 2.16.1:";; + short | recursive ) echo "Configuration of yast2-firewall 2.17.2:";; esac cat <<\_ACEOF @@ -1346,7 +1346,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-firewall configure 2.16.1 +yast2-firewall configure 2.17.2 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-firewall $as_me 2.16.1, which was +It was created by yast2-firewall $as_me 2.17.2, 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-firewall' - VERSION='2.16.1' + VERSION='2.17.2' cat >>confdefs.h <<_ACEOF @@ -2409,7 +2409,7 @@ -VERSION="2.16.1" +VERSION="2.17.2" RPMNAME="yast2-firewall" MAINTAINER="Lukas Ocilka <locilka@suse.cz>" @@ -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-firewall $as_me 2.16.1, which was +This file was extended by yast2-firewall $as_me 2.17.2, 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-firewall config.status 2.16.1 +yast2-firewall config.status 2.17.2 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-firewall-2.17.1/configure.in new/yast2-firewall-2.17.2/configure.in --- old/yast2-firewall-2.17.1/configure.in 2008-04-09 16:45:12.000000000 +0200 +++ new/yast2-firewall-2.17.2/configure.in 2008-08-28 14:08:56.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-firewall dnl -dnl -- This file is generated by y2autoconf 2.16.7 - 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-firewall, 2.16.1, http://bugs.opensuse.org/, yast2-firewall) +AC_INIT(yast2-firewall, 2.17.2, http://bugs.opensuse.org/, yast2-firewall) 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.16.1" +VERSION="2.17.2" RPMNAME="yast2-firewall" MAINTAINER="Lukas Ocilka <locilka@suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.17.1/src/subdialogs.ycp new/yast2-firewall-2.17.2/src/subdialogs.ycp --- old/yast2-firewall-2.17.1/src/subdialogs.ycp 2008-04-09 15:39:34.000000000 +0200 +++ new/yast2-firewall-2.17.2/src/subdialogs.ycp 2008-08-28 14:08:46.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Configuration screens * Authors: Lukas Ocilka <locilka@suse.cz> * - * $Id: subdialogs.ycp 46289 2008-04-09 13:38:13Z locilka $ + * $Id: subdialogs.ycp 50445 2008-08-28 12:08:46Z locilka $ * * Configuration dialogs divided into smaller logic groups. * Both Expert and Simple. @@ -103,9 +103,9 @@ ) ), `VSpacing(1), - `HBox ( - `PushButton(`id("ok"), Label::OKButton()), - `PushButton(`id("cancel"), Label::CancelButton()) + `ButtonBox ( + `PushButton (`id("ok"), `opt (`okButton, `default, `key_F10), Label::OKButton()), + `PushButton (`id("cancel"), `opt (`cancelButton, `key_F9), Label::CancelButton()) ) ) ); @@ -121,43 +121,22 @@ foreach (string zone_id, map <string, string> zone_attributes, zones_additons, { user_defined_zones = add(user_defined_zones, - `TextEntry(`id("zone_additions_" + zone_id), zone_attributes["name"]:"", zone_attributes["items"]:"") + `InputField (`id("zone_additions_" + zone_id), `opt (`hstretch), zone_attributes["name"]:"", zone_attributes["items"]:"") ); }); - term network_manager = `Empty(); - //if (NetworkService::IsManaged()) { - // network_manager = `VBox ( - // `Left ( - // `Label ( - // sformat( - // // TRANSLATORS: an informative text in a popup dialog, more newlines are allowed - // // %1 is the 'any' string (by default) - // // %2 is the name of the EXT zone (by default) - // _("You are currently using NetworkManager. -//You need to have a string '%1' in the zone '%2' -//to get a working configuration."), - // SuSEFirewall::special_all_interface_string, SuSEFirewall::GetZoneFullName(SuSEFirewall::special_all_interface_zone) - // ) - // ) - // ), - // `VSpacing(1) - // ); - //} - term dialog = `Frame ( // TRANSLATORS: frame label _("Additional Interface Settings for Zones"), `VBox ( `HStretch(), `VSpacing(1), - network_manager, user_defined_zones, `VSpacing(1), `VSpacing(1), - `HBox ( - `PushButton(`id("ok"), Label::OKButton()), - `PushButton(`id("cancel"), Label::CancelButton()) + `ButtonBox ( + `PushButton (`id ("ok"), `opt (`okButton, `default, `key_F10), Label::OKButton()), + `PushButton (`id ("cancel"), `opt (`cancelButton, `key_F9), Label::CancelButton()) ) ) ); @@ -307,17 +286,17 @@ // TRANSLATORS: label, %1 is a zone name like "External Zone" `Left ( `Label(sformat(_("Settings for Zone: %1"), zone_name)) ), // TRANSLATORS: text entry - `TextEntry(`id("additional_tcp"), _("&TCP Ports")), + `InputField (`id("additional_tcp"), `opt (`hstretch), _("&TCP Ports")), // TRANSLATORS: text entry - `TextEntry(`id("additional_udp"), _("&UDP Ports")), + `InputField (`id("additional_udp"), `opt (`hstretch), _("&UDP Ports")), // TRANSLATORS: text entry - `TextEntry(`id("additional_rpc"), _("&RPC Ports")), + `InputField (`id("additional_rpc"), `opt (`hstretch), _("&RPC Ports")), // TRANSLATORS: text entry - `TextEntry(`id("additional_ip"), _("&IP Protocols")), + `InputField (`id("additional_ip"), `opt (`hstretch), _("&IP Protocols")), `VSpacing(1), - `HBox ( - `PushButton(`id("ok"), Label::OKButton()), - `PushButton(`id("cancel"), Label::CancelButton()) + `ButtonBox ( + `PushButton(`id("ok"), `opt(`okButton, `key_F10, `default), Label::OKButton()), + `PushButton(`id("cancel"), `opt (`cancelButton, `key_F9), Label::CancelButton()) ) ) )) @@ -452,7 +431,7 @@ `item( `id("0/0"), "0/0") ]), // TRANSLATORS: text entry - `TextEntry (`id("add_requested_ip"), _("Re&quested IP")) + `InputField (`id("add_requested_ip"), `opt (`hstretch), _("Re&quested IP")) ), `VBox ( // TRANSLATORS: select box @@ -461,7 +440,7 @@ `item( `id("udp"), "UDP") ]), // TRANSLATORS: text entry - `TextEntry (`id("add_requested_port"), _("R&equested Port")) + `InputField (`id("add_requested_port"), `opt (`hstretch), _("R&equested Port")) ) ), `VSpacing(1), @@ -469,14 +448,14 @@ `Left( `Label(_("Redirection:")) ), `HBox ( // TRANSLATORS: text entry - `TextEntry (`id("add_redirectto_ip"), _("Re&direct to Masqueraded IP")), + `InputField (`id("add_redirectto_ip"), `opt (`hstretch), _("Re&direct to Masqueraded IP")), // TRANSLATORS: text entry - `TextEntry (`id("add_redirectto_port"), _("&Redirect to Port")) + `InputField (`id("add_redirectto_port"), `opt (`hstretch), _("&Redirect to Port")) ), `VSpacing(1), - `HBox ( - `PushButton(`id("ok"), Label::AddButton()), - `PushButton(`id("cancel"), Label::CancelButton()) + `ButtonBox ( + `PushButton (`id ("ok"), `opt (`okButton, `default, `key_F10), Label::AddButton()), + `PushButton (`id ("cancel"), `opt (`cancelButton, `key_F9), Label::CancelButton()) ) ) ); @@ -880,9 +859,9 @@ ) ), `VSpacing(1), - `HBox ( - `PushButton(`id("ok"), Label::OKButton()), - `PushButton(`id("cancel"), Label::CancelButton()) + `ButtonBox ( + `PushButton (`id ("ok"), `opt (`okButton, `default, `key_F10), Label::OKButton()), + `PushButton (`id ("cancel"), `opt (`cancelButton, `key_F9), Label::CancelButton()) ) ) ); @@ -942,22 +921,22 @@ `Frame ( _("Add New Allowing Rule"), `VBox ( - `TextEntry(`id("add_source_network"), _("Source &Network")), + `InputField (`id("add_source_network"), `opt (`hstretch), _("Source &Network")), `Left (`ComboBox (`id("add_protocol"), _("&Protocol"), [ `item( `id("tcp"), SuSEFirewall::GetProtocolTranslatedName("tcp")), `item( `id("udp"), SuSEFirewall::GetProtocolTranslatedName("udp")), `item( `id("_rpc_"), SuSEFirewall::GetProtocolTranslatedName("_rpc_")), ])), - `TextEntry (`id("add_destination_port"), _("&Destination Port (Optional)")), - `TextEntry (`id("add_source_port"), _("&Source Port (Optional)")) + `InputField (`id("add_destination_port"), `opt (`hstretch), _("&Destination Port (Optional)")), + `InputField (`id("add_source_port"), `opt (`hstretch), _("&Source Port (Optional)")) ) ), `VSpacing(1), - `HBox ( - `PushButton(`id("ok"), Label::AddButton()), - `PushButton(`id("cancel"), Label::CancelButton()) + `ButtonBox ( + `PushButton (`id ("ok"), `opt (`okButton, `default, `key_F10), Label::AddButton()), + `PushButton (`id ("cancel"), `opt (`cancelButton, `key_F9), Label::CancelButton()) ) ); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.17.1/src/SuSEFirewallCMDLine.ycp new/yast2-firewall-2.17.2/src/SuSEFirewallCMDLine.ycp --- old/yast2-firewall-2.17.1/src/SuSEFirewallCMDLine.ycp 2008-07-15 19:10:32.000000000 +0200 +++ new/yast2-firewall-2.17.2/src/SuSEFirewallCMDLine.ycp 2008-08-28 11:05:51.000000000 +0200 @@ -7,7 +7,7 @@ * Authors: Lukas Ocilka <locilka@suse.cz> * Internal * - * $Id: SuSEFirewallCMDLine.ycp 49130 2008-07-15 17:10:31Z locilka $ + * $Id: SuSEFirewallCMDLine.ycp 50387 2008-08-26 17:12:46Z kmachalkova $ */ { @@ -1025,7 +1025,7 @@ "example" : [ "services show detailed", "services set protect=yes zone=INT", - "services add service=dhcp-server zone=EXT", + "services add service=service:dhcp-server zone=EXT", "services remove ipprotocol=esp tcpport=12,13,ipp zone=DMZ", ], ], diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.17.1/src/uifunctions.ycp new/yast2-firewall-2.17.2/src/uifunctions.ycp --- old/yast2-firewall-2.17.1/src/uifunctions.ycp 2008-04-14 12:00:37.000000000 +0200 +++ new/yast2-firewall-2.17.2/src/uifunctions.ycp 2008-08-28 14:08:46.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Configuration dialogs handling functions * Authors: Lukas Ocilka <locilka@suse.cz> * - * $Id: uifunctions.ycp 46290 2008-04-09 13:40:57Z locilka $ + * $Id: uifunctions.ycp 50445 2008-08-28 12:08:46Z locilka $ * * Configuration dialogs handling. * Both Expert and Simple. @@ -1083,8 +1083,16 @@ void InitIPsecSupport (string key) { SetFirewallIcon(); - boolean supported = SuSEFirewall::IsServiceSupportedInZone("ipsec", "EXT"); - UI::ChangeWidget(`id("ispsec_support"), `Value, supported); + // FIXME: check whether such service exists + boolean supported = SuSEFirewall::IsServiceSupportedInZone("service:ipsec", "EXT"); + + if (supported == nil) { + y2error ("No such service 'service:ipsec'"); + UI::ChangeWidget(`id("ispsec_support"), `Enabled, false); + } else { + UI::ChangeWidget(`id("ispsec_support"), `Enabled, true); + UI::ChangeWidget(`id("ispsec_support"), `Value, supported); + } } symbol HandleIPsecSupport (string key, map event) { @@ -1504,10 +1512,9 @@ `HWeight (1, `InputField (`id (`port), `opt (`disabled), _("Po&rt"), "")) )), `VSpacing (1), - `HBox ( - `PushButton (`id (`ok), Label::AddButton()), - `VSpacing (1), - `PushButton (`id (`cancel), Label::CancelButton()) + `ButtonBox ( + `PushButton (`id (`ok), `opt (`okButton, `default, `key_F10), Label::AddButton()), + `PushButton (`id (`cancel), `opt (`cancelButton, `key_F9), Label::CancelButton()) ) ) ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.17.1/VERSION new/yast2-firewall-2.17.2/VERSION --- old/yast2-firewall-2.17.1/VERSION 2008-07-15 18:40:22.000000000 +0200 +++ new/yast2-firewall-2.17.2/VERSION 2008-08-28 14:08:37.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