rpms
/
NetworkManager
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fix applet crash on 64-bit platforms when choosing "Connect to other 

wireless network..." (gnome.org #435036)
- Add debug output for ethernet device link changes
This commit is contained in:
Daniel Williams 2007-06-10 17:26:11 +00:00
parent 63b6aaf3c5
commit 4e55f6caaf
3 changed files with 88 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
NetworkManager.spec
View File

@ -11,7 +11,7 @@ Name: NetworkManager
Summary: Network connection manager and user applications
Epoch: 1
Version: 0.6.5
Release: 5%{?dist}
Release: 6%{?dist}
Group: System Environment/Base
License: GPL
URL: http://www.gnome.org/projects/NetworkManager/
@ -22,6 +22,8 @@ Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
Patch2: NetworkManager-0.6.5-fix-ethernet-link-detection.patch
Patch3: NetworkManager-0.6.5-wait-for-wireless.patch
Patch4: network-manager-applet-0.6.5-fix-eap-key-request.patch
Patch5: network-manager-applet-0.6.5-wso-eap-64bit-fix.patch
Patch6: linkdebug.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
PreReq: chkconfig
@ -122,11 +124,13 @@ NetworkManager functionality from applications that use glib.
%patch0 -p1 -b .startup-dhcdbd
%patch2 -p0 -b .fix-ethernet-link-detection
%patch3 -p0 -b .wait-for-wireless
%patch6 -p1 -b .linkdebug
# unpack the applet
tar -xjf %{SOURCE1}
%patch1 -p1 -b .buildfix
%patch4 -p1 -b .fix-eap-key-request
%patch5 -p1 -b .wso-eap-64bit-fix
%build
# Even though we don't require named, we still build with it
@ -251,6 +255,11 @@ fi
%changelog
* Sun Jun 10 2007 Dan Williams <dcbw@redhat.com> 1:0.6.5-5
- Fix applet crash on 64-bit platforms when choosing
"Connect to other wireless network..." (gnome.org #435036)
- Add debug output for ethernet device link changes
* Thu Jun 7 2007 Dan Williams <dcbw@redhat.com> 1:0.6.5-5
- Fix ethernet link detection (gnome #354565, rh #194124)
- Fix perpetual credentials request with private key passwords in the applet

53
linkdebug.patch Normal file
View File

@ -0,0 +1,53 @@
--- NetworkManager-0.6.5/src/nm-netlink-monitor.c.linkdebug 2007-06-10 13:07:22.000000000 -0400
+++ NetworkManager-0.6.5/src/nm-netlink-monitor.c 2007-06-10 13:12:07.000000000 -0400
@@ -721,6 +721,7 @@
if ((dev = nm_get_device_by_iface_locked (monitor->priv->app_data, iface)))
{
+nm_info ("%s - %s (%d) netlink reports device %s link now %d", __FILE__, __func__, __LINE__, iface, is_connected);
if (is_connected) {
g_signal_emit (G_OBJECT (monitor),
nm_netlink_monitor_signals[INTERFACE_CONNECTED],
--- NetworkManager-0.6.5/src/nm-device.c.linkdebug 2007-06-10 13:07:29.000000000 -0400
+++ NetworkManager-0.6.5/src/nm-device.c 2007-06-10 13:12:34.000000000 -0400
@@ -593,6 +593,7 @@
return;
self->priv->link_active = link_active;
+nm_info ("%s - %s (%d) device %s link state set to %d", __FILE__, __func__, __LINE__, nm_device_get_iface (self), self->priv->link_active);
/* Deactivate a currently active device */
if (!link_active && req)
--- NetworkManager-0.6.5/src/nm-device-802-3-ethernet.c.linkdebug 2007-06-10 13:07:37.000000000 -0400
+++ NetworkManager-0.6.5/src/nm-device-802-3-ethernet.c 2007-06-10 13:11:29.000000000 -0400
@@ -99,6 +99,7 @@
static gboolean
link_activated_helper (NMDevice8023Ethernet *self)
{
+nm_info ("%s - %s (%d) device %s will set active link to TRUE", __FILE__, __func__, __LINE__, nm_device_get_iface (NM_DEVICE (self)));
nm_device_set_active_link (NM_DEVICE (self), TRUE);
return FALSE;
}
@@ -118,12 +119,14 @@
g_source_set_callback (source, (GSourceFunc) link_activated_helper, self, NULL);
g_source_attach (source, nm_device_get_main_context (NM_DEVICE (self)));
g_source_unref (source);
+nm_info ("%s - %s (%d) device %s scheduled link_activated_helper", __FILE__, __func__, __LINE__, nm_device_get_iface (NM_DEVICE (self)));
}
static gboolean
link_deactivated_helper (NMDevice8023Ethernet *self)
{
+nm_info ("%s - %s (%d) device %s will set active link to FALSE", __FILE__, __func__, __LINE__, nm_device_get_iface (NM_DEVICE (self)));
nm_device_set_active_link (NM_DEVICE (self), FALSE);
return FALSE;
}
@@ -143,6 +146,7 @@
g_source_set_callback (source, (GSourceFunc) link_deactivated_helper, self, NULL);
g_source_attach (source, nm_device_get_main_context (NM_DEVICE (self)));
g_source_unref (source);
+nm_info ("%s - %s (%d) device %s scheduled link_deactivated_helper", __FILE__, __func__, __LINE__, nm_device_get_iface (NM_DEVICE (self)));
}
static void

25
network-manager-applet-0.6.5-wso-eap-64bit-fix.patch Normal file
View File

@ -0,0 +1,25 @@
Index: NetworkManager-0.6.5/nm-applet-0.6.5/src/wireless-security-option.c
===================================================================
--- NetworkManager-0.6.5/nm-applet-0.6.5/src/wireless-security-option.c (revision 79)
+++ NetworkManager-0.6.5/nm-applet-0.6.5/src/wireless-security-option.c (working copy)
@@ -274,7 +274,7 @@
gtk_list_store_set (model, &iter, WPA_KEY_TYPE_NAME_COL, name,
WPA_KEY_TYPE_CIPHER_COL, NM_PHASE2_AUTH_GTC, -1);
- *num_added = 4;
+ *num_added = 5;
return GTK_TREE_MODEL (model);
}
Index: NetworkManager-0.6.5/nm-applet-0.6.5/src/wso-private.h
===================================================================
--- NetworkManager-0.6.5/nm-applet-0.6.5/src/wso-private.h (revision 79)
+++ NetworkManager-0.6.5/nm-applet-0.6.5/src/wso-private.h (working copy)
@@ -80,6 +80,7 @@
#define WPA_KEY_TYPE_CIPHER_COL 1
GtkTreeModel * wso_wpa_create_key_type_model (int capabilities, gboolean wpa_eap, int *num_added);
+GtkTreeModel * wso_wpa_create_phase2_type_model (int capabilities, gboolean wpa_eap, int *num_added);
#endif /* WIRELESS_SECURITY_OPTION_PRIVATE_H */