Re: nmap fix/diff

[Okan Demirmen <okan_(_at_)_demirmen_(_dot_)_com>]

On Fri 2005.01.07 at 13:12 -0500, Okan Demirmen wrote:
> nmap in -current and previous versions of the port had some problems
> on 64bit archs, namely realloc() and datalink errors. I finally had
> a chance to track that down. So far this diff on -current has been
> tested on i386 and sparc64, however it needs more testing, and
> certainly comments if anyone has any. The code is a mess, so this
> is merely a hack, but I might take the idea upstream and fix the
> configure scripts and whatnot, when I have the time.
> 
> Also, I don't mind taking maintainer on this (included in diff).

here is simplier diff and pkgname bump.

Index: Makefile
===================================================================
RCS file: /open/cvs/ports/net/nmap/Makefile,v
retrieving revision 1.54
diff -u -r1.54 Makefile
--- Makefile	16 Dec 2004 00:31:23 -0000	1.54
+++ Makefile	9 Jan 2005 15:35:33 -0000
@@ -3,12 +3,15 @@
 COMMENT=	"scan ports and fingerprint stack of network hosts"
 
 DISTNAME=	nmap-3.75
+PKGNAME=	${DISTNAME}p1
 CATEGORIES=	net security
 MASTER_SITES=	${HOMEPAGE}dist/
 EXTRACT_SUFX=	.tgz
 
 HOMEPAGE=	http://www.insecure.org/nmap/
 
+MAINTAINER=	Okan Demirmen <okan_(_at_)_demirmen_(_dot_)_com>
+
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
@@ -20,9 +23,9 @@
 CONFIGURE_ARGS=		--with-libpcap=/usr \
 			--with-libpcre=${LOCALBASE} \
 			--with-openssl=/usr
-MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC} ${WRKSRC}/libpcre \
-				${WRKSRC}/nsock/src \
-				${WRKSRC}/libpcap-possiblymodified
+MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC} \
+				${WRKSRC}/nbase \
+				${WRKSRC}/nsock/src
 
 FLAVORS=	no_x11
 FLAVOR?=	
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile_in	9 Jan 2005 05:24:10 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- Makefile.in.orig	Mon Oct 18 13:15:06 2004
++++ Makefile.in	Sun Jan  9 00:22:34 2005
+@@ -18,7 +18,7 @@ CXX = @CXX@
+ CCOPT = 
+ LIBPCAPDIR = @libpcapdir@
+ LIBPCREDIR = @LIBPCREDIR@
+-INCLS = -I$(LIBPCAPDIR) 
++INCLS = -I.
+ 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.