Author: mvidner Date: Fri Jan 6 15:09:16 2012 New Revision: 67122 URL: http://svn.opensuse.org/viewcvs/yast?rev=67122&view=rev Log: - Relicensed ConfigHistory from GPL-2.0 to GPL-2.0+ to match the rest of the package (bnc#728950). - forbid appending to IPADDR additional suffix if there is already one. Original name have preference (bnc#735109). svn merge -r66768:67121 http://svn.opensuse.org/svn/yast/branches/SuSE-Code-11-SP2-Branch/yast2 Modified: trunk/yast2/ (props changed) trunk/yast2/VERSION trunk/yast2/library/modules/ConfigHistory.ycp trunk/yast2/library/network/src/NetworkInterfaces.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=67122&r1=67121&r2=67122&view=diff ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Fri Jan 6 15:09:16 2012 @@ -1 +1 @@ -2.22.1 +2.22.2 Modified: trunk/yast2/library/modules/ConfigHistory.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/modules/ConfigHistory.ycp?rev=67122&r1=67121&r2=67122&view=diff ============================================================================== --- trunk/yast2/library/modules/ConfigHistory.ycp (original) +++ trunk/yast2/library/modules/ConfigHistory.ycp Fri Jan 6 15:09:16 2012 @@ -3,8 +3,9 @@ * * * This program is free software; you can redistribute it and/or modify it under - * the terms of version 2 of the GNU General Public License as published by the - * Free Software Foundation. + * the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. * * This program is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS Modified: trunk/yast2/library/network/src/NetworkInterfaces.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/NetworkInterfaces.ycp?rev=67122&r1=67121&r2=67122&view=diff ============================================================================== --- trunk/yast2/library/network/src/NetworkInterfaces.ycp (original) +++ trunk/yast2/library/network/src/NetworkInterfaces.ycp Fri Jan 6 15:09:16 2012 @@ -759,19 +759,21 @@ string p = ".network.value.\"" + config + "\"."; - if (size(devmap["IPADDR"]:"")>0 && size(devmap["NETMASK"]:"")>0){ - devmap["IPADDR"] = sformat("%1/%2", devmap["IPADDR"]:"", Netmask::ToBits(devmap["NETMASK"]:"")); - devmap=remove(devmap, "NETMASK"); - //TODO : delete NETMASK from config file - } else { - if (size(devmap["IPADDR"]:"")>0 && size(devmap["PREFIXLEN"]:"")>0){ - devmap["IPADDR"] = sformat("%1/%2", devmap["IPADDR"]:"", devmap["PREFIXLEN"]:""); - devmap=remove(devmap, "PREFIXLEN"); - //TODO : delete PREFIXLEN from config file - } + if (size(devmap["IPADDR"]:"")>0 && find(devmap["IPADDR"]:"","/") == -1) + { + if (size(devmap["IPADDR"]:"")>0 && size(devmap["NETMASK"]:"")>0){ + devmap["IPADDR"] = sformat("%1/%2", devmap["IPADDR"]:"", Netmask::ToBits(devmap["NETMASK"]:"")); + devmap=remove(devmap, "NETMASK"); + //TODO : delete NETMASK from config file + } else { + if (size(devmap["IPADDR"]:"")>0 && size(devmap["PREFIXLEN"]:"")>0){ + devmap["IPADDR"] = sformat("%1/%2", devmap["IPADDR"]:"", devmap["PREFIXLEN"]:""); + devmap=remove(devmap, "PREFIXLEN"); + //TODO : delete PREFIXLEN from config file + } + } } - /* write all keys to config */ maplist(string k, (list<string>) Map::Keys(devmap), { /* Write aliases */ Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=67122&r1=67121&r2=67122&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Fri Jan 6 15:09:16 2012 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Fri Jan 6 15:06:00 CET 2012 - mvidner@suse.cz + +- Relicensed ConfigHistory from GPL-2.0 to GPL-2.0+ + to match the rest of the package (bnc#728950). +- 2.22.2 + +------------------------------------------------------------------- +Fri Jan 6 14:57:57 CET 2012 - jreidinger@suse.com + +- forbid appending to IPADDR additional suffix if there is already + one. Original name have preference (bnc#735109). + +------------------------------------------------------------------- Fri Jan 6 14:56:00 CET 2012 - mvidner@suse.cz - create user-unreadable ifcfg files without a race (bnc#713661, CVE-2011-3177) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org