- Update to 4.68

PR:		126211
Submitted by:	Daniel Roethlisberger <daniel@roe.ch> (maintainer)

5 files changed, 8 insertions, 29 deletions

diff --git a/security/nmap/Makefile b/security/nmap/Makefile
index 49e952d1e8a1..6b7c2f870484 100644
--- a/security/nmap/Makefile
+++ b/security/nmap/Makefile
@@ -6,7 +6,7 @@
 #
 
 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 --git a/security/nmap/distinfo b/security/nmap/distinfo
index 8edac279a68f..a8f542cbd6c4 100644
--- a/security/nmap/distinfo
+++ b/security/nmap/distinfo
@@ -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 --git a/security/nmap/files/patch-Makefile.in b/security/nmap/files/patch-Makefile.in
index 9144e16d5ea2..71329760543e 100644
--- a/security/nmap/files/patch-Makefile.in
+++ b/security/nmap/files/patch-Makefile.in
@@ -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 --git a/security/nmap/files/patch-configure b/security/nmap/files/patch-configure
index 9a56d3386831..2f3667f7a9c4 100644
--- a/security/nmap/files/patch-configure
+++ b/security/nmap/files/patch-configure
@@ -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 --git a/security/nmap/pkg-plist b/security/nmap/pkg-plist
index 07ca3736b25c..290e6d12777a 100644
--- a/security/nmap/pkg-plist
+++ b/security/nmap/pkg-plist
@@ -17,8 +17,6 @@ libexec/nmap/nselib-bin/bit.so
 %%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 @@ libexec/nmap/nselib-bin/bit.so
 %%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