Install more example configuration files, use SIGHUP for reloading configuration in init script.

(Portage version: 2.0.51.22-r2)

5 files changed, 124 insertions, 5 deletions

diff --git a/net-wireless/hostapd/ChangeLog b/net-wireless/hostapd/ChangeLog
index 75c3225bdf63..92843f64fc2a 100644
--- a/net-wireless/hostapd/ChangeLog
+++ b/net-wireless/hostapd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/hostapd
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.39 2005/08/22 12:54:59 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.40 2005/08/22 20:35:18 brix Exp $
+
+*hostapd-0.4.4-r1 (22 Aug 2005)
+
+  22 Aug 2005; Henrik Brix Andersen <brix@gentoo.org>
+  files/hostapd-0.4.4-init.d, +hostapd-0.4.4-r1.ebuild:
+  Install more example configuration files, use SIGHUP for reloading
+  configuration in init script.
 
 *hostapd-0.4.4 (22 Aug 2005)
 
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index b10dc300c447..0db8fe892d7d 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -1,17 +1,19 @@
 MD5 396c1e925e358173b0a3ae75b6015d65 hostapd-0.4.4.ebuild 2816
+MD5 5166fd2a4700406a50285bcf5bd0d112 hostapd-0.4.4-r1.ebuild 2790
 MD5 61d2efeb72b79f734ac5e82d6d6806e9 hostapd-0.4.3.ebuild 2188
 MD5 3d4f2d29f55f0ee2f8117fa90423bff9 hostapd-0.3.7.ebuild 2131
 MD5 8f92a1ce62c0c91b1f31c63a7ecc8320 hostapd-0.3.9-r1.ebuild 2125
-MD5 a7a62c682ac39d575be29ca91b502d9b ChangeLog 6014
+MD5 485557869f3b01ae0e924e52ee37bfe4 ChangeLog 6259
 MD5 52a4b928b36a98e530ae455b73f868f5 metadata.xml 462
 MD5 3cb68569c34f2c059da88220513d9af4 files/digest-hostapd-0.3.7 150
 MD5 f627c86eb7a966449fda4ef56a1ada36 files/digest-hostapd-0.4.3 150
 MD5 e4fa2efc7231097343517c2f26a64247 files/digest-hostapd-0.4.4 65
 MD5 cf287b50f0ccd832a08fb3031281cd4f files/hostapd.init.d 858
 MD5 1a5ea229c1f23346e39a4af2abd08add files/digest-hostapd-0.3.9-r1 150
+MD5 e4fa2efc7231097343517c2f26a64247 files/digest-hostapd-0.4.4-r1 65
 MD5 cc7a2cd85ce4d81e690cac643acaa65d files/hostapd-0.4.3-conf.d 425
 MD5 7ca878f99492c4a97a5d6ce532be7a87 files/hostapd-0.4.3-init.d 982
 MD5 e4b30b5fade1fe4a257be477129ae36d files/hostapd-0.3.9-conf.d 425
 MD5 9f51596dd3a60ecf3aebee6f82f750f8 files/hostapd-0.3.9-init.d 982
 MD5 c5d533aea010f90f5813351eefae99b2 files/hostapd-0.4.4-conf.d 425
-MD5 8ebc573f5e8a895920a62ac7e1087679 files/hostapd-0.4.4-init.d 982
+MD5 f7c0c593641102a7afbfe02072639a65 files/hostapd-0.4.4-init.d 877
diff --git a/net-wireless/hostapd/files/digest-hostapd-0.4.4-r1 b/net-wireless/hostapd/files/digest-hostapd-0.4.4-r1
new file mode 100644
index 000000000000..07f4a00f517f
--- /dev/null
+++ b/net-wireless/hostapd/files/digest-hostapd-0.4.4-r1
@@ -0,0 +1 @@
+MD5 79810ff32f6f12a37dc7827ce18af533 hostapd-0.4.4.tar.gz 273112
diff --git a/net-wireless/hostapd/files/hostapd-0.4.4-init.d b/net-wireless/hostapd/files/hostapd-0.4.4-init.d
index 29fa2fbf4a2c..31932c2cb407 100644
--- a/net-wireless/hostapd/files/hostapd-0.4.4-init.d
+++ b/net-wireless/hostapd/files/hostapd-0.4.4-init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/files/hostapd-0.4.4-init.d,v 1.1 2005/08/22 12:51:11 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/files/hostapd-0.4.4-init.d,v 1.2 2005/08/22 20:35:18 brix Exp $
 
 opts="start stop reload"
 
@@ -45,6 +45,6 @@ reload() {
 	checkconfig || return 1
 
 	ebegin "Reloading hostapd configuration"
-	start-stop-daemon --stop --signal 1 --quiet --exec /usr/sbin/hostapd
+	start-stop-daemon --stop --quiet --exec /usr/sbin/hostapd --signal HUP
 	eend ${?}
 }
diff --git a/net-wireless/hostapd/hostapd-0.4.4-r1.ebuild b/net-wireless/hostapd/hostapd-0.4.4-r1.ebuild
new file mode 100644
index 000000000000..8abf8383fb5f
--- /dev/null
+++ b/net-wireless/hostapd/hostapd-0.4.4-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.4.4-r1.ebuild,v 1.1 2005/08/22 20:35:18 brix Exp $
+
+inherit toolchain-funcs
+
+DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
+HOMEPAGE="http://hostap.epitest.fi"
+SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 BSD )"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+
+IUSE="ipv6 madwifi ssl"
+
+RDEPEND="ssl? ( dev-libs/openssl )
+		madwifi? ( >=net-wireless/madwifi-driver-0.1_pre20050420-r1 )"
+DEPEND="${RDEPEND}
+		sys-apps/sed"
+
+src_unpack() {
+	local CONFIG=${S}/.config
+
+	unpack ${A}
+
+	sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
+		${S}/hostapd.conf
+
+	# toolchain setup
+	echo "CC = $(tc-getCC)" > ${CONFIG}
+
+	# authentication methods
+	echo "CONFIG_EAP=y"           >> ${CONFIG}
+	echo "CONFIG_EAP_MD5=y"       >> ${CONFIG}
+	echo "CONFIG_EAP_GTC=y"       >> ${CONFIG}
+	echo "CONFIG_IAPP=y"          >> ${CONFIG}
+	echo "CONFIG_PKCS12=y"        >> ${CONFIG}
+	echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG}
+	echo "CONFIG_RSN_PREAUTH=y"   >> ${CONFIG}
+	echo "CONFIG_EAP_SIM=y"       >> ${CONFIG}
+
+	if use ssl; then
+		# SSL authentication methods
+		echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
+		echo "CONFIG_EAP_PEAP=y"     >> ${CONFIG}
+		echo "CONFIG_EAP_TLS=y"      >> ${CONFIG}
+		echo "CONFIG_EAP_TTLS=y"     >> ${CONFIG}
+	fi
+
+	if use ipv6; then
+		echo "CONFIG_IPV6=y" >> ${CONFIG}
+	fi
+
+	# Linux specific drivers
+	echo "CONFIG_DRIVER_HOSTAP=y"  >> ${CONFIG}
+	echo "CONFIG_DRIVER_WIRED=y"   >> ${CONFIG}
+	echo "CONFIG_DRIVER_PRISM54=y" >> ${CONFIG}
+
+	if use madwifi; then
+		# Add include path for madwifi-driver headers
+		echo "CFLAGS += -I/usr/include/madwifi" >> ${CONFIG}
+		echo "CONFIG_DRIVER_MADWIFI=y"          >> ${CONFIG}
+	fi
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	insinto /etc/hostapd
+	doins hostapd.conf hostapd.accept hostapd.deny \
+		hostapd.eap_user hostapd.radius_clients hostapd.sim_db hostapd.wpa_psk
+
+	dosbin hostapd
+	dobin hostapd_cli
+
+	newinitd ${FILESDIR}/${P}-init.d hostapd
+	newconfd ${FILESDIR}/${P}-conf.d hostapd
+
+	doman hostapd.8 hostapd_cli.1
+
+	dodoc ChangeLog developer.txt README
+
+	docinto examples
+	dodoc madwifi.conf wired.conf
+}
+
+pkg_postinst() {
+	einfo
+	einfo "In order to use ${PN} you need to set up your wireless card"
+	einfo "for master mode in /etc/conf.d/net or /etc/conf.d/wireless"
+	einfo "and then start /etc/init.d/hostapd."
+	einfo
+	einfo "Example configuration:"
+	einfo
+	einfo "config_wlan0=( \"192.168.1.1/24\" )"
+	einfo "channel_wlan0=\"6\""
+	einfo "essid_wlan0=\"test\""
+	einfo "mode_wlan0=\"master\""
+	einfo
+	if use madwifi; then
+		einfo "This package now compiles against the headers installed by"
+		einfo "net-wireless/madwifi-driver. You should remerge ${PN} after"
+		einfo "upgrading net-wireless/madwifi-driver."
+		einfo
+	fi
+}