Update to latest version, to let nping work as root a simple diff to our
libpcap should be committed, comments, ok ?
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/nmap/Makefile,v
retrieving revision 1.95
diff -u -p -r1.95 Makefile
--- Makefile 16 Dec 2010 17:40:20 -0000 1.95
+++ Makefile 2 Mar 2011 09:25:40 -0000
@@ -3,10 +3,8 @@
COMMENT-main= scan ports and fingerprint stack of network hosts
COMMENT-zenmap= graphical frontend for nmap
-MODPY_EGG_VERSION= 5.21
+MODPY_EGG_VERSION= 5.51
DISTNAME= nmap-${MODPY_EGG_VERSION}
-REVISION-main= 3
-REVISION-zenmap= 1
PKGNAME-main= ${DISTNAME}
PKGNAME-zenmap= nmap-zenmap-${MODPY_EGG_VERSION}
@@ -42,7 +40,7 @@ CONFIGURE_ARGS= --with-libpcap=/usr \
--with-mandir=${LOCALBASE}/man \
--disable-nls
-WANTLIB-main= c crypto m pcap ssl stdc++ pcre dnet lua>=5
+WANTLIB-main= c crypto m pcap ssl stdc++ pcre pthread dnet lua>=5
LIB_DEPENDS-main= devel/pcre \
net/libdnet \
lang/lua
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/nmap/distinfo,v
retrieving revision 1.24
diff -u -p -r1.24 distinfo
--- distinfo 21 Apr 2010 07:08:23 -0000 1.24
+++ distinfo 2 Mar 2011 09:25:40 -0000
@@ -1,5 +1,5 @@
-MD5 (nmap-5.21.tgz) = jOdz1wplAHRSFh4L3jKZDA==
-RMD160 (nmap-5.21.tgz) = X5P0sah3z/wNcKSsLcM9/kMaGE4=
-SHA1 (nmap-5.21.tgz) = ziEs52X4QrFgWUVs8MnZz7vOJdY=
-SHA256 (nmap-5.21.tgz) = p/jBjmxAsrLiu/0S5ZN9sG4o4F76gk4uvHFVw9vWLvg=
-SIZE (nmap-5.21.tgz) = 11096893
+MD5 (nmap-5.51.tgz) = qp7NhemQjKxjhxWJIKrx0g==
+RMD160 (nmap-5.51.tgz) = z94oOTcI+qLyEs1hTUU88V9Qpmk=
+SHA1 (nmap-5.51.tgz) = utJOTTMrKT0I2M44WD/voXbpGY0=
+SHA256 (nmap-5.51.tgz) = 1EzSj8CHqYBWI0rFb8GHtnQtqlwg9WvE1SRUgEL0sl4=
+SIZE (nmap-5.51.tgz) = 18641789
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/net/nmap/patches/patch-Makefile_in,v
retrieving revision 1.11
diff -u -p -r1.11 patch-Makefile_in
--- patches/patch-Makefile_in 21 Apr 2010 07:08:23 -0000 1.11
+++ patches/patch-Makefile_in 2 Mar 2011 09:25:40 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.11 2010/04/21 07:08:23 giovanni Exp $
---- Makefile.in.orig Sat Dec 12 21:26:15 2009
-+++ Makefile.in Wed Jan 20 19:54:57 2010
-@@ -234,8 +234,8 @@ $(NCATDIR)/ncat.h: nmap.h
+--- Makefile.in.orig Thu Jan 13 02:28:52 2011
++++ Makefile.in Wed Feb 2 13:12:14 2011
+@@ -259,8 +259,8 @@ $(NPINGDIR)/nping.h: nmap.h
mv -f $@.tmp $@
# Update the version number used by Zenmap.
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 4 Oct 2010 20:42:37 -0000 1.12
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,188 +0,0 @@
-$OpenBSD: patch-configure,v 1.12 2010/10/04 20:42:37 benoit Exp $
---- configure.orig0 Mon Oct 4 16:05:33 2010
-+++ configure Mon Oct 4 16:06:34 2010
-@@ -675,6 +675,7 @@
- PCAP_CLEAN
- PCAP_BUILD
- PCAP_DEPENDS
-+OPENSSL_NO_MD2
- OPENSSL_LIBS
- ZENMAP_DIST_CLEAN
- ZENMAP_CLEAN
-@@ -6683,6 +6684,150 @@
- fi
- fi
-
-+OPENSSL_NO_MD2=
-+if test "$use_openssl" = "yes"; then
-+ if test "${ac_cv_header_openssl_md2_h+set}" = set; then
-+ { $as_echo "$as_me:$LINENO: checking for openssl/md2.h" >&5
-+$as_echo_n "checking for openssl/md2.h... " >&6; }
-+if test "${ac_cv_header_openssl_md2_h+set}" = set; then
-+ $as_echo_n "(cached) " >&6
-+fi
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_openssl_md2_h" >&5
-+$as_echo "$ac_cv_header_openssl_md2_h" >&6; }
-+else
-+ # Is the header compilable?
-+{ $as_echo "$as_me:$LINENO: checking openssl/md2.h usability" >&5
-+$as_echo_n "checking openssl/md2.h usability... " >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+#include <openssl/md2.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+ (eval "$ac_compile") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_header_compiler=yes
-+else
-+ $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_header_compiler=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
-+
-+# Is the header present?
-+{ $as_echo "$as_me:$LINENO: checking openssl/md2.h presence" >&5
-+$as_echo_n "checking openssl/md2.h presence... " >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <openssl/md2.h>
-+_ACEOF
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
-+ ac_header_preproc=yes
-+else
-+ $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+$as_echo "$ac_header_preproc" >&6; }
-+
-+# So? What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
-+ { $as_echo "$as_me:$LINENO: WARNING: openssl/md2.h: accepted by the
compiler, rejected by the preprocessor!" >&5
-+$as_echo "$as_me: WARNING: openssl/md2.h: accepted by the compiler, rejected
by the preprocessor!" >&2;}
-+ { $as_echo "$as_me:$LINENO: WARNING: openssl/md2.h: proceeding with the
compiler's result" >&5
-+$as_echo "$as_me: WARNING: openssl/md2.h: proceeding with the compiler's
result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
-+ { $as_echo "$as_me:$LINENO: WARNING: openssl/md2.h: present but cannot be
compiled" >&5
-+$as_echo "$as_me: WARNING: openssl/md2.h: present but cannot be compiled"
>&2;}
-+ { $as_echo "$as_me:$LINENO: WARNING: openssl/md2.h: check for missing
prerequisite headers?" >&5
-+$as_echo "$as_me: WARNING: openssl/md2.h: check for missing prerequisite
headers?" >&2;}
-+ { $as_echo "$as_me:$LINENO: WARNING: openssl/md2.h: see the Autoconf
documentation" >&5
-+$as_echo "$as_me: WARNING: openssl/md2.h: see the Autoconf documentation"
>&2;}
-+ { $as_echo "$as_me:$LINENO: WARNING: openssl/md2.h: section \"Present
But Cannot Be Compiled\"" >&5
-+$as_echo "$as_me: WARNING: openssl/md2.h: section \"Present But Cannot Be
Compiled\"" >&2;}
-+ { $as_echo "$as_me:$LINENO: WARNING: openssl/md2.h: proceeding with the
preprocessor's result" >&5
-+$as_echo "$as_me: WARNING: openssl/md2.h: proceeding with the preprocessor's
result" >&2;}
-+ { $as_echo "$as_me:$LINENO: WARNING: openssl/md2.h: in the future, the
compiler will take precedence" >&5
-+$as_echo "$as_me: WARNING: openssl/md2.h: in the future, the compiler will
take precedence" >&2;}
-+
-+ ;;
-+esac
-+{ $as_echo "$as_me:$LINENO: checking for openssl/md2.h" >&5
-+$as_echo_n "checking for openssl/md2.h... " >&6; }
-+if test "${ac_cv_header_openssl_md2_h+set}" = set; then
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_cv_header_openssl_md2_h=$ac_header_preproc
-+fi
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_openssl_md2_h" >&5
-+$as_echo "$ac_cv_header_openssl_md2_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_openssl_md2_h = yes; then
-+ :
-+else
-+ cat >>confdefs.h <<\_ACEOF
-+#define OPENSSL_NO_MD2 1
-+_ACEOF
-+
-+ CPPFLAGS="$CPPFLAGS -DOPENSSL_NO_MD2"
-+
-+fi
-+
-+
-+
-+fi
-+
- OPENSSL_LIBS=
- if test "$use_openssl" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-@@ -7161,6 +7306,7 @@
- extern char pcap_version[];
- int main() {
- int major, minor1, minor2;
-+ exit(0); /* fool it, use our libpcap */
- sscanf(pcap_version,"%d.%d.%d", &major, &minor1, &minor2);
- if (major > 0)
- exit(0);
-@@ -7492,7 +7638,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--#include <pcre/pcre.h>
-+#include <pcre.h>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (ac_try="$ac_compile"
-@@ -7693,7 +7839,7 @@
- else
- # We only need to check for and use this if we are NOT using included pcre
-
--for ac_header in pcre/pcre.h
-+for ac_header in pcre.h
- do
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
Index: patches/patch-libnetutil_netutil_cc
===================================================================
RCS file: patches/patch-libnetutil_netutil_cc
diff -N patches/patch-libnetutil_netutil_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libnetutil_netutil_cc 2 Mar 2011 09:25:40 -0000
@@ -0,0 +1,27 @@
+$OpenBSD$
+--- libnetutil/netutil.cc.orig Wed Feb 2 16:14:26 2011
++++ libnetutil/netutil.cc Wed Feb 2 16:15:38 2011
+@@ -3424,10 +3424,6 @@ void set_pcap_filter(const char *device, pcap_t *pd, c
+ static bool frame_is_arp(const u8 *frame, int datalink) {
+ if (datalink == DLT_EN10MB) {
+ return ntohs(*((u16 *) (frame + 12))) == ETH_TYPE_ARP;
+- } else if (datalink == DLT_LINUX_SLL) {
+- return ntohs(*((u16 *) (frame + 2))) == ARPHRD_ETHER && /* sll_hatype */
+- ntohs(*((u16 *) (frame + 4))) == 6 && /* sll_halen */
+- ntohs(*((u16 *) (frame + 14))) == ETH_TYPE_ARP; /* sll_protocol */
+ } else {
+ return false;
+ }
+@@ -3472,11 +3468,8 @@ int read_arp_reply_pcap(pcap_t *pd, u8 *sendermac,
+
+ if (datalink == DLT_EN10MB) {
+ offset = ETH_HDR_LEN;
+- } else if (datalink == DLT_LINUX_SLL) {
+- /* The datalink type is Linux "cooked" sockets. See pcap-linktype(7). */
+- offset = 16;
+ } else {
+- netutil_fatal("%s called on interface that is datatype %d rather than
DLT_EN10MB (%d) or DLT_LINUX_SLL (%d)", __func__, datalink, DLT_EN10MB,
DLT_LINUX_SLL);
++ netutil_fatal("%s called on interface that is datatype %d rather than
DLT_EN10MB (%d)", __func__, datalink, DLT_EN10MB);
+ }
+
+ if (to_usec > 0) {
Index: patches/patch-libnetutil_netutil_h
===================================================================
RCS file: patches/patch-libnetutil_netutil_h
diff -N patches/patch-libnetutil_netutil_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libnetutil_netutil_h 2 Mar 2011 09:25:40 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- libnetutil/netutil.h.orig Wed Feb 2 16:11:05 2011
++++ libnetutil/netutil.h Wed Feb 2 16:13:25 2011
+@@ -105,6 +105,7 @@ extern "C" {
+ #endif
+
+ #include "dnet.h"
++#include "../sctp.h"
+
+ enum { OP_FAILURE = -1, OP_SUCCESS = 0 };
+
Index: patches/patch-ncat_ncat_connect_c
===================================================================
RCS file: patches/patch-ncat_ncat_connect_c
diff -N patches/patch-ncat_ncat_connect_c
--- patches/patch-ncat_ncat_connect_c 8 Jul 2010 14:43:30 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-ncat_ncat_connect_c,v 1.1 2010/07/08 14:43:30 sebastia Exp $
-fix build on gcc2 archs
---- ncat/ncat_connect.c.orig Thu Jul 8 10:49:27 2010
-+++ ncat/ncat_connect.c Thu Jul 8 10:50:04 2010
-@@ -420,8 +420,9 @@ int ncat_connect(void) {
-
- if (o.verbose) {
- struct timeval end_time;
-+ double time;
- gettimeofday(&end_time, NULL);
-- double time = TIMEVAL_MSEC_SUBTRACT(end_time, start_time) / 1000.0;
-+ time = TIMEVAL_MSEC_SUBTRACT(end_time, start_time) / 1000.0;
- loguser("%lu bytes sent, %lu bytes received in %.2f seconds.\n",
- nsi_get_write_count(cs.sock_nsi),
- nsi_get_read_count(cs.sock_nsi), time);
Index: patches/patch-ncat_ncat_main_c
===================================================================
RCS file: patches/patch-ncat_ncat_main_c
diff -N patches/patch-ncat_ncat_main_c
--- patches/patch-ncat_ncat_main_c 8 Jul 2010 14:43:30 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-$OpenBSD: patch-ncat_ncat_main_c,v 1.1 2010/07/08 14:43:30 sebastia Exp $
-fix build on gcc2 archs
---- ncat/ncat_main.c.orig Thu Jul 8 10:46:42 2010
-+++ ncat/ncat_main.c Thu Jul 8 10:47:38 2010
-@@ -221,10 +221,6 @@ int main(int argc, char *argv[])
- char *source = NULL;
- char *proxyaddr = NULL;
-
-- gettimeofday(&start_time, NULL);
-- /* Set default options. */
-- options_init();
--
- struct option long_options[] = {
- {"4", no_argument, NULL, '4'},
- {"6", no_argument, NULL, '6'},
-@@ -271,6 +267,10 @@ int main(int argc, char *argv[])
- #endif
- {0, 0, 0, 0}
- };
-+
-+ gettimeofday(&start_time, NULL);
-+ /* Set default options. */
-+ options_init();
-
- #ifdef WIN32
- windows_init();
Index: patches/patch-nping_EchoServer_cc
===================================================================
RCS file: patches/patch-nping_EchoServer_cc
diff -N patches/patch-nping_EchoServer_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-nping_EchoServer_cc 2 Mar 2011 09:25:40 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- nping/EchoServer.cc.orig Wed Feb 2 16:32:30 2011
++++ nping/EchoServer.cc Wed Feb 2 16:33:20 2011
+@@ -836,7 +836,7 @@ int EchoServer::nep_capture_handler(nsock_pool nsp, ns
+ const unsigned char *packet=NULL;
+ const unsigned char *link=NULL;
+ nsock_iod nsi = nse_iod(nse);
+- struct timeval pcaptime;
++ struct bpf_timeval pcaptime;
+ nsock_iod clnt_iod=NULL;
+ NEPContext *ctx=NULL;
+ EchoHeader pkt_out;
Index: patches/patch-nping_Makefile_in
===================================================================
RCS file: patches/patch-nping_Makefile_in
diff -N patches/patch-nping_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-nping_Makefile_in 2 Mar 2011 09:25:40 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- nping/Makefile.in.orig Tue Jan 11 20:53:42 2011
++++ nping/Makefile.in Wed Feb 2 17:23:46 2011
+@@ -48,7 +48,7 @@ export CFLAGS = $(CXXFLAGS)
+ STATIC =
+ LDFLAGS = @LDFLAGS@ $(DBGFLAGS) $(STATIC)
+ OPENSSL_LIBS = @OPENSSL_LIBS@
+-LIBS = $(NBASEDIR)/libnbase.a $(NSOCKDIR)/src/libnsock.a
../libnetutil/libnetutil.a $(OPENSSL_LIBS) @LIBPCAP_LIBS@ @LIBDNET_LIBS@ @LIBS@
-lpthread
++LIBS = $(NBASEDIR)/libnbase.a $(NSOCKDIR)/src/libnsock.a
../libnetutil/libnetutil.a $(OPENSSL_LIBS) @LIBDNET_LIBS@ @LIBS@ -lpthread
-lpcap
+ # LIBS = -lefence @LIBS@
+ # LIBS = -lrmalloc @LIBS@
+ INSTALL = @INSTALL@
Index: patches/patch-nping_ProbeMode_cc
===================================================================
RCS file: patches/patch-nping_ProbeMode_cc
diff -N patches/patch-nping_ProbeMode_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-nping_ProbeMode_cc 2 Mar 2011 09:25:40 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- nping/ProbeMode.cc.orig Wed Feb 2 17:12:11 2011
++++ nping/ProbeMode.cc Wed Feb 2 17:12:51 2011
+@@ -1506,8 +1506,8 @@ void ProbeMode::probe_nping_event_handler(nsock_pool n
+ u16 *ethtype=NULL;
+ u8 buffer[512+1];
+ size_t link_offset=0;
+- static struct timeval pcaptime;
+- static struct timeval prevtime;
++ static struct bpf_timeval pcaptime;
++ static struct bpf_timeval prevtime;
+ NpingTarget *trg=NULL;
+ u16 *prt=NULL;
+ u8 proto=0;
Index: patches/patch-nse_nsock_cc
===================================================================
RCS file: patches/patch-nse_nsock_cc
diff -N patches/patch-nse_nsock_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-nse_nsock_cc 2 Mar 2011 09:25:40 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- nse_nsock.cc.orig Wed Feb 2 16:30:50 2011
++++ nse_nsock.cc Wed Feb 2 16:31:11 2011
+@@ -1010,7 +1010,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;
+- struct timeval tv;
++ struct bpf_timeval tv;
+
+ nse_readpcap(nse, &l2_data, &l2_len, &l3_data, &l3_len, &packet_len, &tv);
+
Index: patches/patch-nse_openssl_cc
===================================================================
RCS file: patches/patch-nse_openssl_cc
diff -N patches/patch-nse_openssl_cc
--- patches/patch-nse_openssl_cc 4 Oct 2010 20:42:37 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,39 +0,0 @@
-$OpenBSD: patch-nse_openssl_cc,v 1.1 2010/10/04 20:42:37 benoit Exp $
---- nse_openssl.cc.orig Mon Oct 4 15:50:40 2010
-+++ nse_openssl.cc Mon Oct 4 15:54:05 2010
-@@ -8,7 +8,9 @@
- #include <openssl/crypto.h>
- #include <openssl/bn.h>
- #include <openssl/rand.h>
-+#ifndef OPENSSL_NO_MD2
- #include <openssl/md2.h>
-+#endif
- #include <openssl/md4.h>
- #include <openssl/md5.h>
- #include <openssl/sha.h>
-@@ -206,6 +208,7 @@
- return 1;
- }
-
-+#ifndef OPENSSL_NO_MD2
- static int l_md2(lua_State *L) /** md2(string s) */
- {
- size_t len;
-@@ -215,6 +218,7 @@
- lua_pushlstring( L, (char *) MD2( s, len, digest ), 16 );
- return 1;
- }
-+#endif
-
- static int l_md4(lua_State *L) /** md4(string s) */
- {
-@@ -469,7 +473,9 @@
- { "bignum_mod_exp", l_bignum_mod_exp },
- { "rand_bytes", l_rand_bytes },
- { "rand_pseudo_bytes", l_rand_pseudo_bytes },
-+#ifndef OPENSSL_NO_MD2
- { "md2", l_md2 },
-+#endif
- { "md4", l_md4 },
- { "md5", l_md5 },
- { "sha1", l_sha1 },
Index: patches/patch-nsock_include_nsock_h
===================================================================
RCS file: /cvs/ports/net/nmap/patches/patch-nsock_include_nsock_h,v
retrieving revision 1.5
diff -u -p -r1.5 patch-nsock_include_nsock_h
--- patches/patch-nsock_include_nsock_h 21 Apr 2010 07:08:23 -0000 1.5
+++ patches/patch-nsock_include_nsock_h 2 Mar 2011 09:25:40 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-nsock_include_nsock_h,v 1.5 2010/04/21 07:08:23 giovanni Exp $
---- nsock/include/nsock.h.orig Thu Aug 20 23:36:58 2009
-+++ nsock/include/nsock.h Wed Jan 20 19:54:57 2010
-@@ -79,6 +79,8 @@
+--- nsock/include/nsock.h.orig Fri Jan 21 01:04:51 2011
++++ nsock/include/nsock.h Wed Feb 2 13:12:14 2011
+@@ -86,6 +86,8 @@
extern "C" {
#endif
@@ -10,7 +10,7 @@ $OpenBSD: patch-nsock_include_nsock_h,v
/* 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
-@@ -563,7 +565,7 @@ nsock_event_id nsock_pcap_read_packet(nsock_pool nsp,
+@@ -588,7 +590,7 @@ nsock_event_id nsock_pcap_read_packet(nsock_pool nsp,
void nse_readpcap(nsock_event nsee,
const unsigned char **l2_data, size_t *l2_len,
const unsigned char **l3_data, size_t *l3_len,
Index: patches/patch-nsock_src_nsock_pcap_c
===================================================================
RCS file: patches/patch-nsock_src_nsock_pcap_c
diff -N patches/patch-nsock_src_nsock_pcap_c
--- patches/patch-nsock_src_nsock_pcap_c 8 Jul 2010 14:43:30 -0000
1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,111 +0,0 @@
-$OpenBSD: patch-nsock_src_nsock_pcap_c,v 1.3 2010/07/08 14:43:30 sebastia Exp $
-fix build on gcc2 archs
---- nsock/src/nsock_pcap.c.orig Wed Mar 4 04:08:33 2009
-+++ nsock/src/nsock_pcap.c Thu Jul 8 10:46:21 2010
-@@ -25,13 +25,12 @@ char* nsock_pcap_open(nsock_pool nsp, nsock_iod nsiod,
- mspool *ms = (mspool *) nsp;
- mspcap *mp = (mspcap *) nsi->pcap;
- static char errorbuf[128];
--
-- if(mp) return "nsock-pcap: this nsi already has pcap device opened";
--
-- mp = (mspcap *)safe_malloc(sizeof(mspcap));
-- nsi->pcap = (void*)mp;
--
- char err0r[PCAP_ERRBUF_SIZE];
-+ /* packet filter string */
-+ char bpf[4096];
-+ va_list ap;
-+ int failed, datalink;
-+ char *e;
-
- #ifdef PCAP_CAN_DO_SELECT
- #if PCAP_BSD_SELECT_HACK
-@@ -45,10 +44,9 @@ char* nsock_pcap_open(nsock_pool nsp, nsock_iod nsiod,
- #else
- int to_ms = 1;
- #endif
--
-- /* packet filter string */
-- char bpf[4096];
-- va_list ap;
-+ if(mp) return "nsock-pcap: this nsi already has pcap device opened";
-+ mp = (mspcap *)safe_malloc(sizeof(mspcap));
-+ nsi->pcap = (void*)mp;
-
- va_start(ap, bpf_fmt);
- if(Vsnprintf(bpf, sizeof(bpf), bpf_fmt, ap) >= (int) sizeof(bpf)){
-@@ -61,7 +59,7 @@ char* nsock_pcap_open(nsock_pool nsp, nsock_iod nsiod,
- nsock_trace(ms, "PCAP requested on device '%s' with berkeley
filter '%s' (promisc=%i snaplen=%i to_ms=%i) (IOD #%li)",
- pcap_device,bpf, promisc, snaplen, to_ms, nsi->id);
-
-- int failed = 0;
-+ failed = 0;
- do {
- mp->pt = pcap_open_live((char*)pcap_device, snaplen, promisc,
to_ms, err0r);
- if (mp->pt) /* okay, opened!*/
-@@ -84,7 +82,7 @@ char* nsock_pcap_open(nsock_pool nsp, nsock_iod nsiod,
- sleep(4* failed);
- }while(1);
-
-- char *e = nsock_pcap_set_filter(mp->pt, pcap_device, bpf);
-+ e = nsock_pcap_set_filter(mp->pt, pcap_device, bpf);
- if(e) return e;
-
-
-@@ -96,7 +94,6 @@ char* nsock_pcap_open(nsock_pool nsp, nsock_iod nsiod,
- PacketSetReadTimeout(mp->pt->adapter, to_ms);
- #endif
-
-- int datalink;
- mp->l3_offset = nsock_pcap_get_l3_offset(mp->pt, &datalink);
- mp->snaplen = snaplen;
- mp->datalink = datalink;
-@@ -280,6 +277,9 @@ int do_actual_pcap_read(msevent *nse)
-
- nsock_pcap npp;
- nsock_pcap *n;
-+ struct pcap_pkthdr *pkt_header;
-+ const unsigned char *pkt_data = NULL;
-+ int rc;
- memset(&npp, 0, sizeof(nsock_pcap));
-
- if (nse->iod->nsp->tracelevel > 2)
-@@ -288,9 +288,7 @@ int do_actual_pcap_read(msevent *nse)
-
- assert( FILESPACE_LENGTH(&(nse->iobuf)) == 0 );
-
-- struct pcap_pkthdr *pkt_header;
-- const unsigned char *pkt_data = NULL;
-- int rc = pcap_next_ex(mp->pt, &pkt_header, &pkt_data);
-+ rc = pcap_next_ex(mp->pt, &pkt_header, &pkt_data);
- switch(rc){
- case 1: /* read good packet */
- #ifdef PCAP_RECV_TIMEVAL_VALID
-@@ -325,11 +323,14 @@ int do_actual_pcap_read(msevent *nse)
- void nse_readpcap(nsock_event nsee,
- const unsigned char **l2_data, size_t *l2_len,
- const unsigned char **l3_data, size_t *l3_len,
-- size_t *packet_len, struct timeval *ts)
-+ size_t *packet_len, struct bpf_timeval *ts)
- {
- msevent *nse = (msevent *)nsee;
- msiod *iod = nse->iod;
- mspcap *mp = (mspcap *) iod->pcap;
-+
-+ size_t l2l;
-+ size_t l3l;
-
- nsock_pcap *n = (nsock_pcap *) FILESPACE_STR(&(nse->iobuf));
- if(FILESPACE_LENGTH(&(nse->iobuf)) < sizeof(nsock_pcap)){
-@@ -341,8 +342,8 @@ void nse_readpcap(nsock_event nsee,
- return;
- }
-
-- size_t l2l = MIN(mp->l3_offset, n->caplen);
-- size_t l3l = MAX(0, n->caplen-mp->l3_offset);
-+ l2l = MIN(mp->l3_offset, n->caplen);
-+ l3l = MAX(0, n->caplen-mp->l3_offset);
-
- if(l2_data) *l2_data = n->packet;
- if(l2_len ) *l2_len = l2l;
Index: patches/patch-nsock_src_nsock_pcap_h
===================================================================
RCS file: /cvs/ports/net/nmap/patches/patch-nsock_src_nsock_pcap_h,v
retrieving revision 1.3
diff -u -p -r1.3 patch-nsock_src_nsock_pcap_h
--- patches/patch-nsock_src_nsock_pcap_h 22 Oct 2009 10:00:57 -0000
1.3
+++ patches/patch-nsock_src_nsock_pcap_h 2 Mar 2011 09:25:40 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-nsock_src_nsock_pcap_h,v 1.3 2009/10/22 10:00:57 giovanni Exp $
---- nsock/src/nsock_pcap.h.orig Wed Mar 4 04:08:33 2009
-+++ nsock/src/nsock_pcap.h Tue Jul 21 19:57:38 2009
-@@ -75,7 +75,7 @@ typedef struct{
+--- nsock/src/nsock_pcap.h.orig Sat Oct 2 19:26:38 2010
++++ nsock/src/nsock_pcap.h Wed Feb 2 13:12:14 2011
+@@ -81,7 +81,7 @@ typedef struct{
typedef struct{
Index: patches/patch-scan-engine_cc
===================================================================
RCS file: /cvs/ports/net/nmap/patches/patch-scan-engine_cc,v
retrieving revision 1.2
diff -u -p -r1.2 patch-scan-engine_cc
--- patches/patch-scan-engine_cc 21 Apr 2010 07:08:23 -0000 1.2
+++ patches/patch-scan-engine_cc 2 Mar 2011 09:25:40 -0000
@@ -1,5 +1,5 @@
---- scan_engine.cc.orig Fri Jan 15 04:55:23 2010
-+++ scan_engine.cc Wed Jan 20 19:54:57 2010
+--- scan_engine.cc.orig Fri Jan 21 01:04:16 2011
++++ scan_engine.cc Wed Feb 2 13:12:14 2011
@@ -108,6 +108,7 @@
#include <math.h>
#include <list>
@@ -8,7 +8,7 @@
using namespace std;
extern NmapOps o;
-@@ -4915,13 +4916,13 @@ static void begin_sniffer(UltraScanInfo *USI, vector<T
+@@ -4936,13 +4937,13 @@ static void begin_sniffer(UltraScanInfo *USI, vector<T
if (doIndividual){
pcap_filter="dst host ";
pcap_filter+=inet_ntoa(Targets[0]->v4source());
@@ -23,4 +23,4 @@
+ pcap_filter+=" and (icmp or tcp or udp)";
}
}else assert(0);
- if (o.debugging > 2) log_write(LOG_PLAIN, "Pcap filter: %s\n",
pcap_filter.c_str());
+ if (o.debugging) log_write(LOG_PLAIN, "Packet capture filter (device %s):
%s\n", Targets[0]->deviceFullName(), pcap_filter.c_str());
Index: patches/patch-tcpip_cc
===================================================================
RCS file: /cvs/ports/net/nmap/patches/patch-tcpip_cc,v
retrieving revision 1.11
diff -u -p -r1.11 patch-tcpip_cc
--- patches/patch-tcpip_cc 21 Apr 2010 07:08:23 -0000 1.11
+++ patches/patch-tcpip_cc 2 Mar 2011 09:25:40 -0000
@@ -1,6 +1,6 @@
---- tcpip.cc.orig Fri Jan 15 04:55:23 2010
-+++ tcpip.cc Wed Jan 20 19:56:46 2010
-@@ -127,6 +127,8 @@
+--- tcpip.cc.orig Fri Jan 21 01:04:16 2011
++++ tcpip.cc Wed Feb 2 13:12:14 2011
+@@ -120,6 +120,8 @@
#endif /* NETINET_IF_ETHER_H */
#endif /* HAVE_NETINET_IF_ETHER_H */
@@ -9,12 +9,3 @@
extern NmapOps o;
#ifdef WIN32
-@@ -2432,7 +2434,7 @@ bool pcap_selectable_fd_valid() {
- results. If you just want to test whether the function is supported,
- use pcap_selectable_fd_valid() instead. */
- int my_pcap_get_selectable_fd(pcap_t *p) {
--#if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) &&
(__FreeBSD_version < 500000))
-+#if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) &&
(__FreeBSD_version < 500000)) || defined(__OpenBSD__)
- return -1;
- #else
- assert(pcap_selectable_fd_valid());
Index: patches/patch-zenmap_install_scripts_unix_su-to-zenmap_sh
===================================================================
RCS file:
/cvs/ports/net/nmap/patches/patch-zenmap_install_scripts_unix_su-to-zenmap_sh,v
retrieving revision 1.2
diff -u -p -r1.2 patch-zenmap_install_scripts_unix_su-to-zenmap_sh
--- patches/patch-zenmap_install_scripts_unix_su-to-zenmap_sh 22 Oct 2009
10:00:57 -0000 1.2
+++ patches/patch-zenmap_install_scripts_unix_su-to-zenmap_sh 2 Mar 2011
09:25:40 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-zenmap_install_scripts_unix_su-to-zenmap_sh,v 1.2 2009/10/22
10:00:57 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 Thu Oct 1 18:46:30 2009
++++ zenmap/install_scripts/unix/su-to-zenmap.sh Wed Feb 2 16:04:05 2011
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
@@ -12,14 +12,14 @@ $OpenBSD: patch-zenmap_install_scripts_u
if which kdesu >/dev/null 2>&1 ; then
SU_TO_ROOT_X=kdesu
- elif test -x /usr/lib/kde4/libexec/kdesu ; then
-+ elif test -x ${LOCALBASE}/lib/kde4/libexec/kdesu ; then
++ elif test -x /usr/local/lib/kde4/libexec/kdesu ; then
SU_TO_ROOT_X=kde4su
fi;
fi;
elif which kdesu >/dev/null 2>&1 ; then
SU_TO_ROOT_X=kdesu
- elif test -x /usr/lib/kde4/libexec/kdesu ; then
-+ elif test -x ${LOCALBASE}/lib/kde4/libexec/kdesu ; then
++ elif test -x /usr/local/lib/kde4/libexec/kdesu ; then
SU_TO_ROOT_X=kde4su
elif which ktsuss >/dev/null 2>&1 ; then
SU_TO_ROOT_X=ktsuss
@@ -28,7 +28,7 @@ $OpenBSD: patch-zenmap_install_scripts_u
gksu) gksu -u "$PRIV" "$COMMAND";;
kdesu) kdesu -u "$PRIV" "$COMMAND";;
- kde4su) /usr/lib/kde4/libexec/kdesu -u "$PRIV" "$COMMAND";;
-+ kde4su) ${LOCALBASE}/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";;
Index: patches/patch-zenmap_setup_py
===================================================================
RCS file: /cvs/ports/net/nmap/patches/patch-zenmap_setup_py,v
retrieving revision 1.7
diff -u -p -r1.7 patch-zenmap_setup_py
--- patches/patch-zenmap_setup_py 21 Apr 2010 07:08:23 -0000 1.7
+++ patches/patch-zenmap_setup_py 2 Mar 2011 09:25:40 -0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-zenmap_setup_py,v 1.7 2010/04/21 07:08:23 giovanni Exp $
---- zenmap/setup.py.orig Wed Nov 4 04:36:50 2009
-+++ zenmap/setup.py Wed Jan 20 19:54:57 2010
-@@ -192,12 +192,11 @@ def path_strip_prefix(path, prefix):
+--- zenmap/setup.py.orig Fri Jan 21 01:04:51 2011
++++ zenmap/setup.py Wed Feb 2 13:12:14 2011
+@@ -199,12 +199,11 @@ class my_install(install):
+ install.finalize_options(self)
- class my_install(install):
def run(self):
+ self.fix_paths()
install.run(self)
@@ -15,9 +15,9 @@ $OpenBSD: patch-zenmap_setup_py,v 1.7 20
self.write_installed_files()
def get_installed_files(self):
-@@ -350,17 +349,10 @@ for dir in dirs:
- "MISC_DIR": os.path.join(self.prefix, misc_dir),
- "PIXMAPS_DIR": os.path.join(self.prefix,
pixmaps_dir)}
+@@ -359,17 +358,10 @@ for dir in dirs:
+ # See $(nmapdatadir) in nmap/Makefile.in.
+ "NMAPDATADIR": os.path.join(self.saved_prefix,
"share", "nmap"),}
- # Find and read the Paths.py file.
- pcontent = ""
@@ -36,7 +36,7 @@ $OpenBSD: patch-zenmap_setup_py,v 1.7 20
# Replace the path definitions.
for path, replacement in interesting_paths.items():
-@@ -381,11 +373,6 @@ for dir in dirs:
+@@ -390,11 +382,6 @@ for dir in dirs:
desktop_filename = None
root_desktop_filename = None
Index: pkg/PFRAG.shared-main
===================================================================
RCS file: /cvs/ports/net/nmap/pkg/PFRAG.shared-main,v
retrieving revision 1.8
diff -u -p -r1.8 PFRAG.shared-main
--- pkg/PFRAG.shared-main 21 Apr 2010 07:08:23 -0000 1.8
+++ pkg/PFRAG.shared-main 2 Mar 2011 09:25:41 -0000
@@ -1,13 +1,16 @@
@comment $OpenBSD: PFRAG.shared-main,v 1.8 2010/04/21 07:08:23 giovanni Exp $
share/nmap/nse_main.lua
share/nmap/nselib/
+share/nmap/nselib/afp.lua
+share/nmap/nselib/asn1.lua
share/nmap/nselib/base64.lua
+share/nmap/nselib/brute.lua
share/nmap/nselib/citrixxml.lua
share/nmap/nselib/comm.lua
share/nmap/nselib/data/
share/nmap/nselib/data/favicon-db
-share/nmap/nselib/data/folders.lst
-share/nmap/nselib/data/http-fingerprints
+share/nmap/nselib/data/http-fingerprints.lua
+share/nmap/nselib/data/http-folders.txt
share/nmap/nselib/data/oracle-sids
share/nmap/nselib/data/passwords.lst
share/nmap/nselib/data/psexec/
@@ -15,31 +18,44 @@ share/nmap/nselib/data/psexec/README
share/nmap/nselib/data/psexec/backdoor.lua
share/nmap/nselib/data/psexec/default.lua
share/nmap/nselib/data/psexec/drives.lua
-share/nmap/nselib/data/psexec/encoder.c
share/nmap/nselib/data/psexec/examples.lua
share/nmap/nselib/data/psexec/experimental.lua
share/nmap/nselib/data/psexec/network.lua
share/nmap/nselib/data/psexec/nmap_service.c
-share/nmap/nselib/data/psexec/nmap_service.exe
share/nmap/nselib/data/psexec/nmap_service.vcproj
share/nmap/nselib/data/psexec/pwdump.lua
share/nmap/nselib/data/usernames.lst
-share/nmap/nselib/data/yokoso-fingerprints
share/nmap/nselib/datafiles.lua
+share/nmap/nselib/dhcp.lua
share/nmap/nselib/dns.lua
+share/nmap/nselib/dnssd.lua
+share/nmap/nselib/drda.lua
+share/nmap/nselib/ftp.lua
+share/nmap/nselib/giop.lua
share/nmap/nselib/http.lua
share/nmap/nselib/imap.lua
+share/nmap/nselib/informix.lua
share/nmap/nselib/ipOps.lua
+share/nmap/nselib/iscsi.lua
+share/nmap/nselib/json.lua
+share/nmap/nselib/ldap.lua
share/nmap/nselib/listop.lua
share/nmap/nselib/match.lua
+share/nmap/nselib/mongodb.lua
share/nmap/nselib/msrpc.lua
share/nmap/nselib/msrpcperformance.lua
share/nmap/nselib/msrpctypes.lua
+share/nmap/nselib/mssql.lua
+share/nmap/nselib/mysql.lua
share/nmap/nselib/netbios.lua
+share/nmap/nselib/nrpc.lua
share/nmap/nselib/nsedebug.lua
share/nmap/nselib/packet.lua
+share/nmap/nselib/pgsql.lua
share/nmap/nselib/pop3.lua
share/nmap/nselib/proxy.lua
+share/nmap/nselib/rmi.lua
+share/nmap/nselib/rpc.lua
share/nmap/nselib/shortport.lua
share/nmap/nselib/smb.lua
share/nmap/nselib/smbauth.lua
@@ -50,57 +66,141 @@ share/nmap/nselib/stdnse.lua
share/nmap/nselib/strbuf.lua
share/nmap/nselib/strict.lua
share/nmap/nselib/tab.lua
+share/nmap/nselib/target.lua
+share/nmap/nselib/tns.lua
share/nmap/nselib/unpwdb.lua
+share/nmap/nselib/upnp.lua
share/nmap/nselib/url.lua
+share/nmap/nselib/vnc.lua
+share/nmap/nselib/wsdd.lua
share/nmap/scripts/
+share/nmap/scripts/afp-brute.nse
+share/nmap/scripts/afp-path-vuln.nse
+share/nmap/scripts/afp-serverinfo.nse
+share/nmap/scripts/afp-showmount.nse
share/nmap/scripts/asn-query.nse
share/nmap/scripts/auth-owners.nse
share/nmap/scripts/auth-spoof.nse
share/nmap/scripts/banner.nse
+share/nmap/scripts/broadcast-dns-service-discovery.nse
+share/nmap/scripts/broadcast-dropbox-listener.nse
+share/nmap/scripts/broadcast-ms-sql-discover.nse
+share/nmap/scripts/broadcast-upnp-info.nse
+share/nmap/scripts/broadcast-wsdd-discover.nse
share/nmap/scripts/citrix-brute-xml.nse
share/nmap/scripts/citrix-enum-apps-xml.nse
share/nmap/scripts/citrix-enum-apps.nse
share/nmap/scripts/citrix-enum-servers-xml.nse
share/nmap/scripts/citrix-enum-servers.nse
+share/nmap/scripts/couchdb-databases.nse
+share/nmap/scripts/couchdb-stats.nse
+share/nmap/scripts/daap-get-library.nse
share/nmap/scripts/daytime.nse
-share/nmap/scripts/db2-info.nse
+share/nmap/scripts/db2-das-info.nse
+share/nmap/scripts/db2-discover.nse
share/nmap/scripts/dhcp-discover.nse
+share/nmap/scripts/dns-cache-snoop.nse
+share/nmap/scripts/dns-fuzz.nse
share/nmap/scripts/dns-random-srcport.nse
share/nmap/scripts/dns-random-txid.nse
share/nmap/scripts/dns-recursion.nse
+share/nmap/scripts/dns-service-discovery.nse
+share/nmap/scripts/dns-update.nse
share/nmap/scripts/dns-zone-transfer.nse
+share/nmap/scripts/domcon-brute.nse
+share/nmap/scripts/domcon-cmd.nse
+share/nmap/scripts/domino-enum-users.nse
+share/nmap/scripts/drda-brute.nse
+share/nmap/scripts/drda-info.nse
share/nmap/scripts/finger.nse
+share/nmap/scripts/firewalk.nse
share/nmap/scripts/ftp-anon.nse
share/nmap/scripts/ftp-bounce.nse
share/nmap/scripts/ftp-brute.nse
-share/nmap/scripts/html-title.nse
+share/nmap/scripts/ftp-libopie.nse
+share/nmap/scripts/ftp-proftpd-backdoor.nse
+share/nmap/scripts/giop-info.nse
+share/nmap/scripts/gopher-ls.nse
+share/nmap/scripts/hddtemp-info.nse
+share/nmap/scripts/hostmap.nse
share/nmap/scripts/http-auth.nse
+share/nmap/scripts/http-brute.nse
share/nmap/scripts/http-date.nse
+share/nmap/scripts/http-domino-enum-passwords.nse
share/nmap/scripts/http-enum.nse
share/nmap/scripts/http-favicon.nse
+share/nmap/scripts/http-form-brute.nse
share/nmap/scripts/http-headers.nse
share/nmap/scripts/http-iis-webdav-vuln.nse
share/nmap/scripts/http-malware-host.nse
+share/nmap/scripts/http-methods.nse
share/nmap/scripts/http-open-proxy.nse
share/nmap/scripts/http-passwd.nse
+share/nmap/scripts/http-php-version.nse
+share/nmap/scripts/http-robots.txt.nse
+share/nmap/scripts/http-title.nse
share/nmap/scripts/http-trace.nse
share/nmap/scripts/http-userdir-enum.nse
+share/nmap/scripts/http-vhosts.nse
+share/nmap/scripts/http-vmware-path-vuln.nse
share/nmap/scripts/iax2-version.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/ipidseq.nse
share/nmap/scripts/irc-info.nse
+share/nmap/scripts/irc-unrealircd-backdoor.nse
+share/nmap/scripts/iscsi-brute.nse
+share/nmap/scripts/iscsi-info.nse
+share/nmap/scripts/jdwp-version.nse
+share/nmap/scripts/ldap-brute.nse
+share/nmap/scripts/ldap-rootdse.nse
+share/nmap/scripts/ldap-search.nse
+share/nmap/scripts/lexmark-config.nse
+share/nmap/scripts/modbus-discover.nse
+share/nmap/scripts/mongodb-databases.nse
+share/nmap/scripts/mongodb-info.nse
+share/nmap/scripts/ms-sql-brute.nse
+share/nmap/scripts/ms-sql-config.nse
+share/nmap/scripts/ms-sql-empty-password.nse
+share/nmap/scripts/ms-sql-hasdbaccess.nse
share/nmap/scripts/ms-sql-info.nse
+share/nmap/scripts/ms-sql-query.nse
+share/nmap/scripts/ms-sql-tables.nse
+share/nmap/scripts/ms-sql-xp-cmdshell.nse
+share/nmap/scripts/mysql-brute.nse
+share/nmap/scripts/mysql-databases.nse
+share/nmap/scripts/mysql-empty-password.nse
share/nmap/scripts/mysql-info.nse
+share/nmap/scripts/mysql-users.nse
+share/nmap/scripts/mysql-variables.nse
+share/nmap/scripts/nat-pmp-info.nse
share/nmap/scripts/nbstat.nse
+share/nmap/scripts/netbus-auth-bypass.nse
+share/nmap/scripts/netbus-brute.nse
+share/nmap/scripts/netbus-info.nse
+share/nmap/scripts/netbus-version.nse
+share/nmap/scripts/nfs-ls.nse
share/nmap/scripts/nfs-showmount.nse
+share/nmap/scripts/nfs-statfs.nse
+share/nmap/scripts/nrpe-enum.nse
share/nmap/scripts/ntp-info.nse
+share/nmap/scripts/ntp-monlist.nse
+share/nmap/scripts/oracle-brute.nse
+share/nmap/scripts/oracle-enum-users.nse
share/nmap/scripts/oracle-sid-brute.nse
share/nmap/scripts/p2p-conficker.nse
+share/nmap/scripts/path-mtu.nse
+share/nmap/scripts/pgsql-brute.nse
share/nmap/scripts/pjl-ready-message.nse
share/nmap/scripts/pop3-brute.nse
share/nmap/scripts/pop3-capabilities.nse
share/nmap/scripts/pptp-version.nse
+share/nmap/scripts/qscan.nse
share/nmap/scripts/realvnc-auth-bypass.nse
-share/nmap/scripts/robots.txt.nse
+share/nmap/scripts/resolveall.nse
+share/nmap/scripts/rmi-dumpregistry.nse
share/nmap/scripts/rpcinfo.nse
share/nmap/scripts/script.db
share/nmap/scripts/skypev2-version.nse
@@ -112,6 +212,7 @@ share/nmap/scripts/smb-enum-processes.ns
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-os-discovery.nse
share/nmap/scripts/smb-psexec.nse
share/nmap/scripts/smb-security-mode.nse
@@ -119,18 +220,35 @@ share/nmap/scripts/smb-server-stats.nse
share/nmap/scripts/smb-system-info.nse
share/nmap/scripts/smbv2-enabled.nse
share/nmap/scripts/smtp-commands.nse
+share/nmap/scripts/smtp-enum-users.nse
share/nmap/scripts/smtp-open-relay.nse
share/nmap/scripts/smtp-strangeport.nse
share/nmap/scripts/sniffer-detect.nse
share/nmap/scripts/snmp-brute.nse
+share/nmap/scripts/snmp-interfaces.nse
+share/nmap/scripts/snmp-netstat.nse
+share/nmap/scripts/snmp-processes.nse
share/nmap/scripts/snmp-sysdescr.nse
+share/nmap/scripts/snmp-win32-services.nse
+share/nmap/scripts/snmp-win32-shares.nse
+share/nmap/scripts/snmp-win32-software.nse
+share/nmap/scripts/snmp-win32-users.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-enum-ciphers.nse
share/nmap/scripts/sslv2.nse
+share/nmap/scripts/stuxnet-detect.nse
+share/nmap/scripts/svn-brute.nse
+share/nmap/scripts/targets-traceroute.nse
share/nmap/scripts/telnet-brute.nse
share/nmap/scripts/upnp-info.nse
+share/nmap/scripts/vnc-brute.nse
+share/nmap/scripts/vnc-info.nse
+share/nmap/scripts/wdb-version.nse
share/nmap/scripts/whois.nse
+share/nmap/scripts/wsdd-discover.nse
share/nmap/scripts/x11-access.nse
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/nmap/pkg/PLIST-main,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-main
--- pkg/PLIST-main 28 Jan 2010 15:31:28 -0000 1.4
+++ pkg/PLIST-main 2 Mar 2011 09:25:41 -0000
@@ -6,17 +6,20 @@
@bin bin/ncat
bin/ndiff
@bin bin/nmap
+@bin bin/nping
@comment lib/python${MODPY_VERSION}/
@comment lib/python${MODPY_VERSION}/site-packages/
@man man/man1/ncat.1
@man man/man1/ndiff.1
@man man/man1/nmap.1
+@man man/man1/nping.1
@comment share/applications/
share/ncat/
share/ncat/ca-bundle.crt
share/nmap/
share/nmap/nmap-mac-prefixes
share/nmap/nmap-os-db
+share/nmap/nmap-payloads
share/nmap/nmap-protocols
share/nmap/nmap-rpc
share/nmap/nmap-service-probes
Index: pkg/PLIST-zenmap
===================================================================
RCS file: /cvs/ports/net/nmap/pkg/PLIST-zenmap,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST-zenmap
--- pkg/PLIST-zenmap 21 Apr 2010 07:08:23 -0000 1.10
+++ pkg/PLIST-zenmap 2 Mar 2011 09:25:42 -0000
@@ -2,8 +2,6 @@
bin/nmapfe
bin/xnmap
bin/zenmap
-@comment lib/python${MODPY_VERSION}/
-@comment lib/python${MODPY_VERSION}/site-packages/
lib/python${MODPY_VERSION}/site-packages/radialnet/
lib/python${MODPY_VERSION}/site-packages/radialnet/__init__.py
lib/python${MODPY_VERSION}/site-packages/radialnet/__init__.pyc
@@ -85,6 +83,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zenmapCore/Diff.pyc
lib/python${MODPY_VERSION}/site-packages/zenmapCore/I18N.py
lib/python${MODPY_VERSION}/site-packages/zenmapCore/I18N.pyc
+lib/python${MODPY_VERSION}/site-packages/zenmapCore/NSEDocParser.py
+lib/python${MODPY_VERSION}/site-packages/zenmapCore/NSEDocParser.pyc
lib/python${MODPY_VERSION}/site-packages/zenmapCore/Name.py
lib/python${MODPY_VERSION}/site-packages/zenmapCore/Name.pyc
lib/python${MODPY_VERSION}/site-packages/zenmapCore/NetworkInventory.py
@@ -99,8 +99,14 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zenmapCore/Paths.pyc
lib/python${MODPY_VERSION}/site-packages/zenmapCore/RecentScans.py
lib/python${MODPY_VERSION}/site-packages/zenmapCore/RecentScans.pyc
+lib/python${MODPY_VERSION}/site-packages/zenmapCore/ScriptArgsParser.py
+lib/python${MODPY_VERSION}/site-packages/zenmapCore/ScriptArgsParser.pyc
+lib/python${MODPY_VERSION}/site-packages/zenmapCore/ScriptMetadata.py
+lib/python${MODPY_VERSION}/site-packages/zenmapCore/ScriptMetadata.pyc
lib/python${MODPY_VERSION}/site-packages/zenmapCore/SearchResult.py
lib/python${MODPY_VERSION}/site-packages/zenmapCore/SearchResult.pyc
+lib/python${MODPY_VERSION}/site-packages/zenmapCore/StringPool.py
+lib/python${MODPY_VERSION}/site-packages/zenmapCore/StringPool.pyc
lib/python${MODPY_VERSION}/site-packages/zenmapCore/TargetList.py
lib/python${MODPY_VERSION}/site-packages/zenmapCore/TargetList.pyc
lib/python${MODPY_VERSION}/site-packages/zenmapCore/UmitConf.py
@@ -142,6 +148,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/NmapOutputViewer.pyc
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/OptionBuilder.py
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/OptionBuilder.pyc
+lib/python${MODPY_VERSION}/site-packages/zenmapGUI/Print.py
+lib/python${MODPY_VERSION}/site-packages/zenmapGUI/Print.pyc
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/ProfileCombo.py
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/ProfileCombo.pyc
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/ProfileEditor.py
@@ -166,12 +174,12 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/ScanToolbar.pyc
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/ScansListStore.py
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/ScansListStore.pyc
+lib/python${MODPY_VERSION}/site-packages/zenmapGUI/ScriptInterface.py
+lib/python${MODPY_VERSION}/site-packages/zenmapGUI/ScriptInterface.pyc
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/SearchGUI.py
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/SearchGUI.pyc
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/SearchWindow.py
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/SearchWindow.pyc
-lib/python${MODPY_VERSION}/site-packages/zenmapGUI/Splash.py
-lib/python${MODPY_VERSION}/site-packages/zenmapGUI/Splash.pyc
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/TargetCombo.py
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/TargetCombo.pyc
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/TopologyPage.py
@@ -268,7 +276,6 @@ share/zenmap/pixmaps/redhat_32.png
share/zenmap/pixmaps/redhat_75.png
share/zenmap/pixmaps/solaris_32.png
share/zenmap/pixmaps/solaris_75.png
-share/zenmap/pixmaps/splash.png
share/zenmap/pixmaps/throbber.gif
share/zenmap/pixmaps/throbber.png
share/zenmap/pixmaps/ubuntu_32.png
Index: scanner.l
===================================================================
RCS file: /cvs/src/lib/libpcap/scanner.l,v
retrieving revision 1.21
diff -u -p -r1.21 scanner.l
--- scanner.l 27 Oct 2009 23:59:30 -0000 1.21
+++ scanner.l 2 Feb 2011 17:39:32 -0000
@@ -270,6 +270,30 @@ address4|addr4 return ADDR4;
#endif /*INET6*/
}
{B}:+({B}:+)+ { bpf_error("bogus ethernet address %s", yytext); }
+icmptype { yylval.i = 0; return NUM; }
+icmpcode { yylval.i = 1; return NUM; }
+icmp-echoreply { yylval.i = 0; return NUM; }
+icmp-unreach { yylval.i = 3; return NUM; }
+icmp-sourcequench { yylval.i = 4; return NUM; }
+icmp-redirect { yylval.i = 5; return NUM; }
+icmp-echo { yylval.i = 8; return NUM; }
+icmp-routeradvert { yylval.i = 9; return NUM; }
+icmp-routersolicit { yylval.i = 10; return NUM; }
+icmp-timxceed { yylval.i = 11; return NUM; }
+icmp-paramprob { yylval.i = 12; return NUM; }
+icmp-tstamp { yylval.i = 13; return NUM; }
+icmp-tstampreply { yylval.i = 14; return NUM; }
+icmp-ireq { yylval.i = 15; return NUM; }
+icmp-ireqreply { yylval.i = 16; return NUM; }
+icmp-maskreq { yylval.i = 17; return NUM; }
+icmp-maskreply { yylval.i = 18; return NUM; }
+tcpflags { yylval.i = 13; return NUM; }
+tcp-fin { yylval.i = 0x01; return NUM; }
+tcp-syn { yylval.i = 0x02; return NUM; }
+tcp-rst { yylval.i = 0x04; return NUM; }
+tcp-push { yylval.i = 0x08; return NUM; }
+tcp-ack { yylval.i = 0x10; return NUM; }
+tcp-urg { yylval.i = 0x20; return NUM; }
[A-Za-z0-9][-_.A-Za-z0-9]*[.A-Za-z0-9] {
yylval.s = sdup((char *)yytext); return ID; }
[A-Za-z] { yylval.s = sdup((char *)yytext); return ID; }
