[69538] trunk/dports/net/nmap

[dluke at macports.org]

Revision: 69538
          http://trac.macports.org/changeset/69538
Author:   dluke at macports.org
Date:     2010-07-09 06:53:04 -0700 (Fri, 09 Jul 2010)
Log Message:
-----------
Add patches for openssl 1.0.0a compat (thanks jmr) fixes #25593

Modified Paths:
--------------
    trunk/dports/net/nmap/Portfile

Added Paths:
-----------
    trunk/dports/net/nmap/files/
    trunk/dports/net/nmap/files/nse_openssl.cc.diff

Modified: trunk/dports/net/nmap/Portfile
===================================================================
--- trunk/dports/net/nmap/Portfile	2010-07-09 11:13:39 UTC (rev 69537)
+++ trunk/dports/net/nmap/Portfile	2010-07-09 13:53:04 UTC (rev 69538)
@@ -37,6 +37,9 @@
 
 use_bzip2	yes
 
+# remove use of md2, which is no longer provided by openssl 
+patchfiles  nse_openssl.cc.diff
+
 configure.args	--without-zenmap --without-ndiff \
 		--mandir=\\\${prefix}/share/man \
 		--infodir=\\\${prefix}/share/info \

Added: trunk/dports/net/nmap/files/nse_openssl.cc.diff
===================================================================
--- trunk/dports/net/nmap/files/nse_openssl.cc.diff	                        (rev 0)
+++ trunk/dports/net/nmap/files/nse_openssl.cc.diff	2010-07-09 13:53:04 UTC (rev 69538)
@@ -0,0 +1,35 @@
+--- nse_openssl.cc.orig	2009-03-10 16:56:10.000000000 +1100
++++ nse_openssl.cc	2010-07-09 07:36:47.000000000 +1000
+@@ -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 @@ static int l_rand_pseudo_bytes( lua_Stat
+   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 @@ static const struct luaL_reg openssllib[
+   { "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 },
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100709/21163b16/attachment.html>