commit:     a8e3423633e730858cfc0029cff4cbb28f8d02cb
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  8 12:16:46 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Aug  8 12:17:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8e34236

net-analyzer/nmap: Version bump.

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 net-analyzer/nmap/Manifest         |   1 +
 net-analyzer/nmap/metadata.xml     |   3 +-
 net-analyzer/nmap/nmap-7.60.ebuild | 196 +++++++++++++++++++++++++++++++++++++
 3 files changed, 199 insertions(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 2e0011795cc..7dbcd96d94d 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,3 +1,4 @@
 DIST nmap-7.40.tar.bz2 9043221 SHA256 
9e14665fffd054554d129d62c13ad95a7b5c7a046daa2290501909e65f4d3188 SHA512 
98e37bf1c29789ea19ee4542d719ed6970c8bcc1bf92af4948a52a75273c2403329149f6b5df6368c23840d1bb3f47af9e5ce543f7a36596a33896609574f02d
 WHIRLPOOL 
735133455aec227149478cb273e41d33b7dbd77a6998682b6d80bdc72c77555cd745895adfcde1c194281c258131e7fce49254e79349fe112a5f146768fd1c51
 DIST nmap-7.50.tar.bz2 9309616 SHA256 
e9a96a8e02bfc9e80c617932acc61112c23089521ee7d6b1502ecf8e3b1674b2 SHA512 
b74c5711f03bae363164cdb7e62923ab938c81c7bbcd080eaa2d1acc89f09eb0a7e0f5deb9628b81057c7a35ecd487a2d09dfe3b58b0db6c84cf0b39f526e5f2
 WHIRLPOOL 
9fd0a9fb8de6e4e169cf7a9ce8b06b3e245f66aa3643cb6be4b1933d824091d4211d3207893f5bff5621c7746434db92a5745c3500e3ce8de1bb0c6e2820d365
+DIST nmap-7.60.tar.bz2 10394925 SHA256 
a8796ecc4fa6c38aad6139d9515dc8113023a82e9d787e5a5fb5fa1b05516f21 SHA512 
74ba8f6de026ade9ee6bb2252bee18a57210f8207977df7f1c04556629dcdc1e6127f33febc8a52ef88a1dac876116d590564dee4f1c23798c3ac37529991aa4
 WHIRLPOOL 
ca5a10ca5a685c53fa37a72857c009333287c6559409fb1dfcc5edc5e48034b3d280f76e555e159156b5befc0167b9198673e07ccd2e6a0a80c2d3dc2395fff0
 DIST nmap-logo-64.png 3289 SHA256 
4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 
fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3
 WHIRLPOOL 
6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313

diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml
index bd677b0812d..37088b5933c 100644
--- a/net-analyzer/nmap/metadata.xml
+++ b/net-analyzer/nmap/metadata.xml
@@ -6,12 +6,13 @@
                <name>Gentoo network monitoring and analysis project</name>
        </maintainer>
        <use>
-               <flag name="system-lua">Use <pkg>dev-lang/lua</pkg> instead of 
the bundled liblua</flag>
+               <flag name="libssh2">Enable SSH support through 
<pkg>net-libs/libssh2</pkg></flag>
                <flag name="ncat">Install the ncat utility</flag>
                <flag name="ndiff">Install the ndiff utility</flag>
                <flag name="nmap-update">Install nmap-update, which uses 
<pkg>dev-vcs/subversion</pkg> to update nmap scripts in your home 
directory</flag>
                <flag name="nping">Install the nping utility</flag>
                <flag name="nse">Include support for the Nmap Scripting Engine 
(NSE)</flag>
+               <flag name="system-lua">Use <pkg>dev-lang/lua</pkg> instead of 
the bundled liblua</flag>
                <flag name="zenmap">Install the GTK+ based nmap GUI, 
zenmap</flag>
        </use>
 </pkgmetadata>

diff --git a/net-analyzer/nmap/nmap-7.60.ebuild 
b/net-analyzer/nmap/nmap-7.60.ebuild
new file mode 100644
index 00000000000..2e1a4c75258
--- /dev/null
+++ b/net-analyzer/nmap/nmap-7.60.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2017 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="https://nmap.org/";
+SRC_URI="
+       https://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 libssh2 ncat ndiff nls nmap-update nping +nse ssl 
system-lua
+       zenmap
+"
+NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
+IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
+
+REQUIRED_USE="
+       system-lua? ( nse )
+       ndiff? ( ${PYTHON_REQUIRED_USE} )
+       zenmap? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+       dev-libs/liblinear:=
+       dev-libs/libpcre
+       net-libs/libpcap
+       libssh2? (
+               net-libs/libssh2[zlib]
+       )
+       ndiff? ( ${PYTHON_DEPS} )
+       nls? ( virtual/libintl )
+       nmap-update? (
+               dev-libs/apr
+               dev-vcs/subversion
+       )
+       ssl? (
+               !libressl? ( dev-libs/openssl:0= )
+               libressl? ( dev-libs/libressl:= )
+       )
+       system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
+       zenmap? (
+               dev-python/pygtk:2[${PYTHON_USEDEP}]
+               ${PYTHON_DEPS}
+       )
+"
+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
+
+       if use nls; then
+               local lingua=''
+               for lingua in ${NMAP_LINGUAS[@]}; do
+                       if ! use 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 's|^Categories=.*|Categories=Network;System;Security;|g' \
+               zenmap/install_scripts/unix/zenmap-root.desktop \
+               zenmap/install_scripts/unix/zenmap.desktop || die
+
+       sed -i \
+               -e '/AC_CONFIG_SUBDIRS(libz)/d' \
+               -e '/AC_CONFIG_SUBDIRS(libssh2)/d' \
+               configure.ac
+
+       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 ncat) \
+               $(use_with libssh2) \
+               $(usex libssh2 --with-zlib) \
+               $(use_with ndiff) \
+               $(use_with nmap-update) \
+               $(use_with nping) \
+               $(use_with ssl openssl) \
+               $(use_with zenmap) \
+               $(usex nse --with-liblua=$(usex system-lua /usr included '' '') 
--without-liblua) \
+               --cache-file="${S}"/config.cache \
+               --with-libdnet=included \
+               --with-pcre=/usr
+       #       Commented out because configure does weird things
+       #       --with-liblinear=/usr \
+}
+
+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
+}

Reply via email to