Update nmap to 2.50, based on pkg/10005 by Mipam <reinoud@ibbnet.org>.

Important changes since 2.12:
Remote OS identification by fingerprint, recognition of RPC programs
listening on the respective ports, scan timing controls, ACK/window
scanning, stop/restart scans, output readability improved, and lots of
bug fixes.

6 files changed, 58 insertions, 38 deletions

diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index b5b222bbb53..ca41c4b0c28 100644
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2000/01/28 14:36:37 agc Exp $
+# $NetBSD: Makefile,v 1.8 2000/04/29 17:32:19 wiz Exp $
 #
 
-DISTNAME=	nmap-2.12
-CATEGORIES=	net
+DISTNAME=	nmap-2.50
+CATEGORIES=	net security
 MASTER_SITES=	http://www.insecure.org/nmap/dist/
 EXTRACT_SUFX=	.tgz
 
diff --git a/net/nmap/files/md5 b/net/nmap/files/md5
index 21f4c5f88e4..0c5d5ba4c08 100644
--- a/net/nmap/files/md5
+++ b/net/nmap/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 1999/04/05 18:50:30 hubertf Exp $
+$NetBSD: md5,v 1.5 2000/04/29 17:32:19 wiz Exp $
 
-MD5 (nmap-2.12.tgz) = 197fc5fe2888febf47efe7d823e2f678
+MD5 (nmap-2.50.tgz) = 4fbc65b30bc117bfd0169121d741227a
diff --git a/net/nmap/files/patch-sum b/net/nmap/files/patch-sum
index 7a1b93adcfe..e2c34b93f67 100644
--- a/net/nmap/files/patch-sum
+++ b/net/nmap/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.2 1999/08/29 23:40:06 hubertf Exp $
+$NetBSD: patch-sum,v 1.3 2000/04/29 17:32:19 wiz Exp $
 
-MD5 (patch-aa) = b8c66124e77a15af902e3101411f216b
-MD5 (patch-ab) = 20fedbee00a73c2d6683ea1da36e4c6f
+MD5 (patch-aa) = 85d0013bebc7bb67d530f0e3ae04e777
+MD5 (patch-ab) = bb9ea9c7ed515429b5bde12f9823459c
diff --git a/net/nmap/patches/patch-aa b/net/nmap/patches/patch-aa
index 533b3df599a..cafd8c2c0ff 100644
--- a/net/nmap/patches/patch-aa
+++ b/net/nmap/patches/patch-aa
@@ -1,22 +1,31 @@
-$NetBSD: patch-aa,v 1.1 1999/04/04 16:36:40 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 2000/04/29 17:32:19 wiz Exp $
 
-Lame 1.3.3 install(1) doesn't understand -c and -d at the same time.
-Fix this (see PR 7318).
-
---- Makefile.in.orig	Wed Mar 31 11:07:26 1999
-+++ Makefile.in	Sun Apr  4 18:17:55 1999
-@@ -111,10 +111,10 @@
- 	$(INSTALL) -d $(mandir) 
- 	$(INSTALL) -d $(mandir)/man1
- 	$(INSTALL) -d $(libdir)
--	$(INSTALL) -m 755 $(TARGET) $(bindir)/$(TARGET)
--	$(INSTALL) -m 644 docs/$(TARGET).1 $(mandir)/man1/$(TARGET).1
--	$(INSTALL) -m 644 nmap-os-fingerprints  $(libdir)/nmap-os-fingerprints
--	$(INSTALL) -m 644 nmap-services  $(libdir)/nmap-services
-+	$(INSTALL) -c -m 755 $(TARGET) $(bindir)/$(TARGET)
-+	$(INSTALL) -c -m 644 docs/$(TARGET).1 $(mandir)/man1/$(TARGET).1
-+	$(INSTALL) -c -m 644 nmap-os-fingerprints  $(libdir)/nmap-os-fingerprints
-+	$(INSTALL) -c -m 644 nmap-services  $(libdir)/nmap-services
+--- Makefile.in.orig	Fri Apr 28 08:21:52 2000
++++ Makefile.in	Sat Apr 29 18:56:00 2000
+@@ -5,7 +5,7 @@
+ sbindir = @sbindir@
+ mandir = @mandir@
+ srcdir = @srcdir@
+-libdir = @libdir@/nmap
++libdir = @datadir@/nmap
+ deskdir = $(prefix)/share/gnome/apps/Utilities
+ 
+ CC = @CC@
+@@ -34,7 +34,7 @@
+ 
+ DEPS = nmap.h error.h targets.h osscan.h tcpip.h utils.h global_structures.h charpool.h services.h rpc.h portlist.h
+ 
+-all: $(TARGET) nmapfe/nmapfe
++all: $(TARGET)
+ 
+ $(TARGET): $(DEPS) @PCAP_DEPENDS@ $(OBJS)
+ 	@echo Compiling nmap
+@@ -128,7 +128,7 @@
+ 	$(MAKEDEPEND) $(INCLS) -s "# DO NOT DELETE" -- $(DEFS) -- $(SRCS)
  
- uninstall:
- 	rm -f $(bindir)/$(TARGET)
+ install: $(TARGET)
+-	$(SHTOOL) mkdir -f -p -m 755 $(bindir) $(mandir)/man1 $(libdir) $(deskdir)
++	$(SHTOOL) mkdir -f -p -m 755 $(bindir) $(mandir)/man1 $(libdir)
+ 	$(INSTALL) -c -m 755 nmap $(bindir)/nmap
+ 	@echo "If the next command failes -- you cannot use the X front end"
+ 	-test -f nmapfe/nmapfe && $(INSTALL) -c -m 755 nmapfe/nmapfe $(bindir)/nmapfe && $(SHTOOL) mkln -f -s $(bindir)/nmapfe $(bindir)/xnmap && $(INSTALL) -c -m 644 nmapfe.desktop $(deskdir)/nmapfe.desktop
diff --git a/net/nmap/patches/patch-ab b/net/nmap/patches/patch-ab
index 4fdf65341a8..17a63918fc5 100644
--- a/net/nmap/patches/patch-ab
+++ b/net/nmap/patches/patch-ab
@@ -1,12 +1,22 @@
-$NetBSD: patch-ab,v 1.2 2000/01/10 01:24:41 wiz Exp $
---- nmap-services.orig	Mon Aug 30 01:34:08 1999
-+++ nmap-services	Mon Aug 30 01:35:25 1999
-@@ -1706,7 +1706,7 @@
+$NetBSD: patch-ab,v 1.3 2000/04/29 17:32:19 wiz Exp $
+
+--- nmap-services.orig	Thu Apr 27 21:02:53 2000
++++ nmap-services	Sat Apr 29 18:11:57 2000
+@@ -1724,7 +1724,7 @@
  dls-monitor       2048/udp   # 
  nfs               2049/tcp   # networked file system
  nfs               2049/udp   # networked file system
--distrib-netassholes 2064/tcp # A bunch of retards working on some closed-source encryption cracking contest (www.distributed.net).  This is the keyblock proxy port
-+distrib-net       2064/tcp   # keyblock proxy port for distributed.net-clients
+-distrib-netassholes 2064/tcp # A group of lamers working on a silly closed-source client for solving the RSA cryptographic challenge.  This is the keyblock proxy port.
++distrib-net-kbproxy 2064/tcp # keyblock proxy port for distributed.net-clients
  dlsrpn            2065/tcp   # Data Link Switch Read Port Number
  dlsrpn            2065/udp   # Data Link Switch Read Port Number
  dlswpn            2067/tcp   # Data Link Switch Write Port Number
+@@ -1781,7 +1781,7 @@
+ deslogind         3006/tcp   # 
+ cfs               3049/tcp   # cryptographic file system (nfs) (proposed)
+ cfs               3049/udp   # cryptographic file system (nfs)
+-distrib-net-proxy 3064/tcp   # Stupid closed source distributed.net project proxy port
++distrib-net-proxy 3064/tcp   # distributed.net project proxy port
+ sj3               3086/tcp   # SJ3 (kanji input)
+ squid-http        3128/tcp   #
+ squid-ipc         3130/udp   #
diff --git a/net/nmap/pkg/PLIST b/net/nmap/pkg/PLIST
index f7cf0f49946..31daae02a88 100644
--- a/net/nmap/pkg/PLIST
+++ b/net/nmap/pkg/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 1999/02/10 02:16:59 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/04/29 17:32:20 wiz Exp $
 bin/nmap
-lib/nmap/nmap-os-fingerprints
-lib/nmap/nmap-services
-@dirrm lib/nmap
+share/nmap/nmap-os-fingerprints
+share/nmap/nmap-services
+share/nmap/nmap-rpc
+@dirrm share/nmap
 man/man1/nmap.1