Attachment #190263 for bug #221522





PORTNAME=	nmap
DISTVERSION=	7.60
PORTREVISION=	1
CATEGORIES=	security ipv6
MASTER_SITES=	https://nmap.org/dist/ \
		LOCAL/ohauer

MAINTAINER?=	ohauer@FreeBSD.org

COMMENT?=	Port scanning utility for large networks

# nmap-6.47 => svn.nmap.org/nmap-releases/nmap-6.47 (r33605)
# https://nmap.org/book/man-legal.html
# Install the nmap modified license because of
# http://insecure.org/news/download-com-fiasco.html
LICENSE=	GPLv2


.if !defined(MASTERDIR)

LIB_DEPENDS=	libpcre.so:devel/pcre \
		libpcap.so:net/libpcap

USES=		tar:bzip2 gmake cpe
GNU_CONFIGURE=	yes

OPTIONS_SUB=	yes
OPTIONS_DEFINE=	DOCS SSH2 SSL
OPTIONS_DEFAULT=SSH2 SSL

SSH2_DESC=		SSH2 protocol support
SSH2_CONFIGURE_ON=	--with-libssh2=${LOCALBASE}
SSH2_CONFIGURE_OFF=	--without-libssh2
SSH2_IMPLIES=		SSL
SSH2_LIB_DEPENDS=	libssh2.so:security/libssh2
SSL_USES=		ssl
SSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
SSL_CONFIGURE_OFF=	--without-openssl

CONFIGURE_ARGS+=--without-localdirs \
		--without-zenmap \
		--without-ndiff \
		--with-libdnet=included \
		--with-libpcap=${LOCALBASE} \
		--with-libpcre=${LOCALBASE} \
		--with-liblua=included \
		--without-nmap-update




# Replace gcc with $CXX
#
# Fix libssh2 detection
# https://github.com/nmap/nmap/commit/53e4e92e32721b1fa4490fbcd7ea6bb62f283839

--- configure.orig	2017-07-31 19:09:47 UTC
+++ configure
@@ -2583,7 +2583,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA

 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_CC+:} false; then :
@@ -6801,8 +6801,7 @@ if test "${with_libssh2+set}" = set; the
     CPPFLAGS="-I$with_libssh2/include $CPPFLAGS"
     LDFLAGS="-L$with_libssh2/lib $LDFLAGS"
 
-    ac_fn_c_check_header_compile "$LINENO" "libssh2.h" "ac_cv_header_libssh2_h" "-lm
-"
+    ac_fn_c_check_header_compile "$LINENO" "libssh2.h" "ac_cv_header_libssh2_h" "$ac_includes_default"
 if test "x$ac_cv_header_libssh2_h" = xyes; then :
 
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libssh2_version in -lssh2" >&5
@@ -6811,7 +6810,7 @@ if ${ac_cv_lib_ssh2_libssh2_version+:} f
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lssh2  $LIBS"
+LIBS="-lssh2 -lm $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 




# Include getopt.h
#
# Report appropriate zlib/libssh2 versions
# https://github.com/nmap/nmap/commit/fd0db097498d5ff29f647508a80915d4d0e8d84a

--- nmap.cc.orig	2017-07-31 16:56:48 UTC
+++ nmap.cc
@@ -130,6 +130,7 @@

 #include "nmap.h"
 #include "osscan.h"
 #include "scan_engine.h"
@@ -182,11 +183,11 @@
 #endif
 
 #if HAVE_LIBSSH2
-#include "libssh2/libssh2v.h"
+#include <libssh2.h>
 #endif
 
 #if HAVE_LIBZ
-#include "libz/libzv.h"
+#include <zlib.h>
 #endif
 
 /* To get the version number only. */
@@ -2844,9 +2845,9 @@ static void display_nmap_version() {
 
 #if HAVE_LIBSSH2
 #ifdef LIBSSH2_INCLUDED
-  with.push_back(std::string("nmap-libssh2-") + get_word_or_quote(LIBSSH2_VERSION_TEXT, 1));
+  with.push_back(std::string("nmap-libssh2-") + get_word_or_quote(LIBSSH2_VERSION, 0));
 #else
-  with.push_back(std::string("libssh2-") + get_word_or_quote(LIBSSH2_VERSION_TEXT, 1));
+  with.push_back(std::string("libssh2-") + get_word_or_quote(LIBSSH2_VERSION, 0));
 #endif
 #else
   without.push_back("libssh2");
@@ -2854,9 +2855,9 @@ static void display_nmap_version() {
 
 #if HAVE_LIBZ
 #ifdef ZLIB_INCLUDED
-  with.push_back(std::string("nmap-libz-") + get_word_or_quote(LIBZ_VERSION_TEXT, 1));
+  with.push_back(std::string("nmap-libz-") + get_word_or_quote(ZLIB_VERSION, 0));
 #else
-  with.push_back(std::string("libz-") + get_word_or_quote(LIBZ_VERSION_TEXT, 1));
+  with.push_back(std::string("libz-") + get_word_or_quote(ZLIB_VERSION, 0));
 #endif
 #else
   without.push_back("libz");

Lines 12-18 Link Here

(-)pkg-descr (-2 / +2 lines)
12	Nmap toolset which depend on python. The translated manual pages	12	Nmap toolset which depend on python. The translated manual pages
13	for Nmap are contained in security/nmap-i18n-man.	13	for Nmap are contained in security/nmap-i18n-man.
14		14
15	WWW: http://nmap.org/	15	WWW: https://nmap.org/
16		16
17	See the web page and the Phrack Magazine article (Volume 7, Issue 51	17	See the web page and the Phrack Magazine article (Volume 7, Issue 51
18	September 01, 1997, article 11 of 17) http://nmap.org/p51-11.html	18	September 01, 1997, article 11 of 17) https://nmap.org/p51-11.html

Return to bug 221522

Lines 3-11 Link Here

(-)Makefile (-6 / +14 lines)
3		3
4	PORTNAME= nmap	4	PORTNAME= nmap
5	DISTVERSION= 7.60	5	DISTVERSION= 7.60
6	PORTREVISION= 0	6	PORTREVISION= 1
7	CATEGORIES= security ipv6	7	CATEGORIES= security ipv6
8	MASTER_SITES= http://nmap.org/dist/ \	8	MASTER_SITES= https://nmap.org/dist/ \
9	LOCAL/ohauer	9	LOCAL/ohauer
10		10
11	MAINTAINER?= ohauer@FreeBSD.org	11	MAINTAINER?= ohauer@FreeBSD.org
Lines 12-18 Link Here
12	COMMENT?= Port scanning utility for large networks	12	COMMENT?= Port scanning utility for large networks
13		13
14	# nmap-6.47 => svn.nmap.org/nmap-releases/nmap-6.47 (r33605)	14	# nmap-6.47 => svn.nmap.org/nmap-releases/nmap-6.47 (r33605)
15	# http://nmap.org/book/man-legal.html	15	# https://nmap.org/book/man-legal.html
16	# Install the nmap modified license because of	16	# Install the nmap modified license because of
17	# http://insecure.org/news/download-com-fiasco.html	17	# http://insecure.org/news/download-com-fiasco.html
18	LICENSE= GPLv2	18	LICENSE= GPLv2
Lines 20-34 Link Here
20		20
21	.if !defined(MASTERDIR)	21	.if !defined(MASTERDIR)
22		22
23	LIB_DEPENDS= libpcre.so:devel/pcre	23	LIB_DEPENDS= libpcre.so:devel/pcre \
		24	libpcap.so:net/libpcap
24		25
25	USES= tar:bzip2 gmake cpe	26	USES= tar:bzip2 gmake cpe
26	GNU_CONFIGURE= yes	27	GNU_CONFIGURE= yes
27		28
28	OPTIONS_SUB= yes	29	OPTIONS_SUB= yes
29	OPTIONS_DEFINE= DOCS SSL	30	OPTIONS_DEFINE= DOCS SSH2 SSL
30	OPTIONS_DEFAULT=SSL	31	OPTIONS_DEFAULT=SSH2 SSL
31		32
		33	SSH2_DESC= SSH2 protocol support
		34	SSH2_CONFIGURE_ON= --with-libssh2=${LOCALBASE}
		35	SSH2_CONFIGURE_OFF= --without-libssh2
		36	SSH2_IMPLIES= SSL
		37	SSH2_LIB_DEPENDS= libssh2.so:security/libssh2
32	SSL_USES= ssl	38	SSL_USES= ssl
33	SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE}	39	SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE}
34	SSL_CONFIGURE_OFF= --without-openssl	40	SSL_CONFIGURE_OFF= --without-openssl
Lines 41-46 Link Here
41	CONFIGURE_ARGS+=--without-localdirs \	47	CONFIGURE_ARGS+=--without-localdirs \
42	--without-zenmap \	48	--without-zenmap \
43	--without-ndiff \	49	--without-ndiff \
		50	--with-libdnet=included \
		51	--with-libpcap=${LOCALBASE} \
44	--with-libpcre=${LOCALBASE} \	52	--with-libpcre=${LOCALBASE} \
45	--with-liblua=included \	53	--with-liblua=included \
46	--without-nmap-update	54	--without-nmap-update

Lines 1-3 Link Here

(-)files/patch-configure (+24 lines)
		1	# Replace gcc with $CXX
		2	#
		3	# Fix libssh2 detection
		4	# https://github.com/nmap/nmap/commit/53e4e92e32721b1fa4490fbcd7ea6bb62f283839
		5
1	--- configure.orig 2017-07-31 19:09:47 UTC	6	--- configure.orig 2017-07-31 19:09:47 UTC
2	+++ configure	7	+++ configure
3	@@ -2583,7 +2583,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA	8	@@ -2583,7 +2583,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
Lines 18-20 Link Here
18	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5	23	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19	$as_echo_n "checking for $ac_word... " >&6; }	24	$as_echo_n "checking for $ac_word... " >&6; }
20	if ${ac_cv_prog_CC+:} false; then :	25	if ${ac_cv_prog_CC+:} false; then :
		26	@@ -6801,8 +6801,7 @@ if test "${with_libssh2+set}" = set; the
		27	CPPFLAGS="-I$with_libssh2/include $CPPFLAGS"
		28	LDFLAGS="-L$with_libssh2/lib $LDFLAGS"
		29
		30	- ac_fn_c_check_header_compile "$LINENO" "libssh2.h" "ac_cv_header_libssh2_h" "-lm
		31	-"
		32	+ ac_fn_c_check_header_compile "$LINENO" "libssh2.h" "ac_cv_header_libssh2_h" "$ac_includes_default"
		33	if test "x$ac_cv_header_libssh2_h" = xyes; then :
		34
		35	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libssh2_version in -lssh2" >&5
		36	@@ -6811,7 +6810,7 @@ if ${ac_cv_lib_ssh2_libssh2_version+:} f
		37	$as_echo_n "(cached) " >&6
		38	else
		39	ac_check_lib_save_LIBS=$LIBS
		40	-LIBS="-lssh2 $LIBS"
		41	+LIBS="-lssh2 -lm $LIBS"
		42	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
		43	/* end confdefs.h. */
		44

Lines 1-3 Link Here

(-)files/patch-nmap.cc (+43 lines)
		1	# Include getopt.h
		2	#
		3	# Report appropriate zlib/libssh2 versions
		4	# https://github.com/nmap/nmap/commit/fd0db097498d5ff29f647508a80915d4d0e8d84a
		5
1	--- nmap.cc.orig 2017-07-31 16:56:48 UTC	6	--- nmap.cc.orig 2017-07-31 16:56:48 UTC
2	+++ nmap.cc	7	+++ nmap.cc
3	@@ -130,6 +130,7 @@	8	@@ -130,6 +130,7 @@
Lines 8-10 Link Here
8	#include "nmap.h"	13	#include "nmap.h"
9	#include "osscan.h"	14	#include "osscan.h"
10	#include "scan_engine.h"	15	#include "scan_engine.h"
		16	@@ -182,11 +183,11 @@
		17	#endif
		18
		19	#if HAVE_LIBSSH2
		20	-#include "libssh2/libssh2v.h"
		21	+#include <libssh2.h>
		22	#endif
		23
		24	#if HAVE_LIBZ
		25	-#include "libz/libzv.h"
		26	+#include <zlib.h>
		27	#endif
		28
		29	/* To get the version number only. */
		30	@@ -2844,9 +2845,9 @@ static void display_nmap_version() {
		31
		32	#if HAVE_LIBSSH2
		33	#ifdef LIBSSH2_INCLUDED
		34	- with.push_back(std::string("nmap-libssh2-") + get_word_or_quote(LIBSSH2_VERSION_TEXT, 1));
		35	+ with.push_back(std::string("nmap-libssh2-") + get_word_or_quote(LIBSSH2_VERSION, 0));
		36	#else
		37	- with.push_back(std::string("libssh2-") + get_word_or_quote(LIBSSH2_VERSION_TEXT, 1));
		38	+ with.push_back(std::string("libssh2-") + get_word_or_quote(LIBSSH2_VERSION, 0));
		39	#endif
		40	#else
		41	without.push_back("libssh2");
		42	@@ -2854,9 +2855,9 @@ static void display_nmap_version() {
		43
		44	#if HAVE_LIBZ
		45	#ifdef ZLIB_INCLUDED
		46	- with.push_back(std::string("nmap-libz-") + get_word_or_quote(LIBZ_VERSION_TEXT, 1));
		47	+ with.push_back(std::string("nmap-libz-") + get_word_or_quote(ZLIB_VERSION, 0));
		48	#else
		49	- with.push_back(std::string("libz-") + get_word_or_quote(LIBZ_VERSION_TEXT, 1));
		50	+ with.push_back(std::string("libz-") + get_word_or_quote(ZLIB_VERSION, 0));
		51	#endif
		52	#else
		53	without.push_back("libz");