From d1ff7a9a9305eecda14ee957ba8932ded4e4c466 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Tue, 11 Nov 2014 22:23:22 +0000 Subject: [PATCH] Call python_optimize in src_install, and backport python changes to nmap-6.25-r1. Bug 498726 by Nikoli. Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x0BBEEA1FEA4843A4 --- net-analyzer/nmap/ChangeLog | 9 +- net-analyzer/nmap/Manifest | 11 +- net-analyzer/nmap/nmap-6.25-r1.ebuild | 152 ++++++++++++++++++++++++++ net-analyzer/nmap/nmap-6.47.ebuild | 9 +- 4 files changed, 172 insertions(+), 9 deletions(-) create mode 100644 net-analyzer/nmap/nmap-6.25-r1.ebuild diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog index 58ff023a47f2..fae4849a2441 100644 --- a/net-analyzer/nmap/ChangeLog +++ b/net-analyzer/nmap/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-analyzer/nmap # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.312 2014/11/11 21:58:32 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.313 2014/11/11 22:23:20 floppym Exp $ + +*nmap-6.25-r1 (11 Nov 2014) + + 11 Nov 2014; Mike Gilbert +nmap-6.25-r1.ebuild, + nmap-6.47.ebuild: + Call python_optimize in src_install, and backport python changes to + nmap-6.25-r1. Bug 498726 by Nikoli. 11 Nov 2014; Mike Gilbert nmap-6.47.ebuild: Don't call python-single-r1_pkg_setup if python is not used. diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest index 0a17b9aa08dd..167bf93400b3 100644 --- a/net-analyzer/nmap/Manifest +++ b/net-analyzer/nmap/Manifest @@ -15,15 +15,16 @@ DIST nmap-6.46.tar.bz2 7911353 SHA256 3f89d9053c69507fe9533c40188a6561d49607a37b DIST nmap-6.47.tar.bz2 7878122 SHA256 8fa11e9e203ce2d81a207db5ca4f110a525f6c01c1dd0018325a7112a51aa591 SHA512 f98b92a26f4e912fe15c36a21dfff7bfb9f11c2410f4035330100648fbad7f808ef9e069c63704bbb50199272ae65ea81555de6c97eb8ee152114f44ed5a9296 WHIRLPOOL 4f92f0aeaaa03a94dc27080b5f0c2396325f282b7a781d163d1e05a71117896c4581154b58383f136eed1fcf2cce8f1b94e3344f3fc5d4955cf1f4cfc1417573 DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313 EBUILD nmap-6.01.ebuild 2644 SHA256 a2e907c693677dcc8a477898731770103682529c93594fd2df7723420ab6a58b SHA512 541cdb4c5c62b5dd20f35f216d703e31f2f9a8d354f4532fb95f429aad527fa9ca3ba86d2d8a72968c3ea4229254325cd85cc55d70a067bcff6752b1dc54ad31 WHIRLPOOL d6a183fca1074ff2c905e17145317524d82dd6028ae843602ec7bd81abbff1e973533e36a278d50ab063a21804da1c019dd59af032054f884a013d5f058f4394 +EBUILD nmap-6.25-r1.ebuild 3603 SHA256 47493005896612b5097b4580340e14ed8f9f0fa07151026f5d3bf0edde2c83f0 SHA512 e9dde9756ae0405ddcd75f3c78cef7ff4c10990db079654ca259b5554e8c8b685b845c9fff0d92a1f134c911d22ab3c22cf08cea6bd77fd5211bc8fc3743999d WHIRLPOOL 75c007b8c94e83b4d77eb4509035c9b5152e216bcd89e86c7eb0d6e35c0254943a006da556b01fd3177135d7138713d87e8bf07deb2c10b3d4b653e366c3cafe EBUILD nmap-6.25.ebuild 3479 SHA256 3fc8097d4dcac997838289fd0df88ccb21f084b7b276dfe28f7392ec60cb583c SHA512 d4ee4d0b830ce2667e87c9ffda50a23bc59f6fe7ffe623453555f76b29ac21ae001bdb00dd04ec25e485002c37f953a5f14af11c932675d89f2b49a3f0aa7897 WHIRLPOOL f4faf39d4a2922c776be592971c4f421aada9c93e54f64923397ce29363f14ba458f57dc2662720caed7d63ad796b64a74d5b46545ad4af6191d1c5580a9b151 EBUILD nmap-6.46.ebuild 3553 SHA256 217182cb769e9ff4290d02e0f65ef5f8bb5585c6022a4880f4c5af71937174a2 SHA512 59f158904468786e4087e35c95df4268d109639c19486e8130abf485a412559371852c2104951594f55a2a62ae345633005124ac9b089ab328bc55adf65b3be7 WHIRLPOOL da3c146c64a632d045e5c62a6cc3a47eac590d3b809c875de20f61a2b03ff1b8c56a2716de6f35fa9d3bf96dd57dbc78d7d97abaaa3034e6509f5ab2402d297c -EBUILD nmap-6.47.ebuild 3673 SHA256 365333fa2d3f27a153cf0c46aae3db42e5ef948568ac0943c85ac13bae07eebe SHA512 0d693789c2a0fa38e8ae6adf4a16e64b909a409726ed43d5175663b970624b629a9f576d664ef3a3b69f275141bbd9911cda87997c304636132d69f46a04278d WHIRLPOOL d90c4731137fa8d96fd51b10bccabf461cd76b3c93a803c5bc50f601d8b5636679d3facc509b99a0a9a4a4264d18604b6c9a917ce9b5e2b692b2bafb1c252f4b -MISC ChangeLog 38764 SHA256 be8d61210ee49b8ce682237a3a529da9d34458e2d2e025c362257241012bc561 SHA512 18109d56219eb5a56f2ee675cad8d5448431319b375b0dd4d295d51a7ffafbeb10bc65a9957e2432909d1109fb160ff118872448546ae0b53b90faf29f7f2156 WHIRLPOOL e1c732ab05066f9e83443804833ac8994af167eaed9357468df9e12b4ee74b6e7702d46ddbe385b6fd3500cb7bec3560fdd481e1cd3e758bd51d5027f931c3c7 +EBUILD nmap-6.47.ebuild 3704 SHA256 f7a99ee4acd7565001ea17e99f007cee2aa14f7a1c8deba91e2c71c6ef398e2d SHA512 5a0a35c602fb96a38f8b00ce3c8bffcfd48baa07bfdd12c2d52307f8771e6d70ff4cef7663815eedd62cb3fe93ad6e3febb4a459173ce8488d48795bf730d396 WHIRLPOOL 19e8094b852772c9a0b545041e2fdba233285814651503e5f3cfea01e6ac6c3e381808e0f89374afd9f8a2e598b627f54cd77bffc825fdfb44f94bb3860ed384 +MISC ChangeLog 38993 SHA256 4b7756eb1a940d5113b029c05b4c0e4885b6dbcd62dc8a87057818e1dbc6fe71 SHA512 d4015e9dbeacc1de63407cd41eff0f4aa4a516f16a1f779d37b684260e4821ef5b7e7641048bafa6b417c6c35ae55b51ccf479846fdfcfb005d56e425d4f8a2a WHIRLPOOL c9173192aaaf40c6eb5718262935d468d56e817c94f8b5a3e2e7e592cd970760ffc87edfd3987ee2f0ca827d077d59fd00c8322879028c9b683130faca12da0c MISC metadata.xml 639 SHA256 5bb4193809c829dc5c8f9101355e6f4626bf616df5f6a477e1651a53c25ca9ce SHA512 d20ddd6bdb400bf0cffde6e5530e457ff49631ffc9413a4262ac197441338b19d0a9168b8d73c79a01cfc6244e34bceb3139c8c6e45bebbfec0a192b88fc21f2 WHIRLPOOL 036edb4b7dc0f24d84d214917ab18026dc4cd5da85e3da803ed8510634cf8c5b46c06dadebbb900442d4fe2eb877ec491b337a7a26f33256847b91d4b513f2cd -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlRihokACgkQC77qH+pIQ6Q7yQEAjMtp2wu35La7auoVTzNP1wH2 -Vo1eN8pcURoi519DubAA/25Au/MJb/ARspr6Jv0dRPg7MogE/atqaAKnX5w7qO1v -=wzvA +iF4EAREIAAYFAlRijFkACgkQC77qH+pIQ6SdGgD8Cx/IKva7/SvzVjve3xeBa4Y7 +0mb51rnzCp0hqe6PWA4A/R8eM7X4+b6CSYvVhJjhClF6khVKN7UUkNKHRy5iaNBn +=LHNi -----END PGP SIGNATURE----- diff --git a/net-analyzer/nmap/nmap-6.25-r1.ebuild b/net-analyzer/nmap/nmap-6.25-r1.ebuild new file mode 100644 index 000000000000..26d07ae518a5 --- /dev/null +++ b/net-analyzer/nmap/nmap-6.25-r1.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.25-r1.ebuild,v 1.1 2014/11/11 22:23:20 floppym Exp $ + +EAPI="5" +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="sqlite,xml" + +inherit eutils flag-o-matic python-single-r1 toolchain-funcs + +MY_P=${P/_beta/BETA} + +DESCRIPTION="A utility for network exploration or security auditing" +HOMEPAGE="http://nmap.org/" +SRC_URI=" + http://nmap.org/dist/${MY_P}.tar.bz2 + http://dev.gentoo.org/~jer/nmap-logo-64.png +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~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="gtk ipv6 +lua ncat ndiff nls nmap-update nping ssl" +NMAP_LINGUAS="de es fr hr hu id it ja pl pt_BR pt_PT ro ru sk zh" +for lingua in ${NMAP_LINGUAS}; do + IUSE+=" linguas_${lingua}" +done + +REQUIRED_USE=" + gtk? ( ${PYTHON_REQUIRED_USE} ) + ndiff? ( ${PYTHON_REQUIRED_USE} ) +" +RDEPEND=" + dev-libs/apr + dev-libs/libpcre + net-libs/libpcap[ipv6?] + gtk? ( + >=x11-libs/gtk+-2.6:2 + >=dev-python/pygtk-2.6 + ${PYTHON_DEPS} + ) + lua? ( >=dev-lang/lua-5.1.4-r1[deprecated] ) + ndiff? ( ${PYTHON_DEPS} ) + nls? ( virtual/libintl ) + nmap-update? ( dev-libs/apr dev-vcs/subversion ) + ssl? ( dev-libs/openssl ) +" +DEPEND=" + ${RDEPEND} + nls? ( sys-devel/gettext ) +" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + if use gtk || use ndiff; then + python-single-r1_pkg_setup + fi +} + +src_unpack() { + unpack ${MY_P}.tar.bz2 +} + +src_prepare() { + epatch \ + "${FILESDIR}"/${PN}-4.75-nolua.patch \ + "${FILESDIR}"/${PN}-5.10_beta1-string.patch \ + "${FILESDIR}"/${PN}-5.21-python.patch \ + "${FILESDIR}"/${PN}-6.01-make.patch \ + "${FILESDIR}"/${PN}-6.25-lua.patch \ + "${FILESDIR}"/${PN}-6.25-liblua-ar.patch + sed -i \ + -e 's/-m 755 -s ncat/-m 755 ncat/' \ + ncat/Makefile.in || die + + mv docs/man-xlate/${PN}-j{p,a}.1 || die + if use nls; then + local lingua='' + for lingua in ${NMAP_LINGUAS}; do + if ! use linguas_${lingua}; then + rm -rf zenmap/share/zenmap/locale/${lingua} + rm -f zenmap/share/zenmap/locale/${lingua}.po + fi + done + else + # configure/make ignores --disable-nls + for lingua in ${NMAP_LINGUAS}; do + rm -rf zenmap/share/zenmap/locale/${lingua} + rm -f zenmap/share/zenmap/locale/${lingua}.po + done + fi + + sed -i \ + -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \ + 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 + + epatch_user +} + +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 gtk zenmap) \ + $(use_with lua liblua) \ + $(use_with ncat) \ + $(use_with ndiff) \ + $(use_with nmap-update) \ + $(use_with nping) \ + $(use_with ssl openssl) \ + --with-libdnet=included +} + +src_compile() { + 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 gtk; then + doicon "${DISTDIR}/nmap-logo-64.png" + python_optimize + fi +} diff --git a/net-analyzer/nmap/nmap-6.47.ebuild b/net-analyzer/nmap/nmap-6.47.ebuild index ef905e09e839..78efafc32b2d 100644 --- a/net-analyzer/nmap/nmap-6.47.ebuild +++ b/net-analyzer/nmap/nmap-6.47.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.47.ebuild,v 1.3 2014/11/11 21:58:32 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.47.ebuild,v 1.4 2014/11/11 22:23:20 floppym Exp $ EAPI=5 @@ -27,7 +27,7 @@ IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}" REQUIRED_USE=" ndiff? ( ${PYTHON_REQUIRED_USE} ) - zenmap ( ${PYTHON_REQUIRED_USE} ) + zenmap? ( ${PYTHON_REQUIRED_USE} ) " RDEPEND=" @@ -147,5 +147,8 @@ src_install() { dodoc CHANGELOG HACKING docs/README docs/*.txt - use zenmap && doicon "${DISTDIR}/nmap-logo-64.png" + if use zenmap; then + doicon "${DISTDIR}/nmap-logo-64.png" + python_optimize + fi } -- 2.26.2