From ead0e28fa879eebd7d16e14ce1201857514d41f2 Mon Sep 17 00:00:00 2001
From: pettai <pettai>
Date: Sun, 5 Jun 2011 23:10:12 +0000
Subject: Fixes PR pkg/44996

---
 net/nmap/Makefile         |  5 +++--
 net/nmap/distinfo         |  3 ++-
 net/nmap/patches/patch-am | 16 ++++++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 net/nmap/patches/patch-am

(limited to 'net/nmap')

diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index 662f7c3a387..f4616f984fb 100644
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.80 2011/04/22 14:40:44 obache Exp $
+# $NetBSD: Makefile,v 1.81 2011/06/05 23:10:12 pettai Exp $
 #
 
 DISTNAME=	nmap-5.51
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net security
 MASTER_SITES=	http://nmap.org/dist/
 EXTRACT_SUFX=	.tar.bz2
@@ -17,6 +17,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 BUILDLINK_API_DEPENDS.libpcap=	libpcap>=1.0.0
 BUILDLINK_API_DEPENDS.libpcre=	libpcre>=7.6
+BUILDLINK_API_DEPENDS.openssl=  openssl>=0.9.8
 
 GNU_CONFIGURE=		yes
 
diff --git a/net/nmap/distinfo b/net/nmap/distinfo
index 47df0a1971a..0f0b03ad164 100644
--- a/net/nmap/distinfo
+++ b/net/nmap/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.49 2011/02/16 21:52:01 pettai Exp $
+$NetBSD: distinfo,v 1.50 2011/06/05 23:10:12 pettai Exp $
 
 SHA1 (nmap-5.51.tar.bz2) = 3415ad9a3915d7e162c9e91435cc35d9c73ac7f6
 RMD160 (nmap-5.51.tar.bz2) = d5ac8b245234e122936b40c80927a3c4afba53bd
@@ -6,3 +6,4 @@ Size (nmap-5.51.tar.bz2) = 16869068 bytes
 SHA1 (patch-ab) = b709689e4bda3bc928ba120678f24a2e2321f612
 SHA1 (patch-ac) = c22e8f6411b1152a6e7582c90e5ec5bd4c6acaad
 SHA1 (patch-al) = c56396c28d96314c8d7e8b19a92bd5db7959e289
+SHA1 (patch-am) = 8d9515d1247ab5ad5855f7f7065e90cde5fb2b9f
diff --git a/net/nmap/patches/patch-am b/net/nmap/patches/patch-am
new file mode 100644
index 00000000000..e1bc1b1d968
--- /dev/null
+++ b/net/nmap/patches/patch-am
@@ -0,0 +1,16 @@
+$NetBSD: patch-am,v 1.1 2011/06/05 23:10:12 pettai Exp $
+
+From http://seclists.org/nmap-dev/2011/q2/221
+
+--- TargetGroup.cc.orig	2011-04-15 10:53:27.000000000 -0500
++++ TargetGroup.cc	2011-04-15 10:38:27.000000000 -0500
+@@ -220,7 +220,8 @@
+           resolvedaddrs.push_back(ss);
+         }
+       }
+-      freeaddrinfo(addrs);
++      if (addrs)
++        freeaddrinfo(addrs);
+ 
+       if (resolvedaddrs.empty()) {
+         error("Failed to resolve given hostname/IP: %s.  Note that you can't use '/mask' AND '1-4,7,100-' style IP ranges", target_net);
-- 
cgit v1.2.3