From 458a13bad687452f015f69d43329dffc8fb66c69 Mon Sep 17 00:00:00 2001 From: "John (J5) Palmieri" Date: Fri, 15 Jun 2007 02:22:01 +0000 Subject: [PATCH] - bump and rebuild into OLPC-2 --- .cvsignore | 1 + NetworkManager.spec | 242 +++++++------------------------ nm-limited-meshdev-wext.patch | 172 ++++++++++++++++++++++ nm-no-wpa_supplicant-debug.patch | 14 ++ sources | 3 +- wpas-debugspew.patch | 30 ++++ wpas-wait-longer.patch | 11 ++ 7 files changed, 285 insertions(+), 188 deletions(-) create mode 100644 nm-limited-meshdev-wext.patch create mode 100644 nm-no-wpa_supplicant-debug.patch create mode 100644 wpas-debugspew.patch create mode 100644 wpas-wait-longer.patch diff --git a/.cvsignore b/.cvsignore index 335b461..5fb6a0c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ network-manager-applet-0.6.5.tar.bz2 NetworkManager-0.6.5.tar.bz2 +NetworkManager-0.6.5.svn2546.tar.gz diff --git a/NetworkManager.spec b/NetworkManager.spec index 48ed41f..c5cb9ca 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -1,8 +1,9 @@ ExcludeArch: s390 s390x +%define hal_version 0.5.0 + %define dbus_version 0.90 %define dbus_glib_version 0.70 -%define hal_version 0.5.0 %define gtk2_version 2.6.0 %define wireless_tools_version 1:28-0pre9 @@ -11,26 +12,22 @@ Name: NetworkManager Summary: Network connection manager and user applications Epoch: 1 Version: 0.6.5 -Release: 5%{?dist} +Release: 0.4.svn2546%{?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 +Source: %{name}-%{version}.svn2546.tar.gz 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 +Patch1: wpas-wait-longer.patch +Patch2: nm-no-wpa_supplicant-debug.patch +Patch3: nm-limited-meshdev-wext.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) PreReq: chkconfig Requires: wireless-tools >= %{wireless_tools_version} Requires: dbus >= %{dbus_version} Requires: dbus-glib >= %{dbus_glib_version} -Requires: hal >= 0.5.0 +Requires: hal >= %{hal_version} Requires: iproute openssl Requires: dhcdbd Requires: dhclient >= 3.0.2-12 @@ -40,21 +37,14 @@ BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} BuildRequires: wireless-tools-devel >= %{wireless_tools_version} BuildRequires: hal-devel >= %{hal_version} -BuildRequires: glib2-devel gtk2-devel -BuildRequires: libglade2-devel +BuildRequires: glib2-devel BuildRequires: openssl-devel -BuildRequires: GConf2-devel -BuildRequires: gnome-panel-devel -BuildRequires: libgnomeui-devel -BuildRequires: gnome-keyring-devel BuildRequires: gettext-devel BuildRequires: pkgconfig BuildRequires: dhcdbd BuildRequires: wpa_supplicant BuildRequires: libnl-devel -BuildRequires: libnotify-devel >= 0.3 -BuildRequires: perl(XML::Parser) -BuildRequires: automake autoconf intltool libtool +BuildRequires: perl-XML-Parser %description NetworkManager attempts to keep an active network connection available at all @@ -65,72 +55,24 @@ NetworkManager is _intended_ to replace default routes, obtain IP addresses from a DHCP server, and change nameservers whenever it sees fit. -%package gnome -Summary: GNOME applications for use with NetworkManager -Group: Applications/Internet -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: gnome-panel -Requires: dbus >= %{dbus_version} -Requires: dbus-glib >= %{dbus_glib_version} -Requires: hal >= %{hal_version} -Requires: libnotify >= 0.3 -PreReq: gtk2 >= %{gtk2_version} -Requires: gnome-keyring - -%description gnome -This package contains GNOME utilities and applications for use with -NetworkManager, including a panel applet for wireless networks. - - %package devel Summary: Libraries and headers for adding NetworkManager support to applications Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} Requires: dbus-devel >= %{dbus_version} Requires: dbus-glib >= %{dbus_glib_version} -Requires: pkgconfig %description devel This package contains various headers accessing some NetworkManager functionality from applications. -%package glib -Summary: Libraries for adding NetworkManager support to applications that use glib. -Group: Development/Libraries -Requires: dbus >= %{dbus_version} -Requires: dbus-glib >= %{dbus_glib_version} - -%description glib -This package contains the libraries that make it easier to use some NetworkManager -functionality from applications that use glib. - - -%package glib-devel -Summary: Header files for adding NetworkManager support to applications that use glib. -Group: Development/Libraries -Requires: %{name}-devel = %{epoch}:%{version}-%{release} -Requires: %{name}-glib = %{epoch}:%{version}-%{release} -Requires: glib2-devel -Requires: pkgconfig - -%description glib-devel -This package contains the header and pkg-config files for development applications using -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 - -# unpack the applet -tar -xjf %{SOURCE1} -%patch1 -p1 -b .buildfix -%patch4 -p1 -b .fix-eap-key-request -%patch5 -p1 -b .wso-eap-64bit-fix +%patch1 -p1 -b .wpas-wait-longer +%patch2 -p1 -b .no-wpa_supplicant-debug +%patch3 -p1 -b .limited-meshdev-wext %build # Even though we don't require named, we still build with it @@ -139,39 +81,22 @@ tar -xjf %{SOURCE1} --disable-static \ --with-named=/usr/sbin/named \ --with-named-dir=/var/named/data \ - --with-named-user=named + --with-named-user=named \ + --without-gnome make -# build the applet -pushd nm-applet-0.6.5 - autoreconf -i - intltoolize --force - %configure \ - --disable-static \ - --with-notify \ - --with-named=/usr/sbin/named \ - --with-named-dir=/var/named/data \ - --with-named-user=named - make -popd - + %install %{__rm} -rf $RPM_BUILD_ROOT - -# install NM make install DESTDIR=$RPM_BUILD_ROOT - -# install the applet -pushd nm-applet-0.6.5 - make install DESTDIR=$RPM_BUILD_ROOT -popd - %find_lang %{name} -%find_lang nm-applet -cat nm-applet.lang >> %{name}.lang %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/*.la +%{__mkdir} -p $RPM_BUILD_ROOT%{_bindir}/ %{__cp} test/nm-tool $RPM_BUILD_ROOT%{_bindir}/ +%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/libnm_glib* +%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/libnm_glib* + %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -191,27 +116,13 @@ if [ $1 -eq 0 ]; then /sbin/chkconfig --del NetworkManagerDispatcher fi -%post glib -p /sbin/ldconfig -%postun glib -p /sbin/ldconfig - -%post gnome -touch --no-create %{_datadir}/icons/hicolor -if [ -x /usr/bin/gtk-update-icon-cache ]; then - gtk-update-icon-cache -q %{_datadir}/icons/hicolor -fi - -%postun gnome -touch --no-create %{_datadir}/icons/hicolor -if [ -x /usr/bin/gtk-update-icon-cache ]; then - gtk-update-icon-cache -q %{_datadir}/icons/hicolor -fi %files -f %{name}.lang %defattr(-,root,root,0755) %doc COPYING ChangeLog NEWS AUTHORS README CONTRIBUTING TODO -%config %{_sysconfdir}/dbus-1/system.d/NetworkManager.conf -%config %{_sysconfdir}/rc.d/init.d/NetworkManager -%config %{_sysconfdir}/rc.d/init.d/NetworkManagerDispatcher +%config %{_sysconfdir}/dbus-1/system.d/%{name}.conf +%config %{_sysconfdir}/rc.d/init.d/%{name} +%config %{_sysconfdir}/rc.d/init.d/%{name}Dispatcher %{_sbindir}/%{name} %{_sbindir}/NetworkManagerDispatcher %dir %{_sysconfdir}/NetworkManager/ @@ -220,101 +131,60 @@ fi %{_mandir}/man1/NetworkManager.1.gz %{_mandir}/man1/NetworkManagerDispatcher.1.gz %{_mandir}/man1/nm-tool.1.gz -%dir %{_localstatedir}/run/NetworkManager +%dir %{_localstatedir}/run/%{name} %{_prefix}/libexec/nm-crash-logger -%dir %{_datadir}/NetworkManager %{_datadir}/NetworkManager/gdb-cmd -%files gnome -%defattr(-,root,root,0755) -%config %{_sysconfdir}/dbus-1/system.d/nm-applet.conf -%{_bindir}/nm-applet -%{_bindir}/nm-vpn-properties -%{_datadir}/gnome-vpn-properties/nm-vpn-properties.glade -%{_datadir}/nm-applet/ -%{_datadir}/icons/hicolor/22x22/apps/*.png -%{_datadir}/icons/hicolor/48x48/apps/*.png -%{_datadir}/gnome/autostart/nm-applet.desktop - %files devel %defattr(-,root,root,0755) -%dir %{_includedir}/%{name} %{_includedir}/%{name}/*.h %{_libdir}/pkgconfig/%{name}.pc %{_libdir}/pkgconfig/libnm-util.pc -%{_libdir}/libnm-util.so - -%files glib -%defattr(-,root,root,0755) -%{_libdir}/libnm_glib.so.* - -%files glib-devel -%{_includedir}/%{name}/libnm_glib.h -%{_libdir}/pkgconfig/libnm_glib.pc -%{_libdir}/libnm_glib.so %changelog -* Sun Jun 10 2007 Dan Williams 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 14 2007 John (J5) Palmieri - 1:0.6.5-0.4.svn2546 +- bump and rebuild into OLPC-2 -* Thu Jun 7 2007 Dan Williams 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 +* Fri Jun 08 2007 Dan Williams - 1:0.6.5-0.3.svn2546.olpc1 +- Fix operation with latest libertas driver; mesh device doesn't have full + set of wireless extensions, so use eth device instead -* Mon Jun 4 2007 Dan Williams 1:0.6.5-3 -- Don't spawn wpa_supplicant with -o +* Fri Jun 08 2007 Dan Williams - 1:0.6.5-0.2.svn2546.olpc1 +- Don't launch wpa_supplicant with debug output -* Wed Apr 25 2007 Christopher Aillon 1:0.6.5-2 -- Fix requires macro (237806) +* Fri Apr 06 2007 Dan Williams - 1:0.6.5-0.1.svn2546.olpc1 +- Fix permissions on /etc/hosts +- Decrease AP scan result aggregration timeout so APs actually show up in adhoc mode +- Increase DHCP timeout for mesh -* Thu Apr 19 2007 Christopher Aillon 1:0.6.5-1 -- Update to 0.6.5 final -- Don't lose scanned security information +* Thu Apr 05 2007 Dan Williams - 1:0.6.5-0.1.svn2540.olpc1 +- Change MPP protocol address & port +- switch back to infrastructure mode after mesh activation failure +- Use DHCP for mesh activation instead of auto-ip +- Make hostnames unique and update /etc/hosts +- Remove wpa_supplicant stdout capture and redirect -* Mon Apr 9 2007 Dan Williams - 1:0.6.5-0.7.svn2547 -- Update from trunk - - Updated translations - - Cleaned-up VPN properties dialogs - - Fix 64-bit kernel leakage issues in WEXT - - Don't capture and redirect wpa_supplicant log output +* Sat Mar 31 2007 Dan Williams - 1:0.6.5-0.1.svn2511.olpc1 +- Fix possible infinite idle reschedule +- Add 'anycast' ARP mapping before MPP discovery -* Wed Mar 28 2007 Matthew Barnes 1:0.6.5-0.6.svn2474 -- Close private D-Bus connections. (#232691) +* Thu Mar 29 2007 Dan Williams - 1:0.6.5-0.1.svn2508.olpc1 +- Mesh network device support -* Sun Mar 25 2007 Matthias Clasen 1:0.6.5-0.5.svn2474 -- Fix a directory ownership issue. (#233763) +* Wed Mar 7 2007 Dan Williams - 1:0.6.5-0.1.svn2446.olpc1 +- Update to 0.6.5-pre snapshot +- Disable unused gnome/glib bits -* Thu Mar 15 2007 Dan Williams - 1:0.6.5-0.4.svn2474 -- Update to pre-0.6.5 snapshot +* Sun Nov 12 2006 Dan Williams - 1:0.6.4-8 +- OLPC one-off build: up supplicant timeout, add debug spew -* Thu Feb 8 2007 Christopher Aillon - 1:0.6.5-0.3.cvs20061025 -- Guard against D-Bus LimitExceeded messages +* Wed Oct 25 2006 Dan Williams - 1:0.6.4-7 +- Bump revision # -* Fri Feb 2 2007 Christopher Aillon - 1:0.6.5-0.2.cvs20061025 -- Move .so file to -devel package - -* Sat Nov 25 2006 Matthias Clasen -- Own the /etc/NetworkManager/dispatcher.d directory -- Require pkgconfig for the -devel packages -- Fix compilation with dbus 1.0 - -* Wed Oct 25 2006 Dan Williams - 1:0.6.5-0.cvs20061025 -- Update to a stable branch snapshot - - Gnome applet timeout/redraw suppression when idle - - Backport of LEAP patch from HEAD (from Thiago Bauermann) - - Backport of asynchronous scanning patch from HEAD - - Make renaming of VPN connections work (from Tambet Ingo) - - Dial down wpa_supplicant debug spew - - Cleanup of key/passphrase request scenarios (from Valentine Sinitsyn) - - Shut down VPN connections on logout (from Robert Love) - - Fix WPA passphrase hashing on PPC - -* Thu Oct 19 2006 Christopher Aillon - 1:0.6.4-6 -- Own /usr/share/NetworkManager and /usr/include/NetworkManager +* Tue Oct 24 2006 Dan Williams - 1:0.6.4-6 +- Don't block when grabbing VPN Connection settings from NMI +- Fix more stupid timeouts that wake up the applet periodically * Mon Sep 4 2006 Christopher Aillon - 1:0.6.4-5 - Don't wake up to redraw if NM is inactive (#204850) diff --git a/nm-limited-meshdev-wext.patch b/nm-limited-meshdev-wext.patch new file mode 100644 index 0000000..26d44b3 --- /dev/null +++ b/nm-limited-meshdev-wext.patch @@ -0,0 +1,172 @@ +--- 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 new file mode 100644 index 0000000..f823ea9 --- /dev/null +++ b/nm-no-wpa_supplicant-debug.patch @@ -0,0 +1,14 @@ +--- 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 31e93bb..b66d382 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -b827d300eb28458f6588eb843cba418d NetworkManager-0.6.5.tar.bz2 -1c94a41e2399d261985a75f0cd3b895b network-manager-applet-0.6.5.tar.bz2 +ac556d6d23b3a3dfb0ebb6fd828c86e3 NetworkManager-0.6.5.svn2546.tar.gz diff --git a/wpas-debugspew.patch b/wpas-debugspew.patch new file mode 100644 index 0000000..7baaa52 --- /dev/null +++ b/wpas-debugspew.patch @@ -0,0 +1,30 @@ +--- 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); diff --git a/wpas-wait-longer.patch b/wpas-wait-longer.patch new file mode 100644 index 0000000..242e47e --- /dev/null +++ b/wpas-wait-longer.patch @@ -0,0 +1,11 @@ +--- NetworkManager-0.6.4/src/wpa_ctrl.c.foo 2006-11-12 20:09:19.000000000 -0500 ++++ NetworkManager-0.6.4/src/wpa_ctrl.c 2006-11-12 20:09:50.000000000 -0500 +@@ -144,7 +144,7 @@ + return -1; + + for (;;) { +- tv.tv_sec = 2; ++ tv.tv_sec = 10; + tv.tv_usec = 0; + FD_ZERO(&rfds); + FD_SET(ctrl->s, &rfds);