Bumping to 2.4 and fixing bug #537166 and #543656

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x15AE484C

4 files changed, 62 insertions, 9 deletions

diff --git a/net-wireless/hostapd/ChangeLog b/net-wireless/hostapd/ChangeLog
index ec61be2ce0c0..fc54ff766f40 100644
--- a/net-wireless/hostapd/ChangeLog
+++ b/net-wireless/hostapd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/hostapd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.153 2015/01/08 09:41:10 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.154 2015/03/21 13:19:27 gurligebis Exp $
+
+*hostapd-2.4 (21 Mar 2015)
+
+  21 Mar 2015; <gurligebis@gentoo.org> -hostapd-2.3.ebuild,
+  +hostapd-2.4.ebuild, +files/hostapd-hlr_auc_gw-openssl.patch:
+  Bumping to 2.4 and fixing bug #537166 and #543656
 
   08 Jan 2015; Alexis Ballier <aballier@gentoo.org> hostapd-2.3.ebuild:
   keyword ~arm
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 2ec4d8dafd8a..f37ff2627c42 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -3,18 +3,19 @@ Hash: SHA256
 
 AUX hostapd-2.0-tls_length_fix.patch 1859 SHA256 bbca0422a0babbf9d7fad2b758ecddaae45624db1b2db6d7663292548e25906a SHA512 e354e9352605003101cba296735232d11ac685f1db8718e5d59b55de1b86b55144e4871afe85cae4374f52af1b42df3ebd4747e109c86e0750ef9eb5345453d7 WHIRLPOOL 6a9379b09ffb73d13ea813952e2b39b5ab90ec98a27ed211ff2904d52e346c9e6273fe99e8ae6509773597afa352d9e77f3081103c5e5c55c86e12f8176a5419
 AUX hostapd-conf.d 245 SHA256 916f4b14095ee4ec8a510391c883e9f01868e18d79a3d5cbeb13a104a793d45d SHA512 f07a6cd209eca351b8545017c5f025282c3fdea838ca3df49e362571ded43973281ce4ff83984b1299db15ea9b5c21a42cbda91432220af9146bf034e2265c30 WHIRLPOOL 0ab1dbd8e04df9e7b8ae875dfdfdcdd770e4fcb62197bb81e47588a9ecf0b8bb715adbde34f2be82d630fdd536e9f888f463dd12cab0c06220c345b0093a3dd5
+AUX hostapd-hlr_auc_gw-openssl.patch 1232 SHA256 4c5b17af2825611ae479b7037b0dcdf19eab49f97c2191a3cfda709befd3ca30 SHA512 53f5dbcd03d3c824c13c02f69680cd581cb1107e48b8e63a281cef1339ff0303cbcb91e9b46640b28daec4252d7aa6069ea541a260900201a00e1d484a6b7a7e WHIRLPOOL 8eda4cbf0a80a5386d3599a1e5753b17038c34568823c14e12ed56af0da1f98a1a712a1f5ab930e98b67bf73704f3225771c6d60ba5ffb8de3a02f49564c4f6b
 AUX hostapd-init.d 858 SHA256 b9701b9ea509638ee1ed74bec38a22e6bd7358763497ce53c146d2faf9e97a61 SHA512 f34c28422aad0ccc7f144ce391f908d38cac2a04785358337f962da401449ca83e310714f9d852cec9c119d7d2457b9264309b87a553f194b3cde66686000c2d WHIRLPOOL 456dd8982344e31a9c198fbc66d27e2f5080abcf974bced857ecfc5825ac8212829383525cbe81edfda01323133414a62eada9af84f3c80424077dcb7d822217
 AUX hostapd.service 213 SHA256 16f0612c192fb5d7e7de716f25fdfc2ccecc35a00ff745ae67e02d7292558d8f SHA512 4d1a1619c49ad0272f360d2c9d79f2fd30503786fe8f22dd3fc4abcc39176029fe907c79d22f168c100b0d7b4ac969b5f4b5815d5ebe6805db5881dda69eef29 WHIRLPOOL 3e415fa8068aa429cb37c7957d396d5e261b5843ae06eb81370728be36573e59e90707c7047b336eb82562e98017608e712ceb28afe2bae385b2821e1cdbd856
 DIST hostapd-2.0.tar.gz 1376203 SHA256 262ce394b930bccc3d65fb99ee380f28d36444978f524c845a98e8e29f4e9d35 SHA512 25fddaaddb22903078cfaae29a1e955b60955f9f5542b52962a6a8d4c65146ca102e9ac085118ce422843c55349a74a019220dfd4926895e301d506dbc97b967 WHIRLPOOL e5ae2e760770d2f307b1c4235c9b0c9d25e1719a1d174efa30ce6bbbc07b5c46d5f7babc087b8f450f3b485fb640728ddd23761fb292bcd535ef38dc10ac1d45
-DIST hostapd-2.3.tar.gz 1592480 SHA256 c94c2b76876fad4c80a1063a06f958a2189ba5003475016fa7658a1ca49bb4df SHA512 e54a3117a86393fc6374c3284f1ec52530d09c33e24f9ff943fd6f277f6140b666f0e5e4ac3a972916ed5c1fe2c7d88b59a416bb5fc451608dae1b33dd3cdffb WHIRLPOOL f32a3ec4609306ab250157e680bb19c4da873de6a542baef552882e6b381aaab851da932dccfbe0e1c26ff491c8984f12300b315a204e1daca5aa02f4b510c64
+DIST hostapd-2.4.tar.gz 1658872 SHA256 6fe0eb6bd1c9cbd24952ece8586b6f7bd14ab358edfda99794e79b9b9dbd657f SHA512 37e648fe9cce92923ab1d1e23a4267e274c988785d7be5610f1affca425ffa86b438de81e37446926a0f9158d6b67ee83e6396c3f81d571545c973dddbf1ffe3 WHIRLPOOL 78484c7e09725ba967c8815c3d8b0ffcc0c56daaec4acc79bc15c7392084c8642a2b41156b2c6a6360badb7e9d23792699d452fe600b56e3d62dd569188b6c2c
 EBUILD hostapd-2.0-r1.ebuild 5283 SHA256 91a76c256b5b27043f159cbe40534e6b487751bc63c593aca55a298088541836 SHA512 ac30eaeb3754e77916a0f7f75124324f2e424af3e0e50ea1381ce0c9e2127d568f040f14dce21b877840721d12dae20e42119b26d3cce847976c41c48286a484 WHIRLPOOL afcdc6ce3ed32b1223716fea94b04f4ac6a18c6a1bacbfb1b92f2bcf9e733584454fa27b20287faf9d7a5fb70f0c9e988924d9c20608c763dff01ad2870ef7d5
-EBUILD hostapd-2.3.ebuild 5339 SHA256 55d7c1dd49e706322891c1817cb1ac90e38b751e820ade47e27a46d3579d411b SHA512 ecd0b41762178a32c0a91bd7dfc05aa1dd94e1aaef614898bf627bdafb54025162402338ff996dc5c23b737a7aab9db23c85ee7be4dc1c7c02f936c767792d33 WHIRLPOOL a26c3b151bfc46796212f2d8d971234aeb11de85c3d4a9ee3b371a9a157590b0d39b9453ef52a5090e4864a130b2e226f0f1ff1cc84af8ddbdf1ee8c830078fa
-MISC ChangeLog 26692 SHA256 8713d6aecd454dbdcf18864a1b961c952cb89df06f5785eb8b1622641a049aef SHA512 70f6603366706c2c3aae9a51054b665be102fd15549b125e93e0dc834e78cd3b7a3e321c1992e062a20a3f87f2ce766a8c48eca55d7cdbf12ce7ac46f5a84163 WHIRLPOOL fc1c67fbcf7f91f589a57c06d5fe35bdb8160a9252cb53a4ee8228b970ad0e6632a695d01c6bb16939120b01c1e74f4cee71511aadc53e7bfcc04ba0f06684bb
+EBUILD hostapd-2.4.ebuild 5439 SHA256 42032a3f74cc6f5f1aae25d1a77b11593b03c3602331a8656b2baf2f3bbe1cee SHA512 7e3600827d8b5473241f1475b6b59df6ca7bbaf4909402fda87136a4e757235681e60f475dda358722f1d4e0c9e88c0e9019f3beed1e3557a2f664993756e8c3 WHIRLPOOL 0dc79373db08e74fc19a3eb9bed0092397256aa4a0a949333c79def1a327a7ccb1cb6927f9c040dc402e956db1bfc7849e98cae7d75f55b94395b1fc51ddf664
+MISC ChangeLog 26899 SHA256 b0a74ef59a8a87a39531a74f0547c79f3c28d054c9bb8667c338c90d29ce915e SHA512 47ca5fecd0dc5f70486310864bf4b3edac4e62cadfd32ce192dd44380127bdf7793f628fcfcd09d6d5218c16bd6b8752f52e20359df8f7db6b901ed69c43204d WHIRLPOOL a0b772a58210dd823619dd719e2b4746dbb12369dd4ec65ff1bccb6c5ba5f063af0496838991587f1eeb15cb353015fc0cfa70a891043c20844b52f8200cfff8
 MISC metadata.xml 860 SHA256 61963f6bf5911c90a644c8fd09477b1ceb5f7617e2f9521517d88b899e0021f0 SHA512 6706de2fdcadc5f7619cf2a42d349a5061a8fa1c7fa00c05bac0fe14583d6b5d99211e697c5255957f315c0de66dd10fbff6e450516321511e3fa7c9e4439d6b WHIRLPOOL dcdf07c188a486c59edd7d055f446575cf5162b06dc83a99fc60f2d261532a3f3e0438dbe9b8c3213913bef443898f79a5b61022fe6d6a9cd6d360bab2057fd4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSuULcACgkQvFcC4BYPU0r+EwCggINIwDvQMrN6TIH07VEvxw52
-uugAnRIV0rvO7LAwlwU2GI3JRD/kEGxB
-=1Kn8
+iEYEAREIAAYFAlUNb+AACgkQsR7PQhRXYEmpewCfcRHN4nT+qga00WEFp2Z6MVD/
+JqUAmwVqgJkNcm4mUPoa4jHKEFoROaRX
+=KLcN
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/hostapd/files/hostapd-hlr_auc_gw-openssl.patch b/net-wireless/hostapd/files/hostapd-hlr_auc_gw-openssl.patch
new file mode 100644
index 000000000000..1e88859b8e00
--- /dev/null
+++ b/net-wireless/hostapd/files/hostapd-hlr_auc_gw-openssl.patch
@@ -0,0 +1,43 @@
+From 58e115b86928000475b734a4345862afe11d6352 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <jouni@qca.qualcomm.com>
+Date: Fri, 20 Mar 2015 12:56:31 +0000
+Subject: Fix hlr_auc_gw build with OpenSSL
+
+Commit 983c6a606bc839248ea0c69090e60c095a655bc6 ('OpenSSL: Replace
+internal HMAC-MD5 implementation') forgot to make inclusion of md5.o
+conditional for hlr_auc_gw build.
+
+Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
+---
+diff --git a/hostapd/Android.mk b/hostapd/Android.mk
+index 5c69bd1..54b139c 100644
+--- a/hostapd/Android.mk
++++ b/hostapd/Android.mk
+@@ -795,8 +795,10 @@ OBJS += src/crypto/random.c
+ HOBJS += src/crypto/random.c
+ HOBJS += src/utils/eloop.c
+ HOBJS += $(SHA1OBJS)
++ifneq ($(CONFIG_TLS), openssl)
+ HOBJS += src/crypto/md5.c
+ endif
++endif
+ 
+ ifdef CONFIG_RADIUS_SERVER
+ L_CFLAGS += -DRADIUS_SERVER
+diff --git a/hostapd/Makefile b/hostapd/Makefile
+index 520ae89..d718c15 100644
+--- a/hostapd/Makefile
++++ b/hostapd/Makefile
+@@ -792,8 +792,10 @@ OBJS += ../src/crypto/random.o
+ HOBJS += ../src/crypto/random.o
+ HOBJS += ../src/utils/eloop.o
+ HOBJS += $(SHA1OBJS)
++ifneq ($(CONFIG_TLS), openssl)
+ HOBJS += ../src/crypto/md5.o
+ endif
++endif
+ 
+ ifdef CONFIG_RADIUS_SERVER
+ CFLAGS += -DRADIUS_SERVER
+--
+cgit v0.9.2
diff --git a/net-wireless/hostapd/hostapd-2.3.ebuild b/net-wireless/hostapd/hostapd-2.4.ebuild
index 7a0e42fef1a8..f1ecb4ef15c9 100644
--- a/net-wireless/hostapd/hostapd-2.3.ebuild
+++ b/net-wireless/hostapd/hostapd-2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-2.3.ebuild,v 1.2 2015/01/08 09:41:10 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-2.4.ebuild,v 1.1 2015/03/21 13:19:27 gurligebis Exp $
 
 EAPI="4"
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
 IUSE="ipv6 logwatch netlink sqlite +ssl +wps +crda"
 
-DEPEND="ssl? ( dev-libs/openssl )
+DEPEND="ssl? ( dev-libs/openssl[-bindist] )
 	kernel_linux? (
 		dev-libs/libnl:3
 		crda? ( net-wireless/crda )
@@ -28,6 +28,8 @@ RDEPEND="${DEPEND}"
 S="${S}/${PN}"
 
 src_prepare() {
+	epatch "${FILESDIR}/${PN}-hlr_auc_gw-openssl.patch"
+
 	sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
 		"${S}/hostapd.conf" || die
 }
@@ -40,6 +42,7 @@ src_configure() {
 
 	# EAP authentication methods
 	echo "CONFIG_EAP=y" >> ${CONFIG}
+	echo "CONFIG_ERP=y" >> ${CONFIG}
 	echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
 
 	if use ssl; then