Hello community, here is the log from the commit of package yast2-firewall checked in at Fri May 18 15:15:06 CEST 2007. -------- --- yast2-firewall/yast2-firewall.changes 2007-04-04 10:29:14.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-firewall/yast2-firewall.changes 2007-05-18 10:44:16.000000000 +0200 @@ -1,0 +2,15 @@ +Wed May 16 12:09:01 CEST 2007 - locilka@suse.cz + +- Opening "service:sshd" (defined by package) instead "ssh" in the + firewall proposal and "service:xorg-x11-Xvnc" instead of "vnc" + (#274761) +- Disabling "ssh" by one-click-feature in the firewall proposal + disables both "service:sshd" and "ssh" port if added manually. +- 2.15.6 + +------------------------------------------------------------------- +Wed May 9 11:02:55 CEST 2007 - locilka@suse.cz + +- Fixed typo (#270965). + +------------------------------------------------------------------- Old: ---- yast2-firewall-2.15.5.tar.bz2 New: ---- yast2-firewall-2.15.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-firewall.spec ++++++ --- /var/tmp/diff_new_pack.i32088/_old 2007-05-18 15:14:16.000000000 +0200 +++ /var/tmp/diff_new_pack.i32088/_new 2007-05-18 15:14:16.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-firewall (Version 2.15.5) +# spec file for package yast2-firewall (Version 2.15.6) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-firewall -Version: 2.15.5 +Version: 2.15.6 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-firewall-2.15.5.tar.bz2 +Source0: yast2-firewall-2.15.6.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite # SuSEFirewallExpertRules::DeleteRuleID() @@ -41,7 +41,7 @@ Lukas Ocilka <locilka@suse.de> %prep -%setup -n yast2-firewall-2.15.5 +%setup -n yast2-firewall-2.15.6 %build %{prefix}/bin/y2tool y2autoconf @@ -75,6 +75,15 @@ %doc %{prefix}/share/doc/packages/yast2-firewall %changelog +* Wed May 16 2007 - locilka@suse.cz +- Opening "service:sshd" (defined by package) instead "ssh" in the + firewall proposal and "service:xorg-x11-Xvnc" instead of "vnc" + (#274761) +- Disabling "ssh" by one-click-feature in the firewall proposal + disables both "service:sshd" and "ssh" port if added manually. +- 2.15.6 +* Wed May 09 2007 - locilka@suse.cz +- Fixed typo (#270965). * Wed Apr 04 2007 - locilka@suse.cz - A brand new and better revolutionary solution has been worked out for a firewall service starting/stopping and enabling/disabling ++++++ yast2-firewall-2.15.5.tar.bz2 -> yast2-firewall-2.15.6.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.15.5/configure new/yast2-firewall-2.15.6/configure --- old/yast2-firewall-2.15.5/configure 2007-02-27 12:46:33.000000000 +0100 +++ new/yast2-firewall-2.15.6/configure 2007-05-18 12:56:18.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-firewall 2.15.1. +# Generated by GNU Autoconf 2.60 for yast2-firewall 2.15.6. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-firewall' PACKAGE_TARNAME='yast2-firewall' -PACKAGE_VERSION='2.15.1' -PACKAGE_STRING='yast2-firewall 2.15.1' +PACKAGE_VERSION='2.15.6' +PACKAGE_STRING='yast2-firewall 2.15.6' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1181,7 +1181,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.15.1 to adapt to many kinds of systems. +\`configure' configures yast2-firewall 2.15.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1252,7 +1252,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-firewall 2.15.1:";; + short | recursive ) echo "Configuration of yast2-firewall 2.15.6:";; esac cat <<\_ACEOF @@ -1330,7 +1330,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-firewall configure 2.15.1 +yast2-firewall configure 2.15.6 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1344,7 +1344,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.15.1, which was +It was created by yast2-firewall $as_me 2.15.6, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2145,7 +2145,7 @@ # Define the identity of the package. PACKAGE='yast2-firewall' - VERSION='2.15.1' + VERSION='2.15.6' cat >>confdefs.h <<_ACEOF @@ -2372,7 +2372,7 @@ -VERSION="2.15.1" +VERSION="2.15.6" RPMNAME="yast2-firewall" MAINTAINER="Lukas Ocilka <locilka@suse.cz>" @@ -3258,7 +3258,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.15.1, which was +This file was extended by yast2-firewall $as_me 2.15.6, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3301,7 +3301,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-firewall config.status 2.15.1 +yast2-firewall config.status 2.15.6 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.15.5/configure.in new/yast2-firewall-2.15.6/configure.in --- old/yast2-firewall-2.15.5/configure.in 2007-02-27 12:46:28.000000000 +0100 +++ new/yast2-firewall-2.15.6/configure.in 2007-05-18 12:56:13.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-firewall dnl -dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.15.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-firewall, 2.15.1, http://bugs.opensuse.org/, yast2-firewall) +AC_INIT(yast2-firewall, 2.15.6, http://bugs.opensuse.org/, yast2-firewall) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.15.1" +VERSION="2.15.6" RPMNAME="yast2-firewall" MAINTAINER="Lukas Ocilka <locilka@suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.15.5/src/dialogs.ycp new/yast2-firewall-2.15.6/src/dialogs.ycp --- old/yast2-firewall-2.15.5/src/dialogs.ycp 2007-04-04 10:31:09.000000000 +0200 +++ new/yast2-firewall-2.15.6/src/dialogs.ycp 2007-05-18 10:44:16.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Configuration dialogs and workflow * Authors: Lukas Ocilka <locilka@suse.cz> * - * $Id: dialogs.ycp 37297 2007-04-04 08:31:07Z locilka $ + * $Id: dialogs.ycp 37865 2007-05-09 09:03:28Z locilka $ * * Configuration dialogs and workflow. * Both Expert and Simple. @@ -277,7 +277,8 @@ firewall_caption + ": " + _("Summary"), BoxSummary(), HelpForDialog("box-summary"), - Label::BackButton (), Label::AcceptButton () + Label::BackButton (), + (Mode::normal() ? Label::FinishButton() : Label::AcceptButton ()) ); SetFirewallIcon(); UI::ChangeWidget(`id(`back), `Enabled, true); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.15.5/src/firewall_proposal.ycp new/yast2-firewall-2.15.6/src/firewall_proposal.ycp --- old/yast2-firewall-2.15.5/src/firewall_proposal.ycp 2007-02-28 17:15:18.000000000 +0100 +++ new/yast2-firewall-2.15.6/src/firewall_proposal.ycp 2007-05-18 13:33:13.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Firewall configuration proposal * Authors: Lukas Ocilka <locilka@suse.cz> * - * $Id: firewall_proposal.ycp 36585 2007-02-28 15:47:34Z locilka $ + * $Id: firewall_proposal.ycp 38039 2007-05-18 11:33:13Z locilka $ */ { @@ -17,6 +17,7 @@ y2milestone("Arguments: %1", WFM::Args()); import "SuSEFirewall"; +import "SuSEFirewallServices"; import "SuSEFirewallProposal"; import "Popup"; import "Progress"; @@ -124,28 +125,48 @@ // Enable SSH service } else if (chosen_id == "firewall--enable_ssh_in_proposal") { y2milestone("SSH enabled by a single-click"); - SuSEFirewallProposal::OpenServiceOnNonDialUpInterfaces("ssh"); + + if (SuSEFirewallServices::IsKnownService("service:sshd")) { + y2milestone ("Service 'service:sshd' is known"); + SuSEFirewallProposal::OpenServiceOnNonDialUpInterfaces("service:sshd"); + } else if (SuSEFirewallServices::IsKnownService("ssh")) { + y2warning ("Only service 'ssh' is known"); + SuSEFirewallProposal::OpenServiceOnNonDialUpInterfaces("ssh"); + } + ret = $[ "workflow_sequence" : `next ]; SuSEFirewallProposal::SetChangedByUser(true); // Disable SSH service } else if (chosen_id == "firewall--disable_ssh_in_proposal") { y2milestone("SSH disabled by a single-click"); - SuSEFirewall::SetServicesForZones (["ssh"], SuSEFirewall::GetKnownFirewallZones(), false); + // new service definition + if (SuSEFirewallServices::IsKnownService("service:sshd")) + SuSEFirewall::SetServicesForZones (["service:sshd"], SuSEFirewall::GetKnownFirewallZones(), false); + // old service definition + if (SuSEFirewallServices::IsKnownService("ssh")) + SuSEFirewall::SetServicesForZones (["ssh"], SuSEFirewall::GetKnownFirewallZones(), false); + + // SSH might be also defined by a port, not only using a service:sshd + foreach (string zone, SuSEFirewall::GetKnownFirewallZones(), { + if (SuSEFirewall::HaveService("ssh", "TCP", zone)) + SuSEFirewall::RemoveService("ssh", "TCP", zone); + }); + ret = $[ "workflow_sequence" : `next ]; SuSEFirewallProposal::SetChangedByUser(true); // Enable VNC service } else if (chosen_id == "firewall--enable_vnc_in_proposal") { y2milestone("VNC enabled by a single-click"); - SuSEFirewallProposal::OpenServiceOnNonDialUpInterfaces("vnc"); + SuSEFirewallProposal::OpenServiceOnNonDialUpInterfaces("service:xorg-x11-Xvnc"); ret = $[ "workflow_sequence" : `next ]; SuSEFirewallProposal::SetChangedByUser(true); // Disable VNC service } else if (chosen_id == "firewall--disable_vnc_in_proposal") { y2milestone("VNC disabled by a single-click"); - SuSEFirewall::SetServicesForZones (["vnc"], SuSEFirewall::GetKnownFirewallZones(), false); + SuSEFirewall::SetServicesForZones (["service:xorg-x11-Xvnc"], SuSEFirewall::GetKnownFirewallZones(), false); ret = $[ "workflow_sequence" : `next ]; SuSEFirewallProposal::SetChangedByUser(true); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.15.5/src/helps.ycp new/yast2-firewall-2.15.6/src/helps.ycp --- old/yast2-firewall-2.15.5/src/helps.ycp 2007-02-27 14:30:52.000000000 +0100 +++ new/yast2-firewall-2.15.6/src/helps.ycp 2007-05-18 10:44:16.000000000 +0200 @@ -6,7 +6,7 @@ * Summary: Firewall dialogs helps * Authors: Lukas Ocilka <locilka@suse.cz> * - * $Id: helps.ycp 36538 2007-02-27 13:30:50Z locilka $ + * $Id: helps.ycp 37865 2007-05-09 09:03:28Z locilka $ * * File includes helps for yast2-firewall dialogs. */ @@ -186,7 +186,7 @@ // TRANSLATORS: general help for Custom Rules 1/5 "custom-rules" : _("<p><b><big>Custom Rules</big></b><br> -Here yoy can set special firewall rules that allow new connections +Here you can set special firewall rules that allow new connections matching these rules.<p>") + // TRANSLATORS: general help for Custom Rules 2/5 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.15.5/VERSION new/yast2-firewall-2.15.6/VERSION --- old/yast2-firewall-2.15.5/VERSION 2007-04-04 10:30:52.000000000 +0200 +++ new/yast2-firewall-2.15.6/VERSION 2007-05-18 10:44:16.000000000 +0200 @@ -1 +1 @@ -2.15.5 +2.15.6 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org