diff options
author | adrianp <adrianp> | 2008-06-08 18:12:52 +0000 |
---|---|---|
committer | adrianp <adrianp> | 2008-06-08 18:12:52 +0000 |
commit | 337e07a86bd394cb1a641582a240a9bdbbf313f8 (patch) | |
tree | 62d51a3676d1322d88fbbcd73c5cc2b848b9fa9d /net | |
parent | c9eb7878b57895be2317e981f5441259b9cf1891 (diff) | |
download | pkgsrc-337e07a86bd394cb1a641582a240a9bdbbf313f8.tar.gz |
Update to 4.65
Take MAINTAINER (agreed with salo@)
o Updated to include the latest MAC Address prefixes from the IEEE in
nmap-mac-prefixes [Fyodor]
o NSE engine was cleaned up significantly.
o Nmap now understands the RFC 4007 percent syntax for IPv6 Zone IDs.
o Updated IANA assignment IP list for random IP (-iR)
generation. [Kris]
o NmapFE is now gone. (zenmap is the replacement)
o Added the NSE library (NSELib) which is a library of useful
functions (which can be implemented in LUA or as loadable C/C++
modules) for use by NSE scripts.
o Integrated the Nmap Scripting Engine (NSE) into mainline Nmap.
Diffstat (limited to 'net')
-rw-r--r-- | net/nmap/Makefile | 11 | ||||
-rw-r--r-- | net/nmap/PLIST | 97 | ||||
-rw-r--r-- | net/nmap/distinfo | 12 | ||||
-rw-r--r-- | net/nmap/patches/patch-aa | 32 | ||||
-rw-r--r-- | net/nmap/patches/patch-ac | 13 | ||||
-rw-r--r-- | net/nmap/patches/patch-ai | 13 |
6 files changed, 121 insertions, 57 deletions
diff --git a/net/nmap/Makefile b/net/nmap/Makefile index ecb36330652..ae9bf0fb063 100644 --- a/net/nmap/Makefile +++ b/net/nmap/Makefile @@ -1,13 +1,12 @@ -# $NetBSD: Makefile,v 1.58 2008/01/18 05:08:46 tnn Exp $ +# $NetBSD: Makefile,v 1.59 2008/06/08 18:12:52 adrianp Exp $ # -DISTNAME= nmap-4.20 -PKGREVISION= 1 +DISTNAME= nmap-4.65 CATEGORIES= net security -MASTER_SITES= http://insecure.org/nmap/dist/ +MASTER_SITES= http://download.insecure.org/nmap/dist/ EXTRACT_SUFX= .tar.bz2 -MAINTAINER= salo@NetBSD.org +MAINTAINER= adrianp@NetBSD.org HOMEPAGE= http://insecure.org/nmap/ COMMENT= Network/port scanner with OS detection @@ -24,7 +23,7 @@ USE_TOOLS+= gmake CONFIGURE_ARGS+= --with-libpcap=${BUILDLINK_PREFIX.libpcap} CONFIGURE_ARGS+= --with-libpcre=${BUILDLINK_PREFIX.pcre} CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} -CONFIGURE_ARGS+= --without-nmapfe +CONFIGURE_ARGS+= --without-zenmap .include "../../mk/bsd.prefs.mk" diff --git a/net/nmap/PLIST b/net/nmap/PLIST index 96120ac887e..d9ce860bc00 100644 --- a/net/nmap/PLIST +++ b/net/nmap/PLIST @@ -1,13 +1,106 @@ -@comment $NetBSD: PLIST,v 1.6 2006/12/17 17:55:49 salo Exp $ +@comment $NetBSD: PLIST,v 1.7 2008/06/08 18:12:52 adrianp Exp $ bin/nmap +libexec/nmap/nselib-bin/bit.so man/man1/nmap.1 share/nmap/nmap-mac-prefixes share/nmap/nmap-os-db -share/nmap/nmap-os-fingerprints share/nmap/nmap-protocols share/nmap/nmap-rpc share/nmap/nmap-service-probes share/nmap/nmap-services share/nmap/nmap.dtd share/nmap/nmap.xsl +share/nmap/nselib/datafiles.lua +share/nmap/nselib/http.lua +share/nmap/nselib/ipOps.lua +share/nmap/nselib/listop.lua +share/nmap/nselib/match.lua +share/nmap/nselib/packet.lua +share/nmap/nselib/shortport.lua +share/nmap/nselib/stdnse.lua +share/nmap/nselib/strbuf.lua +share/nmap/nselib/tab.lua +share/nmap/nselib/url.lua +share/nmap/scripts/HTTPAuth.nse +share/nmap/scripts/HTTP_open_proxy.nse +share/nmap/scripts/HTTPpasswd.nse +share/nmap/scripts/HTTPtrace.nse +share/nmap/scripts/MSSQLm.nse +share/nmap/scripts/MySQLinfo.nse +share/nmap/scripts/PPTPversion.nse +share/nmap/scripts/RealVNC_auth_bypass.nse +share/nmap/nselib/stdnse.lua +share/nmap/nselib/strbuf.lua +share/nmap/nselib/tab.lua +share/nmap/nselib/url.lua +share/nmap/scripts/HTTPAuth.nse +share/nmap/scripts/HTTP_open_proxy.nse +share/nmap/scripts/HTTPpasswd.nse +share/nmap/scripts/HTTPtrace.nse +share/nmap/scripts/MSSQLm.nse +share/nmap/scripts/MySQLinfo.nse +share/nmap/scripts/PPTPversion.nse +share/nmap/scripts/RealVNC_auth_bypass.nse +share/nmap/scripts/SMTP_openrelay_test.nse +share/nmap/scripts/SMTPcommands.nse +share/nmap/scripts/SNMPsysdesr.nse +share/nmap/scripts/SQLInject.nse +share/nmap/scripts/SSHv1-support.nse +share/nmap/scripts/SSLv2-support.nse +share/nmap/scripts/UPnP-info.nse +share/nmap/scripts/anonFTP.nse +share/nmap/scripts/bruteTelnet.nse +share/nmap/scripts/chargenTest.nse +share/nmap/scripts/daytimeTest.nse +share/nmap/scripts/dns-test-open-recursion.nse +share/nmap/scripts/SMTP_openrelay_test.nse +share/nmap/scripts/SMTPcommands.nse +share/nmap/scripts/SNMPsysdesr.nse +share/nmap/scripts/SQLInject.nse +share/nmap/scripts/SSHv1-support.nse +share/nmap/scripts/SSLv2-support.nse +share/nmap/scripts/UPnP-info.nse +share/nmap/scripts/anonFTP.nse +share/nmap/scripts/bruteTelnet.nse +share/nmap/scripts/chargenTest.nse +share/nmap/scripts/daytimeTest.nse +share/nmap/scripts/dns-test-open-recursion.nse +share/nmap/scripts/echoTest.nse +share/nmap/scripts/finger.nse +share/nmap/scripts/ftpbounce.nse +share/nmap/scripts/iax2Detect.nse +share/nmap/scripts/ircServerInfo.nse +share/nmap/scripts/ircZombieTest.nse +share/nmap/scripts/nbstat.nse +share/nmap/scripts/netbios-smb-os-discovery.nse +share/nmap/scripts/promiscuous.nse +share/nmap/scripts/ripeQuery.nse +share/nmap/scripts/robots.nse +share/nmap/scripts/rpcinfo.nse +share/nmap/scripts/echoTest.nse +share/nmap/scripts/finger.nse +share/nmap/scripts/ftpbounce.nse +share/nmap/scripts/iax2Detect.nse +share/nmap/scripts/ircServerInfo.nse +share/nmap/scripts/ircZombieTest.nse +share/nmap/scripts/nbstat.nse +share/nmap/scripts/netbios-smb-os-discovery.nse +share/nmap/scripts/promiscuous.nse +share/nmap/scripts/ripeQuery.nse +share/nmap/scripts/robots.nse +share/nmap/scripts/rpcinfo.nse +share/nmap/scripts/script.db +share/nmap/scripts/showHTMLTitle.nse +share/nmap/scripts/showHTTPVersion.nse +share/nmap/scripts/showOwner.nse +share/nmap/scripts/showSMTPVersion.nse +share/nmap/scripts/showSSHVersion.nse +share/nmap/scripts/skype_v2-version.nse +share/nmap/scripts/strangeSMTPport.nse +share/nmap/scripts/xamppDefaultPass.nse +share/nmap/scripts/zoneTrans.nse +@dirrm libexec/nmap/nselib-bin +@dirrm libexec/nmap +@dirrm share/nmap/scripts +@dirrm share/nmap/nselib @dirrm share/nmap diff --git a/net/nmap/distinfo b/net/nmap/distinfo index 20be3f1039b..ffcba6343f3 100644 --- a/net/nmap/distinfo +++ b/net/nmap/distinfo @@ -1,10 +1,8 @@ -$NetBSD: distinfo,v 1.36 2007/01/09 15:25:47 rillig Exp $ +$NetBSD: distinfo,v 1.37 2008/06/08 18:12:52 adrianp Exp $ -SHA1 (nmap-4.20.tar.bz2) = 641bf8ec28313f3fd110d7fa84c3a233cf79c36b -RMD160 (nmap-4.20.tar.bz2) = d4794618c72f46e3c9446ce9e0c705ccf32c7115 -Size (nmap-4.20.tar.bz2) = 2156077 bytes -SHA1 (patch-aa) = 439c500b9d853df5bf007d76b5e4012c959e135a +SHA1 (nmap-4.65.tar.bz2) = e40e794ca8330f377019edba8786b0d911f8ab9e +RMD160 (nmap-4.65.tar.bz2) = e1eca8a2dc37a625475fec791f6754e27884a828 +Size (nmap-4.65.tar.bz2) = 4066062 bytes +SHA1 (patch-aa) = ddd507020256c2960afb9194060264af8a44f59d SHA1 (patch-ab) = bef6a0bc8481702319d14d3427169562f13e1526 -SHA1 (patch-ac) = ac9f3ada1a3b431665225ce778b90723ddf523c8 -SHA1 (patch-ai) = f93dd35a9427f5619d3320955a1f7d132930ef66 SHA1 (patch-aj) = 1500c5a1ea2af3f7ffd355740dace674875e0ea6 diff --git a/net/nmap/patches/patch-aa b/net/nmap/patches/patch-aa index bcfaa276a4c..a65c90cfa32 100644 --- a/net/nmap/patches/patch-aa +++ b/net/nmap/patches/patch-aa @@ -1,34 +1,34 @@ -$NetBSD: patch-aa,v 1.20 2006/12/17 17:55:49 salo Exp $ +$NetBSD: patch-aa,v 1.21 2008/06/08 18:12:52 adrianp Exp $ ---- Makefile.in.orig 2006-12-08 03:53:47.000000000 +0100 -+++ Makefile.in 2006-12-17 15:05:23.000000000 +0100 -@@ -17,8 +17,8 @@ CC = @CC@ - CXX = @CXX@ +--- Makefile.in.orig 2008-05-31 04:24:50.000000000 +0100 ++++ Makefile.in +@@ -24,8 +24,8 @@ CXX = @CXX@ CCOPT = DBGFLAGS = + STRIP = @STRIP@ -LIBPCAPDIR = @libpcapdir@ -LIBPCREDIR = @LIBPCREDIR@ +#LIBPCAPDIR = @libpcapdir@ +#LIBPCREDIR = @LIBPCREDIR@ export LIBDNETDIR = @LIBDNETDIR@ - DEFS = @DEFS@ -DNMAP_VERSION=\"$(NMAP_VERSION)\" -DNMAP_NAME=\"$(NMAP_NAME)\" -DNMAP_URL=\"$(NMAP_URL)\" -DNMAP_PLATFORM=\"$(NMAP_PLATFORM)\" -DNMAPDATADIR=\"$(nmapdatadir)\" - # For mtrace debugging -- see MTRACE define in main.cc for instructions -@@ -69,14 +69,14 @@ $(TARGET): $(DEPS) @PCAP_DEPENDS@ @PCRE_ - # all of the prerequisites (e.g. recursive makes and such) - FORCE: + ZENMAPDIR = zenmap + PYTHON = @PYTHON@ +@@ -88,14 +88,14 @@ nsestdlib: nselib-bin/Makefile + @echo Compiling nse-standard-library; cd nselib-bin && $(MAKE) --$(LIBPCREDIR)/libpcre.a: $(LIBPCREDIR)/Makefile FORCE + +-pcre_build: $(LIBPCREDIR)/Makefile - @echo Compiling libpcre; cd $(LIBPCREDIR) && $(MAKE) -+#$(LIBPCREDIR)/libpcre.a: $(LIBPCREDIR)/Makefile FORCE ++#pcre_build: $(LIBPCREDIR)/Makefile +# @echo Compiling libpcre; cd $(LIBPCREDIR) && $(MAKE) - $(LIBDNETDIR)/src/.libs/libdnet.a: $(LIBDNETDIR)/Makefile FORCE + dnet_build: $(LIBDNETDIR)/Makefile @echo Compiling libdnet; cd $(LIBDNETDIR) && $(MAKE) --$(LIBPCAPDIR)/libpcap.a: $(LIBPCAPDIR)/Makefile FORCE +-pcap_build: $(LIBPCAPDIR)/Makefile - @echo Compiling libpcap; cd $(LIBPCAPDIR) && $(MAKE) -+#$(LIBPCAPDIR)/libpcap.a: $(LIBPCAPDIR)/Makefile FORCE ++#pcap_build: $(LIBPCAPDIR)/Makefile +# @echo Compiling libpcap; cd $(LIBPCAPDIR) && $(MAKE) - $(NBASEDIR)/libnbase.a: $(NBASEDIR)/Makefile FORCE + nbase_build: $(NBASEDIR)/Makefile @echo Compiling libnbase; diff --git a/net/nmap/patches/patch-ac b/net/nmap/patches/patch-ac deleted file mode 100644 index e2a4b6ae251..00000000000 --- a/net/nmap/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.5 2006/10/11 19:23:53 rillig Exp $ - ---- libpcre/configure.orig 2006-10-11 21:21:25.000000000 +0200 -+++ libpcre/configure 2006-10-11 21:22:47.000000000 +0200 -@@ -3450,7 +3450,7 @@ fi; - # Check whether --enable-ebcdic or --disable-ebcdic was given. - if test "${enable_ebcdic+set}" = set; then - enableval="$enable_ebcdic" -- if test "$enableval" == "yes"; then -+ if test "$enableval" = "yes"; then - EBCDIC=-DEBCDIC=1 - fi - diff --git a/net/nmap/patches/patch-ai b/net/nmap/patches/patch-ai deleted file mode 100644 index 1fbfd0ce2d2..00000000000 --- a/net/nmap/patches/patch-ai +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ai,v 1.1 2006/02/01 20:39:11 joerg Exp $ - ---- nmapfe/nmapfe_sig.c.orig 2006-01-21 00:41:22.000000000 +0000 -+++ nmapfe/nmapfe_sig.c -@@ -1094,6 +1094,8 @@ print_line (GtkTextBuffer *buffer, - /* Color the Operating systems */ - } else if (strstr(str, "Linux") || - strstr(str, "FreeBSD") || -+ strstr(str, "DragonFly") || -+ strstr(str, "NetBSD") || - strstr(str, "Win") || - strstr(str, "MacOS") || - strstr(str, "OpenBSD") || |