* [gentoo-commits] repo/gentoo:master commit in: net-wireless/aircrack-ng/files/, net-wireless/aircrack-ng/
@ 2017-01-13 22:13 Alon Bar-Lev
0 siblings, 0 replies; 4+ messages in thread
From: Alon Bar-Lev @ 2017-01-13 22:13 UTC (permalink / raw
To: gentoo-commits
commit: eba2ed3873d7ba5e77e462040e366215a212bb82
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 22:13:01 2017 +0000
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 22:13:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eba2ed38
net-wireless/aircrack-ng: openssl-1.1 issues
+cleanup.
Bug: 604844
Thanks: eroen
Package-Manager: portage-2.3.0
...g-9999.ebuild => aircrack-ng-1.2_rc4-r1.ebuild} | 85 ++++++++--------------
net-wireless/aircrack-ng/aircrack-ng-9999.ebuild | 68 ++++++-----------
.../files/aircrack-ng-1.2_rc4-openssl.patch | 49 +++++++++++++
3 files changed, 101 insertions(+), 101 deletions(-)
diff --git a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.2_rc4-r1.ebuild
similarity index 62%
copy from net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
copy to net-wireless/aircrack-ng/aircrack-ng-1.2_rc4-r1.ebuild
index adc654d..21e2e5c 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.2_rc4-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="5"
+EAPI="6"
PYTHON_COMPAT=( python2_7 )
DISTUTILS_OPTIONAL=1
@@ -12,23 +12,9 @@ inherit toolchain-funcs distutils-r1 flag-o-matic
DESCRIPTION="WLAN tools for breaking 802.11 WEP/WPA keys"
HOMEPAGE="http://www.aircrack-ng.org"
-if [[ ${PV} == "9999" ]] ; then
- inherit subversion
- ESVN_REPO_URI="http://svn.aircrack-ng.org/trunk"
- KEYWORDS=""
- S="${WORKDIR}/${PN}"
-else
- #inherit versionator
- #MY_P=${P/\_/-}
- #MY_PV="$(replace_version_separator 2 '-')"
- #SRC_URI="http://download.aircrack-ng.org/${PN}-${MY_PV}.tar.gz"
- #KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
- #S="${WORKDIR}/${MY_P}"
- MY_PV=${PV/_/-}
- SRC_URI="http://download.${PN}.org/${PN}-${MY_PV}.tar.gz"
- KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
- S="${WORKDIR}/${PN}-${MY_PV}"
-fi
+MY_PV=${PV/_/-}
+SRC_URI="http://download.${PN}.org/${PN}-${MY_PV}.tar.gz"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
LICENSE="GPL-2"
SLOT="0"
@@ -56,27 +42,34 @@ RDEPEND="${DEPEND}
REQUIRED_USE="airdrop-ng? ( ${PYTHON_REQUIRED_USE} )
airgraph-ng? ( ${PYTHON_REQUIRED_USE} )"
+PATCHES=(
+ "${FILESDIR}/${P}-openssl.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+pkg_setup() {
+ MAKE_COMMON=(
+ CC="$(tc-getCC)" \
+ CXX="$(tc-getCXX)" \
+ AR="$(tc-getAR)" \
+ LD="$(tc-getLD)" \
+ RANLIB="$(tc-getRANLIB)" \
+ libnl=$(usex netlink true false) \
+ pcre=$(usex pcre true false) \
+ sqlite=$(usex sqlite true false) \
+ experimental=$(usex experimental true false)
+ prefix="${ED}/usr" \
+ )
+}
+
src_compile() {
if [[ $($(tc-getCC) --version) == clang* ]] ; then
#https://bugs.gentoo.org/show_bug.cgi?id=472890
filter-flags -frecord-gcc-switches
fi
- if [[ ${PV} == "9999" ]] ; then
- liveflags=REVFLAGS=-D_REVISION="${ESVN_WC_REVISION}"
- fi
-
- emake \
- CC="$(tc-getCC)" \
- CXX="$(tc-getCXX)" \
- AR="$(tc-getAR)" \
- LD="$(tc-getLD)" \
- RANLIB="$(tc-getRANLIB)" \
- libnl=$(usex netlink true false) \
- pcre=$(usex pcre true false) \
- sqlite=$(usex sqlite true false) \
- experimental=$(usex experimental true false) \
- ${liveflags}
+ emake "${MAKE_COMMON[@]}"
if use airgraph-ng; then
cd "${S}/scripts/airgraph-ng"
@@ -89,31 +82,11 @@ src_compile() {
}
src_test() {
- if [[ ${PV} == "9999" ]] ; then
- liveflags=REVFLAGS=-D_REVISION="${ESVN_WC_REVISION}"
- fi
-
- emake check \
- libnl=$(usex netlink true false) \
- pcre=$(usex pcre true false) \
- sqlite=$(usex sqlite true false) \
- experimental=$(usex experimental true false) \
- ${liveflags}
+ emake "${MAKE_COMMON[@]}" check
}
src_install() {
- if [[ ${PV} == "9999" ]] ; then
- liveflags=REVFLAGS=-D_REVISION="${ESVN_WC_REVISION}"
- fi
-
- emake \
- prefix="${ED}/usr" \
- libnl=$(usex netlink true false) \
- pcre=$(usex pcre true false) \
- sqlite=$(usex sqlite true false) \
- experimental=$(usex experimental true false) \
- ${liveflags} \
- install
+ emake "${MAKE_COMMON[@]}" install
dodoc AUTHORS ChangeLog INSTALLING README
diff --git a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
index adc654d..07e1546 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="5"
+EAPI="6"
PYTHON_COMPAT=( python2_7 )
DISTUTILS_OPTIONAL=1
@@ -18,12 +18,6 @@ if [[ ${PV} == "9999" ]] ; then
KEYWORDS=""
S="${WORKDIR}/${PN}"
else
- #inherit versionator
- #MY_P=${P/\_/-}
- #MY_PV="$(replace_version_separator 2 '-')"
- #SRC_URI="http://download.aircrack-ng.org/${PN}-${MY_PV}.tar.gz"
- #KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
- #S="${WORKDIR}/${MY_P}"
MY_PV=${PV/_/-}
SRC_URI="http://download.${PN}.org/${PN}-${MY_PV}.tar.gz"
KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
@@ -56,27 +50,31 @@ RDEPEND="${DEPEND}
REQUIRED_USE="airdrop-ng? ( ${PYTHON_REQUIRED_USE} )
airgraph-ng? ( ${PYTHON_REQUIRED_USE} )"
+pkg_setup() {
+ MAKE_COMMON=(
+ CC="$(tc-getCC)" \
+ CXX="$(tc-getCXX)" \
+ AR="$(tc-getAR)" \
+ LD="$(tc-getLD)" \
+ RANLIB="$(tc-getRANLIB)" \
+ libnl=$(usex netlink true false) \
+ pcre=$(usex pcre true false) \
+ sqlite=$(usex sqlite true false) \
+ experimental=$(usex experimental true false)
+ prefix="${ED}/usr" \
+ )
+ [[ ${PV} == "9999" ]] && MAKE_COMMON+=(
+ liveflags=REVFLAGS=-D_REVISION="${ESVN_WC_REVISION}"
+ )
+}
+
src_compile() {
if [[ $($(tc-getCC) --version) == clang* ]] ; then
#https://bugs.gentoo.org/show_bug.cgi?id=472890
filter-flags -frecord-gcc-switches
fi
- if [[ ${PV} == "9999" ]] ; then
- liveflags=REVFLAGS=-D_REVISION="${ESVN_WC_REVISION}"
- fi
-
- emake \
- CC="$(tc-getCC)" \
- CXX="$(tc-getCXX)" \
- AR="$(tc-getAR)" \
- LD="$(tc-getLD)" \
- RANLIB="$(tc-getRANLIB)" \
- libnl=$(usex netlink true false) \
- pcre=$(usex pcre true false) \
- sqlite=$(usex sqlite true false) \
- experimental=$(usex experimental true false) \
- ${liveflags}
+ emake "${MAKE_COMMON[@]}"
if use airgraph-ng; then
cd "${S}/scripts/airgraph-ng"
@@ -89,31 +87,11 @@ src_compile() {
}
src_test() {
- if [[ ${PV} == "9999" ]] ; then
- liveflags=REVFLAGS=-D_REVISION="${ESVN_WC_REVISION}"
- fi
-
- emake check \
- libnl=$(usex netlink true false) \
- pcre=$(usex pcre true false) \
- sqlite=$(usex sqlite true false) \
- experimental=$(usex experimental true false) \
- ${liveflags}
+ emake "${MAKE_COMMON[@]}" check
}
src_install() {
- if [[ ${PV} == "9999" ]] ; then
- liveflags=REVFLAGS=-D_REVISION="${ESVN_WC_REVISION}"
- fi
-
- emake \
- prefix="${ED}/usr" \
- libnl=$(usex netlink true false) \
- pcre=$(usex pcre true false) \
- sqlite=$(usex sqlite true false) \
- experimental=$(usex experimental true false) \
- ${liveflags} \
- install
+ emake "${MAKE_COMMON[@]}" install
dodoc AUTHORS ChangeLog INSTALLING README
diff --git a/net-wireless/aircrack-ng/files/aircrack-ng-1.2_rc4-openssl.patch b/net-wireless/aircrack-ng/files/aircrack-ng-1.2_rc4-openssl.patch
new file mode 100644
index 00000000..a83f622
--- /dev/null
+++ b/net-wireless/aircrack-ng/files/aircrack-ng-1.2_rc4-openssl.patch
@@ -0,0 +1,49 @@
+Index: a/src/crypto.c
+===================================================================
+--- a/src/crypto.c (revision 2881)
++++ b/src/crypto.c (revision 2882)
+@@ -288,7 +288,15 @@
+ void calc_mic (struct AP_info *ap, unsigned char pmk[32], unsigned char ptk[80], unsigned char mic[20]) {
+ int i;
+ unsigned char pke[100];
++ #if defined(USE_GCRYPT) || OPENSSL_VERSION_NUMBER < 0x10100000L
++ #define HMAC_USE_NO_PTR
++ #endif
++
++ #ifdef HMAC_USE_NO_PTR
+ HMAC_CTX ctx;
++ #else
++ HMAC_CTX * ctx;
++ #endif
+
+ memcpy( pke, "Pairwise key expansion", 23 );
+
+@@ -314,6 +322,7 @@
+ memcpy( pke + 67, ap->wpa.snonce, 32 );
+ }
+
++ #ifdef HMAC_USE_NO_PTR
+ HMAC_CTX_init(&ctx);
+ HMAC_Init_ex(&ctx, pmk, 32, EVP_sha1(), NULL);
+ for(i = 0; i < 4; i++ )
+@@ -325,6 +334,20 @@
+ HMAC_Final(&ctx, ptk + i*20, NULL);
+ }
+ HMAC_CTX_cleanup(&ctx);
++ #else
++ ctx = HMAC_CTX_new();
++ HMAC_Init_ex(ctx, pmk, 32, EVP_sha1(), NULL);
++ for(i = 0; i < 4; i++ )
++ {
++ pke[99] = i;
++ //HMAC(EVP_sha1(), values[0], 32, pke, 100, ptk + i * 20, NULL);
++ HMAC_Init_ex(ctx, 0, 0, 0, 0);
++ HMAC_Update(ctx, pke, 100);
++ HMAC_Final(ctx, ptk + i*20, NULL);
++ }
++ HMAC_CTX_free(ctx);
++ #endif
++ #undef HMAC_USE_NO_PTR
+
+ if( ap->wpa.keyver == 1 )
+ {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/aircrack-ng/files/, net-wireless/aircrack-ng/
@ 2018-04-16 19:37 Richard Farina
0 siblings, 0 replies; 4+ messages in thread
From: Richard Farina @ 2018-04-16 19:37 UTC (permalink / raw
To: gentoo-commits
commit: 6a9252071bfa03c61ea411a7567b1d53cf77934c
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 16 19:36:37 2018 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Apr 16 19:37:08 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a925207
net-wireless/aircrack-ng: bump, switch to git, autotools
Package-Manager: Portage-2.3.28, Repoman-2.3.9
net-wireless/aircrack-ng/Manifest | 1 +
...crack-ng-9999.ebuild => aircrack-ng-1.2.ebuild} | 39 ++++++++++-------
.../aircrack-ng/aircrack-ng-1.2_rc1-r1.ebuild | 4 +-
net-wireless/aircrack-ng/aircrack-ng-9999.ebuild | 38 +++++++++-------
.../aircrack-ng-1.2-no-force-stack-protector.patch | 50 ++++++++++++++++++++++
5 files changed, 100 insertions(+), 32 deletions(-)
diff --git a/net-wireless/aircrack-ng/Manifest b/net-wireless/aircrack-ng/Manifest
index 3c1b8d5328f..a47b272129d 100644
--- a/net-wireless/aircrack-ng/Manifest
+++ b/net-wireless/aircrack-ng/Manifest
@@ -1,2 +1,3 @@
DIST aircrack-ng-1.2-rc1.tar.gz 2046476 BLAKE2B aec848a3dedae564cc29fc94475d0dec9cfb33af5185a4bceb9f88c1a3cce7a910439405fd76390ca352e52393b9094e570bf54980af27a50709a36ffab33752 SHA512 897427c535846c0ede58b2f99ed469bc01f50f9b38fc70d5711261fca7342339192cc0c71a724fc04c99114db7534d825a44f09e7bc5754286ec44933a33e40d
DIST aircrack-ng-1.2-rc4.tar.gz 4379880 BLAKE2B 8034e99a9a7117b0552ecd82603883661d7442970a24d26f4754122abd07cc661fbeb57519cecbefb6eea1fc0e8b0f228a116a04f07e1a7d2eb41ea4b5f6040b SHA512 f1e1d465813a5f00fd8f8b287353033ea30b657a4c3a9fe81281ab2546d3238690f0659076bff53703fbc796ba40efb16115804d21f8516adca2c774fefea20c
+DIST aircrack-ng-1.2.tar.gz 4517658 BLAKE2B 1a3d17608dafe69a7a500526807310bf9ae8f0f14ed4198d06fc1cd6287fa25aeed996bad85c82b9ed87c214951e2bbc73384513361b7e8ce6ba05ef32f6530c SHA512 efc8cd17994fd74dcdd60e4ff26f81dc4f090a368668c2b1d62e204d2a9c001f2614a9d2ad0e4ae0ae38fb71e1957e0342f8216d757e38db105b1e467de82bd9
diff --git a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.2.ebuild
similarity index 82%
copy from net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
copy to net-wireless/aircrack-ng/aircrack-ng-1.2.ebuild
index 4410fcbb87a..972e687e1ba 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -6,16 +6,15 @@ EAPI="6"
PYTHON_COMPAT=( python2_7 )
DISTUTILS_OPTIONAL=1
-inherit toolchain-funcs distutils-r1 flag-o-matic
+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 subversion
- ESVN_REPO_URI="http://svn.aircrack-ng.org/trunk"
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/aircrack-ng/aircrack-ng.git"
KEYWORDS=""
- S="${WORKDIR}/${PN}"
else
MY_PV=${PV/_/-}
SRC_URI="http://download.${PN}.org/${PN}-${MY_PV}.tar.gz"
@@ -36,8 +35,8 @@ DEPEND="net-libs/libpcap
airgraph-ng? ( ${PYTHON_DEPS} )
experimental? ( sys-libs/zlib )
sqlite? ( >=dev-db/sqlite-3.4 )"
-RDEPEND="${DEPEND}
- kernel_linux? (
+RDEPEND="${DEPEND}"
+PDEPEND="kernel_linux? (
net-wireless/iw
net-wireless/wireless-tools
sys-apps/ethtool
@@ -56,17 +55,27 @@ pkg_setup() {
AR="$(tc-getAR)" \
LD="$(tc-getLD)" \
RANLIB="$(tc-getRANLIB)" \
- libnl=$(usex netlink true false) \
- pcre=$(usex pcre true false) \
- sqlite=$(usex sqlite true false) \
- experimental=$(usex experimental true false)
- prefix="${ED}/usr" \
- )
- [[ ${PV} == "9999" ]] && MAKE_COMMON+=(
- liveflags=REVFLAGS=-D_REVISION="${ESVN_WC_REVISION}"
+ DESTDIR="${ED}"
)
}
+src_prepare() {
+ epatch "${FILESDIR}"/aircrack-ng-1.2-no-force-stack-protector.patch
+ eapply_user
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-asan \
+ $(use_enable netlink libnl) \
+ $(use_with experimental) \
+ $(use_with sqlite sqlite3) \
+ --enable-shared \
+ --disable-static \
+ --without-opt
+}
+
src_compile() {
if [[ $($(tc-getCC) --version) == clang* ]] ; then
#https://bugs.gentoo.org/show_bug.cgi?id=472890
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.2_rc1-r1.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.2_rc1-r1.ebuild
index 641bf307be1..ccdbd649e1e 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-1.2_rc1-r1.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.2_rc1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -29,7 +29,7 @@ SLOT="0"
IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD +netlink +pcre +sqlite +unstable"
DEPEND="net-libs/libpcap
- dev-libs/openssl
+ dev-libs/openssl:*
netlink? ( dev-libs/libnl:3 )
pcre? ( dev-libs/libpcre )
airdrop-ng? ( ${PYTHON_DEPS} )
diff --git a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
index 4410fcbb87a..1d10edd8197 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -6,16 +6,15 @@ EAPI="6"
PYTHON_COMPAT=( python2_7 )
DISTUTILS_OPTIONAL=1
-inherit toolchain-funcs distutils-r1 flag-o-matic
+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 subversion
- ESVN_REPO_URI="http://svn.aircrack-ng.org/trunk"
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/aircrack-ng/aircrack-ng.git"
KEYWORDS=""
- S="${WORKDIR}/${PN}"
else
MY_PV=${PV/_/-}
SRC_URI="http://download.${PN}.org/${PN}-${MY_PV}.tar.gz"
@@ -36,8 +35,8 @@ DEPEND="net-libs/libpcap
airgraph-ng? ( ${PYTHON_DEPS} )
experimental? ( sys-libs/zlib )
sqlite? ( >=dev-db/sqlite-3.4 )"
-RDEPEND="${DEPEND}
- kernel_linux? (
+RDEPEND="${DEPEND}"
+PDEPEND="kernel_linux? (
net-wireless/iw
net-wireless/wireless-tools
sys-apps/ethtool
@@ -56,17 +55,26 @@ pkg_setup() {
AR="$(tc-getAR)" \
LD="$(tc-getLD)" \
RANLIB="$(tc-getRANLIB)" \
- libnl=$(usex netlink true false) \
- pcre=$(usex pcre true false) \
- sqlite=$(usex sqlite true false) \
- experimental=$(usex experimental true false)
- prefix="${ED}/usr" \
- )
- [[ ${PV} == "9999" ]] && MAKE_COMMON+=(
- liveflags=REVFLAGS=-D_REVISION="${ESVN_WC_REVISION}"
+ DESTDIR="${ED}"
)
}
+src_prepare() {
+ eapply_user
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-asan \
+ $(use_enable netlink libnl) \
+ $(use_with experimental) \
+ $(use_with sqlite sqlite3) \
+ --enable-shared \
+ --disable-static \
+ --without-opt
+}
+
src_compile() {
if [[ $($(tc-getCC) --version) == clang* ]] ; then
#https://bugs.gentoo.org/show_bug.cgi?id=472890
diff --git a/net-wireless/aircrack-ng/files/aircrack-ng-1.2-no-force-stack-protector.patch b/net-wireless/aircrack-ng/files/aircrack-ng-1.2-no-force-stack-protector.patch
new file mode 100644
index 00000000000..d4688b84d2e
--- /dev/null
+++ b/net-wireless/aircrack-ng/files/aircrack-ng-1.2-no-force-stack-protector.patch
@@ -0,0 +1,50 @@
+From 58fe40daf3e082d9e63d689d795a3bbecf72fedb Mon Sep 17 00:00:00 2001
+From: Joseph Benden <joe@benden.us>
+Date: Mon, 16 Apr 2018 11:26:23 -0700
+Subject: [PATCH] autotools: The flag --without-opt should skip stack protector
+ flags. (#1864)
+
+---
+ build/m4/aircrack_ng_compiler.m4 | 28 ++++++++++++++++------------
+ 1 file changed, 16 insertions(+), 12 deletions(-)
+
+diff --git a/build/m4/aircrack_ng_compiler.m4 b/build/m4/aircrack_ng_compiler.m4
+index 0fb19726..8a973dbf 100644
+--- a/build/m4/aircrack_ng_compiler.m4
++++ b/build/m4/aircrack_ng_compiler.m4
+@@ -108,19 +108,23 @@ case "$ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor" in
+ CYGWIN*|MSYS*|cygwin*|msys*)
+ ;;
+ *)
+- AS_IF([test "x$gcc_over49" = "xno"], [
+- AS_IF([test "x$gcc_over41" = "xyes"], [
+- AX_CHECK_COMPILE_FLAG([-fstack-protector], [
+- AX_APPEND_FLAG(-fstack-protector, [opt_[]_AC_LANG_ABBREV[]flags])
+- ])
+- ], [])
+- ], [])
++ case $with_opt in
++ yes | "")
++ AS_IF([test "x$gcc_over49" = "xno"], [
++ AS_IF([test "x$gcc_over41" = "xyes"], [
++ AX_CHECK_COMPILE_FLAG([-fstack-protector], [
++ AX_APPEND_FLAG(-fstack-protector, [opt_[]_AC_LANG_ABBREV[]flags])
++ ])
++ ], [])
++ ], [])
+
+- AS_IF([test "x$gcc_over49" = "xyes"], [
+- AX_CHECK_COMPILE_FLAG([-fstack-protector-strong], [
+- AX_APPEND_FLAG(-fstack-protector-strong, [opt_[]_AC_LANG_ABBREV[]flags])
+- ])
+- ], [])
++ AS_IF([test "x$gcc_over49" = "xyes"], [
++ AX_CHECK_COMPILE_FLAG([-fstack-protector-strong], [
++ AX_APPEND_FLAG(-fstack-protector-strong, [opt_[]_AC_LANG_ABBREV[]flags])
++ ])
++ ], [])
++ ;;
++ esac
+ ;;
+ esac
+ ;;
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/aircrack-ng/files/, net-wireless/aircrack-ng/
@ 2018-08-21 2:32 Richard Farina
0 siblings, 0 replies; 4+ messages in thread
From: Richard Farina @ 2018-08-21 2:32 UTC (permalink / raw
To: gentoo-commits
commit: fdf580a1422bb5ebcbe7a8218eaea67341901d77
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 21 02:30:33 2018 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Aug 21 02:32:07 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdf580a1
net-wireless/aircrack-ng: minor airmon-ng fixes
Package-Manager: Portage-2.3.47, Repoman-2.3.10
...-ng-1.3-r2.ebuild => aircrack-ng-1.3-r3.ebuild} | 0
.../aircrack-ng/files/aircrack-ng-1.3-8812au.patch | 157 +++++++++++++++++++--
2 files changed, 142 insertions(+), 15 deletions(-)
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.3-r2.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.3-r3.ebuild
similarity index 100%
rename from net-wireless/aircrack-ng/aircrack-ng-1.3-r2.ebuild
rename to net-wireless/aircrack-ng/aircrack-ng-1.3-r3.ebuild
diff --git a/net-wireless/aircrack-ng/files/aircrack-ng-1.3-8812au.patch b/net-wireless/aircrack-ng/files/aircrack-ng-1.3-8812au.patch
index 6ce0fbc51eb..e5343023aae 100644
--- a/net-wireless/aircrack-ng/files/aircrack-ng-1.3-8812au.patch
+++ b/net-wireless/aircrack-ng/files/aircrack-ng-1.3-8812au.patch
@@ -1,14 +1,28 @@
-commit 3cc9de5e7cbe6565c7e1fe12ebbcf2c6f7413c8d
-Author: Rick Farina (Zero_Chaos) <zerochaos@gentoo.org>
-Date: Tue Aug 7 01:27:05 2018 +0000
-
- airmon-ng support 8812au
-
diff --git a/scripts/airmon-ng.linux b/scripts/airmon-ng.linux
-index 14e4bdcd..d7328f4b 100755
+index 7f488391..4d0a5e0c 100755
--- a/scripts/airmon-ng.linux
+++ b/scripts/airmon-ng.linux
-@@ -354,21 +354,21 @@ ifaceIsUp() {
+@@ -106,7 +106,18 @@ else
+ fi
+
+ if [ -d /sys/bus/pci ] || [ -d /sys/bus/pci_express ] || [ -d /proc/bus/pci ]; then
+- if [ ! -x "$(command -v lspci 2>&1)" ]; then
++ PCI_DEVICES=0
++ if [ -d /sys/bus/pci/devices ] && [ "$(ls -1 /sys/bus/pci/devices 2>/dev/null | wc -l)" != '0' ]; then
++ PCI_DEVICES=1
++ elif [ -r /proc/bus/pci/devices ] && [ -n "$(cat /proc/bus/pci/devices 2>/dev/null)" ]; then
++ PCI_DEVICES=1
++ elif [ -d /sys/bus/pci_express/devices ] && [ -n "$(ls -1 /sys/bus/pci_express/devices 2>/dev/null | wc -l)" != '0' ]; then
++ PCI_DEVICES=1
++ fi
++
++ if [ ${PCI_DEVICES} -eq 0 ]; then
++ LSPCI=0
++ elif [ ! -x "$(command -v lspci 2>&1)" ]; then
+ printf "Please install lspci from your distro's package manager.\n"
+ exit 1
+ else
+@@ -347,21 +358,21 @@ ifaceIsUp() {
# fi
#}
@@ -45,7 +59,7 @@ index 14e4bdcd..d7328f4b 100755
yesorno() {
read input
-@@ -426,7 +426,7 @@ startMac80211Iface() {
+@@ -419,7 +430,7 @@ startMac80211Iface() {
done
fi
#we didn't bail means we need a monitor interface
@@ -54,11 +68,11 @@ index 14e4bdcd..d7328f4b 100755
printf "Interface ${1}mon is too long for linux so it will be renamed to the old style (wlan#) name.\n"
findFreeInterface monitor
else
-@@ -438,10 +438,16 @@ startMac80211Iface() {
+@@ -431,10 +442,16 @@ startMac80211Iface() {
fi
#we didn't bail means our target interface is available
setLink ${1} down
-+ if [ "${DRIVER}" = "8812au" ] || [ "${DRIVER}" = "8814au" ] || [ "${DRIVER}" = "rtl8812au" ]; then
++ if [ "${DRIVER}" = "8812au" ] || [ "${DRIVER}" = "8814au" ]; then
+ #grumble grumble, seriously crap vendor driver
+ startDeprecatedIface ${1}
+ setChannelMac80211 ${1}
@@ -72,7 +86,55 @@ index 14e4bdcd..d7328f4b 100755
setChannelMac80211 ${1}mon
else
printf "\nNewly created monitor mode interface ${1}mon is *NOT* in monitor mode.\n"
-@@ -569,12 +575,12 @@ setChannelMac80211() {
+@@ -456,15 +473,12 @@ startMac80211Iface() {
+ printf "\nPlease run \"airmon-ng check kill\" and/or kill your network manager."
+ fi
+ else
+- iw ${1} del
++ isRPiWireless && iw ${1} del
+ printf "\t\t(mac80211 station mode vif disabled for [${PHYDEV}]${1})\n"
+ fi
+ }
+
+-NEXMON_FIRMWARE_DIR=/opt
+-NEXMON_DRIVER_DIR=/opt
+-
+-hasRPiWireless() {
++isRPiWireless() {
+ local HW_REV=$(grep Revision /proc/cpuinfo | awk '{print $3}')
+ [ -z "${HW_REV}" ] && return 0
+ # http://www.raspberrypi-spy.co.uk/2012/09/checking-your-raspberry-pi-board-version/
+@@ -475,29 +489,6 @@ hasRPiWireless() {
+ return 0
+ }
+
+-isNexutilPresent() {
+- type nexutil >/dev/null 2>/dev/null
+- if [ $? -eq 0 ]; then
+- return 1
+- fi
+- return 0
+-}
+-
+-startNexmonIface() {
+- [ -z $1 ] && return
+-
+- if [ -n "$(iwconfig $1 | grep 'Mode:Monitor')" ] && [ -n "$(nexutil -m | grep 'monitor: 2')" ]; then
+- printf "\n\tInterface $1 is already in monitor mode\n"
+- else
+- ifconfig $1 up 2>/dev/null
+- iwconfig $1 mode monitor 2>/dev/null
+- [ "$1" = "wlan0" ] && nexutil -m2
+- [ "$1" = "wlan0" ] || nexutil -m2 -I $1
+- iwconfig $1 channel ${CH}
+- printf "\n\t\t(monitor mode enabled for [${PHYDEV}]${1})\n"
+- fi
+-}
+-
+ startwlIface() {
+ if [ -f "/proc/brcm_monitor0" ]; then
+ if [ -r "/proc/brcm_monitor0" ]; then
+@@ -587,12 +578,12 @@ setChannelMac80211() {
fi
}
@@ -91,11 +153,11 @@ index 14e4bdcd..d7328f4b 100755
stopMac80211Iface() {
if [ -f /sys/class/net/${1}/type ]; then
-@@ -587,6 +593,11 @@ stopMac80211Iface() {
+@@ -605,6 +596,11 @@ stopMac80211Iface() {
printf "please report it.\n"
exit 1
else
-+ if [ "${DRIVER}" = "8812au" ] || [ "${DRIVER}" = "8814au" ] || [ "${DRIVER}" = "rtl8812au" ]; then
++ if [ "${DRIVER}" = "8812au" ] || [ "${DRIVER}" = "8814au" ]; then
+ #grumble grumble, seriously crap vendor driver
+ stopDeprecatedIface ${1}
+ return
@@ -103,7 +165,48 @@ index 14e4bdcd..d7328f4b 100755
if [ "${ELITE}" = "0" ]; then
local need_sta=1
if [ -d /sys/class/ieee80211/${PHYDEV}/device/net ]; then
-@@ -1316,8 +1327,10 @@ if [ "$DEBUG" = "1" ]; then
+@@ -665,18 +661,6 @@ stopMac80211Iface() {
+ fi
+ }
+
+-stopNexmonIface() {
+- [ -z $1 ] && return
+- ifconfig $1 down
+- # Running nexutil is not necessary, it gets reset when putting interface down
+- [ "$1" = "wlan0" ] && nexutil -m0
+- [ "$1" = "wlan0" ] || nexutil -m0 -I $1
+- ifconfig $1 down
+- ifconfig $1 up 2> /dev/null
+- iwconfig $1 mode managed 2> /dev/null
+- printf "\n\t\t(monitor mode disabled for [${PHYDEV}]${1})\n"
+-}
+-
+ stopwlIface() {
+ if [ -f "/proc/brcm_monitor0" ]; then
+ if [ -r "/proc/brcm_monitor0" ]; then
+@@ -751,6 +735,12 @@ getDriver() {
+ if [ "$DRIVER" = "rtl8187" ] && [ "$STACK" = "ieee80211" ]; then
+ DRIVER="r8187"
+ fi
++ if [ "$DRIVER" = "rtl88xxau" ]; then
++ DRIVER="88XXau"
++ fi
++ if [ "$DRIVER" = "rtl8812au" ]; then
++ DRIVER="8812au"
++ fi
+
+ #Here we will catch the broken lying drivers not caught above
+ #currently this only functions for pci devices and not usb since lsusb has no -k option
+@@ -795,6 +785,8 @@ getFrom() {
+ FROM="V"
+ elif [ "$DRIVER" = "rt5390sta" ]; then
+ FROM="V"
++ elif [ "${DRIVER}" = "8812au" ] || [ "${DRIVER}" = "8814au" ]; then
++ FROM="V"
+ fi
+ elif modinfo -F filename $DRIVER 2>&1 | grep -q 'updates/drivers'
+ then
+@@ -1346,8 +1338,10 @@ if [ "$DEBUG" = "1" ]; then
fi
fi
if [ "$VERBOSE" = "1" ]; then
@@ -116,3 +219,27 @@ index 14e4bdcd..d7328f4b 100755
uname -a
checkvm
+@@ -1493,23 +1487,6 @@ for iface in $(printf "${iface_list}"); do
+ if [ "$1" = "stop" ] && [ "$2" = "$iface" ]; then
+ stopwlIface $iface
+ fi
+- elif [ "${CHIPSET}" = 'Broadcom 43430' ] || [ "${CHIPSET}" = 'Broadcom 43455' ]; then
+- hasRPiWireless
+- if [ $? -eq 0 ]; then
+- printf "\n\tNot a Raspberry Pi 3, 3B+ or Zero Wireless, cannot put in monitor mode.\n"
+- else
+- isNexutilPresent
+- if [ $? -eq 0 ]; then
+- printf "\n\tMissing nexutil, cannot switch to monitor mode.\n"
+- else
+- if [ "$1" = "start" ] && [ "$2" = "$iface" ]; then
+- startNexmonIface $iface
+- fi
+- if [ "$1" = "stop" ] && [ "$2" = "$iface" ]; then
+- stopNexmonIface $iface
+- fi
+- fi
+- fi
+ elif [ "$MAC80211" = "1" ]; then
+ if [ "$1" = "start" ] && [ "$2" = "$iface" ]; then
+ startMac80211Iface $iface
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/aircrack-ng/files/, net-wireless/aircrack-ng/
@ 2021-11-28 20:08 Mike Gilbert
0 siblings, 0 replies; 4+ messages in thread
From: Mike Gilbert @ 2021-11-28 20:08 UTC (permalink / raw
To: gentoo-commits
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 <floppym@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 <floppym@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",
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-11-28 20:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-16 19:37 [gentoo-commits] repo/gentoo:master commit in: net-wireless/aircrack-ng/files/, net-wireless/aircrack-ng/ Richard Farina
-- strict thread matches above, loose matches on Subject: below --
2021-11-28 20:08 Mike Gilbert
2018-08-21 2:32 Richard Farina
2017-01-13 22:13 Alon Bar-Lev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox