commit: 9bec839c511a1f48a6a4e12343aa0a949c7df6c0 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Thu Nov 25 19:09:58 2021 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sun Nov 28 19:54:09 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bec839c
net-wireless/aircrack-ng: migrate to hwdata Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> ....ebuild => aircrack-ng-1.6_p20200722-r1.ebuild} | 11 ++++++--- net-wireless/aircrack-ng/aircrack-ng-9999.ebuild | 2 +- .../aircrack-ng/files/aircrack-ng-1.6-hwdata.patch | 26 ++++++++++++++++++++++ 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.6_p20200722-r1.ebuild similarity index 89% copy from net-wireless/aircrack-ng/aircrack-ng-9999.ebuild copy to net-wireless/aircrack-ng/aircrack-ng-1.6_p20200722-r1.ebuild index ea254ead117a..3e29615b279a 100644 --- a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild +++ b/net-wireless/aircrack-ng/aircrack-ng-1.6_p20200722-r1.ebuild @@ -15,8 +15,10 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/aircrack-ng/aircrack-ng.git" else - MY_PV=${PV/_/-} - SRC_URI="https://download.aircrack-ng.org/${P}.tar.gz" + #SRC_URI="https://download.aircrack-ng.org/${P}.tar.gz" + COMMIT="5a02ac4818b30d2e87b3e18e497a5f9e5319394f" + SRC_URI="https://github.com/aircrack-ng/aircrack-ng/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${COMMIT}" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux" fi @@ -41,7 +43,7 @@ RDEPEND="${DEPEND} sys-apps/ethtool sys-apps/usbutils sys-apps/pciutils ) - sys-apps/hwids + sys-apps/hwdata airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )" REQUIRED_USE=" @@ -49,6 +51,9 @@ REQUIRED_USE=" airgraph-ng? ( ${PYTHON_REQUIRED_USE} )" src_prepare() { + local PATCHES=( + "${FILESDIR}/aircrack-ng-1.6-hwdata.patch" + ) default eautoreconf } diff --git a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild index ea254ead117a..e7aadf29d9b5 100644 --- a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild +++ b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild @@ -41,7 +41,7 @@ RDEPEND="${DEPEND} sys-apps/ethtool sys-apps/usbutils sys-apps/pciutils ) - sys-apps/hwids + sys-apps/hwdata airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )" REQUIRED_USE=" diff --git a/net-wireless/aircrack-ng/files/aircrack-ng-1.6-hwdata.patch b/net-wireless/aircrack-ng/files/aircrack-ng-1.6-hwdata.patch new file mode 100644 index 000000000000..bedc14f3ffc1 --- /dev/null +++ b/net-wireless/aircrack-ng/files/aircrack-ng-1.6-hwdata.patch @@ -0,0 +1,26 @@ +From f493d0ba1d2cd6c2fdd3c80fe20908c5a6a0001a Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <flop...@gentoo.org> +Date: Thu, 25 Nov 2021 12:28:07 -0500 +Subject: [PATCH] airodump-ng: look for oui.txt in /usr/share/hwdata + +This location is used by the hwdata package on various distros. + +https://github.com/vcrhonek/hwdata + +Signed-off-by: Mike Gilbert <flop...@gentoo.org> +--- + src/airodump-ng/airodump-ng.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/airodump-ng/airodump-ng.c b/src/airodump-ng/airodump-ng.c +index 63013450d..23171854e 100644 +--- a/src/airodump-ng/airodump-ng.c ++++ b/src/airodump-ng/airodump-ng.c +@@ -102,6 +102,7 @@ static const char * OUI_PATHS[] + "/usr/share/aircrack-ng/airodump-ng-oui.txt", + "/var/lib/misc/oui.txt", + "/usr/share/misc/oui.txt", ++ "/usr/share/hwdata/oui.txt", + "/var/lib/ieee-data/oui.txt", + "/usr/share/ieee-data/oui.txt", + "/etc/manuf/oui.txt",