Thanks ! here a corrected version I believe.
Regards.
On 30 September 2016 at 07:09, Giovanni Bechis <[email protected]> wrote:
> Python stuff should go in PLIST-zenmap, do not always trust make-plist.
> Cheers
> Giovanni
>
> Il giorno 29 set 2016, alle ore 23:22, David CARLIER <[email protected]> ha
> scritto:
>>
>> Hello,
>>
>> here an attempt to update nmap to 7.30.
>>
>> Regards.
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/nmap/Makefile,v
retrieving revision 1.121
diff -u -p -r1.121 Makefile
--- Makefile 30 Mar 2016 21:26:45 -0000 1.121
+++ Makefile 30 Sep 2016 06:30:07 -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.12
+MODPY_EGG_VERSION= 7.30
DISTNAME= nmap-${MODPY_EGG_VERSION}
PKGNAME-main= ${DISTNAME}
PKGNAME-zenmap= nmap-zenmap-${MODPY_EGG_VERSION}
@@ -23,7 +23,7 @@ MULTI_PACKAGES= -main -zenmap
USE_GMAKE= Yes
MODLUA_SA= Yes
-MODLUA_VERSION= 5.2
+MODLUA_VERSION= 5.3
MODULES= lang/python \
lang/lua
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/nmap/distinfo,v
retrieving revision 1.34
diff -u -p -r1.34 distinfo
--- distinfo 30 Mar 2016 21:26:45 -0000 1.34
+++ distinfo 30 Sep 2016 06:30:07 -0000
@@ -1,2 +1,2 @@
-SHA256 (nmap-7.12.tgz) = pgqQNTSTIvECaQfWfk1CTcMBHARKcz/4ci34tQKJ++4=
-SIZE (nmap-7.12.tgz) = 11094463
+SHA256 (nmap-7.30.tgz) = LdYrr7IGxgBe5SLhKNTpXd+4pVwLtaUz/hF0y4DjS4w=
+SIZE (nmap-7.30.tgz) = 11106693
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/net/nmap/patches/patch-Makefile_in,v
retrieving revision 1.16
diff -u -p -r1.16 patch-Makefile_in
--- patches/patch-Makefile_in 7 Jan 2016 13:23:47 -0000 1.16
+++ patches/patch-Makefile_in 30 Sep 2016 06:30:07 -0000
@@ -1,16 +1,16 @@
$OpenBSD: patch-Makefile_in,v 1.16 2016/01/07 13:23:47 giovanni Exp $
---- Makefile.in.orig Tue Dec 8 21:54:07 2015
-+++ Makefile.in Tue Dec 29 10:47:48 2015
+--- Makefile.in.orig Tue Aug 16 10:31:59 2016
++++ Makefile.in Thu Sep 29 22:07:52 2016
@@ -46,7 +46,7 @@ DEFS += -D_FORTIFY_SOURCE=2
# Should only be enabled during debugging and not in any real release.
# DEFS += -DMTRACE=1
CXXFLAGS = @CXXFLAGS@ $(DBGFLAGS) $(CCOPT)
-CPPFLAGS = @CPPFLAGS@ $(DEFS)
-+CPPFLAGS = -I./libdnet-stripped/include @CPPFLAGS@ $(DEFS)
- export CFLAGS = $(CXXFLAGS)
- # CFLAGS = $(DEFS) $(INCLS)
++CPPFLAGS = -I../libdnet-stripped/include @CPPFLAGS@ $(DEFS)
+ CFLAGS = @CFLAGS@ $(DBGFLAGS) $(CCOPT)
STATIC =
-@@ -319,8 +319,8 @@ $(NPINGDIR)/nping.h: nmap.h
+ LDFLAGS = @LDFLAGS@ $(DBGFLAGS) $(STATIC)
+@@ -318,8 +318,8 @@ $(NPINGDIR)/nping.h: nmap.h
mv -f [email protected] $@
# Update the version number used by Zenmap.
Index: patches/patch-libnetutil_netutil_cc
===================================================================
RCS file: /cvs/ports/net/nmap/patches/patch-libnetutil_netutil_cc,v
retrieving revision 1.8
diff -u -p -r1.8 patch-libnetutil_netutil_cc
--- patches/patch-libnetutil_netutil_cc 18 Mar 2016 21:13:38 -0000 1.8
+++ patches/patch-libnetutil_netutil_cc 30 Sep 2016 06:30:07 -0000
@@ -8,9 +8,9 @@ http://marc.info/?l=nmap-dev&m=140179174
chunks dealing with iovec: ???
---- 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
+--- 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
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;
-@@ -3194,22 +3193,14 @@ static int route_dst_netlink(const struct sockaddr_sto
+@@ -3224,22 +3223,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));
-@@ -3840,7 +3831,6 @@ static const unsigned char *add_exthdr_ancillary(struc
+@@ -3870,7 +3861,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;
-@@ -3859,8 +3849,6 @@ static int send_ipv6_ip(const struct sockaddr_in6 *dst
+@@ -3889,8 +3879,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;
-@@ -3919,8 +3907,6 @@ static int send_ipv6_ip(const struct sockaddr_in6 *dst
+@@ -3949,8 +3937,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)
-@@ -4123,9 +4109,6 @@ int datalink_offset(int datalink)
+@@ -4153,9 +4139,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;
}
-@@ -4262,10 +4245,6 @@ static bool accept_arp(const unsigned char *p, const s
+@@ -4281,10 +4264,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.8
diff -u -p -r1.8 patch-scan-engine_cc
--- patches/patch-scan-engine_cc 7 Jan 2016 13:23:47 -0000 1.8
+++ patches/patch-scan-engine_cc 30 Sep 2016 06:30:07 -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 Wed Jun 3 15:01:29 2015
-+++ scan_engine.cc Tue Dec 29 10:47:48 2015
-@@ -2011,7 +2011,7 @@ void ultrascan_host_probe_update(UltraScanInfo *USI, H
+--- 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
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.6
diff -u -p -r1.6 patch-timing_cc
--- patches/patch-timing_cc 18 Mar 2016 21:13:38 -0000 1.6
+++ patches/patch-timing_cc 30 Sep 2016 06:30:07 -0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-timing_cc,v 1.6 2016/03/18 21:13:38 giovanni Exp $
---- timing.cc.orig Tue Jun 23 01:09:01 2015
-+++ timing.cc Thu Mar 17 20:44:33 2016
+--- timing.cc.orig Mon Aug 22 20:50:06 2016
++++ timing.cc Thu Sep 29 22:04:48 2016
@@ -125,6 +125,8 @@
- /* $Id: patch-timing_cc,v 1.6 2016/03/18 21:13:38 giovanni Exp $ */
+ /* $Id: timing.cc 36172 2016-08-22 19:50:06Z dmiller $ */
+#include <limits>
+
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/nmap/pkg/PLIST-main,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST-main
--- pkg/PLIST-main 18 Mar 2016 21:13:38 -0000 1.9
+++ pkg/PLIST-main 30 Sep 2016 06:30:07 -0000
@@ -34,14 +34,16 @@ share/nmap/nselib/anyconnect.lua
share/nmap/nselib/asn1.lua
share/nmap/nselib/base32.lua
share/nmap/nselib/base64.lua
-share/nmap/nselib/bin.luadoc
-share/nmap/nselib/bit.luadoc
+share/nmap/nselib/bin.lua
+share/nmap/nselib/bit.lua
share/nmap/nselib/bitcoin.lua
+share/nmap/nselib/bits.lua
share/nmap/nselib/bittorrent.lua
share/nmap/nselib/bjnp.lua
share/nmap/nselib/brute.lua
share/nmap/nselib/cassandra.lua
share/nmap/nselib/citrixxml.lua
+share/nmap/nselib/coap.lua
share/nmap/nselib/comm.lua
share/nmap/nselib/creds.lua
share/nmap/nselib/cvs.lua
@@ -93,6 +95,7 @@ share/nmap/nselib/data/vhosts-full.lst
share/nmap/nselib/data/wp-plugins.lst
share/nmap/nselib/data/wp-themes.lst
share/nmap/nselib/datafiles.lua
+share/nmap/nselib/datetime.lua
share/nmap/nselib/dhcp.lua
share/nmap/nselib/dhcp6.lua
share/nmap/nselib/dns.lua
@@ -112,6 +115,7 @@ share/nmap/nselib/ike.lua
share/nmap/nselib/imap.lua
share/nmap/nselib/informix.lua
share/nmap/nselib/ipOps.lua
+share/nmap/nselib/ipmi.lua
share/nmap/nselib/ipp.lua
share/nmap/nselib/iscsi.lua
share/nmap/nselib/isns.lua
@@ -127,6 +131,7 @@ share/nmap/nselib/match.lua
share/nmap/nselib/membase.lua
share/nmap/nselib/mobileme.lua
share/nmap/nselib/mongodb.lua
+share/nmap/nselib/mqtt.lua
share/nmap/nselib/msrpc.lua
share/nmap/nselib/msrpcperformance.lua
share/nmap/nselib/msrpctypes.lua
@@ -170,6 +175,7 @@ share/nmap/nselib/srvloc.lua
share/nmap/nselib/ssh1.lua
share/nmap/nselib/ssh2.lua
share/nmap/nselib/sslcert.lua
+share/nmap/nselib/sslv2.lua
share/nmap/nselib/stdnse.lua
share/nmap/nselib/strbuf.lua
share/nmap/nselib/strict.lua
@@ -257,6 +263,9 @@ share/nmap/scripts/citrix-enum-apps-xml.
share/nmap/scripts/citrix-enum-apps.nse
share/nmap/scripts/citrix-enum-servers-xml.nse
share/nmap/scripts/citrix-enum-servers.nse
+share/nmap/scripts/clamav-exec.nse
+share/nmap/scripts/clock-skew.nse
+share/nmap/scripts/coap-resources.nse
share/nmap/scripts/couchdb-databases.nse
share/nmap/scripts/couchdb-stats.nse
share/nmap/scripts/creds-summary.nse
@@ -305,6 +314,7 @@ share/nmap/scripts/finger.nse
share/nmap/scripts/firewalk.nse
share/nmap/scripts/firewall-bypass.nse
share/nmap/scripts/flume-master-info.nse
+share/nmap/scripts/fox-info.nse
share/nmap/scripts/freelancer-info.nse
share/nmap/scripts/ftp-anon.nse
share/nmap/scripts/ftp-bounce.nse
@@ -334,6 +344,7 @@ share/nmap/scripts/http-adobe-coldfusion
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-aspnet-debug.nse
share/nmap/scripts/http-auth-finder.nse
share/nmap/scripts/http-auth.nse
share/nmap/scripts/http-avaya-ipoffice-users.nse
@@ -380,11 +391,13 @@ share/nmap/scripts/http-icloud-findmyiph
share/nmap/scripts/http-icloud-sendmsg.nse
share/nmap/scripts/http-iis-short-name-brute.nse
share/nmap/scripts/http-iis-webdav-vuln.nse
+share/nmap/scripts/http-internal-ip-disclosure.nse
share/nmap/scripts/http-joomla-brute.nse
share/nmap/scripts/http-litespeed-sourcecode-download.nse
share/nmap/scripts/http-ls.nse
share/nmap/scripts/http-majordomo2-dir-traversal.nse
share/nmap/scripts/http-malware-host.nse
+share/nmap/scripts/http-mcmp.nse
share/nmap/scripts/http-method-tamper.nse
share/nmap/scripts/http-methods.nse
share/nmap/scripts/http-mobileversion-checker.nse
@@ -461,12 +474,14 @@ share/nmap/scripts/informix-brute.nse
share/nmap/scripts/informix-query.nse
share/nmap/scripts/informix-tables.nse
share/nmap/scripts/ip-forwarding.nse
-share/nmap/scripts/ip-geolocation-geobytes.nse
share/nmap/scripts/ip-geolocation-geoplugin.nse
share/nmap/scripts/ip-geolocation-ipinfodb.nse
share/nmap/scripts/ip-geolocation-maxmind.nse
share/nmap/scripts/ip-https-discover.nse
share/nmap/scripts/ipidseq.nse
+share/nmap/scripts/ipmi-brute.nse
+share/nmap/scripts/ipmi-cipher-zero.nse
+share/nmap/scripts/ipmi-version.nse
share/nmap/scripts/ipv6-multicast-mld-list.nse
share/nmap/scripts/ipv6-node-info.nse
share/nmap/scripts/ipv6-ra-flood.nse
@@ -507,6 +522,7 @@ share/nmap/scripts/modbus-discover.nse
share/nmap/scripts/mongodb-brute.nse
share/nmap/scripts/mongodb-databases.nse
share/nmap/scripts/mongodb-info.nse
+share/nmap/scripts/mqtt-subscribe.nse
share/nmap/scripts/mrinfo.nse
share/nmap/scripts/ms-sql-brute.nse
share/nmap/scripts/ms-sql-config.nse
@@ -565,10 +581,12 @@ share/nmap/scripts/oracle-brute-stealth.
share/nmap/scripts/oracle-brute.nse
share/nmap/scripts/oracle-enum-users.nse
share/nmap/scripts/oracle-sid-brute.nse
+share/nmap/scripts/oracle-tns-version.nse
share/nmap/scripts/ovs-agent-version.nse
share/nmap/scripts/p2p-conficker.nse
share/nmap/scripts/path-mtu.nse
share/nmap/scripts/pcanywhere-brute.nse
+share/nmap/scripts/pcworx-info.nse
share/nmap/scripts/pgsql-brute.nse
share/nmap/scripts/pjl-ready-message.nse
share/nmap/scripts/pop3-brute.nse
@@ -674,6 +692,7 @@ share/nmap/scripts/ssl-google-cert-catal
share/nmap/scripts/ssl-heartbleed.nse
share/nmap/scripts/ssl-known-key.nse
share/nmap/scripts/ssl-poodle.nse
+share/nmap/scripts/sslv2-drown.nse
share/nmap/scripts/sslv2.nse
share/nmap/scripts/sstp-discover.nse
share/nmap/scripts/stun-info.nse
@@ -708,6 +727,7 @@ share/nmap/scripts/versant-info.nse
share/nmap/scripts/vmauthd-brute.nse
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/vuze-dht-info.nse
share/nmap/scripts/wdb-version.nse
Index: pkg/PLIST-zenmap
===================================================================
RCS file: /cvs/ports/net/nmap/pkg/PLIST-zenmap,v
retrieving revision 1.16
diff -u -p -r1.16 PLIST-zenmap
--- pkg/PLIST-zenmap 7 Jan 2016 13:23:47 -0000 1.16
+++ pkg/PLIST-zenmap 30 Sep 2016 06:30:07 -0000
@@ -54,6 +54,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/radialnet/gui/HostsViewer.pyc
lib/python${MODPY_VERSION}/site-packages/radialnet/gui/Image.py
lib/python${MODPY_VERSION}/site-packages/radialnet/gui/Image.pyc
+lib/python${MODPY_VERSION}/site-packages/radialnet/gui/LegendWindow.py
+lib/python${MODPY_VERSION}/site-packages/radialnet/gui/LegendWindow.pyc
lib/python${MODPY_VERSION}/site-packages/radialnet/gui/NodeNotebook.py
lib/python${MODPY_VERSION}/site-packages/radialnet/gui/NodeNotebook.pyc
lib/python${MODPY_VERSION}/site-packages/radialnet/gui/NodeWindow.py
@@ -77,7 +79,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/radialnet/util/integration.pyc
lib/python${MODPY_VERSION}/site-packages/radialnet/util/misc.py
lib/python${MODPY_VERSION}/site-packages/radialnet/util/misc.pyc
-lib/python${MODPY_VERSION}/site-packages/zenmap-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/ze${FULLPKGNAME\-main}-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/zenmapCore/
lib/python${MODPY_VERSION}/site-packages/zenmapCore/BasePaths.py
lib/python${MODPY_VERSION}/site-packages/zenmapCore/BasePaths.pyc
@@ -241,6 +243,9 @@ share/zenmap/locale/
share/zenmap/locale/de/
share/zenmap/locale/de/LC_MESSAGES/
share/zenmap/locale/de/LC_MESSAGES/zenmap.mo
+share/zenmap/locale/es/
+share/zenmap/locale/es/LC_MESSAGES/
+share/zenmap/locale/es/LC_MESSAGES/zenmap.mo
share/zenmap/locale/fr/
share/zenmap/locale/fr/LC_MESSAGES/
share/zenmap/locale/fr/LC_MESSAGES/zenmap.mo
