Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at Tue Aug 2 14:14:11 CEST 2011.
-------- --- yast2/yast2.changes 2011-07-27 14:29:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2011-08-02 10:54:52.000000000 +0200 @@ -1,0 +2,14 @@ +Tue Aug 2 09:19:26 CEST 2011 - loci...@suse.cz + +- Fixed Get/SetBroadcastAllowedPorts in SuSEFirewall to keep + user-entered values instead of translating them magically into + list of ports (bnc#694782). +- 2.21.9 + +------------------------------------------------------------------- +Thu Jul 28 16:23:46 CEST 2011 - mvid...@suse.cz + +- Fixed NetworkInterfaces::GetTypeFromIfcfg to recognize bridges (bnc#704999). +- 2.21.8 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-2.21.7.tar.bz2 New: ---- yast2-2.21.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.yAR2hl/_old 2011-08-02 14:13:31.000000000 +0200 +++ /var/tmp/diff_new_pack.yAR2hl/_new 2011-08-02 14:13:31.000000000 +0200 @@ -19,11 +19,11 @@ Name: yast2 -Version: 2.21.7 +Version: 2.21.9 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.21.7.tar.bz2 +Source0: yast2-2.21.9.tar.bz2 Prefix: /usr @@ -130,7 +130,7 @@ installation with YaST2. %prep -%setup -n yast2-2.21.7 +%setup -n yast2-2.21.9 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-2.21.7.tar.bz2 -> yast2-2.21.9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.7/VERSION new/yast2-2.21.9/VERSION --- old/yast2-2.21.7/VERSION 2011-07-27 11:29:29.000000000 +0200 +++ new/yast2-2.21.9/VERSION 2011-08-02 09:29:54.000000000 +0200 @@ -1 +1 @@ -2.21.7 +2.21.9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.7/configure new/yast2-2.21.9/configure --- old/yast2-2.21.7/configure 2011-07-27 14:27:48.000000000 +0200 +++ new/yast2-2.21.9/configure 2011-08-02 10:53:11.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for yast2 2.21.7. +# Generated by GNU Autoconf 2.68 for yast2 2.21.9. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2' PACKAGE_TARNAME='yast2' -PACKAGE_VERSION='2.21.7' -PACKAGE_STRING='yast2 2.21.7' +PACKAGE_VERSION='2.21.9' +PACKAGE_STRING='yast2 2.21.9' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1232,7 +1232,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.21.7 to adapt to many kinds of systems. +\`configure' configures yast2 2.21.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1303,7 +1303,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2 2.21.7:";; + short | recursive ) echo "Configuration of yast2 2.21.9:";; esac cat <<\_ACEOF @@ -1383,7 +1383,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2 configure 2.21.7 +yast2 configure 2.21.9 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1400,7 +1400,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.21.7, which was +It was created by yast2 $as_me 2.21.9, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2330,7 +2330,7 @@ # Define the identity of the package. PACKAGE='yast2' - VERSION='2.21.7' + VERSION='2.21.9' cat >>confdefs.h <<_ACEOF @@ -2452,7 +2452,7 @@ -VERSION="2.21.7" +VERSION="2.21.9" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsr...@suse.cz>" @@ -3498,7 +3498,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.21.7, which was +This file was extended by yast2 $as_me 2.21.9, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3551,7 +3551,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2 config.status 2.21.7 +yast2 config.status 2.21.9 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.7/configure.in new/yast2-2.21.9/configure.in --- old/yast2-2.21.7/configure.in 2011-07-27 14:27:46.000000000 +0200 +++ new/yast2-2.21.9/configure.in 2011-08-02 10:53:08.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.21.7, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.21.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.21.7" +VERSION="2.21.9" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsr...@suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.7/library/modules/Assert.ycp new/yast2-2.21.9/library/modules/Assert.ycp --- old/yast2-2.21.7/library/modules/Assert.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-2.21.9/library/modules/Assert.ycp 2011-08-02 09:28:57.000000000 +0200 @@ -0,0 +1,36 @@ +/** + * File: Assert.ycp + * Summary: Assertions for test cases + * Authors: Martin Vidner <mvid...@suse.cz> + */ +{ +module "Assert"; + +/** + * @param expected expected value of test + * @param actual actual value of test + * @param fail_message will be logged if test fails + * @return whether test succeeds + */ +global boolean EqualMsg(any expected, any actual, string fail_message) { + if (expected == actual) { + return true; + } + else { + y2error ("%1", fail_message); + return false; + } +} + +/** + * @param expected expected value of test + * @param actual actual value of test + * @return whether test succeeds + */ +global boolean Equal(any expected, any actual) { + string fail_message = sformat ("assertion failure, expected '%1', got '%2'", expected, actual); + return EqualMsg(expected, actual, fail_message); +} + +/* EOF */ +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.7/library/modules/Version.ycp new/yast2-2.21.9/library/modules/Version.ycp --- old/yast2-2.21.7/library/modules/Version.ycp 2011-07-27 14:27:52.000000000 +0200 +++ new/yast2-2.21.9/library/modules/Version.ycp 2011-08-02 10:53:15.000000000 +0200 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.21.7"; +global string yast2 = "2.21.9"; /* EOF */ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.7/library/network/src/NetworkInterfaces.ycp new/yast2-2.21.9/library/network/src/NetworkInterfaces.ycp --- old/yast2-2.21.7/library/network/src/NetworkInterfaces.ycp 2011-07-25 11:29:38.000000000 +0200 +++ new/yast2-2.21.9/library/network/src/NetworkInterfaces.ycp 2011-08-02 09:28:57.000000000 +0200 @@ -182,10 +182,27 @@ list<string> TypeByKeyValue = [ "INTERFACETYPE", - "TUNNEL", ]; list<list<string> > TypeByKeyExistence = [ ["ETHERDEVICE", "vlan"], + ["WIRELESS_MODE", "wlan"], + ["MODEM_DEVICE", "ppp"], + ]; +list<list<string> > TypeByValueMatch = [ + ["BONDING_MASTER", "yes", "bond"], + ["BRIDGE", "yes", "br"], + ["WIRELESS", "yes", "wlan"], + ["TUNNEL", "tap", "tap"], + ["TUNNEL", "tun", "tun"], + ["TUNNEL", "sit", "sit"], + ["TUNNEL", "gre", "gre"], + ["TUNNEL", "ipip", "ipip"], + ["PPPMODE", "pppoe", "ppp"], + ["PPPMODE", "pppoatm", "ppp"], + ["PPPMODE", "capi-adsl", "ppp"], + ["PPPMODE", "pptp", "ppp"], + ["ENCAP", "syncppp", "isdn"], + ["ENCAP", "rawip", "isdn"], ]; /** @@ -193,6 +210,14 @@ */ global string GetTypeFromIfcfg(ifcfg_t ifcfg) { string type = nil; // unknown + foreach(list<string> key_type, TypeByValueMatch, { + string rule_key = key_type[0]:""; + string rule_value = key_type[1]:""; + string rule_type = key_type[2]:""; + if (ifcfg[rule_key]:"" == rule_value) { + type = rule_type; + } + }); foreach(list<string> key_type, TypeByKeyExistence, { string rule_key = key_type[0]:""; string rule_type = key_type[1]:""; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.7/library/network/src/SuSEFirewall.ycp new/yast2-2.21.9/library/network/src/SuSEFirewall.ycp --- old/yast2-2.21.7/library/network/src/SuSEFirewall.ycp 2011-07-25 11:29:38.000000000 +0200 +++ new/yast2-2.21.9/library/network/src/SuSEFirewall.ycp 2011-08-02 09:30:12.000000000 +0200 @@ -6,7 +6,7 @@ * Summary: Interface manipulation of /etc/sysconfig/SuSEFirewall * Authors: Lukas Ocilka <loci...@suse.cz> * - * $Id: SuSEFirewall.ycp 64931 2011-07-21 13:24:21Z locilka $ + * $Id: SuSEFirewall.ycp 65120 2011-08-02 07:30:11Z locilka $ * * Module for handling SuSEfirewall2. */ @@ -501,6 +501,12 @@ * "ZONE2" : [ "port3", "port4" ], * "ZONE3" : [ ] * ] + * or + * $[ + * "ZONE1" : [ "yes" ], // will work for all ports automatically + * "ZONE3" : [ ], + * "ZONE3" : [ ] + * ] */ global define map <string, list <string> > GetBroadcastAllowedPorts () { @@ -511,9 +517,9 @@ // no broadcast allowed for this zone if (broadcast == "no") { allowed_ports[zone] = []; - // all UDP port allowed in zone also allow broadcast + // BNC #694782: "yes" is automatically translated by SuSEfirewall2 } else if (broadcast == "yes") { - allowed_ports[zone] = GetAllowedServicesForZoneProto (zone, "UDP"); + allowed_ports[zone] = ["yes"]; // only listed ports allows broadcast } else { allowed_ports[zone] = splitstring(broadcast, " "); @@ -538,6 +544,9 @@ SetModified(); foreach (string zone, GetKnownFirewallZones(), { + if (broadcast[zone]:[] == []) + broadcast[zone] = ["no"]; + SetBroadcastConfiguration(zone, mergestring(broadcast[zone]:[], " ")); }); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.7/library/network/testsuite/tests/NetworkInterfaces5-Type.out new/yast2-2.21.9/library/network/testsuite/tests/NetworkInterfaces5-Type.out --- old/yast2-2.21.7/library/network/testsuite/tests/NetworkInterfaces5-Type.out 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-2.21.9/library/network/testsuite/tests/NetworkInterfaces5-Type.out 2011-08-02 09:28:57.000000000 +0200 @@ -0,0 +1,4 @@ +Dump NetworkInterfaces::GetTypeFromIfcfg +Return true +Return true +Return true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.7/library/network/testsuite/tests/NetworkInterfaces5-Type.ycp new/yast2-2.21.9/library/network/testsuite/tests/NetworkInterfaces5-Type.ycp --- old/yast2-2.21.7/library/network/testsuite/tests/NetworkInterfaces5-Type.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-2.21.9/library/network/testsuite/tests/NetworkInterfaces5-Type.ycp 2011-08-02 09:28:57.000000000 +0200 @@ -0,0 +1,40 @@ +// bnc#704999 +{ + +include "testsuite.ycp"; +import "Assert"; +import "NetworkInterfaces"; + +typedef map<string, any> ifcfg_t; + +ifcfg_t mybond = $[ + "BOOTPROTO": "dhcp", + "BONDING_MASTER": "yes", + "BONDING_SLAVE_0": "eth0", + "BONDING_SLAVE_1": "eth1", +]; + +ifcfg_t mybridged = $[ + "BOOTPROTO": "dhcp", + "BRIDGE": "yes", + "BRIDGE_PORTS": "eth0 tap0", +]; + +ifcfg_t myvirt = $[ + "BOOTPROTO": "static", + "TUNNEL": "tap", +]; + +DUMP("NetworkInterfaces::GetTypeFromIfcfg"); +TEST(``( + Assert::Equal("bond", NetworkInterfaces::GetTypeFromIfcfg(mybond)) + ), [], nil); +TEST(``( + Assert::Equal("br", NetworkInterfaces::GetTypeFromIfcfg(mybridged)) + ), [], nil); +TEST(``( + Assert::Equal("tap", NetworkInterfaces::GetTypeFromIfcfg(myvirt)) + ), [], nil); + +/*EOF*/ +} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org