commit: 8221cefdafdb767d61ee3e8c2c10a1ea5a3f5aac
Author: Felix Janda <felix.janda <AT> posteo <DOT> de>
AuthorDate: Fri Oct 10 16:54:14 2014 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Oct 10 18:20:27 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=8221cefd
net-libs/wpa_supplicant: bump to 2.2
---
...x.patch => wpa_supplicant-2.2-dbus-path-fix.patch} | 0
...2-do-not-call-dbus-functions-with-NULL-path.patch} | 0
...fix-undefined-reference-to-random_get_bytes.patch} | 0
... => wpa_supplicant-2.2-generate-libeap-peer.patch} | 4 ++--
...t-2.0-r99.ebuild => wpa_supplicant-2.2-r99.ebuild} | 19 +++++++++++--------
5 files changed, 13 insertions(+), 10 deletions(-)
diff --git
a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.0-dbus-path-fix.patch
b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.2-dbus-path-fix.patch
similarity index 100%
rename from
net-wireless/wpa_supplicant/files/wpa_supplicant-2.0-dbus-path-fix.patch
rename to
net-wireless/wpa_supplicant/files/wpa_supplicant-2.2-dbus-path-fix.patch
diff --git
a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.0-do-not-call-dbus-functions-with-NULL-path.patch
b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.2-do-not-call-dbus-functions-with-NULL-path.patch
similarity index 100%
rename from
net-wireless/wpa_supplicant/files/wpa_supplicant-2.0-do-not-call-dbus-functions-with-NULL-path.patch
rename to
net-wireless/wpa_supplicant/files/wpa_supplicant-2.2-do-not-call-dbus-functions-with-NULL-path.patch
diff --git
a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.0-fix-undefined-reference-to-random_get_bytes.patch
b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.2-fix-undefined-reference-to-random_get_bytes.patch
similarity index 100%
rename from
net-wireless/wpa_supplicant/files/wpa_supplicant-2.0-fix-undefined-reference-to-random_get_bytes.patch
rename to
net-wireless/wpa_supplicant/files/wpa_supplicant-2.2-fix-undefined-reference-to-random_get_bytes.patch
diff --git
a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.0-generate-libeap-peer.patch
b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.2-generate-libeap-peer.patch
similarity index 98%
rename from
net-wireless/wpa_supplicant/files/wpa_supplicant-2.0-generate-libeap-peer.patch
rename to
net-wireless/wpa_supplicant/files/wpa_supplicant-2.2-generate-libeap-peer.patch
index 1fb9b10..391338b 100644
---
a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.0-generate-libeap-peer.patch
+++
b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.2-generate-libeap-peer.patch
@@ -339,8 +339,8 @@ diff -Naurp a/src/eap_peer/Makefile b/src/eap_peer/Makefile
+ rm -f $(DESTDIR)/usr/lib/pkgconfig/libeap0.pc
clean:
-- rm -f *~ *.o *.so *.d
-+ rm -f *~ *.o *.so *.d libeap.a $(LIBEAP) $(OBJS_lib)
+- rm -f *~ *.o *.so *.d *.gcno *.gcda *.gcov
++ rm -f *~ *.o *.so *.d *.gcno *.gcda *.gcov libeap.a $(LIBEAP)
$(OBJS_lib)
-install:
- if ls *.so >/dev/null 2>&1; then \
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.0-r99.ebuild
b/net-wireless/wpa_supplicant/wpa_supplicant-2.2-r99.ebuild
similarity index 95%
rename from net-wireless/wpa_supplicant/wpa_supplicant-2.0-r99.ebuild
rename to net-wireless/wpa_supplicant/wpa_supplicant-2.2-r99.ebuild
index 36e4089..03f59eb 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.0-r99.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.2-r99.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-2.0-r2.ebuild,v
1.6 2013/12/22 12:03:58 ago Exp $
+# $Header:
/var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-2.2-r1.ebuild,v
1.4 2014/10/05 19:07:17 zerochaos Exp $
EAPI=4
@@ -24,6 +24,7 @@ RDEPEND="dbus? ( sys-apps/dbus )
)
!kernel_linux? ( net-libs/libpcap )
qt4? (
+ dev-qt/qtcore:4
dev-qt/qtgui:4
dev-qt/qtsvg:4
)
@@ -88,7 +89,8 @@ src_prepare() {
# bug (320097)
epatch
"${FILESDIR}/${P}-do-not-call-dbus-functions-with-NULL-path.patch"
- epatch "${FILESDIR}/${P}-linux_wext.patch"
+ # for musl
+ epatch "${FILESDIR}/${PN}-2.0-linux_wext.patch"
# TODO - NEED TESTING TO SEE IF STILL NEEDED, NOT COMPATIBLE WITH 1.0
OUT OF THE BOX,
# SO WOULD BE NICE TO JUST DROP IT, IF IT IS NOT NEEDED.
@@ -103,6 +105,7 @@ src_configure() {
# Basic setup
echo "CONFIG_CTRL_IFACE=y" >> .config
echo "CONFIG_BACKEND=file" >> .config
+ echo "CONFIG_IBSS_RSN=y" >> .config
# Basic authentication methods
# NOTE: we don't set GPSK or SAKE as they conflict
@@ -113,6 +116,7 @@ src_configure() {
echo "CONFIG_EAP_PAX=y" >> .config
echo "CONFIG_EAP_PSK=y" >> .config
echo "CONFIG_EAP_TLV=y" >> .config
+ echo "CONFIG_EAP_EXE=y" >> .config
echo "CONFIG_IEEE8021X_EAPOL=y" >> .config
echo "CONFIG_PKCS12=y" >> .config
echo "CONFIG_PEERKEY=y" >> .config
@@ -122,6 +126,10 @@ src_configure() {
echo "CONFIG_EAP_TLS=y" >> .config
echo "CONFIG_EAP_TTLS=y" >> .config
+ # Enabling background scanning.
+ echo "CONFIG_BGSCAN_SIMPLE=y" >> .config
+ echo "CONFIG_BGSCAN_LEARN=y" >> .config
+
if use dbus ; then
echo "CONFIG_CTRL_IFACE_DBUS=y" >> .config
echo "CONFIG_CTRL_IFACE_DBUS_NEW=y" >> .config
@@ -165,13 +173,9 @@ src_configure() {
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
@@ -284,7 +288,6 @@ src_install() {
newins dbus-wpa_supplicant.conf wpa_supplicant.conf
insinto /usr/share/dbus-1/system-services
doins fi.epitest.hostap.WPASupplicant.service
fi.w1.wpa_supplicant1.service
- keepdir /var/run/wpa_supplicant
popd > /dev/null
fi
