Hi,
there is the update to the newest version.
Cheers.
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/nmap/Makefile,v
retrieving revision 1.122
diff -u -p -r1.122 Makefile
--- Makefile 6 Oct 2016 05:47:35 -0000 1.122
+++ Makefile 22 Dec 2016 06:20:18 -0000
@@ -3,7 +3,7 @@
COMMENT-main= scan ports and fingerprint stack of network hosts
COMMENT-zenmap= graphical frontend for nmap
-MODPY_EGG_VERSION= 7.30
+MODPY_EGG_VERSION= 7.40
DISTNAME= nmap-${MODPY_EGG_VERSION}
PKGNAME-main= ${DISTNAME}
PKGNAME-zenmap= nmap-zenmap-${MODPY_EGG_VERSION}
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/nmap/distinfo,v
retrieving revision 1.35
diff -u -p -r1.35 distinfo
--- distinfo 6 Oct 2016 05:47:35 -0000 1.35
+++ distinfo 22 Dec 2016 06:20:18 -0000
@@ -1,2 +1,2 @@
-SHA256 (nmap-7.30.tgz) = LdYrr7IGxgBe5SLhKNTpXd+4pVwLtaUz/hF0y4DjS4w=
-SIZE (nmap-7.30.tgz) = 11106693
+SHA256 (nmap-7.40.tgz) = rDX2ToIAce+naMNMlu10G3J4u/zp/td2zTIAyi2QSmU=
+SIZE (nmap-7.40.tgz) = 11229014
Index: patches/patch-libnetutil_netutil_cc
===================================================================
RCS file: /cvs/ports/net/nmap/patches/patch-libnetutil_netutil_cc,v
retrieving revision 1.9
diff -u -p -r1.9 patch-libnetutil_netutil_cc
--- patches/patch-libnetutil_netutil_cc 6 Oct 2016 05:47:35 -0000 1.9
+++ patches/patch-libnetutil_netutil_cc 22 Dec 2016 06:20:18 -0000
@@ -8,9 +8,9 @@ http://marc.info/?l=nmap-dev&m=140179174
chunks dealing with iovec: ???
---- libnetutil/netutil.cc.orig Thu Aug 25 19:41:03 2016
-+++ libnetutil/netutil.cc Thu Sep 29 22:04:48 2016
-@@ -3172,7 +3172,6 @@ static int route_dst_netlink(const struct sockaddr_sto
+--- libnetutil/netutil.cc.orig Wed Dec 14 00:12:23 2016
++++ libnetutil/netutil.cc Thu Dec 22 05:45:11 2016
+@@ -3179,7 +3179,6 @@ static int route_dst_netlink(const struct sockaddr_sto
const struct sockaddr_storage *spoofss) {
struct sockaddr_nl snl;
struct msghdr msg;
@@ -18,7 +18,7 @@ chunks dealing with iovec: ???
struct nlmsghdr *nlmsg;
struct rtmsg *rtmsg;
struct rtattr *rtattr;
-@@ -3224,22 +3223,14 @@ static int route_dst_netlink(const struct sockaddr_sto
+@@ -3231,22 +3230,14 @@ static int route_dst_netlink(const struct sockaddr_sto
add_rtattr_addr(nlmsg, &rtattr, &len, RTA_SRC, spoofss, intf_index);
}
@@ -41,7 +41,7 @@ chunks dealing with iovec: ???
len = recvmsg(fd, &msg, 0);
if (len <= 0)
netutil_fatal("%s: cannot recvmsg: %s", __func__, strerror(errno));
-@@ -3870,7 +3861,6 @@ static const unsigned char *add_exthdr_ancillary(struc
+@@ -3877,7 +3868,6 @@ static const unsigned char *add_exthdr_ancillary(struc
static int send_ipv6_ip(const struct sockaddr_in6 *dst,
const unsigned char *packet, size_t packetlen) {
struct msghdr msg;
@@ -49,7 +49,7 @@ chunks dealing with iovec: ???
const unsigned char *end;
struct ip6_hdr *hdr;
-@@ -3889,8 +3879,6 @@ static int send_ipv6_ip(const struct sockaddr_in6 *dst
+@@ -3896,8 +3886,6 @@ static int send_ipv6_ip(const struct sockaddr_in6 *dst
/* Set up sendmsg data structure. iov is filled in below. */
msg.msg_name = (void *) dst;
msg.msg_namelen = sizeof(*dst);
@@ -58,7 +58,7 @@ chunks dealing with iovec: ???
msg.msg_control = NULL;
msg.msg_controllen = 0;
msg.msg_flags = 0;
-@@ -3949,8 +3937,6 @@ static int send_ipv6_ip(const struct sockaddr_in6 *dst
+@@ -3956,8 +3944,6 @@ static int send_ipv6_ip(const struct sockaddr_in6 *dst
}
assert(packet <= end);
@@ -67,7 +67,7 @@ chunks dealing with iovec: ???
n = sendmsg(sd, &msg, 0);
if (n == -1)
-@@ -4153,9 +4139,6 @@ int datalink_offset(int datalink)
+@@ -4160,9 +4146,6 @@ int datalink_offset(int datalink)
{
if (datalink == DLT_EN10MB)
return ETH_HDR_LEN;
@@ -77,7 +77,7 @@ chunks dealing with iovec: ???
else
return -1;
}
-@@ -4281,10 +4264,6 @@ static bool accept_arp(const unsigned char *p, const s
+@@ -4288,10 +4271,6 @@ static bool accept_arp(const unsigned char *p, const s
if (datalink == DLT_EN10MB) {
return ntohs(*((u16 *) (p + 12))) == ETH_TYPE_ARP;
Index: patches/patch-scan-engine_cc
===================================================================
RCS file: /cvs/ports/net/nmap/patches/patch-scan-engine_cc,v
retrieving revision 1.9
diff -u -p -r1.9 patch-scan-engine_cc
--- patches/patch-scan-engine_cc 6 Oct 2016 05:47:35 -0000 1.9
+++ patches/patch-scan-engine_cc 22 Dec 2016 06:20:18 -0000
@@ -5,9 +5,9 @@ pcap_filter changes: to deal with base l
Format changes for 64-bit time_t, should go upstream
---- scan_engine.cc.orig Fri Aug 19 13:38:29 2016
-+++ scan_engine.cc Thu Sep 29 22:04:48 2016
-@@ -2029,7 +2029,7 @@ void ultrascan_host_probe_update(UltraScanInfo *USI, H
+--- scan_engine.cc.orig Wed Dec 14 00:12:23 2016
++++ scan_engine.cc Thu Dec 22 05:45:11 2016
+@@ -2037,7 +2037,7 @@ void ultrascan_host_probe_update(UltraScanInfo *USI, H
struct timeval tv;
gettimeofday(&tv, NULL);
Index: patches/patch-timing_cc
===================================================================
RCS file: /cvs/ports/net/nmap/patches/patch-timing_cc,v
retrieving revision 1.7
diff -u -p -r1.7 patch-timing_cc
--- patches/patch-timing_cc 6 Oct 2016 05:47:35 -0000 1.7
+++ patches/patch-timing_cc 22 Dec 2016 06:20:18 -0000
@@ -1,21 +1,12 @@
$OpenBSD: patch-timing_cc,v 1.7 2016/10/06 05:47:35 giovanni Exp $
---- timing.cc.orig Mon Aug 22 20:50:06 2016
-+++ timing.cc Thu Sep 29 22:04:48 2016
-@@ -125,6 +125,8 @@
+--- timing.cc.orig Wed Dec 14 00:12:23 2016
++++ timing.cc Thu Dec 22 05:45:12 2016
+@@ -132,6 +132,8 @@
- /* $Id: patch-timing_cc,v 1.7 2016/10/06 05:47:35 giovanni Exp $ */
+ /* $Id: timing.cc 36488 2016-12-14 00:12:23Z fyodor $ */
+#include <limits>
+
#include "timing.h"
#include "NmapOps.h"
#include "utils.h"
-@@ -437,7 +439,7 @@ void RateMeter::update(double amount, const struct tim
- interval = MAX(current_rate_history, diff);
- else
- interval = TIMEVAL_SUBTRACT(*now, start_tv) / 1000000.0;
-- assert(diff <= interval);
-+ assert(diff <= interval + std::numeric_limits<float>::epsilon());
- /* If we record an amount in the very same instant that the timer is
started,
- there's no way to calculate meaningful rates. Ignore it. */
- if (interval == 0.0)
Index: patches/patch-zenmap_install_scripts_unix_zenmap-root_desktop
===================================================================
RCS file:
/cvs/ports/net/nmap/patches/patch-zenmap_install_scripts_unix_zenmap-root_desktop,v
retrieving revision 1.2
diff -u -p -r1.2 patch-zenmap_install_scripts_unix_zenmap-root_desktop
--- patches/patch-zenmap_install_scripts_unix_zenmap-root_desktop 10 Feb
2014 17:43:15 -0000 1.2
+++ patches/patch-zenmap_install_scripts_unix_zenmap-root_desktop 22 Dec
2016 06:20:18 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-zenmap_install_scripts_unix_zenmap-root_desktop,v 1.2
2014/02/10 17:43:15 sthen Exp $
---- zenmap/install_scripts/unix/zenmap-root.desktop.orig Mon Dec 12
10:05:48 2011
-+++ zenmap/install_scripts/unix/zenmap-root.desktop Wed Jul 11 15:08:33 2012
-@@ -3,9 +3,9 @@ Encoding=UTF-8
+--- zenmap/install_scripts/unix/zenmap-root.desktop.orig Sat Dec 3
06:08:10 2016
++++ zenmap/install_scripts/unix/zenmap-root.desktop Thu Dec 22 05:45:12 2016
+@@ -2,9 +2,9 @@
Name=Zenmap (as root)
GenericName=GUI Port Scanner
TryExec=su-to-zenmap.sh
Index: patches/patch-zenmap_install_scripts_unix_zenmap_desktop
===================================================================
RCS file:
/cvs/ports/net/nmap/patches/patch-zenmap_install_scripts_unix_zenmap_desktop,v
retrieving revision 1.2
diff -u -p -r1.2 patch-zenmap_install_scripts_unix_zenmap_desktop
--- patches/patch-zenmap_install_scripts_unix_zenmap_desktop 10 Feb 2014
17:43:15 -0000 1.2
+++ patches/patch-zenmap_install_scripts_unix_zenmap_desktop 22 Dec 2016
06:20:18 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-zenmap_install_scripts_unix_zenmap_desktop,v 1.2 2014/02/10
17:43:15 sthen Exp $
---- zenmap/install_scripts/unix/zenmap.desktop.orig Mon Dec 12 10:05:48 2011
-+++ zenmap/install_scripts/unix/zenmap.desktop Wed Jul 11 15:08:33 2012
-@@ -5,7 +5,7 @@ GenericName=GUI Port Scanner
+--- zenmap/install_scripts/unix/zenmap.desktop.orig Sat Dec 3 06:08:10 2016
++++ zenmap/install_scripts/unix/zenmap.desktop Thu Dec 22 05:45:12 2016
+@@ -4,7 +4,7 @@ GenericName=GUI Port Scanner
TryExec=zenmap
Exec=zenmap %F
Terminal=false
Index: patches/patch-zenmap_setup_py
===================================================================
RCS file: /cvs/ports/net/nmap/patches/patch-zenmap_setup_py,v
retrieving revision 1.13
diff -u -p -r1.13 patch-zenmap_setup_py
--- patches/patch-zenmap_setup_py 18 Mar 2016 21:13:38 -0000 1.13
+++ patches/patch-zenmap_setup_py 22 Dec 2016 06:20:18 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-zenmap_setup_py,v 1.13 2016/03/18 21:13:38 giovanni Exp $
---- zenmap/setup.py.orig Tue Jan 5 14:12:42 2016
-+++ zenmap/setup.py Thu Mar 17 20:29:51 2016
+--- zenmap/setup.py.orig Wed May 18 16:24:36 2016
++++ zenmap/setup.py Thu Dec 22 05:53:32 2016
@@ -242,12 +242,11 @@ class my_install(install):
install.finalize_options(self)
@@ -15,10 +15,11 @@ $OpenBSD: patch-zenmap_setup_py,v 1.13 2
self.write_installed_files()
def get_installed_files(self):
-@@ -407,17 +406,10 @@ for dir in dirs:
+@@ -406,18 +405,10 @@ for dir in dirs:
+ # See $(nmapdatadir) in nmap/Makefile.in.
"NMAPDATADIR": os.path.join(self.saved_prefix, "share",
"nmap")
}
-
+-
- # Find and read the Paths.py file.
- pcontent = ""
paths_file = os.path.join("zenmapCore", "Paths.py")
@@ -36,7 +37,7 @@ $OpenBSD: patch-zenmap_setup_py,v 1.13 2
# Replace the path definitions.
for path, replacement in interesting_paths.items():
-@@ -440,11 +432,6 @@ for dir in dirs:
+@@ -440,11 +431,6 @@ for dir in dirs:
desktop_filename = None
root_desktop_filename = None
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/nmap/pkg/PLIST-main,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST-main
--- pkg/PLIST-main 6 Oct 2016 05:47:35 -0000 1.10
+++ pkg/PLIST-main 22 Dec 2016 06:20:18 -0000
@@ -106,6 +106,7 @@ share/nmap/nselib/eap.lua
share/nmap/nselib/eigrp.lua
share/nmap/nselib/formulas.lua
share/nmap/nselib/ftp.lua
+share/nmap/nselib/geoip.lua
share/nmap/nselib/giop.lua
share/nmap/nselib/gps.lua
share/nmap/nselib/http.lua
@@ -184,6 +185,7 @@ share/nmap/nselib/tab.lua
share/nmap/nselib/target.lua
share/nmap/nselib/tftp.lua
share/nmap/nselib/tls.lua
+share/nmap/nselib/tn3270.lua
share/nmap/nselib/tns.lua
share/nmap/nselib/unicode.lua
share/nmap/nselib/unittest.lua
@@ -258,6 +260,8 @@ share/nmap/scripts/broadcast-xdmcp-disco
share/nmap/scripts/cassandra-brute.nse
share/nmap/scripts/cassandra-info.nse
share/nmap/scripts/cccam-version.nse
+share/nmap/scripts/cics-enum.nse
+share/nmap/scripts/cics-user-enum.nse
share/nmap/scripts/citrix-brute-xml.nse
share/nmap/scripts/citrix-enum-apps-xml.nse
share/nmap/scripts/citrix-enum-apps.nse
@@ -311,6 +315,7 @@ share/nmap/scripts/epmd-info.nse
share/nmap/scripts/eppc-enum-processes.nse
share/nmap/scripts/fcrdns.nse
share/nmap/scripts/finger.nse
+share/nmap/scripts/fingerprint-strings.nse
share/nmap/scripts/firewalk.nse
share/nmap/scripts/firewall-bypass.nse
share/nmap/scripts/flume-master-info.nse
@@ -476,6 +481,9 @@ share/nmap/scripts/informix-tables.nse
share/nmap/scripts/ip-forwarding.nse
share/nmap/scripts/ip-geolocation-geoplugin.nse
share/nmap/scripts/ip-geolocation-ipinfodb.nse
+share/nmap/scripts/ip-geolocation-map-bing.nse
+share/nmap/scripts/ip-geolocation-map-google.nse
+share/nmap/scripts/ip-geolocation-map-kml.nse
share/nmap/scripts/ip-geolocation-maxmind.nse
share/nmap/scripts/ip-https-discover.nse
share/nmap/scripts/ipidseq.nse
@@ -567,6 +575,7 @@ share/nmap/scripts/nfs-ls.nse
share/nmap/scripts/nfs-showmount.nse
share/nmap/scripts/nfs-statfs.nse
share/nmap/scripts/nje-node-brute.nse
+share/nmap/scripts/nje-pass-brute.nse
share/nmap/scripts/nntp-ntlm-info.nse
share/nmap/scripts/nping-brute.nse
share/nmap/scripts/nrpe-enum.nse
@@ -684,11 +693,11 @@ share/nmap/scripts/ssh-hostkey.nse
share/nmap/scripts/ssh2-enum-algos.nse
share/nmap/scripts/sshv1.nse
share/nmap/scripts/ssl-ccs-injection.nse
+share/nmap/scripts/ssl-cert-intaddr.nse
share/nmap/scripts/ssl-cert.nse
share/nmap/scripts/ssl-date.nse
share/nmap/scripts/ssl-dh-params.nse
share/nmap/scripts/ssl-enum-ciphers.nse
-share/nmap/scripts/ssl-google-cert-catalog.nse
share/nmap/scripts/ssl-heartbleed.nse
share/nmap/scripts/ssl-known-key.nse
share/nmap/scripts/ssl-poodle.nse
@@ -716,8 +725,11 @@ share/nmap/scripts/telnet-encryption.nse
share/nmap/scripts/telnet-ntlm-info.nse
share/nmap/scripts/tftp-enum.nse
share/nmap/scripts/tls-nextprotoneg.nse
+share/nmap/scripts/tn3270-screen.nse
share/nmap/scripts/tor-consensus-checker.nse
share/nmap/scripts/traceroute-geolocation.nse
+share/nmap/scripts/tso-brute.nse
+share/nmap/scripts/tso-enum.nse
share/nmap/scripts/unittest.nse
share/nmap/scripts/unusual-port.nse
share/nmap/scripts/upnp-info.nse
@@ -729,6 +741,7 @@ share/nmap/scripts/vnc-brute.nse
share/nmap/scripts/vnc-info.nse
share/nmap/scripts/vnc-title.nse
share/nmap/scripts/voldemort-info.nse
+share/nmap/scripts/vtam-enum.nse
share/nmap/scripts/vuze-dht-info.nse
share/nmap/scripts/wdb-version.nse
share/nmap/scripts/weblogic-t3-info.nse
