Fix init scripts to work with baselayout-1.12.0_rcX.

(Portage version: 2.0.53)

8 files changed, 249 insertions, 8 deletions

diff --git a/net-wireless/hostapd/ChangeLog b/net-wireless/hostapd/ChangeLog
index 3c29f04c96d5..4760afed7ddd 100644
--- a/net-wireless/hostapd/ChangeLog
+++ b/net-wireless/hostapd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-wireless/hostapd
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.50 2006/01/02 18:09:54 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.51 2006/01/09 16:55:36 brix Exp $
+
+*hostapd-0.5.0-r1 (09 Jan 2006)
+*hostapd-0.4.7-r2 (09 Jan 2006)
+
+  09 Jan 2006; Henrik Brix Andersen <brix@gentoo.org>
+  files/hostapd-0.4.7-init.d, files/hostapd-0.5.0-init.d,
+  +hostapd-0.4.7-r2.ebuild, +hostapd-0.5.0-r1.ebuild:
+  Fix init scripts to work with baselayout-1.12.0_rcX.
 
   02 Jan 2006; Michael Hanselmann <hansmi@gentoo.org>
   hostapd-0.4.7-r1.ebuild:
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 55f3620d7bf2..d5568f762ebc 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -1,11 +1,13 @@
-MD5 4d47e7ac46abae4326a7ceb6075b75cc ChangeLog 7981
+MD5 581a1a8e37a47d89f1f486302b8e7bbe ChangeLog 8268
 MD5 3cb68569c34f2c059da88220513d9af4 files/digest-hostapd-0.3.7 150
 MD5 1a5ea229c1f23346e39a4af2abd08add files/digest-hostapd-0.3.9-r1 150
 MD5 9de6de9d2454760956b6b8684f530ca5 files/digest-hostapd-0.4.5 65
 MD5 eed11bccc899301f270328d35d8cdc9f files/digest-hostapd-0.4.6 65
 MD5 b0b607a1e367c39a3b14a50fd66d89b1 files/digest-hostapd-0.4.7 65
 MD5 b0b607a1e367c39a3b14a50fd66d89b1 files/digest-hostapd-0.4.7-r1 65
+MD5 b0b607a1e367c39a3b14a50fd66d89b1 files/digest-hostapd-0.4.7-r2 65
 MD5 c19ab8edc7e308271d2d635a18cfa222 files/digest-hostapd-0.5.0 65
+MD5 c19ab8edc7e308271d2d635a18cfa222 files/digest-hostapd-0.5.0-r1 65
 MD5 e4b30b5fade1fe4a257be477129ae36d files/hostapd-0.3.9-conf.d 425
 MD5 9f51596dd3a60ecf3aebee6f82f750f8 files/hostapd-0.3.9-init.d 982
 MD5 8d58b5265d0db823769c16f29473ffa1 files/hostapd-0.4.5-conf.d 425
@@ -14,15 +16,17 @@ MD5 af20f7c9a017ce03a0b66ca5c631dfc2 files/hostapd-0.4.5-prism54.patch 381
 MD5 5867a1afc9ca33e76f030a3abf0460cc files/hostapd-0.4.6-conf.d 425
 MD5 09e12f4e5e57ee1a8201a8748f30a920 files/hostapd-0.4.6-init.d 984
 MD5 d5a08b266b9a031229e8910fe8cd18b3 files/hostapd-0.4.7-conf.d 425
-MD5 ef0d83e9caafeb54a76f6eb97cada84f files/hostapd-0.4.7-init.d 984
+MD5 b0207ba6060fa2f81ba253bd972fd5db files/hostapd-0.4.7-init.d 967
 MD5 655fa0ef1b20ccc6bc2268ee90aecc3a files/hostapd-0.5.0-conf.d 425
-MD5 caaf9dbacc5a27840e4d7d8a706d1454 files/hostapd-0.5.0-init.d 984
+MD5 79071281c577d7375add2a8cd47341ff files/hostapd-0.5.0-init.d 967
 MD5 cf287b50f0ccd832a08fb3031281cd4f files/hostapd.init.d 858
 MD5 3d4f2d29f55f0ee2f8117fa90423bff9 hostapd-0.3.7.ebuild 2131
 MD5 57fa2d7578148cbc15ea6873e4656e7a hostapd-0.3.9-r1.ebuild 2126
 MD5 6a5242726313ccf8ba14d591c8056f0f hostapd-0.4.5.ebuild 2954
 MD5 5a79c617921133c3fb3028340573acef hostapd-0.4.6.ebuild 3066
 MD5 657b30ed33c277b88ddf007a4d1d55e9 hostapd-0.4.7-r1.ebuild 2738
+MD5 044aad1c9f3e60caafef0033a2a28bfc hostapd-0.4.7-r2.ebuild 2634
 MD5 dd28ecdc7f79c2fbb21b037ab945b621 hostapd-0.4.7.ebuild 3066
+MD5 6784b37ab272085ba199336354172219 hostapd-0.5.0-r1.ebuild 3219
 MD5 4ab8f41f52b693dadcf7d8f77cc90d20 hostapd-0.5.0.ebuild 3219
 MD5 52a4b928b36a98e530ae455b73f868f5 metadata.xml 462
diff --git a/net-wireless/hostapd/files/digest-hostapd-0.4.7-r2 b/net-wireless/hostapd/files/digest-hostapd-0.4.7-r2
new file mode 100644
index 000000000000..4680e1c2c50f
--- /dev/null
+++ b/net-wireless/hostapd/files/digest-hostapd-0.4.7-r2
@@ -0,0 +1 @@
+MD5 b299211691fe8a6840e7adafda351d2b hostapd-0.4.7.tar.gz 288016
diff --git a/net-wireless/hostapd/files/digest-hostapd-0.5.0-r1 b/net-wireless/hostapd/files/digest-hostapd-0.5.0-r1
new file mode 100644
index 000000000000..f5d254f23e44
--- /dev/null
+++ b/net-wireless/hostapd/files/digest-hostapd-0.5.0-r1
@@ -0,0 +1 @@
+MD5 abfe9a3381437e580001b484b7f77335 hostapd-0.5.0.tar.gz 323906
diff --git a/net-wireless/hostapd/files/hostapd-0.4.7-init.d b/net-wireless/hostapd/files/hostapd-0.4.7-init.d
index 92a0c680271c..44ecfb4aac39 100644
--- a/net-wireless/hostapd/files/hostapd-0.4.7-init.d
+++ b/net-wireless/hostapd/files/hostapd-0.4.7-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.7-init.d,v 1.1 2005/11/21 10:38:03 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/files/hostapd-0.4.7-init.d,v 1.2 2006/01/09 16:55:36 brix Exp $
 
 opts="start stop reload"
 
@@ -45,6 +45,6 @@ reload() {
 	checkconfig || return 1
 
 	ebegin "Reloading hostapd configuration"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/hostapd --signal HUP
+	kill -HUP $(pidof /usr/sbin/hostapd) > /dev/null 2>&1
 	eend ${?}
 }
diff --git a/net-wireless/hostapd/files/hostapd-0.5.0-init.d b/net-wireless/hostapd/files/hostapd-0.5.0-init.d
index 38e1d769a40d..5888d353e079 100644
--- a/net-wireless/hostapd/files/hostapd-0.5.0-init.d
+++ b/net-wireless/hostapd/files/hostapd-0.5.0-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.5.0-init.d,v 1.1 2005/12/20 11:09:30 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/files/hostapd-0.5.0-init.d,v 1.2 2006/01/09 16:55:36 brix Exp $
 
 opts="start stop reload"
 
@@ -45,6 +45,6 @@ reload() {
 	checkconfig || return 1
 
 	ebegin "Reloading hostapd configuration"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/hostapd --signal HUP
+	kill -HUP $(pidof /usr/sbin/hostapd) > /dev/null 2>&1
 	eend ${?}
 }
diff --git a/net-wireless/hostapd/hostapd-0.4.7-r2.ebuild b/net-wireless/hostapd/hostapd-0.4.7-r2.ebuild
new file mode 100644
index 000000000000..3657c36ab97d
--- /dev/null
+++ b/net-wireless/hostapd/hostapd-0.4.7-r2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.4.7-r2.ebuild,v 1.1 2006/01/09 16:55:36 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="~amd64 ~ppc ~x86"
+
+IUSE="ipv6 logwatch ssl"
+
+RDEPEND="ssl? ( dev-libs/openssl )"
+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}
+}
+
+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
+
+	if use logwatch; then
+		insinto /etc/log.d/conf/services/
+		doins logwatch/hostapd.conf
+
+		exeinto /etc/log.d/scripts/services/
+		doexe logwatch/hostapd
+	fi
+}
+
+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
+	einfo "Please notice that madwifi support was removed in this version"
+	einfo "of the ebuild. It will return once madwifi is stable again."
+	einfo
+}
diff --git a/net-wireless/hostapd/hostapd-0.5.0-r1.ebuild b/net-wireless/hostapd/hostapd-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..e9863c37616a
--- /dev/null
+++ b/net-wireless/hostapd/hostapd-0.5.0-r1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.5.0-r1.ebuild,v 1.1 2006/01/09 16:55:36 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="~amd64 ~ppc ~x86"
+
+IUSE="ipv6 logwatch 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}
+	echo "CONFIG_STAKEY=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"
+	use ssl && emake nt_password_hash || die "emake nt_password_hash 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
+	use ssl && dobin nt_password_hash
+
+	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
+
+	if use logwatch; then
+		insinto /etc/log.d/conf/services/
+		doins logwatch/hostapd.conf
+
+		exeinto /etc/log.d/scripts/services/
+		doexe logwatch/hostapd
+	fi
+}
+
+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
+}