Removing old madwifi support, and enabling more features, fixing bug #522330

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

4 files changed, 40 insertions, 29 deletions

diff --git a/net-wireless/hostapd/ChangeLog b/net-wireless/hostapd/ChangeLog
index 23639134ec71..f756f8f09f2e 100644
--- a/net-wireless/hostapd/ChangeLog
+++ b/net-wireless/hostapd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/hostapd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.150 2014/08/29 19:28:44 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.151 2014/09/13 15:04:53 gurligebis Exp $
+
+*hostapd-2.2-r2 (13 Sep 2014)
+
+  13 Sep 2014; <gurligebis@gentoo.org> -hostapd-2.2-r1.ebuild,
+  +hostapd-2.2-r2.ebuild, metadata.xml:
+  Removing old madwifi support, and enabling more features, fixing bug #522330
 
 *hostapd-2.2-r1 (29 Aug 2014)
 
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 20b82dc6ff02..9c5e021ac45c 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -8,13 +8,13 @@ AUX hostapd.service 213 SHA256 16f0612c192fb5d7e7de716f25fdfc2ccecc35a00ff745ae6
 DIST hostapd-2.0.tar.gz 1376203 SHA256 262ce394b930bccc3d65fb99ee380f28d36444978f524c845a98e8e29f4e9d35 SHA512 25fddaaddb22903078cfaae29a1e955b60955f9f5542b52962a6a8d4c65146ca102e9ac085118ce422843c55349a74a019220dfd4926895e301d506dbc97b967 WHIRLPOOL e5ae2e760770d2f307b1c4235c9b0c9d25e1719a1d174efa30ce6bbbc07b5c46d5f7babc087b8f450f3b485fb640728ddd23761fb292bcd535ef38dc10ac1d45
 DIST hostapd-2.2.tar.gz 1586482 SHA256 f15b6bcb434378860ea5b88dffed7f54d8cb71fff2146de0f006977a5e25a882 SHA512 d232442bed447218bcdee820c3ffcb1f87e0fe32c1ece8667c7ce411f7647a53dd19ead5570d5dec275da8cbdee10d5d8545cb6d44eba143bb6beb581594f696 WHIRLPOOL 7b88c14f9714c28d7b6d2cf3007a9e07aa1e5393dcc4e3b234307bbd07844c44c456fc5b01fb11a5d26f47e22d66625f93bfa5bae1359c4e4c8fd59258117c56
 EBUILD hostapd-2.0-r1.ebuild 5283 SHA256 91a76c256b5b27043f159cbe40534e6b487751bc63c593aca55a298088541836 SHA512 ac30eaeb3754e77916a0f7f75124324f2e424af3e0e50ea1381ce0c9e2127d568f040f14dce21b877840721d12dae20e42119b26d3cce847976c41c48286a484 WHIRLPOOL afcdc6ce3ed32b1223716fea94b04f4ac6a18c6a1bacbfb1b92f2bcf9e733584454fa27b20287faf9d7a5fb70f0c9e988924d9c20608c763dff01ad2870ef7d5
-EBUILD hostapd-2.2-r1.ebuild 5382 SHA256 7be40d9205da09ad84df52ee53bec75315148d0b7ee0948a36f8b3cb61488d3a SHA512 3e3639b5fcbbe7406cf91aadcb36948736a948850fa00c76f02332de37d47440332b2ab30783076cce40483d28e1f3aab09868e2415232cb167146e477aea634 WHIRLPOOL 58b83804ad8cac6d0f693fd259fd713319d7a6a5a97bcff6e049c51c1161099d211cbae29ec14591d1cd476c3dceeaeede2b6d5f8849156fe35e20d2ce9ed650
-MISC ChangeLog 26260 SHA256 ef567066467bfa72ed35b10a7317c78ce10aa157b78892094dcb258627c59471 SHA512 f594bff3f8177248ca35faa741aab23ea6794cdcc4eb5f90673263aeffb4f04f0d3f9cf2e8b8ebc3e8cbaf073ac181a4e300dee67f469ed3fd251a4aae0a3456 WHIRLPOOL 2c7be93ec182983e4233a190f3293c9195768cb9dca6308c7b6bc4fa2ffd937ec3729bb7b6ff429f0028e12eddd1e4ecdef68e86434a3b6978b264fdd8b8f7ba
-MISC metadata.xml 730 SHA256 0bb3f91ee921b846bebb28e76e38c4e6245ae00980c9ae3406e412ccde4a3df5 SHA512 590f1ade1d08af7f408893973fdb7589e30f6a9485a7d121581f15287075d2707fa1c0d54a666dd0ff217bc375c5d6064d652185a7649e425702b8f723e5a606 WHIRLPOOL ae4488bcbd1e0ea7f1529fb9627599a2c4a5de31747739256bb6373e9338ec23f8538ce841d6beacdaf46752815d0e8112cf28da683749c42bf18bcaa7dfebde
+EBUILD hostapd-2.2-r2.ebuild 5339 SHA256 7ec12c2d23e5e07df82072b2a41ce0e01218a33f69160a94e0b34dcc9a28cd8d SHA512 70e9964922e5c3492d9ce271fd07a119743528e210a221b2114907680d35410288550ff98a0fcea0a29638b3f554aecf1a9e31e47dbe04bcbbf8572b8687dabe WHIRLPOOL bae96aec877bbee60fab516187ebd6f0af4c6ba6b789e09e7c9583654e1d1a823ac82a8c1b22512e877f749f31950a9c97c13a57085d19cf2c735d11ca87654b
+MISC ChangeLog 26474 SHA256 ad80a01499eae8e1ae6cb2f0e1a1d467119ee0b4148cc257ea9c30cb1bd96a99 SHA512 0b014c098746f73aa7468408c1ca919c6380f85aaa26dc19695a7b8f72828c0ca6cf856d76e8f0822464a8f4f1cf758d8f35a5ff3a63f9075b1788d78721e2df WHIRLPOOL a602f5aa4aee45e00fa30bbb53c2c114f3069afab5689ec80d7fb68f03ee6970caf7e67e263935f73bc899bfff63b6c359863117dcaf7e98a7abb56d0330651b
+MISC metadata.xml 860 SHA256 61963f6bf5911c90a644c8fd09477b1ceb5f7617e2f9521517d88b899e0021f0 SHA512 6706de2fdcadc5f7619cf2a42d349a5061a8fa1c7fa00c05bac0fe14583d6b5d99211e697c5255957f315c0de66dd10fbff6e450516321511e3fa7c9e4439d6b WHIRLPOOL dcdf07c188a486c59edd7d055f446575cf5162b06dc83a99fc60f2d261532a3f3e0438dbe9b8c3213913bef443898f79a5b61022fe6d6a9cd6d360bab2057fd4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQA1G0ACgkQsR7PQhRXYEkZ+ACfTDxYw21V8yZa/mHEiQ6uAhHy
-VNQAn1wMOyUzJzRda55M5uDW85Z5RJbw
-=X+LR
+iEYEAREIAAYFAlQUXRoACgkQsR7PQhRXYElvjwCfe93NJRFiZn1CW+//YKx6AXQZ
+EPAAn0J2zuRaPwe7hPPeBTUp5YMdvftc
+=MxRj
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/hostapd/hostapd-2.2-r1.ebuild b/net-wireless/hostapd/hostapd-2.2-r2.ebuild
index 91609172712b..b4ca926a7552 100644
--- a/net-wireless/hostapd/hostapd-2.2-r1.ebuild
+++ b/net-wireless/hostapd/hostapd-2.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-2.2-r1.ebuild,v 1.1 2014/08/29 19:28:44 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-2.2-r2.ebuild,v 1.1 2014/09/13 15:04:53 gurligebis Exp $
 
 EAPI="4"
 
@@ -13,15 +13,15 @@ SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
 LICENSE="|| ( GPL-2 BSD )"
 SLOT="0"
 KEYWORDS="~amd64 ~mips ~ppc ~x86"
-IUSE="ipv6 logwatch madwifi +ssl +wps +crda"
+IUSE="ipv6 logwatch netlink sqlite +ssl +wps +crda"
 
 DEPEND="ssl? ( dev-libs/openssl )
 	kernel_linux? (
 		dev-libs/libnl:3
 		crda? ( net-wireless/crda )
 	)
-	madwifi? ( ||
-		( >net-wireless/madwifi-ng-tools-0.9.3 ) )"
+	netlink? ( net-libs/libnfnetlink )
+	sqlite? ( >=dev-db/sqlite-3 )"
 
 RDEPEND="${DEPEND}"
 
@@ -44,10 +44,13 @@ src_configure() {
 
 	if use ssl; then
 		# SSL authentication methods
+		echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
 		echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
 		echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
 		echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
 		echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
+		echo "CONFIG_TLSV11=y" >> ${CONFIG}
+		echo "CONFIG_TLSV12=y" >> ${CONFIG}
 	fi
 
 	if use wps; then
@@ -55,12 +58,16 @@ src_configure() {
 		echo "CONFIG_WPS=y" >> ${CONFIG}
 		echo "CONFIG_WPS2=y" >> ${CONFIG}
 		echo "CONFIG_WPS_UPNP=y" >> ${CONFIG}
+		echo "CONFIG_WPS_NFC=y" >> ${CONFIG}
 		einfo "Enabling Wi-Fi Protected Setup support"
 	fi
 
+	echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG}
+	echo "CONFIG_EAP_TNC=y" >> ${CONFIG}
 	echo "CONFIG_EAP_GTC=y" >> ${CONFIG}
 	echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
 	echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
+	echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG}
 	echo "CONFIG_EAP_EKE=y" >> ${CONFIG}
 	echo "CONFIG_EAP_PAX=y" >> ${CONFIG}
 	echo "CONFIG_EAP_PSK=y" >> ${CONFIG}
@@ -81,19 +88,11 @@ src_configure() {
 	echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG}
 	einfo "  None driver enabled"
 
-	if use madwifi; then
-		# Add include path for madwifi-driver headers
-		einfo "  Madwifi driver enabled"
-		echo "CFLAGS += -I/usr/include/madwifi" >> ${CONFIG}
-		echo "CONFIG_DRIVER_MADWIFI=y" >> ${CONFIG}
-	else
-		einfo "  Madwifi driver disabled"
-	fi
-
 	einfo "  nl80211 driver enabled"
 	echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG}
 
 	# misc
+	echo "CONFIG_DEBUG_FILE=y" >> ${CONFIG}
 	echo "CONFIG_PKCS12=y" >> ${CONFIG}
 	echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG}
 	echo "CONFIG_IAPP=y" >> ${CONFIG}
@@ -104,13 +103,26 @@ src_configure() {
 	echo "CONFIG_PEERKEY=y" >> ${CONFIG}
 	echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG}
 	echo "CONFIG_INTERWORKING=y" >> ${CONFIG}
+	echo "CONFIG_FULL_DYNAMIC_VLAN=y" >> ${CONFIG}
+	echo "CONFIG_HS20=y" >> ${CONFIG}
+	echo "CONFIG_WNM=y" >> ${CONFIG}
 	echo "CONFIG_ACS=y" >> ${CONFIG}
 
+	if use netlink; then
+		# Netlink support
+		echo "CONFIG_VLAN_NETLINK=y" >> ${CONFIG}
+	fi
+
 	if use ipv6; then
 		# IPv6 support
 		echo "CONFIG_IPV6=y" >> ${CONFIG}
 	fi
 
+	if use sqlite; then
+		# Sqlite support
+		echo "CONFIG_SQLITE=y" >> ${CONFIG}
+	fi
+
 	# If we are using libnl 2.0 and above, enable support for it
 	# Removed for now, since the 3.2 version is broken, and we don't
 	# support it.
@@ -178,15 +190,6 @@ pkg_postinst() {
 	einfo "essid_wlan0=\"test\""
 	einfo "mode_wlan0=\"master\""
 	einfo
-	if use madwifi; then
-		einfo "This package compiles against the headers installed by"
-		einfo "madwifi-old, madwifi-ng or madwifi-ng-tools."
-		einfo "You should remerge ${PN} after upgrading these packages."
-		einfo
-		einfo "Since you are using the madwifi-ng driver, you should disable or"
-		einfo "comment out wme_enabled from ${PN}.conf, since it will"
-		einfo "cause problems otherwise (see bug #260377"
-	fi
 	#if [ -e "${KV_DIR}"/net/mac80211 ]; then
 	#	einfo "This package now compiles against the headers installed by"
 	#	einfo "the kernel source for the mac80211 driver. You should "
diff --git a/net-wireless/hostapd/metadata.xml b/net-wireless/hostapd/metadata.xml
index 176db4e6f770..bfc8f678a180 100644
--- a/net-wireless/hostapd/metadata.xml
+++ b/net-wireless/hostapd/metadata.xml
@@ -15,6 +15,8 @@
 		<flag name='logwatch'>Install support files for 
 			<pkg>sys-app/logwatch</pkg></flag>
 		<flag name='madwifi'>Add support for madwifi (Atheros chipset)</flag>
+		<flag name='netlink'>Adding support for using netlink to create VLANs</flag>
+		<flag name='sqlite'>Adding sqlite support</flag>
 		<flag name='wps'>Add support for Wi-Fi Protected Setup</flag>
 	</use>
 </pkgmetadata>