From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8A822138334 for ; Thu, 7 Jun 2018 21:54:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 34800E0AA4; Thu, 7 Jun 2018 21:54:05 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D97D1E0AA4 for ; Thu, 7 Jun 2018 21:54:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 76AEF335CBF for ; Thu, 7 Jun 2018 21:54:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A14222BF for ; Thu, 7 Jun 2018 21:54:00 +0000 (UTC) From: "Andrey Utkin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrey Utkin" Message-ID: <1528407833.5eb1f900583c5b709e061dcbfaee67084021f60d.andrey_utkin@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/hostapd/Manifest net-wireless/hostapd/hostapd-2.6-r5.ebuild X-VCS-Directories: net-wireless/hostapd/ X-VCS-Committer: andrey_utkin X-VCS-Committer-Name: Andrey Utkin X-VCS-Revision: 5eb1f900583c5b709e061dcbfaee67084021f60d X-VCS-Branch: master Date: Thu, 7 Jun 2018 21:54:00 +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: c63ba479-756c-494f-ab9d-e45b259b82ce X-Archives-Hash: b52a39d0e2c1aae4fb7bb46d4b688680 commit: 5eb1f900583c5b709e061dcbfaee67084021f60d Author: Andrey Utkin gentoo org> AuthorDate: Thu Jun 7 21:23:16 2018 +0000 Commit: Andrey Utkin gentoo org> CommitDate: Thu Jun 7 21:43:53 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5eb1f900 net-wireless/hostapd: use extras distfile instead of files/ This is to comply with QA policy of keeping files/ small. Package-Manager: Portage-2.3.40, Repoman-2.3.9 net-wireless/hostapd/Manifest | 1 + net-wireless/hostapd/hostapd-2.6-r5.ebuild | 27 +++++++++++++++------------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest index 3e38dd5d7d7..34faab85331 100644 --- a/net-wireless/hostapd/Manifest +++ b/net-wireless/hostapd/Manifest @@ -1 +1,2 @@ DIST hostapd-2.6.tar.gz 1822341 BLAKE2B c0075ffcdb11237e11410d87329a7a71aae5e00481022e02faf03771d45a61410ff906ebffdeea03fdeab751ce85e5a5e191173883ee9f1c284e6bc00342a011 SHA512 e60baaa092786250b8de9935f5417c7626f5d749210cce9f83d776b65c19fc92a8141f41923389f05c16295d482a15ae8d8b744f4667425040c99e3c2f5b1bda +DIST net-wireless_hostapd_2.6-r5_extras.tar.xz 10648 BLAKE2B fef02c9fbc9b6bce662f7d569a56450371bc1e9c5cd34a7cf4fc0220bb8239214604806f3edfde87fd45c7cf07bab9cf16a6c215c1bfa3161ba4361e4b295981 SHA512 cf818854e7af6562a163b5a61d63f4fa1284905f5803abe4ef97a6743b74ce2d28c818aa462d843448146226b9c5c9578b6c69ffad2d4fb8a62777cd5d353e70 diff --git a/net-wireless/hostapd/hostapd-2.6-r5.ebuild b/net-wireless/hostapd/hostapd-2.6-r5.ebuild index ffc16c5ae29..da0fbd66921 100644 --- a/net-wireless/hostapd/hostapd-2.6-r5.ebuild +++ b/net-wireless/hostapd/hostapd-2.6-r5.ebuild @@ -7,7 +7,10 @@ inherit toolchain-funcs eutils systemd savedconfig DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon" HOMEPAGE="http://hostap.epitest.fi" -SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz" +EXTRAS_VER="2.6-r5" +EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras" +SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz + https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz" LICENSE="BSD" SLOT="0" @@ -47,16 +50,16 @@ src_prepare() { pushd ../ >/dev/null || die # Add LibreSSL compatibility patch bug (#567262) - eapply "${FILESDIR}/${P}-libressl-compatibility.patch" + eapply "${WORKDIR}/${EXTRAS_NAME}/${P}-libressl-compatibility.patch" # https://w1.fi/security/2017-1/wpa-packet-number-reuse-with-replayed-messages.txt - eapply "${FILESDIR}/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch" - eapply "${FILESDIR}/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch" - eapply "${FILESDIR}/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch" - eapply "${FILESDIR}/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch" - eapply "${FILESDIR}/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch" - eapply "${FILESDIR}/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch" - eapply "${FILESDIR}/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch" + eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch" + eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch" + eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch" + eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch" + eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch" + eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch" + eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch" default popd >/dev/null || die @@ -202,9 +205,9 @@ src_install() { dobin nt_password_hash hlr_auc_gw fi - newinitd "${FILESDIR}"/${PN}-init.d ${PN} - newconfd "${FILESDIR}"/${PN}-conf.d ${PN} - systemd_dounit "${FILESDIR}"/${PN}.service + newinitd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-init.d ${PN} + newconfd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-conf.d ${PN} + systemd_dounit "${WORKDIR}/${EXTRAS_NAME}"/${PN}.service doman ${PN}{.8,_cli.1}