Update to 6.25

lot of improvements in nse scripting engine and in ipv6 support Full changelog: http://nmap.org/changelog.html Help and ok sthen@ and dcoppa@
2012-12-19 17:12:11 +00:00 · 2012-12-19 17:12:11 +00:00 · e6fc392521
commit e6fc392521
parent 5e0dc31366
21 changed files with 230 additions and 126 deletions
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@ -1,16 +1,13 @@
-# $OpenBSD: Makefile,v 1.104 2012/11/16 17:05:13 sthen Exp $
+# $OpenBSD: Makefile,v 1.105 2012/12/19 17:12:11 giovanni Exp $

 COMMENT-main=	scan ports and fingerprint stack of network hosts
 COMMENT-zenmap=	graphical frontend for nmap

-MODPY_EGG_VERSION=	6.01
+MODPY_EGG_VERSION=	6.25
 DISTNAME=		nmap-${MODPY_EGG_VERSION}
 PKGNAME-main=		${DISTNAME}
 PKGNAME-zenmap=		nmap-zenmap-${MODPY_EGG_VERSION}

-REVISION-main=	1
-REVISION-zenmap=1
-
 CATEGORIES=	net security
 MASTER_SITES=	http://nmap.org/dist/
 EXTRACT_SUFX=	.tgz
@ -28,8 +25,10 @@ PERMIT_DISTFILES_FTP=	Yes
 MULTI_PACKAGES=	-main -zenmap

 USE_GMAKE=	yes
+MODLUA_SA=	Yes
+MODLUA_VERSION=5.2
 MODULES=	lang/python \
-		lang/lua
+			lang/lua

 CONFIGURE_STYLE=gnu
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
--- a/net/nmap/distinfo
+++ b/net/nmap/distinfo
@ -1,2 +1,2 @@
-SHA256 (nmap-6.01.tgz) = 5p++vOu32VCcqRM8ObL5GZGkRzjRhEyvOF8fP2b3OXk=
-SIZE (nmap-6.01.tgz) = 23204848
+SHA256 (nmap-6.25.tgz) = QsVP1cxfBeXfkJdX1iMHECqP8d+vXCYmsctfLs0Anlc=
+SIZE (nmap-6.25.tgz) = 9374716
--- a/net/nmap/patches/patch-FPEngine_cc
+++ b/net/nmap/patches/patch-FPEngine_cc
@ -1,7 +1,7 @@
-$OpenBSD: patch-FPEngine_cc,v 1.1 2012/07/16 07:39:31 giovanni Exp $
--- FPEngine.cc.orig	Fri May 25 11:47:44 2012
-+++ FPEngine.cc	Fri May 25 11:49:23 2012
-@@ -479,7 +479,7 @@ void FPNetworkControl::response_reception_handler(nsoc
+$OpenBSD: patch-FPEngine_cc,v 1.2 2012/12/19 17:12:11 giovanni Exp $
+--- FPEngine.cc.orig	Wed Oct 31 18:00:55 2012
+++ FPEngine.cc	Fri Nov 30 12:41:47 2012
+@@ -477,7 +477,7 @@ void FPNetworkControl::response_reception_handler(nsoc
   enum nse_type type = nse_type(nse);
   const u8 *rcvd_pkt = NULL;                    /* Points to the captured packet */
   size_t rcvd_pkt_len = 0;                      /* Lenght of the captured packet */
--- a/net/nmap/patches/patch-Makefile_in
+++ b/net/nmap/patches/patch-Makefile_in
@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile_in,v 1.13 2012/07/16 07:39:31 giovanni Exp $
--- Makefile.in.orig	Tue Apr  3 02:21:44 2012
-+++ Makefile.in	Wed May 30 10:48:53 2012
+$OpenBSD: patch-Makefile_in,v 1.14 2012/12/19 17:12:11 giovanni Exp $
+--- Makefile.in.orig	Thu Sep 13 02:17:42 2012
+++ Makefile.in	Fri Nov 30 12:41:47 2012
@@ -45,7 +45,7 @@ DEFS += -D_FORTIFY_SOURCE=2
 # Should only be enabled during debugging and not in any real release.
 # DEFS += -DMTRACE=1
@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.13 2012/07/16 07:39:31 giovanni Exp $
 export CFLAGS = $(CXXFLAGS)
 # CFLAGS = $(DEFS) $(INCLS)
 STATIC =
-@@ -284,8 +284,8 @@ $(NPINGDIR)/nping.h: nmap.h
+@@ -285,8 +285,8 @@ $(NPINGDIR)/nping.h: nmap.h
 	mv -f $@.tmp $@
 
 # Update the version number used by Zenmap.
--- a/net/nmap/patches/patch-configure
+++ b/net/nmap/patches/patch-configure
@ -1,6 +1,6 @@
-$OpenBSD: patch-configure,v 1.15 2012/07/16 07:39:31 giovanni Exp $
--- configure.orig	Sat Apr  7 10:16:08 2012
-+++ configure	Wed Jul 11 15:05:35 2012
+$OpenBSD: patch-configure,v 1.16 2012/12/19 17:12:11 giovanni Exp $
+--- configure.orig	Fri Nov 16 01:54:16 2012
+++ configure	Fri Nov 30 12:41:47 2012
@@ -6311,6 +6311,7 @@ else
 extern char pcap_version[];
 int main() {
@ -8,13 +8,13 @@ $OpenBSD: patch-configure,v 1.15 2012/07/16 07:39:31 giovanni Exp $
 +  exit(0); /* fool it, use our libpcap */
   sscanf(pcap_version,"%d.%d.%d", &major, &minor1, &minor2);
   if (major > 0)
-     exit(0);
+     return 0;
@@ -6726,7 +6727,7 @@ if test "${with_liblua+set}" = set; then :
     no_lua="yes"
   ;;
   *)
 -    CPPFLAGS="-I$with_liblua/include $CPPFLAGS"
-+    CPPFLAGS="-I$with_liblua/include/lua-5.1 $CPPFLAGS"
+    CPPFLAGS="-I$with_liblua/include/lua-5.2 $CPPFLAGS"
     LDFLAGS="-L$with_liblua/lib $LDFLAGS"
   ;;
   esac
--- a/net/nmap/patches/patch-libdnet-stripped_src_intf_c
+++ b/net/nmap/patches/patch-libdnet-stripped_src_intf_c
@ -1,7 +1,7 @@
-$OpenBSD: patch-libdnet-stripped_src_intf_c,v 1.1 2012/11/16 17:05:13 sthen Exp $
--- libdnet-stripped/src/intf.c.orig	Wed Nov 14 04:18:29 2012
-+++ libdnet-stripped/src/intf.c	Wed Nov 14 04:19:10 2012
-@@ -76,7 +76,13 @@
+$OpenBSD: patch-libdnet-stripped_src_intf_c,v 1.2 2012/12/19 17:12:11 giovanni Exp $
+--- libdnet-stripped/src/intf.c.orig	Mon Sep 10 03:17:28 2012
+++ libdnet-stripped/src/intf.c	Fri Nov 30 12:41:47 2012
+@@ -77,7 +77,13 @@
 /* XXX - superset of ifreq, for portable SIOC{A,D}IFADDR */
 struct dnet_ifaliasreq {
 	char		ifra_name[IFNAMSIZ];
--- a/net/nmap/patches/patch-libnetutil_netutil_cc
+++ b/net/nmap/patches/patch-libnetutil_netutil_cc
@ -1,7 +1,7 @@
-$OpenBSD: patch-libnetutil_netutil_cc,v 1.2 2012/07/16 07:39:31 giovanni Exp $
--- libnetutil/netutil.cc.orig	Fri May 25 11:30:27 2012
-+++ libnetutil/netutil.cc	Fri May 25 11:32:11 2012
-@@ -2997,7 +2997,6 @@ static int route_dst_netlink(const struct sockaddr_sto
+$OpenBSD: patch-libnetutil_netutil_cc,v 1.3 2012/12/19 17:12:11 giovanni Exp $
+--- libnetutil/netutil.cc.orig	Thu Oct 11 05:11:53 2012
+++ libnetutil/netutil.cc	Fri Nov 30 12:41:47 2012
+@@ -3087,7 +3087,6 @@ static int route_dst_netlink(const struct sockaddr_sto
                              const struct sockaddr_storage *spoofss) {
   struct sockaddr_nl snl;
   struct msghdr msg;
@ -9,8 +9,8 @@ $OpenBSD: patch-libnetutil_netutil_cc,v 1.2 2012/07/16 07:39:31 giovanni Exp $
   struct nlmsghdr *nlmsg;
   struct rtmsg *rtmsg;
   struct rtattr *rtattr;
-@@ -3067,22 +3066,14 @@ static int route_dst_netlink(const struct sockaddr_sto
-     nlmsg->nlmsg_len = NLMSG_ALIGN(nlmsg->nlmsg_len) + rtattr->rta_len;
+@@ -3128,22 +3127,14 @@ static int route_dst_netlink(const struct sockaddr_sto
+     add_rtattr_addr(nlmsg, &rtattr, &len, RTA_SRC, spoofss);
   }
 
 -  iov.iov_base = nlmsg;
@ -32,7 +32,7 @@ $OpenBSD: patch-libnetutil_netutil_cc,v 1.2 2012/07/16 07:39:31 giovanni Exp $
   len = recvmsg(fd, &msg, 0);
   if (len <= 0)
     netutil_fatal("%s: cannot recvmsg: %s", __func__, strerror(errno));
-@@ -3702,7 +3693,6 @@ static const unsigned char *add_exthdr_ancillary(struc
+@@ -3769,7 +3760,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;
@ -40,7 +40,7 @@ $OpenBSD: patch-libnetutil_netutil_cc,v 1.2 2012/07/16 07:39:31 giovanni Exp $
 
   const unsigned char *end;
   struct ip6_hdr *hdr;
-@@ -3718,8 +3708,6 @@ static int send_ipv6_ip(const struct sockaddr_in6 *dst
+@@ -3785,8 +3775,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);
@ -49,7 +49,7 @@ $OpenBSD: patch-libnetutil_netutil_cc,v 1.2 2012/07/16 07:39:31 giovanni Exp $
   msg.msg_control = NULL;
   msg.msg_controllen = 0;
   msg.msg_flags = 0;
-@@ -3778,8 +3766,6 @@ static int send_ipv6_ip(const struct sockaddr_in6 *dst
+@@ -3845,8 +3833,6 @@ static int send_ipv6_ip(const struct sockaddr_in6 *dst
   }
 
   assert(packet <= end);
@ -58,7 +58,7 @@ $OpenBSD: patch-libnetutil_netutil_cc,v 1.2 2012/07/16 07:39:31 giovanni Exp $
 
   n = sendmsg(sd, &msg, 0);
   if (n == -1)
-@@ -3948,9 +3934,6 @@ int datalink_offset(int datalink)
+@@ -4015,9 +4001,6 @@ int datalink_offset(int datalink)
 {
   if (datalink == DLT_EN10MB)
     return ETH_HDR_LEN;
@ -68,7 +68,7 @@ $OpenBSD: patch-libnetutil_netutil_cc,v 1.2 2012/07/16 07:39:31 giovanni Exp $
   else
     return -1;
 }
-@@ -3987,7 +3970,7 @@ static int read_reply_pcap(pcap_t *pd, long to_usec,
+@@ -4054,7 +4037,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)
@ -77,7 +77,7 @@ $OpenBSD: patch-libnetutil_netutil_cc,v 1.2 2012/07/16 07:39:31 giovanni Exp $
   *offset = (unsigned int) ioffset;
 
   if (to_usec > 0) {
-@@ -4087,10 +4070,6 @@ static bool accept_arp(const unsigned char *p, const s
+@@ -4154,10 +4137,6 @@ static bool accept_arp(const unsigned char *p, const s
 
   if (datalink == DLT_EN10MB) {
     return ntohs(*((u16 *) (p + 12))) == ETH_TYPE_ARP;
--- a/net/nmap/patches/patch-ncat_ncat_core_c
+++ b/net/nmap/patches/patch-ncat_ncat_core_c
@ -1,6 +1,6 @@
-$OpenBSD: patch-ncat_ncat_core_c,v 1.1 2012/07/16 07:39:31 giovanni Exp $
--- ncat/ncat_core.c.orig	Fri May 25 12:03:58 2012
-+++ ncat/ncat_core.c	Fri May 25 12:04:23 2012
+$OpenBSD: patch-ncat_ncat_core_c,v 1.2 2012/12/19 17:12:11 giovanni Exp $
+--- ncat/ncat_core.c.orig	Tue Nov 13 09:40:49 2012
+++ ncat/ncat_core.c	Fri Nov 30 12:41:47 2012
@@ -127,7 +127,7 @@ union sockaddr_u socksconnect;
 struct options o;
 
@ -9,4 +9,4 @@ $OpenBSD: patch-ncat_ncat_core_c,v 1.1 2012/07/16 07:39:31 giovanni Exp $
 +struct bpf_timeval start_time;
 
 /* Initializes global options to their default values. */
- void options_init(void) {
+ void options_init(void)
--- a/net/nmap/patches/patch-ncat_ncat_core_h
+++ b/net/nmap/patches/patch-ncat_ncat_core_h
@ -1,7 +1,7 @@
-$OpenBSD: patch-ncat_ncat_core_h,v 1.1 2012/07/16 07:39:31 giovanni Exp $
--- ncat/ncat_core.h.orig	Fri May 25 12:03:54 2012
-+++ ncat/ncat_core.h	Fri May 25 12:04:14 2012
-@@ -167,7 +167,7 @@ struct options {
+$OpenBSD: patch-ncat_ncat_core_h,v 1.2 2012/12/19 17:12:11 giovanni Exp $
+--- ncat/ncat_core.h.orig	Tue Nov 13 09:40:49 2012
+++ ncat/ncat_core.h	Fri Nov 30 12:41:47 2012
+@@ -168,7 +168,7 @@ struct options {
 extern struct options o;
 
 /* The time the program was started, for exit statistics in connect mode. */
--- a/net/nmap/patches/patch-nping_ProbeMode_cc
+++ b/net/nmap/patches/patch-nping_ProbeMode_cc
@ -1,7 +1,7 @@
-$OpenBSD: patch-nping_ProbeMode_cc,v 1.2 2012/07/16 07:39:31 giovanni Exp $
--- nping/ProbeMode.cc.orig	Thu Mar  1 07:53:35 2012
-+++ nping/ProbeMode.cc	Fri May 25 15:16:04 2012
-@@ -129,9 +129,9 @@ int ProbeMode::init_nsock(){
+$OpenBSD: patch-nping_ProbeMode_cc,v 1.3 2012/12/19 17:12:11 giovanni Exp $
+--- nping/ProbeMode.cc.orig	Wed Oct  3 17:43:18 2012
+++ nping/ProbeMode.cc	Fri Nov 30 12:41:48 2012
+@@ -130,9 +130,9 @@ int ProbeMode::init_nsock(){
       /* Set nsock trace level */
       gettimeofday(&now, NULL);
       if( o.getDebugging() == DBG_5)
@ -13,7 +13,7 @@ $OpenBSD: patch-nping_ProbeMode_cc,v 1.2 2012/07/16 07:39:31 giovanni Exp $
       /* Flag it as already inited so we don't do it again */
       nsock_init=true;
   }
-@@ -1500,8 +1500,8 @@ void ProbeMode::probe_nping_event_handler(nsock_pool n
+@@ -1521,8 +1521,8 @@ void ProbeMode::probe_nping_event_handler(nsock_pool n
  u16 *ethtype=NULL;
  u8 buffer[512+1];
  size_t link_offset=0;
--- a/net/nmap/patches/patch-nse_nsock_cc
+++ b/net/nmap/patches/patch-nse_nsock_cc
@ -1,7 +1,7 @@
-$OpenBSD: patch-nse_nsock_cc,v 1.2 2012/07/10 15:22:45 jasper Exp $
--- nse_nsock.cc.orig	Wed Feb  9 03:37:53 2011
-+++ nse_nsock.cc	Mon Jul  9 19:32:14 2012
-@@ -1012,7 +1012,7 @@ static void pcap_receive_handler (nsock_pool nsp, nsoc
+$OpenBSD: patch-nse_nsock_cc,v 1.3 2012/12/19 17:12:11 giovanni Exp $
+--- nse_nsock.cc.orig	Thu Nov 29 04:19:52 2012
+++ nse_nsock.cc	Fri Nov 30 12:41:48 2012
+@@ -982,7 +982,7 @@ static void pcap_receive_handler (nsock_pool nsp, nsoc
   {
     const unsigned char *l2_data, *l3_data;
     size_t l2_len, l3_len, packet_len;
--- a/net/nmap/patches/patch-nsock_include_nsock_h
+++ b/net/nmap/patches/patch-nsock_include_nsock_h
@ -1,7 +1,7 @@
-$OpenBSD: patch-nsock_include_nsock_h,v 1.7 2012/07/16 07:39:31 giovanni Exp $
--- nsock/include/nsock.h.orig	Thu Mar  1 10:05:02 2012
-+++ nsock/include/nsock.h	Fri May 25 09:37:23 2012
-@@ -80,6 +80,8 @@
+$OpenBSD: patch-nsock_include_nsock_h,v 1.8 2012/12/19 17:12:11 giovanni Exp $
+--- nsock/include/nsock.h.orig	Mon Nov 12 21:44:37 2012
+++ nsock/include/nsock.h	Fri Nov 30 12:41:48 2012
+@@ -90,6 +90,8 @@
 extern "C" {
 #endif
 
@ -10,7 +10,7 @@ $OpenBSD: patch-nsock_include_nsock_h,v 1.7 2012/07/16 07:39:31 giovanni Exp $
 /* The read calls will generally return after reading at least this
  * much data so that the caller can process it and so that the
  * connection spewing data doesn't monopolize resources.  The caller
-@@ -176,7 +178,7 @@ void *nsp_getud(nsock_pool nsp);
+@@ -186,7 +188,7 @@ void *nsp_getud(nsock_pool nsp);
  * everything.  The basetime can be NULL to print trace lines with the current
  * time, otherwise the difference between the current time and basetime will be
  * used (the time program execution starts would be a good candidate) */
@ -19,7 +19,7 @@ $OpenBSD: patch-nsock_include_nsock_h,v 1.7 2012/07/16 07:39:31 giovanni Exp $
 
 /* Turns on or off broadcast support on new sockets. Default is off (0, false)
  * set in nsp_new(). Any non-zero (true) value sets SO_BROADCAST on all new
-@@ -514,7 +516,7 @@ int nsock_event_cancel(nsock_pool ms_pool, nsock_event
+@@ -550,7 +552,7 @@ int nsock_event_cancel(nsock_pool ms_pool, nsock_event
  * avoid a system call, but in many circumstances it is better to use nsock's
  * time rather than the system time.  If nsock has never obtained the time when
  * you call it, it will do so before returning */
@ -28,7 +28,7 @@ $OpenBSD: patch-nsock_include_nsock_h,v 1.7 2012/07/16 07:39:31 giovanni Exp $
 
 
 #ifdef HAVE_PCAP
-@@ -545,7 +547,7 @@ nsock_event_id nsock_pcap_read_packet(nsock_pool nsp, 
+@@ -581,7 +583,7 @@ nsock_event_id nsock_pcap_read_packet(nsock_pool nsp, 
  * think that host is a bit further.
  * */
 void nse_readpcap(nsock_event nsee, const unsigned char **l2_data, size_t *l2_len, const unsigned char **l3_data, size_t *l3_len,
--- a/net/nmap/patches/patch-nsock_src_nsock_core_c
+++ b/net/nmap/patches/patch-nsock_src_nsock_core_c
@ -1,7 +1,7 @@
-$OpenBSD: patch-nsock_src_nsock_core_c,v 1.1 2012/07/16 07:39:31 giovanni Exp $
--- nsock/src/nsock_core.c.orig	Fri May 25 10:13:28 2012
-+++ nsock/src/nsock_core.c	Fri May 25 10:13:46 2012
-@@ -1121,7 +1121,7 @@ void nsock_loop_quit(nsock_pool nsp) {
+$OpenBSD: patch-nsock_src_nsock_core_c,v 1.2 2012/12/19 17:12:11 giovanni Exp $
+--- nsock/src/nsock_core.c.orig	Thu Nov 29 04:19:52 2012
+++ nsock/src/nsock_core.c	Fri Nov 30 12:41:48 2012
+@@ -1130,7 +1130,7 @@ void nsock_loop_quit(nsock_pool nsp) {
  * avoid a system call, but in many circumstances it is better to use nsock's
  * time rather than the system time.  If nsock has never obtained the time when
  * you call it, it will do so before returning */
--- a/net/nmap/patches/patch-nsock_src_nsock_internal_h
+++ b/net/nmap/patches/patch-nsock_src_nsock_internal_h
@ -1,7 +1,7 @@
-$OpenBSD: patch-nsock_src_nsock_internal_h,v 1.1 2012/07/16 07:39:31 giovanni Exp $
--- nsock/src/nsock_internal.h.orig	Fri May 25 10:23:15 2012
-+++ nsock/src/nsock_internal.h	Fri May 25 10:23:32 2012
-@@ -200,7 +200,7 @@ typedef struct {
+$OpenBSD: patch-nsock_src_nsock_internal_h,v 1.2 2012/12/19 17:12:11 giovanni Exp $
+--- nsock/src/nsock_internal.h.orig	Mon Nov 12 21:44:37 2012
+++ nsock/src/nsock_internal.h	Fri Nov 30 12:41:48 2012
+@@ -203,7 +203,7 @@ typedef struct {
   int tracelevel;
   FILE *tracefile;
   /* This time is subtracted from the current time for trace reports */
--- a/net/nmap/patches/patch-output_cc
+++ b/net/nmap/patches/patch-output_cc
@ -1,7 +1,7 @@
-$OpenBSD: patch-output_cc,v 1.1 2012/07/16 07:39:31 giovanni Exp $
--- output.cc.orig	Fri May 25 12:58:18 2012
-+++ output.cc	Fri May 25 13:00:46 2012
-@@ -2407,7 +2407,7 @@ void printStatusMessage() {
+$OpenBSD: patch-output_cc,v 1.2 2012/12/19 17:12:11 giovanni Exp $
+--- output.cc.orig	Thu Nov 29 04:19:52 2012
+++ output.cc	Fri Nov 30 12:41:48 2012
+@@ -2411,7 +2411,7 @@ void printStatusMessage() {
   // Pre-computations
   struct timeval tv;
   gettimeofday(&tv, NULL);
@ -10,7 +10,7 @@ $OpenBSD: patch-output_cc,v 1.1 2012/07/16 07:39:31 giovanni Exp $
 
   log_write(LOG_STDOUT, "Stats: %d:%02d:%02d elapsed; %d hosts completed (%d up), %d undergoing %s\n",
             time / 60 / 60, time / 60 % 60, time % 60, o.numhosts_scanned,
-@@ -2427,13 +2427,13 @@ void print_xml_finished_open(time_t timep, const struc
+@@ -2431,13 +2431,13 @@ void print_xml_finished_open(time_t timep, const struc
   xml_open_start_tag("finished");
   xml_attribute("time", "%lu", (unsigned long) timep);
   xml_attribute("timestr", "%s", mytime);
@ -26,7 +26,7 @@ $OpenBSD: patch-output_cc,v 1.1 2012/07/16 07:39:31 giovanni Exp $
 }
 
 void print_xml_hosts() {
-@@ -2478,7 +2478,7 @@ void printfinaloutput() {
+@@ -2482,7 +2482,7 @@ void printfinaloutput() {
             o.numhosts_scanned,
             (o.numhosts_scanned == 1) ? "IP address" : "IP addresses",
             o.numhosts_up, (o.numhosts_up == 1) ? "host" : "hosts",
@ -35,7 +35,7 @@ $OpenBSD: patch-output_cc,v 1.1 2012/07/16 07:39:31 giovanni Exp $
   if (o.verbose && o.isr00t && o.RawScan())
     log_write(LOG_STDOUT | LOG_SKID, "           %s\n",
               getFinalPacketStats(statbuf, sizeof(statbuf)));
-@@ -2500,7 +2500,7 @@ void printfinaloutput() {
+@@ -2504,7 +2504,7 @@ void printfinaloutput() {
             mytime, o.numhosts_scanned,
             (o.numhosts_scanned == 1) ? "IP address" : "IP addresses",
             o.numhosts_up, (o.numhosts_up == 1) ? "host" : "hosts",
--- a/net/nmap/patches/patch-scan-engine_cc
+++ b/net/nmap/patches/patch-scan-engine_cc
@ -1,18 +1,18 @@
--- scan_engine.cc.orig	Sat Apr  7 10:16:08 2012
-+++ scan_engine.cc	Wed May 30 11:35:54 2012
-@@ -5421,13 +5421,13 @@ static void begin_sniffer(UltraScanInfo *USI, vector<T
-     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)";
+--- scan_engine.cc.orig	Wed Oct 31 18:00:55 2012
+++ scan_engine.cc	Fri Nov 30 12:43:04 2012
+@@ -5540,13 +5540,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);
-   if (o.debugging) log_write(LOG_PLAIN, "Packet capture filter (device %s): %s\n", Targets[0]->deviceFullName(), pcap_filter.c_str());
+   } else {
+     assert(0);
--- a/net/nmap/patches/patch-service_scan_cc
+++ b/net/nmap/patches/patch-service_scan_cc
@ -1,7 +1,7 @@
-$OpenBSD: patch-service_scan_cc,v 1.1 2012/07/16 07:39:31 giovanni Exp $
--- service_scan.cc.orig	Fri May 25 14:45:48 2012
-+++ service_scan.cc	Fri May 25 15:10:52 2012
-@@ -1968,10 +1968,10 @@ static void startNextProbe(nsock_pool nsp, nsock_iod n
+$OpenBSD: patch-service_scan_cc,v 1.2 2012/12/19 17:12:11 giovanni Exp $
+--- service_scan.cc.orig	Mon Oct 22 17:33:57 2012
+++ service_scan.cc	Fri Nov 30 12:41:48 2012
+@@ -1964,10 +1964,10 @@ static void startNextProbe(nsock_pool nsp, nsock_iod n
     // if the last probe was the NULL probe.
     probe = svc->nextProbe(false);
     if (probe) {
@ -14,7 +14,7 @@ $OpenBSD: patch-service_scan_cc,v 1.1 2012/07/16 07:39:31 giovanni Exp $
     } else {
       // Should only happen if someone has a highly perverse nmap-service-probes
       // file.  Null scan should generally never be the only probe.
-@@ -2016,11 +2016,11 @@ static void startNextProbe(nsock_pool nsp, nsock_iod n
+@@ -2012,11 +2012,11 @@ static void startNextProbe(nsock_pool nsp, nsock_iod n
       } else {
 	assert(svc->proto == IPPROTO_UDP);
 	/* Can maintain the same UDP "connection" */
@ -28,7 +28,7 @@ $OpenBSD: patch-service_scan_cc,v 1.1 2012/07/16 07:39:31 giovanni Exp $
       }
     } else {
       // No more probes remaining!  Failed to match
-@@ -2087,14 +2087,14 @@ static void considerPrintingStats(ServiceGroup *SG) {
+@@ -2083,14 +2083,14 @@ static void considerPrintingStats(ServiceGroup *SG) {
    if (keyWasPressed()) {
       SG->SPM->printStats(SG->services_finished.size() /
                           ((double)SG->services_remaining.size() + SG->services_in_progress.size() + 
@ -46,7 +46,7 @@ $OpenBSD: patch-service_scan_cc,v 1.1 2012/07/16 07:39:31 giovanni Exp $
   }
 }
 
-@@ -2121,7 +2121,7 @@ static void handleHostIfDone(ServiceGroup *SG, Target 
+@@ -2117,7 +2117,7 @@ static void handleHostIfDone(ServiceGroup *SG, Target 
   }
 
   if (!found) {
@ -55,7 +55,7 @@ $OpenBSD: patch-service_scan_cc,v 1.1 2012/07/16 07:39:31 giovanni Exp $
     if (target->timedOut(NULL)) {
       SG->num_hosts_timedout++;
     }
-@@ -2177,7 +2177,7 @@ static int launchSomeServiceProbes(nsock_pool nsp, Ser
+@@ -2173,7 +2173,7 @@ static int launchSomeServiceProbes(nsock_pool nsp, Ser
 	 !SG->services_remaining.empty()) {
     // Start executing a probe from the new list and move it to in_progress
     svc = SG->services_remaining.front();
@ -64,7 +64,7 @@ $OpenBSD: patch-service_scan_cc,v 1.1 2012/07/16 07:39:31 giovanni Exp $
       end_svcprobe(nsp, PROBESTATE_INCOMPLETE, SG, svc, NULL);
       continue;
     }
-@@ -2236,7 +2236,7 @@ static void servicescan_connect_handler(nsock_pool nsp
+@@ -2232,7 +2232,7 @@ static void servicescan_connect_handler(nsock_pool nsp
 
   assert(type == NSE_TYPE_CONNECT || type == NSE_TYPE_CONNECT_SSL);
 
@ -73,7 +73,7 @@ $OpenBSD: patch-service_scan_cc,v 1.1 2012/07/16 07:39:31 giovanni Exp $
     end_svcprobe(nsp, PROBESTATE_INCOMPLETE, SG, svc, nsi);
   } else if (status == NSE_STATUS_SUCCESS) {
 
-@@ -2262,10 +2262,10 @@ static void servicescan_connect_handler(nsock_pool nsp
+@@ -2258,10 +2258,10 @@ static void servicescan_connect_handler(nsock_pool nsp
 
     // Yeah!  Connection made to the port.  Send the appropriate probe
     // text (if any is needed -- might be NULL probe)
@ -86,7 +86,7 @@ $OpenBSD: patch-service_scan_cc,v 1.1 2012/07/16 07:39:31 giovanni Exp $
   } else if (status == NSE_STATUS_TIMEOUT || status == NSE_STATUS_ERROR) {
       // This is not good.  The connect() really shouldn't generally
       // be timing out like that.  We'll mark this svc as incomplete
-@@ -2300,11 +2300,11 @@ static void servicescan_write_handler(nsock_pool nsp, 
+@@ -2296,11 +2296,11 @@ static void servicescan_write_handler(nsock_pool nsp, 
   if (keyWasPressed()) {
      SG->SPM->printStats(SG->services_finished.size() /
                          ((double)SG->services_remaining.size() + SG->services_in_progress.size() + 
@ -100,7 +100,7 @@ $OpenBSD: patch-service_scan_cc,v 1.1 2012/07/16 07:39:31 giovanni Exp $
     end_svcprobe(nsp, PROBESTATE_INCOMPLETE, SG, svc, nsi);
     return;
   }
-@@ -2350,7 +2350,7 @@ static void servicescan_read_handler(nsock_pool nsp, n
+@@ -2346,7 +2346,7 @@ static void servicescan_read_handler(nsock_pool nsp, n
 
   assert(type == NSE_TYPE_READ);
 
--- a/net/nmap/patches/patch-tcpip_cc
+++ b/net/nmap/patches/patch-tcpip_cc
@ -1,5 +1,5 @@
--- tcpip.cc.orig	Wed Apr 11 03:46:43 2012
-+++ tcpip.cc	Wed May 30 11:14:52 2012
+--- tcpip.cc.orig	Wed Oct 31 18:00:55 2012
+++ tcpip.cc	Fri Nov 30 12:41:48 2012
@@ -99,7 +99,7 @@
 
 #include "nbase.h"
@ -9,7 +9,7 @@
 #include "tcpip.h"
 #include "NmapOps.h"
 #include "Target.h"
-@@ -208,7 +208,7 @@ void PacketTrace::traceArp(pdirection pdir, const u8 *
+@@ -228,7 +228,7 @@ void PacketTrace::traceArp(pdirection pdir, const u8 *
 
   log_write(LOG_STDOUT | LOG_NORMAL, "%s (%.4fs) ARP %s\n",
             (pdir == SENT) ? "SENT" : "RCVD",
@ -18,7 +18,7 @@
 
   return;
 }
-@@ -283,7 +283,7 @@ void PacketTrace::traceND(pdirection pdir, const u8 *f
+@@ -303,7 +303,7 @@ void PacketTrace::traceND(pdirection pdir, const u8 *f
   inet_ntop(AF_INET6, &ip6->ip6_dst, dst, sizeof(dst));
   log_write(LOG_STDOUT | LOG_NORMAL, "%s (%.4fs) %s %s > %s %s\n",
             (pdir == SENT) ? "SENT" : "RCVD",
@ -27,7 +27,7 @@
 
   return;
 }
-@@ -339,7 +339,7 @@ void PacketTrace::trace(pdirection pdir, const u8 *pac
+@@ -359,7 +359,7 @@ void PacketTrace::trace(pdirection pdir, const u8 *pac
 
   log_write(LOG_STDOUT | LOG_NORMAL, "%s (%.4fs) %s\n",
             (pdir == SENT) ? "SENT" : "RCVD",
@ -36,7 +36,7 @@
 
   return;
 }
-@@ -405,7 +405,7 @@ void PacketTrace::traceConnect(u8 proto, const struct 
+@@ -425,7 +425,7 @@ void PacketTrace::traceConnect(u8 proto, const struct 
 
   log_write(LOG_STDOUT | LOG_NORMAL,
             "CONN (%.4fs) %s localhost > %s:%d => %s\n",
--- a/net/nmap/patches/patch-zenmap_install_scripts_unix_su-to-zenmap_sh
+++ b/net/nmap/patches/patch-zenmap_install_scripts_unix_su-to-zenmap_sh
@ -1,6 +1,6 @@
-$OpenBSD: patch-zenmap_install_scripts_unix_su-to-zenmap_sh,v 1.3 2011/03/28 09:01:24 giovanni Exp $
--- zenmap/install_scripts/unix/su-to-zenmap.sh.orig	Sun May  3 06:33:50 2009
-+++ zenmap/install_scripts/unix/su-to-zenmap.sh	Wed Feb  2 16:04:05 2011
+$OpenBSD: patch-zenmap_install_scripts_unix_su-to-zenmap_sh,v 1.4 2012/12/19 17:12:11 giovanni Exp $
+--- zenmap/install_scripts/unix/su-to-zenmap.sh.orig	Sun Aug 19 22:11:06 2012
+++ zenmap/install_scripts/unix/su-to-zenmap.sh	Fri Nov 30 12:43:43 2012
@@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
@ -23,12 +23,3 @@ $OpenBSD: patch-zenmap_install_scripts_unix_su-to-zenmap_sh,v 1.3 2011/03/28 09:
         SU_TO_ROOT_X=kde4su
       elif which ktsuss >/dev/null 2>&1 ; then
         SU_TO_ROOT_X=ktsuss
-@@ -41,7 +41,7 @@ else
-     case $SU_TO_ROOT_X in
-       gksu) gksu -u "$PRIV" "$COMMAND";;
-       kdesu) kdesu -u "$PRIV" "$COMMAND";;
-      kde4su) /usr/lib/kde4/libexec/kdesu -u "$PRIV" "$COMMAND";;
-+      kde4su) /usr/local/lib/kde4/libexec/kdesu -u "$PRIV" "$COMMAND";;
-       ktsuss) ktsuss -u "$PRIV" "$COMMAND";;
-   # As a last resort, open a new xterm use sudo/su
-       sdterm) xterm -e "sudo -u $PRIV $COMMAND";;
--- a/net/nmap/pkg/PFRAG.shared-main
+++ b/net/nmap/pkg/PFRAG.shared-main
@ -1,22 +1,35 @@
-@comment $OpenBSD: PFRAG.shared-main,v 1.10 2012/07/16 07:39:31 giovanni Exp $
+@comment $OpenBSD: PFRAG.shared-main,v 1.11 2012/12/19 17:12:12 giovanni Exp $
 share/nmap/nse_main.lua
 share/nmap/nselib/
 share/nmap/nselib/afp.lua
+share/nmap/nselib/ajp.lua
 share/nmap/nselib/amqp.lua
 share/nmap/nselib/asn1.lua
+share/nmap/nselib/base32.lua
 share/nmap/nselib/base64.lua
 share/nmap/nselib/bitcoin.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/comm.lua
 share/nmap/nselib/creds.lua
 share/nmap/nselib/cvs.lua
 share/nmap/nselib/data/
+share/nmap/nselib/data/drupal-modules.lst
 share/nmap/nselib/data/favicon-db
 share/nmap/nselib/data/http-default-accounts-fingerprints.lua
 share/nmap/nselib/data/http-fingerprints.lua
 share/nmap/nselib/data/http-folders.txt
+share/nmap/nselib/data/http-sql-errors.lst
+share/nmap/nselib/data/http-web-files-extensions.lst
+share/nmap/nselib/data/jdwp-class/
+share/nmap/nselib/data/jdwp-class/JDWPExecCmd.class
+share/nmap/nselib/data/jdwp-class/JDWPExecCmd.java
+share/nmap/nselib/data/jdwp-class/JDWPSystemInfo.class
+share/nmap/nselib/data/jdwp-class/JDWPSystemInfo.java
+share/nmap/nselib/data/jdwp-class/README.txt
 share/nmap/nselib/data/mysql-cis.audit
 share/nmap/nselib/data/oracle-default-accounts.lst
 share/nmap/nselib/data/oracle-sids
@ -39,6 +52,8 @@ share/nmap/nselib/data/ssl-ciphers
 share/nmap/nselib/data/ssl-fingerprints
 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/datafiles.lua
 share/nmap/nselib/dhcp.lua
@ -48,20 +63,26 @@ share/nmap/nselib/dnsbl.lua
 share/nmap/nselib/dnssd.lua
 share/nmap/nselib/drda.lua
 share/nmap/nselib/eap.lua
+share/nmap/nselib/eigrp.lua
 share/nmap/nselib/ftp.lua
 share/nmap/nselib/giop.lua
+share/nmap/nselib/gps.lua
 share/nmap/nselib/http.lua
 share/nmap/nselib/httpspider.lua
 share/nmap/nselib/iax2.lua
 share/nmap/nselib/imap.lua
 share/nmap/nselib/informix.lua
 share/nmap/nselib/ipOps.lua
+share/nmap/nselib/ipp.lua
 share/nmap/nselib/iscsi.lua
+share/nmap/nselib/isns.lua
+share/nmap/nselib/jdwp.lua
 share/nmap/nselib/json.lua
 share/nmap/nselib/ldap.lua
 share/nmap/nselib/listop.lua
 share/nmap/nselib/match.lua
 share/nmap/nselib/membase.lua
+share/nmap/nselib/mobileme.lua
 share/nmap/nselib/mongodb.lua
 share/nmap/nselib/msrpc.lua
 share/nmap/nselib/msrpcperformance.lua
@ -75,11 +96,13 @@ share/nmap/nselib/netbios.lua
 share/nmap/nselib/nrpc.lua
 share/nmap/nselib/nsedebug.lua
 share/nmap/nselib/omp2.lua
+share/nmap/nselib/ospf.lua
 share/nmap/nselib/packet.lua
 share/nmap/nselib/pgsql.lua
 share/nmap/nselib/pop3.lua
 share/nmap/nselib/pppoe.lua
 share/nmap/nselib/proxy.lua
+share/nmap/nselib/rdp.lua
 share/nmap/nselib/redis.lua
 share/nmap/nselib/rmi.lua
 share/nmap/nselib/rpc.lua
@ -124,6 +147,11 @@ share/nmap/scripts/afp-ls.nse
 share/nmap/scripts/afp-path-vuln.nse
 share/nmap/scripts/afp-serverinfo.nse
 share/nmap/scripts/afp-showmount.nse
+share/nmap/scripts/ajp-auth.nse
+share/nmap/scripts/ajp-brute.nse
+share/nmap/scripts/ajp-headers.nse
+share/nmap/scripts/ajp-methods.nse
+share/nmap/scripts/ajp-request.nse
 share/nmap/scripts/amqp-info.nse
 share/nmap/scripts/asn-query.nse
 share/nmap/scripts/auth-owners.nse
@ -135,12 +163,17 @@ share/nmap/scripts/bitcoin-getaddr.nse
 share/nmap/scripts/bitcoin-info.nse
 share/nmap/scripts/bitcoinrpc-info.nse
 share/nmap/scripts/bittorrent-discovery.nse
+share/nmap/scripts/bjnp-discover.nse
+share/nmap/scripts/broadcast-ataoe-discover.nse
 share/nmap/scripts/broadcast-avahi-dos.nse
+share/nmap/scripts/broadcast-bjnp-discover.nse
 share/nmap/scripts/broadcast-db2-discover.nse
 share/nmap/scripts/broadcast-dhcp-discover.nse
 share/nmap/scripts/broadcast-dhcp6-discover.nse
 share/nmap/scripts/broadcast-dns-service-discovery.nse
 share/nmap/scripts/broadcast-dropbox-listener.nse
+share/nmap/scripts/broadcast-eigrp-discovery.nse
+share/nmap/scripts/broadcast-igmp-discovery.nse
 share/nmap/scripts/broadcast-listener.nse
 share/nmap/scripts/broadcast-ms-sql-discover.nse
 share/nmap/scripts/broadcast-netbios-master-browser.nse
@ -148,17 +181,21 @@ share/nmap/scripts/broadcast-networker-discover.nse
 share/nmap/scripts/broadcast-novell-locate.nse
 share/nmap/scripts/broadcast-pc-anywhere.nse
 share/nmap/scripts/broadcast-pc-duo.nse
+share/nmap/scripts/broadcast-pim-discovery.nse
 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-sybase-asa-discover.nse
+share/nmap/scripts/broadcast-tellstick-discover.nse
 share/nmap/scripts/broadcast-upnp-info.nse
 share/nmap/scripts/broadcast-versant-locate.nse
 share/nmap/scripts/broadcast-wake-on-lan.nse
 share/nmap/scripts/broadcast-wpad-discover.nse
 share/nmap/scripts/broadcast-wsdd-discover.nse
 share/nmap/scripts/broadcast-xdmcp-discover.nse
+share/nmap/scripts/cassandra-brute.nse
+share/nmap/scripts/cassandra-info.nse
 share/nmap/scripts/cccam-version.nse
 share/nmap/scripts/citrix-brute-xml.nse
 share/nmap/scripts/citrix-enum-apps-xml.nse
@ -168,6 +205,8 @@ share/nmap/scripts/citrix-enum-servers.nse
 share/nmap/scripts/couchdb-databases.nse
 share/nmap/scripts/couchdb-stats.nse
 share/nmap/scripts/creds-summary.nse
+share/nmap/scripts/cups-info.nse
+share/nmap/scripts/cups-queue-info.nse
 share/nmap/scripts/cvs-brute-repository.nse
 share/nmap/scripts/cvs-brute.nse
 share/nmap/scripts/daap-get-library.nse
@ -175,12 +214,17 @@ 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
 share/nmap/scripts/dns-blacklist.nse
 share/nmap/scripts/dns-brute.nse
 share/nmap/scripts/dns-cache-snoop.nse
+share/nmap/scripts/dns-check-zone.nse
 share/nmap/scripts/dns-client-subnet-scan.nse
 share/nmap/scripts/dns-fuzz.nse
+share/nmap/scripts/dns-ip6-arpa-scan.nse
 share/nmap/scripts/dns-nsec-enum.nse
+share/nmap/scripts/dns-nsec3-enum.nse
 share/nmap/scripts/dns-nsid.nse
 share/nmap/scripts/dns-random-srcport.nse
 share/nmap/scripts/dns-random-txid.nse
@ -199,8 +243,11 @@ share/nmap/scripts/drda-info.nse
 share/nmap/scripts/duplicates.nse
 share/nmap/scripts/eap-info.nse
 share/nmap/scripts/epmd-info.nse
+share/nmap/scripts/eppc-enum-processes.nse
 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/ftp-anon.nse
 share/nmap/scripts/ftp-bounce.nse
 share/nmap/scripts/ftp-brute.nse
@ -210,7 +257,9 @@ share/nmap/scripts/ftp-vsftpd-backdoor.nse
 share/nmap/scripts/ftp-vuln-cve2010-4221.nse
 share/nmap/scripts/ganglia-info.nse
 share/nmap/scripts/giop-info.nse
+share/nmap/scripts/gkrellm-info.nse
 share/nmap/scripts/gopher-ls.nse
+share/nmap/scripts/gpsd-info.nse
 share/nmap/scripts/hadoop-datanode-info.nse
 share/nmap/scripts/hadoop-jobtracker-info.nse
 share/nmap/scripts/hadoop-namenode-info.nse
@ -220,6 +269,7 @@ share/nmap/scripts/hbase-master-info.nse
 share/nmap/scripts/hbase-region-info.nse
 share/nmap/scripts/hddtemp-info.nse
 share/nmap/scripts/hostmap-bfk.nse
+share/nmap/scripts/hostmap-robtex.nse
 share/nmap/scripts/http-affiliate-id.nse
 share/nmap/scripts/http-apache-negotiation.nse
 share/nmap/scripts/http-auth-finder.nse
@ -236,14 +286,24 @@ share/nmap/scripts/http-cors.nse
 share/nmap/scripts/http-date.nse
 share/nmap/scripts/http-default-accounts.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-enum.nse
+share/nmap/scripts/http-exif-spider.nse
 share/nmap/scripts/http-favicon.nse
 share/nmap/scripts/http-form-brute.nse
+share/nmap/scripts/http-form-fuzzer.nse
+share/nmap/scripts/http-frontpage-login.nse
 share/nmap/scripts/http-generator.nse
+share/nmap/scripts/http-git.nse
+share/nmap/scripts/http-gitweb-projects-enum.nse
 share/nmap/scripts/http-google-malware.nse
 share/nmap/scripts/http-grep.nse
 share/nmap/scripts/http-headers.nse
+share/nmap/scripts/http-huawei-hg5xx-vuln.nse
+share/nmap/scripts/http-icloud-findmyiphone.nse
+share/nmap/scripts/http-icloud-sendmsg.nse
 share/nmap/scripts/http-iis-webdav-vuln.nse
 share/nmap/scripts/http-joomla-brute.nse
 share/nmap/scripts/http-litespeed-sourcecode-download.nse
@ -255,45 +315,66 @@ share/nmap/scripts/http-open-proxy.nse
 share/nmap/scripts/http-open-redirect.nse
 share/nmap/scripts/http-passwd.nse
 share/nmap/scripts/http-php-version.nse
+share/nmap/scripts/http-phpself-xss.nse
 share/nmap/scripts/http-proxy-brute.nse
 share/nmap/scripts/http-put.nse
 share/nmap/scripts/http-qnap-nas-info.nse
+share/nmap/scripts/http-rfi-spider.nse
 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-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-title.nse
+share/nmap/scripts/http-tplink-dir-traversal.nse
 share/nmap/scripts/http-trace.nse
+share/nmap/scripts/http-traceroute.nse
 share/nmap/scripts/http-unsafe-output-escaping.nse
 share/nmap/scripts/http-userdir-enum.nse
 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-cve2009-3960.nse
+share/nmap/scripts/http-vuln-cve2010-0738.nse
 share/nmap/scripts/http-vuln-cve2010-2861.nse
 share/nmap/scripts/http-vuln-cve2011-3192.nse
 share/nmap/scripts/http-vuln-cve2011-3368.nse
 share/nmap/scripts/http-vuln-cve2012-1823.nse
 share/nmap/scripts/http-waf-detect.nse
+share/nmap/scripts/http-waf-fingerprint.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/iax2-brute.nse
 share/nmap/scripts/iax2-version.nse
+share/nmap/scripts/icap-info.nse
 share/nmap/scripts/imap-brute.nse
 share/nmap/scripts/imap-capabilities.nse
 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/ipidseq.nse
 share/nmap/scripts/ipv6-node-info.nse
+share/nmap/scripts/ipv6-ra-flood.nse
 share/nmap/scripts/irc-botnet-channels.nse
 share/nmap/scripts/irc-brute.nse
 share/nmap/scripts/irc-info.nse
+share/nmap/scripts/irc-sasl-brute.nse
 share/nmap/scripts/irc-unrealircd-backdoor.nse
 share/nmap/scripts/iscsi-brute.nse
 share/nmap/scripts/iscsi-info.nse
+share/nmap/scripts/isns-info.nse
+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/krb5-enum-users.nse
 share/nmap/scripts/ldap-brute.nse
@ -301,18 +382,26 @@ share/nmap/scripts/ldap-novell-getpass.nse
 share/nmap/scripts/ldap-rootdse.nse
 share/nmap/scripts/ldap-search.nse
 share/nmap/scripts/lexmark-config.nse
+share/nmap/scripts/llmnr-resolve.nse
 share/nmap/scripts/lltd-discovery.nse
 share/nmap/scripts/maxdb-info.nse
+share/nmap/scripts/mcafee-epo-agent.nse
 share/nmap/scripts/membase-brute.nse
 share/nmap/scripts/membase-http-info.nse
 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/mmouse-brute.nse
+share/nmap/scripts/mmouse-exec.nse
 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/mrinfo.nse
 share/nmap/scripts/ms-sql-brute.nse
 share/nmap/scripts/ms-sql-config.nse
+share/nmap/scripts/ms-sql-dac.nse
 share/nmap/scripts/ms-sql-dump-hashes.nse
 share/nmap/scripts/ms-sql-empty-password.nse
 share/nmap/scripts/ms-sql-hasdbaccess.nse
@ -320,13 +409,18 @@ share/nmap/scripts/ms-sql-info.nse
 share/nmap/scripts/ms-sql-query.nse
 share/nmap/scripts/ms-sql-tables.nse
 share/nmap/scripts/ms-sql-xp-cmdshell.nse
+share/nmap/scripts/msrpc-enum.nse
+share/nmap/scripts/mtrace.nse
 share/nmap/scripts/mysql-audit.nse
 share/nmap/scripts/mysql-brute.nse
 share/nmap/scripts/mysql-databases.nse
+share/nmap/scripts/mysql-dump-hashes.nse
 share/nmap/scripts/mysql-empty-password.nse
 share/nmap/scripts/mysql-info.nse
+share/nmap/scripts/mysql-query.nse
 share/nmap/scripts/mysql-users.nse
 share/nmap/scripts/mysql-variables.nse
+share/nmap/scripts/mysql-vuln-cve2012-2122.nse
 share/nmap/scripts/nat-pmp-info.nse
 share/nmap/scripts/nat-pmp-mapport.nse
 share/nmap/scripts/nbstat.nse
@ -352,12 +446,14 @@ share/nmap/scripts/omp2-brute.nse
 share/nmap/scripts/omp2-enum-targets.nse
 share/nmap/scripts/openlookup-info.nse
 share/nmap/scripts/openvas-otp-brute.nse
+share/nmap/scripts/oracle-brute-stealth.nse
 share/nmap/scripts/oracle-brute.nse
 share/nmap/scripts/oracle-enum-users.nse
 share/nmap/scripts/oracle-sid-brute.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/pgsql-brute.nse
 share/nmap/scripts/pjl-ready-message.nse
 share/nmap/scripts/pop3-brute.nse
@ -366,6 +462,7 @@ share/nmap/scripts/pptp-version.nse
 share/nmap/scripts/qscan.nse
 share/nmap/scripts/quake3-info.nse
 share/nmap/scripts/quake3-master-getservers.nse
+share/nmap/scripts/rdp-enum-encryption.nse
 share/nmap/scripts/rdp-vuln-ms12-020.nse
 share/nmap/scripts/realvnc-auth-bypass.nse
 share/nmap/scripts/redis-brute.nse
@ -376,6 +473,8 @@ share/nmap/scripts/rexec-brute.nse
 share/nmap/scripts/riak-http-info.nse
 share/nmap/scripts/rlogin-brute.nse
 share/nmap/scripts/rmi-dumpregistry.nse
+share/nmap/scripts/rmi-vuln-classloader.nse
+share/nmap/scripts/rpc-grind.nse
 share/nmap/scripts/rpcap-brute.nse
 share/nmap/scripts/rpcap-info.nse
 share/nmap/scripts/rpcinfo.nse
@ -387,7 +486,9 @@ share/nmap/scripts/samba-vuln-cve-2012-1182.nse
 share/nmap/scripts/script.db
 share/nmap/scripts/servicetags.nse
 share/nmap/scripts/sip-brute.nse
+share/nmap/scripts/sip-call-spoof.nse
 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
@ -398,12 +499,16 @@ share/nmap/scripts/smb-enum-sessions.nse
 share/nmap/scripts/smb-enum-shares.nse
 share/nmap/scripts/smb-enum-users.nse
 share/nmap/scripts/smb-flood.nse
+share/nmap/scripts/smb-ls.nse
 share/nmap/scripts/smb-mbenum.nse
 share/nmap/scripts/smb-os-discovery.nse
+share/nmap/scripts/smb-print-text.nse
 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-ms10-054.nse
+share/nmap/scripts/smb-vuln-ms10-061.nse
 share/nmap/scripts/smbv2-enabled.nse
 share/nmap/scripts/smtp-brute.nse
 share/nmap/scripts/smtp-commands.nse
@ -415,6 +520,7 @@ share/nmap/scripts/smtp-vuln-cve2011-1720.nse
 share/nmap/scripts/smtp-vuln-cve2011-1764.nse
 share/nmap/scripts/sniffer-detect.nse
 share/nmap/scripts/snmp-brute.nse
+share/nmap/scripts/snmp-hh3c-logins.nse
 share/nmap/scripts/snmp-interfaces.nse
 share/nmap/scripts/snmp-ios-config.nse
 share/nmap/scripts/snmp-netstat.nse
@ -427,11 +533,11 @@ share/nmap/scripts/snmp-win32-users.nse
 share/nmap/scripts/socks-auth-info.nse
 share/nmap/scripts/socks-brute.nse
 share/nmap/scripts/socks-open-proxy.nse
-share/nmap/scripts/sql-injection.nse
 share/nmap/scripts/ssh-hostkey.nse
 share/nmap/scripts/ssh2-enum-algos.nse
 share/nmap/scripts/sshv1.nse
 share/nmap/scripts/ssl-cert.nse
+share/nmap/scripts/ssl-date.nse
 share/nmap/scripts/ssl-enum-ciphers.nse
 share/nmap/scripts/ssl-google-cert-catalog.nse
 share/nmap/scripts/ssl-known-key.nse
@ -450,6 +556,8 @@ share/nmap/scripts/targets-traceroute.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/traceroute-geolocation.nse
 share/nmap/scripts/unusual-port.nse
 share/nmap/scripts/upnp-info.nse
 share/nmap/scripts/url-snarf.nse
--- a/net/nmap/pkg/PLIST-zenmap
+++ b/net/nmap/pkg/PLIST-zenmap
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-zenmap,v 1.12 2012/07/16 07:39:31 giovanni Exp $
+@comment $OpenBSD: PLIST-zenmap,v 1.13 2012/12/19 17:12:12 giovanni Exp $
 bin/nmapfe
 bin/xnmap
 bin/zenmap
@ -22,6 +22,12 @@ share/zenmap/locale/fr/LC_MESSAGES/zenmap.mo
 share/zenmap/locale/hr/
 share/zenmap/locale/hr/LC_MESSAGES/
 share/zenmap/locale/hr/LC_MESSAGES/zenmap.mo
+share/zenmap/locale/it/
+share/zenmap/locale/it/LC_MESSAGES/
+share/zenmap/locale/it/LC_MESSAGES/zenmap.mo
+share/zenmap/locale/ja/
+share/zenmap/locale/ja/LC_MESSAGES/
+share/zenmap/locale/ja/LC_MESSAGES/zenmap.mo
 share/zenmap/locale/pt_BR/
 share/zenmap/locale/pt_BR/LC_MESSAGES/
 share/zenmap/locale/pt_BR/LC_MESSAGES/zenmap.mo