From 6dc1d380afd6eafcff148706768bfea2f0781f5d Mon Sep 17 00:00:00 2001 From: "Jory A. Pratt" Date: Tue, 10 Jul 2018 09:50:48 -0500 Subject: media-video/ffmpeg,net-wireless/aircrack-ng: libressl support in latest 3.4, sync aircrack-ng update to tree --- net-wireless/aircrack-ng/Manifest | 5 +- net-wireless/aircrack-ng/aircrack-ng-1.2.ebuild | 132 --------------------- net-wireless/aircrack-ng/aircrack-ng-1.3.ebuild | 131 ++++++++++++++++++++ .../aircrack-ng-1.2-no-force-stack-protector.patch | 50 -------- 4 files changed, 133 insertions(+), 185 deletions(-) delete mode 100644 net-wireless/aircrack-ng/aircrack-ng-1.2.ebuild create mode 100644 net-wireless/aircrack-ng/aircrack-ng-1.3.ebuild delete mode 100644 net-wireless/aircrack-ng/files/aircrack-ng-1.2-no-force-stack-protector.patch (limited to 'net-wireless') diff --git a/net-wireless/aircrack-ng/Manifest b/net-wireless/aircrack-ng/Manifest index 7df9f46..00e991c 100644 --- a/net-wireless/aircrack-ng/Manifest +++ b/net-wireless/aircrack-ng/Manifest @@ -1,4 +1,3 @@ -AUX aircrack-ng-1.2-no-force-stack-protector.patch 2245 BLAKE2B a7f200711a4e24cc92d4626d24c62abe11a2d378e8876a801a516aa2023b7aa7566c868e890186cebf9dacecc59037b23c39380b1b435b0f0985a02f939ccfec SHA512 35e5f717bc3b90507a879bbd4ffd3bb88c7bc98676abac1241cbc50dbb1bcf2c53e5c45514b643d7ad7d86d0b74e662803de155ae6bbf430a1fdb32e50682068 -DIST aircrack-ng-1.2.tar.gz 4517658 BLAKE2B 1a3d17608dafe69a7a500526807310bf9ae8f0f14ed4198d06fc1cd6287fa25aeed996bad85c82b9ed87c214951e2bbc73384513361b7e8ce6ba05ef32f6530c SHA512 efc8cd17994fd74dcdd60e4ff26f81dc4f090a368668c2b1d62e204d2a9c001f2614a9d2ad0e4ae0ae38fb71e1957e0342f8216d757e38db105b1e467de82bd9 -EBUILD aircrack-ng-1.2.ebuild 3209 BLAKE2B 3fe2545808e756fc551df03931c49ff0a614d8ba611ffd7a06b65bcccb43d26ae98e6f7f7476442a2afdf666548ebb1f77c5d89f7abfcf760df5fbe785da84cd SHA512 8aa402652d18a70904b8080dd410bc824e057f7a09526a88bbc522e0830e4d9414d0f950a0ff0ce0687b3b32655a4d191910be2d62783ad5b873e800b4ae6c67 +DIST aircrack-ng-1.3.tar.gz 4182502 BLAKE2B d18d3644fd5bad7a45d8684a50a42d84d9e0e832e88876a34cb7b308c4496c7b1d39159cb24c19097b7ca4286f62560b509e84e816d65c77d2f72883dd3c9457 SHA512 bc092f84fb204b5764a16a230695b69ff916aceae865bf73827c56b155100e7bd64941d0c5f999585d25ee8faad2d35a3c580a57b60c320f7857bd8750558961 +EBUILD aircrack-ng-1.3.ebuild 3171 BLAKE2B 8d0690b92116b520b9501902b0ff6bcd4d931f0d1e007b4b43d25dbe9f4da469ef8a413e7f41217b2562752b047491bf9e70382e3ef78639950fde98b16ae85d SHA512 d6c8433593d9bc8839d81d9d7e98645e83474e10e96669db400d70d2d4272e5020eb56fa5b2a3e59d76a192835c99e25ba4b539eba70a3468ebee08c5ab3a583 MISC metadata.xml 1130 BLAKE2B 9d3c0463a4a1cf4360ce77c550a701a805cd3db5f06ee895aa8888180246d6b51970d23b74b723a241e09bb6dde426055ca8f1288afffa90e8e4abc7d9c4b92a SHA512 0ca935ebf651d221657fda9320fc8a8f8dbabd9d10fc4eebb8b301b63ca8f9316069bee16b2468d227ea5acf53a28747c8479eb776983334b9496d68fefa76ee diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.2.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.2.ebuild deleted file mode 100644 index 8b5b6e0..0000000 --- a/net-wireless/aircrack-ng/aircrack-ng-1.2.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python2_7 ) -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" - KEYWORDS="" -else - 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 - -LICENSE="GPL-2" -SLOT="0" - -IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD +netlink +pcre +sqlite +experimental" - -DEPEND="net-libs/libpcap - || ( dev-libs/openssl:0= - dev-libs/libressl: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}" -PDEPEND="kernel_linux? ( - net-wireless/iw - net-wireless/wireless-tools - sys-apps/ethtool - sys-apps/usbutils - sys-apps/pciutils ) - sys-apps/hwids - airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )" - -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)" \ - 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 - filter-flags -frecord-gcc-switches - fi - - emake "${MAKE_COMMON[@]}" - - 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_test() { - emake "${MAKE_COMMON[@]}" check -} - -src_install() { - einstalldocs - emake "${MAKE_COMMON[@]}" install - - 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 -} - -pkg_postinst() { - # Message is (c) FreeBSD - # http://www.freebsd.org/cgi/cvsweb.cgi/ports/net-mgmt/aircrack-ng/files/pkg-message.in?rev=1.5 - if use kernel_FreeBSD ; then - einfo "Contrary to Linux, it is not necessary to use airmon-ng to enable the monitor" - einfo "mode of your wireless card. So do not care about what the manpages say about" - einfo "airmon-ng, airodump-ng sets monitor mode automatically." - echo - einfo "To return from monitor mode, issue the following command:" - einfo " ifconfig \${INTERFACE} -mediaopt monitor" - einfo - einfo "For aireplay-ng you need FreeBSD >= 7.0." - fi -} diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.3.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.3.ebuild new file mode 100644 index 0000000..d0f56be --- /dev/null +++ b/net-wireless/aircrack-ng/aircrack-ng-1.3.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +PYTHON_COMPAT=( python2_7 ) +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" + KEYWORDS="" +else + MY_PV=${PV/_/-} + SRC_URI="https://github.com/aircrack-ng/aircrack-ng/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" + S="${WORKDIR}/${PN}-${MY_PV}" +fi + +LICENSE="GPL-2" +SLOT="0" + +IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD +netlink +pcre +sqlite +experimental" + +DEPEND="net-libs/libpcap + || ( dev-libs/openssl:0= + dev-libs/libressl: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}" +PDEPEND="kernel_linux? ( + net-wireless/iw + net-wireless/wireless-tools + sys-apps/ethtool + sys-apps/usbutils + sys-apps/pciutils ) + sys-apps/hwids + airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )" + +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)" \ + 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 + filter-flags -frecord-gcc-switches + fi + + emake "${MAKE_COMMON[@]}" + + 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_test() { + emake "${MAKE_COMMON[@]}" check +} + +src_install() { + einstalldocs + emake "${MAKE_COMMON[@]}" install + + 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 +} + +pkg_postinst() { + # Message is (c) FreeBSD + # http://www.freebsd.org/cgi/cvsweb.cgi/ports/net-mgmt/aircrack-ng/files/pkg-message.in?rev=1.5 + if use kernel_FreeBSD ; then + einfo "Contrary to Linux, it is not necessary to use airmon-ng to enable the monitor" + einfo "mode of your wireless card. So do not care about what the manpages say about" + einfo "airmon-ng, airodump-ng sets monitor mode automatically." + echo + einfo "To return from monitor mode, issue the following command:" + einfo " ifconfig \${INTERFACE} -mediaopt monitor" + einfo + einfo "For aireplay-ng you need FreeBSD >= 7.0." + fi +} 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 deleted file mode 100644 index d4688b8..0000000 --- a/net-wireless/aircrack-ng/files/aircrack-ng-1.2-no-force-stack-protector.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 58fe40daf3e082d9e63d689d795a3bbecf72fedb Mon Sep 17 00:00:00 2001 -From: Joseph Benden -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 - ;; -- cgit v1.2.3-65-gdbad