diff -pruN nmap.orig nmap diff -pruN nmap.orig/Makefile nmap/Makefile --- nmap.orig/Makefile Mon Jul 19 07:45:48 2021 +++ nmap/Makefile Sun Jul 18 18:02:44 2021 @@ -3,7 +3,7 @@ COMMENT-main= scan ports and fingerprint stack of network hosts COMMENT-zenmap= graphical frontend for nmap -MODPY_EGG_VERSION= 7.80 +MODPY_EGG_VERSION= 7.91 DISTNAME= nmap-${MODPY_EGG_VERSION} PKGNAME-main= ${DISTNAME} PKGNAME-zenmap= nmap-zenmap-${MODPY_EGG_VERSION} @@ -17,7 +17,7 @@ HOMEPAGE= https://www.nmap.org/ MAINTAINER= David Carlier -# GPL (v2 only), with additional clarifications and exceptions, see COPYING +# NPSL, Nmap Public Source with additional clarifications and exceptions, see COPYING PERMIT_PACKAGE= Yes MULTI_PACKAGES= -main -zenmap diff -pruN nmap.orig/distinfo nmap/distinfo --- nmap.orig/distinfo Mon Jul 19 07:45:48 2021 +++ nmap/distinfo Sun Jul 18 18:22:02 2021 @@ -1,2 +1,2 @@ -SHA256 (nmap-7.80.tgz) = eAy/Sg3bnpzUnY+9+lx/NozHroV938ORAt0rg6kF16c= -SIZE (nmap-7.80.tgz) = 13132692 +SHA256 (nmap-7.91.tgz) = 9ecf2e93adad5a90c69fa7ab419937ef670398707dd4f97b12bf464d6b1e6cda +SIZE (nmap-7.91.tgz) = 12971299 diff -pruN nmap.orig/patches/patch-libnetutil_netutil_cc nmap/patches/patch-libnetutil_netutil_cc --- nmap.orig/patches/patch-libnetutil_netutil_cc Mon Jul 19 07:45:48 2021 +++ nmap/patches/patch-libnetutil_netutil_cc Wed Dec 31 16:00:00 1969 @@ -1,91 +0,0 @@ -$OpenBSD: patch-libnetutil_netutil_cc,v 1.11 2019/08/24 06:37:13 giovanni Exp $ - -first chunk: -http://marc.info/?l=openbsd-ports&m=140284432321370&w=2 - -similar diff to DLT_LINUX_SLL chunks sent upstream but they seem uninterested. -http://marc.info/?l=nmap-dev&m=140179174718457&w=2 - -chunks dealing with iovec: ??? - -Index: libnetutil/netutil.cc ---- libnetutil/netutil.cc.orig -+++ libnetutil/netutil.cc -@@ -3159,7 +3159,6 @@ static int route_dst_netlink(const struct sockaddr_sto - const struct sockaddr_storage *spoofss) { - struct sockaddr_nl snl; - struct msghdr msg; -- struct iovec iov; - struct nlmsghdr *nlmsg; - struct rtmsg *rtmsg; - struct rtattr *rtattr; -@@ -3211,22 +3210,14 @@ static int route_dst_netlink(const struct sockaddr_sto - add_rtattr_addr(nlmsg, &rtattr, &len, RTA_SRC, spoofss, intf_index); - } - -- iov.iov_base = nlmsg; -- iov.iov_len = nlmsg->nlmsg_len; -- - memset(&msg, 0, sizeof(msg)); - msg.msg_name = &snl; - msg.msg_namelen = sizeof(snl); -- msg.msg_iov = &iov; -- msg.msg_iovlen = 1; - - rc = sendmsg(fd, &msg, 0); - if (rc == -1) - netutil_fatal("%s: cannot sendmsg: %s", __func__, strerror(errno)); - -- iov.iov_base = buf; -- iov.iov_len = sizeof(buf); -- - len = recvmsg(fd, &msg, 0); - if (len <= 0) - netutil_fatal("%s: cannot recvmsg: %s", __func__, strerror(errno)); -@@ -3857,7 +3848,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; -- struct iovec iov; - - const unsigned char *end; - struct ip6_hdr *hdr; -@@ -3876,8 +3866,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); -- msg.msg_iov = &iov; -- msg.msg_iovlen = 1; - msg.msg_control = NULL; - msg.msg_controllen = 0; - msg.msg_flags = 0; -@@ -3936,8 +3924,6 @@ static int send_ipv6_ip(const struct sockaddr_in6 *dst - } - - assert(packet <= end); -- iov.iov_base = (unsigned char *) packet; -- iov.iov_len = end - packet; - - n = sendmsg(sd, &msg, 0); - if (n == -1) -@@ -4165,9 +4151,6 @@ int datalink_offset(int datalink) - { - if (datalink == DLT_EN10MB) - return ETH_HDR_LEN; -- else if (datalink == DLT_LINUX_SLL) -- /* The datalink type is Linux "cooked" sockets. See pcap-linktype(7). */ -- return 16; - else - return -1; - } -@@ -4293,10 +4276,6 @@ static bool accept_arp(const unsigned char *p, const s - - if (datalink == DLT_EN10MB) { - return ntohs(*((u16 *) (p + 12))) == ETH_TYPE_ARP; -- } else if (datalink == DLT_LINUX_SLL) { -- return ntohs(*((u16 *) (p + 2))) == ARPHRD_ETHER && /* sll_hatype */ -- ntohs(*((u16 *) (p + 4))) == 6 && /* sll_halen */ -- ntohs(*((u16 *) (p + 14))) == ETH_TYPE_ARP; /* sll_protocol */ - } else { - return false; - }