From b007dc437b60401238a1c689a15b4d330d3685d8 Mon Sep 17 00:00:00 2001 From: naddy Date: Tue, 9 Jan 2001 16:10:16 +0000 Subject: [PATCH] - new maintainer: Brian Caswell ; ok angelos@ - update to nmap-2.54BETA7 and include nmapfe; from bmc@mitre.org - clean up port --- net/nmap/Makefile | 35 +++++++++++------------ net/nmap/files/md5 | 6 ++-- net/nmap/patches/patch-Makefile_in | 12 ++++++++ net/nmap/patches/patch-configure | 12 ++++++++ net/nmap/patches/patch-configure_in | 12 ++++++++ net/nmap/patches/patch-nbase_Makefile_in | 12 ++++++++ net/nmap/patches/patch-nbase_configure | 12 ++++++++ net/nmap/patches/patch-nbase_configure_in | 12 ++++++++ net/nmap/patches/patch-tcpip.c | 7 +++-- net/nmap/patches/patch-utils.c | 9 +++--- net/nmap/pkg/PFRAG.x11 | 5 ++++ net/nmap/pkg/PLIST | 3 +- 12 files changed, 107 insertions(+), 30 deletions(-) create mode 100644 net/nmap/patches/patch-Makefile_in create mode 100644 net/nmap/patches/patch-configure create mode 100644 net/nmap/patches/patch-configure_in create mode 100644 net/nmap/patches/patch-nbase_Makefile_in create mode 100644 net/nmap/patches/patch-nbase_configure create mode 100644 net/nmap/patches/patch-nbase_configure_in create mode 100644 net/nmap/pkg/PFRAG.x11 diff --git a/net/nmap/Makefile b/net/nmap/Makefile index 4254f10a647..ec55d6144c4 100644 --- a/net/nmap/Makefile +++ b/net/nmap/Makefile @@ -1,31 +1,28 @@ -# $OpenBSD: Makefile,v 1.29 2000/10/22 16:08:00 espie Exp $ +# $OpenBSD: Makefile,v 1.30 2001/01/09 16:10:16 naddy Exp $ -DISTNAME= nmap-2.54BETA6 -PKGNAME= nmap-2.54b6 +DISTNAME= nmap-2.54BETA7 +PKGNAME= nmap-2.54b7 CATEGORIES= net security -NEED_VERSION= 1.338 -MASTER_SITES= http://www.insecure.org/nmap/dist/ -EXTRACT_SUFX= .tgz - +NEED_VERSION= 1.348 HOMEPAGE= http://www.insecure.org/nmap/ -MAINTAINER= Angelos D. Keromytis + +MAINTAINER= Brian Caswell PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MAKE_FLAGS= CCOPT="${CFLAGS}" -CONFIGURE_STYLE= gnu -ALL_TARGET= nmap -NMAP_FILES= os-fingerprints protocols rpc services +MASTER_SITES= ${HOMEPAGE}dist/ +EXTRACT_SUFX= .tgz -do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/nmap - ${INSTALL_PROGRAM} ${WRKBUILD}/nmap ${PREFIX}/bin - ${INSTALL_MAN} ${WRKBUILD}/docs/nmap.1 ${PREFIX}/man/man1 -. for i in ${NMAP_FILES} - ${INSTALL_DATA} ${WRKSRC}/nmap-$i ${PREFIX}/share/nmap -. endfor +FLAVORS= x11 +FLAVOR?= + +.if ${FLAVOR:L:Mx11} +LIB_DEPENDS+= gtk.1.2::x11/gtk+ +.endif + +CONFIGURE_STYLE= gnu dest .include diff --git a/net/nmap/files/md5 b/net/nmap/files/md5 index 72bb508cd2b..bda780c9240 100644 --- a/net/nmap/files/md5 +++ b/net/nmap/files/md5 @@ -1,3 +1,3 @@ -MD5 (nmap-2.54BETA6.tgz) = e6faa7e14b20f554611f622bbfdf6948 -RMD160 (nmap-2.54BETA6.tgz) = cbdcc050ab8b3326abdce22697c8256a263794e1 -SHA1 (nmap-2.54BETA6.tgz) = fd8822697244cdd346b286257b4539b55628e9f6 +MD5 (nmap-2.54BETA7.tgz) = d7fd8b79d2a8268a9cb32421dea02975 +RMD160 (nmap-2.54BETA7.tgz) = 7d76dc94e229466af529d535c251d5f7b0a27b04 +SHA1 (nmap-2.54BETA7.tgz) = 50b68ebfcdc37fd69e7abbe29da3e1edc75b15bd diff --git a/net/nmap/patches/patch-Makefile_in b/net/nmap/patches/patch-Makefile_in new file mode 100644 index 00000000000..4bf8f4c40a4 --- /dev/null +++ b/net/nmap/patches/patch-Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-Makefile_in,v 1.1 2001/01/09 16:10:16 naddy Exp $ +--- Makefile.in.orig Mon Jan 8 17:32:53 2001 ++++ Makefile.in Mon Jan 8 17:33:04 2001 +@@ -17,7 +17,7 @@ CCOPT = + LIBPCAPDIR = @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) ++CFLAGS = @CFLAGS@ $(CCOPT) $(DEFS) $(INCLS) + # CFLAGS = -g -Wall $(DEFS) $(INCLS) + STATIC = + LDFLAGS = @LDFLAGS@ $(STATIC) diff --git a/net/nmap/patches/patch-configure b/net/nmap/patches/patch-configure new file mode 100644 index 00000000000..e239400a31e --- /dev/null +++ b/net/nmap/patches/patch-configure @@ -0,0 +1,12 @@ +$OpenBSD: patch-configure,v 1.1 2001/01/09 16:10:17 naddy Exp $ +--- configure.orig Mon Jan 8 20:38:46 2001 ++++ configure Mon Jan 8 20:39:03 2001 +@@ -530,7 +530,7 @@ if test -d /usr/local/lib; then + LDFLAGS="$LDFLAGS -L/usr/local/lib" + fi + if test -d /usr/local/include; then +- CFLAGS="$CLFAGS -I/usr/local/include" ++ CFLAGS="$CFLAGS -I/usr/local/include" + fi + + libpcapdir=libpcap-possiblymodified diff --git a/net/nmap/patches/patch-configure_in b/net/nmap/patches/patch-configure_in new file mode 100644 index 00000000000..39051c5096f --- /dev/null +++ b/net/nmap/patches/patch-configure_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-configure_in,v 1.1 2001/01/09 16:10:17 naddy Exp $ +--- configure.in.orig Mon Jan 8 20:38:43 2001 ++++ configure.in Mon Jan 8 20:38:57 2001 +@@ -9,7 +9,7 @@ if test -d /usr/local/lib; then + LDFLAGS="$LDFLAGS -L/usr/local/lib" + fi + if test -d /usr/local/include; then +- CFLAGS="$CLFAGS -I/usr/local/include" ++ CFLAGS="$CFLAGS -I/usr/local/include" + fi + + libpcapdir=libpcap-possiblymodified diff --git a/net/nmap/patches/patch-nbase_Makefile_in b/net/nmap/patches/patch-nbase_Makefile_in new file mode 100644 index 00000000000..9d62054bd9b --- /dev/null +++ b/net/nmap/patches/patch-nbase_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-nbase_Makefile_in,v 1.1 2001/01/09 16:10:17 naddy Exp $ +--- nbase/Makefile.in.orig Mon Jan 8 17:33:45 2001 ++++ nbase/Makefile.in Mon Jan 8 17:33:54 2001 +@@ -9,7 +9,7 @@ CC = @CC@ + AR = ar + CCOPT = + DEFS = @DEFS@ -DNCRACK_VERSION=\"$(NCRACK_VERSION)\" +-CFLAGS = @CFLAGS@ -g $(CCOPT) $(GLIB_CFLAGS) $(DEFS) $(INCLS) ++CFLAGS = @CFLAGS@ $(CCOPT) $(GLIB_CFLAGS) $(DEFS) $(INCLS) + # CFLAGS = -g -Wall $(DEFS) $(INCLS) + STATIC = + LDFLAGS = @LDFLAGS@ $(STATIC) diff --git a/net/nmap/patches/patch-nbase_configure b/net/nmap/patches/patch-nbase_configure new file mode 100644 index 00000000000..aba51a80bdd --- /dev/null +++ b/net/nmap/patches/patch-nbase_configure @@ -0,0 +1,12 @@ +$OpenBSD: patch-nbase_configure,v 1.1 2001/01/09 16:10:17 naddy Exp $ +--- nbase/configure.orig Mon Jan 8 22:24:19 2001 ++++ nbase/configure Mon Jan 8 22:24:24 2001 +@@ -526,7 +526,7 @@ if test -d /usr/local/lib; then + LDFLAGS="$LDFLAGS -L/usr/local/lib" + fi + if test -d /usr/local/include; then +- CFLAGS="$CLFAGS -I/usr/local/include" ++ CFLAGS="$CFLAGS -I/usr/local/include" + fi + + diff --git a/net/nmap/patches/patch-nbase_configure_in b/net/nmap/patches/patch-nbase_configure_in new file mode 100644 index 00000000000..e0d89087453 --- /dev/null +++ b/net/nmap/patches/patch-nbase_configure_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-nbase_configure_in,v 1.1 2001/01/09 16:10:17 naddy Exp $ +--- nbase/configure.in.orig Mon Jan 8 22:23:43 2001 ++++ nbase/configure.in Mon Jan 8 22:24:05 2001 +@@ -9,7 +9,7 @@ if test -d /usr/local/lib; then + LDFLAGS="$LDFLAGS -L/usr/local/lib" + fi + if test -d /usr/local/include; then +- CFLAGS="$CLFAGS -I/usr/local/include" ++ CFLAGS="$CFLAGS -I/usr/local/include" + fi + + dnl use config.h instad of -D macros diff --git a/net/nmap/patches/patch-tcpip.c b/net/nmap/patches/patch-tcpip.c index 4c5e7517d2b..3de821c6dc6 100644 --- a/net/nmap/patches/patch-tcpip.c +++ b/net/nmap/patches/patch-tcpip.c @@ -1,6 +1,7 @@ ---- tcpip.c.orig Sun Nov 19 09:13:48 2000 -+++ tcpip.c Sun Nov 19 09:18:17 2000 -@@ -317,27 +317,19 @@ +$OpenBSD: patch-tcpip.c,v 1.2 2001/01/09 16:10:17 naddy Exp $ +--- tcpip.c.orig Sun Oct 8 23:30:03 2000 ++++ tcpip.c Mon Jan 8 02:29:18 2001 +@@ -317,27 +317,19 @@ inline int Sendto(char *functionname, in struct sockaddr_in *sin = (struct sockaddr_in *) to; int res; diff --git a/net/nmap/patches/patch-utils.c b/net/nmap/patches/patch-utils.c index 010fa026ace..f0066c9c285 100644 --- a/net/nmap/patches/patch-utils.c +++ b/net/nmap/patches/patch-utils.c @@ -1,6 +1,7 @@ ---- utils.c.orig Thu Oct 5 01:46:19 2000 -+++ utils.c Sat Nov 18 00:55:54 2000 -@@ -184,6 +184,23 @@ +$OpenBSD: patch-utils.c,v 1.2 2001/01/09 16:10:17 naddy Exp $ +--- utils.c.orig Thu Oct 5 05:46:19 2000 ++++ utils.c Mon Jan 8 02:29:18 2001 +@@ -184,6 +184,23 @@ get_random_bytes(&s, sizeof(unsigned sho return s; } @@ -24,7 +25,7 @@ int get_random_bytes(void *buf, int numbytes) { static char bytebuf[2048]; static char badrandomwarning = 0; -@@ -239,6 +256,7 @@ +@@ -239,6 +256,7 @@ tmp = bytesleft; bytesleft = 0; return get_random_bytes((char *)buf + tmp, numbytes - tmp); } diff --git a/net/nmap/pkg/PFRAG.x11 b/net/nmap/pkg/PFRAG.x11 new file mode 100644 index 00000000000..852ecc92d2c --- /dev/null +++ b/net/nmap/pkg/PFRAG.x11 @@ -0,0 +1,5 @@ +@comment $OpenBSD: PFRAG.x11,v 1.1 2001/01/09 16:10:17 naddy Exp $ +bin/nmapfe +bin/xnmap +man/man1/nmapfe.1 +man/man1/xnmap.1 diff --git a/net/nmap/pkg/PLIST b/net/nmap/pkg/PLIST index 7ac7a9f37c9..08b8caaa2c8 100644 --- a/net/nmap/pkg/PLIST +++ b/net/nmap/pkg/PLIST @@ -1,6 +1,7 @@ -@comment $OpenBSD: PLIST,v 1.7 2000/08/05 00:12:45 fgsch Exp $ +@comment $OpenBSD: PLIST,v 1.8 2001/01/09 16:10:17 naddy Exp $ bin/nmap man/man1/nmap.1 +%%x11%% share/nmap/nmap-os-fingerprints share/nmap/nmap-protocols share/nmap/nmap-rpc