- Update to stable branch snapshot:
- More fixes for ethernet link detection (gnome #354565, rh #194124) - Support for HAL-detected rfkill switches
This commit is contained in:
parent
4e55f6caaf
commit
2f99c4361d
@ -1,54 +0,0 @@
|
||||
Index: src/nm-device-802-3-ethernet.c
|
||||
===================================================================
|
||||
--- src/nm-device-802-3-ethernet.c (revision 2577)
|
||||
+++ src/nm-device-802-3-ethernet.c (revision 2578)
|
||||
@@ -108,18 +108,16 @@
|
||||
GObject *obj,
|
||||
NMDevice8023Ethernet *self)
|
||||
{
|
||||
+ GSource * source;
|
||||
+
|
||||
/* Make sure signal is for us */
|
||||
if (NM_DEVICE (self) != NM_DEVICE (obj))
|
||||
return;
|
||||
|
||||
- if (!nm_device_has_active_link (NM_DEVICE (self)))
|
||||
- {
|
||||
- GSource * source = g_idle_source_new ();
|
||||
-
|
||||
- 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);
|
||||
- }
|
||||
+ source = g_idle_source_new ();
|
||||
+ 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);
|
||||
}
|
||||
|
||||
|
||||
@@ -135,18 +133,16 @@
|
||||
GObject *obj,
|
||||
NMDevice8023Ethernet *self)
|
||||
{
|
||||
+ GSource * source;
|
||||
+
|
||||
/* Make sure signal is for us */
|
||||
if (NM_DEVICE (self) != NM_DEVICE (obj))
|
||||
return;
|
||||
|
||||
- if (nm_device_has_active_link (NM_DEVICE (self)))
|
||||
- {
|
||||
- GSource * source = g_idle_source_new ();
|
||||
-
|
||||
- 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);
|
||||
- }
|
||||
+ source = g_idle_source_new ();
|
||||
+ 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);
|
||||
}
|
||||
|
||||
static void
|
@ -1,14 +0,0 @@
|
||||
Index: src/nm-device-802-11-wireless.c
|
||||
===================================================================
|
||||
--- src/nm-device-802-11-wireless.c (revision 2577)
|
||||
+++ src/nm-device-802-11-wireless.c (working copy)
|
||||
@@ -2981,6 +2981,9 @@
|
||||
return NM_ACT_STAGE_RETURN_POSTPONE;
|
||||
}
|
||||
|
||||
+ /* Some cards are dumb. Wait a second */
|
||||
+ sleep (1);
|
||||
+
|
||||
iface = nm_device_get_iface (dev);
|
||||
if (!supplicant_exec (self))
|
||||
{
|
@ -1,22 +0,0 @@
|
||||
--- NetworkManager-0.6.5/src/nm-device-802-11-wireless.c.debug 2007-04-09 11:00:46.000000000 -0400
|
||||
+++ NetworkManager-0.6.5/src/nm-device-802-11-wireless.c 2007-04-09 11:02:00.000000000 -0400
|
||||
@@ -2715,14 +2715,17 @@
|
||||
supplicant_exec (NMDevice80211Wireless *self)
|
||||
{
|
||||
gboolean success = FALSE;
|
||||
- char * argv[4];
|
||||
+ char * argv[7];
|
||||
GError * error = NULL;
|
||||
GPid pid = -1;
|
||||
|
||||
argv[0] = WPA_SUPPLICANT_BIN;
|
||||
argv[1] = "-g";
|
||||
argv[2] = WPA_SUPPLICANT_GLOBAL_SOCKET;
|
||||
- argv[3] = NULL;
|
||||
+ argv[3] = "-dd";
|
||||
+ argv[4] = "-o";
|
||||
+ argv[5] = "daemon";
|
||||
+ argv[6] = NULL;
|
||||
|
||||
success = g_spawn_async ("/", argv, NULL, 0, &supplicant_child_setup, NULL,
|
||||
&pid, &error);
|
@ -11,19 +11,15 @@ Name: NetworkManager
|
||||
Summary: Network connection manager and user applications
|
||||
Epoch: 1
|
||||
Version: 0.6.5
|
||||
Release: 6%{?dist}
|
||||
Release: 6.1%{?dist}
|
||||
Group: System Environment/Base
|
||||
License: GPL
|
||||
URL: http://www.gnome.org/projects/NetworkManager/
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
Source1: network-manager-applet-%{version}.tar.bz2
|
||||
Source1: nm-applet-%{version}.tar.bz2
|
||||
Patch0: NetworkManager-0.6.4-startup-dhcdbd.patch
|
||||
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
|
||||
Patch2: linkdebug.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
PreReq: chkconfig
|
||||
@ -122,15 +118,11 @@ NetworkManager functionality from applications that use glib.
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .startup-dhcdbd
|
||||
%patch2 -p0 -b .fix-ethernet-link-detection
|
||||
%patch3 -p0 -b .wait-for-wireless
|
||||
%patch6 -p1 -b .linkdebug
|
||||
%patch2 -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
|
||||
@ -255,22 +247,24 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Jun 21 2007 Dan Williams <dcbw@redhat.com> 1:0.6.5-6
|
||||
- Update to stable branch snapshot:
|
||||
- More fixes for ethernet link detection (gnome #354565, rh #194124)
|
||||
- Support for HAL-detected rfkill switches
|
||||
|
||||
* 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
|
||||
* Thu Jun 7 2007 Dan Williams <dcbw@redhat.com> 1:0.6.5-4
|
||||
- Fix ethernet link detection (gnome #354565, rh #194124)
|
||||
- Fix perpetual credentials request with private key passwords in the applet
|
||||
- Sleep a bit before activating wireless cards to work around driver bugs
|
||||
|
||||
* Mon Jun 4 2007 Dan Williams <dcbw@redhat.com> 1:0.6.5-4
|
||||
* Mon Jun 4 2007 Dan Williams <dcbw@redhat.com> 1:0.6.5-3
|
||||
- Don't spawn wpa_supplicant with -o
|
||||
|
||||
* Wed May 23 2007 Christopher Aillon <caillon@redhat.com> 1:0.6.5-3
|
||||
- Rebuild
|
||||
|
||||
* Wed Apr 25 2007 Christopher Aillon <caillon@redhat.com> 1:0.6.5-2
|
||||
- Fix requires macro (237806)
|
||||
|
||||
|
@ -1,33 +0,0 @@
|
||||
Index: NetworkManager-0.6.5/nm-applet-0.6.5/src/applet-dbus-info.c
|
||||
===================================================================
|
||||
--- NetworkManager-0.6.5/nm-applet-0.6.5/src/applet-dbus-info.c (revision 78)
|
||||
+++ NetworkManager-0.6.5/nm-applet-0.6.5/src/applet-dbus-info.c (revision 79)
|
||||
@@ -152,6 +152,8 @@
|
||||
char * temp = NULL;
|
||||
char * escaped_network;
|
||||
int we_cipher = -1;
|
||||
+ char * private_key_file = NULL;
|
||||
+ gboolean have_priv_key_file = FALSE;
|
||||
|
||||
g_return_val_if_fail (applet != NULL, NULL);
|
||||
g_return_val_if_fail (message != NULL, NULL);
|
||||
@@ -182,9 +184,18 @@
|
||||
|| !temp)
|
||||
new_key = TRUE;
|
||||
|
||||
+ nm_gconf_get_string_helper (applet->gconf_client,
|
||||
+ GCONF_PATH_WIRELESS_NETWORKS,
|
||||
+ "wpa_eap_private_key_file", escaped_network, &private_key_file);
|
||||
+ if (private_key_file) {
|
||||
+ have_priv_key_file = TRUE;
|
||||
+ g_free (private_key_file);
|
||||
+ }
|
||||
+
|
||||
/* Hack: 802.1x passwords are not stored in the keyring */
|
||||
if (!new_key &&
|
||||
- (we_cipher == NM_AUTH_TYPE_WPA_EAP || we_cipher == NM_AUTH_TYPE_LEAP))
|
||||
+ ((we_cipher == NM_AUTH_TYPE_WPA_EAP && !have_priv_key_file) ||
|
||||
+ we_cipher == NM_AUTH_TYPE_LEAP))
|
||||
{
|
||||
NMGConfWSO *gconf_wso;
|
||||
gconf_wso = nm_gconf_wso_new_deserialize_gconf (applet->gconf_client,
|
@ -1,25 +0,0 @@
|
||||
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 */
|
Loading…
Reference in New Issue
Block a user