Version bump. Add a parallel make patch (bug #416987). Add more USE flags for optional utilities.

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

5 files changed, 117 insertions, 6 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index b28edba2d359..5d2b9c78d5bf 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/nmap
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.253 2012/06/15 15:32:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.254 2012/06/20 17:33:05 jer Exp $
+
+*nmap-6.01 (20 Jun 2012)
+
+  20 Jun 2012; Jeroen Roovers <jer@gentoo.org> +nmap-6.01.ebuild,
+  +files/nmap-6.01-make.patch, metadata.xml:
+  Version bump. Add a parallel make patch (bug #416987). Add more USE flags for
+  optional utilities.
 
   15 Jun 2012; Jeroen Roovers <jer@gentoo.org> nmap-6.00.ebuild:
   Reinstate -j1 (bug #416987).
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 09f171bea19a..dbf90d8a728f 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -9,22 +9,25 @@ AUX nmap-5.20-nolua.patch 1237 RMD160 b670ecd0630d0f13f8f5a46cc8ffb84b86374c3d S
 AUX nmap-5.21-openssl-1.patch 920 RMD160 5c8d7c1c55a9cc2cd5acc5237c20bf5ca726855a SHA1 b8af4241ceac2a2bd12df5c443b599528bb31423 SHA256 1e0167303acdeb01a90d61afd2cc8ca521d8e9504585716f07e7acf2367f1360
 AUX nmap-5.21-python.patch 1219 RMD160 87b07436f42950341403ee0f92edf02abfe88614 SHA1 6e82966a50b150ce3cb2b36d0ad57595f98dc2c8 SHA256 2d133db8f31d048de810fa3a3b8234f856bdfa9b830c6346d71cdc2357a16b74
 AUX nmap-5.51-su-to-zenmap-fix.patch 785 RMD160 44f30cdf13120d949792eb07e82d7b697c914bb0 SHA1 fcea2bb71901ed4c78e918f07a3da208f115a3d9 SHA256 f57d70bd98b0b395661dc2b85df15ae79b71fe339133967f7af4eee98feee8da
+AUX nmap-6.01-make.patch 571 RMD160 1985bae0e96489b03498d98e70ec8373a8c193d8 SHA1 03ee95bbd5b90b2596f130ab3d0185b3a4af54a4 SHA256 d315795797c60712b00dbdc0e1fe5df6851575e0dbc11abb772a51c739ab60cb
 AUX nmap-logo-64.png 3289 RMD160 0f0a9ec49ecffc97517b8d048888a6fd5dce0ab0 SHA1 c36250c662ee9058974a2215c579c3f45ddaf2d0 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa
 AUX su-to-zenmap.sh.diff 407 RMD160 60d66ce051777897d69b353eba08225a4fdb0892 SHA1 d4fcf25792851e1a1a3288588eedfcfec7af631c SHA256 164664d9e1ff54279794fe2eb34f15d419a843e58d7633664be07be12a6cfe36
 DIST nmap-5.21.tar.bz2 10015121 RMD160 85e912c3c6a7ed03eb1b399c812836071e4dcf9f SHA1 ce5ff792161dae0037e41b31e0c2ef683ce94655 SHA256 9fcb24f86157541c2f17cc8a0cc1e5d15d909b51720d163fcad5faaa6201b0ba
 DIST nmap-5.35DC1.tar.bz2 11302092 RMD160 d0663a669824a38f05e89c14a2ad5fd9932eddcc SHA1 5fd786d4bbe6b4fbc0ae625fbb6893b19fbde627 SHA256 51a6cde0a6afee50799d59b1968f1a4011753bb535f070114fd60be62f59ad44
 DIST nmap-5.51.tar.bz2 16869068 RMD160 d5ac8b245234e122936b40c80927a3c4afba53bd SHA1 3415ad9a3915d7e162c9e91435cc35d9c73ac7f6 SHA256 15b3e134a74fa9b54aba2c3a53d6701c7ad221dc4051657ef95465a5a5a8687e
 DIST nmap-6.00.tar.bz2 21639906 RMD160 e8f9c1da433aadcbc18ab216445466388c0e331a SHA1 11d8f418e31a85e5b5ad6b4cf98f3c1b5c19ddb2 SHA256 9037b49ffde13a228ce4ffadd3de8320580f84a0cd8ac14b2fd74757f1fb4b26
+DIST nmap-6.01.tar.bz2 21640157 RMD160 1b6f2b0e4f019d9cd069db14990364c45d463c7d SHA1 e397e453893930d14e9bb33a847d15b94b7ee83a SHA256 77f6635b677d28b546cbef97e4ead6c2d4a5aebcaa108fe3a3c135db6448617a
 EBUILD nmap-5.21-r1.ebuild 1853 RMD160 afe1d7959e144fd320a3ebd17c391d4a6a1fc617 SHA1 6ca5da46059c3fd6fd523a447f3019734d569911 SHA256 a1e82563d667c8559ff03bc31e224e66db6d60aa8d9f2b9dce0dabb3bca4bb0f
 EBUILD nmap-5.35.ebuild 1878 RMD160 bade2661341cc764192a3ea9812a12d3804936fb SHA1 bf529de7c48b7debb722441080e01198692ca6fe SHA256 52569140a07b39c67f4a8163391d304b3a859ab1fd43a6a35f21ad4e08fa1c56
 EBUILD nmap-5.51.ebuild 1853 RMD160 4df8afa96ae3afe7f0ebc5f4051a0cc431d9eab5 SHA1 01a8515b3175c59c3d541e57a36b7b0f8335758c SHA256 632766f6788752a5d00c27bea784173d86940d52fb39b655a44b9238092478d0
 EBUILD nmap-6.00.ebuild 1920 RMD160 351f8004f9ee9b1b85377d156a895bfb0622a5e9 SHA1 9a14a19a80fd998b93a80ffd383ad557dd8fdae9 SHA256 64f2b54f65d88a6860b6707520249372002bd9b960128f05b959c8676fa8e0a2
-MISC ChangeLog 30928 RMD160 984a0409c13910e3b35825721c6f4d7ddecdaa49 SHA1 a2584ad9998a12cbc161b886bf81163d3001bdf1 SHA256 8a7eb3280ba41ff286047fe69986515ef5f0cc3a9856428fc39ad1e43e274e13
-MISC metadata.xml 220 RMD160 e546581ce5539acad3af6c34d9aa3cf620d7f3a8 SHA1 6a6d5d3526e99d62e789655226cdda4b343a913f SHA256 acc28d2b0a26781492524b195565470457168bd704c817430d76770844b5d42a
+EBUILD nmap-6.01.ebuild 2228 RMD160 47274064c169942a7ca1849ffffa765dcf743f33 SHA1 599976d1995da2e40edae35650c5cbe731160570 SHA256 02790bd7c3bc7d2dafeeeff769dd7a46d1f87a64b1e299ba315677629b4d6f47
+MISC ChangeLog 31168 RMD160 edf1d672962d0d374d2005541f295a4ce9375815 SHA1 a504caf28695199d6a45848eb897c82c125a6284 SHA256 b61e872a9a794eacd56d20dff5f93fc048e6e82b6ebead070abbdb105cd042f5
+MISC metadata.xml 527 RMD160 9dd34c9365eebe1138379a5ad0834ae0e948287d SHA1 e2778705b12064bb9f821daf7903ceffdb581a7d SHA256 f6291faba996b899beb0f35b3d5feb0a0a5a7e71e684b10f8386f0707e73d982
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk/bVakACgkQVWmRsqeSphPjJQCeN4UQ7xVTCzvxIm9ExtmpRYg6
-ANoAn1GxuQ2em83J24492nM1lIHXwF3Y
-=TD/y
+iEYEARECAAYFAk/iCWEACgkQVWmRsqeSphN6/gCaAz+oaKSO1iwjLxDoSal9ZcZQ
+Q0MAn1f2ciXkyfOOU9JOWiG96ZcAfdzJ
+=eHzE
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nmap/files/nmap-6.01-make.patch b/net-analyzer/nmap/files/nmap-6.01-make.patch
new file mode 100644
index 000000000000..2711b3168b2e
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-6.01-make.patch
@@ -0,0 +1,20 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -119,6 +119,8 @@
+ 	rm -f $@
+ 	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ 
++$(NBASEDIR)/libnbase.a: nbase_build
++
+ build-%: %/Makefile
+ 	cd $* && $(MAKE)
+ 
+@@ -152,7 +154,7 @@
+ liblinear_build: $(LIBLINEARDIR)/Makefile
+ 	@echo Compiling liblinear; cd $(LIBLINEARDIR) && $(MAKE) liblinear.a CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)"
+ 
+-build-nmap-update: nmap-update/default_channel.h
++build-nmap-update: nbase_build nmap-update/default_channel.h
+ 
+ #$(LIBPCAPDIR)/Makefile:
+ #	@echo Configuring libpcap; cd $(LIBPCAPDIR); ./configure
diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml
index f0607ae32cc0..b5e3b19fee28 100644
--- a/net-analyzer/nmap/metadata.xml
+++ b/net-analyzer/nmap/metadata.xml
@@ -5,4 +5,12 @@
 <maintainer>
   <email>spock@gentoo.org</email>
 </maintainer>
+<use>
+<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>
+</use>
 </pkgmetadata>
diff --git a/net-analyzer/nmap/nmap-6.01.ebuild b/net-analyzer/nmap/nmap-6.01.ebuild
new file mode 100644
index 000000000000..b237b252fe74
--- /dev/null
+++ b/net-analyzer/nmap/nmap-6.01.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild,v 1.1 2012/06/20 17:33:05 jer Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+
+inherit eutils flag-o-matic python
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="gtk lua ncat ndiff nmap-update nping ssl"
+
+DEPEND="dev-libs/libpcre
+	net-libs/libpcap
+	dev-libs/apr
+	gtk? ( >=x11-libs/gtk+-2.6:2
+		   >=dev-python/pygtk-2.6
+		   || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 )
+		 )
+	lua? ( >=dev-lang/lua-5.1.4-r1[deprecated] )
+	nmap-update? ( dev-libs/apr dev-vcs/subversion )
+	ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.75-include.patch
+	epatch "${FILESDIR}"/${PN}-4.75-nolua.patch
+	epatch "${FILESDIR}"/${PN}-5.10_beta1-string.patch
+	epatch "${FILESDIR}"/${PN}-5.21-python.patch
+	epatch "${FILESDIR}"/${PN}-5.51-su-to-zenmap-fix.patch
+	sed -i -e 's/-m 755 -s ncat/-m 755 ncat/' ncat/Makefile.in
+
+	# bug #416987
+	epatch "${FILESDIR}"/${P}-make.patch
+}
+
+src_configure() {
+	# The bundled libdnet is incompatible with the version available in the
+	# tree, so we cannot use the system library here.
+	econf --with-libdnet=included \
+		$(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)
+}
+
+src_install() {
+	LC_ALL=C emake DESTDIR="${D}" -j1 STRIP=: nmapdatadir="${EPREFIX}"/usr/share/nmap install
+	if use nmap-update;then
+		LC_ALL=C emake DESTDIR="${D}" -j1 STRIP=: \
+			nmapdatadir="${EPREFIX}"/usr/share/nmap -C nmap-update install
+	fi
+	dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+	use gtk && doicon "${FILESDIR}/nmap-logo-64.png"
+}