From 4bcc744d8d9a0273c08a6fb372a6cf9662e42549 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Jun 28 2007 19:28:08 +0000 Subject: - Update to svn nm-0-6-olpc - new automesh behavior - kill dhcdbd --- diff --git a/.cvsignore b/.cvsignore index 5fb6a0c..ad7ee43 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,4 @@ network-manager-applet-0.6.5.tar.bz2 NetworkManager-0.6.5.tar.bz2 NetworkManager-0.6.5.svn2546.tar.gz +NetworkManager-0.6.5.svn2621.tar.gz diff --git a/NetworkManager-0.6.4-startup-dhcdbd.patch b/NetworkManager-0.6.4-startup-dhcdbd.patch deleted file mode 100644 index 4fee0b5..0000000 --- a/NetworkManager-0.6.4-startup-dhcdbd.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- NetworkManager-0.6.2/initscript/RedHat/NetworkManager.in.dhcdbd 2006-03-30 12:42:28.000000000 -0500 -+++ NetworkManager-0.6.2/initscript/RedHat/NetworkManager.in 2006-03-30 12:43:25.000000000 -0500 -@@ -36,6 +36,11 @@ - { - echo $"Setting network parameters... " - sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1 -+ -+ if [ ! -e /var/lock/subsys/dhcdbd ]; then -+ service dhcdbd start -+ fi -+ - echo -n $"Starting NetworkManager daemon: " - daemon --check $servicename $processname --pid-file=$pidfile - RETVAL=$? diff --git a/NetworkManager-0.6.5-fix-ethernet-link-detection.patch b/NetworkManager-0.6.5-fix-ethernet-link-detection.patch deleted file mode 100644 index 9fc7974..0000000 --- a/NetworkManager-0.6.5-fix-ethernet-link-detection.patch +++ /dev/null @@ -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 diff --git a/NetworkManager-0.6.5-fixup-internal-applet-build.patch b/NetworkManager-0.6.5-fixup-internal-applet-build.patch deleted file mode 100644 index 42cb053..0000000 --- a/NetworkManager-0.6.5-fixup-internal-applet-build.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- NetworkManager-0.6.5/nm-applet-0.6.5/src/Makefile.am.buildfix 2007-02-02 10:53:26.000000000 -0500 -+++ NetworkManager-0.6.5/nm-applet-0.6.5/src/Makefile.am 2007-03-15 14:20:32.000000000 -0400 -@@ -2,6 +2,9 @@ - - bin_PROGRAMS = nm-applet - -+INCLUDES = -I${top_srcdir}/../include \ -+ -I${top_srcdir}/../libnm-util -+ - nm_applet_CPPFLAGS = \ - $(DBUS_CFLAGS) \ - $(GTHREAD_CFLAGS) \ -@@ -12,7 +15,6 @@ - $(GCONF_CFLAGS) \ - $(LIBGNOMEUI_CFLAGS) \ - $(GNOME_KEYRING_CFLAGS) \ -- $(NM_CFLAGS) \ - -DICONDIR=\""$(datadir)/icons"\" \ - -DGLADEDIR=\""$(gladedir)"\" \ - -DBINDIR=\""$(bindir)"\" \ -@@ -112,7 +114,7 @@ - $(GCONF_LIBS) \ - $(LIBGNOMEUI_LIBS) \ - $(GNOME_KEYRING_LIBS) \ -- $(NM_LIBS) \ -+ -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ - $(NULL) - - if WITH_NOTIFY ---- NetworkManager-0.6.5/nm-applet-0.6.5/configure.ac.buildfix 2007-03-15 11:51:49.000000000 -0400 -+++ NetworkManager-0.6.5/nm-applet-0.6.5/configure.ac 2007-03-15 16:33:34.000000000 -0400 -@@ -18,10 +18,10 @@ - dnl This doesn't depend on gnome support, only on gnome-common, autogen already - dnl uses gnome-autogen - dnl --GNOME_COMMON_INIT --GNOME_DEBUG_CHECK --GNOME_COMPILE_WARNINGS([maximum]) --GNOME_MAINTAINER_MODE_DEFINES -+dnl GNOME_COMMON_INIT -+dnl GNOME_DEBUG_CHECK -+dnl GNOME_COMPILE_WARNINGS([maximum]) -+dnl GNOME_MAINTAINER_MODE_DEFINES - - dnl - dnl Required headers -@@ -112,10 +112,6 @@ - AC_SUBST(GOBJECT_CFLAGS) - AC_SUBST(GOBJECT_LIBS) - --PKG_CHECK_MODULES(NM, NetworkManager) --AC_SUBST(NM_CFLAGS) --AC_SUBST(NM_LIBS) -- - AC_ARG_WITH(notify, AC_HELP_STRING([--with-notify], [Use libnotify]), enable_notify=$withval, enable_notify=auto) - - PKG_CHECK_MODULES(GTK, gtk+-2.0) diff --git a/NetworkManager-0.6.5-wait-for-wireless.patch b/NetworkManager-0.6.5-wait-for-wireless.patch deleted file mode 100644 index 90fe675..0000000 --- a/NetworkManager-0.6.5-wait-for-wireless.patch +++ /dev/null @@ -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)) - { diff --git a/NetworkManager-0.6.5-wpa_supplicant-debug.patch b/NetworkManager-0.6.5-wpa_supplicant-debug.patch deleted file mode 100644 index 321adfb..0000000 --- a/NetworkManager-0.6.5-wpa_supplicant-debug.patch +++ /dev/null @@ -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); diff --git a/NetworkManager.spec b/NetworkManager.spec index c5cb9ca..ee37d40 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -8,19 +8,18 @@ ExcludeArch: s390 s390x %define gtk2_version 2.6.0 %define wireless_tools_version 1:28-0pre9 +%define svn_revision svn2621 + Name: NetworkManager Summary: Network connection manager and user applications Epoch: 1 Version: 0.6.5 -Release: 0.4.svn2546%{?dist} +Release: 0.5.%{svn_revision}%{?dist} Group: System Environment/Base License: GPL URL: http://www.gnome.org/projects/NetworkManager/ -Source: %{name}-%{version}.svn2546.tar.gz -Patch0: NetworkManager-0.6.4-startup-dhcdbd.patch -Patch1: wpas-wait-longer.patch -Patch2: nm-no-wpa_supplicant-debug.patch -Patch3: nm-limited-meshdev-wext.patch +Source: %{name}-%{version}.%{svn_revision}.tar.gz +Patch0: wpas-wait-longer.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) PreReq: chkconfig @@ -29,9 +28,10 @@ Requires: dbus >= %{dbus_version} Requires: dbus-glib >= %{dbus_glib_version} Requires: hal >= %{hal_version} Requires: iproute openssl -Requires: dhcdbd -Requires: dhclient >= 3.0.2-12 +Requires: dhclient >= 12:3.0.5-36 Requires: wpa_supplicant +Requires: dhcp >= 12:3.0.5-36 +Requires: avahi >= 0.6.20-1 BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} @@ -41,7 +41,6 @@ BuildRequires: glib2-devel BuildRequires: openssl-devel BuildRequires: gettext-devel BuildRequires: pkgconfig -BuildRequires: dhcdbd BuildRequires: wpa_supplicant BuildRequires: libnl-devel BuildRequires: perl-XML-Parser @@ -69,10 +68,7 @@ from applications. %prep %setup -q -%patch0 -p1 -b .startup-dhcdbd -%patch1 -p1 -b .wpas-wait-longer -%patch2 -p1 -b .no-wpa_supplicant-debug -%patch3 -p1 -b .limited-meshdev-wext +%patch0 -p1 -b .wpas-wait-longer %build # Even though we don't require named, we still build with it @@ -134,6 +130,10 @@ fi %dir %{_localstatedir}/run/%{name} %{_prefix}/libexec/nm-crash-logger %{_datadir}/NetworkManager/gdb-cmd +%{_sysconfdir}/NetworkManager/callouts/nm-avahi-autoipd.action +%{_sysconfdir}/NetworkManager/callouts/nm-dhcp-client.action +%config %{_sysconfdir}/dbus-1/system.d/nm-avahi-autoipd.conf +%config %{_sysconfdir}/dbus-1/system.d/nm-dhcp-client.conf %files devel %defattr(-,root,root,0755) @@ -143,6 +143,11 @@ fi %changelog +* Thu Jun 28 2007 Dan Williams - 1:0.6.5-0.5.svn2621 +- Update to svn nm-0-6-olpc + - new automesh behavior + - kill dhcdbd + * Thu Jun 14 2007 John (J5) Palmieri - 1:0.6.5-0.4.svn2546 - bump and rebuild into OLPC-2 diff --git a/linkdebug.patch b/linkdebug.patch deleted file mode 100644 index cfdbd69..0000000 --- a/linkdebug.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- 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 diff --git a/network-manager-applet-0.6.5-fix-eap-key-request.patch b/network-manager-applet-0.6.5-fix-eap-key-request.patch deleted file mode 100644 index d31edf2..0000000 --- a/network-manager-applet-0.6.5-fix-eap-key-request.patch +++ /dev/null @@ -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, diff --git a/network-manager-applet-0.6.5-wso-eap-64bit-fix.patch b/network-manager-applet-0.6.5-wso-eap-64bit-fix.patch deleted file mode 100644 index e33cadd..0000000 --- a/network-manager-applet-0.6.5-wso-eap-64bit-fix.patch +++ /dev/null @@ -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 */ diff --git a/nm-limited-meshdev-wext.patch b/nm-limited-meshdev-wext.patch deleted file mode 100644 index 26d44b3..0000000 --- a/nm-limited-meshdev-wext.patch +++ /dev/null @@ -1,172 +0,0 @@ ---- NetworkManager-0.6.5/src/nm-device-802-11-mesh-olpc.c.bork 2007-06-08 22:37:53.000000000 -0400 -+++ NetworkManager-0.6.5/src/nm-device-802-11-mesh-olpc.c 2007-06-08 22:53:57.000000000 -0400 -@@ -516,29 +516,29 @@ - } - - static int --get_80211_mode (NMDevice80211MeshOLPC *self) -+get_80211_mode (NMDevice *dev) - { - NMSock * sk; - int mode = -1; - struct iwreq wrq; - int err; - -- g_return_val_if_fail (self != NULL, -1); -+ g_return_val_if_fail (dev != NULL, -1); - - /* Force the card into Managed/Infrastructure mode */ -- sk = nm_dev_sock_open (NM_DEVICE (self), DEV_WIRELESS, __func__, NULL); -+ sk = nm_dev_sock_open (dev, DEV_WIRELESS, __func__, NULL); - if (!sk) { -- nm_warning ("%s: failed to open device socket.", nm_device_get_iface (NM_DEVICE (self))); -+ nm_warning ("%s: failed to open device socket.", nm_device_get_iface (dev)); - return -1; - } - - err = iw_get_ext (nm_dev_sock_get_fd (sk), -- nm_device_get_iface (NM_DEVICE (self)), -+ nm_device_get_iface (dev), - SIOCGIWMODE, - &wrq); - if (err) { - nm_warning ("%s: failed to get device mode (errno: %d).", -- nm_device_get_iface (NM_DEVICE (self)), -+ nm_device_get_iface (dev), - errno); - goto out; - } -@@ -558,27 +558,28 @@ - gboolean success = FALSE; - struct iwreq wrqu; - int err; -+ NMDevice * ethdev = NM_DEVICE (self->priv->ethdev.dev); - - g_return_val_if_fail (self != NULL, FALSE); - g_return_val_if_fail ((mode == IW_MODE_INFRA) || (mode == IW_MODE_ADHOC), FALSE); - -- if (get_80211_mode (self) == mode) -+ if (get_80211_mode (ethdev) == mode) - return TRUE; - -- sk = nm_dev_sock_open (NM_DEVICE (self), DEV_WIRELESS, __func__, NULL); -+ sk = nm_dev_sock_open (ethdev, DEV_WIRELESS, __func__, NULL); - if (!sk) { -- nm_warning ("%s: failed to open device socket.", nm_device_get_iface (NM_DEVICE (self))); -+ nm_warning ("%s: failed to open device socket.", nm_device_get_iface (ethdev)); - return FALSE; - } - - wrqu.u.mode = mode; - err = iw_set_ext (nm_dev_sock_get_fd (sk), -- nm_device_get_iface (NM_DEVICE (self)), -+ nm_device_get_iface (ethdev), - SIOCSIWMODE, - &wrqu); - if (err) { - nm_warning ("%s: failed to set device mode to %d (errno: %d).", -- nm_device_get_iface (NM_DEVICE (self)), -+ nm_device_get_iface (ethdev), - mode, - errno); - goto out; -@@ -598,12 +599,13 @@ - struct iwreq wrqu; - gboolean success = FALSE; - int err; -+ NMDevice * ethdev = NM_DEVICE (self->priv->ethdev.dev); - - g_return_val_if_fail (self != NULL, FALSE); - -- sk = nm_dev_sock_open (NM_DEVICE (self), DEV_WIRELESS, __func__, NULL); -+ sk = nm_dev_sock_open (ethdev, DEV_WIRELESS, __func__, NULL); - if (!sk) { -- nm_warning ("%s: failed to open device socket.", nm_device_get_iface (NM_DEVICE (self))); -+ nm_warning ("%s: failed to open device socket.", nm_device_get_iface (ethdev)); - return FALSE; - } - -@@ -612,12 +614,12 @@ - wrqu.u.data.flags = IW_ENCODE_DISABLED | IW_ENCODE_NOKEY; - - err = iw_set_ext (nm_dev_sock_get_fd (sk), -- nm_device_get_iface (NM_DEVICE (self)), -+ nm_device_get_iface (ethdev), - SIOCSIWENCODE, - &wrqu); - if (err) { - nm_warning ("%s: failed to clear encryption keys (errno: %d).", -- nm_device_get_iface (NM_DEVICE (self)), -+ nm_device_get_iface (ethdev), - errno); - goto out; - } -@@ -640,6 +642,7 @@ - char * safe_ssid = NULL; - guint32 safe_len = (ssid_len > IW_ESSID_MAX_SIZE) ? IW_ESSID_MAX_SIZE : ssid_len; - gboolean success = FALSE; -+ NMDevice * ethdev = NM_DEVICE (self->priv->ethdev.dev); - - g_return_val_if_fail (self != NULL, FALSE); - -@@ -651,9 +654,9 @@ - memcpy (safe_ssid, ssid, safe_len); - } - -- sk = nm_dev_sock_open (NM_DEVICE (self), DEV_WIRELESS, __func__, NULL); -+ sk = nm_dev_sock_open (ethdev, DEV_WIRELESS, __func__, NULL); - if (!sk) { -- nm_warning ("%s: failed to open device socket.", nm_device_get_iface (NM_DEVICE (self))); -+ nm_warning ("%s: failed to open device socket.", nm_device_get_iface (ethdev)); - return FALSE; - } - -@@ -662,12 +665,12 @@ - wrqu.u.essid.flags = 1; /* Enable essid on card */ - - err = iw_set_ext (nm_dev_sock_get_fd (sk), -- nm_device_get_iface (NM_DEVICE (self)), -+ nm_device_get_iface (ethdev), - SIOCSIWESSID, - &wrqu); - if (err) { - nm_warning ("%s: failed to set SSID (errno: %d).", -- nm_device_get_iface (NM_DEVICE (self)), -+ nm_device_get_iface (ethdev), - errno); - goto out; - } -@@ -690,11 +693,12 @@ - int channel = 0; - struct iwreq wrqu; - const char * iface; -+ NMDevice * ethdev = NM_DEVICE (self->priv->ethdev.dev); - - g_return_val_if_fail (self != NULL, -1); - -- iface = nm_device_get_iface (NM_DEVICE (self)); -- sk = nm_dev_sock_open (NM_DEVICE (self), DEV_WIRELESS, __func__, NULL); -+ iface = nm_device_get_iface (ethdev); -+ sk = nm_dev_sock_open (ethdev, DEV_WIRELESS, __func__, NULL); - if (!sk) { - nm_warning ("%s: failed to open device socket.", iface); - return -1; -@@ -730,15 +734,16 @@ - gboolean success = FALSE; - int skfd; - const char * iface; -+ NMDevice * ethdev = NM_DEVICE (self->priv->ethdev.dev); - - g_return_val_if_fail (self != NULL, FALSE); - - if ((channel > 0) && (get_80211_channel (self) == channel)) - return TRUE; - -- iface = nm_device_get_iface (NM_DEVICE (self)); -+ iface = nm_device_get_iface (ethdev); - -- sk = nm_dev_sock_open (NM_DEVICE (self), DEV_WIRELESS, __func__, NULL); -+ sk = nm_dev_sock_open (ethdev, DEV_WIRELESS, __func__, NULL); - if (!sk) { - nm_warning ("%s: failed to open device socket.", iface); - return FALSE; diff --git a/nm-no-wpa_supplicant-debug.patch b/nm-no-wpa_supplicant-debug.patch deleted file mode 100644 index f823ea9..0000000 --- a/nm-no-wpa_supplicant-debug.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- NetworkManager-0.6.5/src/nm-device-802-11-wireless.c.foo 2007-06-08 16:32:14.000000000 -0400 -+++ NetworkManager-0.6.5/src/nm-device-802-11-wireless.c 2007-06-08 16:32:25.000000000 -0400 -@@ -2779,10 +2779,7 @@ - argv[0] = WPA_SUPPLICANT_BIN; - argv[1] = "-g"; - argv[2] = WPA_SUPPLICANT_GLOBAL_SOCKET; -- argv[3] = "-ddd"; -- argv[4] = "-o"; -- argv[5] = "local0"; -- argv[6] = NULL; -+ argv[3] = NULL; - - success = g_spawn_async ("/", argv, NULL, 0, &supplicant_child_setup, NULL, - &pid, &error); diff --git a/sources b/sources index b66d382..eec3011 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ac556d6d23b3a3dfb0ebb6fd828c86e3 NetworkManager-0.6.5.svn2546.tar.gz +47e2c8f03284483f658e048d7a45fded NetworkManager-0.6.5.svn2621.tar.gz diff --git a/wpas-debugspew.patch b/wpas-debugspew.patch deleted file mode 100644 index 7baaa52..0000000 --- a/wpas-debugspew.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- NetworkManager-0.6.4/src/nm-device-802-11-wireless.c.wpas-debugspew 2006-08-13 23:34:20.000000000 -0400 -+++ NetworkManager-0.6.4/src/nm-device-802-11-wireless.c 2006-11-12 20:23:56.000000000 -0500 -@@ -2412,7 +2412,7 @@ - } - - --#define NM_SUPPLICANT_TIMEOUT 20 /* how long we wait for wpa_supplicant to associate (in seconds) */ -+#define NM_SUPPLICANT_TIMEOUT 40 /* how long we wait for wpa_supplicant to associate (in seconds) */ - - static unsigned int - get_supplicant_timeout (NMDevice80211Wireless *self) -@@ -2543,7 +2543,7 @@ - supplicant_exec (NMDevice80211Wireless *self) - { - gboolean success = FALSE; -- char * argv[4]; -+ char * argv[5]; - GError * error = NULL; - GPid pid = -1; - int sup_stdout; -@@ -2551,7 +2551,8 @@ - argv[0] = WPA_SUPPLICANT_BIN; - argv[1] = "-g"; - argv[2] = WPA_SUPPLICANT_GLOBAL_SOCKET; -- argv[3] = NULL; -+ argv[3] = "-dd"; -+ argv[4] = NULL; - - success = g_spawn_async_with_pipes ("/", argv, NULL, 0, NULL, NULL, - &pid, NULL, &sup_stdout, NULL, &error);