head	1.15;
access;
symbols
	RELEASE_5_1_0:1.14
	RELEASE_4_8_0:1.13
	RELEASE_5_0_0:1.13
	RELEASE_4_7_0:1.13
	RELEASE_4_6_2:1.13
	RELEASE_4_6_1:1.13
	RELEASE_4_6_0:1.13
	RELEASE_5_0_DP1:1.13
	RELEASE_4_5_0:1.12
	RELEASE_4_4_0:1.12
	RELEASE_4_3_0:1.11
	RELEASE_4_2_0:1.10
	RELEASE_4_1_1:1.10
	RELEASE_4_1_0:1.10
	RELEASE_3_5_0:1.10
	nmap_2_30_beta17:1.8
	nmap_2_30_beta18:1.8
	RELEASE_4_0_0:1.7
	RELEASE_3_4_0:1.5
	RELEASE_3_3_0:1.5
	nmap_2_2_beta4:1.5
	RELEASE_3_2_0:1.4
	nmap_2_12:1.4
	nmap_2_08:1.4
	nmap_2_11:1.4
	RELEASE_3_1_0:1.4
	nmap_2_07:1.4
	nmap_2_06:1.4
	nmap_2_05:1.4
	nmap_2_03:1.3
	nmap_2_02:1.3
	nmap_2_01:1.3
	nmap_2_00:1.3
	RELEASE_2_2_8:1.2
	RELEASE_3_0_0:1.2
	nmap_1_51:1.2;
locks; strict;
comment	@# @;


1.15
date	2003.07.01.03.38.04;	author foxfair;	state dead;
branches;
next	1.14;

1.14
date	2003.04.11.10.00.50;	author sumikawa;	state Exp;
branches;
next	1.13;

1.13
date	2002.02.23.06.04.44;	author cjc;	state Exp;
branches;
next	1.12;

1.12
date	2001.05.28.01.01.19;	author obrien;	state Exp;
branches;
next	1.11;

1.11
date	2001.04.07.18.38.08;	author obrien;	state Exp;
branches;
next	1.10;

1.10
date	2000.05.05.01.51.06;	author obrien;	state Exp;
branches;
next	1.9;

1.9
date	2000.04.30.09.46.45;	author obrien;	state Exp;
branches;
next	1.8;

1.8
date	2000.03.27.01.23.45;	author obrien;	state Exp;
branches;
next	1.7;

1.7
date	2000.02.27.08.56.17;	author reg;	state Exp;
branches;
next	1.6;

1.6
date	2000.01.04.08.00.18;	author obrien;	state Exp;
branches;
next	1.5;

1.5
date	99.07.22.18.33.43;	author obrien;	state Exp;
branches;
next	1.4;

1.4
date	99.02.08.11.58.17;	author obrien;	state Exp;
branches;
next	1.3;

1.3
date	98.12.15.11.18.31;	author obrien;	state Exp;
branches;
next	1.2;

1.2
date	98.08.20.22.06.00;	author obrien;	state Exp;
branches;
next	1.1;

1.1
date	98.08.18.14.31.37;	author ache;	state Exp;
branches;
next	;


desc
@@


1.15
log
@PR:		53933
Submitted by:	maintainer
Reviewed by:
Approved by:
Obtained from:
MFC after:
1. Upgrade Nmap to 3.30, which released at Jun 29, 2003. Major enchancement is
   OS fingerprints update. The fingerprint DB now contains almost 1000
   fingerprints.

   See ChangeLog at this link:

	http://lists.insecure.org/lists/nmap-hackers/2003/Apr-Jun/0016.html

2. Renamed the patch files to be more descriptive.
@
text
@--- Makefile.in.orig	Fri Mar  9 22:25:19 2001
+++ Makefile.in	Sun May 27 17:49:17 2001
@@@@ -9,14 +9,14 @@@@
 mandir = @@mandir@@
 srcdir = @@srcdir@@
 nmapdatadir = @@datadir@@/nmap
-deskdir = $(prefix)/share/gnome/apps/Utilities
+deskdir = $(X11BASE)/share/gnome/apps/Utilities
 
 NBASEDIR=@@NBASEDIR@@
 CC = @@CC@@
 CXX = @@CXX@@
 CCOPT = 
 LIBPCAPDIR = @@libpcapdir@@
-INCLS = -I$(LIBPCAPDIR) 
+#INCLS = -I$(LIBPCAPDIR) 
 DEFS = @@DEFS@@ -DNMAP_VERSION=\"$(NMAP_VERSION)\" -DNMAP_NAME=\"$(NMAP_NAME)\" -DNMAP_URL=\"$(NMAP_URL)\" -DNMAP_PLATFORM=\"$(NMAP_PLATFORM)\" -DNMAPDATADIR=\"$(nmapdatadir)\"
 # For mtrace debugging -- see MTRACE define in main.cc for instructions
 # Should only be enabled during debugging and not in any real release.
@@@@ -200,7 +200,7 @@@@
 	$(MAKEDEPEND) $(INCLS) -s "# DO NOT DELETE" -- $(DEFS) -- $(SRCS)
 
 install-nmap: $(TARGET)
-	$(SHTOOL) mkdir -f -p -m 755 $(bindir) $(mandir)/man1 $(nmapdatadir) $(deskdir)
+	$(SHTOOL) mkdir -f -p -m 755 $(bindir) $(mandir)/man1 $(nmapdatadir)
 	$(INSTALL) -c -m 755 nmap $(bindir)/nmap
 	$(INSTALL) -c -m 644 docs/$(TARGET).1 $(mandir)/man1/$(TARGET).1
 	$(INSTALL) -c -m 644 nmap-os-fingerprints  $(nmapdatadir)/nmap-os-fingerprints
@


1.14
log
@Upgrade to 3.20

PR:		ports/49987
Submitted by:	Dominic Marks <dom@@cus.org.uk>
		marius@@alchemy.franken.de
@
text
@@


1.13
log
@Do not try to install any parts of nmapfe from the nmap port. There is
a separate port for nmapfe. Even though the attempt in the nmap port
mostly fails since no nmapfe executable would have been built, files
not appearing in the pkg-plist were being added to the system.

PR:		ports/35207
Approved by:	obrien
@
text
@d3 10
a12 1
@@@@ -16,5 +16,5 @@@@
d18 3
a20 2
 CFLAGS = -g @@CFLAGS@@ $(CCOPT) $(DEFS) $(INCLS)
@@@@ -171,9 +171,12 @@@@
d23 1
a23 1
-install: $(TARGET)
a24 7
-	$(INSTALL) -c -m 755 nmap $(bindir)/nmap
+install-nmapfe:
 	@@echo "If the next command fails -- you cannot use the X front end"
+	$(SHTOOL) mkdir -f -p -m 755 $(deskdir)
 	-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 && $(INSTALL) -c -m 644 docs/nmapfe.1 $(mandir)/man1/nmapfe.1 && $(INSTALL) -c -m 644 docs/xnmap.1 $(mandir)/man1/xnmap.1
+
+install: $(TARGET)
d26 1
a26 1
+	$(INSTALL) -c -m 755 nmap $(bindir)/nmap
@


1.12
log
@More changes needed to allow a slave port.
@
text
@d10 1
a10 1
@@@@ -171,9 +171,13 @@@@
a23 1
+	-$(MAKE) install-nmapfe
@


1.11
log
@While the previous patch worked, this is a fresh one generated from
this version's sources.
@
text
@d2 3
a4 2
+++ Makefile.in	Sat Apr  7 11:28:49 2001
@@@@ -17,3 +17,3 @@@@
d9 5
a13 2
@@@@ -173,3 +173,3 @@@@
 install: $(TARGET)
d15 7
d23 4
a26 1
 	$(INSTALL) -c -m 755 nmap $(bindir)/nmap
@


1.10
log
@Update to version 2.52.
[fixes minor typos in 2.51]
@
text
@d1 9
a9 9
--- Makefile.in.orig	Mon May  1 19:17:38 2000
+++ Makefile.in	Thu May  4 16:42:44 2000
@@@@ -16 +16 @@@@
-INCLS = -I. -I$(LIBPCAPDIR)
+INCLS = -I. # -I$(LIBPCAPDIR)
@@@@ -41 +41 @@@@
-$(TARGET): $(DEPS) @@PCAP_DEPENDS@@ $(OBJS)
+$(TARGET): $(DEPS) $(OBJS)
@@@@ -144 +144 @@@@
d12 1
@


1.9
log
@Update to 2.51.
2.51 fixes a target parsing bug which could in some cases cause Nmap to
crash with the error "Assertion `t->nleft > 1' failed".
@
text
@d1 3
a3 6
--- Makefile.in.orig	Sat Apr 29 13:37:50 2000
+++ Makefile.in	Sun Apr 30 01:38:54 2000
@@@@ -11,7 +11,7 @@@@
 CC = @@CC@@
 CCOPT = 
 LIBPCAPDIR = @@libpcapdir@@
d6 1
a6 7
 DEFS = @@DEFS@@ -DVERSION=\"$(VERSION)\" -DNMAPDATADIR=\"$(nmapdatadir)\"
 CFLAGS = @@CFLAGS@@ $(CCOPT) $(DEFS) $(INCLS)
 # CFLAGS = -g -Wall $(DEFS) $(INCLS)
@@@@ -36,7 +36,7 @@@@
 
 all: $(TARGET) nmapfe/nmapfe
 
d9 1
a9 7
 	@@echo Compiling nmap
 	rm -f $@@
 	$(CC) $(LDFLAGS) -o $@@ $(OBJS) $(LIBS)
@@@@ -129,7 +129,7 @@@@
 	$(MAKEDEPEND) $(INCLS) -s "# DO NOT DELETE" -- $(DEFS) -- $(SRCS)
 
 install: $(TARGET)
a11 3
 	$(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
@


1.8
log
@Update to version 2.3 beta 17.

* Added ACK scanning.  This scan technique is great for testing firewall
  rulesets.  It can NOT find open ports, but it can distinguish between
  filtered/unfilterd by sending an ACK packet to each port and waiting for
  a RST to come back.  Filtered ports will not send back a RST (or will
  send ICMP unreachables).  This scan type is activated with -sA .

* Documented the Window scan (-sW)

* "Protocol" field in output eliminated.  It is now printed right
   next to the number (/etc/services style).  Like "22/tcp".

* Added --resume option to continue a large network scan where you left off.
  It also allows you to start and stop for policy reasons
@
text
@d1 3
a3 10
--- Makefile.in.orig	Sun Mar 26 03:04:48 2000
+++ Makefile.in	Sun Mar 26 17:16:58 2000
@@@@ -5,13 +5,13 @@@@
 sbindir = @@sbindir@@
 mandir = @@mandir@@
 srcdir = @@srcdir@@
-libdir = @@libdir@@/nmap
+libdir = @@libdir@@
 deskdir = $(prefix)/share/gnome/apps/Utilities
 
d9 1
a9 1
 DEFS = @@DEFS@@ -DVERSION=\"$(VERSION)\" -DLIBDIR=\"$(libdir)\"
d21 1
a21 1
@@@@ -128,7 +128,7 @@@@
d25 2
a26 2
-	$(SHTOOL) mkdir -f -p -m 755 $(bindir) $(mandir)/man1 $(libdir) $(deskdir)
+	$(SHTOOL) mkdir -f -p -m 755 $(bindir) $(mandir)/man1 $(libdir)
@


1.7
log
@PLIST related fixes.
@
text
@d1 2
a2 2
--- Makefile.in.orig	Fri Dec 31 03:13:50 1999
+++ Makefile.in	Mon Jan  3 23:54:14 2000
d21 1
a21 1
 all: $(TARGET)
d23 2
a24 2
-$(TARGET): $(DEPS) @@PCAP_DEPENDS@@ $(OBJS) nmapfe/nmapfe
+$(TARGET): $(DEPS) $(OBJS) nmapfe/nmapfe # @@PCAP_DEPENDS@@
d31 1
a31 1
 install: all
@


1.6
log
@Upgrade to version 2.3BETA12.

Submitted by:	taguchi@@tohoku.iij.ad.jp
@
text
@d28 9
@


1.5
log
@Upgrade to nmap-2.2-BETA4.  The beta includes a very nice GUI (xnmap) that
simplifies the running of nmap for the point and shoot crowd.
@
text
@d1 3
a3 3
--- Makefile.in.orig	Fri May  7 04:20:11 1999
+++ Makefile.in	Thu Jul 22 10:45:28 1999
@@@@ -5,12 +5,12 @@@@
d9 1
d19 1
a19 1
@@@@ -33,7 +33,7 @@@@
@


1.4
log
@upgrade to 2.05
@
text
@d1 2
a2 2
--- Makefile.in.orig	Sun Feb  7 12:23:10 1999
+++ Makefile.in	Mon Feb  8 03:18:01 1999
d18 1
a18 1
@@@@ -32,7 +32,7 @@@@
d22 2
a23 2
-$(TARGET): $(DEPS) @@PCAP_DEPENDS@@ $(OBJS)
+$(TARGET): $(DEPS) $(OBJS) # @@PCAP_DEPENDS@@
@


1.3
log
@Upgrade to 2.00.
@
text
@d1 9
a9 3
--- Makefile.in.orig	Wed Oct  7 19:59:00 1998
+++ Makefile.in	Thu Oct  8 03:57:23 1998
@@@@ -10,4 +10,4 @@@@
d15 4
a18 1
@@@@ -30,7 +30,7 @@@@
@


1.2
log
@* Nuke included libpcap so I don't make the mistake ache fixed again.
* Prefer -u diffs over -c
@
text
@d1 3
a3 3
--- Makefile.in.orig	Mon May 25 06:11:27 1998
+++ Makefile.in	Thu Aug 20 15:04:19 1998
@@@@ -9,7 +9,7 @@@@
d8 10
a17 4
+INCLS = -I.
 DEFS = @@DEFS@@
 CFLAGS = @@CFLAGS@@ $(CCOPT) $(DEFS) $(INCLS)
 LDFLAGS = @@LDFLAGS@@
@


1.1
log
@Old version use bpf.h from internal libpcap and link with
system libpcap in the same time. Fix to use <net/bpf.h> instead

New manpages scheme
@
text
@d1 11
a11 19
*** Makefile.in.bak	Mon May 25 17:11:27 1998
--- Makefile.in	Tue Aug 18 10:18:42 1998
***************
*** 9,15 ****
  CC = @@CC@@
  CCOPT = 
  LIBPCAPDIR = @@libpcapdir@@
! INCLS = -I. -I$(LIBPCAPDIR)
  DEFS = @@DEFS@@
  CFLAGS = @@CFLAGS@@ $(CCOPT) $(DEFS) $(INCLS)
  LDFLAGS = @@LDFLAGS@@
--- 9,15 ----
  CC = @@CC@@
  CCOPT = 
  LIBPCAPDIR = @@libpcapdir@@
! INCLS = -I.
  DEFS = @@DEFS@@
  CFLAGS = @@CFLAGS@@ $(CCOPT) $(DEFS) $(INCLS)
  LDFLAGS = @@LDFLAGS@@
@
