Sun Mar 21 21:58:23 2010 UTC ()
Nmap 5.21 [2010-01-27] (-> Nmap 5.00)

Some of highlights are:

o Dramatically improved the version detection database, integrating
  2,596 submissions that users contributed since February 3, 2009!
o Added 7 new NSE scripts for a grand total of 79!
o Performed a memory consumption audit and made changes to
  dramatically reduce Nmap's footprint.
o A major service detection submission integration.
o Added some new service detection probes
o Added 14 new NSE scripts for a grand total of 72! You can learn
  about them all at http://nmap.org/nsedoc/. Here are the new ones:
o Nmap's --traceroute has been rewritten for better performance.
o Integrated 1,349 fingerprints (and 81 corrections).
o [NSE] Default socket parallelism has been doubled from 10 to 20.
o [NSE] Now supports worker threads
o Zenmap now includes ports in the services view whenever Nmap found
  them "interesting," whatever their state.
o [Ncat, Ndiff] The exit codes of these programs now reflect whether
  they succeeded.
o Optimize MAC address prefix lookup by using an std::map
o Canonicalized the list of OS detection device types to a smaller set.
o Zenmap's UI performance has improved significantly.
o [NSE] socket garbage collection was rewritten for better performance.

Many many bugfixes!

For full changelog, see http://nmap.org/changelog.html

Ok'ed during freeze by wiz@


(pettai)
diff -r1.70 -r1.71 pkgsrc/net/nmap/Makefile
diff -r1.11 -r1.12 pkgsrc/net/nmap/PLIST
diff -r1.5 -r1.6 pkgsrc/net/nmap/PLIST.zenmap
diff -r1.40 -r1.41 pkgsrc/net/nmap/distinfo
diff -r1.3 -r1.4 pkgsrc/net/nmap/options.mk
diff -r1.12 -r1.13 pkgsrc/net/nmap/patches/patch-ab
diff -r1.13 -r1.14 pkgsrc/net/nmap/patches/patch-ad

cvs diff -r1.70 -r1.71 pkgsrc/net/nmap/Makefile (expand / switch to unified diff)

--- pkgsrc/net/nmap/Makefile 2010/03/21 02:50:47 1.70
+++ pkgsrc/net/nmap/Makefile 2010/03/21 21:58:23 1.71
@@ -1,38 +1,41 @@ @@ -1,38 +1,41 @@
1# $NetBSD: Makefile,v 1.70 2010/03/21 02:50:47 schmonz Exp $ 1# $NetBSD: Makefile,v 1.71 2010/03/21 21:58:23 pettai Exp $
2# 2#
3 3
4DISTNAME= nmap-5.00 4DISTNAME= nmap-5.21
5PKGREVISION= 2 
6CATEGORIES= net security 5CATEGORIES= net security
7MASTER_SITES= http://nmap.org/dist/ 6MASTER_SITES= http://nmap.org/dist/
8EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@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
 12LICENSE= gnu-gpl-v2
13 13
14PKG_INSTALLATION_TYPES= overwrite pkgviews 14PKG_INSTALLATION_TYPES= overwrite pkgviews
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17BUILDLINK_API_DEPENDS.libpcap= libpcap>=0.9.4 17BUILDLINK_API_DEPENDS.libpcap= libpcap>=0.9.4
18BUILDLINK_API_DEPENDS.libpcre= libpcre>=6.7 18BUILDLINK_API_DEPENDS.libpcre= libpcre>=6.7
19 19
20GNU_CONFIGURE= yes 20GNU_CONFIGURE= yes
 21
21USE_LANGUAGES= c c++ 22USE_LANGUAGES= c c++
22USE_LIBTOOL= yes 23USE_LIBTOOL= yes
23USE_TOOLS+= gmake 24USE_TOOLS+= gmake
24PLIST_SRC= ${WRKDIR}/.PLIST_SRC 25PLIST_SRC= ${WRKDIR}/.PLIST_SRC
25 26
 27BUILD_DEFS+= IPV6_READY
 28
26.include "options.mk" 29.include "options.mk"
27 30
28CHECK_INTERPRETER_SKIP+= share/zenmap/su-to-zenmap.sh 31CHECK_INTERPRETER_SKIP+= share/zenmap/su-to-zenmap.sh
29 32
30CONFIGURE_ARGS+= --with-libpcap=${BUILDLINK_PREFIX.libpcap} 33CONFIGURE_ARGS+= --with-libpcap=${BUILDLINK_PREFIX.libpcap}
31CONFIGURE_ARGS+= --with-libpcre=${BUILDLINK_PREFIX.pcre} 34CONFIGURE_ARGS+= --with-libpcre=${BUILDLINK_PREFIX.pcre}
32CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} 35CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
33 36
34.include "../../mk/bsd.prefs.mk" 37.include "../../mk/bsd.prefs.mk"
35 38
36.if ${OPSYS} == "SunOS" || ${OPSYS} == "Linux" 39.if ${OPSYS} == "SunOS" || ${OPSYS} == "Linux"
37MAKE_ENV+= CPPFLAGS="" 40MAKE_ENV+= CPPFLAGS=""
38.endif 41.endif

cvs diff -r1.11 -r1.12 pkgsrc/net/nmap/PLIST (expand / switch to unified diff)

--- pkgsrc/net/nmap/PLIST 2009/07/20 20:49:40 1.11
+++ pkgsrc/net/nmap/PLIST 2010/03/21 21:58:23 1.12
@@ -1,102 +1,159 @@ @@ -1,102 +1,159 @@
1@comment $NetBSD: PLIST,v 1.11 2009/07/20 20:49:40 adrianp Exp $ 1@comment $NetBSD: PLIST,v 1.12 2010/03/21 21:58:23 pettai Exp $
2bin/ncat 2bin/ncat
3bin/nmap 3bin/nmap
 4man/de/man1/nmap.1
 5man/es/man1/nmap.1
 6man/fr/man1/nmap.1
 7man/hr/man1/nmap.1
 8man/hu/man1/nmap.1
 9man/it/man1/nmap.1
 10man/jp/man1/nmap.1
4man/man1/ncat.1 11man/man1/ncat.1
5man/man1/nmap.1 12man/man1/nmap.1
 13man/pl/man1/nmap.1
 14man/pt_BR/man1/nmap.1
 15man/pt_PT/man1/nmap.1
 16man/ro/man1/nmap.1
 17man/ru/man1/nmap.1
 18man/sk/man1/nmap.1
 19man/zh/man1/nmap.1
6share/ncat/ca-bundle.crt 20share/ncat/ca-bundle.crt
7share/nmap/nmap-mac-prefixes 21share/nmap/nmap-mac-prefixes
8share/nmap/nmap-os-db 22share/nmap/nmap-os-db
9share/nmap/nmap-protocols 23share/nmap/nmap-protocols
10share/nmap/nmap-rpc 24share/nmap/nmap-rpc
11share/nmap/nmap-service-probes 25share/nmap/nmap-service-probes
12share/nmap/nmap-services 26share/nmap/nmap-services
13share/nmap/nmap.dtd 27share/nmap/nmap.dtd
14share/nmap/nmap.xsl 28share/nmap/nmap.xsl
15share/nmap/nse_main.lua 29share/nmap/nse_main.lua
16share/nmap/nselib/base64.lua 30share/nmap/nselib/base64.lua
 31share/nmap/nselib/citrixxml.lua
17share/nmap/nselib/comm.lua 32share/nmap/nselib/comm.lua
 33share/nmap/nselib/data/favicon-db
 34share/nmap/nselib/data/folders.lst
 35share/nmap/nselib/data/http-fingerprints
 36share/nmap/nselib/data/oracle-sids
 37share/nmap/nselib/data/passwords.lst
 38share/nmap/nselib/data/psexec/README
 39share/nmap/nselib/data/psexec/backdoor.lua
 40share/nmap/nselib/data/psexec/default.lua
 41share/nmap/nselib/data/psexec/drives.lua
 42share/nmap/nselib/data/psexec/encoder.c
 43share/nmap/nselib/data/psexec/examples.lua
 44share/nmap/nselib/data/psexec/experimental.lua
 45share/nmap/nselib/data/psexec/network.lua
 46share/nmap/nselib/data/psexec/nmap_service.c
 47share/nmap/nselib/data/psexec/nmap_service.exe
 48share/nmap/nselib/data/psexec/nmap_service.vcproj
 49share/nmap/nselib/data/psexec/pwdump.lua
 50share/nmap/nselib/data/usernames.lst
 51share/nmap/nselib/data/yokoso-fingerprints
18share/nmap/nselib/datafiles.lua 52share/nmap/nselib/datafiles.lua
19share/nmap/nselib/dns.lua 53share/nmap/nselib/dns.lua
20share/nmap/nselib/http.lua 54share/nmap/nselib/http.lua
21share/nmap/nselib/imap.lua 55share/nmap/nselib/imap.lua
22share/nmap/nselib/ipOps.lua 56share/nmap/nselib/ipOps.lua
23share/nmap/nselib/listop.lua 57share/nmap/nselib/listop.lua
24share/nmap/nselib/match.lua 58share/nmap/nselib/match.lua
25share/nmap/nselib/msrpc.lua 59share/nmap/nselib/msrpc.lua
26share/nmap/nselib/msrpcperformance.lua 60share/nmap/nselib/msrpcperformance.lua
27share/nmap/nselib/msrpctypes.lua 61share/nmap/nselib/msrpctypes.lua
28share/nmap/nselib/netbios.lua 62share/nmap/nselib/netbios.lua
29share/nmap/nselib/nsedebug.lua 63share/nmap/nselib/nsedebug.lua
30share/nmap/nselib/packet.lua 64share/nmap/nselib/packet.lua
31share/nmap/nselib/pop3.lua 65share/nmap/nselib/pop3.lua
 66share/nmap/nselib/proxy.lua
32share/nmap/nselib/shortport.lua 67share/nmap/nselib/shortport.lua
33share/nmap/nselib/smb.lua 68share/nmap/nselib/smb.lua
34share/nmap/nselib/smbauth.lua 69share/nmap/nselib/smbauth.lua
35share/nmap/nselib/snmp.lua 70share/nmap/nselib/snmp.lua
36share/nmap/nselib/ssh1.lua 71share/nmap/nselib/ssh1.lua
37share/nmap/nselib/ssh2.lua 72share/nmap/nselib/ssh2.lua
38share/nmap/nselib/stdnse.lua 73share/nmap/nselib/stdnse.lua
39share/nmap/nselib/strbuf.lua 74share/nmap/nselib/strbuf.lua
 75share/nmap/nselib/strict.lua
40share/nmap/nselib/tab.lua 76share/nmap/nselib/tab.lua
41share/nmap/nselib/unpwdb.lua 77share/nmap/nselib/unpwdb.lua
42share/nmap/nselib/url.lua 78share/nmap/nselib/url.lua
43share/nmap/scripts/asn-query.nse 79share/nmap/scripts/asn-query.nse
44share/nmap/scripts/auth-owners.nse 80share/nmap/scripts/auth-owners.nse
45share/nmap/scripts/auth-spoof.nse 81share/nmap/scripts/auth-spoof.nse
46share/nmap/scripts/banner.nse 82share/nmap/scripts/banner.nse
 83share/nmap/scripts/citrix-brute-xml.nse
 84share/nmap/scripts/citrix-enum-apps-xml.nse
 85share/nmap/scripts/citrix-enum-apps.nse
 86share/nmap/scripts/citrix-enum-servers-xml.nse
 87share/nmap/scripts/citrix-enum-servers.nse
47share/nmap/scripts/daytime.nse 88share/nmap/scripts/daytime.nse
 89share/nmap/scripts/db2-info.nse
 90share/nmap/scripts/dhcp-discover.nse
48share/nmap/scripts/dns-random-srcport.nse 91share/nmap/scripts/dns-random-srcport.nse
49share/nmap/scripts/dns-random-txid.nse 92share/nmap/scripts/dns-random-txid.nse
50share/nmap/scripts/dns-recursion.nse 93share/nmap/scripts/dns-recursion.nse
51share/nmap/scripts/dns-zone-transfer.nse 94share/nmap/scripts/dns-zone-transfer.nse
52share/nmap/scripts/finger.nse 95share/nmap/scripts/finger.nse
53share/nmap/scripts/ftp-anon.nse 96share/nmap/scripts/ftp-anon.nse
54share/nmap/scripts/ftp-bounce.nse 97share/nmap/scripts/ftp-bounce.nse
55share/nmap/scripts/ftp-brute.nse 98share/nmap/scripts/ftp-brute.nse
56share/nmap/scripts/html-title.nse 99share/nmap/scripts/html-title.nse
57share/nmap/scripts/http-auth.nse 100share/nmap/scripts/http-auth.nse
 101share/nmap/scripts/http-date.nse
 102share/nmap/scripts/http-enum.nse
 103share/nmap/scripts/http-favicon.nse
 104share/nmap/scripts/http-headers.nse
58share/nmap/scripts/http-iis-webdav-vuln.nse 105share/nmap/scripts/http-iis-webdav-vuln.nse
 106share/nmap/scripts/http-malware-host.nse
59share/nmap/scripts/http-open-proxy.nse 107share/nmap/scripts/http-open-proxy.nse
60share/nmap/scripts/http-passwd.nse 108share/nmap/scripts/http-passwd.nse
61share/nmap/scripts/http-trace.nse 109share/nmap/scripts/http-trace.nse
 110share/nmap/scripts/http-userdir-enum.nse
62share/nmap/scripts/iax2-version.nse 111share/nmap/scripts/iax2-version.nse
63share/nmap/scripts/imap-capabilities.nse 112share/nmap/scripts/imap-capabilities.nse
64share/nmap/scripts/irc-info.nse 113share/nmap/scripts/irc-info.nse
65share/nmap/scripts/ms-sql-info.nse 114share/nmap/scripts/ms-sql-info.nse
66share/nmap/scripts/mysql-info.nse 115share/nmap/scripts/mysql-info.nse
67share/nmap/scripts/nbstat.nse 116share/nmap/scripts/nbstat.nse
 117share/nmap/scripts/nfs-showmount.nse
 118share/nmap/scripts/ntp-info.nse
 119share/nmap/scripts/oracle-sid-brute.nse
68share/nmap/scripts/p2p-conficker.nse 120share/nmap/scripts/p2p-conficker.nse
 121share/nmap/scripts/pjl-ready-message.nse
69share/nmap/scripts/pop3-brute.nse 122share/nmap/scripts/pop3-brute.nse
70share/nmap/scripts/pop3-capabilities.nse 123share/nmap/scripts/pop3-capabilities.nse
71share/nmap/scripts/pptp-version.nse 124share/nmap/scripts/pptp-version.nse
72share/nmap/scripts/realvnc-auth-bypass.nse 125share/nmap/scripts/realvnc-auth-bypass.nse
73share/nmap/scripts/robots.txt.nse 126share/nmap/scripts/robots.txt.nse
74share/nmap/scripts/rpcinfo.nse 127share/nmap/scripts/rpcinfo.nse
75share/nmap/scripts/script.db 128share/nmap/scripts/script.db
76share/nmap/scripts/skypev2-version.nse 129share/nmap/scripts/skypev2-version.nse
77share/nmap/scripts/smb-brute.nse 130share/nmap/scripts/smb-brute.nse
78share/nmap/scripts/smb-check-vulns.nse 131share/nmap/scripts/smb-check-vulns.nse
79share/nmap/scripts/smb-enum-domains.nse 132share/nmap/scripts/smb-enum-domains.nse
 133share/nmap/scripts/smb-enum-groups.nse
80share/nmap/scripts/smb-enum-processes.nse 134share/nmap/scripts/smb-enum-processes.nse
81share/nmap/scripts/smb-enum-sessions.nse 135share/nmap/scripts/smb-enum-sessions.nse
82share/nmap/scripts/smb-enum-shares.nse 136share/nmap/scripts/smb-enum-shares.nse
83share/nmap/scripts/smb-enum-users.nse 137share/nmap/scripts/smb-enum-users.nse
84share/nmap/scripts/smb-os-discovery.nse 138share/nmap/scripts/smb-os-discovery.nse
85share/nmap/scripts/smb-pwdump.nse 139share/nmap/scripts/smb-psexec.nse
86share/nmap/scripts/smb-security-mode.nse 140share/nmap/scripts/smb-security-mode.nse
87share/nmap/scripts/smb-server-stats.nse 141share/nmap/scripts/smb-server-stats.nse
88share/nmap/scripts/smb-system-info.nse 142share/nmap/scripts/smb-system-info.nse
 143share/nmap/scripts/smbv2-enabled.nse
89share/nmap/scripts/smtp-commands.nse 144share/nmap/scripts/smtp-commands.nse
90share/nmap/scripts/smtp-open-relay.nse 145share/nmap/scripts/smtp-open-relay.nse
91share/nmap/scripts/smtp-strangeport.nse 146share/nmap/scripts/smtp-strangeport.nse
92share/nmap/scripts/sniffer-detect.nse 147share/nmap/scripts/sniffer-detect.nse
93share/nmap/scripts/snmp-brute.nse 148share/nmap/scripts/snmp-brute.nse
94share/nmap/scripts/snmp-sysdescr.nse 149share/nmap/scripts/snmp-sysdescr.nse
95share/nmap/scripts/socks-open-proxy.nse 150share/nmap/scripts/socks-open-proxy.nse
96share/nmap/scripts/sql-injection.nse 151share/nmap/scripts/sql-injection.nse
97share/nmap/scripts/ssh-hostkey.nse 152share/nmap/scripts/ssh-hostkey.nse
98share/nmap/scripts/sshv1.nse 153share/nmap/scripts/sshv1.nse
 154share/nmap/scripts/ssl-cert.nse
99share/nmap/scripts/sslv2.nse 155share/nmap/scripts/sslv2.nse
100share/nmap/scripts/telnet-brute.nse 156share/nmap/scripts/telnet-brute.nse
101share/nmap/scripts/upnp-info.nse 157share/nmap/scripts/upnp-info.nse
102share/nmap/scripts/whois.nse 158share/nmap/scripts/whois.nse
 159share/nmap/scripts/x11-access.nse

cvs diff -r1.5 -r1.6 pkgsrc/net/nmap/Attic/PLIST.zenmap (expand / switch to unified diff)

--- pkgsrc/net/nmap/Attic/PLIST.zenmap 2009/07/20 20:49:40 1.5
+++ pkgsrc/net/nmap/Attic/PLIST.zenmap 2010/03/21 21:58:23 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST.zenmap,v 1.5 2009/07/20 20:49:40 adrianp Exp $ 1@comment $NetBSD: PLIST.zenmap,v 1.6 2010/03/21 21:58:23 pettai Exp $
2bin/nmapfe 2bin/nmapfe
3bin/uninstall_zenmap 3bin/uninstall_zenmap
4bin/xnmap 4bin/xnmap
5bin/zenmap 5bin/zenmap
6${PYSITELIB}/radialnet/__init__.py 6${PYSITELIB}/radialnet/__init__.py
7${PYSITELIB}/radialnet/__init__.pyc 7${PYSITELIB}/radialnet/__init__.pyc
8${PYSITELIB}/radialnet/bestwidgets/__init__.py 8${PYSITELIB}/radialnet/bestwidgets/__init__.py
9${PYSITELIB}/radialnet/bestwidgets/__init__.pyc 9${PYSITELIB}/radialnet/bestwidgets/__init__.pyc
10${PYSITELIB}/radialnet/bestwidgets/boxes.py 10${PYSITELIB}/radialnet/bestwidgets/boxes.py
11${PYSITELIB}/radialnet/bestwidgets/boxes.pyc 11${PYSITELIB}/radialnet/bestwidgets/boxes.pyc
12${PYSITELIB}/radialnet/bestwidgets/buttons.py 12${PYSITELIB}/radialnet/bestwidgets/buttons.py
13${PYSITELIB}/radialnet/bestwidgets/buttons.pyc 13${PYSITELIB}/radialnet/bestwidgets/buttons.pyc
14${PYSITELIB}/radialnet/bestwidgets/comboboxes.py 14${PYSITELIB}/radialnet/bestwidgets/comboboxes.py
@@ -111,50 +111,52 @@ ${PYSITELIB}/zenmapCore/__init__.py @@ -111,50 +111,52 @@ ${PYSITELIB}/zenmapCore/__init__.py
111${PYSITELIB}/zenmapCore/__init__.pyc 111${PYSITELIB}/zenmapCore/__init__.pyc
112${PYSITELIB}/zenmapGUI/About.py 112${PYSITELIB}/zenmapGUI/About.py
113${PYSITELIB}/zenmapGUI/About.pyc 113${PYSITELIB}/zenmapGUI/About.pyc
114${PYSITELIB}/zenmapGUI/App.py 114${PYSITELIB}/zenmapGUI/App.py
115${PYSITELIB}/zenmapGUI/App.pyc 115${PYSITELIB}/zenmapGUI/App.pyc
116${PYSITELIB}/zenmapGUI/BugReport.py 116${PYSITELIB}/zenmapGUI/BugReport.py
117${PYSITELIB}/zenmapGUI/BugReport.pyc 117${PYSITELIB}/zenmapGUI/BugReport.pyc
118${PYSITELIB}/zenmapGUI/CrashReport.py 118${PYSITELIB}/zenmapGUI/CrashReport.py
119${PYSITELIB}/zenmapGUI/CrashReport.pyc 119${PYSITELIB}/zenmapGUI/CrashReport.pyc
120${PYSITELIB}/zenmapGUI/DiffCompare.py 120${PYSITELIB}/zenmapGUI/DiffCompare.py
121${PYSITELIB}/zenmapGUI/DiffCompare.pyc 121${PYSITELIB}/zenmapGUI/DiffCompare.pyc
122${PYSITELIB}/zenmapGUI/FileChoosers.py 122${PYSITELIB}/zenmapGUI/FileChoosers.py
123${PYSITELIB}/zenmapGUI/FileChoosers.pyc 123${PYSITELIB}/zenmapGUI/FileChoosers.pyc
 124${PYSITELIB}/zenmapGUI/FilterBar.py
 125${PYSITELIB}/zenmapGUI/FilterBar.pyc
124${PYSITELIB}/zenmapGUI/Icons.py 126${PYSITELIB}/zenmapGUI/Icons.py
125${PYSITELIB}/zenmapGUI/Icons.pyc 127${PYSITELIB}/zenmapGUI/Icons.pyc
126${PYSITELIB}/zenmapGUI/MainWindow.py 128${PYSITELIB}/zenmapGUI/MainWindow.py
127${PYSITELIB}/zenmapGUI/MainWindow.pyc 129${PYSITELIB}/zenmapGUI/MainWindow.pyc
128${PYSITELIB}/zenmapGUI/NmapOutputProperties.py 130${PYSITELIB}/zenmapGUI/NmapOutputProperties.py
129${PYSITELIB}/zenmapGUI/NmapOutputProperties.pyc 131${PYSITELIB}/zenmapGUI/NmapOutputProperties.pyc
130${PYSITELIB}/zenmapGUI/NmapOutputViewer.py 132${PYSITELIB}/zenmapGUI/NmapOutputViewer.py
131${PYSITELIB}/zenmapGUI/NmapOutputViewer.pyc 133${PYSITELIB}/zenmapGUI/NmapOutputViewer.pyc
132${PYSITELIB}/zenmapGUI/OptionBuilder.py 134${PYSITELIB}/zenmapGUI/OptionBuilder.py
133${PYSITELIB}/zenmapGUI/OptionBuilder.pyc 135${PYSITELIB}/zenmapGUI/OptionBuilder.pyc
134${PYSITELIB}/zenmapGUI/ProfileCombo.py 136${PYSITELIB}/zenmapGUI/ProfileCombo.py
135${PYSITELIB}/zenmapGUI/ProfileCombo.pyc 137${PYSITELIB}/zenmapGUI/ProfileCombo.pyc
136${PYSITELIB}/zenmapGUI/ProfileEditor.py 138${PYSITELIB}/zenmapGUI/ProfileEditor.py
137${PYSITELIB}/zenmapGUI/ProfileEditor.pyc 139${PYSITELIB}/zenmapGUI/ProfileEditor.pyc
138${PYSITELIB}/zenmapGUI/ProfileHelp.py 140${PYSITELIB}/zenmapGUI/ProfileHelp.py
139${PYSITELIB}/zenmapGUI/ProfileHelp.pyc 141${PYSITELIB}/zenmapGUI/ProfileHelp.pyc
140${PYSITELIB}/zenmapGUI/ScanHostDetailsPage.py 142${PYSITELIB}/zenmapGUI/ScanHostDetailsPage.py
141${PYSITELIB}/zenmapGUI/ScanHostDetailsPage.pyc 143${PYSITELIB}/zenmapGUI/ScanHostDetailsPage.pyc
142${PYSITELIB}/zenmapGUI/ScanHostsView.py 144${PYSITELIB}/zenmapGUI/ScanHostsView.py
143${PYSITELIB}/zenmapGUI/ScanHostsView.pyc 145${PYSITELIB}/zenmapGUI/ScanHostsView.pyc
 146${PYSITELIB}/zenmapGUI/ScanInterface.py
 147${PYSITELIB}/zenmapGUI/ScanInterface.pyc
144${PYSITELIB}/zenmapGUI/ScanNmapOutputPage.py 148${PYSITELIB}/zenmapGUI/ScanNmapOutputPage.py
145${PYSITELIB}/zenmapGUI/ScanNmapOutputPage.pyc 149${PYSITELIB}/zenmapGUI/ScanNmapOutputPage.pyc
146${PYSITELIB}/zenmapGUI/ScanNotebook.py 
147${PYSITELIB}/zenmapGUI/ScanNotebook.pyc 
148${PYSITELIB}/zenmapGUI/ScanOpenPortsPage.py 150${PYSITELIB}/zenmapGUI/ScanOpenPortsPage.py
149${PYSITELIB}/zenmapGUI/ScanOpenPortsPage.pyc 151${PYSITELIB}/zenmapGUI/ScanOpenPortsPage.pyc
150${PYSITELIB}/zenmapGUI/ScanRunDetailsPage.py 152${PYSITELIB}/zenmapGUI/ScanRunDetailsPage.py
151${PYSITELIB}/zenmapGUI/ScanRunDetailsPage.pyc 153${PYSITELIB}/zenmapGUI/ScanRunDetailsPage.pyc
152${PYSITELIB}/zenmapGUI/ScanScanListPage.py 154${PYSITELIB}/zenmapGUI/ScanScanListPage.py
153${PYSITELIB}/zenmapGUI/ScanScanListPage.pyc 155${PYSITELIB}/zenmapGUI/ScanScanListPage.pyc
154${PYSITELIB}/zenmapGUI/ScanToolbar.py 156${PYSITELIB}/zenmapGUI/ScanToolbar.py
155${PYSITELIB}/zenmapGUI/ScanToolbar.pyc 157${PYSITELIB}/zenmapGUI/ScanToolbar.pyc
156${PYSITELIB}/zenmapGUI/ScansListStore.py 158${PYSITELIB}/zenmapGUI/ScansListStore.py
157${PYSITELIB}/zenmapGUI/ScansListStore.pyc 159${PYSITELIB}/zenmapGUI/ScansListStore.pyc
158${PYSITELIB}/zenmapGUI/SearchGUI.py 160${PYSITELIB}/zenmapGUI/SearchGUI.py
159${PYSITELIB}/zenmapGUI/SearchGUI.pyc 161${PYSITELIB}/zenmapGUI/SearchGUI.pyc
160${PYSITELIB}/zenmapGUI/SearchWindow.py 162${PYSITELIB}/zenmapGUI/SearchWindow.py
@@ -204,26 +206,27 @@ ${PYSITELIB}/zenmapGUI/higwidgets/higwin @@ -204,26 +206,27 @@ ${PYSITELIB}/zenmapGUI/higwidgets/higwin
204${PYSITELIB}/zenmapGUI/higwidgets/utils.py 206${PYSITELIB}/zenmapGUI/higwidgets/utils.py
205${PYSITELIB}/zenmapGUI/higwidgets/utils.pyc 207${PYSITELIB}/zenmapGUI/higwidgets/utils.pyc
206man/man1/zenmap.1 208man/man1/zenmap.1
207share/applications/zenmap-root.desktop 209share/applications/zenmap-root.desktop
208share/applications/zenmap.desktop 210share/applications/zenmap.desktop
209share/zenmap/config/scan_profile.usp 211share/zenmap/config/scan_profile.usp
210share/zenmap/config/zenmap.conf 212share/zenmap/config/zenmap.conf
211share/zenmap/config/zenmap_version 213share/zenmap/config/zenmap_version
212share/zenmap/docs/help.html 214share/zenmap/docs/help.html
213share/zenmap/locale/de/LC_MESSAGES/zenmap.mo 215share/zenmap/locale/de/LC_MESSAGES/zenmap.mo
214share/zenmap/locale/fr/LC_MESSAGES/zenmap.mo 216share/zenmap/locale/fr/LC_MESSAGES/zenmap.mo
215share/zenmap/locale/hr/LC_MESSAGES/zenmap.mo 217share/zenmap/locale/hr/LC_MESSAGES/zenmap.mo
216share/zenmap/locale/pt_BR/LC_MESSAGES/zenmap.mo 218share/zenmap/locale/pt_BR/LC_MESSAGES/zenmap.mo
 219share/zenmap/locale/ru/LC_MESSAGES/zenmap.mo
217share/zenmap/misc/profile_editor.xml 220share/zenmap/misc/profile_editor.xml
218share/zenmap/pixmaps/default_32.png 221share/zenmap/pixmaps/default_32.png
219share/zenmap/pixmaps/default_75.png 222share/zenmap/pixmaps/default_75.png
220share/zenmap/pixmaps/freebsd_32.png 223share/zenmap/pixmaps/freebsd_32.png
221share/zenmap/pixmaps/freebsd_75.png 224share/zenmap/pixmaps/freebsd_75.png
222share/zenmap/pixmaps/irix_32.png 225share/zenmap/pixmaps/irix_32.png
223share/zenmap/pixmaps/irix_75.png 226share/zenmap/pixmaps/irix_75.png
224share/zenmap/pixmaps/linux_32.png 227share/zenmap/pixmaps/linux_32.png
225share/zenmap/pixmaps/linux_75.png 228share/zenmap/pixmaps/linux_75.png
226share/zenmap/pixmaps/macosx_32.png 229share/zenmap/pixmaps/macosx_32.png
227share/zenmap/pixmaps/macosx_75.png 230share/zenmap/pixmaps/macosx_75.png
228share/zenmap/pixmaps/openbsd_32.png 231share/zenmap/pixmaps/openbsd_32.png
229share/zenmap/pixmaps/openbsd_75.png 232share/zenmap/pixmaps/openbsd_75.png

cvs diff -r1.40 -r1.41 pkgsrc/net/nmap/distinfo (expand / switch to unified diff)

--- pkgsrc/net/nmap/distinfo 2009/07/20 19:40:08 1.40
+++ pkgsrc/net/nmap/distinfo 2010/03/21 21:58:23 1.41
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.40 2009/07/20 19:40:08 adrianp Exp $ 1$NetBSD: distinfo,v 1.41 2010/03/21 21:58:23 pettai Exp $
2 2
3SHA1 (nmap-5.00.tar.bz2) = 3e7557f7fd52ccf8f052042fe1412ba0c964dee8 3SHA1 (nmap-5.21.tar.bz2) = ce5ff792161dae0037e41b31e0c2ef683ce94655
4RMD160 (nmap-5.00.tar.bz2) = 429fff5e436826978426bd800698de8e0d78b662 4RMD160 (nmap-5.21.tar.bz2) = 85e912c3c6a7ed03eb1b399c812836071e4dcf9f
5Size (nmap-5.00.tar.bz2) = 9068342 bytes 5Size (nmap-5.21.tar.bz2) = 10015121 bytes
6SHA1 (patch-aa) = 61593e0479a79bcb4cce2e88b2e5753fa14bc429 6SHA1 (patch-aa) = 61593e0479a79bcb4cce2e88b2e5753fa14bc429
7SHA1 (patch-ab) = bef6a0bc8481702319d14d3427169562f13e1526 7SHA1 (patch-ab) = 22c377e9a340a6e6d7b9a36b63e6ffc47a084b3b
8SHA1 (patch-ac) = c22e8f6411b1152a6e7582c90e5ec5bd4c6acaad 8SHA1 (patch-ac) = c22e8f6411b1152a6e7582c90e5ec5bd4c6acaad
9SHA1 (patch-ad) = 767ace3bb0c94db80ce3352692358b63463f4e30 9SHA1 (patch-ad) = 607225d4f0d1e9a7ea5f73aee79e71c6995f1c64
10SHA1 (patch-aj) = 868440ce24a70c1a747af6d65eed24f20c4bb892 10SHA1 (patch-aj) = 868440ce24a70c1a747af6d65eed24f20c4bb892

cvs diff -r1.3 -r1.4 pkgsrc/net/nmap/options.mk (expand / switch to unified diff)

--- pkgsrc/net/nmap/options.mk 2009/07/20 19:40:08 1.3
+++ pkgsrc/net/nmap/options.mk 2010/03/21 21:58:23 1.4
@@ -1,40 +1,41 @@ @@ -1,40 +1,41 @@
1# $NetBSD: options.mk,v 1.3 2009/07/20 19:40:08 adrianp Exp $ 1# $NetBSD: options.mk,v 1.4 2010/03/21 21:58:23 pettai Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.nmap 3PKG_OPTIONS_VAR= PKG_OPTIONS.nmap
4 4
5PKG_SUPPORTED_OPTIONS= zenmap inet6 ndiff 5PKG_SUPPORTED_OPTIONS= inet6 zenmap ndiff
 6PKG_SUGGESTED_OPTIONS= inet6
6 7
7.include "../../mk/bsd.options.mk" 8.include "../../mk/bsd.options.mk"
8 9
9.if !empty(PKG_OPTIONS:Minet6) 10.if !empty(PKG_OPTIONS:Minet6)
10CONFIGURE_ARGS+= --enable-ipv6 11CONFIGURE_ARGS+= --enable-ipv6
11.else 12.else
12CONFIGURE_ARGS+= --disable-ipv6 13CONFIGURE_ARGS+= --disable-ipv6
13.endif 14.endif
14 15
15### 16###
16### Enable dynamically loadable preprocessors, detection engine 17### Enable dynamically loadable preprocessors, detection engine
17### and rules libraries. 18### and rules libraries.
18### 19###
19.if !empty(PKG_OPTIONS:Mzenmap) 20.if !empty(PKG_OPTIONS:Mzenmap)
20CONFIGURE_ARGS+= --with-zenmap 21CONFIGURE_ARGS+= --with-zenmap
21PLIST_SRC+= ${PKGDIR}/PLIST.zenmap 22PLIST_SRC+= ${PKGDIR}/PLIST.zenmap
22PYTHON_VERSIONS_ACCEPTED= 25 24 23PYTHON_VERSIONS_ACCEPTED= 26 25 24
23PY_PATCHPLIST= yes 24PY_PATCHPLIST= yes
24.include "../../lang/python/application.mk" 25.include "../../lang/python/application.mk"
25.include "../../lang/python/extension.mk" 26.include "../../lang/python/extension.mk"
26.include "../../x11/py-gtk2/buildlink3.mk" 27.include "../../x11/py-gtk2/buildlink3.mk"
27.include "../../databases/py-sqlite2/buildlink3.mk" 28.include "../../databases/py-sqlite2/buildlink3.mk"
28.include "../../textproc/py-xml/buildlink3.mk" 29.include "../../textproc/py-xml/buildlink3.mk"
29.include "../../sysutils/desktop-file-utils/desktopdb.mk" 30.include "../../sysutils/desktop-file-utils/desktopdb.mk"
30.else 31.else
31CONFIGURE_ARGS+= --without-zenmap 32CONFIGURE_ARGS+= --without-zenmap
32.endif 33.endif
33 34
34.if !empty(PKG_OPTIONS:Mndiff) 35.if !empty(PKG_OPTIONS:Mndiff)
35CONFIGURE_ARGS+= --with-ndiff 36CONFIGURE_ARGS+= --with-ndiff
36PLIST_SRC+= ${PKGDIR}/PLIST.ndiff 37PLIST_SRC+= ${PKGDIR}/PLIST.ndiff
37PYTHON_VERSIONS_ACCEPTED= 25 24 38PYTHON_VERSIONS_ACCEPTED= 26 25 24
38.else 39.else
39CONFIGURE_ARGS+= --without-ndiff 40CONFIGURE_ARGS+= --without-ndiff
40.endif 41.endif

cvs diff -r1.12 -r1.13 pkgsrc/net/nmap/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/net/nmap/patches/Attic/patch-ab 2006/12/17 17:55:49 1.12
+++ pkgsrc/net/nmap/patches/Attic/patch-ab 2010/03/21 21:58:23 1.13
@@ -1,12 +1,30 @@ @@ -1,12 +1,30 @@
1$NetBSD: patch-ab,v 1.12 2006/12/17 17:55:49 salo Exp $ 1$NetBSD: patch-ab,v 1.13 2010/03/21 21:58:23 pettai Exp $
2 2
3--- configure.orig 2006-08-17 02:36:16.000000000 +0200 3--- configure.orig 2009-11-05 20:50:33.000000000 +0100
4+++ configure 2006-12-17 15:07:11.000000000 +0100 4+++ configure 2010-01-27 23:57:35.000000000 +0100
5@@ -5879,6 +5879,7 @@ cat >>conftest.$ac_ext <<_ACEOF 5@@ -5891,7 +5891,7 @@
 6 $as_echo_n "(cached) " >&6
 7 else
 8
 9- for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
 10+ for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
 11 test "$am_cv_pathless_PYTHON" = none && break
 12 prog="import sys
 13 # split strings by '.' and convert to numeric. Append some zeros
 14@@ -6145,7 +6145,7 @@
 15 $as_echo_n "(cached) " >&6
 16 else
 17
 18- for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
 19+ for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
 20 test "$am_cv_pathless_PYTHON" = none && break
 21 prog="import sys
 22 # split strings by '.' and convert to numeric. Append some zeros
 23@@ -7161,6 +7161,7 @@
6 extern char pcap_version[]; 24 extern char pcap_version[];
7 int main() { 25 int main() {
8 int major, minor1, minor2; 26 int major, minor1, minor2;
9+ exit(0); /* fool it */ 27+ exit(0); /* fool it */
10 sscanf(pcap_version,"%d.%d.%d", &major, &minor1, &minor2); 28 sscanf(pcap_version,"%d.%d.%d", &major, &minor1, &minor2);
11 if (major > 0) 29 if (major > 0)
12 exit(0); 30 exit(0);

cvs diff -r1.13 -r1.14 pkgsrc/net/nmap/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/net/nmap/patches/Attic/patch-ad 2009/04/01 07:56:19 1.13
+++ pkgsrc/net/nmap/patches/Attic/patch-ad 2010/03/21 21:58:23 1.14
@@ -1,61 +1,47 @@ @@ -1,61 +1,47 @@
1$NetBSD: patch-ad,v 1.13 2009/04/01 07:56:19 apb Exp $ 1$NetBSD: patch-ad,v 1.14 2010/03/21 21:58:23 pettai Exp $
2 2
3Correct handling of the length of data returned by SIOCGIFCONF. The 3Correct handling of the length of data returned by SIOCGIFCONF. The
4actual length of each item is never less than sizeof(struct ifreq), but 4actual length of each item is never less than sizeof(struct ifreq), but
5may be more than that. If the platform's struct sockaddr has an sa_len 5may be more than that. If the platform's struct sockaddr has an sa_len
6field, and if the length in sa_len is larger then the space available in 6field, and if the length in sa_len is larger then the space available in
7ifr_ifru, then the data extends beyond the end of the ifr_ifru field by 7ifr_ifru, then the data extends beyond the end of the ifr_ifru field by
8the difference in sizes. 8the difference in sizes.
9 9
10The previous code of the form 10The previous code of the form
11 11
12 len = ifr->ifr_addr.sa_len + sizeof(ifr->ifr_name); 12 len = ifr->ifr_addr.sa_len + sizeof(ifr->ifr_name);
13 13
14had two problems: 14had two problems:
15 15
161) It assumes that ifr_name and ifr_ifru are the only members 161) It assumes that ifr_name and ifr_ifru are the only members
17 of struct ifreq, so that sizeof(ifr->ifr_name) is equivalent to 17 of struct ifreq, so that sizeof(ifr->ifr_name) is equivalent to
18 sizeof(struct ifr) - sizeof(ifr->ifr_ifreq). This assumption may 18 sizeof(struct ifr) - sizeof(ifr->ifr_ifreq). This assumption may
19 be incorrect on some thypothetical systems, 19 be incorrect on some thypothetical systems,
20 and it's just as efficient to use code that 20 and it's just as efficient to use code that
21 avoids making the assumption. 21 avoids making the assumption.
22 22
232) It assumes that ifr->ifr_addr.sa_len will never be smaller than 232) It assumes that ifr->ifr_addr.sa_len will never be smaller than
24 sizeof(ifr->ifr_ifru). This assumption is incorrect on some 24 sizeof(ifr->ifr_ifru). This assumption is incorrect on some
25 systems, at least on NetBSD. 25 systems, at least on NetBSD.
26 26
27--- tcpip.cc.orig 2008-09-04 14:41:59.000000000 +0000 27--- tcpip.cc.orig 2010-01-15 04:55:23.000000000 +0100
28+++ tcpip.cc 28+++ tcpip.cc 2010-01-27 22:46:10.000000000 +0100
29@@ -2890,12 +2890,10 @@ int sd; 29@@ -3053,12 +3053,13 @@
30 ifr = (struct ifreq *) buf; 30 int rc;
31 if (ifc.ifc_len == 0)  31 char *p;
32 fatal("%s: SIOCGIFCONF claims you have no network interfaces!\n", __func__); 32
 33- /* On some platforms (such as FreeBSD), the length of each ifr changes
 34- based on the sockaddr type used, so we get the next length now. */
33-#if HAVE_SOCKADDR_SA_LEN 35-#if HAVE_SOCKADDR_SA_LEN
34- /* len = MAX(sizeof(struct sockaddr), ifr->ifr_addr.sa_len);*/ 
35- len = ifr->ifr_addr.sa_len + sizeof(ifr->ifr_name); 36- len = ifr->ifr_addr.sa_len + sizeof(ifr->ifr_name);
36-#else 37-#else
 38+ /* On some platforms struct sockaddr has an sa_len member, if
 39+ ifr_ddr.sa_len is larger then sizeof ifr_ifru, then the actual
 40+ data extends beyond the end of ifr_ifru. */
37 len = sizeof(struct ifreq); 41 len = sizeof(struct ifreq);
38- /* len = sizeof(SA); */ 
39+#if HAVE_SOCKADDR_SA_LEN 42+#if HAVE_SOCKADDR_SA_LEN
40+ if (ifr->ifr_addr.sa_len > sizeof(ifr->ifr_ifru)) 43+ len = ifr->ifr_addr.sa_len > sizeof(ifr->ifr_name);
41+ len += (ifr->ifr_addr.sa_len - sizeof(ifr->ifr_ifru)); 44+ len += (ifr->ifr_addr.sa_len - sizeof(ifr->ifr_ifru));
42 #endif 45 #endif
43  46
44 /* Debugging code 47 /* skip any device with no name */
45@@ -2914,10 +2912,13 @@ int sd; 
46 printf("ifr = %X\n",(unsigned)(*(char **)&ifr)); 
47 */ 
48  
49- /* On some platforms (such as FreeBSD), the length of each ifr changes 
50- based on the sockaddr type used, so we get the next length now */ 
51+ /* On platforms where struct sockaddr has an sa_len member, if 
52+ ifr_ddr.sa_len is larger then sizeof ifr_ifru, then the actual 
53+ data extends beyond the end of ifr_ifru. */ 
54+ len = sizeof(struct ifreq); 
55 #if HAVE_SOCKADDR_SA_LEN 
56- len = ifr->ifr_addr.sa_len + sizeof(ifr->ifr_name); 
57+ if (ifr->ifr_addr.sa_len > sizeof(ifr->ifr_ifru)) 
58+ len += (ifr->ifr_addr.sa_len - sizeof(ifr->ifr_ifru)); 
59 #endif  
60  
61 /* skip any device with no name */