On 03/18/16 12:33, David CARLIER wrote:
sorry for the inconveniency, is this diff working better ?
(in fact the patch for osscan2 is now useless)
Thanks.
you should regen plist as well, there are new nse scripts.
diff attached, will commit this week-end.
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /var/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 18 Mar 2016 11:38:50 -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: /var/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 18 Mar 2016 11:38:50 -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: /var/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 18 Mar 2016 11:38:50 -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-osscan2_cc
===================================================================
RCS file: patches/patch-osscan2_cc
diff -N patches/patch-osscan2_cc
--- patches/patch-osscan2_cc 7 Jan 2016 13:23:47 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-osscan2_cc,v 1.3 2016/01/07 13:23:47 giovanni Exp $
-
-Format changes for 64-bit time_t, should go upstream
-
---- osscan2.cc.orig Tue Nov 10 05:26:26 2015
-+++ osscan2.cc Tue Dec 29 10:47:48 2015
-@@ -2582,8 +2582,8 @@ void HostOsScan::makeTSeqFP(HostOsScanStats *hss) {
- if (lastboot != 0.0 && (hss->seq_send_times[0].tv_sec - lastboot > 63072000)) {
- /* Up 2 years? Perhaps, but they're probably lying. */
- if (o.debugging) {
-- log_write(LOG_STDOUT, "Ignoring claimed %s uptime of %lu days\n",
-- hss->target->targetipstr(), (hss->seq_send_times[0].tv_sec - hss->si.lastboot) / 86400);
-+ log_write(LOG_STDOUT, "Ignoring claimed %s uptime of %lld days\n",
-+ hss->target->targetipstr(), (long long) ((hss->seq_send_times[0].tv_sec - hss->si.lastboot) / 86400));
- }
- lastboot = 0;
- }
Index: patches/patch-timing_cc
===================================================================
RCS file: /var/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 18 Mar 2016 11:38:50 -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: /var/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 18 Mar 2016 11:38:50 -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
Index: pkg/PLIST-main
===================================================================
RCS file: /var/cvs/ports/net/nmap/pkg/PLIST-main,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST-main
--- pkg/PLIST-main 7 Jan 2016 13:23:47 -0000 1.8
+++ pkg/PLIST-main 18 Mar 2016 11:48:00 -0000
@@ -121,6 +121,7 @@ share/nmap/nselib/ldap.lua
share/nmap/nselib/lfs.luadoc
share/nmap/nselib/listop.lua
share/nmap/nselib/lpeg-utility.lua
+share/nmap/nselib/lpeg.luadoc
share/nmap/nselib/ls.lua
share/nmap/nselib/match.lua
share/nmap/nselib/membase.lua
@@ -130,6 +131,7 @@ share/nmap/nselib/msrpc.lua
share/nmap/nselib/msrpcperformance.lua
share/nmap/nselib/msrpctypes.lua
share/nmap/nselib/mssql.lua
+share/nmap/nselib/multicast.lua
share/nmap/nselib/mysql.lua
share/nmap/nselib/natpmp.lua
share/nmap/nselib/ncp.lua
@@ -331,6 +333,7 @@ share/nmap/scripts/hostmap-robtex.nse
share/nmap/scripts/http-adobe-coldfusion-apsa1301.nse
share/nmap/scripts/http-affiliate-id.nse
share/nmap/scripts/http-apache-negotiation.nse
+share/nmap/scripts/http-apache-server-status.nse
share/nmap/scripts/http-auth-finder.nse
share/nmap/scripts/http-auth.nse
share/nmap/scripts/http-avaya-ipoffice-users.nse
@@ -428,11 +431,13 @@ share/nmap/scripts/http-vuln-cve2011-319
share/nmap/scripts/http-vuln-cve2011-3368.nse
share/nmap/scripts/http-vuln-cve2012-1823.nse
share/nmap/scripts/http-vuln-cve2013-0156.nse
+share/nmap/scripts/http-vuln-cve2013-6786.nse
share/nmap/scripts/http-vuln-cve2013-7091.nse
share/nmap/scripts/http-vuln-cve2014-2126.nse
share/nmap/scripts/http-vuln-cve2014-2127.nse
share/nmap/scripts/http-vuln-cve2014-2128.nse
share/nmap/scripts/http-vuln-cve2014-2129.nse
+share/nmap/scripts/http-vuln-cve2014-3704.nse
share/nmap/scripts/http-vuln-cve2014-8877.nse
share/nmap/scripts/http-vuln-cve2015-1427.nse
share/nmap/scripts/http-vuln-cve2015-1635.nse
@@ -451,6 +456,7 @@ share/nmap/scripts/icap-info.nse
share/nmap/scripts/ike-version.nse
share/nmap/scripts/imap-brute.nse
share/nmap/scripts/imap-capabilities.nse
+share/nmap/scripts/imap-ntlm-info.nse
share/nmap/scripts/informix-brute.nse
share/nmap/scripts/informix-query.nse
share/nmap/scripts/informix-tables.nse
@@ -461,6 +467,7 @@ share/nmap/scripts/ip-geolocation-ipinfo
share/nmap/scripts/ip-geolocation-maxmind.nse
share/nmap/scripts/ip-https-discover.nse
share/nmap/scripts/ipidseq.nse
+share/nmap/scripts/ipv6-multicast-mld-list.nse
share/nmap/scripts/ipv6-node-info.nse
share/nmap/scripts/ipv6-ra-flood.nse
share/nmap/scripts/irc-botnet-channels.nse
@@ -508,6 +515,7 @@ share/nmap/scripts/ms-sql-dump-hashes.ns
share/nmap/scripts/ms-sql-empty-password.nse
share/nmap/scripts/ms-sql-hasdbaccess.nse
share/nmap/scripts/ms-sql-info.nse
+share/nmap/scripts/ms-sql-ntlm-info.nse
share/nmap/scripts/ms-sql-query.nse
share/nmap/scripts/ms-sql-tables.nse
share/nmap/scripts/ms-sql-xp-cmdshell.nse
@@ -543,6 +551,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/nntp-ntlm-info.nse
share/nmap/scripts/nping-brute.nse
share/nmap/scripts/nrpe-enum.nse
share/nmap/scripts/ntp-info.nse
@@ -564,6 +573,7 @@ share/nmap/scripts/pgsql-brute.nse
share/nmap/scripts/pjl-ready-message.nse
share/nmap/scripts/pop3-brute.nse
share/nmap/scripts/pop3-capabilities.nse
+share/nmap/scripts/pop3-ntlm-info.nse
share/nmap/scripts/pptp-version.nse
share/nmap/scripts/qconn-exec.nse
share/nmap/scripts/qscan.nse
@@ -591,10 +601,12 @@ share/nmap/scripts/rsync-brute.nse
share/nmap/scripts/rsync-list-modules.nse
share/nmap/scripts/rtsp-methods.nse
share/nmap/scripts/rtsp-url-brute.nse
+share/nmap/scripts/rusers.nse
share/nmap/scripts/s7-info.nse
share/nmap/scripts/samba-vuln-cve-2012-1182.nse
share/nmap/scripts/script.db
share/nmap/scripts/servicetags.nse
+share/nmap/scripts/shodan-api.nse
share/nmap/scripts/sip-brute.nse
share/nmap/scripts/sip-call-spoof.nse
share/nmap/scripts/sip-enum-users.nse
@@ -628,6 +640,7 @@ share/nmap/scripts/smbv2-enabled.nse
share/nmap/scripts/smtp-brute.nse
share/nmap/scripts/smtp-commands.nse
share/nmap/scripts/smtp-enum-users.nse
+share/nmap/scripts/smtp-ntlm-info.nse
share/nmap/scripts/smtp-open-relay.nse
share/nmap/scripts/smtp-strangeport.nse
share/nmap/scripts/smtp-vuln-cve2010-4344.nse
@@ -681,6 +694,7 @@ share/nmap/scripts/targets-xml.nse
share/nmap/scripts/teamspeak2-version.nse
share/nmap/scripts/telnet-brute.nse
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/tor-consensus-checker.nse
