summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Shvetsov <alexxy@gentoo.org>2011-01-12 19:51:44 +0000
committerAlexey Shvetsov <alexxy@gentoo.org>2011-01-12 19:51:44 +0000
commitc9751ca049f532b9fd62be58fda6a029d019129b (patch)
tree28d3eaeb6c6d7e4c5d55238cfbccfa1bdf01fa1a /net-wireless
parentBump to 0.10.31. Minor fixes in this release. (diff)
downloadgentoo-2-c9751ca049f532b9fd62be58fda6a029d019129b.tar.gz
gentoo-2-c9751ca049f532b9fd62be58fda6a029d019129b.tar.bz2
gentoo-2-c9751ca049f532b9fd62be58fda6a029d019129b.zip
[net-wireless/wpa_supplicant] Fix bug #351174. Thanks to Fabio Correa
(Portage version: 2.2.0_alpha14_p1/cvs/Linux x86_64)
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/wpa_supplicant/ChangeLog11
-rw-r--r--net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-dbus_path_fix.patch12
-rw-r--r--net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r2.ebuild (renamed from net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r1.ebuild)8
3 files changed, 24 insertions, 7 deletions
diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 3499253f7076..d260b10ebaf5 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-wireless/wpa_supplicant
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.151 2010/11/08 17:40:39 alexxy Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.152 2011/01/12 19:51:44 alexxy Exp $
+
+*wpa_supplicant-0.7.3-r2 (12 Jan 2011)
+
+ 12 Jan 2011; Alexey Shvetsov <alexxy@gentoo.org>
+ -wpa_supplicant-0.7.3-r1.ebuild, +wpa_supplicant-0.7.3-r2.ebuild,
+ files/wpa_supplicant-0.7.3-dbus_path_fix.patch:
+ Fix bug #351174. Thanks to Fabio Correa
08 Nov 2010; Alexey Shvetsov <alexxy@gentoo.org>
-wpa_supplicant-0.6.10-r1.ebuild,
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-dbus_path_fix.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-dbus_path_fix.patch
index eb4a1c01a5e0..ac82943fbe7f 100644
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-dbus_path_fix.patch
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-dbus_path_fix.patch
@@ -1,8 +1,16 @@
---- 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
+--- dbus/fi.epitest.hostap.WPASupplicant.service 2010-09-07 10:43:39.000000000 -0500
++++ dbus/fi.epitest.hostap.WPASupplicant.service 2011-01-08 19:41:32.969507889 -0500
@@ -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
+--- dbus/fi.w1.wpa_supplicant1.service 2010-09-07 10:43:39.000000000 -0500
++++ dbus/fi.w1.wpa_supplicant1.service 2011-01-08 19:42:12.420246349 -0500
+@@ -1,4 +1,4 @@
+ [D-BUS Service]
+ Name=fi.w1.wpa_supplicant1
+-Exec=/sbin/wpa_supplicant -u
++Exec=/usr/sbin/wpa_supplicant -u
+ User=root
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r2.ebuild
index e69e1e1debdd..77b4f1775b46 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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-r1.ebuild,v 1.1 2010/11/08 17:39:02 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r2.ebuild,v 1.1 2011/01/12 19:51:44 alexxy Exp $
EAPI="2"
@@ -105,6 +105,8 @@ src_configure() {
if use dbus ; then
echo "CONFIG_CTRL_IFACE_DBUS=y" >> .config
+ echo "CONFIG_CTRL_IFACE_DBUS_NEW=y" >> .config
+ echo "CONFIG_CTRL_IFACE_DBUS_INTRO=y" >> .config
fi
if use debug ; then
@@ -239,7 +241,7 @@ src_install() {
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
+ doins fi.epitest.hostap.WPASupplicant.service fi.w1.wpa_supplicant1.service || die
keepdir /var/run/wpa_supplicant
fi
}