nmap: updated to 7.80

7.80:
Here is the full list of significant changes:

o [Windows] The Npcap Windows packet capturing library (https://npcap.org/)
  is faster and more stable than ever. Nmap 7.80 updates the bundled Npcap
  from version 0.99-r2 to 0.9982, including all of these changes from the
  last 15 Npcap releases: https://nmap.org/npcap/changelog

o [NSE] Added 11 NSE scripts, from 8 authors, bringing the total up to 598!
  They are all listed at https://nmap.org/nsedoc/, and the summaries are
  below:

  +  broadcast-hid-discoveryd discovers HID devices on a LAN by
    sending a discoveryd network broadcast probe.

  +  broadcast-jenkins-discover discovers Jenkins servers on a LAN
    by sending a discovery broadcast probe.

  +  http-hp-ilo-info extracts information from HP
    Integrated Lights-Out (iLO) servers.

  +  http-sap-netweaver-leak detects SAP Netweaver Portal with the
    Knowledge Management Unit enabled with anonymous access.

  + https-redirect detects HTTP servers that redirect to the same port, but
    with HTTPS. Some nginx servers do this, which made ssl-* scripts not run
    properly.

  +  lu-enum enumerates Logical Units (LU) of TN3270E servers.


  +  rdp-ntlm-info extracts Windows domain information from RDP
    services.

  + smb-vuln-webexec checks whether the WebExService is installed and allows
    code execution.

  + smb-webexec-exploit exploits the WebExService to run arbitrary commands
    with SYSTEM privileges.

  +  ubiquiti-discovery extracts information from the Ubiquiti
    Discovery service and assists version detection.

  +  vulners queries the Vulners CVE database API using CPE
    information from Nmap's service and application version detection.


o Use pcap_create instead of pcap_live_open in
  Nmap, and set immediate mode on the pcap descriptor. This solves packet
  loss problems on Linux and may improve performance on other platforms.


o [NSE] Collected utility functions for string processing into a new
  library, stringaux.lua.

o [NSE] New rand.lua library uses the best sources of random available on
  the system to generate random strings.

o [NSE] New library, oops.lua, makes reporting errors easy, with plenty of
  debugging detail when needed, and no clutter when not.

o [NSE] Collected utility functions for manipulating and searching tables
  into a new library, tableaux.lua.

o [NSE] New knx.lua library holds common functions and definitions for
  communicating with KNX/Konnex devices.

o [NSE] The HTTP library now provides transparent support for gzip-
  encoded response body. (See https://github.com/nmap/nmap/pull/1571 for an
  overview.)

o [Nsock][Ncat] Add AF_VSOCK (Linux VM sockets) functionality to
  Nsock and Ncat. VM sockets are used for communication between virtual
  machines and the hypervisor.

o [Security][Windows] Address CVE-2019-1552 in OpenSSL by building with the
  prefix "C:\Program Files (x86)\Nmap\OpenSSL". This should prevent
  unauthorized users from modifying OpenSSL defaults by writing
  configuration to this directory.

o [Security] Reduced LibPCRE resource limits so that
  version detection can't use as much of the stack. Previously Nmap could
  crash when run on low-memory systems against target services which are
  intentionally or accidentally difficult to match. Someone assigned
  CVE-2018-15173 for this issue.

o Deprecate and disable the -PR (ARP ping) host discovery
  option. ARP ping is already used whenever possible, and the -PR option
  would not force it to be used in any other case.

o [NSE] bin.lua is officially deprecated. Lua 5.3, added 2 years ago in Nmap
  7.25BETA2, has native support for binary data packing via string.pack and
  string.unpack. All existing scripts and libraries have been updated.


o [NSE] Completely removed the bit.lua NSE library. All of its functions are
  replaced by native Lua bitwise operations, except for `arshift`
  (arithmetic shift) which has been moved to the bits.lua library. [Daniel
  Miller]

o [NSE] The HTTP library is now enforcing a size limit on the
  received response body. The default limit can be adjusted with a script
  argument, which applies to all scripts, and can be overridden case-by-case
  with an HTTP request option. (See https://github.com/nmap/nmap/pull/1571
  for details.)

o [NSE] CR characters are no longer treated as illegal in script
  XML output.

o Allow resuming nmap scan with lengthy command line [Clément
  Notin]

o [NSE] Add TLS support to rdp-enum-encryption. Enables determining
  protocol version against servers that require TLS and lays ground work for
  some NLA/CredSSP information collection.

o [NSE] Address two protocol parsing issues in rdp-enum-encryption
  and the RDP nse library which broke scanning of Windows XP. Clarify
  protocol types

o [NSE] Script http-fileupload-exploiter failed to locate its
  resource file unless executed from a specific working
  directory.

o [NSE] Avoid clobbering the "severity" and "ignore_404" values of
  fingerprints in http-enum. None of the standard fingerprints uses these
  fields.

o [NSE] Fix a crash caused by a double-free of libssh2 session data
  when running SSH NSE scripts against non-SSH services.

o [NSE] Updates the execution rule of the mongodb scripts to be
  able to run on alternate ports.

o [Ncat] Allow Ncat to connect to servers on port 0, provided that
  the socket implementation allows this.

o Update the included libpcap to 1.9.0.

o [NSE] Fix a logic error that resulted in scripts not honoring the
  smbdomain script-arg when the target provided a domain in the NTLM
  challenge.

o [Nsock] Avoid a crash (Protocol not supported) caused by trying
  to reconnect with SSLv2 when an error occurs during DTLS connect. [Daniel
  Miller]

o [NSE] Removed OSVDB references from scripts and replaced them
  with BID references where possible.

o [NSE] Updates TN3270.lua and adds argument to disable TN3270E


o RMI parser could crash when encountering invalid input [Clément
  Notin]

o Avoid reporting negative latencies due to matching an ARP or ND
  response to a probe sent after it was recieved.

o [Ncat] To avoid confusion and to support non-default proxy ports,
  option --proxy now requires a literal IPv6 address to be specified using
  square-bracket notation, such as --proxy

o [Ncat] New ncat option provides control over
  whether proxy destinations are resolved by the remote proxy server or
  locally, by Ncat itself. See option --proxy-dns.

o [NSE] Updated script ftp-syst to prevent potential endless
  looping.

o New service probes and match lines for v1 and v2 of the Ubiquiti
  Discovery protocol. Devices often leave the related service open and it
  exposes significant amounts of information as well as the risk of being
  used as part of a DDoS. New nmap-payload entry for v1 of the
  protocol.

o [NSE] Removed hostmap-ip2hosts.nse as the API has been broken for a while
  and the service was completely shutdown on Feb 17th, 2019. [Paulino
  Calderon]

o [NSE] Adds TN3270E support and additional improvements to
  tn3270.lua and updates tn3270-screen.nse to display the new
  setting.

o [NSE] Updates product codes and adds a check for response length
  in enip-info.nse. The script now uses string.unpack.

o [Ncat] Temporary RSA keys are now 2048-bit to resolve a
  compatibility issue with OpenSSL library configured with security level 2,
  as seen on current Debian or Kali.

o [NSE] Fix a crash (double-free) when using SSH scripts against
  non-SSH services.

o [Zenmap] Fix a crash when Nmap executable cannot be found and the system
  PATH contains non-UTF-8 bytes, such as on Windows.

o [Zenmap] Fix a crash in results search when using the dir: operator:
    AttributeError: 'SearchDB' object has no attribute 'match_dir' [Daniel
    Miller]

o [Ncat] Fixed an issue with Ncat -e on Windows that caused early
  termination of connections.

o [NSE] Fix a false-positive in http-phpmyadmin-dir-traversal when
  the server responds with 200 status to a POST request to any
  URI.

o [NSE] New vulnerability state in vulns.lua, UNKNOWN, is used to indicate
  that testing could not rule out vulnerability.

o When searching for Lua header files, actually use them where
  they are found instead of forcing /usr/include. [Fabrice Fontaine, Daniel
  Miller]

o [NSE] Script traceroute-geolocation no longer crashes when
  www.GeoPlugin.net returns null coordinates

o Limit verbose -v and debugging -d levels to a maximum of 10. Nmap does not
  use higher levels internally.

o [NSE] tls.lua when creating a client_hello message will now only use a
  SSLv3 record layer if the protocol version is SSLv3. Some TLS
  implementations will not handshake with a client offering less than
  TLSv1.0. Scripts will have to manually fall back to SSLv3 to talk to
  SSLv3-only servers.

o [NSE] Fix a few false-positive conditions in
  ssl-ccs-injection. TLS implementations that responded with fatal alerts
  other than "unexpected message" had been falsely marked as
  vulnerable.

o Emergency fix to Nmap's birthday announcement so Nmap wishes itself a
  "Happy 21st Birthday" rather than "Happy 21th" in verbose mode (-v) on
  September 1, 2018.

o Start host timeout clocks when the first probe is sent to a
  host, not when the hostgroup is started. Sometimes a host doesn't get
  probes until late in the hostgroup, increasing the chance it will time
  out.

o [NSE] Support for edns-client-subnet (ECS) in dns.lua has been improved
by:
  -
  - Properly trimming ECS address, as mandated by RFC 7871
  - Fixing a bug that prevented using the same ECS option table more than
    once

o [Ncat] Fixed communication with commands launched with -e or -c
  on Windows, especially when --ssl is used.

o [NSE] Script http-default-accounts can now select more than one
  fingerprint category. It now also possible to select fingerprints by name
  to support very specific scanning.

o [NSE] Script http-default-accounts was not able to run against more than
  one target host/port.

o [NSE] New script-arg `http.host` allows users to force a
  particular value for the Host header in all HTTP requests.

o [NSE] Use smtp.domain script arg or target's domain name instead
  of "example.com" in EHLO command used for STARTTLS.

o [NSE] Fix brute.lua's BruteSocket wrapper, which was crashing
  Nmap with an assertion failure due to socket mixup [Daniel Miller]: nmap:
  nse_nsock.cc:672: int receive_buf(lua_State*, int, lua_KContext):
  Assertion `lua_gettop(L) == 7' failed.

o [NSE] Handle an error condition in smb-vuln-ms17-010 caused by
  IPS closing the connection.

o [Ncat] Fixed literal IPv6 URL format for connecting through HTTP
  proxies.

o [NSE] Updates vendors from ODVA list for enip-info.
[NothinRandom]

o [NSE] Add two common error strings that improve MySQL detection
  by the script http-sql-injection.

o [NSE] Fix bug in http-vuln-cve2006-3392 that prevented the script
  to generate the vulnerability report correctly.

o [NSE] Fix bug related to screen rendering in NSE library
  tn3270. This patch also improves the brute force script
  tso-brute.

o [NSE] Fix SIP, SASL, and HTTP Digest authentication when the
  algorithm contains lowercase characters.

o Nmap could be fooled into ignoring TCP response packets if they
  used an unknown TCP Option, which would misalign the validation, causing
  it to fail.

o [NSE]The HTTP response parser now tolerates status lines without a reason
  phrase, which improves compatibility with some HTTP servers.

o [NSE]] Parser for HTTP Set-Cookie header
  is now more compliant with RFC 6265:
  - empty attributes are tolerated
  - double quotes in cookie and/or attribute values are treated literally
  - attributes with empty values and value-less attributes are parsed
equally
  - attributes named "name" or "value" are ignored

o [NSE] Fix parsing http-grep.match script-arg. [Hans van den
  Bogert]

o [Zenmap] Avoid a crash when recent_scans.txt cannot be written
  to.

o Fixed --resume when the path to Nmap contains spaces.

o New service probe and match lines for adb, the Android Debug Bridge, which
  allows remote code execution and is left enabled by default on many
  devices.

9 files changed, 42 insertions, 29 deletions

diff --git a/net/ndiff/Makefile b/net/ndiff/Makefile
index 0c0a7d3d23c..cbf2cc3d8bf 100644
--- a/net/ndiff/Makefile
+++ b/net/ndiff/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.3 2019/04/25 07:33:11 maya Exp $
+# $NetBSD: Makefile,v 1.4 2019/08/28 13:55:44 adam Exp $
 
-PKGREVISION= 1
 .include "../../net/nmap/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/nmap/ndiff/}
diff --git a/net/ndiff/distinfo b/net/ndiff/distinfo
index 7ba51282f6c..7b5088802f0 100644
--- a/net/ndiff/distinfo
+++ b/net/ndiff/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2018/04/14 13:04:33 adam Exp $
+$NetBSD: distinfo,v 1.2 2019/08/28 13:55:44 adam Exp $
 
-SHA1 (nmap-7.70.tar.bz2) = 71057361a0953bba5967dc0385de77f3eed792de
-RMD160 (nmap-7.70.tar.bz2) = 39b176e3b515bb5bf95503e3cb431a0dcd9e97ed
-SHA512 (nmap-7.70.tar.bz2) = 084c148b022ff6550e269d976d0077f7932a10e2ef218236fe13aa3a70b4eb6506df03329868fc68cb3ce78e4360b200f5a7a491d3145028fed679ef1c9ecae5
-Size (nmap-7.70.tar.bz2) = 10467371 bytes
+SHA1 (nmap-7.80.tar.bz2) = cfd8162192cfe2623f5770b8ed3c6237791ff6bf
+RMD160 (nmap-7.80.tar.bz2) = f9e2a71733fd25db98681286c9c2bf23d41bdd71
+SHA512 (nmap-7.80.tar.bz2) = d4384d3ebf4f3abf3588eed5433f733874ecdceb9342a718dc36db19634b0cc819d73399974eb0a9a9c9dd9e5c88473e07644ec91db28b0c072552b54430be6b
+Size (nmap-7.80.tar.bz2) = 10550327 bytes
diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index 0c6d4f30819..ac0bbbd5608 100644
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.140 2018/04/14 13:04:33 adam Exp $
+# $NetBSD: Makefile,v 1.141 2019/08/28 13:55:44 adam Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=	1
 COMMENT=	Network/port scanner with OS detection
 
 BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=1.0.0
diff --git a/net/nmap/Makefile.common b/net/nmap/Makefile.common
index 1edf620c8b1..618610c690f 100644
--- a/net/nmap/Makefile.common
+++ b/net/nmap/Makefile.common
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile.common,v 1.1 2018/04/14 13:04:33 adam Exp $
+# $NetBSD: Makefile.common,v 1.2 2019/08/28 13:55:44 adam Exp $
 # used by net/ndiff/Makefile
 # used by net/nmap/Makefile
 # used by net/zenmap/Makefile
 
-DISTNAME=	nmap-7.70
+DISTNAME=	nmap-7.80
 CATEGORIES=	net security
 MASTER_SITES=	http://nmap.org/dist/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER?=	pettai@NetBSD.org
-HOMEPAGE=	http://insecure.org/nmap/
+HOMEPAGE=	https://nmap.org/
 LICENSE=	gnu-gpl-v2
 
 CONFLICTS=	nmap<=7.70
diff --git a/net/nmap/PLIST b/net/nmap/PLIST
index 368b4117b08..76abcca3322 100644
--- a/net/nmap/PLIST
+++ b/net/nmap/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2018/04/14 13:04:33 adam Exp $
+@comment $NetBSD: PLIST,v 1.30 2019/08/28 13:55:44 adam Exp $
 bin/ncat
 bin/nmap
 bin/nping
@@ -38,7 +38,6 @@ ${PLIST.lua}share/nmap/nselib/asn1.lua
 ${PLIST.lua}share/nmap/nselib/base32.lua
 ${PLIST.lua}share/nmap/nselib/base64.lua
 ${PLIST.lua}share/nmap/nselib/bin.lua
-${PLIST.lua}share/nmap/nselib/bit.lua
 ${PLIST.lua}share/nmap/nselib/bitcoin.lua
 ${PLIST.lua}share/nmap/nselib/bits.lua
 ${PLIST.lua}share/nmap/nselib/bittorrent.lua
@@ -126,6 +125,7 @@ ${PLIST.lua}share/nmap/nselib/iscsi.lua
 ${PLIST.lua}share/nmap/nselib/isns.lua
 ${PLIST.lua}share/nmap/nselib/jdwp.lua
 ${PLIST.lua}share/nmap/nselib/json.lua
+${PLIST.lua}share/nmap/nselib/knx.lua
 ${PLIST.lua}share/nmap/nselib/ldap.lua
 ${PLIST.lua}share/nmap/nselib/lfs.luadoc
 ${PLIST.lua}share/nmap/nselib/libssh2-utility.lua
@@ -154,6 +154,7 @@ ${PLIST.lua}share/nmap/nselib/nmap.luadoc
 ${PLIST.lua}share/nmap/nselib/nrpc.lua
 ${PLIST.lua}share/nmap/nselib/nsedebug.lua
 ${PLIST.lua}share/nmap/nselib/omp2.lua
+${PLIST.lua}share/nmap/nselib/oops.lua
 ${PLIST.lua}share/nmap/nselib/openssl.luadoc
 ${PLIST.lua}share/nmap/nselib/ospf.lua
 ${PLIST.lua}share/nmap/nselib/packet.lua
@@ -163,6 +164,7 @@ ${PLIST.lua}share/nmap/nselib/pop3.lua
 ${PLIST.lua}share/nmap/nselib/pppoe.lua
 ${PLIST.lua}share/nmap/nselib/proxy.lua
 ${PLIST.lua}share/nmap/nselib/punycode.lua
+${PLIST.lua}share/nmap/nselib/rand.lua
 ${PLIST.lua}share/nmap/nselib/rdp.lua
 ${PLIST.lua}share/nmap/nselib/re.lua
 ${PLIST.lua}share/nmap/nselib/redis.lua
@@ -189,8 +191,10 @@ ${PLIST.lua}share/nmap/nselib/sslv2.lua
 ${PLIST.lua}share/nmap/nselib/stdnse.lua
 ${PLIST.lua}share/nmap/nselib/strbuf.lua
 ${PLIST.lua}share/nmap/nselib/strict.lua
+${PLIST.lua}share/nmap/nselib/stringaux.lua
 ${PLIST.lua}share/nmap/nselib/stun.lua
 ${PLIST.lua}share/nmap/nselib/tab.lua
+${PLIST.lua}share/nmap/nselib/tableaux.lua
 ${PLIST.lua}share/nmap/nselib/target.lua
 ${PLIST.lua}share/nmap/nselib/tftp.lua
 ${PLIST.lua}share/nmap/nselib/tls.lua
@@ -244,7 +248,9 @@ ${PLIST.lua}share/nmap/scripts/broadcast-dhcp6-discover.nse
 ${PLIST.lua}share/nmap/scripts/broadcast-dns-service-discovery.nse
 ${PLIST.lua}share/nmap/scripts/broadcast-dropbox-listener.nse
 ${PLIST.lua}share/nmap/scripts/broadcast-eigrp-discovery.nse
+${PLIST.lua}share/nmap/scripts/broadcast-hid-discoveryd.nse
 ${PLIST.lua}share/nmap/scripts/broadcast-igmp-discovery.nse
+${PLIST.lua}share/nmap/scripts/broadcast-jenkins-discover.nse
 ${PLIST.lua}share/nmap/scripts/broadcast-listener.nse
 ${PLIST.lua}share/nmap/scripts/broadcast-ms-sql-discover.nse
 ${PLIST.lua}share/nmap/scripts/broadcast-netbios-master-browser.nse
@@ -358,7 +364,6 @@ ${PLIST.lua}share/nmap/scripts/hddtemp-info.nse
 ${PLIST.lua}share/nmap/scripts/hnap-info.nse
 ${PLIST.lua}share/nmap/scripts/hostmap-bfk.nse
 ${PLIST.lua}share/nmap/scripts/hostmap-crtsh.nse
-${PLIST.lua}share/nmap/scripts/hostmap-ip2hosts.nse
 ${PLIST.lua}share/nmap/scripts/hostmap-robtex.nse
 ${PLIST.lua}share/nmap/scripts/http-adobe-coldfusion-apsa1301.nse
 ${PLIST.lua}share/nmap/scripts/http-affiliate-id.nse
@@ -408,6 +413,7 @@ ${PLIST.lua}share/nmap/scripts/http-gitweb-projects-enum.nse
 ${PLIST.lua}share/nmap/scripts/http-google-malware.nse
 ${PLIST.lua}share/nmap/scripts/http-grep.nse
 ${PLIST.lua}share/nmap/scripts/http-headers.nse
+${PLIST.lua}share/nmap/scripts/http-hp-ilo-info.nse
 ${PLIST.lua}share/nmap/scripts/http-huawei-hg5xx-vuln.nse
 ${PLIST.lua}share/nmap/scripts/http-icloud-findmyiphone.nse
 ${PLIST.lua}share/nmap/scripts/http-icloud-sendmsg.nse
@@ -439,6 +445,7 @@ ${PLIST.lua}share/nmap/scripts/http-rfi-spider.nse
 ${PLIST.lua}share/nmap/scripts/http-robots.txt.nse
 ${PLIST.lua}share/nmap/scripts/http-robtex-reverse-ip.nse
 ${PLIST.lua}share/nmap/scripts/http-robtex-shared-ns.nse
+${PLIST.lua}share/nmap/scripts/http-sap-netweaver-leak.nse
 ${PLIST.lua}share/nmap/scripts/http-security-headers.nse
 ${PLIST.lua}share/nmap/scripts/http-server-header.nse
 ${PLIST.lua}share/nmap/scripts/http-shellshock.nse
@@ -492,6 +499,7 @@ ${PLIST.lua}share/nmap/scripts/http-wordpress-brute.nse
 ${PLIST.lua}share/nmap/scripts/http-wordpress-enum.nse
 ${PLIST.lua}share/nmap/scripts/http-wordpress-users.nse
 ${PLIST.lua}share/nmap/scripts/http-xssed.nse
+${PLIST.lua}share/nmap/scripts/https-redirect.nse
 ${PLIST.lua}share/nmap/scripts/iax2-brute.nse
 ${PLIST.lua}share/nmap/scripts/iax2-version.nse
 ${PLIST.lua}share/nmap/scripts/icap-info.nse
@@ -541,6 +549,7 @@ ${PLIST.lua}share/nmap/scripts/ldap-search.nse
 ${PLIST.lua}share/nmap/scripts/lexmark-config.nse
 ${PLIST.lua}share/nmap/scripts/llmnr-resolve.nse
 ${PLIST.lua}share/nmap/scripts/lltd-discovery.nse
+${PLIST.lua}share/nmap/scripts/lu-enum.nse
 ${PLIST.lua}share/nmap/scripts/maxdb-info.nse
 ${PLIST.lua}share/nmap/scripts/mcafee-epo-agent.nse
 ${PLIST.lua}share/nmap/scripts/membase-brute.nse
@@ -637,6 +646,7 @@ ${PLIST.lua}share/nmap/scripts/quake1-info.nse
 ${PLIST.lua}share/nmap/scripts/quake3-info.nse
 ${PLIST.lua}share/nmap/scripts/quake3-master-getservers.nse
 ${PLIST.lua}share/nmap/scripts/rdp-enum-encryption.nse
+${PLIST.lua}share/nmap/scripts/rdp-ntlm-info.nse
 ${PLIST.lua}share/nmap/scripts/rdp-vuln-ms12-020.nse
 ${PLIST.lua}share/nmap/scripts/realvnc-auth-bypass.nse
 ${PLIST.lua}share/nmap/scripts/redis-brute.nse
@@ -698,6 +708,8 @@ ${PLIST.lua}share/nmap/scripts/smb-vuln-ms10-054.nse
 ${PLIST.lua}share/nmap/scripts/smb-vuln-ms10-061.nse
 ${PLIST.lua}share/nmap/scripts/smb-vuln-ms17-010.nse
 ${PLIST.lua}share/nmap/scripts/smb-vuln-regsvc-dos.nse
+${PLIST.lua}share/nmap/scripts/smb-vuln-webexec.nse
+${PLIST.lua}share/nmap/scripts/smb-webexec-exploit.nse
 ${PLIST.lua}share/nmap/scripts/smb2-capabilities.nse
 ${PLIST.lua}share/nmap/scripts/smb2-security-mode.nse
 ${PLIST.lua}share/nmap/scripts/smb2-time.nse
@@ -774,6 +786,7 @@ ${PLIST.lua}share/nmap/scripts/tor-consensus-checker.nse
 ${PLIST.lua}share/nmap/scripts/traceroute-geolocation.nse
 ${PLIST.lua}share/nmap/scripts/tso-brute.nse
 ${PLIST.lua}share/nmap/scripts/tso-enum.nse
+${PLIST.lua}share/nmap/scripts/ubiquiti-discovery.nse
 ${PLIST.lua}share/nmap/scripts/unittest.nse
 ${PLIST.lua}share/nmap/scripts/unusual-port.nse
 ${PLIST.lua}share/nmap/scripts/upnp-info.nse
@@ -787,6 +800,7 @@ ${PLIST.lua}share/nmap/scripts/vnc-info.nse
 ${PLIST.lua}share/nmap/scripts/vnc-title.nse
 ${PLIST.lua}share/nmap/scripts/voldemort-info.nse
 ${PLIST.lua}share/nmap/scripts/vtam-enum.nse
+${PLIST.lua}share/nmap/scripts/vulners.nse
 ${PLIST.lua}share/nmap/scripts/vuze-dht-info.nse
 ${PLIST.lua}share/nmap/scripts/wdb-version.nse
 ${PLIST.lua}share/nmap/scripts/weblogic-t3-info.nse
diff --git a/net/nmap/distinfo b/net/nmap/distinfo
index 53a68e235f3..e7b078b769c 100644
--- a/net/nmap/distinfo
+++ b/net/nmap/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.77 2018/04/14 13:04:33 adam Exp $
+$NetBSD: distinfo,v 1.78 2019/08/28 13:55:44 adam Exp $
 
-SHA1 (nmap-7.70.tar.bz2) = 71057361a0953bba5967dc0385de77f3eed792de
-RMD160 (nmap-7.70.tar.bz2) = 39b176e3b515bb5bf95503e3cb431a0dcd9e97ed
-SHA512 (nmap-7.70.tar.bz2) = 084c148b022ff6550e269d976d0077f7932a10e2ef218236fe13aa3a70b4eb6506df03329868fc68cb3ce78e4360b200f5a7a491d3145028fed679ef1c9ecae5
-Size (nmap-7.70.tar.bz2) = 10467371 bytes
+SHA1 (nmap-7.80.tar.bz2) = cfd8162192cfe2623f5770b8ed3c6237791ff6bf
+RMD160 (nmap-7.80.tar.bz2) = f9e2a71733fd25db98681286c9c2bf23d41bdd71
+SHA512 (nmap-7.80.tar.bz2) = d4384d3ebf4f3abf3588eed5433f733874ecdceb9342a718dc36db19634b0cc819d73399974eb0a9a9c9dd9e5c88473e07644ec91db28b0c072552b54430be6b
+Size (nmap-7.80.tar.bz2) = 10550327 bytes
 SHA1 (patch-configure) = 5fc39f084eadd6ea0560cd8e6f52074113566600
 SHA1 (patch-libdnet-stripped_src_arp-bsd.c) = c56c4e70eca2fa04dd8aab38ed2c3f4cac83f5e3
 SHA1 (patch-libnetutil_netutil.cc) = 7bd1059d6cbcf4f6d129730d6c6f6bc3ab54c0a0
diff --git a/net/zenmap/Makefile b/net/zenmap/Makefile
index a38ef3cd1eb..6430c67b254 100644
--- a/net/zenmap/Makefile
+++ b/net/zenmap/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.3 2019/04/25 07:33:13 maya Exp $
+# $NetBSD: Makefile,v 1.4 2019/08/28 13:55:44 adam Exp $
 
-PKGREVISION= 1
 .include "../../net/nmap/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/nmap/zenmap/}
@@ -11,6 +10,8 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/zenmap
 
 EXTRACT_ELEMENTS=	${DISTNAME}/zenmap
 
+EGG_NAME=	${PKGNAME:C/-([^0-9])/_\1/g}
+
 PYTHON_VERSIONS_ACCEPTED=	27
 
 DEPENDS+=	nmap-[0-9]*:../../net/nmap
diff --git a/net/zenmap/PLIST b/net/zenmap/PLIST
index fe188b61bba..41b3c0e5cb5 100644
--- a/net/zenmap/PLIST
+++ b/net/zenmap/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2018/04/14 13:04:33 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/08/28 13:55:44 adam Exp $
 bin/zenmap
+${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/radialnet/__init__.py
 ${PYSITELIB}/radialnet/__init__.pyc
 ${PYSITELIB}/radialnet/__init__.pyo
@@ -102,7 +103,6 @@ ${PYSITELIB}/radialnet/util/integration.pyo
 ${PYSITELIB}/radialnet/util/misc.py
 ${PYSITELIB}/radialnet/util/misc.pyc
 ${PYSITELIB}/radialnet/util/misc.pyo
-${PYSITELIB}/zenmap-7.70-py2.7.egg-info
 ${PYSITELIB}/zenmapCore/BasePaths.py
 ${PYSITELIB}/zenmapCore/BasePaths.pyc
 ${PYSITELIB}/zenmapCore/BasePaths.pyo
diff --git a/net/zenmap/distinfo b/net/zenmap/distinfo
index 4dbbce0abff..5a839200644 100644
--- a/net/zenmap/distinfo
+++ b/net/zenmap/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1 2018/04/14 13:04:33 adam Exp $
+$NetBSD: distinfo,v 1.2 2019/08/28 13:55:44 adam Exp $
 
-SHA1 (nmap-7.70.tar.bz2) = 71057361a0953bba5967dc0385de77f3eed792de
-RMD160 (nmap-7.70.tar.bz2) = 39b176e3b515bb5bf95503e3cb431a0dcd9e97ed
-SHA512 (nmap-7.70.tar.bz2) = 084c148b022ff6550e269d976d0077f7932a10e2ef218236fe13aa3a70b4eb6506df03329868fc68cb3ce78e4360b200f5a7a491d3145028fed679ef1c9ecae5
-Size (nmap-7.70.tar.bz2) = 10467371 bytes
+SHA1 (nmap-7.80.tar.bz2) = cfd8162192cfe2623f5770b8ed3c6237791ff6bf
+RMD160 (nmap-7.80.tar.bz2) = f9e2a71733fd25db98681286c9c2bf23d41bdd71
+SHA512 (nmap-7.80.tar.bz2) = d4384d3ebf4f3abf3588eed5433f733874ecdceb9342a718dc36db19634b0cc819d73399974eb0a9a9c9dd9e5c88473e07644ec91db28b0c072552b54430be6b
+Size (nmap-7.80.tar.bz2) = 10550327 bytes
 SHA1 (patch-zenmapCore_Paths.py) = 55ccc83a8f7dd302e4b0ffc1df0837ff651ba913