summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjarke Istrup Pedersen <gurligebis@gentoo.org>2010-01-14 14:36:18 +0000
committerBjarke Istrup Pedersen <gurligebis@gentoo.org>2010-01-14 14:36:18 +0000
commitc34a65691a38dbf6ad1dd6fbeefc6ca560950933 (patch)
tree71460525463c1366412d8484732777de407cbadd /net-wireless
parentQt3 only application. See bug #291878 and bug #283429 (diff)
downloadhistorical-c34a65691a38dbf6ad1dd6fbeefc6ca560950933.tar.gz
historical-c34a65691a38dbf6ad1dd6fbeefc6ca560950933.tar.bz2
historical-c34a65691a38dbf6ad1dd6fbeefc6ca560950933.zip
Bumping to 0.6.10 and removing redundant files.
Package-Manager: portage-2.2_rc61/cvs/Linux i686
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/hostapd/ChangeLog13
-rw-r--r--net-wireless/hostapd/Manifest22
-rw-r--r--net-wireless/hostapd/files/hostapd-0.6.9-conf.d9
-rw-r--r--net-wireless/hostapd/files/hostapd-0.6.9-init.d50
-rw-r--r--net-wireless/hostapd/files/hostapd-conf.d (renamed from net-wireless/hostapd/files/hostapd-0.6.8-conf.d)0
-rw-r--r--net-wireless/hostapd/files/hostapd-init.d (renamed from net-wireless/hostapd/files/hostapd-0.6.8-init.d)2
-rw-r--r--net-wireless/hostapd/hostapd-0.6.10.ebuild187
-rw-r--r--net-wireless/hostapd/hostapd-0.6.8.ebuild8
-rw-r--r--net-wireless/hostapd/hostapd-0.6.9.ebuild8
9 files changed, 218 insertions, 81 deletions
diff --git a/net-wireless/hostapd/ChangeLog b/net-wireless/hostapd/ChangeLog
index 57d06ebe023b..7ce1fb62def7 100644
--- a/net-wireless/hostapd/ChangeLog
+++ b/net-wireless/hostapd/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for net-wireless/hostapd
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.103 2009/09/11 11:15:17 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.104 2010/01/14 14:36:18 gurligebis Exp $
+
+*hostapd-0.6.10 (14 Jan 2010)
+
+ 14 Jan 2010; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
+ hostapd-0.6.8.ebuild, -files/hostapd-0.6.8-conf.d,
+ -files/hostapd-0.6.8-init.d, hostapd-0.6.9.ebuild,
+ -files/hostapd-0.6.9-conf.d, -files/hostapd-0.6.9-init.d,
+ +hostapd-0.6.10.ebuild, +files/hostapd-conf.d, +files/hostapd-init.d:
+ Bumping to 0.6.10 and removing redundant init.d and conf.d files
11 Sep 2009; Diego E. Pettenò <flameeyes@gentoo.org>
hostapd-0.6.8.ebuild, hostapd-0.6.9.ebuild:
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 4be9aa5e7333..ebed18b7c6ed 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -1,20 +1,20 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX hostapd-0.6.8-conf.d 245 RMD160 88b816218cb37d32fd940db17ece84d612c87f14 SHA1 0d88865c313bf1ffbc168029a13c76f288280a3d SHA256 916f4b14095ee4ec8a510391c883e9f01868e18d79a3d5cbeb13a104a793d45d
-AUX hostapd-0.6.8-init.d 1021 RMD160 87b76e7cf3ef8a4688d15636fea5e7515a56a527 SHA1 79e62eafad600c860b92fb39a92e9e8b40495f6c SHA256 7064c17e3fb62f67de9f4d8ff02483af1b1f632cda7092b6854dee3ddeef119a
-AUX hostapd-0.6.9-conf.d 245 RMD160 88b816218cb37d32fd940db17ece84d612c87f14 SHA1 0d88865c313bf1ffbc168029a13c76f288280a3d SHA256 916f4b14095ee4ec8a510391c883e9f01868e18d79a3d5cbeb13a104a793d45d
-AUX hostapd-0.6.9-init.d 1021 RMD160 56f066a9ebcbf6d4ca1af2d4bf2bd1299caac85c SHA1 94685f75cc80d6437acc70b987af8d1da82573d6 SHA256 048b2c8994dcaac224dce09328f1d704e346df6a872d56e45e2c0bc20e94bf1d
+AUX hostapd-conf.d 245 RMD160 88b816218cb37d32fd940db17ece84d612c87f14 SHA1 0d88865c313bf1ffbc168029a13c76f288280a3d SHA256 916f4b14095ee4ec8a510391c883e9f01868e18d79a3d5cbeb13a104a793d45d
+AUX hostapd-init.d 1015 RMD160 9c5908b38de714f6c79aad61ee2c248bf9d06c0a SHA1 6238deb6c618169ab5a8147850a1a0e594d69ba3 SHA256 d2c0f0d97a8c7d25e723c55c4377c1f7344762375998cc8498788f3a340fdf95
+DIST hostapd-0.6.10.tar.gz 1100734 RMD160 2da84cf89be263fe08f0b7a90a0e2cdd7409c36f SHA1 2cacf994abd3cebad36679d32f64c9e9906ccff8 SHA256 53cb165d5fec821f186b811beb2fcb212964b1a8ea84cc8cfcf229227989581b
DIST hostapd-0.6.8.tar.gz 1078338 RMD160 eae5adfabe734c7586473ef9cdbde4d86b622536 SHA1 0f03a3d4dcce3560b5bb516628570c4eff88b58f SHA256 90e735947f84492c10ccfb6801971f4b0789e4639a37a379987db49c9291cab6
DIST hostapd-0.6.9.tar.gz 1089548 RMD160 1faf1728984756b54ee353af4ed6d173259a953d SHA1 80d1d3922fc0daf2aab2d41a2e37172d5371cf4f SHA256 4430fe2c7a2176c6890ac3a726a8b3d234a77beb3ca987b4349c467331343e67
-EBUILD hostapd-0.6.8.ebuild 5337 RMD160 7feb4791c8cfac28b3fdb3cbd5a5c68250c47c79 SHA1 ee01f1ceb9fc6251e41a20ec3e7ab7fc460783bf SHA256 fb19842f1821906fbd62576d15b0e3adb076ac8dd94ac9d9785953eae9fb7498
-EBUILD hostapd-0.6.9.ebuild 4950 RMD160 94f9f1d9213e1903657f070c9c8727b88e0e2b15 SHA1 932df72c2ed1dfd2780988a1a7a35e7a93c94943 SHA256 7f665dc8edf0c6fb7502bd6813a82263041183b795aa90bde47c168099599d5b
-MISC ChangeLog 18797 RMD160 5a9084d3f1adc456416287e49a6370b029f48911 SHA1 726c314cf7f9a5c4e2f47584cfc39ef4a445f7ec SHA256 9c1ea4b4f9ec6da73b3186c51abef6c7b7ae24f6cc7496323f82e352ca1d86a1
+EBUILD hostapd-0.6.10.ebuild 4957 RMD160 74e9a7888d732603f6a9f5abb0bb74cf878e2113 SHA1 df3b2ed436fe8912f11d07ea2e0d522faedcde7b SHA256 21d9fc4dfe6cb88aa3abee61a3abe9f2eade4560449012a732472105a3ca3942
+EBUILD hostapd-0.6.8.ebuild 5340 RMD160 2d4fc98e901f60b0b2f745a454b66e27a7cd837a SHA1 1bf794377abfff4ff5b653fc63b4f6c4b18b8b4f SHA256 8aa339e1735369ed64bfe00b97e92d39b869664cbe43d66d2aae6faf4aad2e96
+EBUILD hostapd-0.6.9.ebuild 4953 RMD160 dcd2a03675d34ce9a1854c3ef788eb6218ee9193 SHA1 fc713e42361c63c7a5c3b222dd643b54aa5b4f30 SHA256 bd870808e074117ee66b41c62ff3358fea8fe17d54bb72d1c9dae67e5e907a04
+MISC ChangeLog 19197 RMD160 071537407a4d81159eb9579c11770832bd5072d4 SHA1 7eaadba5f22b4d44359acfb78ac115b8f3c291b2 SHA256 dc9e9416a2cb4f14507d408b891e931d2b49883891d467bc2ecabc5c2234e1ab
MISC metadata.xml 706 RMD160 f4b7cada9bc0fc7a61b06034bad7ab67329b0024 SHA1 2ee15103693cd61494f028cb751a5da34d9363b8 SHA256 34d8518e44ebb430b9c87471a17fac1d60a08feabae7d2d4b0e74cf2f39f17b4
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
-iEYEARECAAYFAkqqMUsACgkQAiZjviIA2XhnUQCfSL3xSZYa4eE2ttqxK6xFsgHG
-KJMAniFynRuaCcsBZg5hT0O28HajVVR4
-=Q5hb
+iEYEARECAAYFAktPK/IACgkQsR7PQhRXYEkurgCfULQhRVTr5oB+Kqc258iaQut1
+au8An3U6Wpu1R9Aq5HYiNsuSReL+t2uu
+=I1tg
-----END PGP SIGNATURE-----
diff --git a/net-wireless/hostapd/files/hostapd-0.6.9-conf.d b/net-wireless/hostapd/files/hostapd-0.6.9-conf.d
deleted file mode 100644
index 7d05735eb3b4..000000000000
--- a/net-wireless/hostapd/files/hostapd-0.6.9-conf.d
+++ /dev/null
@@ -1,9 +0,0 @@
-# Space separated List of interfaces which needs to be started before
-# hostapd
-INTERFACES="wlan0"
-
-# Space separated list of configuration files
-CONFIGS="/etc/hostapd/hostapd.conf"
-
-# Extra options to pass to hostapd, see hostapd(8)
-OPTIONS=""
diff --git a/net-wireless/hostapd/files/hostapd-0.6.9-init.d b/net-wireless/hostapd/files/hostapd-0.6.9-init.d
deleted file mode 100644
index 6d12c23303a4..000000000000
--- a/net-wireless/hostapd/files/hostapd-0.6.9-init.d
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/files/hostapd-0.6.9-init.d,v 1.2 2009/05/17 10:18:18 gurligebis Exp $
-
-opts="start stop reload"
-
-depend() {
- local myneeds=
- for iface in ${INTERFACES}; do
- myneeds="${myneeds} net.${iface}"
- done
-
- [ -n "${myneeds}" ] && need ${myneeds}
- use logger
-}
-
-checkconfig() {
- local file
-
- for file in ${CONFIGS}; do
- if [ ! -r "${file}" ]; then
- eerror "hostapd configuration file (${CONFIG}) not found"
- return 1
- fi
- 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
-
- ebegin "Reloading ${SVCNAME} configuration"
- kill -HUP $(pidof /usr/sbin/hostapd) > /dev/null 2>&1
- eend $?
-}
diff --git a/net-wireless/hostapd/files/hostapd-0.6.8-conf.d b/net-wireless/hostapd/files/hostapd-conf.d
index 7d05735eb3b4..7d05735eb3b4 100644
--- a/net-wireless/hostapd/files/hostapd-0.6.8-conf.d
+++ b/net-wireless/hostapd/files/hostapd-conf.d
diff --git a/net-wireless/hostapd/files/hostapd-0.6.8-init.d b/net-wireless/hostapd/files/hostapd-init.d
index 924cc6145946..c6372cc52401 100644
--- a/net-wireless/hostapd/files/hostapd-0.6.8-init.d
+++ b/net-wireless/hostapd/files/hostapd-init.d
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/files/hostapd-0.6.8-init.d,v 1.2 2009/05/17 10:18:18 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/files/hostapd-init.d,v 1.1 2010/01/14 14:36:18 gurligebis Exp $
opts="start stop reload"
diff --git a/net-wireless/hostapd/hostapd-0.6.10.ebuild b/net-wireless/hostapd/hostapd-0.6.10.ebuild
new file mode 100644
index 000000000000..8a7455729f1b
--- /dev/null
+++ b/net-wireless/hostapd/hostapd-0.6.10.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.6.10.ebuild,v 1.1 2010/01/14 14:36:18 gurligebis Exp $
+
+EAPI="2"
+
+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 +wps"
+
+DEPEND="ssl? ( dev-libs/openssl )
+ >=dev-libs/libnl-1.1
+ madwifi? ( ||
+ ( >net-wireless/madwifi-ng-tools-0.9.3
+ net-wireless/madwifi-old ) )"
+RDEPEND="${DEPEND}"
+
+S="${S}/hostapd"
+
+src_prepare() {
+ sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
+ "${S}/hostapd.conf"
+}
+
+src_configure() {
+ local CONFIG="${S}/.config"
+
+ # toolchain setup
+ echo "CC = $(tc-getCC)" > ${CONFIG}
+
+ # EAP authentication methods
+ echo "CONFIG_EAP=y" >> ${CONFIG}
+ echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
+
+ if use ssl; then
+ # SSL authentication methods
+ echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
+ echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
+ echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
+ echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
+ fi
+
+ if use wps; then
+ # Enable Wi-Fi Protected Setup
+ echo "CONFIG_WPS=y" >> ${CONFIG}
+ echo "CONFIG_WPS_UPNP=y" >> ${CONFIG}
+ einfo "Enabling Wi-Fi Protected Setup support"
+ fi
+
+ echo "CONFIG_EAP_GTC=y" >> ${CONFIG}
+ echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
+ echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
+ echo "CONFIG_EAP_PAX=y" >> ${CONFIG}
+ echo "CONFIG_EAP_PSK=y" >> ${CONFIG}
+ echo "CONFIG_EAP_SAKE=y" >> ${CONFIG}
+ echo "CONFIG_EAP_GPSK=y" >> ${CONFIG}
+ echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG}
+
+ einfo "Enabling drivers: "
+
+ # drivers
+ echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG}
+ einfo " HostAP driver enabled"
+ echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG}
+ einfo " Wired driver enabled"
+ echo "CONFIG_DRIVER_PRISM54=y" >> ${CONFIG}
+ einfo " Prism54 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}
+ echo "CFLAGS += -I/usr/include/netlink" >> ${CONFIG}
+ echo "LIBS += -L/usr/lib" >> ${CONFIG}
+
+ # misc
+ echo "CONFIG_PKCS12=y" >> ${CONFIG}
+ echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG}
+ echo "CONFIG_IAPP=y" >> ${CONFIG}
+ echo "CONFIG_IEEE80211R=y" >> ${CONFIG}
+ echo "CONFIG_IEEE80211W=y" >> ${CONFIG}
+ echo "CONFIG_IEEE80211N=y" >> ${CONFIG}
+ echo "CONFIG_PEERKEY=y" >> ${CONFIG}
+ echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG}
+
+ if use ipv6; then
+ # IPv6 support
+ echo "CONFIG_IPV6=y" >> ${CONFIG}
+ fi
+
+ # TODO: Add support for BSD drivers
+
+ default_src_configure
+}
+
+src_compile() {
+ default_src_compile
+
+ #emake || die "emake failed"
+
+ if use ssl; then
+ emake nt_password_hash || die "emake nt_password_hash failed"
+ emake hlr_auc_gw || die "emake hlr_auc_gw failed"
+ fi
+}
+
+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
+ use ssl && dobin hlr_auc_gw
+
+ newinitd "${FILESDIR}"/${PN}-init.d hostapd
+ newconfd "${FILESDIR}"/${PN}-conf.d hostapd
+
+ doman hostapd.8 hostapd_cli.1
+
+ dodoc ChangeLog README
+ if use wps; then
+ dodoc README-WPS
+ fi
+
+ docinto examples
+ dodoc 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 and then start"
+ einfo "/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 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 hostapd.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 "
+ # einfo "re-emerge ${PN} after upgrading your kernel source."
+ #fi
+
+ if use wps; then
+ einfo "You have enabled Wi-Fi Protected Setup support, please"
+ einfo "read the README-WPS file in /usr/share/doc/${P}"
+ einfo "for info on how to use WPS"
+ fi
+}
diff --git a/net-wireless/hostapd/hostapd-0.6.8.ebuild b/net-wireless/hostapd/hostapd-0.6.8.ebuild
index a0aa9702b90b..6c403113cecb 100644
--- a/net-wireless/hostapd/hostapd-0.6.8.ebuild
+++ b/net-wireless/hostapd/hostapd-0.6.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.6.8.ebuild,v 1.6 2009/09/11 11:15:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.6.8.ebuild,v 1.7 2010/01/14 14:36:18 gurligebis Exp $
inherit toolchain-funcs linux-info
@@ -138,8 +138,8 @@ src_install() {
use ssl && dobin nt_password_hash
use ssl && dobin hlr_auc_gw
- newinitd "${FILESDIR}"/${P}-init.d hostapd
- newconfd "${FILESDIR}"/${P}-conf.d hostapd
+ newinitd "${FILESDIR}"/${PN}-init.d hostapd
+ newconfd "${FILESDIR}"/${PN}-conf.d hostapd
doman hostapd.8 hostapd_cli.1
diff --git a/net-wireless/hostapd/hostapd-0.6.9.ebuild b/net-wireless/hostapd/hostapd-0.6.9.ebuild
index 763e16934fa0..8f98ade19c78 100644
--- a/net-wireless/hostapd/hostapd-0.6.9.ebuild
+++ b/net-wireless/hostapd/hostapd-0.6.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.6.9.ebuild,v 1.5 2009/09/11 11:15:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.6.9.ebuild,v 1.6 2010/01/14 14:36:18 gurligebis Exp $
EAPI="2"
@@ -129,8 +129,8 @@ src_install() {
use ssl && dobin nt_password_hash
use ssl && dobin hlr_auc_gw
- newinitd "${FILESDIR}"/${P}-init.d hostapd
- newconfd "${FILESDIR}"/${P}-conf.d hostapd
+ newinitd "${FILESDIR}"/${PN}-init.d hostapd
+ newconfd "${FILESDIR}"/${PN}-conf.d hostapd
doman hostapd.8 hostapd_cli.1