[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

nmap fix/diff



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).

Thanks,
Okan

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	7 Jan 2005 16:56:02 -0000
@@ -9,6 +9,8 @@
 
 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 +22,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	7 Jan 2005 16:37:28 -0000
@@ -0,0 +1,27 @@
+$OpenBSD$
+--- Makefile.in.orig	Fri Jan  7 11:16:25 2005
++++ Makefile.in	Fri Jan  7 11:16:43 2005
+@@ -16,9 +16,7 @@ NSOCKDIR=_(_at_)_NSOCKDIR@
+ CC = @CC@
+ 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.
+@@ -68,12 +66,6 @@ $(TARGET): $(DEPS) @PCAP_DEPENDS@ @PCRE_
+ # This empty rule is used to force execution of certain rules where I can't conveniently specify
+ # all of the prerequisites (e.g. recursive makes and such)
+ FORCE:
+-
+-$(LIBPCREDIR)/libpcre.a: $(LIBPCREDIR)/Makefile FORCE
+-	@echo Compiling libpcre; cd $(LIBPCREDIR) && $(MAKE)
+-
+-$(LIBPCAPDIR)/libpcap.a: $(LIBPCAPDIR)/Makefile FORCE
+-	@echo Compiling libpcap; cd $(LIBPCAPDIR) && $(MAKE)
+ 
+ $(NBASEDIR)/libnbase.a: $(NBASEDIR)/Makefile FORCE
+ 	@echo Compiling libnbase;



Visit your host, monkey.org