On 12/29/15 21:21, Stuart Henderson wrote:
> On 2015/12/29 11:23, Giovanni Bechis wrote:
>> Hi,
>> I do not use it anymore so I am dropping maintainership, anyway attached a
>> wip port to update it to latest version
>> if someone wants to step over.
>
> Here's a smaller diff for PLIST-zenmap for this.
>
New diff with suggestions by jca@ and sthen@, new maintainer is David Carlier.
ok ?
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /var/cvs/ports/net/nmap/Makefile,v
retrieving revision 1.116
diff -u -p -r1.116 Makefile
--- Makefile 8 Oct 2015 21:19:22 -0000 1.116
+++ Makefile 30 Dec 2015 11:18:46 -0000
@@ -5,8 +5,7 @@ SHARED_ONLY= Yes
COMMENT-main= scan ports and fingerprint stack of network hosts
COMMENT-zenmap= graphical frontend for nmap
-MODPY_EGG_VERSION= 6.47
-REVISION-main= 1
+MODPY_EGG_VERSION= 7.01
DISTNAME= nmap-${MODPY_EGG_VERSION}
PKGNAME-main= ${DISTNAME}
PKGNAME-zenmap= nmap-zenmap-${MODPY_EGG_VERSION}
@@ -17,7 +16,7 @@ EXTRACT_SUFX= .tgz
HOMEPAGE= http://www.nmap.org/
-MAINTAINER= Giovanni Bechis <giova...@openbsd.org>
+MAINTAINER= David Carlier <devne...@gmail.com>
# GPL (v2 only), with additional clarifications and exceptions, see COPYING
PERMIT_PACKAGE_CDROM= Yes
@@ -55,8 +54,6 @@ RUN_DEPENDS-zenmap= x11/py-gtk2 \
databases/py-sqlite2 \
devel/desktop-file-utils \
net/nmap
-
-NO_TEST= Yes
post-extract:
@cd ${WRKSRC} && rm -rf liblua/ libpcre/
Index: distinfo
===================================================================
RCS file: /var/cvs/ports/net/nmap/distinfo,v
retrieving revision 1.30
diff -u -p -r1.30 distinfo
--- distinfo 25 Sep 2014 17:33:15 -0000 1.30
+++ distinfo 29 Dec 2015 09:47:15 -0000
@@ -1,2 +1,2 @@
-SHA256 (nmap-6.47.tgz) = Wl/CVDVmMJ0U5Ftcg8k91dEGiiwBPeEgA2+r/BOfVWE=
-SIZE (nmap-6.47.tgz) = 9796783
+SHA256 (nmap-7.01.tgz) = jK86y+k8D6CmhcPm+zpfgM5Jk2vX1AJpoJs+rW/YXtU=
+SIZE (nmap-7.01.tgz) = 11029121
Index: patches/patch-Makefile_in
===================================================================
RCS file: /var/cvs/ports/net/nmap/patches/patch-Makefile_in,v
retrieving revision 1.15
diff -u -p -r1.15 patch-Makefile_in
--- patches/patch-Makefile_in 16 May 2014 15:08:54 -0000 1.15
+++ patches/patch-Makefile_in 29 Dec 2015 09:49:37 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.15 2014/05/16 15:08:54 sthen Exp $
---- Makefile.in.orig Fri Feb 21 23:11:41 2014
-+++ Makefile.in Thu May 15 20:12:32 2014
-@@ -45,7 +45,7 @@ DEFS += -D_FORTIFY_SOURCE=2
+--- Makefile.in.orig Tue Dec 8 21:54:07 2015
++++ Makefile.in Tue Dec 29 10:47:48 2015
+@@ -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)
@@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.15 2014/
export CFLAGS = $(CXXFLAGS)
# CFLAGS = $(DEFS) $(INCLS)
STATIC =
-@@ -288,8 +288,8 @@ $(NPINGDIR)/nping.h: nmap.h
+@@ -319,8 +319,8 @@ $(NPINGDIR)/nping.h: nmap.h
mv -f $@.tmp $@
# Update the version number used by Zenmap.
Index: patches/patch-libnetutil_netutil_cc
===================================================================
RCS file: /var/cvs/ports/net/nmap/patches/patch-libnetutil_netutil_cc,v
retrieving revision 1.6
diff -u -p -r1.6 patch-libnetutil_netutil_cc
--- patches/patch-libnetutil_netutil_cc 16 Jun 2014 10:22:15 -0000 1.6
+++ patches/patch-libnetutil_netutil_cc 29 Dec 2015 09:49:37 -0000
@@ -8,9 +8,9 @@ http://marc.info/?l=nmap-dev&m=140179174
chunks dealing with iovec: ???
---- libnetutil/netutil.cc.orig Thu Nov 7 19:32:33 2013
-+++ libnetutil/netutil.cc Sun Jun 15 20:36:36 2014
-@@ -916,7 +916,7 @@ void set_ttl(int sd, int ttl) {
+--- 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.) */
@@ -19,7 +19,7 @@ chunks dealing with iovec: ???
/* Returns whether the system supports pcap_get_selectable_fd() properly */
int pcap_selectable_fd_valid() {
return 0;
-@@ -3140,7 +3140,6 @@ static int route_dst_netlink(const struct sockaddr_sto
+@@ -3139,7 +3139,6 @@ static int route_dst_netlink(const struct sockaddr_sto
const struct sockaddr_storage *spoofss) {
struct sockaddr_nl snl;
struct msghdr msg;
@@ -27,7 +27,7 @@ chunks dealing with iovec: ???
struct nlmsghdr *nlmsg;
struct rtmsg *rtmsg;
struct rtattr *rtattr;
-@@ -3192,22 +3191,14 @@ static int route_dst_netlink(const struct sockaddr_sto
+@@ -3191,22 +3190,14 @@ static int route_dst_netlink(const struct sockaddr_sto
add_rtattr_addr(nlmsg, &rtattr, &len, RTA_SRC, spoofss, intf_index);
}
@@ -50,7 +50,7 @@ chunks dealing with iovec: ???
len = recvmsg(fd, &msg, 0);
if (len <= 0)
netutil_fatal("%s: cannot recvmsg: %s", __func__, strerror(errno));
-@@ -3838,7 +3829,6 @@ static const unsigned char *add_exthdr_ancillary(struc
+@@ -3837,7 +3828,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 +58,7 @@ chunks dealing with iovec: ???
const unsigned char *end;
struct ip6_hdr *hdr;
-@@ -3854,8 +3844,6 @@ static int send_ipv6_ip(const struct sockaddr_in6 *dst
+@@ -3853,8 +3843,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 +67,7 @@ chunks dealing with iovec: ???
msg.msg_control = NULL;
msg.msg_controllen = 0;
msg.msg_flags = 0;
-@@ -3914,8 +3902,6 @@ static int send_ipv6_ip(const struct sockaddr_in6 *dst
+@@ -3913,8 +3901,6 @@ static int send_ipv6_ip(const struct sockaddr_in6 *dst
}
assert(packet <= end);
@@ -76,7 +76,7 @@ chunks dealing with iovec: ???
n = sendmsg(sd, &msg, 0);
if (n == -1)
-@@ -4084,9 +4070,6 @@ int datalink_offset(int datalink)
+@@ -4117,9 +4103,6 @@ int datalink_offset(int datalink)
{
if (datalink == DLT_EN10MB)
return ETH_HDR_LEN;
@@ -86,7 +86,7 @@ chunks dealing with iovec: ???
else
return -1;
}
-@@ -4123,7 +4106,7 @@ static int read_reply_pcap(pcap_t *pd, long to_usec,
+@@ -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)
@@ -95,7 +95,7 @@ chunks dealing with iovec: ???
*offset = (unsigned int) ioffset;
if (to_usec > 0) {
-@@ -4223,10 +4206,6 @@ static bool accept_arp(const unsigned char *p, const s
+@@ -4256,10 +4239,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-libpcap_configure
===================================================================
RCS file: patches/patch-libpcap_configure
diff -N patches/patch-libpcap_configure
--- patches/patch-libpcap_configure 11 Feb 2014 16:16:36 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-libpcap_configure,v 1.1 2014/02/11 16:16:36 sthen Exp $
---- libpcap/configure.orig Tue Feb 11 11:51:20 2014
-+++ libpcap/configure Tue Feb 11 11:51:22 2014
-@@ -3498,7 +3498,7 @@ $as_echo "#define const /**/" >>confdefs.h
- sparc64*)
- case "$host_os" in
-
-- freebsd*)
-+ freebsd*|openbsd*)
- PIC_OPT=-fPIC
- ;;
- esac
Index: patches/patch-libpcap_pcap-bpf_c
===================================================================
RCS file: /var/cvs/ports/net/nmap/patches/patch-libpcap_pcap-bpf_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-libpcap_pcap-bpf_c
--- patches/patch-libpcap_pcap-bpf_c 11 Sep 2015 15:57:42 -0000 1.1
+++ patches/patch-libpcap_pcap-bpf_c 29 Dec 2015 09:49:38 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-libpcap_pcap-bpf_c,v 1.1 2015/09/11 15:57:42 sthen Exp $
---- libpcap/pcap-bpf.c.orig Fri Sep 11 09:54:04 2015
-+++ libpcap/pcap-bpf.c Fri Sep 11 09:54:42 2015
-@@ -2265,7 +2265,7 @@ monitor_mode(pcap_t *p, int set)
- {
+--- libpcap/pcap-bpf.c.orig Fri May 1 22:24:47 2015
++++ libpcap/pcap-bpf.c Tue Dec 29 10:47:48 2015
+@@ -2319,7 +2319,7 @@ monitor_mode(pcap_t *p, int set)
+ struct pcap_bpf *pb = p->priv;
int sock;
struct ifmediareq req;
- int *media_list;
@@ -10,7 +10,7 @@ $OpenBSD: patch-libpcap_pcap-bpf_c,v 1.1
int i;
int can_do;
struct ifreq ifr;
-@@ -2322,7 +2322,7 @@ monitor_mode(pcap_t *p, int set)
+@@ -2376,7 +2376,7 @@ monitor_mode(pcap_t *p, int set)
* Allocate a buffer to hold all the media types, and
* get the media types.
*/
Index: patches/patch-ndiff_setup_py
===================================================================
RCS file: /var/cvs/ports/net/nmap/patches/patch-ndiff_setup_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-ndiff_setup_py
--- patches/patch-ndiff_setup_py 16 May 2014 15:08:54 -0000 1.2
+++ patches/patch-ndiff_setup_py 29 Dec 2015 09:49:38 -0000
@@ -1,10 +1,12 @@
$OpenBSD: patch-ndiff_setup_py,v 1.2 2014/05/16 15:08:54 sthen Exp $
---- ndiff/setup.py.orig Sat Apr 12 02:24:32 2014
-+++ ndiff/setup.py Thu May 15 20:13:44 2014
-@@ -112,5 +112,5 @@ Installing your distribution's python-dev package may
+--- ndiff/setup.py.orig Sun Sep 20 06:16:36 2015
++++ ndiff/setup.py Tue Dec 29 10:47:48 2015
+@@ -309,7 +309,7 @@ class my_uninstall(distutils.cmd.Command):
distutils.core.setup(name=u"ndiff", scripts=[u"scripts/ndiff"],
py_modules=[u"ndiff"],
- data_files=[(u"share/man/man1", [u"docs/ndiff.1"])],
+ data_files=[(u"man/man1", [u"docs/ndiff.1"])],
- cmdclass={"install_egg_info": null_command, "install": checked_install})
+ cmdclass={
+ "install_egg_info": null_command,
+ "install": checked_install,
Index: patches/patch-osscan2_cc
===================================================================
RCS file: /var/cvs/ports/net/nmap/patches/patch-osscan2_cc,v
retrieving revision 1.2
diff -u -p -r1.2 patch-osscan2_cc
--- patches/patch-osscan2_cc 16 May 2014 15:08:54 -0000 1.2
+++ patches/patch-osscan2_cc 29 Dec 2015 09:49:38 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-osscan2_cc,v 1.2 2014/05
Format changes for 64-bit time_t, should go upstream
---- osscan2.cc.orig Sat Mar 15 12:37:54 2014
-+++ osscan2.cc Thu May 15 20:12:32 2014
-@@ -2507,8 +2507,8 @@ void HostOsScan::makeTSeqFP(HostOsScanStats *hss) {
+--- 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) {
Index: patches/patch-scan-engine_cc
===================================================================
RCS file: /var/cvs/ports/net/nmap/patches/patch-scan-engine_cc,v
retrieving revision 1.7
diff -u -p -r1.7 patch-scan-engine_cc
--- patches/patch-scan-engine_cc 16 May 2014 15:08:54 -0000 1.7
+++ patches/patch-scan-engine_cc 29 Dec 2015 09:49:37 -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 Thu Apr 17 23:58:39 2014
-+++ scan_engine.cc Wed Apr 30 19:56:54 2014
-@@ -2977,7 +2977,7 @@ static void ultrascan_host_probe_update(UltraScanInfo
+--- 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
struct timeval tv;
gettimeofday(&tv, NULL);
@@ -16,19 +16,3 @@ Format changes for 64-bit time_t, should
}
ultrascan_host_pspec_update(USI, hss, probe->pspec(), newstate);
-@@ -5590,13 +5590,13 @@ static void begin_sniffer(UltraScanInfo *USI, std::vec
- if (doIndividual) {
- pcap_filter = "dst host ";
- pcap_filter += inet_ntop_ez(&source, sizeof(source));
-- pcap_filter += " and (icmp or icmp6 or ((tcp or udp or sctp) and (";
-+ pcap_filter += " and (icmp or icmp6 or ((tcp or udp) and (";
- pcap_filter += dst_hosts;
- pcap_filter += ")))";
- } else {
- pcap_filter = "dst host ";
- pcap_filter += inet_ntop_ez(&source, sizeof(source));
-- pcap_filter += " and (icmp or icmp6 or tcp or udp or sctp)";
-+ pcap_filter += " and (icmp or icmp6 or tcp or udp)";
- }
- } else {
- assert(0);
Index: patches/patch-timing_cc
===================================================================
RCS file: /var/cvs/ports/net/nmap/patches/patch-timing_cc,v
retrieving revision 1.4
diff -u -p -r1.4 patch-timing_cc
--- patches/patch-timing_cc 11 Sep 2015 15:56:43 -0000 1.4
+++ patches/patch-timing_cc 29 Dec 2015 09:49:41 -0000
@@ -3,16 +3,18 @@ $OpenBSD: patch-timing_cc,v 1.4 2015/09/
Avoid float-related assertion triggered on i386, not triggered on
macppc/amd64/sparc64.
---- timing.cc.orig Sat Aug 16 04:45:47 2014
-+++ timing.cc Fri Sep 11 17:55:26 2015
-@@ -128,4 +128,6 @@
+--- timing.cc.orig Tue Jun 23 02:09:01 2015
++++ timing.cc Tue Dec 29 10:47:48 2015
+@@ -125,6 +125,8 @@
+
+ /* $Id: timing.cc 34709 2015-06-23 00:09:01Z dmiller $ */
+#include <limits>
+
#include "timing.h"
#include "NmapOps.h"
#include "utils.h"
-@@ -436,7 +438,7 @@ void RateMeter::update(double amount, const struct tim
+@@ -437,7 +439,7 @@ void RateMeter::update(double amount, const struct tim
interval = MAX(current_rate_history, diff);
else
interval = TIMEVAL_SUBTRACT(*now, start_tv) / 1000000.0;
Index: patches/patch-zenmap_setup_py
===================================================================
RCS file: /var/cvs/ports/net/nmap/patches/patch-zenmap_setup_py,v
retrieving revision 1.11
diff -u -p -r1.11 patch-zenmap_setup_py
--- patches/patch-zenmap_setup_py 16 May 2014 15:08:54 -0000 1.11
+++ patches/patch-zenmap_setup_py 29 Dec 2015 09:49:37 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-zenmap_setup_py,v 1.11 2014/05/16 15:08:54 sthen Exp $
---- zenmap/setup.py.orig Wed Jan 8 19:50:22 2014
-+++ zenmap/setup.py Thu May 15 20:12:32 2014
-@@ -240,12 +240,11 @@ class my_install(install):
+--- 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):
install.finalize_options(self)
def run(self):
@@ -15,7 +15,7 @@ $OpenBSD: patch-zenmap_setup_py,v 1.11 2
self.write_installed_files()
def get_installed_files(self):
-@@ -405,17 +404,10 @@ for dir in dirs:
+@@ -404,17 +403,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.11 2
# Replace the path definitions.
for path, replacement in interesting_paths.items():
-@@ -438,11 +430,6 @@ for dir in dirs:
+@@ -437,11 +429,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.7
diff -u -p -r1.7 PLIST-main
--- pkg/PLIST-main 16 May 2014 15:08:54 -0000 1.7
+++ pkg/PLIST-main 29 Dec 2015 09:54:30 -0000
@@ -7,6 +7,7 @@
bin/ndiff
@bin bin/nmap
@bin bin/nping
+@comment bin/uninstall_ndiff
@man man/man1/ncat.1
@man man/man1/ndiff.1
@man man/man1/nmap.1
@@ -29,6 +30,7 @@ share/nmap/nselib/
share/nmap/nselib/afp.lua
share/nmap/nselib/ajp.lua
share/nmap/nselib/amqp.lua
+share/nmap/nselib/anyconnect.lua
share/nmap/nselib/asn1.lua
share/nmap/nselib/base32.lua
share/nmap/nselib/base64.lua
@@ -46,6 +48,8 @@ share/nmap/nselib/cvs.lua
share/nmap/nselib/data/
share/nmap/nselib/data/dns-srv-names
share/nmap/nselib/data/drupal-modules.lst
+share/nmap/nselib/data/drupal-themes.lst
+share/nmap/nselib/data/enterprise_numbers.txt
share/nmap/nselib/data/favicon-db
share/nmap/nselib/data/http-default-accounts-fingerprints.lua
share/nmap/nselib/data/http-devframework-fingerprints.lua
@@ -80,13 +84,14 @@ share/nmap/nselib/data/psexec/nmap_servi
share/nmap/nselib/data/psexec/pwdump.lua
share/nmap/nselib/data/rtsp-urls.txt
share/nmap/nselib/data/snmpcommunities.lst
-share/nmap/nselib/data/ssl-ciphers
share/nmap/nselib/data/ssl-fingerprints
+share/nmap/nselib/data/targets-ipv6-wordlist
share/nmap/nselib/data/tftplist.txt
share/nmap/nselib/data/usernames.lst
share/nmap/nselib/data/vhosts-default.lst
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/dhcp.lua
share/nmap/nselib/dhcp6.lua
@@ -115,6 +120,8 @@ share/nmap/nselib/json.lua
share/nmap/nselib/ldap.lua
share/nmap/nselib/lfs.luadoc
share/nmap/nselib/listop.lua
+share/nmap/nselib/lpeg-utility.lua
+share/nmap/nselib/ls.lua
share/nmap/nselib/match.lua
share/nmap/nselib/membase.lua
share/nmap/nselib/mobileme.lua
@@ -141,6 +148,7 @@ share/nmap/nselib/pop3.lua
share/nmap/nselib/pppoe.lua
share/nmap/nselib/proxy.lua
share/nmap/nselib/rdp.lua
+share/nmap/nselib/re.lua
share/nmap/nselib/redis.lua
share/nmap/nselib/rmi.lua
share/nmap/nselib/rpc.lua
@@ -150,6 +158,7 @@ share/nmap/nselib/rtsp.lua
share/nmap/nselib/sasl.lua
share/nmap/nselib/shortport.lua
share/nmap/nselib/sip.lua
+share/nmap/nselib/slaxml.lua
share/nmap/nselib/smb.lua
share/nmap/nselib/smbauth.lua
share/nmap/nselib/smtp.lua
@@ -200,6 +209,7 @@ share/nmap/scripts/auth-owners.nse
share/nmap/scripts/auth-spoof.nse
share/nmap/scripts/backorifice-brute.nse
share/nmap/scripts/backorifice-info.nse
+share/nmap/scripts/bacnet-info.nse
share/nmap/scripts/banner.nse
share/nmap/scripts/bitcoin-getaddr.nse
share/nmap/scripts/bitcoin-info.nse
@@ -228,6 +238,7 @@ share/nmap/scripts/broadcast-ping.nse
share/nmap/scripts/broadcast-pppoe-discover.nse
share/nmap/scripts/broadcast-rip-discover.nse
share/nmap/scripts/broadcast-ripng-discover.nse
+share/nmap/scripts/broadcast-sonicwall-discover.nse
share/nmap/scripts/broadcast-sybase-asa-discover.nse
share/nmap/scripts/broadcast-tellstick-discover.nse
share/nmap/scripts/broadcast-upnp-info.nse
@@ -254,7 +265,6 @@ share/nmap/scripts/cvs-brute.nse
share/nmap/scripts/daap-get-library.nse
share/nmap/scripts/daytime.nse
share/nmap/scripts/db2-das-info.nse
-share/nmap/scripts/db2-discover.nse
share/nmap/scripts/dhcp-discover.nse
share/nmap/scripts/dict-info.nse
share/nmap/scripts/distcc-cve2004-2687.nse
@@ -276,6 +286,7 @@ share/nmap/scripts/dns-srv-enum.nse
share/nmap/scripts/dns-update.nse
share/nmap/scripts/dns-zeustracker.nse
share/nmap/scripts/dns-zone-transfer.nse
+share/nmap/scripts/docker-version.nse
share/nmap/scripts/domcon-brute.nse
share/nmap/scripts/domcon-cmd.nse
share/nmap/scripts/domino-enum-users.nse
@@ -284,8 +295,10 @@ share/nmap/scripts/drda-brute.nse
share/nmap/scripts/drda-info.nse
share/nmap/scripts/duplicates.nse
share/nmap/scripts/eap-info.nse
+share/nmap/scripts/enip-info.nse
share/nmap/scripts/epmd-info.nse
share/nmap/scripts/eppc-enum-processes.nse
+share/nmap/scripts/fcrdns.nse
share/nmap/scripts/finger.nse
share/nmap/scripts/firewalk.nse
share/nmap/scripts/firewall-bypass.nse
@@ -311,6 +324,7 @@ share/nmap/scripts/hadoop-tasktracker-in
share/nmap/scripts/hbase-master-info.nse
share/nmap/scripts/hbase-region-info.nse
share/nmap/scripts/hddtemp-info.nse
+share/nmap/scripts/hnap-info.nse
share/nmap/scripts/hostmap-bfk.nse
share/nmap/scripts/hostmap-ip2hosts.nse
share/nmap/scripts/hostmap-robtex.nse
@@ -319,6 +333,7 @@ share/nmap/scripts/http-affiliate-id.nse
share/nmap/scripts/http-apache-negotiation.nse
share/nmap/scripts/http-auth-finder.nse
share/nmap/scripts/http-auth.nse
+share/nmap/scripts/http-avaya-ipoffice-users.nse
share/nmap/scripts/http-awstatstotals-exec.nse
share/nmap/scripts/http-axis2-dir-traversal.nse
share/nmap/scripts/http-backup-finder.nse
@@ -326,10 +341,12 @@ share/nmap/scripts/http-barracuda-dir-tr
share/nmap/scripts/http-brute.nse
share/nmap/scripts/http-cakephp-version.nse
share/nmap/scripts/http-chrono.nse
+share/nmap/scripts/http-cisco-anyconnect.nse
share/nmap/scripts/http-coldfusion-subzero.nse
share/nmap/scripts/http-comments-displayer.nse
share/nmap/scripts/http-config-backup.nse
share/nmap/scripts/http-cors.nse
+share/nmap/scripts/http-cross-domain-policy.nse
share/nmap/scripts/http-csrf.nse
share/nmap/scripts/http-date.nse
share/nmap/scripts/http-default-accounts.nse
@@ -338,13 +355,13 @@ share/nmap/scripts/http-dlink-backdoor.n
share/nmap/scripts/http-dombased-xss.nse
share/nmap/scripts/http-domino-enum-passwords.nse
share/nmap/scripts/http-drupal-enum-users.nse
-share/nmap/scripts/http-drupal-modules.nse
-share/nmap/scripts/http-email-harvest.nse
+share/nmap/scripts/http-drupal-enum.nse
share/nmap/scripts/http-enum.nse
share/nmap/scripts/http-errors.nse
share/nmap/scripts/http-exif-spider.nse
share/nmap/scripts/http-favicon.nse
share/nmap/scripts/http-feed.nse
+share/nmap/scripts/http-fetch.nse
share/nmap/scripts/http-fileupload-exploiter.nse
share/nmap/scripts/http-form-brute.nse
share/nmap/scripts/http-form-fuzzer.nse
@@ -362,6 +379,7 @@ share/nmap/scripts/http-iis-short-name-b
share/nmap/scripts/http-iis-webdav-vuln.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-method-tamper.nse
@@ -383,11 +401,14 @@ share/nmap/scripts/http-robots.txt.nse
share/nmap/scripts/http-robtex-reverse-ip.nse
share/nmap/scripts/http-robtex-shared-ns.nse
share/nmap/scripts/http-server-header.nse
+share/nmap/scripts/http-shellshock.nse
share/nmap/scripts/http-sitemap-generator.nse
share/nmap/scripts/http-slowloris-check.nse
share/nmap/scripts/http-slowloris.nse
share/nmap/scripts/http-sql-injection.nse
share/nmap/scripts/http-stored-xss.nse
+share/nmap/scripts/http-svn-enum.nse
+share/nmap/scripts/http-svn-info.nse
share/nmap/scripts/http-title.nse
share/nmap/scripts/http-tplink-dir-traversal.nse
share/nmap/scripts/http-trace.nse
@@ -399,6 +420,7 @@ share/nmap/scripts/http-vhosts.nse
share/nmap/scripts/http-virustotal.nse
share/nmap/scripts/http-vlcstreamer-ls.nse
share/nmap/scripts/http-vmware-path-vuln.nse
+share/nmap/scripts/http-vuln-cve2006-3392.nse
share/nmap/scripts/http-vuln-cve2009-3960.nse
share/nmap/scripts/http-vuln-cve2010-0738.nse
share/nmap/scripts/http-vuln-cve2010-2861.nse
@@ -406,12 +428,22 @@ 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-zimbra-lfi.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-8877.nse
+share/nmap/scripts/http-vuln-cve2015-1427.nse
+share/nmap/scripts/http-vuln-cve2015-1635.nse
+share/nmap/scripts/http-vuln-misfortune-cookie.nse
+share/nmap/scripts/http-vuln-wnr1000-creds.nse
share/nmap/scripts/http-waf-detect.nse
share/nmap/scripts/http-waf-fingerprint.nse
+share/nmap/scripts/http-webdav-scan.nse
share/nmap/scripts/http-wordpress-brute.nse
share/nmap/scripts/http-wordpress-enum.nse
-share/nmap/scripts/http-wordpress-plugins.nse
+share/nmap/scripts/http-wordpress-users.nse
share/nmap/scripts/http-xssed.nse
share/nmap/scripts/iax2-brute.nse
share/nmap/scripts/iax2-version.nse
@@ -427,6 +459,7 @@ share/nmap/scripts/ip-geolocation-geobyt
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/ipv6-node-info.nse
share/nmap/scripts/ipv6-ra-flood.nse
@@ -442,6 +475,8 @@ share/nmap/scripts/jdwp-exec.nse
share/nmap/scripts/jdwp-info.nse
share/nmap/scripts/jdwp-inject.nse
share/nmap/scripts/jdwp-version.nse
+share/nmap/scripts/knx-gateway-discover.nse
+share/nmap/scripts/knx-gateway-info.nse
share/nmap/scripts/krb5-enum-users.nse
share/nmap/scripts/ldap-brute.nse
share/nmap/scripts/ldap-novell-getpass.nse
@@ -458,6 +493,7 @@ share/nmap/scripts/memcached-info.nse
share/nmap/scripts/metasploit-info.nse
share/nmap/scripts/metasploit-msgrpc-brute.nse
share/nmap/scripts/metasploit-xmlrpc-brute.nse
+share/nmap/scripts/mikrotik-routeros-brute.nse
share/nmap/scripts/mmouse-brute.nse
share/nmap/scripts/mmouse-exec.nse
share/nmap/scripts/modbus-discover.nse
@@ -506,12 +542,14 @@ share/nmap/scripts/nexpose-brute.nse
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/nping-brute.nse
share/nmap/scripts/nrpe-enum.nse
share/nmap/scripts/ntp-info.nse
share/nmap/scripts/ntp-monlist.nse
share/nmap/scripts/omp2-brute.nse
share/nmap/scripts/omp2-enum-targets.nse
+share/nmap/scripts/omron-info.nse
share/nmap/scripts/openlookup-info.nse
share/nmap/scripts/openvas-otp-brute.nse
share/nmap/scripts/oracle-brute-stealth.nse
@@ -553,6 +591,7 @@ 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/s7-info.nse
share/nmap/scripts/samba-vuln-cve-2012-1182.nse
share/nmap/scripts/script.db
share/nmap/scripts/servicetags.nse
@@ -562,7 +601,6 @@ share/nmap/scripts/sip-enum-users.nse
share/nmap/scripts/sip-methods.nse
share/nmap/scripts/skypev2-version.nse
share/nmap/scripts/smb-brute.nse
-share/nmap/scripts/smb-check-vulns.nse
share/nmap/scripts/smb-enum-domains.nse
share/nmap/scripts/smb-enum-groups.nse
share/nmap/scripts/smb-enum-processes.nse
@@ -578,8 +616,14 @@ share/nmap/scripts/smb-psexec.nse
share/nmap/scripts/smb-security-mode.nse
share/nmap/scripts/smb-server-stats.nse
share/nmap/scripts/smb-system-info.nse
+share/nmap/scripts/smb-vuln-conficker.nse
+share/nmap/scripts/smb-vuln-cve2009-3103.nse
+share/nmap/scripts/smb-vuln-ms06-025.nse
+share/nmap/scripts/smb-vuln-ms07-029.nse
+share/nmap/scripts/smb-vuln-ms08-067.nse
share/nmap/scripts/smb-vuln-ms10-054.nse
share/nmap/scripts/smb-vuln-ms10-061.nse
+share/nmap/scripts/smb-vuln-regsvc-dos.nse
share/nmap/scripts/smbv2-enabled.nse
share/nmap/scripts/smtp-brute.nse
share/nmap/scripts/smtp-commands.nse
@@ -592,6 +636,7 @@ share/nmap/scripts/smtp-vuln-cve2011-176
share/nmap/scripts/sniffer-detect.nse
share/nmap/scripts/snmp-brute.nse
share/nmap/scripts/snmp-hh3c-logins.nse
+share/nmap/scripts/snmp-info.nse
share/nmap/scripts/snmp-interfaces.nse
share/nmap/scripts/snmp-ios-config.nse
share/nmap/scripts/snmp-netstat.nse
@@ -607,30 +652,38 @@ share/nmap/scripts/socks-open-proxy.nse
share/nmap/scripts/ssh-hostkey.nse
share/nmap/scripts/ssh2-enum-algos.nse
share/nmap/scripts/sshv1.nse
+share/nmap/scripts/ssl-ccs-injection.nse
share/nmap/scripts/ssl-cert.nse
share/nmap/scripts/ssl-date.nse
+share/nmap/scripts/ssl-dh-params.nse
share/nmap/scripts/ssl-enum-ciphers.nse
share/nmap/scripts/ssl-google-cert-catalog.nse
share/nmap/scripts/ssl-heartbleed.nse
share/nmap/scripts/ssl-known-key.nse
+share/nmap/scripts/ssl-poodle.nse
share/nmap/scripts/sslv2.nse
share/nmap/scripts/sstp-discover.nse
share/nmap/scripts/stun-info.nse
share/nmap/scripts/stun-version.nse
share/nmap/scripts/stuxnet-detect.nse
+share/nmap/scripts/supermicro-ipmi-conf.nse
share/nmap/scripts/svn-brute.nse
share/nmap/scripts/targets-asn.nse
+share/nmap/scripts/targets-ipv6-map4to6.nse
share/nmap/scripts/targets-ipv6-multicast-echo.nse
share/nmap/scripts/targets-ipv6-multicast-invalid-dst.nse
share/nmap/scripts/targets-ipv6-multicast-mld.nse
share/nmap/scripts/targets-ipv6-multicast-slaac.nse
+share/nmap/scripts/targets-ipv6-wordlist.nse
share/nmap/scripts/targets-sniffer.nse
share/nmap/scripts/targets-traceroute.nse
+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/tftp-enum.nse
share/nmap/scripts/tls-nextprotoneg.nse
+share/nmap/scripts/tor-consensus-checker.nse
share/nmap/scripts/traceroute-geolocation.nse
share/nmap/scripts/unittest.nse
share/nmap/scripts/unusual-port.nse
@@ -650,5 +703,6 @@ share/nmap/scripts/whois-ip.nse
share/nmap/scripts/wsdd-discover.nse
share/nmap/scripts/x11-access.nse
share/nmap/scripts/xdmcp-discover.nse
+share/nmap/scripts/xmlrpc-methods.nse
share/nmap/scripts/xmpp-brute.nse
share/nmap/scripts/xmpp-info.nse
Index: pkg/PLIST-zenmap
===================================================================
RCS file: /var/cvs/ports/net/nmap/pkg/PLIST-zenmap,v
retrieving revision 1.15
diff -u -p -r1.15 PLIST-zenmap
--- pkg/PLIST-zenmap 16 May 2014 15:08:54 -0000 1.15
+++ pkg/PLIST-zenmap 30 Dec 2015 11:16:03 -0000
@@ -244,6 +244,9 @@ share/zenmap/locale/de/LC_MESSAGES/zenma
share/zenmap/locale/fr/
share/zenmap/locale/fr/LC_MESSAGES/
share/zenmap/locale/fr/LC_MESSAGES/zenmap.mo
+share/zenmap/locale/hi/
+share/zenmap/locale/hi/LC_MESSAGES/
+share/zenmap/locale/hi/LC_MESSAGES/zenmap.mo
share/zenmap/locale/hr/
share/zenmap/locale/hr/LC_MESSAGES/
share/zenmap/locale/hr/LC_MESSAGES/zenmap.mo
@@ -262,6 +265,9 @@ share/zenmap/locale/pt_BR/LC_MESSAGES/ze
share/zenmap/locale/ru/
share/zenmap/locale/ru/LC_MESSAGES/
share/zenmap/locale/ru/LC_MESSAGES/zenmap.mo
+share/zenmap/locale/zh/
+share/zenmap/locale/zh/LC_MESSAGES/
+share/zenmap/locale/zh/LC_MESSAGES/zenmap.mo
share/zenmap/misc/
share/zenmap/misc/profile_editor.xml
share/zenmap/pixmaps/
