Hello community,
here is the log from the commit of package yast2-network for openSUSE:Factory checked in at 2012-09-06 09:08:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-network (Old)
and /work/SRC/openSUSE:Factory/.yast2-network.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-network", Maintainer is "MFilka@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-network/yast2-network.changes 2012-08-23 15:32:59.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-network.new/yast2-network.changes 2012-09-06 09:08:30.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Aug 27 14:08:26 UTC 2012 - mfilka@suse.com
+
+- bnc#752464 - leak wireless passwords
+- 2.24.4
+
+-------------------------------------------------------------------
Old:
----
yast2-network-2.24.3.tar.bz2
New:
----
yast2-network-2.24.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.PRdoXf/_old 2012-09-06 09:08:32.000000000 +0200
+++ /var/tmp/diff_new_pack.PRdoXf/_new 2012-09-06 09:08:32.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-network
-Version: 2.24.3
+Version: 2.24.4
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-network-2.24.3.tar.bz2 -> yast2-network-2.24.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.24.3/VERSION new/yast2-network-2.24.4/VERSION
--- old/yast2-network-2.24.3/VERSION 2012-08-20 14:59:34.000000000 +0200
+++ new/yast2-network-2.24.4/VERSION 2012-09-05 15:05:42.000000000 +0200
@@ -1 +1 @@
-2.24.3
+2.24.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.24.3/configure new/yast2-network-2.24.4/configure
--- old/yast2-network-2.24.3/configure 2012-07-23 10:39:21.000000000 +0200
+++ new/yast2-network-2.24.4/configure 2012-09-03 09:55:48.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-network 2.24.1.
+# Generated by GNU Autoconf 2.68 for yast2-network 2.13.142.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-network'
PACKAGE_TARNAME='yast2-network'
-PACKAGE_VERSION='2.24.1'
-PACKAGE_STRING='yast2-network 2.24.1'
+PACKAGE_VERSION='2.13.142'
+PACKAGE_STRING='yast2-network 2.13.142'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1229,7 +1229,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-network 2.24.1 to adapt to many kinds of systems.
+\`configure' configures yast2-network 2.13.142 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1300,7 +1300,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-network 2.24.1:";;
+ short | recursive ) echo "Configuration of yast2-network 2.13.142:";;
esac
cat <<\_ACEOF
@@ -1380,7 +1380,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-network configure 2.24.1
+yast2-network configure 2.13.142
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1397,7 +1397,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-network $as_me 2.24.1, which was
+It was created by yast2-network $as_me 2.13.142, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2327,7 +2327,7 @@
# Define the identity of the package.
PACKAGE='yast2-network'
- VERSION='2.24.1'
+ VERSION='2.13.142'
cat >>confdefs.h <<_ACEOF
@@ -2449,9 +2449,9 @@
-VERSION="2.24.1"
+VERSION="2.13.142"
RPMNAME="yast2-network"
-MAINTAINER="Martin Vidner "
+MAINTAINER="Michal Zugec "
pkgconfigdir=\${libdir}/pkgconfig
pkgconfigdatadir=\${datadir}/pkgconfig
@@ -3379,7 +3379,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-network $as_me 2.24.1, which was
+This file was extended by yast2-network $as_me 2.13.142, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3432,7 +3432,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-network config.status 2.24.1
+yast2-network config.status 2.13.142
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-network-2.24.3/configure.in new/yast2-network-2.24.4/configure.in
--- old/yast2-network-2.24.3/configure.in 2012-07-23 10:39:18.000000000 +0200
+++ new/yast2-network-2.24.4/configure.in 2012-09-03 09:55:45.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.23.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-network, 2.24.1, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.13.142, http://bugs.opensuse.org/, yast2-network)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,9 +18,9 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.24.1"
+VERSION="2.13.142"
RPMNAME="yast2-network"
-MAINTAINER="Martin Vidner "
+MAINTAINER="Michal Zugec "
dnl pkgconfig honors lib64
pkgconfigdir=\${libdir}/pkgconfig
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.24.3/src/modules/LanItems.ycp new/yast2-network-2.24.4/src/modules/LanItems.ycp
--- old/yast2-network-2.24.3/src/modules/LanItems.ycp 2012-08-20 14:59:34.000000000 +0200
+++ new/yast2-network-2.24.4/src/modules/LanItems.ycp 2012-09-05 15:05:43.000000000 +0200
@@ -1055,8 +1055,6 @@
"WIRELESS_KEY_3": "",
"WIRELESS_DEFAULT_KEY": "0",
"WIRELESS_NICK": "",
- "WIRELESS_WPA_IDENTITY": "",
- "WIRELESS_WPA_PASSWORD": "",
"WIRELESS_CLIENT_CERT": "",
"WIRELESS_CA_CERT": "",
"WIRELESS_CHANNEL": "",
@@ -1161,153 +1159,157 @@
*/
global define boolean Commit() {
if(operation == `add || operation == `edit) {
- map newdev = $[];
+ map newdev = $[];
- // #104494 - always write IPADDR+NETMASK, even empty
- newdev["IPADDR"] = ipaddr;
- if(size(prefix)>0) newdev["PREFIXLEN"] = prefix;
- else newdev["NETMASK"] = netmask;
- // #50955 omit computable fields
- newdev["BROADCAST"] = "";
- newdev["NETWORK"] = "";
-
- newdev["REMOTE_IPADDR"] = remoteip;
- if (qeth_layer2) newdev["LLADDR"] = qeth_macaddress;
-
- if(alias == "") {
- newdev["MTU"] = mtu;
- newdev["ETHTOOL_OPTIONS"] = ethtool_options;
- newdev["STARTMODE"] = startmode;
- // it is not in Select yet because we don't have a widget for it
- if (startmode == "ifplugd")
- {
-/*
- string prio = ifplugd_priorities[type]:"";
- newdev["IFPLUGD_PRIORITY"] = prio;
-*/
- if (ifplugd_priority!=nil)
- newdev["IFPLUGD_PRIORITY"] = ifplugd_priority;
- else
- newdev["IFPLUGD_PRIORITY"] = ifplugd_priorities[type]:"0";
- } // else if (haskey(newdev, "IFPLUGD_PRIORITY"))newdev = remove(newdev, "IFPLUGD_PRIORITY");
- newdev["USERCONTROL"] = usercontrol? "yes": "no";
- newdev["BOOTPROTO"] = bootproto;
- }
- newdev["NAME"] = description;
+ // #104494 - always write IPADDR+NETMASK, even empty
+ newdev["IPADDR"] = ipaddr;
+ if(size(prefix)>0) newdev["PREFIXLEN"] = prefix;
+ else newdev["NETMASK"] = netmask;
+ // #50955 omit computable fields
+ newdev["BROADCAST"] = "";
+ newdev["NETWORK"] = "";
+
+ newdev["REMOTE_IPADDR"] = remoteip;
+ if (qeth_layer2) newdev["LLADDR"] = qeth_macaddress;
+
+ if(alias == "") {
+ newdev["MTU"] = mtu;
+ newdev["ETHTOOL_OPTIONS"] = ethtool_options;
+ newdev["STARTMODE"] = startmode;
+ // it is not in Select yet because we don't have a widget for it
+ if (startmode == "ifplugd")
+ {
+ /*
+ string prio = ifplugd_priorities[type]:"";
+ newdev["IFPLUGD_PRIORITY"] = prio;
+ */
+ if (ifplugd_priority!=nil)
+ newdev["IFPLUGD_PRIORITY"] = ifplugd_priority;
+ else
+ newdev["IFPLUGD_PRIORITY"] = ifplugd_priorities[type]:"0";
+ } // else if (haskey(newdev, "IFPLUGD_PRIORITY"))newdev = remove(newdev, "IFPLUGD_PRIORITY");
+ newdev["USERCONTROL"] = usercontrol? "yes": "no";
+ newdev["BOOTPROTO"] = bootproto;
+ }
+ newdev["NAME"] = description;
- if(hotplug == "pcmcia") newdev["DHCLIENT_SET_DOWN_LINK"] = "yes";
+ if(hotplug == "pcmcia") newdev["DHCLIENT_SET_DOWN_LINK"] = "yes";
- if (type == "bond")
- {
+ if (type == "bond")
+ {
integer i = 0;
foreach (string slave, bond_slaves,
- {
- newdev[sformat("BONDING_SLAVE%1", i)] = slave;
- i = i + 1;
- });
+ {
+ newdev[sformat("BONDING_SLAVE%1", i)] = slave;
+ i = i + 1;
+ });
//assign nil to rest BONDING_SLAVEn to remove them
while (i < MAX_BOND_SLAVE)
{
- newdev[sformat("BONDING_SLAVE%1", i)] = nil;
- i = i + 1;
+ newdev[sformat("BONDING_SLAVE%1", i)] = nil;
+ i = i + 1;
};
newdev["BONDING_MODULE_OPTS"] = bond_option;
//BONDING_MASTER always is yes
newdev["BONDING_MASTER"] = "yes";
- }
-
- if (type=="vlan"){
- newdev["ETHERDEVICE"]=vlan_etherdevice;
- newdev["VLAN_ID"]=vlan_id;
- }
- if (type=="br"){
- newdev["BRIDGE_PORTS"]=bridge_ports;
- newdev["BRIDGE"]="yes";
- newdev["BRIDGE_STP"]="off";
- newdev["BRIDGE_FORWARDDELAY"]="0";
- }
+ }
- if(type == "wlan") {
- newdev["WIRELESS_MODE"] = wl_mode;
- newdev["WIRELESS_ESSID"] = wl_essid;
- newdev["WIRELESS_NWID"] = wl_nwid;
- newdev["WIRELESS_AUTH_MODE"] = wl_auth_mode;
- newdev["WIRELESS_WPA_PSK"] = wl_wpa_psk;
- newdev["WIRELESS_KEY_LENGTH"] = wl_key_length;
- // obsoleted by WIRELESS_KEY_0
- newdev["WIRELESS_KEY"] = ""; // TODO: delete the varlable
- newdev["WIRELESS_KEY_0"] = wl_key[0]:"";
- newdev["WIRELESS_KEY_1"] = wl_key[1]:"";
- newdev["WIRELESS_KEY_2"] = wl_key[2]:"";
- newdev["WIRELESS_KEY_3"] = wl_key[3]:"";
- newdev["WIRELESS_DEFAULT_KEY"] = tostring (wl_default_key);
- newdev["WIRELESS_NICK"] = wl_nick;
- newdev["WIRELESS_AP_SCANMODE"] = wl_ap_scanmode;
+ if (type=="vlan"){
+ newdev["ETHERDEVICE"]=vlan_etherdevice;
+ newdev["VLAN_ID"]=vlan_id;
+ }
+ if (type=="br"){
+ newdev["BRIDGE_PORTS"]=bridge_ports;
+ newdev["BRIDGE"]="yes";
+ newdev["BRIDGE_STP"]="off";
+ newdev["BRIDGE_FORWARDDELAY"]="0";
+ }
+
+ if(type == "wlan") {
+ newdev["WIRELESS_MODE"] = wl_mode;
+ newdev["WIRELESS_ESSID"] = wl_essid;
+ newdev["WIRELESS_NWID"] = wl_nwid;
+ newdev["WIRELESS_AUTH_MODE"] = wl_auth_mode;
+ newdev["WIRELESS_WPA_PSK"] = wl_wpa_psk;
+ newdev["WIRELESS_KEY_LENGTH"] = wl_key_length;
+ // obsoleted by WIRELESS_KEY_0
+ newdev["WIRELESS_KEY"] = ""; // TODO: delete the varlable
+ newdev["WIRELESS_KEY_0"] = wl_key[0]:"";
+ newdev["WIRELESS_KEY_1"] = wl_key[1]:"";
+ newdev["WIRELESS_KEY_2"] = wl_key[2]:"";
+ newdev["WIRELESS_KEY_3"] = wl_key[3]:"";
+ newdev["WIRELESS_DEFAULT_KEY"] = tostring (wl_default_key);
+ newdev["WIRELESS_NICK"] = wl_nick;
+ newdev["WIRELESS_AP_SCANMODE"] = wl_ap_scanmode;
- if (wl_wpa_eap != $[])
- {
- newdev["WIRELESS_EAP_MODE"] = wl_wpa_eap["WPA_EAP_MODE"]:"";
- newdev["WIRELESS_WPA_IDENTITY"] = wl_wpa_eap["WPA_EAP_IDENTITY"]:"";
- newdev["WIRELESS_WPA_PASSWORD"] = wl_wpa_eap["WPA_EAP_PASSWORD"]:"";
- newdev["WIRELESS_WPA_ANONID"] = wl_wpa_eap["WPA_EAP_ANONID"]:"";
- newdev["WIRELESS_CLIENT_CERT"] = wl_wpa_eap["WPA_EAP_CLIENT_CERT"]:"";
- newdev["WIRELESS_CLIENT_KEY"] = wl_wpa_eap["WPA_EAP_CLIENT_KEY"]:"";
- newdev["WIRELESS_CLIENT_KEY_PASSWORD"] = wl_wpa_eap["WPA_EAP_CLIENT_KEY_PASSWORD"]:"";
- newdev["WIRELESS_CA_CERT"] = wl_wpa_eap["WPA_EAP_CA_CERT"]:"";
- newdev["WIRELESS_EAP_AUTH"] = wl_wpa_eap["WPA_EAP_AUTH"]:"";
- newdev["WIRELESS_PEAP_VERSION"] = wl_wpa_eap["WPA_EAP_PEAP_VERSION"]:"";
- }
-
- newdev["WIRELESS_CHANNEL"] = wl_channel;
- newdev["WIRELESS_FREQUENCY"] = wl_frequency;
- newdev["WIRELESS_BITRATE"] = wl_bitrate;
- newdev["WIRELESS_AP"] = wl_accesspoint;
- newdev["WIRELESS_POWER"] = wl_power ? "yes" : "no";
- }
-
- if(DriverType (type) == "ctc")
- if(NetworkConfig::Config["WAIT_FOR_INTERFACES"]:nil == nil || NetworkConfig::Config["WAIT_FOR_INTERFACES"]:0 < 40)
- NetworkConfig::Config["WAIT_FOR_INTERFACES"] = 40;
-
- if(alias == "") {
- newdev["_aliases"] = aliases;
- y2milestone("aliases %1", aliases);
- }
- if (contains(["tun", "tap"], type)){
- newdev=$[
- "BOOTPROTO" : "static",
- "STARTMODE" : "auto",
- "TUNNEL" : type,
- "TUNNEL_SET_PERSISTENT" : tunnel_set_persistent ? "yes" : "no",
- "TUNNEL_SET_OWNER" : tunnel_set_owner,
- "TUNNEL_SET_GROUP" : tunnel_set_group
- ];
- }
-
- // L3: bnc#585458
- // FIXME: INTERFACETYPE confuses sysconfig, bnc#458412
- // Only test when newdev has enough info for GetTypeFromIfcfg to work.
+ if (wl_wpa_eap != $[])
+ {
+ newdev["WIRELESS_EAP_MODE"] = wl_wpa_eap["WPA_EAP_MODE"]:"";
+ newdev["WIRELESS_WPA_IDENTITY"] = wl_wpa_eap["WPA_EAP_IDENTITY"]:"";
+ newdev["WIRELESS_WPA_PASSWORD"] = wl_wpa_eap["WPA_EAP_PASSWORD"]:"";
+ newdev["WIRELESS_WPA_ANONID"] = wl_wpa_eap["WPA_EAP_ANONID"]:"";
+ newdev["WIRELESS_CLIENT_CERT"] = wl_wpa_eap["WPA_EAP_CLIENT_CERT"]:"";
+ newdev["WIRELESS_CLIENT_KEY"] = wl_wpa_eap["WPA_EAP_CLIENT_KEY"]:"";
+ newdev["WIRELESS_CLIENT_KEY_PASSWORD"] = wl_wpa_eap["WPA_EAP_CLIENT_KEY_PASSWORD"]:"";
+ newdev["WIRELESS_CA_CERT"] = wl_wpa_eap["WPA_EAP_CA_CERT"]:"";
+ newdev["WIRELESS_EAP_AUTH"] = wl_wpa_eap["WPA_EAP_AUTH"]:"";
+ newdev["WIRELESS_PEAP_VERSION"] = wl_wpa_eap["WPA_EAP_PEAP_VERSION"]:"";
+ }
+
+ newdev["WIRELESS_CHANNEL"] = wl_channel;
+ newdev["WIRELESS_FREQUENCY"] = wl_frequency;
+ newdev["WIRELESS_BITRATE"] = wl_bitrate;
+ newdev["WIRELESS_AP"] = wl_accesspoint;
+ newdev["WIRELESS_POWER"] = wl_power ? "yes" : "no";
+ }
+
+ if(DriverType (type) == "ctc")
+ if(NetworkConfig::Config["WAIT_FOR_INTERFACES"]:nil == nil || NetworkConfig::Config["WAIT_FOR_INTERFACES"]:0 < 40)
+ NetworkConfig::Config["WAIT_FOR_INTERFACES"] = 40;
+
+ if(alias == "") {
+ newdev["_aliases"] = aliases;
+ y2milestone("aliases %1", aliases);
+ }
+ if (contains(["tun", "tap"], type)){
+ newdev=$[
+ "BOOTPROTO" : "static",
+ "STARTMODE" : "auto",
+ "TUNNEL" : type,
+ "TUNNEL_SET_PERSISTENT" : tunnel_set_persistent ? "yes" : "no",
+ "TUNNEL_SET_OWNER" : tunnel_set_owner,
+ "TUNNEL_SET_GROUP" : tunnel_set_group
+ ];
+ }
+
+ // L3: bnc#585458
+ // FIXME: INTERFACETYPE confuses sysconfig, bnc#458412
+ // Only test when newdev has enough info for GetTypeFromIfcfg to work.
string implied_type = NetworkInterfaces::GetTypeFromIfcfg(newdev);
if (implied_type != nil && implied_type != type) {
- newdev["INTERFACETYPE"]=type;
- }
+ newdev["INTERFACETYPE"]=type;
+ }
- NetworkInterfaces::Name = Items[current, "ifcfg"]:"";
- NetworkInterfaces::Current = newdev;
-y2internal("%1", newdev);
- if (!NetworkInterfaces::Commit()) Items[current, "ifcfg"]="";
+ NetworkInterfaces::Name = Items[current, "ifcfg"]:"";
+ NetworkInterfaces::Current = newdev;
+
+ // bnc#752464 - can leak wireless passwords
+ // useful only for debugging. Writes huge struct mostly filled by defaults.
+ y2debug("%1", NetworkInterfaces::ConcealSecrets1( newdev) );
+
+ if (!NetworkInterfaces::Commit()) Items[current, "ifcfg"]="";
}
else {
- y2error("Unknown operation: %1", operation);
- return false;
+ y2error("Unknown operation: %1", operation);
+ return false;
}
- modified = true;
- operation = nil;
- return true;
+ modified = true;
+ operation = nil;
+ return true;
}
global boolean Rollback(){
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org