Do not allow usage of the bundled liblua (see bug #280772 for more info).

Package-Manager: portage-2.2_rc42/cvs/Linux x86_64

3 files changed, 63 insertions, 5 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index d73f72a78479..d7ad03937372 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/nmap
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.203 2009/09/26 10:39:33 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.204 2009/09/26 22:01:06 spock Exp $
+
+*nmap-5.00-r2 (26 Sep 2009)
+
+  26 Sep 2009; Michał Januszewski <spock@gentoo.org> +nmap-5.00-r2.ebuild:
+  Do not allow usage of the bundled liblua (see bug #280772 for more info).
 
 *nmap-5.00-r1 (26 Sep 2009)
 
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 606a28c04200..1bad9465cb88 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -15,13 +15,14 @@ EBUILD nmap-4.85_beta8.ebuild 1630 RMD160 781ea53789c6d37dbc9f5844c9e1c972938114
 EBUILD nmap-4.85_beta9.ebuild 1595 RMD160 916bc11bcecbae59347c05baf971667c76ffa9a9 SHA1 ec2fe9806feab20e2fc1b9e40cb208a9e1408b12 SHA256 fb2ff936aaa5fa24313bb5ae8b7314dc3c19c87438c139b552bdcab16cdb619c
 EBUILD nmap-4.90_rc1.ebuild 1570 RMD160 aa966c36cc0be41dba40476f68e2c4785e088b13 SHA1 0c2d6a43bbc205cf7b13ebcdbf0720261de557fe SHA256 0c53d7adb344878cb4b5b46534beac36ad9aeddec83cfc3c55a57f8f600dbd2b
 EBUILD nmap-5.00-r1.ebuild 1574 RMD160 d949ff8dbc21c0469b39c67bf85e2d3d0eae23c7 SHA1 6cfe19692d7c4287afef95ffec296dd62c63a64d SHA256 877c3d75bc48f65e1634b643b97c052153033f3d6eaf32baad81588e82e8b434
+EBUILD nmap-5.00-r2.ebuild 1498 RMD160 b85bfeeaa6dcf110ea75e7df5b01a61a1d5caf25 SHA1 55f815fb126ec55050c2e82c8b76fc3035713b05 SHA256 528445cee008d5d5ab6e961b5d2b8908d64e1a1b9875a2e7b616a01dba4dea1d
 EBUILD nmap-5.00.ebuild 1566 RMD160 25216ab94dabeede619569e4110c19710c9116dc SHA1 88f3725e6a4472fe5e7bea493067e4281af87e40 SHA256 879897c9f604e4895f50dc21c6b6a7570652bbb551bb4702379a855b625f3212
-MISC ChangeLog 24824 RMD160 4e68d4345d20ef959655e56ad471ce1060402665 SHA1 1bda4335627ed60a781b1998da3b93b7d9517268 SHA256 7cd76abdc7a188af6d602c8cd960b2f0a7c507fc83d0658380e85fbbbc96baf7
+MISC ChangeLog 25006 RMD160 9ec732673a1c0688a322e51d997fb9415bd4e8ae SHA1 76ee6b1f7989847b6f51b291b2f1ef7bb7ec7f31 SHA256 8d13e87bd75e4e07ec85d5ef791f8f4dbc5a2912ff1c51867735ef4b2a97457a
 MISC metadata.xml 544 RMD160 226b3ed159b0f6c3d6c00673a6e995ffaaff7d7b SHA1 0942f96090d475901c087ba43289b5c13cdc41bd SHA256 a105edf8864b83c1cd1fc32a8946ba25b0c05f13b92d94a426fe2319430908c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkq973MACgkQchej4aZK9/dO2gCeNwXY4u+pMDmUnW1XjKSTQbFF
-8+MAn3ZZ4nQbWZpCKi7EqqW263DWcbpx
-=DFQi
+iEYEARECAAYFAkq+jyIACgkQchej4aZK9/ejPQCcDEhj+tgD93DhQK/QtxFDhcZO
+ArsAnjjTrlQy4Cm1KOQfshKPCVHicqfL
+=F4zY
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nmap/nmap-5.00-r2.ebuild b/net-analyzer/nmap/nmap-5.00-r2.ebuild
new file mode 100644
index 000000000000..2161a9e5fb9d
--- /dev/null
+++ b/net-analyzer/nmap/nmap-5.00-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-5.00-r2.ebuild,v 1.1 2009/09/26 22:01:06 spock Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic
+
+MY_P=${P//_rc1/RC1}
+
+DESCRIPTION="A utility for network exploration or security auditing"
+HOMEPAGE="http://nmap.org/"
+SRC_URI="http://download.insecure.org/nmap/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"
+IUSE="gtk lua ssl"
+
+DEPEND="dev-libs/libpcre
+	net-libs/libpcap
+	gtk? ( >=x11-libs/gtk+-2.6
+		   >=dev-python/pygtk-2.6
+		   || ( >=dev-lang/python-2.5[sqlite]
+				>=dev-python/pysqlite-2 )
+		 )
+	lua? ( >=dev-lang/lua-5.1.4-r1[deprecated] )
+	ssl? ( dev-libs/openssl )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-4.75-include.patch"
+	epatch "${FILESDIR}/${PN}-4.75-nolua.patch"
+	sed -i -e 's/-m 755 -s ncat/-m 755 ncat/' ncat/Makefile.in
+}
+
+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 ssl openssl) || die
+}
+
+src_install() {
+	LC_ALL=C emake DESTDIR="${D}" -j1 STRIP=: nmapdatadir=/usr/share/nmap install || die
+	dodoc CHANGELOG HACKING docs/README docs/*.txt || die
+
+	use gtk && doicon "${FILESDIR}/nmap-logo-64.png"
+}