public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in net-wireless/hostapd: hostapd-1.0-r2.ebuild ChangeLog
@ 2012-09-24 15:42 Richard Farina (zerochaos)
  0 siblings, 0 replies; 2+ messages in thread
From: Richard Farina (zerochaos) @ 2012-09-24 15:42 UTC (permalink / raw
  To: gentoo-commits

zerochaos    12/09/24 15:42:53

  Modified:             ChangeLog
  Added:                hostapd-1.0-r2.ebuild
  Log:
  let's actually fix bug #426498
  
  (Portage version: 2.1.11.21/cvs/Linux x86_64, RepoMan options: --force)

Revision  Changes    Path
1.126                net-wireless/hostapd/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/hostapd/ChangeLog?rev=1.126&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/hostapd/ChangeLog?rev=1.126&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/hostapd/ChangeLog?r1=1.125&r2=1.126

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- ChangeLog	24 Aug 2012 07:59:52 -0000	1.125
+++ ChangeLog	24 Sep 2012 15:42:53 -0000	1.126
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/hostapd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.125 2012/08/24 07:59:52 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.126 2012/09/24 15:42:53 zerochaos Exp $
+
+*hostapd-1.0-r2 (24 Sep 2012)
+
+  24 Sep 2012; Rick Farina <zerochaos@gentoo.org> +hostapd-1.0-r2.ebuild:
+  let's actually fix bug #426498
 
   24 Aug 2012; Michael Weber <xmw@gentoo.org> hostapd-1.0-r1.ebuild:
   ppc stable (bug 426498).



1.1                  net-wireless/hostapd/hostapd-1.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/hostapd/hostapd-1.0-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/hostapd/hostapd-1.0-r2.ebuild?rev=1.1&content-type=text/plain

Index: hostapd-1.0-r2.ebuild
===================================================================
# 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-r2.ebuild,v 1.1 2012/09/24 15:42:53 zerochaos 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="debug ipv6 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() {
	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 "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
	fperms -R 600 /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
}





^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-wireless/hostapd: hostapd-1.0-r2.ebuild ChangeLog
@ 2012-09-24 16:02 Agostino Sarubbo (ago)
  0 siblings, 0 replies; 2+ messages in thread
From: Agostino Sarubbo (ago) @ 2012-09-24 16:02 UTC (permalink / raw
  To: gentoo-commits

ago         12/09/24 16:02:09

  Modified:             hostapd-1.0-r2.ebuild ChangeLog
  Log:
  cleanup + EAPI4 bump
  
  (Portage version: 2.1.11.9/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  net-wireless/hostapd/hostapd-1.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/hostapd/hostapd-1.0-r2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/hostapd/hostapd-1.0-r2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/hostapd/hostapd-1.0-r2.ebuild?r1=1.1&r2=1.2

Index: hostapd-1.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-1.0-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hostapd-1.0-r2.ebuild	24 Sep 2012 15:42:53 -0000	1.1
+++ hostapd-1.0-r2.ebuild	24 Sep 2012 16:02:09 -0000	1.2
@@ -1,10 +1,10 @@
 # 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-r2.ebuild,v 1.1 2012/09/24 15:42:53 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-1.0-r2.ebuild,v 1.2 2012/09/24 16:02:09 ago Exp $
 
-EAPI="2"
+EAPI="4"
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
 
 DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
 HOMEPAGE="http://hostap.epitest.fi"
@@ -25,11 +25,11 @@
 		net-wireless/madwifi-old ) )"
 RDEPEND="${DEPEND}"
 
-S="${S}/hostapd"
+S="${S}/${PN}"
 
 src_prepare() {
 	sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
-		"${S}/hostapd.conf"
+		"${S}/hostapd.conf" || die
 }
 
 src_configure() {
@@ -125,47 +125,42 @@
 }
 
 src_compile() {
-	default_src_compile
-
-	#emake || die "emake failed"
+	emake V=1
 
 	if use ssl; then
-		emake nt_password_hash || die "emake nt_password_hash failed"
-		emake hlr_auc_gw || die "emake hlr_auc_gw failed"
+		emake V=1 nt_password_hash
+		emake V=1 hlr_auc_gw
 	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
-	fperms -R 600 /etc/hostapd
+	insinto /etc/${PN}
+	doins ${PN}.{conf,accept,deny,eap_user,radius_clients,sim_db,wpa_psk}
+
+	fperms -R 600 /etc/${PN}
 
-	dosbin hostapd
-	dobin hostapd_cli
+	dosbin ${PN}
+	dobin ${PN}_cli
 
-	use ssl && dobin nt_password_hash
-	use ssl && dobin hlr_auc_gw
+	use ssl && dobin nt_password_hash hlr_auc_gw
 
-	newinitd "${FILESDIR}"/${PN}-init.d hostapd
-	newconfd "${FILESDIR}"/${PN}-conf.d hostapd
+	newinitd "${FILESDIR}"/${PN}-init.d ${PN}
+	newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
 
-	doman hostapd.8 hostapd_cli.1
+	doman ${PN}{.8,_cli.1}
 
 	dodoc ChangeLog README
-	if use wps; then
-		dodoc README-WPS
-	fi
+	use wps && dodoc README-WPS
 
 	docinto examples
 	dodoc wired.conf
 
 	if use logwatch; then
 		insinto /etc/log.d/conf/services/
-		doins logwatch/hostapd.conf
+		doins logwatch/${PN}.conf
 
 		exeinto /etc/log.d/scripts/services/
-		doexe logwatch/hostapd
+		doexe logwatch/${PN}
 	fi
 }
 
@@ -173,7 +168,7 @@
 	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 "/etc/init.d/${PN}."
 	einfo
 	einfo "Example configuration:"
 	einfo
@@ -188,7 +183,7 @@
 		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 "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



1.127                net-wireless/hostapd/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/hostapd/ChangeLog?rev=1.127&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/hostapd/ChangeLog?rev=1.127&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/hostapd/ChangeLog?r1=1.126&r2=1.127

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- ChangeLog	24 Sep 2012 15:42:53 -0000	1.126
+++ ChangeLog	24 Sep 2012 16:02:09 -0000	1.127
@@ -1,6 +1,9 @@
 # ChangeLog for net-wireless/hostapd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.126 2012/09/24 15:42:53 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.127 2012/09/24 16:02:09 ago Exp $
+
+  24 Sep 2012; Agostino Sarubbo <ago@gentoo.org> hostapd-1.0-r2.ebuild:
+  cleanup + EAPI4 bump
 
 *hostapd-1.0-r2 (24 Sep 2012)
 





^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-09-24 16:02 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-24 16:02 [gentoo-commits] gentoo-x86 commit in net-wireless/hostapd: hostapd-1.0-r2.ebuild ChangeLog Agostino Sarubbo (ago)
  -- strict thread matches above, loose matches on Subject: below --
2012-09-24 15:42 Richard Farina (zerochaos)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox