- strip nmap binary on installation

- make nmap use the systems libpcap
- make nmap work with datalink types of DLT_LOOP and DLT_ENC
This commit is contained in:
brad 1999-07-27 04:05:48 +00:00
parent cc22b33740
commit 1836c45648
3 changed files with 51 additions and 1 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.6 1999/06/18 00:17:47 brad Exp $
# $OpenBSD: Makefile,v 1.7 1999/07/27 04:05:48 brad Exp $
DISTNAME= nmap-2.12
CATEGORIES= net
@ -10,4 +10,10 @@ MAINTAINER= angelos@openbsd.org
GNU_CONFIGURE= yes
post-extract:
@${RM} -rf ${WRKSRC}/libpcap*
post-install:
@strip ${PREFIX}/bin/nmap
.include <bsd.port.mk>

26
net/nmap/patches/patch-aa Normal file
View File

@ -0,0 +1,26 @@
--- Makefile.in.orig Mon Jul 26 22:28:22 1999
+++ Makefile.in Mon Jul 26 22:29:17 1999
@@ -5,12 +5,12 @@
sbindir = @sbindir@
mandir = @mandir@
srcdir = @srcdir@
-libdir = @libdir@/nmap
+libdir = @libdir@
CC = @CC@
CCOPT =
LIBPCAPDIR = @libpcapdir@
-INCLS = -I. -I$(LIBPCAPDIR)
+INCLS = -I. # -I$(LIBPCAPDIR)
DEFS = @DEFS@ -DVERSION=\"$(VERSION)\" -DLIBDIR=\"$(libdir)\"
CFLAGS = @CFLAGS@ $(CCOPT) $(DEFS) $(INCLS)
# CFLAGS = -g -Wall $(DEFS) $(INCLS)
@@ -32,7 +32,7 @@
all: $(TARGET)
-$(TARGET): $(DEPS) @PCAP_DEPENDS@ $(OBJS)
+$(TARGET): $(DEPS) $(OBJS) # @PCAP_DEPENDS@
@echo Compiling nmap
rm -f $@
$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)

18
net/nmap/patches/patch-ab Normal file
View File

@ -0,0 +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 @@
#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);
}
}