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

- bump and rebuild into OLPC-2

This commit is contained in:
John (J5) Palmieri 2007-06-15 02:22:01 +00:00
parent a4cbaf424b
commit 458a13bad6
7 changed files with 285 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cvsignore
View File

@ -1,2 +1,3 @@
network-manager-applet-0.6.5.tar.bz2 network-manager-applet-0.6.5.tar.bz2
NetworkManager-0.6.5.tar.bz2 NetworkManager-0.6.5.tar.bz2
NetworkManager-0.6.5.svn2546.tar.gz

242
NetworkManager.spec
View File

@ -1,8 +1,9 @@
ExcludeArch: s390 s390x ExcludeArch: s390 s390x
%define hal_version 0.5.0
%define dbus_version 0.90 %define dbus_version 0.90
%define dbus_glib_version 0.70 %define dbus_glib_version 0.70
%define hal_version 0.5.0
%define gtk2_version 2.6.0 %define gtk2_version 2.6.0
%define wireless_tools_version 1:28-0pre9 %define wireless_tools_version 1:28-0pre9
@ -11,26 +12,22 @@ Name: NetworkManager
Summary: Network connection manager and user applications Summary: Network connection manager and user applications
Epoch: 1 Epoch: 1
Version: 0.6.5 Version: 0.6.5
Release: 5%{?dist} Release: 0.4.svn2546%{?dist}
Group: System Environment/Base Group: System Environment/Base
License: GPL License: GPL
URL: http://www.gnome.org/projects/NetworkManager/ URL: http://www.gnome.org/projects/NetworkManager/
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.svn2546.tar.gz
Source1: network-manager-applet-%{version}.tar.bz2
Patch0: NetworkManager-0.6.4-startup-dhcdbd.patch Patch0: NetworkManager-0.6.4-startup-dhcdbd.patch
Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch Patch1: wpas-wait-longer.patch
Patch2: NetworkManager-0.6.5-fix-ethernet-link-detection.patch Patch2: nm-no-wpa_supplicant-debug.patch
Patch3: NetworkManager-0.6.5-wait-for-wireless.patch Patch3: nm-limited-meshdev-wext.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) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
PreReq: chkconfig PreReq: chkconfig
Requires: wireless-tools >= %{wireless_tools_version} Requires: wireless-tools >= %{wireless_tools_version}
Requires: dbus >= %{dbus_version} Requires: dbus >= %{dbus_version}
Requires: dbus-glib >= %{dbus_glib_version} Requires: dbus-glib >= %{dbus_glib_version}
Requires: hal >= 0.5.0 Requires: hal >= %{hal_version}
Requires: iproute openssl Requires: iproute openssl
Requires: dhcdbd Requires: dhcdbd
Requires: dhclient >= 3.0.2-12 Requires: dhclient >= 3.0.2-12
@ -40,21 +37,14 @@ BuildRequires: dbus-devel >= %{dbus_version}
BuildRequires: dbus-glib-devel >= %{dbus_glib_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
BuildRequires: wireless-tools-devel >= %{wireless_tools_version} BuildRequires: wireless-tools-devel >= %{wireless_tools_version}
BuildRequires: hal-devel >= %{hal_version} BuildRequires: hal-devel >= %{hal_version}
BuildRequires: glib2-devel gtk2-devel BuildRequires: glib2-devel
BuildRequires: libglade2-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: GConf2-devel
BuildRequires: gnome-panel-devel
BuildRequires: libgnomeui-devel
BuildRequires: gnome-keyring-devel
BuildRequires: gettext-devel BuildRequires: gettext-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: dhcdbd BuildRequires: dhcdbd
BuildRequires: wpa_supplicant BuildRequires: wpa_supplicant
BuildRequires: libnl-devel BuildRequires: libnl-devel
BuildRequires: libnotify-devel >= 0.3 BuildRequires: perl-XML-Parser
BuildRequires: perl(XML::Parser)
BuildRequires: automake autoconf intltool libtool
%description %description
NetworkManager attempts to keep an active network connection available at all 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. 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 %package devel
Summary: Libraries and headers for adding NetworkManager support to applications Summary: Libraries and headers for adding NetworkManager support to applications
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: dbus-devel >= %{dbus_version} Requires: dbus-devel >= %{dbus_version}
Requires: dbus-glib >= %{dbus_glib_version} Requires: dbus-glib >= %{dbus_glib_version}
Requires: pkgconfig
%description devel %description devel
This package contains various headers accessing some NetworkManager functionality This package contains various headers accessing some NetworkManager functionality
from applications. 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 %prep
%setup -q %setup -q
%patch0 -p1 -b .startup-dhcdbd %patch0 -p1 -b .startup-dhcdbd
%patch2 -p0 -b .fix-ethernet-link-detection %patch1 -p1 -b .wpas-wait-longer
%patch3 -p0 -b .wait-for-wireless %patch2 -p1 -b .no-wpa_supplicant-debug
%patch6 -p1 -b .linkdebug %patch3 -p1 -b .limited-meshdev-wext
# 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 %build
# Even though we don't require named, we still build with it # Even though we don't require named, we still build with it
@ -139,39 +81,22 @@ tar -xjf %{SOURCE1}
--disable-static \ --disable-static \
--with-named=/usr/sbin/named \ --with-named=/usr/sbin/named \
--with-named-dir=/var/named/data \ --with-named-dir=/var/named/data \
--with-named-user=named --with-named-user=named \
--without-gnome
make 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 %install
%{__rm} -rf $RPM_BUILD_ROOT %{__rm} -rf $RPM_BUILD_ROOT
# install NM
make install DESTDIR=$RPM_BUILD_ROOT 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 %{name}
%find_lang nm-applet
cat nm-applet.lang >> %{name}.lang
%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/*.la %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/*.la
%{__mkdir} -p $RPM_BUILD_ROOT%{_bindir}/
%{__cp} test/nm-tool $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 %clean
%{__rm} -rf $RPM_BUILD_ROOT %{__rm} -rf $RPM_BUILD_ROOT
@ -191,27 +116,13 @@ if [ $1 -eq 0 ]; then
/sbin/chkconfig --del NetworkManagerDispatcher /sbin/chkconfig --del NetworkManagerDispatcher
fi 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 %files -f %{name}.lang
%defattr(-,root,root,0755) %defattr(-,root,root,0755)
%doc COPYING ChangeLog NEWS AUTHORS README CONTRIBUTING TODO %doc COPYING ChangeLog NEWS AUTHORS README CONTRIBUTING TODO
%config %{_sysconfdir}/dbus-1/system.d/NetworkManager.conf %config %{_sysconfdir}/dbus-1/system.d/%{name}.conf
%config %{_sysconfdir}/rc.d/init.d/NetworkManager %config %{_sysconfdir}/rc.d/init.d/%{name}
%config %{_sysconfdir}/rc.d/init.d/NetworkManagerDispatcher %config %{_sysconfdir}/rc.d/init.d/%{name}Dispatcher
%{_sbindir}/%{name} %{_sbindir}/%{name}
%{_sbindir}/NetworkManagerDispatcher %{_sbindir}/NetworkManagerDispatcher
%dir %{_sysconfdir}/NetworkManager/ %dir %{_sysconfdir}/NetworkManager/
@ -220,101 +131,60 @@ fi
%{_mandir}/man1/NetworkManager.1.gz %{_mandir}/man1/NetworkManager.1.gz
%{_mandir}/man1/NetworkManagerDispatcher.1.gz %{_mandir}/man1/NetworkManagerDispatcher.1.gz
%{_mandir}/man1/nm-tool.1.gz %{_mandir}/man1/nm-tool.1.gz
%dir %{_localstatedir}/run/NetworkManager %dir %{_localstatedir}/run/%{name}
%{_prefix}/libexec/nm-crash-logger %{_prefix}/libexec/nm-crash-logger
%dir %{_datadir}/NetworkManager
%{_datadir}/NetworkManager/gdb-cmd %{_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 %files devel
%defattr(-,root,root,0755) %defattr(-,root,root,0755)
%dir %{_includedir}/%{name}
%{_includedir}/%{name}/*.h %{_includedir}/%{name}/*.h
%{_libdir}/pkgconfig/%{name}.pc %{_libdir}/pkgconfig/%{name}.pc
%{_libdir}/pkgconfig/libnm-util.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 %changelog
* Sun Jun 10 2007 Dan Williams <dcbw@redhat.com> 1:0.6.5-5 * Thu Jun 14 2007 John (J5) Palmieri <johnp@redhat.com> - 1:0.6.5-0.4.svn2546
- Fix applet crash on 64-bit platforms when choosing - bump and rebuild into OLPC-2
"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-4 * Fri Jun 08 2007 Dan Williams <dcbw@redhat.com> - 1:0.6.5-0.3.svn2546.olpc1
- Fix ethernet link detection (gnome #354565, rh #194124) - Fix operation with latest libertas driver; mesh device doesn't have full
- Fix perpetual credentials request with private key passwords in the applet set of wireless extensions, so use eth device instead
- 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-3 * Fri Jun 08 2007 Dan Williams <dcbw@redhat.com> - 1:0.6.5-0.2.svn2546.olpc1
- Don't spawn wpa_supplicant with -o - Don't launch wpa_supplicant with debug output
* Wed Apr 25 2007 Christopher Aillon <caillon@redhat.com> 1:0.6.5-2 * Fri Apr 06 2007 Dan Williams <dcbw@redhat.com> - 1:0.6.5-0.1.svn2546.olpc1
- Fix requires macro (237806) - 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 <caillon@redhat.com> 1:0.6.5-1 * Thu Apr 05 2007 Dan Williams <dcbw@redhat.com> - 1:0.6.5-0.1.svn2540.olpc1
- Update to 0.6.5 final - Change MPP protocol address & port
- Don't lose scanned security information - 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 <dcbw@redhat.com> - 1:0.6.5-0.7.svn2547 * Sat Mar 31 2007 Dan Williams <dcbw@redhat.com> - 1:0.6.5-0.1.svn2511.olpc1
- Update from trunk - Fix possible infinite idle reschedule
- Updated translations - Add 'anycast' ARP mapping before MPP discovery
- Cleaned-up VPN properties dialogs
- Fix 64-bit kernel leakage issues in WEXT
- Don't capture and redirect wpa_supplicant log output
* Wed Mar 28 2007 Matthew Barnes <mbarnes@redhat.com> 1:0.6.5-0.6.svn2474 * Thu Mar 29 2007 Dan Williams <dcbw@redhat.com> - 1:0.6.5-0.1.svn2508.olpc1
- Close private D-Bus connections. (#232691) - Mesh network device support
* Sun Mar 25 2007 Matthias Clasen <mclasen@redhat.com> 1:0.6.5-0.5.svn2474 * Wed Mar 7 2007 Dan Williams <dcbw@redhat.com> - 1:0.6.5-0.1.svn2446.olpc1
- Fix a directory ownership issue. (#233763) - Update to 0.6.5-pre snapshot
- Disable unused gnome/glib bits
* Thu Mar 15 2007 Dan Williams <dcbw@redhat.com> - 1:0.6.5-0.4.svn2474 * Sun Nov 12 2006 Dan Williams <dcbw@redhat.com> - 1:0.6.4-8
- Update to pre-0.6.5 snapshot - OLPC one-off build: up supplicant timeout, add debug spew
* Thu Feb 8 2007 Christopher Aillon <caillon@redhat.com> - 1:0.6.5-0.3.cvs20061025 * Wed Oct 25 2006 Dan Williams <dcbw@redhat.com> - 1:0.6.4-7
- Guard against D-Bus LimitExceeded messages - Bump revision #
* Fri Feb 2 2007 Christopher Aillon <caillon@redhat.com> - 1:0.6.5-0.2.cvs20061025 * Tue Oct 24 2006 Dan Williams <dcbw@redhat.com> - 1:0.6.4-6
- Move .so file to -devel package - Don't block when grabbing VPN Connection settings from NMI
- Fix more stupid timeouts that wake up the applet periodically
* Sat Nov 25 2006 Matthias Clasen <mclasen@redhat.com>
- 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 <dcbw@redhat.com> - 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 <caillon@redhat.com> - 1:0.6.4-6
- Own /usr/share/NetworkManager and /usr/include/NetworkManager
* Mon Sep 4 2006 Christopher Aillon <caillon@redhat.com> - 1:0.6.4-5 * Mon Sep 4 2006 Christopher Aillon <caillon@redhat.com> - 1:0.6.4-5
- Don't wake up to redraw if NM is inactive (#204850) - Don't wake up to redraw if NM is inactive (#204850)

172
nm-limited-meshdev-wext.patch Normal file
View File

@ -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;

14
nm-no-wpa_supplicant-debug.patch Normal file
View File

@ -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);

3
sources
View File

@ -1,2 +1 @@
b827d300eb28458f6588eb843cba418d NetworkManager-0.6.5.tar.bz2 ac556d6d23b3a3dfb0ebb6fd828c86e3 NetworkManager-0.6.5.svn2546.tar.gz
1c94a41e2399d261985a75f0cd3b895b network-manager-applet-0.6.5.tar.bz2

30
wpas-debugspew.patch Normal file
View File

@ -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);

11
wpas-wait-longer.patch Normal file
View File

@ -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);