View | Details | Raw Unified | Return to bug 221522 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-7 / +14 lines)
Lines 2-11 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	nmap
4
PORTNAME=	nmap
5
DISTVERSION=	7.60
5
DISTVERSION=	7.70
6
PORTREVISION=	0
6
PORTREVISION=	0
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-39 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.1: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
35
SSL_CFLAGS=		-I${OPENSSLINC}
41
SSL_CFLAGS=		-I${OPENSSLINC}
36
SSL_VARS=		STRIP_FILES=ncat
42
SSL_VARS=		STRIP_FILES+=ncat
37
43
38
DOCS=	CHANGELOG HACKING
44
DOCS=	CHANGELOG HACKING
39
STRIP_FILES+=	nmap nping
45
STRIP_FILES+=	nmap nping
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-libpcap=${LOCALBASE} \
44
		--with-libpcre=${LOCALBASE} \
51
		--with-libpcre=${LOCALBASE} \
45
		--with-liblua=included \
52
		--with-liblua=included \
46
		--without-nmap-update
53
		--without-nmap-update
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1501622830
1
TIMESTAMP = 1521431844
2
SHA256 (nmap-7.60.tar.bz2) = a8796ecc4fa6c38aad6139d9515dc8113023a82e9d787e5a5fb5fa1b05516f21
2
SHA256 (nmap-7.70.tar.bz2) = 847b068955f792f4cc247593aca6dc3dc4aae12976169873247488de147a6e18
3
SIZE (nmap-7.60.tar.bz2) = 10394925
3
SIZE (nmap-7.70.tar.bz2) = 10467371
(-)files/patch-libdnet-stripped_configure (-4 / +4 lines)
Lines 1-6 Link Here
1
--- libdnet-stripped/configure.orig	2017-02-13 19:46:23 UTC
1
--- libdnet-stripped/configure.orig	2017-08-02 18:48:27 UTC
2
+++ libdnet-stripped/configure
2
+++ libdnet-stripped/configure
3
@@ -733,6 +733,9 @@ ac_includes_default="\
3
@@ -764,6 +764,9 @@ ac_includes_default="\
4
 #ifdef HAVE_STDINT_H
4
 #ifdef HAVE_STDINT_H
5
 # include <stdint.h>
5
 # include <stdint.h>
6
 #endif
6
 #endif
Lines 10-17 Link Here
10
 #ifdef HAVE_UNISTD_H
10
 #ifdef HAVE_UNISTD_H
11
 # include <unistd.h>
11
 # include <unistd.h>
12
 #endif"
12
 #endif"
13
@@ -11716,11 +11719,8 @@ $as_echo_n "checking for Berkeley Packet
13
@@ -11828,11 +11831,8 @@ $as_echo_n "checking for Berkeley Packet
14
     if test "${ac_cv_dnet_bsd_bpf+set}" = set; then :
14
     if ${ac_cv_dnet_bsd_bpf+:} false; then :
15
   $as_echo_n "(cached) " >&6
15
   $as_echo_n "(cached) " >&6
16
 else
16
 else
17
-  if test -c /dev/bpf0 ; then
17
-  if test -c /dev/bpf0 ; then
(-)files/patch-libdnet-stripped_src_arp-ioctl.c (+14 lines)
Line 0 Link Here
1
# Use correct width in sscanf. Fixes #1156
2
# https://github.com/nmap/nmap/commit/36a6d897a584013d25e51ac339fe45ffc45df9df
3
4
--- libdnet-stripped/src/arp-ioctl.c.orig	2008-09-19 06:12:25 UTC
5
+++ libdnet-stripped/src/arp-ioctl.c
6
@@ -218,7 +218,7 @@ arp_loop(arp_t *a, arp_handler callback,
7
 
8
 	ret = 0;
9
 	while (fgets(buf, sizeof(buf), fp) != NULL) {
10
-		i = sscanf(buf, "%s 0x%x 0x%x %100s %100s %100s\n",
11
+		i = sscanf(buf, "%s 0x%x 0x%x %99s %99s %99s\n",
12
 		    ipbuf, &type, &flags, macbuf, maskbuf, devbuf);
13
 		
14
 		if (i < 4 || (flags & ATF_COM) == 0)
(-)pkg-descr (-2 / +2 lines)
Lines 12-18 Link Here
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
(-)pkg-plist (+14 lines)
Lines 62-67 Link Here
62
%%DATADIR%%/nselib/data/http-folders.txt
62
%%DATADIR%%/nselib/data/http-folders.txt
63
%%DATADIR%%/nselib/data/http-sql-errors.lst
63
%%DATADIR%%/nselib/data/http-sql-errors.lst
64
%%DATADIR%%/nselib/data/http-web-files-extensions.lst
64
%%DATADIR%%/nselib/data/http-web-files-extensions.lst
65
%%DATADIR%%/nselib/data/idnaMappings.lua
65
%%DATADIR%%/nselib/data/ike-fingerprints.lua
66
%%DATADIR%%/nselib/data/ike-fingerprints.lua
66
%%DATADIR%%/nselib/data/jdwp-class/JDWPExecCmd.class
67
%%DATADIR%%/nselib/data/jdwp-class/JDWPExecCmd.class
67
%%DATADIR%%/nselib/data/jdwp-class/JDWPExecCmd.java
68
%%DATADIR%%/nselib/data/jdwp-class/JDWPExecCmd.java
Lines 114-119 Link Here
114
%%DATADIR%%/nselib/http.lua
115
%%DATADIR%%/nselib/http.lua
115
%%DATADIR%%/nselib/httpspider.lua
116
%%DATADIR%%/nselib/httpspider.lua
116
%%DATADIR%%/nselib/iax2.lua
117
%%DATADIR%%/nselib/iax2.lua
118
%%DATADIR%%/nselib/idna.lua
117
%%DATADIR%%/nselib/ike.lua
119
%%DATADIR%%/nselib/ike.lua
118
%%DATADIR%%/nselib/imap.lua
120
%%DATADIR%%/nselib/imap.lua
119
%%DATADIR%%/nselib/informix.lua
121
%%DATADIR%%/nselib/informix.lua
Lines 145-150 Link Here
145
%%DATADIR%%/nselib/multicast.lua
147
%%DATADIR%%/nselib/multicast.lua
146
%%DATADIR%%/nselib/mysql.lua
148
%%DATADIR%%/nselib/mysql.lua
147
%%DATADIR%%/nselib/natpmp.lua
149
%%DATADIR%%/nselib/natpmp.lua
150
%%DATADIR%%/nselib/nbd.lua
148
%%DATADIR%%/nselib/ncp.lua
151
%%DATADIR%%/nselib/ncp.lua
149
%%DATADIR%%/nselib/ndmp.lua
152
%%DATADIR%%/nselib/ndmp.lua
150
%%DATADIR%%/nselib/netbios.lua
153
%%DATADIR%%/nselib/netbios.lua
Lines 160-165 Link Here
160
%%DATADIR%%/nselib/pop3.lua
163
%%DATADIR%%/nselib/pop3.lua
161
%%DATADIR%%/nselib/pppoe.lua
164
%%DATADIR%%/nselib/pppoe.lua
162
%%DATADIR%%/nselib/proxy.lua
165
%%DATADIR%%/nselib/proxy.lua
166
%%DATADIR%%/nselib/punycode.lua
163
%%DATADIR%%/nselib/rdp.lua
167
%%DATADIR%%/nselib/rdp.lua
164
%%DATADIR%%/nselib/re.lua
168
%%DATADIR%%/nselib/re.lua
165
%%DATADIR%%/nselib/redis.lua
169
%%DATADIR%%/nselib/redis.lua
Lines 205-210 Link Here
205
%%DATADIR%%/nselib/wsdd.lua
209
%%DATADIR%%/nselib/wsdd.lua
206
%%DATADIR%%/nselib/xdmcp.lua
210
%%DATADIR%%/nselib/xdmcp.lua
207
%%DATADIR%%/nselib/xmpp.lua
211
%%DATADIR%%/nselib/xmpp.lua
212
%%DATADIR%%/nselib/zlib.luadoc
208
%%DATADIR%%/scripts/acarsd-info.nse
213
%%DATADIR%%/scripts/acarsd-info.nse
209
%%DATADIR%%/scripts/address-info.nse
214
%%DATADIR%%/scripts/address-info.nse
210
%%DATADIR%%/scripts/afp-brute.nse
215
%%DATADIR%%/scripts/afp-brute.nse
Lines 288-293 Link Here
288
%%DATADIR%%/scripts/daap-get-library.nse
293
%%DATADIR%%/scripts/daap-get-library.nse
289
%%DATADIR%%/scripts/daytime.nse
294
%%DATADIR%%/scripts/daytime.nse
290
%%DATADIR%%/scripts/db2-das-info.nse
295
%%DATADIR%%/scripts/db2-das-info.nse
296
%%DATADIR%%/scripts/deluge-rpc-brute.nse
291
%%DATADIR%%/scripts/dhcp-discover.nse
297
%%DATADIR%%/scripts/dhcp-discover.nse
292
%%DATADIR%%/scripts/dict-info.nse
298
%%DATADIR%%/scripts/dict-info.nse
293
%%DATADIR%%/scripts/distcc-cve2004-2687.nse
299
%%DATADIR%%/scripts/distcc-cve2004-2687.nse
Lines 352-357 Link Here
352
%%DATADIR%%/scripts/hddtemp-info.nse
358
%%DATADIR%%/scripts/hddtemp-info.nse
353
%%DATADIR%%/scripts/hnap-info.nse
359
%%DATADIR%%/scripts/hnap-info.nse
354
%%DATADIR%%/scripts/hostmap-bfk.nse
360
%%DATADIR%%/scripts/hostmap-bfk.nse
361
%%DATADIR%%/scripts/hostmap-crtsh.nse
355
%%DATADIR%%/scripts/hostmap-ip2hosts.nse
362
%%DATADIR%%/scripts/hostmap-ip2hosts.nse
356
%%DATADIR%%/scripts/hostmap-robtex.nse
363
%%DATADIR%%/scripts/hostmap-robtex.nse
357
%%DATADIR%%/scripts/http-adobe-coldfusion-apsa1301.nse
364
%%DATADIR%%/scripts/http-adobe-coldfusion-apsa1301.nse
Lines 366-371 Link Here
366
%%DATADIR%%/scripts/http-axis2-dir-traversal.nse
373
%%DATADIR%%/scripts/http-axis2-dir-traversal.nse
367
%%DATADIR%%/scripts/http-backup-finder.nse
374
%%DATADIR%%/scripts/http-backup-finder.nse
368
%%DATADIR%%/scripts/http-barracuda-dir-traversal.nse
375
%%DATADIR%%/scripts/http-barracuda-dir-traversal.nse
376
%%DATADIR%%/scripts/http-bigip-cookie.nse
369
%%DATADIR%%/scripts/http-brute.nse
377
%%DATADIR%%/scripts/http-brute.nse
370
%%DATADIR%%/scripts/http-cakephp-version.nse
378
%%DATADIR%%/scripts/http-cakephp-version.nse
371
%%DATADIR%%/scripts/http-chrono.nse
379
%%DATADIR%%/scripts/http-chrono.nse
Lines 408-413 Link Here
408
%%DATADIR%%/scripts/http-iis-webdav-vuln.nse
416
%%DATADIR%%/scripts/http-iis-webdav-vuln.nse
409
%%DATADIR%%/scripts/http-internal-ip-disclosure.nse
417
%%DATADIR%%/scripts/http-internal-ip-disclosure.nse
410
%%DATADIR%%/scripts/http-joomla-brute.nse
418
%%DATADIR%%/scripts/http-joomla-brute.nse
419
%%DATADIR%%/scripts/http-jsonp-detection.nse
411
%%DATADIR%%/scripts/http-litespeed-sourcecode-download.nse
420
%%DATADIR%%/scripts/http-litespeed-sourcecode-download.nse
412
%%DATADIR%%/scripts/http-ls.nse
421
%%DATADIR%%/scripts/http-ls.nse
413
%%DATADIR%%/scripts/http-majordomo2-dir-traversal.nse
422
%%DATADIR%%/scripts/http-majordomo2-dir-traversal.nse
Lines 445-450 Link Here
445
%%DATADIR%%/scripts/http-tplink-dir-traversal.nse
454
%%DATADIR%%/scripts/http-tplink-dir-traversal.nse
446
%%DATADIR%%/scripts/http-trace.nse
455
%%DATADIR%%/scripts/http-trace.nse
447
%%DATADIR%%/scripts/http-traceroute.nse
456
%%DATADIR%%/scripts/http-traceroute.nse
457
%%DATADIR%%/scripts/http-trane-info.nse
448
%%DATADIR%%/scripts/http-unsafe-output-escaping.nse
458
%%DATADIR%%/scripts/http-unsafe-output-escaping.nse
449
%%DATADIR%%/scripts/http-useragent-tester.nse
459
%%DATADIR%%/scripts/http-useragent-tester.nse
450
%%DATADIR%%/scripts/http-userdir-enum.nse
460
%%DATADIR%%/scripts/http-userdir-enum.nse
Lines 576-581 Link Here
576
%%DATADIR%%/scripts/mysql-vuln-cve2012-2122.nse
586
%%DATADIR%%/scripts/mysql-vuln-cve2012-2122.nse
577
%%DATADIR%%/scripts/nat-pmp-info.nse
587
%%DATADIR%%/scripts/nat-pmp-info.nse
578
%%DATADIR%%/scripts/nat-pmp-mapport.nse
588
%%DATADIR%%/scripts/nat-pmp-mapport.nse
589
%%DATADIR%%/scripts/nbd-info.nse
579
%%DATADIR%%/scripts/nbstat.nse
590
%%DATADIR%%/scripts/nbstat.nse
580
%%DATADIR%%/scripts/ncp-enum-users.nse
591
%%DATADIR%%/scripts/ncp-enum-users.nse
581
%%DATADIR%%/scripts/ncp-serverinfo.nse
592
%%DATADIR%%/scripts/ncp-serverinfo.nse
Lines 643-648 Link Here
643
%%DATADIR%%/scripts/rpcap-brute.nse
654
%%DATADIR%%/scripts/rpcap-brute.nse
644
%%DATADIR%%/scripts/rpcap-info.nse
655
%%DATADIR%%/scripts/rpcap-info.nse
645
%%DATADIR%%/scripts/rpcinfo.nse
656
%%DATADIR%%/scripts/rpcinfo.nse
657
%%DATADIR%%/scripts/rsa-vuln-roca.nse
646
%%DATADIR%%/scripts/rsync-brute.nse
658
%%DATADIR%%/scripts/rsync-brute.nse
647
%%DATADIR%%/scripts/rsync-list-modules.nse
659
%%DATADIR%%/scripts/rsync-list-modules.nse
648
%%DATADIR%%/scripts/rtsp-methods.nse
660
%%DATADIR%%/scripts/rtsp-methods.nse
Lines 663-668 Link Here
663
%%DATADIR%%/scripts/smb-enum-domains.nse
675
%%DATADIR%%/scripts/smb-enum-domains.nse
664
%%DATADIR%%/scripts/smb-enum-groups.nse
676
%%DATADIR%%/scripts/smb-enum-groups.nse
665
%%DATADIR%%/scripts/smb-enum-processes.nse
677
%%DATADIR%%/scripts/smb-enum-processes.nse
678
%%DATADIR%%/scripts/smb-enum-services.nse
666
%%DATADIR%%/scripts/smb-enum-sessions.nse
679
%%DATADIR%%/scripts/smb-enum-sessions.nse
667
%%DATADIR%%/scripts/smb-enum-shares.nse
680
%%DATADIR%%/scripts/smb-enum-shares.nse
668
%%DATADIR%%/scripts/smb-enum-users.nse
681
%%DATADIR%%/scripts/smb-enum-users.nse
Lines 754-759 Link Here
754
%%DATADIR%%/scripts/telnet-encryption.nse
767
%%DATADIR%%/scripts/telnet-encryption.nse
755
%%DATADIR%%/scripts/telnet-ntlm-info.nse
768
%%DATADIR%%/scripts/telnet-ntlm-info.nse
756
%%DATADIR%%/scripts/tftp-enum.nse
769
%%DATADIR%%/scripts/tftp-enum.nse
770
%%DATADIR%%/scripts/tls-alpn.nse
757
%%DATADIR%%/scripts/tls-nextprotoneg.nse
771
%%DATADIR%%/scripts/tls-nextprotoneg.nse
758
%%DATADIR%%/scripts/tls-ticketbleed.nse
772
%%DATADIR%%/scripts/tls-ticketbleed.nse
759
%%DATADIR%%/scripts/tn3270-screen.nse
773
%%DATADIR%%/scripts/tn3270-screen.nse

Return to bug 221522