From 9230b4c91e5cb845ee3984489b7f15c6e959545e Mon Sep 17 00:00:00 2001 From: Anton Bolshakov Date: Sat, 8 Jan 2022 11:39:51 +0800 Subject: [PATCH] hostapd-mana: fix https://github.com/pentoo/pentoo-overlay/issues/995 --- net-wireless/hostapd-mana/Manifest | 2 +- net-wireless/hostapd-mana/files/crackapd.conf | 0 ...ld => hostapd-mana-2.6.5_p20210920.ebuild} | 0 .../hostapd-mana/hostapd-mana-9999.ebuild | 38 ++++++++++--------- profiles/pentoo/base/package.mask | 1 - 5 files changed, 22 insertions(+), 19 deletions(-) mode change 100755 => 100644 net-wireless/hostapd-mana/files/crackapd.conf rename net-wireless/hostapd-mana/{hostapd-mana-2.6.5.ebuild => hostapd-mana-2.6.5_p20210920.ebuild} (100%) diff --git a/net-wireless/hostapd-mana/Manifest b/net-wireless/hostapd-mana/Manifest index e36d8f214..20daaf23d 100644 --- a/net-wireless/hostapd-mana/Manifest +++ b/net-wireless/hostapd-mana/Manifest @@ -1 +1 @@ -DIST hostapd-mana-2.6.5.tar.gz 1897021 BLAKE2B 939dc5c0d8c29a7261c83174538252952b3e597ed63b48fca871211fda5933706e42659ab545c7056b924efff7890d270b6dedb7f61819937757145e210a529b SHA512 6e80776c6ce06ea120c57a26db5b4cf2eff64863cbf86525746c5c607a9e28773b2c491c45250afab3128c48f0cf518b66bd94b88753b02f0e77016dee4014ff +DIST hostapd-mana-2.6.5_p20210920.tar.gz 1899518 BLAKE2B 41bc1efd42b3cf3b8ac2b220a0000dc89a1adb153a05a6c1b428ebcf99e873626bb4ba018e56f6e937f68895cce17d6f8ed97c8d9b8b5f5f713e576e09ff7762 SHA512 dea8ae493da7ffcf44e21a7536adb5b252cbe26ead0b5a6320832d990548ecac70bfb3741175515bce563a86d656a545107cc1b5e0fe09fc5a028815cce98a54 diff --git a/net-wireless/hostapd-mana/files/crackapd.conf b/net-wireless/hostapd-mana/files/crackapd.conf old mode 100755 new mode 100644 diff --git a/net-wireless/hostapd-mana/hostapd-mana-2.6.5.ebuild b/net-wireless/hostapd-mana/hostapd-mana-2.6.5_p20210920.ebuild similarity index 100% rename from net-wireless/hostapd-mana/hostapd-mana-2.6.5.ebuild rename to net-wireless/hostapd-mana/hostapd-mana-2.6.5_p20210920.ebuild diff --git a/net-wireless/hostapd-mana/hostapd-mana-9999.ebuild b/net-wireless/hostapd-mana/hostapd-mana-9999.ebuild index 1c894f816..c54760d69 100644 --- a/net-wireless/hostapd-mana/hostapd-mana-9999.ebuild +++ b/net-wireless/hostapd-mana/hostapd-mana-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,50 +7,54 @@ PYTHON_COMPAT=( python3_{9..10} ) inherit python-r1 toolchain-funcs savedconfig +MY_PN="hostapd" + DESCRIPTION="SensePost's modified hostapd for wifi attacks" HOMEPAGE="https://w1f1.net https://github.com/sensepost/hostapd-mana" if [[ $PV == *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/sensepost/hostapd-mana.git" + S="${S}/${MY_PN}" else - SRC_URI="https://github.com/sensepost/hostapd-mana/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + HASH_COMMIT="1302a7204d9118efa0668df1924c938dbe8d1b11" + SRC_URI="https://github.com/sensepost/hostapd-mana/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz" + KEYWORDS="amd64 x86" + S="${WORKDIR}/${PN}-${HASH_COMMIT}/${MY_PN}" fi LICENSE="BSD" SLOT="0" -IUSE="+crackapd" +IUSE="crda internal-tls netlink sqlite crackapd" DEPEND=" - crackapd? ( - ${PYTHON_DEPS} - app-crypt/asleap + internal-tls? ( dev-libs/libtommath ) + !internal-tls? ( dev-libs/openssl:0=[-bindist(-)] ) + kernel_linux? ( + dev-libs/libnl:3 + crda? ( net-wireless/crda ) ) - dev-libs/openssl:0=[-bindist] - dev-libs/libnl:3 - net-libs/libnfnetlink" - + netlink? ( net-libs/libnfnetlink ) + sqlite? ( >=dev-db/sqlite-3 )" RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" -MY_PN="${PN%-mana}" -S="${S}/${MY_PN}" src_prepare() { - sed -e "s:/etc/hostapd:/etc/${PN}:g" \ - -i "${S}/hostapd.conf" || die + sed -e "s:/etc/hostapd:/etc/${PN}:g" -i ./hostapd.conf || die # Allow users to apply patches to src/drivers for example, - # i.e. anything outside ${S}/${MY_PN} + # i.e. anything outside ${S}/${PN} pushd ../ >/dev/null || die + default eapply "${FILESDIR}"/crackapd_pentoo.patch eapply "${FILESDIR}"/update_hostapd.conf.patch eapply "${FILESDIR}"/48.patch - default popd >/dev/null || die + } src_configure() { diff --git a/profiles/pentoo/base/package.mask b/profiles/pentoo/base/package.mask index fb0c319d4..b3aad5350 100644 --- a/profiles/pentoo/base/package.mask +++ b/profiles/pentoo/base/package.mask @@ -125,7 +125,6 @@ net-analyzer/osmedeus # not tested yet... (2019-09-21) # more info: https://github.com/pentoo/pentoo-overlay/issues/495 -net-wireless/hostapd-mana net-wireless/berate_ap net-wireless/wpa_sycophant