summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <uberlord@gentoo.org>2006-09-30 18:22:35 +0000
committerRoy Marples <uberlord@gentoo.org>2006-09-30 18:22:35 +0000
commitc6c1a604d69e352a820b1015894c6f5ecabc9cba (patch)
treec86bd5185683fd9c73f1731e7612194529f2854e /net-wireless
parentVersion bump. (diff)
downloadgentoo-2-c6c1a604d69e352a820b1015894c6f5ecabc9cba.tar.gz
gentoo-2-c6c1a604d69e352a820b1015894c6f5ecabc9cba.tar.bz2
gentoo-2-c6c1a604d69e352a820b1015894c6f5ecabc9cba.zip
Add a patch to make the wext driver the default instead of hostap.
(Portage version: 2.1.2_pre2)
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/wpa_supplicant/ChangeLog8
-rw-r--r--net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.5-default_driver.patch42
-rw-r--r--net-wireless/wpa_supplicant/wpa_supplicant-0.5.5.ebuild5
3 files changed, 53 insertions, 2 deletions
diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 839b283f5050..39b939f6b737 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-wireless/wpa_supplicant
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.77 2006/09/29 09:15:43 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.78 2006/09/30 18:22:35 uberlord Exp $
+
+ 30 Sep 2006; Roy Marples <uberlord@gentoo.org>
+ +files/wpa_supplicant-0.5.5-default_driver.patch,
+ wpa_supplicant-0.5.5.ebuild:
+ Add a patch to make the wext driver the default instead of hostap.
+ wext works with hostap so this should not break anything.
29 Sep 2006; Roy Marples <uberlord@gentoo.org>
+files/wpa_supplicant-0.5.5-sigpoll.patch, wpa_supplicant-0.5.5.ebuild:
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.5-default_driver.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.5-default_driver.patch
new file mode 100644
index 000000000000..6f3a845cc1c6
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.5-default_driver.patch
@@ -0,0 +1,42 @@
+--- drivers.c.orig 2006-09-06 10:43:08.000000000 +0100
++++ drivers.c 2006-09-06 10:44:22.000000000 +0100
+@@ -15,6 +15,9 @@
+ #include "includes.h"
+
+
++#ifdef CONFIG_DRIVER_WEXT
++extern struct wpa_driver_ops wpa_driver_wext_ops; /* driver_wext.c */
++#endif /* CONFIG_DRIVER_WEXT */
+ #ifdef CONFIG_DRIVER_HOSTAP
+ extern struct wpa_driver_ops wpa_driver_hostap_ops; /* driver_hostap.c */
+ #endif /* CONFIG_DRIVER_HOSTAP */
+@@ -30,9 +33,6 @@
+ #ifdef CONFIG_DRIVER_ATMEL
+ extern struct wpa_driver_ops wpa_driver_atmel_ops; /* driver_atmel.c */
+ #endif /* CONFIG_DRIVER_ATMEL */
+-#ifdef CONFIG_DRIVER_WEXT
+-extern struct wpa_driver_ops wpa_driver_wext_ops; /* driver_wext.c */
+-#endif /* CONFIG_DRIVER_WEXT */
+ #ifdef CONFIG_DRIVER_NDISWRAPPER
+ /* driver_ndiswrapper.c */
+ extern struct wpa_driver_ops wpa_driver_ndiswrapper_ops;
+@@ -59,6 +59,9 @@
+
+ struct wpa_driver_ops *wpa_supplicant_drivers[] =
+ {
++#ifdef CONFIG_DRIVER_WEXT
++ &wpa_driver_wext_ops,
++#endif /* CONFIG_DRIVER_WEXT */
+ #ifdef CONFIG_DRIVER_HOSTAP
+ &wpa_driver_hostap_ops,
+ #endif /* CONFIG_DRIVER_HOSTAP */
+@@ -74,9 +77,6 @@
+ #ifdef CONFIG_DRIVER_ATMEL
+ &wpa_driver_atmel_ops,
+ #endif /* CONFIG_DRIVER_ATMEL */
+-#ifdef CONFIG_DRIVER_WEXT
+- &wpa_driver_wext_ops,
+-#endif /* CONFIG_DRIVER_WEXT */
+ #ifdef CONFIG_DRIVER_NDISWRAPPER
+ &wpa_driver_ndiswrapper_ops,
+ #endif /* CONFIG_DRIVER_NDISWRAPPER */
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.5.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.5.ebuild
index 32cf47b90fc9..3eff22c85bad 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.5.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.5.5.ebuild,v 1.6 2006/09/29 09:15:43 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.5.5.ebuild,v 1.7 2006/09/30 18:22:35 uberlord Exp $
inherit eutils toolchain-funcs
@@ -46,6 +46,9 @@ src_unpack() {
# If we don't have SIGPOLL (like FreeBSD), use SIGIO instead
epatch "${FILESDIR}/${P}-sigpoll.patch"
+ # Change the default driver to wext for Linux systems.
+ epatch "${FILESDIR}/${P}-default_driver.patch"
+
# net/bpf.h needed for net-libs/libpcap on Gentoo FreeBSD
sed -i \
-e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \