Hi. This diff is to update nmap to 7.10
ok?
? patches/patch-scan_engine_cc Index: Makefile =================================================================== RCS file: /cvs/ports/net/nmap/Makefile,v retrieving revision 1.117 diff -u -p -r1.117 Makefile --- Makefile 7 Jan 2016 13:23:47 -0000 1.117 +++ Makefile 17 Mar 2016 21:01:05 -0000 @@ -5,7 +5,7 @@ SHARED_ONLY= Yes COMMENT-main= scan ports and fingerprint stack of network hosts COMMENT-zenmap= graphical frontend for nmap -MODPY_EGG_VERSION= 7.01 +MODPY_EGG_VERSION= 7.10 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.31 diff -u -p -r1.31 distinfo --- distinfo 7 Jan 2016 13:23:47 -0000 1.31 +++ distinfo 17 Mar 2016 21:01:05 -0000 @@ -1,2 +1,2 @@ -SHA256 (nmap-7.01.tgz) = jK86y+k8D6CmhcPm+zpfgM5Jk2vX1AJpoJs+rW/YXtU= -SIZE (nmap-7.01.tgz) = 11029121 +SHA256 (nmap-7.10.tgz) = aOxAGi2neGSsClmNtqgq0mpxVt8fXVdtr756odcgeD0= +SIZE (nmap-7.10.tgz) = 11086463 Index: patches/patch-libnetutil_netutil_cc =================================================================== RCS file: /cvs/ports/net/nmap/patches/patch-libnetutil_netutil_cc,v retrieving revision 1.7 diff -u -p -r1.7 patch-libnetutil_netutil_cc --- patches/patch-libnetutil_netutil_cc 7 Jan 2016 13:23:47 -0000 1.7 +++ patches/patch-libnetutil_netutil_cc 17 Mar 2016 21:01:05 -0000 @@ -8,18 +8,9 @@ http://marc.info/?l=nmap-dev&m=140179174 chunks dealing with iovec: ??? ---- libnetutil/netutil.cc.orig Wed Oct 28 04:21:15 2015 -+++ libnetutil/netutil.cc Tue Dec 29 10:47:48 2015 -@@ -915,7 +915,7 @@ void set_ttl(int sd, int ttl) { - /* Other than WIN32, what these systems have in common is that they use BPF for - packet capture. (Solaris 10 and earlier used DLPI and had valid selectable - fds.) */ --#if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) && (__FreeBSD_version < 500000) || defined(SOLARIS_BPF_PCAP_CAPTURE)) -+#if defined(WIN32) || defined(MACOSX) || defined(OPENBSD) || (defined(FREEBSD) && (__FreeBSD_version < 500000) || defined(SOLARIS_BPF_PCAP_CAPTURE)) - /* Returns whether the system supports pcap_get_selectable_fd() properly */ - int pcap_selectable_fd_valid() { - return 0; -@@ -3139,7 +3139,6 @@ static int route_dst_netlink(const struct sockaddr_sto +--- libnetutil/netutil.cc.orig Thu Mar 17 20:17:27 2016 ++++ libnetutil/netutil.cc Thu Mar 17 20:19:47 2016 +@@ -3142,7 +3142,6 @@ static int route_dst_netlink(const struct sockaddr_sto const struct sockaddr_storage *spoofss) { struct sockaddr_nl snl; struct msghdr msg; @@ -27,7 +18,7 @@ chunks dealing with iovec: ??? struct nlmsghdr *nlmsg; struct rtmsg *rtmsg; struct rtattr *rtattr; -@@ -3191,22 +3190,14 @@ static int route_dst_netlink(const struct sockaddr_sto +@@ -3194,22 +3193,14 @@ static int route_dst_netlink(const struct sockaddr_sto add_rtattr_addr(nlmsg, &rtattr, &len, RTA_SRC, spoofss, intf_index); } @@ -50,7 +41,7 @@ chunks dealing with iovec: ??? len = recvmsg(fd, &msg, 0); if (len <= 0) netutil_fatal("%s: cannot recvmsg: %s", __func__, strerror(errno)); -@@ -3837,7 +3828,6 @@ static const unsigned char *add_exthdr_ancillary(struc +@@ -3840,7 +3831,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; @@ -58,7 +49,7 @@ chunks dealing with iovec: ??? const unsigned char *end; struct ip6_hdr *hdr; -@@ -3853,8 +3843,6 @@ static int send_ipv6_ip(const struct sockaddr_in6 *dst +@@ -3859,8 +3849,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); @@ -67,7 +58,7 @@ chunks dealing with iovec: ??? msg.msg_control = NULL; msg.msg_controllen = 0; msg.msg_flags = 0; -@@ -3913,8 +3901,6 @@ static int send_ipv6_ip(const struct sockaddr_in6 *dst +@@ -3919,8 +3907,6 @@ static int send_ipv6_ip(const struct sockaddr_in6 *dst } assert(packet <= end); @@ -76,7 +67,7 @@ chunks dealing with iovec: ??? n = sendmsg(sd, &msg, 0); if (n == -1) -@@ -4117,9 +4103,6 @@ int datalink_offset(int datalink) +@@ -4123,9 +4109,6 @@ int datalink_offset(int datalink) { if (datalink == DLT_EN10MB) return ETH_HDR_LEN; @@ -86,16 +77,7 @@ chunks dealing with iovec: ??? else return -1; } -@@ -4156,7 +4139,7 @@ static int read_reply_pcap(pcap_t *pd, long to_usec, - netutil_fatal("Cannot obtain datalink information: %s", pcap_geterr(pd)); - ioffset = datalink_offset(*datalink); - if (ioffset < 0) -- netutil_fatal("datalink_offset failed for type %d (DLT_EN10MB = %d, DLT_LINUX_SLL = %d)", *datalink, DLT_EN10MB, DLT_LINUX_SLL); -+ netutil_fatal("datalink_offset failed for type %d (DLT_EN10MB = %d)", *datalink, DLT_EN10MB); - *offset = (unsigned int) ioffset; - - if (to_usec > 0) { -@@ -4256,10 +4239,6 @@ static bool accept_arp(const unsigned char *p, const s +@@ -4262,10 +4245,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-timing_cc =================================================================== RCS file: /cvs/ports/net/nmap/patches/patch-timing_cc,v retrieving revision 1.5 diff -u -p -r1.5 patch-timing_cc --- patches/patch-timing_cc 7 Jan 2016 13:23:47 -0000 1.5 +++ patches/patch-timing_cc 17 Mar 2016 21:01:05 -0000 @@ -1,13 +1,9 @@ -$OpenBSD: patch-timing_cc,v 1.5 2016/01/07 13:23:47 giovanni Exp $ - -Avoid float-related assertion triggered on i386, not triggered on -macppc/amd64/sparc64. - ---- timing.cc.orig Tue Jun 23 02:09:01 2015 -+++ timing.cc Tue Dec 29 10:47:48 2015 +$OpenBSD$ +--- timing.cc.orig Tue Jun 23 01:09:01 2015 ++++ timing.cc Thu Mar 17 20:44:33 2016 @@ -125,6 +125,8 @@ - /* $Id: patch-timing_cc,v 1.5 2016/01/07 13:23:47 giovanni Exp $ */ + /* $Id: timing.cc 34709 2015-06-23 00:09:01Z dmiller $ */ +#include <limits> + Index: patches/patch-zenmap_setup_py =================================================================== RCS file: /cvs/ports/net/nmap/patches/patch-zenmap_setup_py,v retrieving revision 1.12 diff -u -p -r1.12 patch-zenmap_setup_py --- patches/patch-zenmap_setup_py 7 Jan 2016 13:23:47 -0000 1.12 +++ patches/patch-zenmap_setup_py 17 Mar 2016 21:01:05 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-zenmap_setup_py,v 1.12 2016/01/07 13:23:47 giovanni Exp $ ---- zenmap/setup.py.orig Wed Dec 9 16:45:33 2015 -+++ zenmap/setup.py Tue Dec 29 10:47:48 2015 -@@ -239,12 +239,11 @@ class my_install(install): +--- zenmap/setup.py.orig Tue Jan 5 14:12:42 2016 ++++ zenmap/setup.py Thu Mar 17 20:29:51 2016 +@@ -242,12 +242,11 @@ class my_install(install): install.finalize_options(self) def run(self): @@ -15,7 +15,7 @@ $OpenBSD: patch-zenmap_setup_py,v 1.12 2 self.write_installed_files() def get_installed_files(self): -@@ -404,17 +403,10 @@ for dir in dirs: +@@ -407,17 +406,10 @@ for dir in dirs: "NMAPDATADIR": os.path.join(self.saved_prefix, "share", "nmap") } @@ -36,7 +36,7 @@ $OpenBSD: patch-zenmap_setup_py,v 1.12 2 # Replace the path definitions. for path, replacement in interesting_paths.items(): -@@ -437,11 +429,6 @@ for dir in dirs: +@@ -440,11 +432,6 @@ for dir in dirs: desktop_filename = None root_desktop_filename = None