Re: UPDATE net/nmap 7.40

2016-12-22 Thread Stuart Henderson
On 2016/12/22 06:22, David CARLIER wrote:
> Hi,
> 
> there is the update to the newest version.

Thanks, working for me. Committed.



UPDATE net/nmap 7.40

2016-12-21 Thread David CARLIER
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
--- Makefile6 Oct 2016 05:47:35 -   1.122
+++ Makefile22 Dec 2016 06:20:18 -
@@ -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
--- distinfo6 Oct 2016 05:47:35 -   1.35
+++ distinfo22 Dec 2016 06:20:18 -
@@ -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 -   1.9
+++ patches/patch-libnetutil_netutil_cc 22 Dec 2016 06:20:18 -
@@ -8,9 +8,9 @@ http://marc.info/?l=nmap-dev=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, , , RTA_SRC, spoofss, intf_index);
}
  
@@ -41,7 +41,7 @@ chunks dealing with iovec: ???
len = recvmsg(fd, , 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, , 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_cc6 Oct 2016 05:47:35 -   1.9
+++ patches/patch-scan-engine_cc22 Dec 2016 06:20:18 -
@@ -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.origFri 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