ports/56968: [PATCH] port security/nmap: update to 3.45, grab maintainership

Oliver Eikemeier eikemeier at fillmore-labs.com
Thu Sep 18 02:40:06 UTC 2003 

>Number:         56968
>Category:       ports
>Synopsis:       [PATCH] port security/nmap: update to 3.45, grab maintainership
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 17 19:40:04 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Oliver Eikemeier
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
Fillmore Labs - http://www.fillmore-labs.com
>Environment:
System: FreeBSD nuuk.fillmore-labs.com 5.1-CURRENT

>Description:

- update to 3.45 (based on PR 56920)
- superseedes PR 56920
- grab maintainership (PR 56935)

>How-To-Repeat:
>Fix:

--- nmap-3.45.patch begins here ---
diff -Nur security/nmap/Makefile.orig security/nmap/Makefile
--- security/nmap/Makefile.orig	Tue Jul  1 20:41:27 2003
+++ security/nmap/Makefile	Thu Sep 18 04:08:15 2003
@@ -6,37 +6,61 @@
 # $FreeBSD: ports/security/nmap/Makefile,v 1.70 2003/07/01 07:27:43 foxfair Exp $
 #
 
-PORTNAME?=	nmap
-PORTVERSION=	3.30
-CATEGORIES=	security ipv6
-MASTER_SITES=	http://download.insecure.org/nmap/dist/
-DISTNAME=	nmap-${PORTVERSION:S/.b/BETA/}
+PORTNAME?=		nmap
+PORTVERSION=		3.45
+CATEGORIES=		security ipv6
+MASTER_SITES=		http://download.insecure.org/nmap/dist/
+DISTNAME=		nmap-${PORTVERSION}
 
-MAINTAINER=	dominic.marks at btinternet.com
-COMMENT?=	Port scanning utility for large networks
+MAINTAINER=		dominic.marks at btinternet.com
+COMMENT?=		Port scanning utility for large networks
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-localdirs
-USE_BZIP2=	yes
+USE_BZIP2=		yes
 
-MAN1?=		nmap.1
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS=		--without-localdirs
 
-.include <bsd.port.pre.mk>
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-.if ${OSVERSION} < 300004
-CFLAGS+=	-DDLT_RAW=12 # for obsoleted <net/bpf.h>
+.if !defined(BUILD_NMAPFE)
+
+MAN1=			nmap.1
+
+LIB_DEPENDS=		pcre.0:${PORTSDIR}/devel/pcre
+
+CONFIGURE_ARGS+=	--with-pcre=${LOCALBASE}
+
+.if !defined(WITHOUT_SSL)
+USE_OPENSSL=		yes
+CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
+.else
+CONFIGURE_ARGS+=	--without-openssl
 .endif
 
-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:
-	@strip ${PREFIX}/bin/nmap
+ALL_TARGET=		nmap
+INSTALL_TARGET=		install-nmap
+
+.else
+
+RUN_DEPENDS=		nmap:${PORTSDIR}/security/nmap
+
+DESCR=			${PKGDIR}/pkg-descr.fe
+PLIST=			${PKGDIR}/pkg-plist.fe
+
+MAN1=			nmapfe.1
+MLINKS=			nmapfe.1 xnmap.1
+
+USE_GNOME=		gtk12
+
+CONFIGURE_ARGS+=	--without-openssl
+
+CONFIGURE_ARGS+=	--with-nmapfe
+
+ALL_TARGET=		nbase/libnbase.a nmapfe/nmapfe
+INSTALL_TARGET=		install-nmapfe
+
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -Nur security/nmap/distinfo.orig security/nmap/distinfo
--- security/nmap/distinfo.orig	Tue Jul  1 20:41:27 2003
+++ security/nmap/distinfo	Thu Sep 18 02:11:05 2003
@@ -1 +1 @@
-MD5 (nmap-3.30.tar.bz2) = 639fc1c91f48319eca97401e74f9c90e
+MD5 (nmap-3.45.tar.bz2) = 9219fe0907a83bddbfd1b99a21ba35ac
diff -Nur security/nmap/files/patch-Makefile.in.orig security/nmap/files/patch-Makefile.in
--- security/nmap/files/patch-Makefile.in.orig	Tue Jul  1 09:27:43 2003
+++ security/nmap/files/patch-Makefile.in	Thu Sep 18 02:11:05 2003
@@ -1,6 +1,6 @@
 --- Makefile.in.orig	Fri Mar  9 22:25:19 2001
 +++ Makefile.in	Sun May 27 17:49:17 2001
-@@ -9,14 +9,14 @@
+@@ -9,7 +9,7 @@
  mandir = @mandir@
  srcdir = @srcdir@
  nmapdatadir = @datadir@/nmap
@@ -8,21 +8,33 @@
 +deskdir = $(X11BASE)/share/gnome/apps/Utilities
  
  NBASEDIR=@NBASEDIR@
- CC = @CC@
- CXX = @CXX@
+ NSOCKDIR=@NSOCKDIR@
+@@ -18,7 +18,7 @@
  CCOPT = 
  LIBPCAPDIR = @libpcapdir@
+ LIBPCREDIR = @LIBPCREDIR@
 -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 @@
+@@ -254,8 +254,8 @@
  	$(MAKEDEPEND) $(INCLS) -s "# DO NOT DELETE" -- $(DEFS) -- $(SRCS)
  
  install-nmap: $(TARGET)
 -	$(SHTOOL) mkdir -f -p -m 755 $(bindir) $(mandir)/man1 $(nmapdatadir) $(deskdir)
+-	$(INSTALL) -c -m 755 nmap $(bindir)/nmap
 +	$(SHTOOL) mkdir -f -p -m 755 $(bindir) $(mandir)/man1 $(nmapdatadir)
- 	$(INSTALL) -c -m 755 nmap $(bindir)/nmap
++	$(INSTALL) -c -m 755 nmap -s $(bindir)/nmap
  	$(INSTALL) -c -m 644 docs/$(TARGET).1 $(mandir)/man1/$(TARGET).1
  	$(INSTALL) -c -m 644 nmap-os-fingerprints  $(nmapdatadir)/nmap-os-fingerprints
+ 	$(INSTALL) -c -m 644 nmap-service-probes  $(nmapdatadir)/nmap-service-probes
+@@ -266,7 +266,7 @@
+ install-nmapfe: $(TARGETNMAPFE)
+ 	$(SHTOOL) mkdir -f -p -m 755 $(bindir) $(mandir)/man1 $(nmapdatadir) $(deskdir)
+ 	@echo "If the next command fails -- you cannot use the X front end"
+-	-test -f nmapfe/nmapfe && $(INSTALL) -c -m 755 nmapfe/nmapfe $(bindir)/nmapfe && rm -f $(bindir)/xnmap && $(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
++	-test -f nmapfe/nmapfe && $(INSTALL) -c -m 755 -s nmapfe/nmapfe $(bindir)/nmapfe && rm -f $(bindir)/xnmap && $(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: install-nmap $(INSTALLNMAPFE)
+ 
diff -Nur security/nmap/files/patch-configure.orig security/nmap/files/patch-configure
--- security/nmap/files/patch-configure.orig	Thu Jan  1 01:00:00 1970
+++ security/nmap/files/patch-configure	Thu Sep 18 02:15:31 2003
@@ -0,0 +1,27 @@
+--- configure.orig	Sat Sep 13 07:40:51 2003
++++ configure	Thu Sep 18 02:15:30 2003
+@@ -4251,6 +4251,7 @@
+     ;;
+   *)
+     specialssldir="$with_openssl"
++    CXXFLAGS="$CXXFLAGS -I$with_openssl/include"
+     LDFLAGS="$LDFLAGS -L$with_openssl/lib"
+     ;;
+   esac
+@@ -5196,6 +5197,8 @@
+   echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; have_libpcap=no
+ else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lpcap  $LIBS"
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+@@ -5251,6 +5254,7 @@
+ echo "${ECHO_T}no" >&6; have_libpcap=no
+ fi
+ rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+ fi
+ fi
+ 
diff -Nur security/nmap/pkg-descr.orig security/nmap/pkg-descr
--- security/nmap/pkg-descr.orig	Thu Mar 14 19:18:08 2002
+++ security/nmap/pkg-descr	Thu Sep 18 04:21:39 2003
@@ -6,7 +6,7 @@
 ICMP, etc.).  You just can't do all this with one scanning mode.  Thus nmap
 incorporates virtually every scanning technique known of.
 
-WWW: http://www.insecure.org/nmap/index.html
+WWW: http://www.insecure.org/nmap/
 
 See the webpage and the Phrack Magazine article (Volume 7, Issue 51 
 September 01, 1997, article 11 of 17) http://www.insecure.org/nmap/p51-11.txt
diff -Nur security/nmap/pkg-descr.fe.orig security/nmap/pkg-descr.fe
--- security/nmap/pkg-descr.fe.orig	Thu Jan  1 01:00:00 1970
+++ security/nmap/pkg-descr.fe	Thu Sep 18 04:21:52 2003
@@ -0,0 +1,6 @@
+nmapfe is a GUI front end for the nmap port scanning tool.
+
+WWW: http://www.insecure.org/nmap/
+
+-- David
+   obrien at cs.ucdavis.edu
diff -Nur security/nmap/pkg-plist.orig security/nmap/pkg-plist
--- security/nmap/pkg-plist.orig	Tue Jul  1 20:41:27 2003
+++ security/nmap/pkg-plist	Thu Sep 18 02:11:05 2003
@@ -1,6 +1,7 @@
 bin/nmap
-share/nmap/nmap-os-fingerprints
-share/nmap/nmap-protocols
-share/nmap/nmap-services
-share/nmap/nmap-rpc
- at dirrm share/nmap
+%%DATADIR%%/nmap-os-fingerprints
+%%DATADIR%%/nmap-protocols
+%%DATADIR%%/nmap-rpc
+%%DATADIR%%/nmap-service-probes
+%%DATADIR%%/nmap-services
+ at dirrm %%DATADIR%%
diff -Nur security/nmap/pkg-plist.fe.orig security/nmap/pkg-plist.fe
--- security/nmap/pkg-plist.fe.orig	Thu Jan  1 01:00:00 1970
+++ security/nmap/pkg-plist.fe	Tue Jul  1 20:41:27 2003
@@ -0,0 +1,5 @@
+bin/nmapfe
+bin/xnmap
+ at cwd %%X11BASE%%
+share/gnome/apps/Utilities/nmapfe.desktop
+ at cwd %%LOCALBASE%%
--- nmap-3.45.patch ends here ---

--- nmapfe-3.45.patch begins here ---
diff -Nur security/nmapfe/Makefile.orig security/nmapfe/Makefile
--- security/nmapfe/Makefile.orig	Tue Jul  1 06:04:02 2003
+++ security/nmapfe/Makefile	Thu Sep 18 04:18:23 2003
@@ -1,4 +1,3 @@
-# ex:ts=8
 # Ports collection makefile for:  nmap
 # Date created:			  Tue Aug 04, 1998
 # Whom:				  David O'Brien (obrien at NUXI.com)
@@ -10,16 +9,8 @@
 
 COMMENT=	GUI frontend for the nmap scanning utility
 
-RUN_DEPENDS=	nmap:${PORTSDIR}/security/nmap
-
 MASTERDIR=	${.CURDIR}/../nmap
-PLIST=		${.CURDIR}/pkg-plist
-
-USE_GNOME=	gtk12
-
-MAN1=		nmapfe.1 xnmap.1
 
-ALL_TARGET=	nbase/libnbase.a nmapfe/nmapfe
-INSTALL_TARGET=	install-nmapfe
+BUILD_NMAPFE=	yes
 
 .include "${MASTERDIR}/Makefile"
diff -Nur security/nmapfe/pkg-descr.orig security/nmapfe/pkg-descr
--- security/nmapfe/pkg-descr.orig	Fri Sep 10 08:26:35 1999
+++ security/nmapfe/pkg-descr	Thu Jan  1 01:00:00 1970
@@ -1,6 +0,0 @@
-nmapfe is a GUI front end for the nmap port scanning tool.
-
-WWW: http://www.insecure.org/nmap/index.html
-
--- David
-   obrien at cs.ucdavis.edu
diff -Nur security/nmapfe/pkg-plist.orig security/nmapfe/pkg-plist
--- security/nmapfe/pkg-plist.orig	Tue Jul  1 06:04:02 2003
+++ security/nmapfe/pkg-plist	Thu Jan  1 01:00:00 1970
@@ -1,5 +0,0 @@
-bin/nmapfe
-bin/xnmap
- at cwd %%X11BASE%%
-share/gnome/apps/Utilities/nmapfe.desktop
- at cwd %%LOCALBASE%%
--- nmapfe-3.45.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list