summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjarke Istrup Pedersen <gurligebis@gentoo.org>2011-07-07 07:54:55 +0000
committerBjarke Istrup Pedersen <gurligebis@gentoo.org>2011-07-07 07:54:55 +0000
commit2fbf58c2d7dfb2b02d0f2c685cdbd102f14c8e14 (patch)
tree96d93cfd6763196edeabcfa3bb9a492b4c55bfd8 /net-wireless/wpa_supplicant
parentKeyworded ~ppc for all recent versions (not done previously due to responding... (diff)
downloadgentoo-2-2fbf58c2d7dfb2b02d0f2c685cdbd102f14c8e14.tar.gz
gentoo-2-2fbf58c2d7dfb2b02d0f2c685cdbd102f14c8e14.tar.bz2
gentoo-2-2fbf58c2d7dfb2b02d0f2c685cdbd102f14c8e14.zip
Cleaning bug and fixing bugs #373921 and #374089
(Portage version: 2.2.0_alpha43/cvs/Linux i686)
Diffstat (limited to 'net-wireless/wpa_supplicant')
-rw-r--r--net-wireless/wpa_supplicant/ChangeLog12
-rw-r--r--net-wireless/wpa_supplicant/files/fix-ssid-combo.patch121
-rw-r--r--net-wireless/wpa_supplicant/files/wpa_cli.sh9
-rw-r--r--net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.2-dbus_path_fix.patch8
-rw-r--r--net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.2-no-crash.patch22
-rw-r--r--net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-dbus-WPAIE-fix.patch115
-rw-r--r--net-wireless/wpa_supplicant/wpa_supplicant-0.7.2-r3.ebuild258
-rw-r--r--net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r4.ebuild (renamed from net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r3.ebuild)4
8 files changed, 134 insertions, 415 deletions
diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 3b1589cc9fab..bdf14d397f07 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,16 @@
# ChangeLog for net-wireless/wpa_supplicant
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.159 2011/07/01 20:01:04 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.160 2011/07/07 07:54:54 gurligebis Exp $
+
+*wpa_supplicant-0.7.3-r4 (07 Jul 2011)
+
+ 07 Jul 2011; <gurligebis@gentoo.org> -wpa_supplicant-0.7.2-r3.ebuild,
+ -files/wpa_supplicant-0.7.2-dbus_path_fix.patch,
+ -files/wpa_supplicant-0.7.2-no-crash.patch, -wpa_supplicant-0.7.3-r3.ebuild,
+ +wpa_supplicant-0.7.3-r4.ebuild,
+ +files/wpa_supplicant-0.7.3-dbus-WPAIE-fix.patch,
+ -files/fix-ssid-combo.patch, files/wpa_cli.sh:
+ Cleaning bug and fixing bugs #373921 and #374089
01 Jul 2011; <gurligebis@gentoo.org> wpa_supplicant-0.7.3-r3.ebuild:
Fixing multilib-strict problem (bug #373685)
diff --git a/net-wireless/wpa_supplicant/files/fix-ssid-combo.patch b/net-wireless/wpa_supplicant/files/fix-ssid-combo.patch
deleted file mode 100644
index b5d7a0280d56..000000000000
--- a/net-wireless/wpa_supplicant/files/fix-ssid-combo.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From: Kel Modderman <kel@otaku42.de>
-Date: Sun, 2 May 2010 08:17:13 +0000 (+0300)
-Subject: wpa_gui-qt4: Fix network selection
-X-Git-Url: http://hostap.epitest.fi/gitweb/gitweb.cgi?p=hostap.git;a=commitdiff_plain;h=1491f8a78516a5c773583125bd9691323249a6dc;hp=adc8d4a791ca7ef5245d2030d7096cf8675a3720
-
-wpa_gui-qt4: Fix network selection
-
-Use regular expression matches to see if input is not the (now translated?)
-string "Select any network" and is a "<network id>: <ssid>" string or the
-"all" keyword where that is applicable.
-
-Signed-off-by: Kel Modderman <kel@otaku42.de>
----
-
-diff --git a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
-index 94220f4..e15d751 100644
---- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
-+++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
-@@ -971,17 +971,10 @@ void WpaGui::selectNetwork( const QString &sel )
- char reply[10];
- size_t reply_len = sizeof(reply);
-
-- if (cmd.compare(tr("Select any network"))) {
-+ if (cmd.contains(QRegExp("^\\d+:")))
-+ cmd.truncate(cmd.indexOf(':'));
-+ else
- cmd = "any";
-- } else {
-- int pos = cmd.indexOf(':');
-- if (pos < 0) {
-- printf("Invalid selectNetwork '%s'\n",
-- cmd.toAscii().constData());
-- return;
-- }
-- cmd.truncate(pos);
-- }
- cmd.prepend("SELECT_NETWORK ");
- ctrlRequest(cmd.toAscii().constData(), reply, &reply_len);
- triggerUpdate();
-@@ -995,14 +988,12 @@ void WpaGui::enableNetwork(const QString &sel)
- char reply[10];
- size_t reply_len = sizeof(reply);
-
-- if (!cmd.startsWith("all")) {
-- int pos = cmd.indexOf(':');
-- if (pos < 0) {
-- printf("Invalid enableNetwork '%s'\n",
-- cmd.toAscii().constData());
-- return;
-- }
-- cmd.truncate(pos);
-+ if (cmd.contains(QRegExp("^\\d+:")))
-+ cmd.truncate(cmd.indexOf(':'));
-+ else if (!cmd.startsWith("all")) {
-+ printf("Invalid editNetwork '%s'\n",
-+ cmd.toAscii().constData());
-+ return;
- }
- cmd.prepend("ENABLE_NETWORK ");
- ctrlRequest(cmd.toAscii().constData(), reply, &reply_len);
-@@ -1016,14 +1007,12 @@ void WpaGui::disableNetwork(const QString &sel)
- char reply[10];
- size_t reply_len = sizeof(reply);
-
-- if (!cmd.startsWith("all")) {
-- int pos = cmd.indexOf(':');
-- if (pos < 0) {
-- printf("Invalid disableNetwork '%s'\n",
-- cmd.toAscii().constData());
-- return;
-- }
-- cmd.truncate(pos);
-+ if (cmd.contains(QRegExp("^\\d+:")))
-+ cmd.truncate(cmd.indexOf(':'));
-+ else if (!cmd.startsWith("all")) {
-+ printf("Invalid editNetwork '%s'\n",
-+ cmd.toAscii().constData());
-+ return;
- }
- cmd.prepend("DISABLE_NETWORK ");
- ctrlRequest(cmd.toAscii().constData(), reply, &reply_len);
-@@ -1036,14 +1025,8 @@ void WpaGui::editNetwork(const QString &sel)
- QString cmd(sel);
- int id = -1;
-
-- if (!cmd.compare(tr("Select any network"))) {
-- int pos = sel.indexOf(':');
-- if (pos < 0) {
-- printf("Invalid editNetwork '%s'\n",
-- cmd.toAscii().constData());
-- return;
-- }
-- cmd.truncate(pos);
-+ if (cmd.contains(QRegExp("^\\d+:"))) {
-+ cmd.truncate(cmd.indexOf(':'));
- id = cmd.toInt();
- }
-
-@@ -1114,17 +1097,12 @@ void WpaGui::removeNetwork(const QString &sel)
- char reply[10];
- size_t reply_len = sizeof(reply);
-
-- if (cmd.compare(tr("Select any network")))
-+ if (cmd.contains(QRegExp("^\\d+:")))
-+ cmd.truncate(cmd.indexOf(':'));
-+ else if (!cmd.startsWith("all")) {
-+ printf("Invalid editNetwork '%s'\n",
-+ cmd.toAscii().constData());
- return;
--
-- if (!cmd.startsWith("all")) {
-- int pos = cmd.indexOf(':');
-- if (pos < 0) {
-- printf("Invalid removeNetwork '%s'\n",
-- cmd.toAscii().constData());
-- return;
-- }
-- cmd.truncate(pos);
- }
- cmd.prepend("REMOVE_NETWORK ");
- ctrlRequest(cmd.toAscii().constData(), reply, &reply_len);
diff --git a/net-wireless/wpa_supplicant/files/wpa_cli.sh b/net-wireless/wpa_supplicant/files/wpa_cli.sh
index d7d340b90bb6..4b1da4307ca5 100644
--- a/net-wireless/wpa_supplicant/files/wpa_cli.sh
+++ b/net-wireless/wpa_supplicant/files/wpa_cli.sh
@@ -1,9 +1,9 @@
#!/bin/sh
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Written by Roy Marples <uberlord@gentoo.org>
# Distributed under the terms of the GNU General Public License v2
# Alternatively, this file may be distributed under the terms of the BSD License
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_cli.sh,v 1.1 2006/07/11 15:07:16 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_cli.sh,v 1.2 2011/07/07 07:54:55 gurligebis Exp $
if [ -z "$1" -o -z "$2" ]; then
logger -t wpa_cli "Insufficient parameters"
@@ -41,5 +41,6 @@ esac
# stopping the interface and a background process - like wpa_cli - is.
export IN_BACKGROUND=true
-logger -t wpa_cli "interface ${INTERFACE} ${ACTION}"
-${EXEC} || logger -t wpa_cli "executing '${EXEC}' failed"
+# Removed, since stopping /etc/init.d/net.wlanX stops the network completly.
+#logger -t wpa_cli "interface ${INTERFACE} ${ACTION}"
+#${EXEC} || logger -t wpa_cli "executing '${EXEC}' failed"
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.2-dbus_path_fix.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.2-dbus_path_fix.patch
deleted file mode 100644
index eb4a1c01a5e0..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.2-dbus_path_fix.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- dbus/fi.epitest.hostap.WPASupplicant.service 2009-04-15 23:16:19.000000000 +0000
-+++ dbus/fi.epitest.hostap.WPASupplicant.service 2009-04-15 23:16:29.000000000 +0000
-@@ -1,4 +1,4 @@
- [D-BUS Service]
- Name=fi.epitest.hostap.WPASupplicant
--Exec=/sbin/wpa_supplicant -u
-+Exec=/usr/sbin/wpa_supplicant -u
- User=root
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.2-no-crash.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.2-no-crash.patch
deleted file mode 100644
index 2d3ba1a28188..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.2-no-crash.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../src/rsn_supp/preauth.c 2010-01-16 12:04:38.000000000 -0500
-+++ ../src/rsn_supp/preauth.c 2010-02-01 10:08:48.862052876 -0500
-@@ -49,8 +49,10 @@ void pmksa_candidate_free(struct wpa_sm
- return;
-
- dl_list_for_each_safe(entry, n, &sm->pmksa_candidates,
-- struct rsn_pmksa_candidate, list)
-+ struct rsn_pmksa_candidate, list) {
-+ dl_list_del(&entry->list);
- os_free(entry);
-+ }
- }
-
-
-@@ -378,6 +380,7 @@ void pmksa_candidate_add(struct wpa_sm *
- }
-
- if (cand) {
-+ dl_list_del(&cand->list);
- if (prio < PMKID_CANDIDATE_PRIO_SCAN)
- cand->priority = prio;
- } else {
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-dbus-WPAIE-fix.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-dbus-WPAIE-fix.patch
new file mode 100644
index 000000000000..3920da63f383
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-dbus-WPAIE-fix.patch
@@ -0,0 +1,115 @@
+diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_handlers.c.prop-failure wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_handlers.c
+--- wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_handlers.c.prop-failure 2011-04-09 14:04:43.108343777 -0400
++++ wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_handlers.c 2011-04-09 14:44:09.808372285 -0400
+@@ -33,6 +33,14 @@
+ #include "dbus_new_handlers.h"
+ #include "dbus_dict_helpers.h"
+
++/* The getters in this file can also be invoked when building a signal
++ * message to send out spontaneously. In this case, no message is passed
++ * in and if we try to call dbus_message_new_error(), we'll get an
++ * assertion failure. So, #define dbus_message_new_error() to a more
++ * tolerant cut-and-paste version
++ */
++#define dbus_message_new_error wpa_dbus_message_new_error
++
+ extern int wpa_debug_level;
+ extern int wpa_debug_show_keys;
+ extern int wpa_debug_timestamp;
+diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_handlers.h.prop-failure wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_handlers.h
+diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.c.prop-failure wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.c
+--- wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.c.prop-failure 2011-04-09 14:04:18.293117234 -0400
++++ wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.c 2011-04-09 14:51:48.464204876 -0400
+@@ -22,6 +22,42 @@
+ #include "dbus_new.h"
+ #include "dbus_new_helpers.h"
+
++/* This is exactly like dbus_message_new_error, but returns a
++ * (partially filled in) error message in the case reply_to is
++ * NULL rather than failing with an assertion message. This is
++ * useful for getters that we recycle when sending out signals.
++ *
++ * Contains code cut-and-pasted from dbus_message_new_error()
++ * Copyright (C) 2002, 2003, 2004, 2005 Red Hat Inc.
++ * Copyright (C) 2002, 2003 CodeFactory AB
++ */
++DBusMessage*
++wpa_dbus_message_new_error (DBusMessage *reply_to,
++ const char *error_name,
++ const char *error_message)
++{
++ if (reply_to) {
++ return dbus_message_new_error(reply_to, error_name, error_message);
++ } else {
++ DBusMessage *message = dbus_message_new(DBUS_MESSAGE_TYPE_ERROR);
++ DBusMessageIter iter;
++
++ dbus_message_set_error_name(message, error_name);
++ dbus_message_set_no_reply(message, TRUE);
++
++ if (error_message != NULL) {
++ dbus_message_iter_init_append(message, &iter);
++ if (!dbus_message_iter_append_basic(&iter,
++ DBUS_TYPE_STRING,
++ &error_message)) {
++ dbus_message_unref(message);
++ return NULL;
++ }
++ }
++
++ return message;
++ }
++}
+
+ /**
+ * recursive_iter_copy - Reads arguments from one iterator and
+@@ -86,6 +122,7 @@ static void recursive_iter_copy(DBusMess
+
+
+ static unsigned int fill_dict_with_properties(
++ DBusMessage *message,
+ DBusMessageIter *dict_iter, const struct wpa_dbus_property_desc *props,
+ const char *interface, const void *user_data)
+ {
+@@ -98,7 +135,7 @@ static unsigned int fill_dict_with_prope
+ if (!os_strncmp(dsc->dbus_interface, interface,
+ WPAS_DBUS_INTERFACE_MAX) &&
+ dsc->access != W && dsc->getter) {
+- reply = dsc->getter(NULL, user_data);
++ reply = dsc->getter(message, user_data);
+ if (!reply)
+ continue;
+
+@@ -160,7 +197,8 @@ static DBusMessage * get_all_properties(
+ DBUS_DICT_ENTRY_END_CHAR_AS_STRING,
+ &dict_iter);
+
+- props_num = fill_dict_with_properties(&dict_iter, obj_dsc->properties,
++ props_num = fill_dict_with_properties(message,
++ &dict_iter, obj_dsc->properties,
+ interface, obj_dsc->user_data);
+
+ dbus_message_iter_close_container(&iter, &dict_iter);
+@@ -870,6 +908,7 @@ void wpa_dbus_get_object_properties(stru
+ return;
+ }
+
+- fill_dict_with_properties(dict_iter, obj_desc->properties,
++ fill_dict_with_properties(NULL,
++ dict_iter, obj_desc->properties,
+ interface, obj_desc->user_data);
+ }
+diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.h.prop-failure wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.h
+--- wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.h.prop-failure 2011-04-09 14:04:25.130180461 -0400
++++ wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.h 2011-04-09 14:38:53.092075181 -0400
+@@ -112,6 +112,10 @@ struct wpa_dbus_property_desc {
+ #define WPA_DBUS_PROPERTIES_SET "Set"
+ #define WPA_DBUS_PROPERTIES_GETALL "GetAll"
+
++DBusMessage* wpa_dbus_message_new_error (DBusMessage *reply_to,
++ const char *error_name,
++ const char *error_message);
++
+ void free_dbus_object_desc(struct wpa_dbus_object_desc *obj_dsc);
+
+ int wpa_dbus_ctrl_iface_init(struct wpas_dbus_priv *iface, char *dbus_path,
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.2-r3.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.2-r3.ebuild
deleted file mode 100644
index f8a2b2d3ca99..000000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.2-r3.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# Copyright 1999-2010 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.7.2-r3.ebuild,v 1.6 2010/09/26 11:52:03 armin76 Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs qt4-r2
-
-DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
-HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
-SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
-LICENSE="|| ( GPL-2 BSD )"
-
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd"
-IUSE="dbus debug gnutls eap-sim fasteap madwifi ps3 qt4 readline ssl wps kernel_linux kernel_FreeBSD"
-
-RDEPEND="dbus? ( sys-apps/dbus )
- kernel_linux? (
- eap-sim? ( sys-apps/pcsc-lite )
- madwifi? ( ||
- ( >net-wireless/madwifi-ng-tools-0.9.3
- net-wireless/madwifi-old )
- )
- dev-libs/libnl
- )
- !kernel_linux? ( net-libs/libpcap )
- qt4? ( x11-libs/qt-gui:4
- x11-libs/qt-svg:4 )
- readline? ( sys-libs/ncurses sys-libs/readline )
- ssl? ( dev-libs/openssl )
- !ssl? ( gnutls? ( net-libs/gnutls ) )
- !ssl? ( !gnutls? ( dev-libs/libtommath ) )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig"
-
-S="${WORKDIR}/${P}/${PN}"
-
-pkg_setup() {
- if use fasteap && (use gnutls || use ssl) ; then
- die "If you use fasteap, you must build with wpa_supplicant's internal TLS implementation. That is, both 'gnutls' and 'ssl' USE flags must be disabled"
- fi
-
- if use gnutls && use ssl ; then
- einfo "You have both 'gnutls' and 'ssl' USE flags enabled: defaulting to USE=\"ssl\""
- fi
-}
-
-src_prepare() {
- # net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD
- sed -i \
- -e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
- ../src/l2_packet/l2_packet_freebsd.c || die
-
- # People seem to take the example configuration file too literally (bug #102361)
- sed -i \
- -e "s:^\(opensc_engine_path\):#\1:" \
- -e "s:^\(pkcs11_engine_path\):#\1:" \
- -e "s:^\(pkcs11_module_path\):#\1:" \
- wpa_supplicant.conf || die
-
- # Change configuration to match Gentoo locations (bug #143750)
- sed -i \
- -e "s:/usr/lib/opensc:/usr/$(get_libdir):" \
- -e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \
- wpa_supplicant.conf || die
-
- epatch "${FILESDIR}/${P}-dbus_path_fix.patch"
-
- # bug (320097)
- epatch "${FILESDIR}/do-not-call-dbus-functions-with-NULL-path.patch"
-
- # bug (321627)
- epatch "${FILESDIR}/fix-ssid-combo.patch"
-
- # bug (330085)
- epatch "${FILESDIR}/${P}-no-crash.patch"
-}
-
-src_configure() {
- # Toolchain setup
- echo "CC = $(tc-getCC)" > .config
-
- # Basic setup
- echo "CONFIG_CTRL_IFACE=y" >> .config
- echo "CONFIG_BACKEND=file" >> .config
-
- # Basic authentication methods
- # NOTE: we don't set GPSK or SAKE as they conflict
- # with the below options
- echo "CONFIG_EAP_GTC=y" >> .config
- echo "CONFIG_EAP_MD5=y" >> .config
- echo "CONFIG_EAP_OTP=y" >> .config
- echo "CONFIG_EAP_PAX=y" >> .config
- echo "CONFIG_EAP_PSK=y" >> .config
- echo "CONFIG_EAP_TLV=y" >> .config
- echo "CONFIG_IEEE8021X_EAPOL=y" >> .config
- echo "CONFIG_PKCS12=y" >> .config
- echo "CONFIG_PEERKEY=y" >> .config
- echo "CONFIG_EAP_LEAP=y" >> .config
- echo "CONFIG_EAP_MSCHAPV2=y" >> .config
- echo "CONFIG_EAP_PEAP=y" >> .config
- echo "CONFIG_EAP_TLS=y" >> .config
- echo "CONFIG_EAP_TTLS=y" >> .config
-
- if use dbus ; then
- echo "CONFIG_CTRL_IFACE_DBUS=y" >> .config
- fi
-
- if use debug ; then
- echo "CONFIG_DEBUG_FILE=y" >> .config
- fi
-
- if use eap-sim ; then
- # Smart card authentication
- echo "CONFIG_EAP_SIM=y" >> .config
- echo "CONFIG_EAP_AKA=y" >> .config
- echo "CONFIG_EAP_AKA_PRIME=y" >> .config
- echo "CONFIG_PCSC=y" >> .config
- fi
-
- if use fasteap ; then
- echo "CONFIG_EAP_FAST=y" >> .config
- fi
-
- if use readline ; then
- # readline/history support for wpa_cli
- echo "CONFIG_READLINE=y" >> .config
- fi
-
- # SSL authentication methods
- if use ssl ; then
- echo "CONFIG_TLS=openssl" >> .config
- echo "CONFIG_SMARTCARD=y" >> .config
- elif use gnutls ; then
- echo "CONFIG_TLS=gnutls" >> .config
- echo "CONFIG_GNUTLS_EXTRA=y" >> .config
- else
- echo "CONFIG_TLS=internal" >> .config
- fi
-
- if use kernel_linux ; then
- # Linux specific drivers
- echo "CONFIG_DRIVER_ATMEL=y" >> .config
- #echo "CONFIG_DRIVER_BROADCOM=y" >> .config
- #echo "CONFIG_DRIVER_HERMES=y" >> .config
- echo "CONFIG_DRIVER_HOSTAP=y" >> .config
- echo "CONFIG_DRIVER_IPW=y" >> .config
- echo "CONFIG_DRIVER_NDISWRAPPER=y" >> .config
- echo "CONFIG_DRIVER_NL80211=y" >> .config
- #echo "CONFIG_DRIVER_PRISM54=y" >> .config
- echo "CONFIG_DRIVER_RALINK=y" >> .config
- echo "CONFIG_DRIVER_WEXT=y" >> .config
- echo "CONFIG_DRIVER_WIRED=y" >> .config
-
- if use madwifi ; then
- # Add include path for madwifi-driver headers
- echo "CFLAGS += -I/usr/include/madwifi" >> .config
- echo "CONFIG_DRIVER_MADWIFI=y" >> .config
- fi
-
- if use ps3 ; then
- echo "CONFIG_DRIVER_PS3=y" >> .config
- fi
-
- elif use kernel_FreeBSD ; then
- # FreeBSD specific driver
- echo "CONFIG_DRIVER_BSD=y" >> .config
- fi
-
- # Wi-Fi Protected Setup (WPS)
- if use wps ; then
- echo "CONFIG_WPS=y" >> .config
- fi
-
- # Enable mitigation against certain attacks against TKIP
- echo "CONFIG_DELAYED_MIC_ERROR_REPORT=y" >> .config
-
- if use qt4 ; then
- cd "${S}"/wpa_gui-qt4
- eqmake4 wpa_gui.pro
- fi
-}
-
-src_compile() {
- einfo "Building wpa_supplicant"
- emake || die "emake failed"
-
- if use qt4 ; then
- cd "${S}"/wpa_gui-qt4
- einfo "Building wpa_gui"
- emake || die "wpa_gui compilation failed"
- fi
-}
-
-src_install() {
- dosbin wpa_supplicant || die
- dobin wpa_cli wpa_passphrase || die
-
- # baselayout-1 compat
- if has_version "<sys-apps/baselayout-2.0.0"; then
- dodir /sbin
- dosym /usr/sbin/wpa_supplicant /sbin/wpa_supplicant || die
- dodir /bin
- dosym /usr/bin/wpa_cli /bin/wpa_cli || die
- fi
-
- if has_version ">=sys-apps/openrc-0.5.0"; then
- newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant
- newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant
- fi
-
- exeinto /etc/wpa_supplicant/
- newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh
-
- dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \
- wpa_supplicant.conf || die "dodoc failed"
-
- doman doc/docbook/*.{5,8} || die "doman failed"
-
- if use qt4 ; then
- into /usr
- dobin wpa_gui-qt4/wpa_gui || die
- doicon wpa_gui-qt4/icons/wpa_gui.svg || die "Icon not found"
- make_desktop_entry wpa_gui "WPA Supplicant Administration GUI" "wpa_gui" "Qt;Network;"
- fi
-
- if use dbus ; then
- cd "${S}"/dbus
- insinto /etc/dbus-1/system.d
- newins dbus-wpa_supplicant.conf wpa_supplicant.conf || die
- insinto /usr/share/dbus-1/system-services
- doins fi.epitest.hostap.WPASupplicant.service || die
- keepdir /var/run/wpa_supplicant
- fi
-}
-
-pkg_postinst() {
- einfo "If this is a clean installation of wpa_supplicant, you"
- einfo "have to create a configuration file named"
- einfo "/etc/wpa_supplicant/wpa_supplicant.conf"
- einfo
- einfo "An example configuration file is available for reference in"
- einfo "/usr/share/doc/${PF}/"
-
- if [[ -e ${ROOT}etc/wpa_supplicant.conf ]] ; then
- echo
- ewarn "WARNING: your old configuration file ${ROOT}etc/wpa_supplicant.conf"
- ewarn "needs to be moved to ${ROOT}etc/wpa_supplicant/wpa_supplicant.conf"
- fi
-
- if use madwifi ; then
- echo
- einfo "This package compiles against the headers installed by"
- einfo "madwifi-old, madwifi-ng or madwifi-ng-tools."
- einfo "You should re-emerge ${PN} after upgrading these packages."
- fi
-}
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r3.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r4.ebuild
index f577ebc1e013..49ae8d88a996 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r3.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.7.3-r3.ebuild,v 1.4 2011/07/01 20:01:04 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r4.ebuild,v 1.1 2011/07/07 07:54:54 gurligebis Exp $
EAPI="2"
@@ -80,6 +80,8 @@ src_prepare() {
epatch "${FILESDIR}/do-not-call-dbus-functions-with-NULL-path.patch"
# https://bugzilla.gnome.org/show_bug.cgi?id=644634
epatch "${FILESDIR}/${P}-dbus-api-changes.patch"
+ # bug (374089)
+ epatch "${FILESDIR}/${P}-dbus-WPAIE-fix.patch"
}
src_configure() {