From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 375D2138010 for ; Mon, 24 Sep 2012 16:02:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1200421C149; Mon, 24 Sep 2012 16:02:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C3C1F21C149 for ; Mon, 24 Sep 2012 16:02:11 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0EB9833C84E for ; Mon, 24 Sep 2012 16:02:11 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2314) id C534221600; Mon, 24 Sep 2012 16:02:09 +0000 (UTC) From: "Agostino Sarubbo (ago)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, ago@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in net-wireless/hostapd: hostapd-1.0-r2.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: hostapd-1.0-r2.ebuild ChangeLog X-VCS-Directories: net-wireless/hostapd X-VCS-Committer: ago X-VCS-Committer-Name: Agostino Sarubbo Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20120924160209.C534221600@flycatcher.gentoo.org> Date: Mon, 24 Sep 2012 16:02:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 62131667-dcc0-4e0b-ae2a-8cb4e38f7c43 X-Archives-Hash: b76735936a56e8d0fa4fd449b5e5a28f 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 hostapd-1.0-r2.ebuild: + cleanup + EAPI4 bump *hostapd-1.0-r2 (24 Sep 2012)