gentoo resync : 12.05.2022

3 files changed, 107 insertions, 3 deletions

diff --git a/net-wireless/aircrack-ng/Manifest b/net-wireless/aircrack-ng/Manifest
index dae68a115fca..108f101e5917 100644
--- a/net-wireless/aircrack-ng/Manifest
+++ b/net-wireless/aircrack-ng/Manifest
@@ -1,5 +1,7 @@
 AUX aircrack-ng-1.6-hwdata.patch 921 BLAKE2B 0cbe038a33745cfb9bf873ea34627281d4a5f30e7f36595ef85490d4a13d281235f7e6cf09af1f0d7fea10fefda4a4ba76bcd8f0175520fb6b314c191dcd998e SHA512 cb2bcb89185555e827f3bc28135ac0fd025f3c9a7e770c779c4feb3737ae6a975c55ce041e31cb4409a9339b730b42d453eb62b5576709a79e42737abe5ffd1b
 DIST aircrack-ng-1.6_p20200722.tar.gz 7602785 BLAKE2B 67426a8f1d683fa374e8aa3dfd78ec860f622127f37080f0b3acba6fd7e05088203a60a9c7fd6265835b7b52697fd7d2660a5efb79c3c72d7098a081dd83ecfe SHA512 dc7c80099bdcd6c68c5e06e4668453c0c594c66d57079ed77c27467e4d2307ca63ea9671966e06feb6b698020b683f6830d401701e4472acbf0edb4f22bb1f75
+DIST aircrack-ng-1.7.tar.gz 7740634 BLAKE2B 4461af7b698d30c96e6f93494d5ee658bf8d7144d8b165e9b8aee1766a35dddded3bbb738237e1100dcf22167125aa7cf9149288bba1607fe778470b04596cb2 SHA512 3e6433cba1d6b122701245e8904480de9957dad033c1642cc45b30339e9391ffa21b39b2cc712bcba79bc2c2e26f2964be8f28a27081dc4bb323792cb7df2478
 EBUILD aircrack-ng-1.6_p20200722-r1.ebuild 2474 BLAKE2B ab71fe70a5817b57b22fc0a74fea4b0b2f8f6d6c6662ec350a817028c8d66f769f6e77591c02209037cc5b8eb8e99936ef0de7e82c3bce5316ce1318c710d2e5 SHA512 daaf64848114ebea39e5ec2ff370ef373d55bfc639213881c62a28e826ab790dae5c5a362864547b6d9639508cc42e510a9efe7cee5c8001483009d0205567de
-EBUILD aircrack-ng-9999.ebuild 2268 BLAKE2B 01671a7167087aa9975a67148af35936a457c3845e46c492123475fbfe535f45beb77d3811c002cf51ffb0570aa5cd474e1330b21d703f7f16e7072fffe137cd SHA512 78518c67116723c2d6e667986c9f0ef28168bd769096ec27477bee4087a2310c3babf22803a34edab5ae42be5b0d034faff33cb3b426c91fb1b3648ef79272d1
+EBUILD aircrack-ng-1.7.ebuild 2310 BLAKE2B 4ee1e593477a0f4d6f77457e1f0b97ba4442b23450e3ac33e4b2a06d83d18f23df7bfc812c17a507adf628a6dbc926a1baea42768407b1791e499ead579dce41 SHA512 1983274ce81ddb99b01a30da88746646303e521f3661f88d8785961f7e8884c8432dacad18d58fd6dda46b77e4252eb60bec28ec99023a1fd6ef732a95b133e8
+EBUILD aircrack-ng-9999.ebuild 2310 BLAKE2B 4ee1e593477a0f4d6f77457e1f0b97ba4442b23450e3ac33e4b2a06d83d18f23df7bfc812c17a507adf628a6dbc926a1baea42768407b1791e499ead579dce41 SHA512 1983274ce81ddb99b01a30da88746646303e521f3661f88d8785961f7e8884c8432dacad18d58fd6dda46b77e4252eb60bec28ec99023a1fd6ef732a95b133e8
 MISC metadata.xml 1025 BLAKE2B 3ef3b53eb156de9ed98d8a6283b6950e6d2f184d1058139a94222b18d5695da805444d993d50d9fc9736c7035a3a20253679e06e5b64bb1c83f504aa4f0406b6 SHA512 bd9b04fb372175910512baba2320a91e9122dded0070f0498c82ae55716e4b5dc027ba7027086805ab9782283eb43ab0787e41a0a5b8c551e696511ac45bc291
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.7.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.7.ebuild
new file mode 100644
index 000000000000..5fa3ec4ce798
--- /dev/null
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.7.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+DISTUTILS_OPTIONAL=1
+
+inherit toolchain-funcs distutils-r1 flag-o-matic autotools
+
+DESCRIPTION="WLAN tools for breaking 802.11 WEP/WPA keys"
+HOMEPAGE="http://www.aircrack-ng.org"
+
+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://github.com/aircrack-ng/aircrack-ng/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="+airdrop-ng +airgraph-ng +netlink +pcre +sqlite +experimental"
+
+DEPEND="net-libs/libpcap
+	sys-apps/hwloc:0=
+	dev-libs/libbsd
+	dev-libs/openssl:0=
+	netlink? ( dev-libs/libnl:3 )
+	pcre? ( dev-libs/libpcre )
+	airdrop-ng? ( ${PYTHON_DEPS} )
+	airgraph-ng? ( ${PYTHON_DEPS} )
+	experimental? ( sys-libs/zlib )
+	sqlite? ( >=dev-db/sqlite-3.4 )"
+RDEPEND="${DEPEND}
+	kernel_linux? (
+		net-wireless/iw
+		net-wireless/wireless-tools
+		sys-apps/ethtool
+		sys-apps/usbutils
+		sys-apps/pciutils )
+	sys-apps/hwdata
+	airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )"
+
+REQUIRED_USE="
+	airdrop-ng? ( ${PYTHON_REQUIRED_USE} )
+	airgraph-ng? ( ${PYTHON_REQUIRED_USE} )"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		STATIC_LIBDIR_NAME="$(get_libdir)" \
+		--disable-asan \
+		--enable-shared \
+		--disable-static \
+		--without-opt \
+		$(use_enable netlink libnl) \
+		$(use_with experimental) \
+		$(use_with sqlite sqlite3)
+}
+
+src_compile() {
+	if [[ $($(tc-getCC) --version) == clang* ]] ; then
+		#https://bugs.gentoo.org/show_bug.cgi?id=472890
+		filter-flags -frecord-gcc-switches
+	fi
+
+	default
+
+	if use airgraph-ng; then
+		cd "${S}/scripts/airgraph-ng"
+		distutils-r1_src_compile
+	fi
+	if use airdrop-ng; then
+		cd "${S}/scripts/airdrop-ng"
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	default
+
+	if use airgraph-ng; then
+		cd "${S}/scripts/airgraph-ng"
+		distutils-r1_src_install
+	fi
+	if use airdrop-ng; then
+		cd "${S}/scripts/airdrop-ng"
+		distutils-r1_src_install
+	fi
+
+	# we don't need aircrack-ng's oui updater, we have our own
+	rm "${ED}"/usr/sbin/airodump-ng-oui-update
+	find "${D}" -xtype f -name '*.la' -delete || die
+}
diff --git a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
index e3aaf11f7fc8..5fa3ec4ce798 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 DISTUTILS_OPTIONAL=1
 
 inherit toolchain-funcs distutils-r1 flag-o-matic autotools
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 	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://github.com/aircrack-ng/aircrack-ng/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 fi