summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBertrand Jacquin <bertrand@jacquin.bzh>2016-08-31 21:56:00 +0100
committerBertrand Jacquin <bertrand@jacquin.bzh>2016-08-31 21:56:00 +0100
commitc69963dc0d4182e499f0245f0af17716cf8b97d1 (patch)
tree6738943b1604447ed0fba4687d2ef1a3da1c19a7
parentwww-apps/phabricator: Convert init scripts to openrc-run (diff)
downloadportage-c69963dc0d4182e499f0245f0af17716cf8b97d1.tar.xz
net-wireless/hostapd: Drop since hot vlan bridging is not needed anymore
-rw-r--r--metadata/md5-cache/net-wireless/hostapd-2.013
-rw-r--r--net-wireless/hostapd/Manifest7
-rw-r--r--net-wireless/hostapd/files/hostapd-2.0-tls_length_fix.patch48
-rw-r--r--net-wireless/hostapd/files/hostapd-conf.d9
-rw-r--r--net-wireless/hostapd/files/hostapd-init.d39
-rw-r--r--net-wireless/hostapd/files/hostapd.service9
-rw-r--r--net-wireless/hostapd/hostapd-2.0.ebuild206
-rw-r--r--net-wireless/hostapd/metadata.xml21
-rw-r--r--profiles/use.local.desc4
9 files changed, 0 insertions, 356 deletions
diff --git a/metadata/md5-cache/net-wireless/hostapd-2.0 b/metadata/md5-cache/net-wireless/hostapd-2.0
deleted file mode 100644
index 9b60b26d..00000000
--- a/metadata/md5-cache/net-wireless/hostapd-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=ssl? ( dev-libs/openssl ) kernel_linux? ( dev-libs/libnl:3 crda? ( net-wireless/crda ) ) madwifi? ( >net-wireless/madwifi-ng-tools-0.9.3 )
-DESCRIPTION=IEEE 802.11 wireless LAN Host AP daemon
-EAPI=4
-HOMEPAGE=http://hostap.epitest.fi
-IUSE=ipv6 logwatch madwifi +ssl +wps +crda savedconfig
-KEYWORDS=amd64 ~mips ppc x86
-LICENSE=|| ( GPL-2 BSD )
-RDEPEND=ssl? ( dev-libs/openssl ) kernel_linux? ( dev-libs/libnl:3 crda? ( net-wireless/crda ) ) madwifi? ( >net-wireless/madwifi-ng-tools-0.9.3 )
-SLOT=0
-SRC_URI=http://hostap.epitest.fi/releases/hostapd-2.0.tar.gz
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc multilib d062ae4ba2fc40a19c11de2ad89b6616 portability bb1a0ed8ea152b957d17339f01d4d7f5 savedconfig 7de7daa586f6bf361639e77d6f2299db toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=abf1952bd250a829dd3eaeb1b873dfa7
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
deleted file mode 100644
index 697f51d3..00000000
--- a/net-wireless/hostapd/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-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 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 5488 SHA256 683dd26d746e7873b89db89bb6f1506b85219c16dca82aafbdfc3598637683aa WHIRLPOOL 1bb11e72d113aa13363b809b2cba1e3c05dfee035cd3c0c935d861e1b3ea1337e716d11df980ec1ea5b585727c61edab15e4fa712d89d6fcc73593b962a6b939
-MISC metadata.xml 820 SHA256 ccdd3f08f7a60f9c685389b6b6cdc7171fab3547abe77329441c92acd64205f3 WHIRLPOOL 882cc3f01cf8f006e46f30332ebb02c44224e741aead2c619536970199805ff7724dfc8f8013e91e22afc21ea6cef3f002036d7d2662cf97843d9d71f562b84a
diff --git a/net-wireless/hostapd/files/hostapd-2.0-tls_length_fix.patch b/net-wireless/hostapd/files/hostapd-2.0-tls_length_fix.patch
deleted file mode 100644
index bda92cf4..00000000
--- a/net-wireless/hostapd/files/hostapd-2.0-tls_length_fix.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 586c446e0ff42ae00315b014924ec669023bd8de Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j@w1.fi>
-Date: Sun, 7 Oct 2012 20:06:29 +0300
-Subject: [PATCH] EAP-TLS server: Fix TLS Message Length validation
-
-EAP-TLS/PEAP/TTLS/FAST server implementation did not validate TLS
-Message Length value properly and could end up trying to store more
-information into the message buffer than the allocated size if the first
-fragment is longer than the indicated size. This could result in hostapd
-process terminating in wpabuf length validation. Fix this by rejecting
-messages that have invalid TLS Message Length value.
-
-This would affect cases that use the internal EAP authentication server
-in hostapd either directly with IEEE 802.1X or when using hostapd as a
-RADIUS authentication server and when receiving an incorrectly
-constructed EAP-TLS message. Cases where hostapd uses an external
-authentication are not affected.
-
-Thanks to Timo Warns for finding and reporting this issue.
-
-Signed-hostap: Jouni Malinen <j@w1.fi>
-intended-for: hostap-1
----
- src/eap_server/eap_server_tls_common.c | 8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/src/eap_server/eap_server_tls_common.c b/src/eap_server/eap_server_tls_common.c
-index 31be2ec..46f282b 100644
---- a/src/eap_server/eap_server_tls_common.c
-+++ b/src/eap_server/eap_server_tls_common.c
-@@ -228,6 +228,14 @@ static int eap_server_tls_process_fragment(struct eap_ssl_data *data,
- return -1;
- }
-
-+ if (len > message_length) {
-+ wpa_printf(MSG_INFO, "SSL: Too much data (%d bytes) in "
-+ "first fragment of frame (TLS Message "
-+ "Length %d bytes)",
-+ (int) len, (int) message_length);
-+ return -1;
-+ }
-+
- data->tls_in = wpabuf_alloc(message_length);
- if (data->tls_in == NULL) {
- wpa_printf(MSG_DEBUG, "SSL: No memory for message");
---
-1.7.4-rc1
-
diff --git a/net-wireless/hostapd/files/hostapd-conf.d b/net-wireless/hostapd/files/hostapd-conf.d
deleted file mode 100644
index 7d05735e..00000000
--- a/net-wireless/hostapd/files/hostapd-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-init.d b/net-wireless/hostapd/files/hostapd-init.d
deleted file mode 100644
index d09002b6..00000000
--- a/net-wireless/hostapd/files/hostapd-init.d
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/runscript
-# 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.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"
-
-depend() {
- local myneeds=
- for iface in ${INTERFACES}; do
- myneeds="${myneeds} net.${iface}"
- done
-
- [ -n "${myneeds}" ] && need ${myneeds}
- use logger
-}
-
-start_pre() {
- local file
-
- for file in ${CONFIGS}; do
- if [ ! -r "${file}" ]; then
- eerror "hostapd configuration file (${CONFIG}) not found"
- return 1
- fi
- done
-}
-
-reload() {
- start_pre || return 1
-
- ebegin "Reloading ${SVCNAME} configuration"
- 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
deleted file mode 100644
index 8f0ee8e8..00000000
--- a/net-wireless/hostapd/files/hostapd.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[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
deleted file mode 100644
index ff678187..00000000
--- a/net-wireless/hostapd/hostapd-2.0.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit toolchain-funcs eutils savedconfig flag-o-matic
-
-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 ~mips ppc x86"
-IUSE="ipv6 logwatch madwifi +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 )"
-RDEPEND="${DEPEND}"
-
-S="${S}/${PN}"
-
-src_prepare() {
- cd ..
- epatch "${FILESDIR}/${P}-tls_length_fix.patch"
-
- sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
- "${S}/hostapd.conf" || die
-}
-
-hostapd_config_option() {
- local key="$1" ; shift
- local val="$@"
-
- if ! grep -qE "^(#| )*CONFIG_${key}[ =]" "${CONFIG}" ; then
- eqawarn "CONFIG_${key} is missing in defconfig"
- echo >> "${CONFIG}"
- echo "# .config imported from ${S}/defconfig is missing CONFIG_${key}" >> "${CONFIG}"
- echo "# CONFIG_${key} is not set" >> "${CONFIG}"
- fi
-
- if [[ ${val} == "n" ]] ; then
- sed -i -re "s:^(#| )*CONFIG_${key}[ =].*:# CONFIG_${key} is not set:" "${CONFIG}"
- else
- sed -i -re "s:^(#| )*CONFIG_${key}[ =].*:CONFIG_${key}=${val}:" "${CONFIG}"
- fi
-
- einfo $(grep -E "^(#| )*CONFIG_${key}[ =]" "${CONFIG}")
-}
-
-src_configure() {
- tc-export CC
-
- # Add include path for madwifi-driver headers
- use madwifi && append-cflags -I/usr/include/madwifi
-
- CONFIG="${S}/.config"
- restore_config "${CONFIG}"
-
- [[ -f "${CONFIG}" ]] && return 0
-
- einfo "Generating configuration based on defconfig"
- cp "${S}/defconfig" "${CONFIG}"
-
- # EAP authentication methods
- hostapd_config_option EAP y
- hostapd_config_option EAP_MD5 y
-
- # SSL authentication methods
- hostapd_config_option EAP_TLS $(usex ssl y n)
- hostapd_config_option EAP_TTLS $(usex ssl y n)
- hostapd_config_option EAP_MSCHAPV2 $(usex ssl y n)
- hostapd_config_option EAP_PEAP $(usex ssl y n)
-
- # Enable Wi-Fi Protected Setup
- hostapd_config_option WPS $(usex wps y n)
- hostapd_config_option WPS2 $(usex wps y n)
- hostapd_config_option WPS_UPNP $(usex wps y n)
-
- hostapd_config_option EAP_GTC y
- hostapd_config_option EAP_SIM y
- hostapd_config_option EAP_AKA y
- hostapd_config_option EAP_PAX y
- hostapd_config_option EAP_PSK y
- hostapd_config_option EAP_SAKE y
- hostapd_config_option EAP_GPSK y
- hostapd_config_option EAP_GPSK_SHA256 y
-
- # drivers
- # 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
-
- # misc
- hostapd_config_option PKCS12 y
- hostapd_config_option RADIUS_SERVER y
- hostapd_config_option IAPP y
- hostapd_config_option IEEE80211R y
- hostapd_config_option IEEE80211W y
- hostapd_config_option IEEE80211N y
- hostapd_config_option PEERKEY y
- hostapd_config_option RSN_PREAUTH y
- hostapd_config_option INTERWORKING y
-
- # IPv6 support
- hostapd_config_option IPV6 $(usex ipv6 y n)
-
- # 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.
- if has_version ">=dev-libs/libnl-3.2"; then
- hostapd_config_option LIBNL32 y
- else
- hostapd_config_option LIBNL32 n
- fi
-
- default_src_configure
-}
-
-src_compile() {
- emake V=1
-
- if use ssl; then
- emake V=1 nt_password_hash
- emake V=1 hlr_auc_gw
- fi
-}
-
-src_install() {
- save_config "${CONFIG}"
-
- insinto /etc/${PN}
- doins ${PN}.{conf,accept,deny,eap_user,radius_clients,sim_db,wpa_psk}
-
- fperms -R 600 /etc/${PN}
-
- dosbin ${PN}
- dobin ${PN}_cli
-
- use ssl && dobin nt_password_hash hlr_auc_gw
-
- newinitd "${FILESDIR}"/${PN}-init.d ${PN}
- newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
- systemd_dounit "${FILESDIR}"/${PN}.service
-
- doman ${PN}{.8,_cli.1}
-
- dodoc ChangeLog README
- use wps && dodoc README-WPS
-
- docinto examples
- dodoc wired.conf
-
- if use logwatch; then
- insinto /etc/log.d/conf/services/
- doins logwatch/${PN}.conf
-
- exeinto /etc/log.d/scripts/services/
- doexe logwatch/${PN}
- fi
-}
-
-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}."
- 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 ${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 "
- # 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/metadata.xml b/net-wireless/hostapd/metadata.xml
deleted file mode 100644
index b023e003..00000000
--- a/net-wireless/hostapd/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer>
- <email>gurligebis@gentoo.org</email>
- <name>Bjarke Istrup Pedersen</name>
- </maintainer>
- <longdescription>
- User space daemon for the hostap-driver.
- Extended IEEE 802.11 management, IEEE 802.1X Authenticator,
- RADIUS Authentication client, RADIUS Accounting client
- </longdescription>
- <use>
- <flag name='crda'>Add CRDA support</flag>
- <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='wps'>Add support for Wi-Fi Protected Setup</flag>
- </use>
-</pkgmetadata>
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 5f4ecc01..1c330782 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -56,10 +56,6 @@ media-video/rtmpdump:polarssl - Use PolarSSL library instead of the default Open
net-misc/icmptx:client - Enable client support
net-misc/icmptx:server - Enable server support
net-misc/openvpn-gui:empty-password - Permit user to remove password on private key
-net-wireless/hostapd:crda - Add CRDA support
-net-wireless/hostapd:logwatch - Install support files for sys-app/logwatch
-net-wireless/hostapd:madwifi - Add support for madwifi (Atheros chipset)
-net-wireless/hostapd:wps - Add support for Wi-Fi Protected Setup
sys-firmware/gnuk:tools - Install aditional tools
virtual/linux-sources:firmware - Install linux kernel firmware
www-apps/phabricator:extension-sprint - Enable extension sprint via www-apps/phabricator-extensions-Sprint