From aa3de66963b8e145fb4e77993dafc95635403a0b Mon Sep 17 00:00:00 2001
From: brad <brad@openbsd.org>
Date: Wed, 1 Sep 1999 18:19:03 +0000
Subject: [PATCH] upgrade to nmap 2.3b4

---
 net/nmap/Makefile         |  6 +++---
 net/nmap/files/md5        |  6 +++---
 net/nmap/patches/patch-aa | 12 ++++++------
 net/nmap/patches/patch-ab | 34 +++++++++++++++++-----------------
 4 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index 0ab82524e55..7caa739caaf 100644
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.8 1999/08/02 06:26:26 brad Exp $
+# $OpenBSD: Makefile,v 1.9 1999/09/01 18:19:03 brad Exp $
 
-DISTNAME=	nmap-2.2-BETA4
-PKGNAME=	nmap-2.2b4
+DISTNAME=	nmap-2.3BETA4
+PKGNAME=	nmap-2.3b4
 CATEGORIES=     net
 MASTER_SITES=	http://www.insecure.org/nmap/dist/ \
 		ftp://relay.nuxi.com/pub/misc/
diff --git a/net/nmap/files/md5 b/net/nmap/files/md5
index 046cfd62992..963735e451a 100644
--- a/net/nmap/files/md5
+++ b/net/nmap/files/md5
@@ -1,3 +1,3 @@
-MD5 (nmap-2.2-BETA4.tgz) = 23c3e6c7f4969338b79c8e6fa6c2ddbd
-RMD160 (nmap-2.2-BETA4.tgz) = bba005274fc640b9f6fc028761cefffe2f43e728
-SHA1 (nmap-2.2-BETA4.tgz) = b8783b65a52d0cf6df5c900263c025c68540b909
+MD5 (nmap-2.3BETA4.tgz) = d855cbff440f3cc8bfc51551a5f2cd0c
+RMD160 (nmap-2.3BETA4.tgz) = ff232060b1fc1790c4acdb16bc490691e6f138b1
+SHA1 (nmap-2.3BETA4.tgz) = 2c5e13d3b356f7e79b43a656866cc9640fc7ea7f
diff --git a/net/nmap/patches/patch-aa b/net/nmap/patches/patch-aa
index a4b60416a8f..d17d773c1da 100644
--- a/net/nmap/patches/patch-aa
+++ b/net/nmap/patches/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Fri May  7 07:20:11 1999
-+++ Makefile.in	Mon Aug  2 02:11:51 1999
+--- Makefile.in.orig	Mon Aug 30 04:03:42 1999
++++ Makefile.in	Wed Sep  1 12:10:19 1999
 @@ -10,7 +10,7 @@
  CC = @CC@
  CCOPT = 
@@ -7,9 +7,9 @@
 -INCLS = -I. -I$(LIBPCAPDIR)
 +INCLS = -I. # -I$(LIBPCAPDIR)
  DEFS = @DEFS@ -DVERSION=\"$(VERSION)\" -DLIBDIR=\"$(libdir)\"
- CFLAGS = @CFLAGS@ $(CCOPT) $(DEFS) $(INCLS)
- # CFLAGS = -g -Wall $(DEFS) $(INCLS)
-@@ -33,7 +33,7 @@
+ # CFLAGS = @CFLAGS@ $(CCOPT) $(DEFS) $(INCLS)
+ CFLAGS = -g -Wall $(DEFS) $(INCLS)
+@@ -35,7 +35,7 @@
  
  all: $(TARGET)
  
@@ -18,7 +18,7 @@
  	@echo Compiling nmap
  	rm -f $@
  	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-@@ -124,8 +124,8 @@
+@@ -128,8 +128,8 @@
  install: all
  	$(SHTOOL) mkdir -f -p -m 755 $(bindir) $(mandir)/man1 $(libdir)
  	$(INSTALL) -c -m 755 nmap $(bindir)/nmap
diff --git a/net/nmap/patches/patch-ab b/net/nmap/patches/patch-ab
index 16d97de40bf..f014b738e18 100644
--- a/net/nmap/patches/patch-ab
+++ b/net/nmap/patches/patch-ab
@@ -1,18 +1,18 @@
---- tcpip.c.orig	Mon Jul 26 23:42:08 1999
-+++ tcpip.c	Mon Jul 26 23:44:55 1999
-@@ -774,6 +774,7 @@
-   switch(datalink) {
-   case DLT_EN10MB: offset = 14; break;
-   case DLT_IEEE802: offset = 22; break;
-+  case DLT_LOOP:
-   case DLT_NULL: offset = 4; break;
-   case DLT_SLIP:
- #if (FREEBSD || OPENBSD || NETBSD || BSDI)
-@@ -794,6 +795,7 @@
+--- tcpip.c.orig	Tue Aug  3 00:29:31 1999
++++ tcpip.c	Wed Sep  1 12:12:30 1999
+@@ -773,6 +773,7 @@
+  switch(datalink) {
+  case DLT_EN10MB: offset = 14; break;
+  case DLT_IEEE802: offset = 22; break;
++ case DLT_LOOP:
+  case DLT_NULL: offset = 4; break;
+  case DLT_SLIP:
+ #ifdef DLT_SLIP_BSDOS
+@@ -799,6 +800,7 @@
  #endif /* if freebsd || openbsd || netbsd || bsdi */
-     break;
-   case DLT_RAW: offset = 0; break;
-+  case DLT_ENC: offset = 12; break;
-   default: fatal("Unknown datalink type (%d)", datalink);
-   }
- }
+    break;
+  case DLT_RAW: offset = 0; break;
++ case DLT_ENC: offset = 12; break;
+  default: fatal("Unknown datalink type (%d)", datalink);
+  }
+