Fix building with OpenSSL >= 1.0.0 wrt #326531 by Daniel Black. Revision bump because md2 is dropped.

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

4 files changed, 108 insertions, 22 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index fc08074122b4..8f7234ac201e 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nmap
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.229 2010/05/26 16:41:20 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.230 2010/07/11 03:32:10 ssuominen Exp $
+
+*nmap-5.21-r1 (11 Jul 2010)
+
+  11 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> +nmap-5.21-r1.ebuild,
+  +files/nmap-5.21-openssl-1.patch:
+  Fix building with OpenSSL >= 1.0.0 wrt #326531 by Daniel Black. Revision bump because md2 is dropped.
 
   26 May 2010; Jonathan Callen <abcd@gentoo.org> nmap-5.21.ebuild:
   Bump to EAPI=3, add prefix keywords
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 52c5f45e5b9f..701390d75d36 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,32 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX nmap-4.75-include.patch 476 RMD160 5ac50ccc48dbbc1c654558c97c0b6c5f777cc843 SHA1 10ec6eb55e60175417c37785f274d3872ccd22bf SHA256 ec9453954d1b84e77c1489c8a25d629ba300084c7020ed8b6045c0e839cdcdca
 AUX nmap-4.75-nolua.patch 364 RMD160 90ec068c5a267dd43737fb39828b3c9c372e19b1 SHA1 aab37cdb0a19891fd55038b05d1ab843d1fcf255 SHA256 52434a5d0e8b82fe325e1066c3851a2e862fc58c3a3d02f8463e7dcf1d603619
 AUX nmap-5.00-python.patch 1205 RMD160 22120c7719c8bb4f2ef77c50f35fea15e03e5b89 SHA1 32b42042a27e5ea131aa145c9239fb9e8a070ed1 SHA256 0fe36a2e95a2f6c01967191fe68aac87b7f66f9185846f79de15728608d09f8e
 AUX nmap-5.10_beta1-string.patch 252 RMD160 58dc7f4dfb660519a51af2f5619eca144cfd6480 SHA1 b080ef5618b3666bf85f011ce6edc969d8a2132d SHA256 6012685deb53985c73fa038d27b2f1472344fd6641c40103143fa15676454506
 AUX nmap-5.20-nolua.patch 1237 RMD160 b670ecd0630d0f13f8f5a46cc8ffb84b86374c3d SHA1 e64d645b6b4e3a73482945632eba7aa7f6730d4a SHA256 ce215ce6666e4518121d6a5996c7e7a29037fc77b2d43d0ffbf77d9d7c00e985
+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-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
+EBUILD nmap-5.21-r1.ebuild 1793 RMD160 0d40ab07f5c784647b138518f0103c5b6560b997 SHA1 a316de5759de759e53c4d6b0f84a7191b75cba1f SHA256 d3e5312f8247c2eb01fc20f447662060afe5107b09bebdc114402400d53485c7
 EBUILD nmap-5.21.ebuild 1726 RMD160 cb0695755809ad31020ba4a7eaad72d19964272d SHA1 20594b1e33f47f2f4a4d870eaddc896223b6f8fb SHA256 ae68ea5e1af2b33ad4eeab5ad9d41d8b977af634bcd54a5dd1ac6d79769b5e68
-MISC ChangeLog 28069 RMD160 f7910a356fdc0b395100686c78529e6f5656943a SHA1 39a192815c67f7d44d130d9fbb18b19d9c9def14 SHA256 841ca60cb8e4659a5ed23fa1393003e8cac095381f6d794ea341900921bf716b
+MISC ChangeLog 28320 RMD160 ace16b7c0ecb5b9aba768f2d239a6a810292dc45 SHA1 bd471a3b88ab975cb4f3cebe970491df7dde5d08 SHA256 a7279e68b9e9ebab9c72475522bd6f0b7dbb238132b45ebe5f838fc307382482
 MISC metadata.xml 220 RMD160 e546581ce5539acad3af6c34d9aa3cf620d7f3a8 SHA1 6a6d5d3526e99d62e789655226cdda4b343a913f SHA256 acc28d2b0a26781492524b195565470457168bd704c817430d76770844b5d42a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iQIcBAEBCAAGBQJL/U82AAoJELHSF2kinlg4pfQP/iYUx61VnfBMs3nAbqO3d73l
-hOj0ncGLJS7kVFY6whmkxGBDH/qJ2c01JSC15MwHq1q9hVaWh/wdvJ30Sr5ABisL
-fJ0T9KPO9jYTkNQwD5wsr3yquN4fK/FPb1JyuFtjEg6bRoVZMOmVJfW2ohd2UFuS
-mXN+ku69p7s750UsfORu61rWSCAFZ5fcH/7/qfEgEv2gLnkoNX6PZipbmhJdF53L
-Hav9JsovUxIuXx11DAJRo85G+aocYCP2AVwKZILXREIRMdXdg//v7JN9/2/CyUTr
-kYUyhtoP/weyKhiIEGvYL1rBnrmB1Wa0Mco0ji6T9vLB0IYsrZBJczm5bZ0onIZO
-awNPg1UGCZ3w+HUsKOqO6yOZVihQf0u6Y9JaYXubN/4fgYGAxljmmWzJLN0LVoMc
-z1d6jz5Hs2anyVi3w8blWmFoUgSQDgWuyk+emMIvYKXBg5q6uWW4qJ5T0RJAFIIV
-MGcs+xBHRuBFzhSjaWlkQhUMqVRjVnPo+ECtPWuI0bXalnCpMGw7XSgOgV0g1NjX
-m1U89Hrflt2zxMkYjFxtxEcEjJhKL/rCGqUe/ZxQCbNYAh0LdxDRefT3PfeQjuGI
-MrqtG+j1gb1PNkTNtadTZyLgoYwI/XDe/YeTQoDJ+clN4qghnvo06/N0WSDvYTZ6
-yYVHk4pUBSlICOgq8UDj
-=7LMx
------END PGP SIGNATURE-----
diff --git a/net-analyzer/nmap/files/nmap-5.21-openssl-1.patch b/net-analyzer/nmap/files/nmap-5.21-openssl-1.patch
new file mode 100644
index 000000000000..b22fd38d8a81
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-5.21-openssl-1.patch
@@ -0,0 +1,38 @@
+http://bugs.gentoo.org/326531
+http://trac.macports.org/ticket/25593
+
+--- nse_openssl.cc
++++ nse_openssl.cc
+@@ -8,7 +8,6 @@
+ #include <openssl/crypto.h>
+ #include <openssl/bn.h>
+ #include <openssl/rand.h>
+-#include <openssl/md2.h>
+ #include <openssl/md4.h>
+ #include <openssl/md5.h>
+ #include <openssl/sha.h>
+@@ -206,16 +205,6 @@
+   return 1;
+ }
+ 
+-static int l_md2(lua_State *L)     /** md2(string s) */
+-{
+-  size_t len;
+-  const unsigned char *s = (unsigned char *) luaL_checklstring( L, 1, &len );
+-  unsigned char digest[16];
+- 
+-  lua_pushlstring( L, (char *) MD2( s, len, digest ), 16 );
+-  return 1;
+-}
+-
+ static int l_md4(lua_State *L)     /** md4(string s) */
+ {
+   size_t len;
+@@ -469,7 +458,6 @@
+   { "bignum_mod_exp", l_bignum_mod_exp },
+   { "rand_bytes", l_rand_bytes },
+   { "rand_pseudo_bytes", l_rand_pseudo_bytes },
+-  { "md2", l_md2 },
+   { "md4", l_md4 },
+   { "md5", l_md5 },
+   { "sha1", l_sha1 },
diff --git a/net-analyzer/nmap/nmap-5.21-r1.ebuild b/net-analyzer/nmap/nmap-5.21-r1.ebuild
new file mode 100644
index 000000000000..d8f2f3202f1d
--- /dev/null
+++ b/net-analyzer/nmap/nmap-5.21-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-5.21-r1.ebuild,v 1.1 2010/07/11 03:32:10 ssuominen Exp $
+
+EAPI="3"
+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 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}"
+
+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.21-openssl-1.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)
+}
+
+src_install() {
+	LC_ALL=C emake DESTDIR="${D}" -j1 STRIP=: nmapdatadir="${EPREFIX}"/usr/share/nmap install || die
+	dodoc CHANGELOG HACKING docs/README docs/*.txt || die
+
+	use gtk && doicon "${FILESDIR}/nmap-logo-64.png"
+}