From e74fa876ace14ee32a6db74c4ee89f550376aaa8 Mon Sep 17 00:00:00 2001 From: Munechika SUMIKAWA Date: Fri, 11 Apr 2003 10:00:50 +0000 Subject: Upgrade to 3.20 PR: ports/49987 Submitted by: Dominic Marks marius@alchemy.franken.de --- security/nmap/Makefile | 22 +++++--- security/nmap/distinfo | 2 +- security/nmap/files/nmap.1 | 87 ------------------------------- security/nmap/files/patch-aa | 27 +++++----- security/nmap/files/patch-nbase::getopt.h | 14 +++++ security/nmap/files/patch-nmap.h | 18 +++++++ 6 files changed, 63 insertions(+), 107 deletions(-) delete mode 100644 security/nmap/files/nmap.1 create mode 100644 security/nmap/files/patch-nbase::getopt.h create mode 100644 security/nmap/files/patch-nmap.h (limited to 'security') diff --git a/security/nmap/Makefile b/security/nmap/Makefile index 6c8d2708c4f8..55c9c23e94a5 100644 --- a/security/nmap/Makefile +++ b/security/nmap/Makefile @@ -7,23 +7,31 @@ # PORTNAME?= nmap -PORTVERSION= 3.00 -CATEGORIES= security -MASTER_SITES= http://download.insecure.org/nmap/dist/ \ - http://www.mobis.com/ajax/projects/ +PORTVERSION= 3.20 +CATEGORIES= security ipv6 +MASTER_SITES= http://download.insecure.org/nmap/dist/ DISTNAME= nmap-${PORTVERSION:S/.b/BETA/} -EXTRACT_SUFX= .tgz MAINTAINER= d.marks@student.umist.ac.uk COMMENT?= Port scanning utility for large networks +GNU_CONFIGURE= yes +USE_BZIP2= yes + +MAN1?= nmap.1 + .include -GNU_CONFIGURE= yes .if ${OSVERSION} < 300004 CFLAGS+= -DDLT_RAW=12 # for obsoleted .endif -MAN1?= nmap.1 + +CONFIGURE_TARGET= -build=${ARCH}-portbld-freebsd${OSREL} +.if ${PORTNAME} == "nmap" +CONFIGURE_ARGS+= --without-nmapfe +.endif +ALL_TARGET?= nmap +INSTALL_TARGET?= install-nmap .if !target(post-install) && (${PORTNAME} == "nmap") post-install: diff --git a/security/nmap/distinfo b/security/nmap/distinfo index 9e643c074b73..a1cb6c6d014d 100644 --- a/security/nmap/distinfo +++ b/security/nmap/distinfo @@ -1 +1 @@ -MD5 (nmap-3.00.tgz) = 2b648bc66f1cedbeed230ef56f6549a8 +MD5 (nmap-3.20.tar.bz2) = 00f42f5477cc2499f5f68479702dd224 diff --git a/security/nmap/files/nmap.1 b/security/nmap/files/nmap.1 deleted file mode 100644 index b80aaa89fe46..000000000000 --- a/security/nmap/files/nmap.1 +++ /dev/null @@ -1,87 +0,0 @@ -.\" -.\" Copyright (c) 1998 David E. O'Brien -.\" -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY EXPRESS OR -.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -.\" IN NO EVENT SHALL THE DEVELOPERS BE LIABLE FOR ANY DIRECT, INDIRECT, -.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -.\" -.\" $FreeBSD$ -.\" -.\" .TH NMAP 1L local -.Dd August 4, 1998 -.Dt NMAP 1 -.Os BSD -.Sh NAME -.Nm nmap -.Nd network port scanner -.Sh SYNOPSIS -.Nm nmap -.Op Ar options -.Ar hostname -.Op Ar /mask -.Sh DESCRIPTION -.Nm -is a utility for port scanning large networks, although it works fine for -single hosts. The guiding philosophy for the creation of -.Nm -was TMTOWTDI (There's More Than One Way To Do It). This is the Perl slogan, but -it is equally applicable to scanners. Sometimes you need speed, other times you -may need stealth. In some cases, bypassing firewalls may be required. Not to -mention the fact that you may want to scan different protocols (UDP, TCP, ICMP, -etc.). You just can't do all this with one scanning mode. And you don't want to -have 10 different scanners around, all with different interfaces and -capabilities. Thus -.Nm -incorporats virtually every scanning technique known. -Specifically, -.Nm -supports: - - Vanilla TCP connect() scanning, - TCP SYN (half open) scanning, - TCP FIN (stealth) scanning, - TCP ftp proxy (bounce attack) scanning - SYN/FIN scanning using IP fragments (bypasses packet filters), - UDP recvfrom() scanning, - UDP raw ICMP port unreachable scanning, - ICMP scanning (ping-sweep), and - Reverse-ident scanning. - -.Nm -also supports a number of performance and reliability features such as dynamic -delay time calculations, packet timeout and retransmission, parallel port -scanning, detection of down hosts via parallel pings, and flexible target and -port specification. -.Sh FILES -none. -.Sh SEE ALSO -.Xr mscan 1L , -.Xr nc 1L , -.Xr scrobe 1L -.Sh DIAGNOSTICS -none. -.Sh BUGS -none known. -.Sh AUTHORS -This man page has been written by David O'Brien (obrien@cs.ucdavis.edu) -.\" .Sh HISTORY -.\" .Nm -.\" appeared in FreeBSD 3.0. diff --git a/security/nmap/files/patch-aa b/security/nmap/files/patch-aa index 34c00b4f2ccf..65f57295798d 100644 --- a/security/nmap/files/patch-aa +++ b/security/nmap/files/patch-aa @@ -1,25 +1,28 @@ --- Makefile.in.orig Fri Mar 9 22:25:19 2001 +++ Makefile.in Sun May 27 17:49:17 2001 -@@ -16,5 +16,5 @@ +@@ -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)\" - CFLAGS = -g @CFLAGS@ $(CCOPT) $(DEFS) $(INCLS) -@@ -171,9 +171,12 @@ + # 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: $(TARGET) + install-nmap: $(TARGET) - $(SHTOOL) mkdir -f -p -m 755 $(bindir) $(mandir)/man1 $(nmapdatadir) $(deskdir) -- $(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) + $(SHTOOL) mkdir -f -p -m 755 $(bindir) $(mandir)/man1 $(nmapdatadir) -+ $(INSTALL) -c -m 755 nmap $(bindir)/nmap + $(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 diff --git a/security/nmap/files/patch-nbase::getopt.h b/security/nmap/files/patch-nbase::getopt.h new file mode 100644 index 000000000000..6f83861620ed --- /dev/null +++ b/security/nmap/files/patch-nbase::getopt.h @@ -0,0 +1,14 @@ +--- nbase/getopt.h.orig Sat Mar 29 22:29:42 2003 ++++ nbase/getopt.h Sat Mar 29 22:47:18 2003 +@@ -100,7 +100,11 @@ + errors, only prototype getopt for the GNU C library. */ + extern int getopt (int argc, char *const *argv, const char *shortopts); + #else /* not __GNU_LIBRARY__ */ ++#if FREEBSD ++#include ++#else + extern int getopt (); ++#endif + #endif /* __GNU_LIBRARY__ */ + extern int getopt_long (int argc, char *const *argv, const char *shortopts, + const struct option *longopts, int *longind); diff --git a/security/nmap/files/patch-nmap.h b/security/nmap/files/patch-nmap.h new file mode 100644 index 000000000000..9034cea558eb --- /dev/null +++ b/security/nmap/files/patch-nmap.h @@ -0,0 +1,18 @@ +--- nmap.h.orig Sun Mar 30 18:44:33 2003 ++++ nmap.h Sun Mar 30 18:51:47 2003 +@@ -344,9 +344,12 @@ + #elif defined(UW) + # define NET_SIZE_T size_t + #elif defined(__FreeBSD__) +- /* XXX: Apache didn't have this one, +- so watch it be wrong :)... */ +-# define NET_SIZE_T size_t ++# if __FreeBSD__ >= 2 ++# include ++# if __FreeBSD_version >= 400000 ++# define NET_SIZE_T socklen_t ++# endif ++# endif + #elif defined(OPENBSD) + # define NET_SIZE_T socklen_t + #elif defined(NETBSD) -- cgit v1.2.3