ports/126211: [maintainer] Update security/nmap to 4.68

[Daniel Roethlisberger]

>Number:         126211
>Category:       ports
>Synopsis:       [maintainer] Update security/nmap to 4.68
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Aug 03 14:40:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Daniel Roethlisberger
>Release:        FreeBSD 7.0-RELEASE-p2 i386
>Organization:
>Environment:
System: FreeBSD marvin.ustcor.roe.ch 7.0-RELEASE-p2 FreeBSD 7.0-RELEASE-p2 #0: Wed Jun 18 07:33:20 UTC 2008 root at i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386
>Description:
Update nmap to latest stable release, 4.68.  As usual, there were tons of
upstream bugfixes, performance enhancements and signatures added.

The removed patch chunks in the port are the result of those fixes being
incorporated upstream.

I'm also modifying the date format in the Makefile header to a machine
readable, ISO standard format, to help FreshPorts and similar services.

Please also commit the security/zenmap update (separate PR).
>How-To-Repeat:
>Fix:
--- nmap-4.68.diff begins here ---
diff -ruN nmap.orig/Makefile nmap/Makefile
--- nmap.orig/Makefile	2008-05-06 15:26:10.000000000 +0200
+++ nmap/Makefile	2008-08-03 13:26:03.000000000 +0200
@@ -1,12 +1,12 @@
 # Ports collection makefile for:  nmap
-# Date created:			  Tue Aug 04, 1998
+# Date created:			  1998-08-04
 # Whom:				  David O'Brien (obrien at NUXI.com)
 #
 # $FreeBSD: ports/security/nmap/Makefile,v 1.109 2008/05/06 13:26:10 miwi Exp $
 #
 
 PORTNAME=	nmap
-PORTVERSION=	4.62
+PORTVERSION=	4.68
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://nmap.org/dist/ \
 		http://www.mirrors.wiretapped.net/security/network-mapping/nmap/ \
diff -ruN nmap.orig/distinfo nmap/distinfo
--- nmap.orig/distinfo	2008-05-06 15:26:10.000000000 +0200
+++ nmap/distinfo	2008-08-03 12:33:59.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (nmap-4.62.tar.bz2) = 4fdaa418f4008509d4c91ec087131d4e
-SHA256 (nmap-4.62.tar.bz2) = 2fb7b72c1416428dd786f37e3aab0b36f633ee5246dd7a1b0240b0a5f9e13791
-SIZE (nmap-4.62.tar.bz2) = 3308006
+MD5 (nmap-4.68.tar.bz2) = c363d32a00c697d15996fced22072b6c
+SHA256 (nmap-4.68.tar.bz2) = 1866be3d8d397ea7721c08f520d033c208492d3e1551311805d18efbe6cef161
+SIZE (nmap-4.68.tar.bz2) = 5979048
diff -ruN nmap.orig/files/patch-Makefile.in nmap/files/patch-Makefile.in
--- nmap.orig/files/patch-Makefile.in	2008-04-19 19:53:27.000000000 +0200
+++ nmap/files/patch-Makefile.in	2008-08-03 12:36:19.000000000 +0200
@@ -9,12 +9,3 @@
  NMAPDEVDIR=~/nmap-dev
  
  export NBASEDIR=@NBASEDIR@
-@@ -178,7 +178,7 @@
- # Use strip -x to avoid stripping dynamically loaded NSE functions. See
- # http://seclists.org/nmap-dev/2007/q4/0272.html.
- 	$(STRIP) -x $(DESTDIR)$(bindir)/nmap
--	$(INSTALL) -c -m 644 docs/$(TARGET).1 docs/zenmap.1 $(DESTDIR)$(mandir)/man1/
-+	$(INSTALL) -c -m 644 docs/$(TARGET).1 $(DESTDIR)$(mandir)/man1/
- 	$(INSTALL) -c -m 644 docs/nmap.xsl $(DESTDIR)$(nmapdatadir)/
- 	$(INSTALL) -c -m 644 docs/nmap.dtd $(DESTDIR)$(nmapdatadir)/
- 	$(INSTALL) -c -m 644 nmap-services $(DESTDIR)$(nmapdatadir)/
diff -ruN nmap.orig/files/patch-configure nmap/files/patch-configure
--- nmap.orig/files/patch-configure	2008-05-06 15:26:11.000000000 +0200
+++ nmap/files/patch-configure	2008-08-03 12:41:22.000000000 +0200
@@ -1,5 +1,5 @@
---- configure.orig	2008-04-28 19:53:32.000000000 +0200
-+++ configure	2008-05-04 20:25:47.000000000 +0200
+--- configure.orig	2008-06-15 09:05:12.000000000 +0200
++++ configure	2008-08-03 12:41:04.000000000 +0200
 @@ -1930,7 +1930,7 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  if test -n "$ac_tool_prefix"; then
@@ -9,25 +9,14 @@
  { echo "$as_me:$LINENO: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_CC+set}" = set; then
-@@ -7179,9 +7179,9 @@
+@@ -7337,8 +7337,8 @@
      no_lua="yes"
    ;;
    *)
 -    CPPFLAGS="-I$with_liblua/include $CPPFLAGS"
 -    LDFLAGS="-L$with_liblua/lib $LDFLAGS"
--    have_lua=yes
 +    CPPFLAGS="-I${LUA_INCDIR} $CPPFLAGS"
 +    LDFLAGS="-L${LUA_LIBDIR} $LDFLAGS"
-+    #have_lua=yes
    ;;
    esac
  
-@@ -7189,7 +7189,7 @@
- 
- 
- # They don't want lua
--if test $no_lua == yes; then
-+if test $no_lua = yes; then
-   CXXFLAGS="-DNOLUA $CXXFLAGS"
-   LIBLUA_LIBS=""
-   LUA_DEPENDS=""
diff -ruN nmap.orig/pkg-plist nmap/pkg-plist
--- nmap.orig/pkg-plist	2008-05-06 15:26:10.000000000 +0200
+++ nmap/pkg-plist	2008-08-03 12:50:53.000000000 +0200
@@ -17,8 +17,6 @@
 %%DATADIR%%/scripts/promiscuous.nse
 %%DATADIR%%/scripts/netbios-smb-os-discovery.nse
 %%DATADIR%%/scripts/nbstat.nse
-%%DATADIR%%/scripts/mswindowsShell.nse
-%%DATADIR%%/scripts/kibuvDetection.nse
 %%DATADIR%%/scripts/ircZombieTest.nse
 %%DATADIR%%/scripts/ircServerInfo.nse
 %%DATADIR%%/scripts/iax2Detect.nse
@@ -58,6 +56,7 @@
 %%DATADIR%%/nselib/url.lua
 %%DATADIR%%/nselib/tab.lua
 %%DATADIR%%/nselib/datafiles.lua
+%%DATADIR%%/nselib/comm.lua
 @dirrm %%DATADIR%%/nselib
 %%DATADIR%%/nmap-mac-prefixes
 %%DATADIR%%/nmap-os-db
--- nmap-4.68.diff ends here ---


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