commit:     5eb1f900583c5b709e061dcbfaee67084021f60d
Author:     Andrey Utkin <andrey_utkin <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  7 21:23:16 2018 +0000
Commit:     Andrey Utkin <andrey_utkin <AT> gentoo <DOT> 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}
 

Reply via email to