net-wireless/hostapd: Refresh with upstream, drop net-wireless/madwifi-old DEPEND

Package-Manager: portage-2.2.12

5 files changed, 33 insertions, 29 deletions

diff --git a/net-wireless/hostapd/ChangeLog b/net-wireless/hostapd/ChangeLog
index 38bed2f0..f8033abb 100644
--- a/net-wireless/hostapd/ChangeLog
+++ b/net-wireless/hostapd/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for net-wireless/hostapd
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Aug 2014; Bertrand Jacquin <beber@meleeweb.net> +files/hostapd.service,
+  files/hostapd-init.d, hostapd-2.0.ebuild:
+  net-wireless/hostapd: Refresh with upstream, drop net-wireless/madwifi-old
+  DEPEND
+
   12 Jun 2013; Bertrand Jacquin <beber@meleeweb.net> hostapd-2.0.ebuild:
   net-wireless/hostapd: Implement savedconfig, see #473124
 
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 5e00a83e..d9d22f7a 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -1,7 +1,8 @@
 AUX hostapd-2.0-tls_length_fix.patch 1859 SHA256 bbca0422a0babbf9d7fad2b758ecddaae45624db1b2db6d7663292548e25906a WHIRLPOOL 6a9379b09ffb73d13ea813952e2b39b5ab90ec98a27ed211ff2904d52e346c9e6273fe99e8ae6509773597afa352d9e77f3081103c5e5c55c86e12f8176a5419
 AUX hostapd-conf.d 245 SHA256 916f4b14095ee4ec8a510391c883e9f01868e18d79a3d5cbeb13a104a793d45d WHIRLPOOL 0ab1dbd8e04df9e7b8ae875dfdfdcdd770e4fcb62197bb81e47588a9ecf0b8bb715adbde34f2be82d630fdd536e9f888f463dd12cab0c06220c345b0093a3dd5
-AUX hostapd-init.d 1022 SHA256 a220058841e66a11603df8e968ccc68945f01e1d11c1ae498922d0e01f6fa804 WHIRLPOOL e86f507cff5712ff2590f39c58989a379b81feb40cedcd424188e055ac38f772a7bb9c1089efabd6ff104078257aa2a20a82790e17b085c03264d35b6f4e274d
+AUX hostapd-init.d 858 SHA256 b9701b9ea509638ee1ed74bec38a22e6bd7358763497ce53c146d2faf9e97a61 WHIRLPOOL 456dd8982344e31a9c198fbc66d27e2f5080abcf974bced857ecfc5825ac8212829383525cbe81edfda01323133414a62eada9af84f3c80424077dcb7d822217
+AUX hostapd.service 213 SHA256 16f0612c192fb5d7e7de716f25fdfc2ccecc35a00ff745ae67e02d7292558d8f WHIRLPOOL 3e415fa8068aa429cb37c7957d396d5e261b5843ae06eb81370728be36573e59e90707c7047b336eb82562e98017608e712ceb28afe2bae385b2821e1cdbd856
 DIST hostapd-2.0.tar.gz 1376203 SHA256 262ce394b930bccc3d65fb99ee380f28d36444978f524c845a98e8e29f4e9d35 WHIRLPOOL e5ae2e760770d2f307b1c4235c9b0c9d25e1719a1d174efa30ce6bbbc07b5c46d5f7babc087b8f450f3b485fb640728ddd23761fb292bcd535ef38dc10ac1d45
-EBUILD hostapd-2.0.ebuild 5502 SHA256 3349c9ddb691b6ca40d75d16af34b6f790b967d23bb06af6f1be408ca868ba35 WHIRLPOOL 57d059963e4cb566f5209c311e95d75300d1c2fcadd7f6713138a96bebb0d1e10a2ff6ff49467b41300ce05c56802217d8913b5edfb4be28e83135a9c25a8a4b
-MISC ChangeLog 1365 SHA256 19c4a14738e270463f1e25abc8d841fb2b8de63a38492524db91fca2f37f7167 WHIRLPOOL cd66d11bbb9104c2e06b4d42deea264680550284b6cf31c8580c61eb197bf593159bfcf0d44b28cfd15b45f6e9d3394803deaf47bf774cc2eac86185138540be
+EBUILD hostapd-2.0.ebuild 5598 SHA256 7f591ba762844bb0b3337171e323e739bfb7d973b06eced09bbaea2e62a34022 WHIRLPOOL 1bfed755c120e59bbd2bf9f1524aa6b653f4beb95f6167e70c2ec1d3fed95c205a74add8bd063f84146f4329fe2db9a15b70c115b951e560947be2941b595d37
+MISC ChangeLog 1573 SHA256 b82ba874da95037fb65c64ca5be67043dcc3b5f714b3ed3c4a360635c852f92a WHIRLPOOL 1e4c5d8a3ac1b9388d1621560ae9820bbf46f72f6d8aa5411d04542ddc8aa6074225d3c7bcc4edab167daa3bcea211df570f96eb6e49aeac98ba7d8b77a1b812
 MISC metadata.xml 820 SHA256 ccdd3f08f7a60f9c685389b6b6cdc7171fab3547abe77329441c92acd64205f3 WHIRLPOOL 882cc3f01cf8f006e46f30332ebb02c44224e741aead2c619536970199805ff7724dfc8f8013e91e22afc21ea6cef3f002036d7d2662cf97843d9d71f562b84a
diff --git a/net-wireless/hostapd/files/hostapd-init.d b/net-wireless/hostapd/files/hostapd-init.d
index bc5b8d6a..d09002b6 100644
--- a/net-wireless/hostapd/files/hostapd-init.d
+++ b/net-wireless/hostapd/files/hostapd-init.d
@@ -1,7 +1,11 @@
 #!/sbin/runscript
-# Copyright 1999-2011 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/hostapd/files/hostapd-init.d,v 1.3 2011/09/25 14:03:46 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/files/hostapd-init.d,v 1.4 2014/03/21 19:47:14 gurligebis Exp $
+
+pidfile="/run/${SVCNAME}.pid"
+command="/usr/sbin/hostapd"
+command_args="-P ${pidfile} -B ${OPTIONS} ${CONFIGS}"
 
 extra_started_commands="reload"
 
@@ -15,7 +19,7 @@ depend() {
 	use logger
 }
 
-checkconfig() {
+start_pre() {
 	local file
 
 	for file in ${CONFIGS}; do
@@ -26,25 +30,10 @@ checkconfig() {
 	done
 }
 
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --exec /usr/sbin/hostapd \
-		-- -B ${OPTIONS} ${CONFIGS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --exec /usr/sbin/hostapd
-	eend $?
-}
-
 reload() {
-	checkconfig || return 1
+	start_pre || return 1
 
 	ebegin "Reloading ${SVCNAME} configuration"
-	kill -HUP $(pidof /usr/sbin/hostapd) > /dev/null 2>&1
+	kill -HUP $(cat ${pidfile}) > /dev/null 2>&1
 	eend $?
 }
diff --git a/net-wireless/hostapd/files/hostapd.service b/net-wireless/hostapd/files/hostapd.service
new file mode 100644
index 00000000..8f0ee8e8
--- /dev/null
+++ b/net-wireless/hostapd/files/hostapd.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Hostapd IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator
+After=network.target
+
+[Service]
+ExecStart=/usr/sbin/hostapd /etc/hostapd/hostapd.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-wireless/hostapd/hostapd-2.0.ebuild b/net-wireless/hostapd/hostapd-2.0.ebuild
index b1d328cb..4326a496 100644
--- a/net-wireless/hostapd/hostapd-2.0.ebuild
+++ b/net-wireless/hostapd/hostapd-2.0.ebuild
@@ -1,4 +1,4 @@
-# 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/hostapd/hostapd-2.0.ebuild,v 1.3 2013/04/29 18:35:53 scarabeus Exp $
 
@@ -20,9 +20,7 @@ DEPEND="ssl? ( dev-libs/openssl )
 		dev-libs/libnl:3
 		crda? ( net-wireless/crda )
 	)
-	madwifi? ( ||
-		( >net-wireless/madwifi-ng-tools-0.9.3
-		net-wireless/madwifi-old ) )"
+	madwifi? ( >net-wireless/madwifi-ng-tools-0.9.3 )"
 RDEPEND="${DEPEND}"
 
 S="${S}/${PN}"
@@ -58,7 +56,6 @@ hostapd_config_option() {
 src_configure() {
 	tc-export CC
 
-	#append-libs -L/usr/lib
 	# Add include path for madwifi-driver headers
 	use madwifi && append-cflags -I/usr/include/madwifi
 
@@ -98,6 +95,7 @@ src_configure() {
 	# TODO: Add support for BSD drivers
 	hostapd_config_option DRIVER_HOSTAP y
 	hostapd_config_option DRIVER_WIRED y
+	hostapd_config_option DRIVER_PRISM54 y
 	hostapd_config_option DRIVER_NONE y
 	hostapd_config_option DRIVER_MADWIFI $(usex madwifi y n)
 	hostapd_config_option DRIVER_NL80211 y
@@ -152,6 +150,7 @@ src_install() {
 
 	newinitd "${FILESDIR}"/${PN}-init.d ${PN}
 	newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
 
 	doman ${PN}{.8,_cli.1}
 
@@ -172,6 +171,7 @@ src_install() {
 
 pkg_postinst() {
 	einfo
+	einfo "If you are running openRC you need to follow this instructions:"
 	einfo "In order to use ${PN} you need to set up your wireless card"
 	einfo "for master mode in /etc/conf.d/net and then start"
 	einfo "/etc/init.d/${PN}."