From 8aebb228036d5e2863b7eaa6e319ab41c1669269 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 16 Apr 2018 16:47:37 +0100 Subject: gentoo resync : 16.04.2018 --- net-analyzer/nmap/Manifest | 4 +- net-analyzer/nmap/nmap-7.40.ebuild | 179 ------------------------------------- net-analyzer/nmap/nmap-7.70.ebuild | 2 +- 3 files changed, 2 insertions(+), 183 deletions(-) delete mode 100644 net-analyzer/nmap/nmap-7.40.ebuild (limited to 'net-analyzer/nmap') diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest index 297cdaadecc9..ff7819b8142f 100644 --- a/net-analyzer/nmap/Manifest +++ b/net-analyzer/nmap/Manifest @@ -7,10 +7,8 @@ AUX nmap-7.25-CXXFLAGS.patch 302 BLAKE2B 3a6689beb9750dbb2d35a779089c4f8dd772add AUX nmap-7.25-libpcre.patch 291 BLAKE2B f63a80d6e25309d4706f7f428cd70f5926df99f7dc7b98f6991c75f13f2cdc0ca14e2527bd55cc88e33837012d4b1b24433a9f63b614cffedbf3da40ab73d9b6 SHA512 75963ed6eb156475a8e928f6fd6ad18cdc61ed658a3e0a82a7719bbc4998b186981fa93c2b39b8bc92e10cc0ad19f5097224a9a68bc4b35e1b771d4a27532b1d AUX nmap-7.25-no-FORTIFY_SOURCE.patch 2258 BLAKE2B 28e3dbd2d2ccac4d01fc640377fd8ca016f196bb59eaaa42ebe7ef31f473f9bf9db893c7b4330b1a2aa723b5268640b5edba4519b94ee094d63605600bffd9e6 SHA512 29b19e8cedc5e9edf66e728d89b71c4c0ada29fdbb9c167bec84b5aad2c9d52fe111a902c32b247106ace0154734f2a3b4eeae119887dc7203ad2271c8c240a3 AUX nmap-7.31-libnl.patch 498 BLAKE2B 15ba0015ce0c5f266adf1f6b53ad99db82521a3ef8b226f040acc4f0f7759af762fafbce2a1820675e55e04d6b4dfbe04f67711d3fdd1e9dabd750b200ef9d3a SHA512 e7047faaac2bec6c8e0aaae04cbc6e97a8da7999fbb1a8ff015a78ffafe3ce645b71746fd6da826e3ad9baa8d8a917d3791836e67a346dc9c1ca6678cd04e7c8 -DIST nmap-7.40.tar.bz2 9043221 BLAKE2B ddbc2f9d8b96aa2ddd53bb250acb5b0829dd79caf04d599ed2257f89cc1e419a9dbf94101a5b1d5ad6815e1a94974b3c02ad81354897ba3bb032a5e3d616468d SHA512 98e37bf1c29789ea19ee4542d719ed6970c8bcc1bf92af4948a52a75273c2403329149f6b5df6368c23840d1bb3f47af9e5ce543f7a36596a33896609574f02d DIST nmap-7.70.tar.bz2 10467371 BLAKE2B 53d751773851e45fcfa7604f8b325297f429f525bafdef91e7f693b9a9876ddb23e978c50821776b64764adb5bf36e759042cac3254bdbf36bff7048dfb6f58d SHA512 084c148b022ff6550e269d976d0077f7932a10e2ef218236fe13aa3a70b4eb6506df03329868fc68cb3ce78e4360b200f5a7a491d3145028fed679ef1c9ecae5 DIST nmap-logo-64.png 3289 BLAKE2B 9563f57d126e6fa38dc777391c2887112836b4f5b521311bde64d5c5a04c45a3f420abba0750f776658015c0018b2afeb381c691bc8784e4f39abc78b9c2d2c7 SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 -EBUILD nmap-7.40.ebuild 4322 BLAKE2B fa5c7e0f84dc27f65047a3522244199a7a7024fb76177a36a77a224ca46b5e15d9e5b3f2201d19c8a7550ef637a3713d3fc493d419ad929af4b229fa8eb4899a SHA512 24f62b8cc52020de46f5274d870a65a4e87be189d07d08deaed7d5767e0be7f44e3841e5edfc19bdbec48f11b236ef564cf870ec7068672cebbefb05673e5295 -EBUILD nmap-7.70.ebuild 4529 BLAKE2B 9dd5db3f71a0e40818dc9a43d1c3aba4a61661d88e21c37010c266fe1dbcfbd63cf3ce1cea0679c27b5cdfc8f8d17acd32bae03384e24c766e785771bfa4919b SHA512 8931f0323e1a234121006935635121d2a51e616c8e7ecc2fb963e3c60bdde743c15b81eb41ce6b63303e50549311c4f86a48ab5450652f74669099ef55843323 +EBUILD nmap-7.70.ebuild 4528 BLAKE2B 9f880f05a7525b9947cfe40fe917eee7efde39bce1aca35dd9359161aa9e4ced9b7b731e280e3999da48309fd96f8102f84b2bc77660906a07369ed54d47ecbe SHA512 4f5ae8693eb6634f4eecab9eee36ca04d1d37e52d7009c5eba06f4394ad3ad0a1ff824db2035a573fb687e899f7abf367a32928e274438351878ae017c72b99c EBUILD nmap-9999.ebuild 4315 BLAKE2B 7d83887400200359844f202b29e30cb358a6c35a35f23754c69455f1807fdb9e1e6739f856d5e575058a01b9f0a4686a83602e53f3d202d80fcd33e636264141 SHA512 c9b708642cf84cc3caa3555085779ae3f3d93a575f07b033f5e562ed2dd3bc4f94f17f27244a4baf5b15b98ebafa1432df292d11c991a357fed65d21af2def18 MISC metadata.xml 920 BLAKE2B c07add545e072588022e15d9de0595f1924fe10fdbec7a11cd401429a76a56ee0a53e4675b3e784f5e2e44372f531073cbdc3da717e4a7f3f906b5c1987530d8 SHA512 56d44c71139e48b75a89140bedd2c4a1bc20c8fe99e16ee8b71fb490cb606997571de95d6ac93147bdee81bbcbb736588c87c43b9cd4f9fac71280416a499185 diff --git a/net-analyzer/nmap/nmap-7.40.ebuild b/net-analyzer/nmap/nmap-7.40.ebuild deleted file mode 100644 index b1b445aa9534..000000000000 --- a/net-analyzer/nmap/nmap-7.40.ebuild +++ /dev/null @@ -1,179 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite,xml" -inherit autotools flag-o-matic python-single-r1 toolchain-funcs - -MY_P=${P/_beta/BETA} - -DESCRIPTION="A utility for network discovery and security auditing" -HOMEPAGE="http://nmap.org/" -SRC_URI=" - http://nmap.org/dist/${MY_P}.tar.bz2 - https://dev.gentoo.org/~jer/nmap-logo-64.png -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" - -IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap" -NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh ) - -REQUIRED_USE=" - system-lua? ( nse ) - ndiff? ( ${PYTHON_REQUIRED_USE} ) - zenmap? ( ${PYTHON_REQUIRED_USE} ) -" - -RDEPEND=" - dev-libs/liblinear:= - dev-libs/libpcre - net-libs/libpcap - zenmap? ( - dev-python/pygtk:2[${PYTHON_USEDEP}] - ${PYTHON_DEPS} - ) - system-lua? ( >=dev-lang/lua-5.2:*[deprecated] ) - ndiff? ( ${PYTHON_DEPS} ) - nls? ( virtual/libintl ) - nmap-update? ( dev-libs/apr dev-vcs/subversion ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) -" -DEPEND=" - ${RDEPEND} - nls? ( sys-devel/gettext ) -" - -S="${WORKDIR}/${MY_P}" -PATCHES=( - "${FILESDIR}"/${PN}-5.10_beta1-string.patch - "${FILESDIR}"/${PN}-5.21-python.patch - "${FILESDIR}"/${PN}-6.46-uninstaller.patch - "${FILESDIR}"/${PN}-6.25-liblua-ar.patch - "${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch - "${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch - "${FILESDIR}"/${PN}-7.25-libpcre.patch - "${FILESDIR}"/${PN}-7.31-libnl.patch -) - -pkg_setup() { - if use ndiff || use zenmap; then - python-single-r1_pkg_setup - fi -} - -src_unpack() { - # prevent unpacking the logo - unpack ${MY_P}.tar.bz2 -} - -src_prepare() { - rm -r libpcap/ || die - - cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die - - default - - local lingua - if use nls; then - for lingua in ${NMAP_LINGUAS[@]}; do - if ! has ${lingua} ${LINGUAS-${lingua}}; then - rm -r zenmap/share/zenmap/locale/${lingua} || die - rm zenmap/share/zenmap/locale/${lingua}.po || die - fi - done - else - # configure/make ignores --disable-nls - for lingua in ${NMAP_LINGUAS[@]}; do - rm -r zenmap/share/zenmap/locale/${lingua} || die - rm zenmap/share/zenmap/locale/${lingua}.po || die - done - fi - - sed -i \ - -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \ - Makefile.in || die - - sed -i \ - -e '/rm -f $@/d' \ - $(find . -name Makefile.in) \ - || die - - # Fix desktop files wrt bug #432714 - sed -i \ - -e '/^Encoding/d' \ - -e 's|^Categories=.*|Categories=Network;System;Security;|g' \ - zenmap/install_scripts/unix/zenmap-root.desktop \ - zenmap/install_scripts/unix/zenmap.desktop || die - - cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die - eautoreconf - if [[ ${CHOST} == *-darwin* ]] ; then - # we need the original for a Darwin-specific fix, bug #604432 - mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die - fi -} - -src_configure() { - # The bundled libdnet is incompatible with the version available in the - # tree, so we cannot use the system library here. - econf \ - $(use_enable ipv6) \ - $(use_enable nls) \ - $(use_with zenmap) \ - $(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \ - $(use_with ncat) \ - $(use_with ndiff) \ - $(use_with nmap-update) \ - $(use_with nping) \ - $(use_with ssl openssl) \ - --with-libdnet=included \ - --with-pcre=/usr - # --with-liblinear=/usr \ - # Commented because configure does weird things, while autodetection works -} - -src_compile() { - local directory - for directory in . libnetutil nsock/src \ - $(usex ncat ncat '') \ - $(usex nmap-update nmap-update '') \ - $(usex nping nping '') - do - emake -C "${directory}" makefile.dep - done - - emake \ - AR=$(tc-getAR) \ - RANLIB=$(tc-getRANLIB) -} - -src_install() { - LC_ALL=C emake -j1 \ - DESTDIR="${D}" \ - STRIP=: \ - nmapdatadir="${EPREFIX}"/usr/share/nmap \ - install - if use nmap-update;then - LC_ALL=C emake -j1 \ - -C nmap-update \ - DESTDIR="${D}" \ - STRIP=: \ - nmapdatadir="${EPREFIX}"/usr/share/nmap \ - install - fi - - dodoc CHANGELOG HACKING docs/README docs/*.txt - - if use zenmap; then - doicon "${DISTDIR}/nmap-logo-64.png" - python_optimize - fi -} diff --git a/net-analyzer/nmap/nmap-7.70.ebuild b/net-analyzer/nmap/nmap-7.70.ebuild index a649c0dacfc2..40fea0e3b9d3 100644 --- a/net-analyzer/nmap/nmap-7.70.ebuild +++ b/net-analyzer/nmap/nmap-7.70.ebuild @@ -18,7 +18,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE=" ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua -- cgit v1.2.3