hostapd: version bump with karma/cui patches. CVE-2012-2389 (#426498) fixed in the same time

This commit is contained in:
Anton Bolshakov 2012-07-17 11:16:14 +00:00
parent 836ff87fb0
commit 2485ae1328
5 changed files with 8639 additions and 4 deletions

View file

@ -1,9 +1,13 @@
AUX cui-20120417.patch 13221 RMD160 c6d420cb68e0e705d46c4287cebfa70c745ba661 SHA1 6d73d4de1089f6fc49273e5210d1f7cf6a862dcc SHA256 b853484cd5d3e89e4eb96be3edf0bedef01922e74cd87578c6a2faf647f3180a
AUX cui-20120717.patch 103360 RMD160 63ddc77437b5ec73e84d85be6a0de8a7d54f214e SHA1 d9fc7f61dbcd7d64cb3b2212d7732fae466343b4 SHA256 06da69f418be098369629a2fe9d12a89e2cec5f5710871631a1a114c3c358fd0
AUX hostapd-0.7.3-karma.patch 17778 RMD160 e6fb21ba941c8c0578fdf4bcaad3970b4182d580 SHA1 5264175ec18fc44dd437525eabbde56f438b958d SHA256 28b8963c836e0208d8f621c6345e27d66ad2a8df33eec99d2505fc7980019ee8
AUX hostapd-1.0-karma.patch 136714 RMD160 74551f14e6f3f3c5a76da6f6c4668f5bfd072bd4 SHA1 7fab7883145aaf3e0fb99547b6ead45c79576b7d SHA256 2a69860c92639eb1d9defe77dd8b74dc19bf9107d48d3fd629415bee4da6bf89
AUX hostapd-conf.d 245 RMD160 88b816218cb37d32fd940db17ece84d612c87f14 SHA1 0d88865c313bf1ffbc168029a13c76f288280a3d SHA256 916f4b14095ee4ec8a510391c883e9f01868e18d79a3d5cbeb13a104a793d45d
AUX hostapd-init.d 1015 RMD160 9c5908b38de714f6c79aad61ee2c248bf9d06c0a SHA1 6238deb6c618169ab5a8147850a1a0e594d69ba3 SHA256 d2c0f0d97a8c7d25e723c55c4377c1f7344762375998cc8498788f3a340fdf95
AUX hostapd-init.d 1022 RMD160 cb6380788253a43d6078c498fcfc7d37c4881d1b SHA1 68911ad9af83ab7a77a8e12ddc6f4f5337aa4d19 SHA256 a220058841e66a11603df8e968ccc68945f01e1d11c1ae498922d0e01f6fa804
DIST hostapd-0.7.3.tar.gz 1138869 RMD160 3d901166172cf634ecab4bd8426a33695b1e1070 SHA1 7a8853fe41ee5a2b9f03f608cf7a61c7ccea4f4c SHA256 31eb2781f37e1a4c27969d1594f8019c0ca87779349c099ab812833289961567
DIST hostapd-1.0.tar.gz 1327943 RMD160 d4d90d0ed3130727ac8a4b3a413882dfeaef9fd4 SHA1 4edf267bc5943a5f7d6d9c0abcce0973bfbad5fa SHA256 002e9dcb7e46cf82b5900a2fcf92b30fc8cdfd32a72d7fd4488588f1c013dfcc
EBUILD hostapd-0.7.3-r1.ebuild 5196 RMD160 c64ab6b1b4383012cf8c5fa3d888ef2ef0110d99 SHA1 177365371ab8b4d30c3f6de5e3628a1e7da579dc SHA256 c1d3482187cebb1723218f78e481ad6eb6ea1e84671211d2eb0d0c341e9754e3
EBUILD hostapd-0.7.3-r2.ebuild 5242 RMD160 c9d7d5a2b83db19ce14054da49dcfc74a2bc1aec SHA1 b4cb886d96a7fe22a111e17f836db739233aaeef SHA256 85f98f60afad13b1667d602bba5a66f32eadcffa7548f52d13422424de33ed04
EBUILD hostapd-1.0-r1.ebuild 5654 RMD160 91e6f5751a0ddebaa07b54766c12937ec97675bb SHA1 e5f231345817ad3ce09868f9f225a157abe29331 SHA256 9da6f5e16bafd702277f43cef25d6b6e71e4a99236b71eabd9098986014614a8
MISC ChangeLog 20312 RMD160 c4c737a7b61d845873ff118e070c73a6cda1b20d SHA1 6757bce5e168416c6c388d53740978dba230ba6f SHA256 4a1673cde56f1b7ea1dfd20f0ac702ad3e7e916b84cfdf4f5aa0448d01b13659
MISC metadata.xml 752 RMD160 f895add3fe282efb5fd3fba223d16b28fabe2e9e SHA1 1c4e58ae3628f9c433d939e5d973e1c795aa58f6 SHA256 78c8bab11c00f4988d677b1f4bf5a66c3221c0f9a3c46cfaf333a8857f250662

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -1,9 +1,9 @@
#!/sbin/runscript
# Copyright 1999-2006 Gentoo Foundation
# Copyright 1999-2011 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.1 2010/01/14 14:36:18 gurligebis Exp $
# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/files/hostapd-init.d,v 1.3 2011/09/25 14:03:46 gurligebis Exp $
opts="start stop reload"
extra_started_commands="reload"
depend() {
local myneeds=

View file

@ -0,0 +1,210 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-1.0-r1.ebuild,v 1.3 2012/06/17 15:51:16 gurligebis Exp $
EAPI="2"
inherit toolchain-funcs eutils
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="cui debug ipv6 +karma logwatch madwifi +ssl +wps +crda"
DEPEND="ssl? ( dev-libs/openssl )
kernel_linux? (
dev-libs/libnl:1.1
crda? ( net-wireless/crda )
)
madwifi? ( ||
( >net-wireless/madwifi-ng-tools-0.9.3
net-wireless/madwifi-old ) )"
RDEPEND="${DEPEND}"
S="${S}/hostapd"
src_prepare() {
cd ..
use karma && epatch "${FILESDIR}/${P}-karma.patch"
use cui && epatch "${FILESDIR}/cui-20120417.patch"
cd "${S}"
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_WPS2=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"
echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG}
einfo " None 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}
echo "CONFIG_INTERWORKING=y" >> ${CONFIG}
if use ipv6; then
# IPv6 support
echo "CONFIG_IPV6=y" >> ${CONFIG}
fi
if ! use debug; then
echo "CONFIG_NO_STDOUT_DEBUG=y" >> ${CONFIG}
fi
# 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-2.0"; then
# echo "CONFIG_LIBNL20=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
chmod -R 600 "${D}"/etc/hostapd
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
}