Sun Jun 8 18:12:52 2008 UTC ()
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.


(adrianp)
diff -r1.58 -r1.59 pkgsrc/net/nmap/Makefile
diff -r1.6 -r1.7 pkgsrc/net/nmap/PLIST
diff -r1.36 -r1.37 pkgsrc/net/nmap/distinfo
diff -r1.20 -r1.21 pkgsrc/net/nmap/patches/patch-aa
diff -r1.5 -r0 pkgsrc/net/nmap/patches/patch-ac
diff -r1.1 -r0 pkgsrc/net/nmap/patches/patch-ai
cvs diff -r1.58 -r1.59 pkgsrc/net/nmap/Makefile (expand / switch to unified diff)

--- pkgsrc/net/nmap/Makefile 2008/01/18 05:08:46 1.58
+++ pkgsrc/net/nmap/Makefile 2008/06/08 18:12:52 1.59
@@ -1,40 +1,39 @@ @@ -1,40 +1,39 @@
1# $NetBSD: Makefile,v 1.58 2008/01/18 05:08:46 tnn Exp $ 1# $NetBSD: Makefile,v 1.59 2008/06/08 18:12:52 adrianp Exp $
2# 2#
3 3
4DISTNAME= nmap-4.20 4DISTNAME= nmap-4.65
5PKGREVISION= 1 
6CATEGORIES= net security 5CATEGORIES= net security
7MASTER_SITES= http://insecure.org/nmap/dist/ 6MASTER_SITES= http://download.insecure.org/nmap/dist/
8EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
9 8
10MAINTAINER= salo@NetBSD.org 9MAINTAINER= adrianp@NetBSD.org
11HOMEPAGE= http://insecure.org/nmap/ 10HOMEPAGE= http://insecure.org/nmap/
12COMMENT= Network/port scanner with OS detection 11COMMENT= Network/port scanner with OS detection
13 12
14PKG_INSTALLATION_TYPES= overwrite pkgviews 13PKG_INSTALLATION_TYPES= overwrite pkgviews
15 14
16BUILDLINK_API_DEPENDS.libpcap= libpcap>=0.9.4 15BUILDLINK_API_DEPENDS.libpcap= libpcap>=0.9.4
17BUILDLINK_API_DEPENDS.libpcre= libpcre>=6.7 16BUILDLINK_API_DEPENDS.libpcre= libpcre>=6.7
18 17
19GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
20USE_LANGUAGES= c c++ 19USE_LANGUAGES= c c++
21USE_LIBTOOL= yes 20USE_LIBTOOL= yes
22USE_TOOLS+= gmake 21USE_TOOLS+= gmake
23 22
24CONFIGURE_ARGS+= --with-libpcap=${BUILDLINK_PREFIX.libpcap} 23CONFIGURE_ARGS+= --with-libpcap=${BUILDLINK_PREFIX.libpcap}
25CONFIGURE_ARGS+= --with-libpcre=${BUILDLINK_PREFIX.pcre} 24CONFIGURE_ARGS+= --with-libpcre=${BUILDLINK_PREFIX.pcre}
26CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} 25CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
27CONFIGURE_ARGS+= --without-nmapfe 26CONFIGURE_ARGS+= --without-zenmap
28 27
29.include "../../mk/bsd.prefs.mk" 28.include "../../mk/bsd.prefs.mk"
30 29
31.if ${OPSYS} == "SunOS" || ${OPSYS} == "Linux" 30.if ${OPSYS} == "SunOS" || ${OPSYS} == "Linux"
32MAKE_ENV+= CPPFLAGS="" 31MAKE_ENV+= CPPFLAGS=""
33.endif 32.endif
34 33
35# The SunPro C++ compiler does not understand __FUNCTION__, as well as 34# The SunPro C++ compiler does not understand __FUNCTION__, as well as
36# __func__. So __FILE__ is the nearest replacement. 35# __func__. So __FILE__ is the nearest replacement.
37.include "../../mk/compiler.mk" 36.include "../../mk/compiler.mk"
38.if !empty(PKGSRC_COMPILER:Msunpro) 37.if !empty(PKGSRC_COMPILER:Msunpro)
39CFLAGS.SunOS+= -D__FUNCTION__=__FILE__ 38CFLAGS.SunOS+= -D__FUNCTION__=__FILE__
40.endif 39.endif
cvs diff -r1.6 -r1.7 pkgsrc/net/nmap/PLIST (expand / switch to unified diff)

--- pkgsrc/net/nmap/PLIST 2006/12/17 17:55:49 1.6
+++ pkgsrc/net/nmap/PLIST 2008/06/08 18:12:52 1.7
@@ -1,13 +1,106 @@ @@ -1,13 +1,106 @@
1@comment $NetBSD: PLIST,v 1.6 2006/12/17 17:55:49 salo Exp $ 1@comment $NetBSD: PLIST,v 1.7 2008/06/08 18:12:52 adrianp Exp $
2bin/nmap 2bin/nmap
 3libexec/nmap/nselib-bin/bit.so
3man/man1/nmap.1 4man/man1/nmap.1
4share/nmap/nmap-mac-prefixes 5share/nmap/nmap-mac-prefixes
5share/nmap/nmap-os-db 6share/nmap/nmap-os-db
6share/nmap/nmap-os-fingerprints 
7share/nmap/nmap-protocols 7share/nmap/nmap-protocols
8share/nmap/nmap-rpc 8share/nmap/nmap-rpc
9share/nmap/nmap-service-probes 9share/nmap/nmap-service-probes
10share/nmap/nmap-services 10share/nmap/nmap-services
11share/nmap/nmap.dtd 11share/nmap/nmap.dtd
12share/nmap/nmap.xsl 12share/nmap/nmap.xsl
 13share/nmap/nselib/datafiles.lua
 14share/nmap/nselib/http.lua
 15share/nmap/nselib/ipOps.lua
 16share/nmap/nselib/listop.lua
 17share/nmap/nselib/match.lua
 18share/nmap/nselib/packet.lua
 19share/nmap/nselib/shortport.lua
 20share/nmap/nselib/stdnse.lua
 21share/nmap/nselib/strbuf.lua
 22share/nmap/nselib/tab.lua
 23share/nmap/nselib/url.lua
 24share/nmap/scripts/HTTPAuth.nse
 25share/nmap/scripts/HTTP_open_proxy.nse
 26share/nmap/scripts/HTTPpasswd.nse
 27share/nmap/scripts/HTTPtrace.nse
 28share/nmap/scripts/MSSQLm.nse
 29share/nmap/scripts/MySQLinfo.nse
 30share/nmap/scripts/PPTPversion.nse
 31share/nmap/scripts/RealVNC_auth_bypass.nse
 32share/nmap/nselib/stdnse.lua
 33share/nmap/nselib/strbuf.lua
 34share/nmap/nselib/tab.lua
 35share/nmap/nselib/url.lua
 36share/nmap/scripts/HTTPAuth.nse
 37share/nmap/scripts/HTTP_open_proxy.nse
 38share/nmap/scripts/HTTPpasswd.nse
 39share/nmap/scripts/HTTPtrace.nse
 40share/nmap/scripts/MSSQLm.nse
 41share/nmap/scripts/MySQLinfo.nse
 42share/nmap/scripts/PPTPversion.nse
 43share/nmap/scripts/RealVNC_auth_bypass.nse
 44share/nmap/scripts/SMTP_openrelay_test.nse
 45share/nmap/scripts/SMTPcommands.nse
 46share/nmap/scripts/SNMPsysdesr.nse
 47share/nmap/scripts/SQLInject.nse
 48share/nmap/scripts/SSHv1-support.nse
 49share/nmap/scripts/SSLv2-support.nse
 50share/nmap/scripts/UPnP-info.nse
 51share/nmap/scripts/anonFTP.nse
 52share/nmap/scripts/bruteTelnet.nse
 53share/nmap/scripts/chargenTest.nse
 54share/nmap/scripts/daytimeTest.nse
 55share/nmap/scripts/dns-test-open-recursion.nse
 56share/nmap/scripts/SMTP_openrelay_test.nse
 57share/nmap/scripts/SMTPcommands.nse
 58share/nmap/scripts/SNMPsysdesr.nse
 59share/nmap/scripts/SQLInject.nse
 60share/nmap/scripts/SSHv1-support.nse
 61share/nmap/scripts/SSLv2-support.nse
 62share/nmap/scripts/UPnP-info.nse
 63share/nmap/scripts/anonFTP.nse
 64share/nmap/scripts/bruteTelnet.nse
 65share/nmap/scripts/chargenTest.nse
 66share/nmap/scripts/daytimeTest.nse
 67share/nmap/scripts/dns-test-open-recursion.nse
 68share/nmap/scripts/echoTest.nse
 69share/nmap/scripts/finger.nse
 70share/nmap/scripts/ftpbounce.nse
 71share/nmap/scripts/iax2Detect.nse
 72share/nmap/scripts/ircServerInfo.nse
 73share/nmap/scripts/ircZombieTest.nse
 74share/nmap/scripts/nbstat.nse
 75share/nmap/scripts/netbios-smb-os-discovery.nse
 76share/nmap/scripts/promiscuous.nse
 77share/nmap/scripts/ripeQuery.nse
 78share/nmap/scripts/robots.nse
 79share/nmap/scripts/rpcinfo.nse
 80share/nmap/scripts/echoTest.nse
 81share/nmap/scripts/finger.nse
 82share/nmap/scripts/ftpbounce.nse
 83share/nmap/scripts/iax2Detect.nse
 84share/nmap/scripts/ircServerInfo.nse
 85share/nmap/scripts/ircZombieTest.nse
 86share/nmap/scripts/nbstat.nse
 87share/nmap/scripts/netbios-smb-os-discovery.nse
 88share/nmap/scripts/promiscuous.nse
 89share/nmap/scripts/ripeQuery.nse
 90share/nmap/scripts/robots.nse
 91share/nmap/scripts/rpcinfo.nse
 92share/nmap/scripts/script.db
 93share/nmap/scripts/showHTMLTitle.nse
 94share/nmap/scripts/showHTTPVersion.nse
 95share/nmap/scripts/showOwner.nse
 96share/nmap/scripts/showSMTPVersion.nse
 97share/nmap/scripts/showSSHVersion.nse
 98share/nmap/scripts/skype_v2-version.nse
 99share/nmap/scripts/strangeSMTPport.nse
 100share/nmap/scripts/xamppDefaultPass.nse
 101share/nmap/scripts/zoneTrans.nse
 102@dirrm libexec/nmap/nselib-bin
 103@dirrm libexec/nmap
 104@dirrm share/nmap/scripts
 105@dirrm share/nmap/nselib
13@dirrm share/nmap 106@dirrm share/nmap
cvs diff -r1.36 -r1.37 pkgsrc/net/nmap/distinfo (expand / switch to unified diff)

--- pkgsrc/net/nmap/distinfo 2007/01/09 15:25:47 1.36
+++ pkgsrc/net/nmap/distinfo 2008/06/08 18:12:52 1.37
@@ -1,10 +1,8 @@ @@ -1,10 +1,8 @@
1$NetBSD: distinfo,v 1.36 2007/01/09 15:25:47 rillig Exp $ 1$NetBSD: distinfo,v 1.37 2008/06/08 18:12:52 adrianp Exp $
2 2
3SHA1 (nmap-4.20.tar.bz2) = 641bf8ec28313f3fd110d7fa84c3a233cf79c36b 3SHA1 (nmap-4.65.tar.bz2) = e40e794ca8330f377019edba8786b0d911f8ab9e
4RMD160 (nmap-4.20.tar.bz2) = d4794618c72f46e3c9446ce9e0c705ccf32c7115 4RMD160 (nmap-4.65.tar.bz2) = e1eca8a2dc37a625475fec791f6754e27884a828
5Size (nmap-4.20.tar.bz2) = 2156077 bytes 5Size (nmap-4.65.tar.bz2) = 4066062 bytes
6SHA1 (patch-aa) = 439c500b9d853df5bf007d76b5e4012c959e135a 6SHA1 (patch-aa) = ddd507020256c2960afb9194060264af8a44f59d
7SHA1 (patch-ab) = bef6a0bc8481702319d14d3427169562f13e1526 7SHA1 (patch-ab) = bef6a0bc8481702319d14d3427169562f13e1526
8SHA1 (patch-ac) = ac9f3ada1a3b431665225ce778b90723ddf523c8 
9SHA1 (patch-ai) = f93dd35a9427f5619d3320955a1f7d132930ef66 
10SHA1 (patch-aj) = 1500c5a1ea2af3f7ffd355740dace674875e0ea6 8SHA1 (patch-aj) = 1500c5a1ea2af3f7ffd355740dace674875e0ea6
cvs diff -r1.20 -r1.21 pkgsrc/net/nmap/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/net/nmap/patches/Attic/patch-aa 2006/12/17 17:55:49 1.20
+++ pkgsrc/net/nmap/patches/Attic/patch-aa 2008/06/08 18:12:52 1.21
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1$NetBSD: patch-aa,v 1.20 2006/12/17 17:55:49 salo Exp $ 1$NetBSD: patch-aa,v 1.21 2008/06/08 18:12:52 adrianp Exp $
2 2
3--- Makefile.in.orig 2006-12-08 03:53:47.000000000 +0100 3--- Makefile.in.orig 2008-05-31 04:24:50.000000000 +0100
4+++ Makefile.in 2006-12-17 15:05:23.000000000 +0100 4+++ Makefile.in
5@@ -17,8 +17,8 @@ CC = @CC@ 5@@ -24,8 +24,8 @@ CXX = @CXX@
6 CXX = @CXX@ 
7 CCOPT =  6 CCOPT =
8 DBGFLAGS =  7 DBGFLAGS =
 8 STRIP = @STRIP@
9-LIBPCAPDIR = @libpcapdir@ 9-LIBPCAPDIR = @libpcapdir@
10-LIBPCREDIR = @LIBPCREDIR@ 10-LIBPCREDIR = @LIBPCREDIR@
11+#LIBPCAPDIR = @libpcapdir@ 11+#LIBPCAPDIR = @libpcapdir@
12+#LIBPCREDIR = @LIBPCREDIR@ 12+#LIBPCREDIR = @LIBPCREDIR@
13 export LIBDNETDIR = @LIBDNETDIR@ 13 export LIBDNETDIR = @LIBDNETDIR@
14 DEFS = @DEFS@ -DNMAP_VERSION=\"$(NMAP_VERSION)\" -DNMAP_NAME=\"$(NMAP_NAME)\" -DNMAP_URL=\"$(NMAP_URL)\" -DNMAP_PLATFORM=\"$(NMAP_PLATFORM)\" -DNMAPDATADIR=\"$(nmapdatadir)\" 14 ZENMAPDIR = zenmap
15 # For mtrace debugging -- see MTRACE define in main.cc for instructions 15 PYTHON = @PYTHON@
16@@ -69,14 +69,14 @@ $(TARGET): $(DEPS) @PCAP_DEPENDS@ @PCRE_ 16@@ -88,14 +88,14 @@ nsestdlib: nselib-bin/Makefile
17 # all of the prerequisites (e.g. recursive makes and such) 17 @echo Compiling nse-standard-library; cd nselib-bin && $(MAKE)
18 FORCE: 
19  18
20-$(LIBPCREDIR)/libpcre.a: $(LIBPCREDIR)/Makefile FORCE 19
 20-pcre_build: $(LIBPCREDIR)/Makefile
21- @echo Compiling libpcre; cd $(LIBPCREDIR) && $(MAKE) 21- @echo Compiling libpcre; cd $(LIBPCREDIR) && $(MAKE)
22+#$(LIBPCREDIR)/libpcre.a: $(LIBPCREDIR)/Makefile FORCE 22+#pcre_build: $(LIBPCREDIR)/Makefile
23+# @echo Compiling libpcre; cd $(LIBPCREDIR) && $(MAKE) 23+# @echo Compiling libpcre; cd $(LIBPCREDIR) && $(MAKE)
24  24
25 $(LIBDNETDIR)/src/.libs/libdnet.a: $(LIBDNETDIR)/Makefile FORCE 25 dnet_build: $(LIBDNETDIR)/Makefile
26 @echo Compiling libdnet; cd $(LIBDNETDIR) && $(MAKE) 26 @echo Compiling libdnet; cd $(LIBDNETDIR) && $(MAKE)
27  27
28-$(LIBPCAPDIR)/libpcap.a: $(LIBPCAPDIR)/Makefile FORCE 28-pcap_build: $(LIBPCAPDIR)/Makefile
29- @echo Compiling libpcap; cd $(LIBPCAPDIR) && $(MAKE) 29- @echo Compiling libpcap; cd $(LIBPCAPDIR) && $(MAKE)
30+#$(LIBPCAPDIR)/libpcap.a: $(LIBPCAPDIR)/Makefile FORCE 30+#pcap_build: $(LIBPCAPDIR)/Makefile
31+# @echo Compiling libpcap; cd $(LIBPCAPDIR) && $(MAKE) 31+# @echo Compiling libpcap; cd $(LIBPCAPDIR) && $(MAKE)
32  32
33 $(NBASEDIR)/libnbase.a: $(NBASEDIR)/Makefile FORCE 33 nbase_build: $(NBASEDIR)/Makefile
34 @echo Compiling libnbase; 34 @echo Compiling libnbase;
File Deleted: pkgsrc/net/nmap/patches/Attic/patch-ac
File Deleted: pkgsrc/net/nmap/patches/Attic/patch-ai