Adding patch to fix missing symbox in libeap, fixing bug #470038

(Portage version: 2.2.0_alpha175/cvs/Linux i686, signed Manifest commit with key 15AE484C)

3 files changed, 31 insertions, 2 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 2d024c8a4938..6a81add0191e 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.198 2013/04/28 16:02:30 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.199 2013/05/19 07:41:08 gurligebis Exp $
+
+*wpa_supplicant-2.0-r2 (19 May 2013)
+
+  19 May 2013; <gurligebis@gentoo.org> -wpa_supplicant-2.0-r1.ebuild,
+  +wpa_supplicant-2.0-r2.ebuild,
+  +files/wpa_supplicant-2.0-fix-undefined-reference-to-random_get_bytes.patch:
+  Adding patch to fix missing symbox in libeap, fixing bug #470038
 
 *wpa_supplicant-2.0-r1 (28 Apr 2013)
 
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.0-fix-undefined-reference-to-random_get_bytes.patch
new file mode 100644
index 000000000000..def43a2ae314
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.0-fix-undefined-reference-to-random_get_bytes.patch
@@ -0,0 +1,19 @@
+diff -Naur a/src/eap_peer/Makefile b/src/eap_peer/Makefile
+--- a/src/eap_peer/Makefile	2013-05-17 09:51:55.000000000 +0000
++++ b/src/eap_peer/Makefile	2013-05-17 09:54:03.010830904 +0000
+@@ -36,6 +36,7 @@
+ OBJS_both += ../utils/wpa_debug.o
+ OBJS_both += ../utils/base64.o
+ OBJS_both += ../utils/wpabuf.o
++OBJS_both += ../utils/eloop.o
+ OBJS_both += ../crypto/md5.o
+ ifneq ($(CONFIG_TLS), openssl)
+ OBJS_both += ../crypto/sha1.o
+@@ -48,6 +49,7 @@
+ OBJS_both += ../crypto/aes-omac1.o
+ OBJS_both += ../crypto/ms_funcs.o
+ OBJS_both += ../crypto/sha256.o
++OBJS_both += ../crypto/random.o
+ 
+ 
+ OBJS_both += ../eap_common/eap_peap_common.o
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.0-r1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.0-r2.ebuild
index 7f62869e8985..f95bf75d71b3 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.0-r1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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-r1.ebuild,v 1.1 2013/04/28 16:02:30 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-2.0-r2.ebuild,v 1.1 2013/05/19 07:41:08 gurligebis Exp $
 
 EAPI=4
 
@@ -76,7 +76,10 @@ src_prepare() {
 	cd "${WORKDIR}/${P}"
 
 	if use wimax; then
+		# generate-libeap-peer.patch comes before
+		# fix-undefined-reference-to-random_get_bytes.patch
 		epatch "${FILESDIR}/${P}-generate-libeap-peer.patch"
+		epatch "${FILESDIR}/${P}-fix-undefined-reference-to-random_get_bytes.patch"
 
 		# multilib-strict fix (bug #373685)
 		sed -e "s/\/usr\/lib/\/usr\/$(get_libdir)/" -i src/eap_peer/Makefile