- update to version 5.61TEST2

- add workaround for system build with WITHOUT_INET6 [1]

 Thanks to Kim Scarborough for sharing the libpcap workaround

PR:		ports/159376 [1]
Submitted by:	Alexander Panyushkin [1]

4 files changed, 19 insertions, 18 deletions

diff --git a/security/nmap/Makefile b/security/nmap/Makefile
index 047cd6d2ae40..5cee734d6ae4 100644
--- a/security/nmap/Makefile
+++ b/security/nmap/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nmap
-DISTVERSION=	5.61TEST1
+DISTVERSION=	5.61TEST2
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://nmap.org/dist/ \
 		LOCAL/ohauer
@@ -53,6 +53,17 @@ CONFIGURE_ARGS+=	--without-openssl
 PLIST_SUB+=		WITHSSL="@comment "
 .endif
 
+# XXX: Workaround if OS is build with WITHOUT_INET6
+#  PR: ports/159376
+#
+# Note: If this option is specified in src.conf it has to
+#  be defined as param -DWITHOUT_INET6 during build time
+#  since the port system has no access to src.conf
+.if defined(WITHOUT_INET6)
+LIB_DEPENDS+=		pcap.1:${PORTSDIR}/net/libpcap
+CONFIGURE_ARGS+=	--with-libpcap=${LOCALBASE}
+.endif
+
 PORTDOCS=	CHANGELOG HACKING
 EXAMPLES=	docs/sample-script.nse
 PORTEXAMPLES=	${EXAMPLES:T}
diff --git a/security/nmap/distinfo b/security/nmap/distinfo
index 2d97e5f57fc0..50ebdfb2dfd9 100644
--- a/security/nmap/distinfo
+++ b/security/nmap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nmap-5.61TEST1.tar.bz2) = c87e98c4d0493b02e50a43979f3a9e7ee411c50dec695e92b0b6c1a8eb539f1c
-SIZE (nmap-5.61TEST1.tar.bz2) = 21616904
+SHA256 (nmap-5.61TEST2.tar.bz2) = 8b086eba391e306bcb99750a757abe016651b817b4fde046b0e1ea91c5455ee0
+SIZE (nmap-5.61TEST2.tar.bz2) = 21633731
diff --git a/security/nmap/files/patch-liblinear__Makefile b/security/nmap/files/patch-liblinear__Makefile
deleted file mode 100644
index 1ed4a0157409..000000000000
--- a/security/nmap/files/patch-liblinear__Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./liblinear/Makefile.orig	2011-08-16 23:43:30.000000000 +0200
-+++ ./liblinear/Makefile	2011-09-23 22:15:11.000000000 +0200
-@@ -29,8 +29,8 @@
- 	$(CXX) $(CFLAGS) -c -o linear.o linear.cpp
- 
- blas/blas.a:
--	cd blas; make OPTFLAGS='$(CFLAGS)' CC='$(CC)';
-+	cd blas; ${MAKE} OPTFLAGS='$(CFLAGS)' CC='$(CC)';
- 
- clean:
--	cd blas;	make clean
-+	cd blas;	${MAKE} clean
- 	rm -f *~ tron.o linear.o train predict liblinear.so.$(SHVER) liblinear.a
diff --git a/security/nmap/pkg-plist b/security/nmap/pkg-plist
index 4a07b85802af..5b9e1964d0a5 100644
--- a/security/nmap/pkg-plist
+++ b/security/nmap/pkg-plist
@@ -204,8 +204,8 @@ bin/nping
 %%DATADIR%%/scripts/http-vuln-cve2011-3192.nse
 %%DATADIR%%/scripts/http-waf-detect.nse
 %%DATADIR%%/scripts/http-wordpress-brute.nse
-%%DATADIR%%/scripts/http-wp-enum.nse
-%%DATADIR%%/scripts/http-wp-plugins.nse
+%%DATADIR%%/scripts/http-wordpress-enum.nse
+%%DATADIR%%/scripts/http-wordpress-plugins.nse
 %%DATADIR%%/scripts/iax2-version.nse
 %%DATADIR%%/scripts/imap-brute.nse
 %%DATADIR%%/scripts/imap-capabilities.nse
@@ -227,6 +227,7 @@ bin/nping
 %%DATADIR%%/scripts/ldap-rootdse.nse
 %%DATADIR%%/scripts/ldap-search.nse
 %%DATADIR%%/scripts/lexmark-config.nse
+%%DATADIR%%/scripts/lltd-discovery.nse
 %%DATADIR%%/scripts/modbus-discover.nse
 %%DATADIR%%/scripts/mongodb-databases.nse
 %%DATADIR%%/scripts/mongodb-info.nse
@@ -274,6 +275,7 @@ bin/nping
 %%DATADIR%%/scripts/pop3-capabilities.nse
 %%DATADIR%%/scripts/pptp-version.nse
 %%DATADIR%%/scripts/qscan.nse
+%%DATADIR%%/scripts/quake3-info.nse
 %%DATADIR%%/scripts/quake3-master-getservers.nse
 %%DATADIR%%/scripts/realvnc-auth-bypass.nse
 %%DATADIR%%/scripts/resolveall.nse
@@ -326,6 +328,7 @@ bin/nping
 %%DATADIR%%/scripts/sshv1.nse
 %%DATADIR%%/scripts/ssl-cert.nse
 %%DATADIR%%/scripts/ssl-enum-ciphers.nse
+%%DATADIR%%/scripts/ssl-google-cert-catalog.nse
 %%DATADIR%%/scripts/ssl-known-key.nse
 %%DATADIR%%/scripts/sslv2.nse
 %%DATADIR%%/scripts/stuxnet-detect.nse