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@diff -r1.70 -r1.71 pkgsrc/net/nmap/Makefile
(pettai)
@@ -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 | |||
4 | DISTNAME= nmap-5.00 | 4 | DISTNAME= nmap-5.21 | |
5 | PKGREVISION= 2 | |||
6 | CATEGORIES= net security | 5 | CATEGORIES= net security | |
7 | MASTER_SITES= http://nmap.org/dist/ | 6 | MASTER_SITES= http://nmap.org/dist/ | |
8 | EXTRACT_SUFX= .tar.bz2 | 7 | EXTRACT_SUFX= .tar.bz2 | |
9 | 8 | |||
10 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
11 | HOMEPAGE= http://insecure.org/nmap/ | 10 | HOMEPAGE= http://insecure.org/nmap/ | |
12 | COMMENT= Network/port scanner with OS detection | 11 | COMMENT= Network/port scanner with OS detection | |
12 | LICENSE= gnu-gpl-v2 | |||
13 | 13 | |||
14 | PKG_INSTALLATION_TYPES= overwrite pkgviews | 14 | PKG_INSTALLATION_TYPES= overwrite pkgviews | |
15 | PKG_DESTDIR_SUPPORT= user-destdir | 15 | PKG_DESTDIR_SUPPORT= user-destdir | |
16 | 16 | |||
17 | BUILDLINK_API_DEPENDS.libpcap= libpcap>=0.9.4 | 17 | BUILDLINK_API_DEPENDS.libpcap= libpcap>=0.9.4 | |
18 | BUILDLINK_API_DEPENDS.libpcre= libpcre>=6.7 | 18 | BUILDLINK_API_DEPENDS.libpcre= libpcre>=6.7 | |
19 | 19 | |||
20 | GNU_CONFIGURE= yes | 20 | GNU_CONFIGURE= yes | |
21 | ||||
21 | USE_LANGUAGES= c c++ | 22 | USE_LANGUAGES= c c++ | |
22 | USE_LIBTOOL= yes | 23 | USE_LIBTOOL= yes | |
23 | USE_TOOLS+= gmake | 24 | USE_TOOLS+= gmake | |
24 | PLIST_SRC= ${WRKDIR}/.PLIST_SRC | 25 | PLIST_SRC= ${WRKDIR}/.PLIST_SRC | |
25 | 26 | |||
27 | BUILD_DEFS+= IPV6_READY | |||
28 | ||||
26 | .include "options.mk" | 29 | .include "options.mk" | |
27 | 30 | |||
28 | CHECK_INTERPRETER_SKIP+= share/zenmap/su-to-zenmap.sh | 31 | CHECK_INTERPRETER_SKIP+= share/zenmap/su-to-zenmap.sh | |
29 | 32 | |||
30 | CONFIGURE_ARGS+= --with-libpcap=${BUILDLINK_PREFIX.libpcap} | 33 | CONFIGURE_ARGS+= --with-libpcap=${BUILDLINK_PREFIX.libpcap} | |
31 | CONFIGURE_ARGS+= --with-libpcre=${BUILDLINK_PREFIX.pcre} | 34 | CONFIGURE_ARGS+= --with-libpcre=${BUILDLINK_PREFIX.pcre} | |
32 | CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} | 35 | CONFIGURE_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" | |
37 | MAKE_ENV+= CPPFLAGS="" | 40 | MAKE_ENV+= CPPFLAGS="" | |
38 | .endif | 41 | .endif |
@@ -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 $ | |
2 | bin/ncat | 2 | bin/ncat | |
3 | bin/nmap | 3 | bin/nmap | |
4 | man/de/man1/nmap.1 | |||
5 | man/es/man1/nmap.1 | |||
6 | man/fr/man1/nmap.1 | |||
7 | man/hr/man1/nmap.1 | |||
8 | man/hu/man1/nmap.1 | |||
9 | man/it/man1/nmap.1 | |||
10 | man/jp/man1/nmap.1 | |||
4 | man/man1/ncat.1 | 11 | man/man1/ncat.1 | |
5 | man/man1/nmap.1 | 12 | man/man1/nmap.1 | |
13 | man/pl/man1/nmap.1 | |||
14 | man/pt_BR/man1/nmap.1 | |||
15 | man/pt_PT/man1/nmap.1 | |||
16 | man/ro/man1/nmap.1 | |||
17 | man/ru/man1/nmap.1 | |||
18 | man/sk/man1/nmap.1 | |||
19 | man/zh/man1/nmap.1 | |||
6 | share/ncat/ca-bundle.crt | 20 | share/ncat/ca-bundle.crt | |
7 | share/nmap/nmap-mac-prefixes | 21 | share/nmap/nmap-mac-prefixes | |
8 | share/nmap/nmap-os-db | 22 | share/nmap/nmap-os-db | |
9 | share/nmap/nmap-protocols | 23 | share/nmap/nmap-protocols | |
10 | share/nmap/nmap-rpc | 24 | share/nmap/nmap-rpc | |
11 | share/nmap/nmap-service-probes | 25 | share/nmap/nmap-service-probes | |
12 | share/nmap/nmap-services | 26 | share/nmap/nmap-services | |
13 | share/nmap/nmap.dtd | 27 | share/nmap/nmap.dtd | |
14 | share/nmap/nmap.xsl | 28 | share/nmap/nmap.xsl | |
15 | share/nmap/nse_main.lua | 29 | share/nmap/nse_main.lua | |
16 | share/nmap/nselib/base64.lua | 30 | share/nmap/nselib/base64.lua | |
31 | share/nmap/nselib/citrixxml.lua | |||
17 | share/nmap/nselib/comm.lua | 32 | share/nmap/nselib/comm.lua | |
33 | share/nmap/nselib/data/favicon-db | |||
34 | share/nmap/nselib/data/folders.lst | |||
35 | share/nmap/nselib/data/http-fingerprints | |||
36 | share/nmap/nselib/data/oracle-sids | |||
37 | share/nmap/nselib/data/passwords.lst | |||
38 | share/nmap/nselib/data/psexec/README | |||
39 | share/nmap/nselib/data/psexec/backdoor.lua | |||
40 | share/nmap/nselib/data/psexec/default.lua | |||
41 | share/nmap/nselib/data/psexec/drives.lua | |||
42 | share/nmap/nselib/data/psexec/encoder.c | |||
43 | share/nmap/nselib/data/psexec/examples.lua | |||
44 | share/nmap/nselib/data/psexec/experimental.lua | |||
45 | share/nmap/nselib/data/psexec/network.lua | |||
46 | share/nmap/nselib/data/psexec/nmap_service.c | |||
47 | share/nmap/nselib/data/psexec/nmap_service.exe | |||
48 | share/nmap/nselib/data/psexec/nmap_service.vcproj | |||
49 | share/nmap/nselib/data/psexec/pwdump.lua | |||
50 | share/nmap/nselib/data/usernames.lst | |||
51 | share/nmap/nselib/data/yokoso-fingerprints | |||
18 | share/nmap/nselib/datafiles.lua | 52 | share/nmap/nselib/datafiles.lua | |
19 | share/nmap/nselib/dns.lua | 53 | share/nmap/nselib/dns.lua | |
20 | share/nmap/nselib/http.lua | 54 | share/nmap/nselib/http.lua | |
21 | share/nmap/nselib/imap.lua | 55 | share/nmap/nselib/imap.lua | |
22 | share/nmap/nselib/ipOps.lua | 56 | share/nmap/nselib/ipOps.lua | |
23 | share/nmap/nselib/listop.lua | 57 | share/nmap/nselib/listop.lua | |
24 | share/nmap/nselib/match.lua | 58 | share/nmap/nselib/match.lua | |
25 | share/nmap/nselib/msrpc.lua | 59 | share/nmap/nselib/msrpc.lua | |
26 | share/nmap/nselib/msrpcperformance.lua | 60 | share/nmap/nselib/msrpcperformance.lua | |
27 | share/nmap/nselib/msrpctypes.lua | 61 | share/nmap/nselib/msrpctypes.lua | |
28 | share/nmap/nselib/netbios.lua | 62 | share/nmap/nselib/netbios.lua | |
29 | share/nmap/nselib/nsedebug.lua | 63 | share/nmap/nselib/nsedebug.lua | |
30 | share/nmap/nselib/packet.lua | 64 | share/nmap/nselib/packet.lua | |
31 | share/nmap/nselib/pop3.lua | 65 | share/nmap/nselib/pop3.lua | |
66 | share/nmap/nselib/proxy.lua | |||
32 | share/nmap/nselib/shortport.lua | 67 | share/nmap/nselib/shortport.lua | |
33 | share/nmap/nselib/smb.lua | 68 | share/nmap/nselib/smb.lua | |
34 | share/nmap/nselib/smbauth.lua | 69 | share/nmap/nselib/smbauth.lua | |
35 | share/nmap/nselib/snmp.lua | 70 | share/nmap/nselib/snmp.lua | |
36 | share/nmap/nselib/ssh1.lua | 71 | share/nmap/nselib/ssh1.lua | |
37 | share/nmap/nselib/ssh2.lua | 72 | share/nmap/nselib/ssh2.lua | |
38 | share/nmap/nselib/stdnse.lua | 73 | share/nmap/nselib/stdnse.lua | |
39 | share/nmap/nselib/strbuf.lua | 74 | share/nmap/nselib/strbuf.lua | |
75 | share/nmap/nselib/strict.lua | |||
40 | share/nmap/nselib/tab.lua | 76 | share/nmap/nselib/tab.lua | |
41 | share/nmap/nselib/unpwdb.lua | 77 | share/nmap/nselib/unpwdb.lua | |
42 | share/nmap/nselib/url.lua | 78 | share/nmap/nselib/url.lua | |
43 | share/nmap/scripts/asn-query.nse | 79 | share/nmap/scripts/asn-query.nse | |
44 | share/nmap/scripts/auth-owners.nse | 80 | share/nmap/scripts/auth-owners.nse | |
45 | share/nmap/scripts/auth-spoof.nse | 81 | share/nmap/scripts/auth-spoof.nse | |
46 | share/nmap/scripts/banner.nse | 82 | share/nmap/scripts/banner.nse | |
83 | share/nmap/scripts/citrix-brute-xml.nse | |||
84 | share/nmap/scripts/citrix-enum-apps-xml.nse | |||
85 | share/nmap/scripts/citrix-enum-apps.nse | |||
86 | share/nmap/scripts/citrix-enum-servers-xml.nse | |||
87 | share/nmap/scripts/citrix-enum-servers.nse | |||
47 | share/nmap/scripts/daytime.nse | 88 | share/nmap/scripts/daytime.nse | |
89 | share/nmap/scripts/db2-info.nse | |||
90 | share/nmap/scripts/dhcp-discover.nse | |||
48 | share/nmap/scripts/dns-random-srcport.nse | 91 | share/nmap/scripts/dns-random-srcport.nse | |
49 | share/nmap/scripts/dns-random-txid.nse | 92 | share/nmap/scripts/dns-random-txid.nse | |
50 | share/nmap/scripts/dns-recursion.nse | 93 | share/nmap/scripts/dns-recursion.nse | |
51 | share/nmap/scripts/dns-zone-transfer.nse | 94 | share/nmap/scripts/dns-zone-transfer.nse | |
52 | share/nmap/scripts/finger.nse | 95 | share/nmap/scripts/finger.nse | |
53 | share/nmap/scripts/ftp-anon.nse | 96 | share/nmap/scripts/ftp-anon.nse | |
54 | share/nmap/scripts/ftp-bounce.nse | 97 | share/nmap/scripts/ftp-bounce.nse | |
55 | share/nmap/scripts/ftp-brute.nse | 98 | share/nmap/scripts/ftp-brute.nse | |
56 | share/nmap/scripts/html-title.nse | 99 | share/nmap/scripts/html-title.nse | |
57 | share/nmap/scripts/http-auth.nse | 100 | share/nmap/scripts/http-auth.nse | |
101 | share/nmap/scripts/http-date.nse | |||
102 | share/nmap/scripts/http-enum.nse | |||
103 | share/nmap/scripts/http-favicon.nse | |||
104 | share/nmap/scripts/http-headers.nse | |||
58 | share/nmap/scripts/http-iis-webdav-vuln.nse | 105 | share/nmap/scripts/http-iis-webdav-vuln.nse | |
106 | share/nmap/scripts/http-malware-host.nse | |||
59 | share/nmap/scripts/http-open-proxy.nse | 107 | share/nmap/scripts/http-open-proxy.nse | |
60 | share/nmap/scripts/http-passwd.nse | 108 | share/nmap/scripts/http-passwd.nse | |
61 | share/nmap/scripts/http-trace.nse | 109 | share/nmap/scripts/http-trace.nse | |
110 | share/nmap/scripts/http-userdir-enum.nse | |||
62 | share/nmap/scripts/iax2-version.nse | 111 | share/nmap/scripts/iax2-version.nse | |
63 | share/nmap/scripts/imap-capabilities.nse | 112 | share/nmap/scripts/imap-capabilities.nse | |
64 | share/nmap/scripts/irc-info.nse | 113 | share/nmap/scripts/irc-info.nse | |
65 | share/nmap/scripts/ms-sql-info.nse | 114 | share/nmap/scripts/ms-sql-info.nse | |
66 | share/nmap/scripts/mysql-info.nse | 115 | share/nmap/scripts/mysql-info.nse | |
67 | share/nmap/scripts/nbstat.nse | 116 | share/nmap/scripts/nbstat.nse | |
117 | share/nmap/scripts/nfs-showmount.nse | |||
118 | share/nmap/scripts/ntp-info.nse | |||
119 | share/nmap/scripts/oracle-sid-brute.nse | |||
68 | share/nmap/scripts/p2p-conficker.nse | 120 | share/nmap/scripts/p2p-conficker.nse | |
121 | share/nmap/scripts/pjl-ready-message.nse | |||
69 | share/nmap/scripts/pop3-brute.nse | 122 | share/nmap/scripts/pop3-brute.nse | |
70 | share/nmap/scripts/pop3-capabilities.nse | 123 | share/nmap/scripts/pop3-capabilities.nse | |
71 | share/nmap/scripts/pptp-version.nse | 124 | share/nmap/scripts/pptp-version.nse | |
72 | share/nmap/scripts/realvnc-auth-bypass.nse | 125 | share/nmap/scripts/realvnc-auth-bypass.nse | |
73 | share/nmap/scripts/robots.txt.nse | 126 | share/nmap/scripts/robots.txt.nse | |
74 | share/nmap/scripts/rpcinfo.nse | 127 | share/nmap/scripts/rpcinfo.nse | |
75 | share/nmap/scripts/script.db | 128 | share/nmap/scripts/script.db | |
76 | share/nmap/scripts/skypev2-version.nse | 129 | share/nmap/scripts/skypev2-version.nse | |
77 | share/nmap/scripts/smb-brute.nse | 130 | share/nmap/scripts/smb-brute.nse | |
78 | share/nmap/scripts/smb-check-vulns.nse | 131 | share/nmap/scripts/smb-check-vulns.nse | |
79 | share/nmap/scripts/smb-enum-domains.nse | 132 | share/nmap/scripts/smb-enum-domains.nse | |
133 | share/nmap/scripts/smb-enum-groups.nse | |||
80 | share/nmap/scripts/smb-enum-processes.nse | 134 | share/nmap/scripts/smb-enum-processes.nse | |
81 | share/nmap/scripts/smb-enum-sessions.nse | 135 | share/nmap/scripts/smb-enum-sessions.nse | |
82 | share/nmap/scripts/smb-enum-shares.nse | 136 | share/nmap/scripts/smb-enum-shares.nse | |
83 | share/nmap/scripts/smb-enum-users.nse | 137 | share/nmap/scripts/smb-enum-users.nse | |
84 | share/nmap/scripts/smb-os-discovery.nse | 138 | share/nmap/scripts/smb-os-discovery.nse | |
85 | share/nmap/scripts/smb-pwdump.nse | 139 | share/nmap/scripts/smb-psexec.nse | |
86 | share/nmap/scripts/smb-security-mode.nse | 140 | share/nmap/scripts/smb-security-mode.nse | |
87 | share/nmap/scripts/smb-server-stats.nse | 141 | share/nmap/scripts/smb-server-stats.nse | |
88 | share/nmap/scripts/smb-system-info.nse | 142 | share/nmap/scripts/smb-system-info.nse | |
143 | share/nmap/scripts/smbv2-enabled.nse | |||
89 | share/nmap/scripts/smtp-commands.nse | 144 | share/nmap/scripts/smtp-commands.nse | |
90 | share/nmap/scripts/smtp-open-relay.nse | 145 | share/nmap/scripts/smtp-open-relay.nse | |
91 | share/nmap/scripts/smtp-strangeport.nse | 146 | share/nmap/scripts/smtp-strangeport.nse | |
92 | share/nmap/scripts/sniffer-detect.nse | 147 | share/nmap/scripts/sniffer-detect.nse | |
93 | share/nmap/scripts/snmp-brute.nse | 148 | share/nmap/scripts/snmp-brute.nse | |
94 | share/nmap/scripts/snmp-sysdescr.nse | 149 | share/nmap/scripts/snmp-sysdescr.nse | |
95 | share/nmap/scripts/socks-open-proxy.nse | 150 | share/nmap/scripts/socks-open-proxy.nse | |
96 | share/nmap/scripts/sql-injection.nse | 151 | share/nmap/scripts/sql-injection.nse | |
97 | share/nmap/scripts/ssh-hostkey.nse | 152 | share/nmap/scripts/ssh-hostkey.nse | |
98 | share/nmap/scripts/sshv1.nse | 153 | share/nmap/scripts/sshv1.nse | |
154 | share/nmap/scripts/ssl-cert.nse | |||
99 | share/nmap/scripts/sslv2.nse | 155 | share/nmap/scripts/sslv2.nse | |
100 | share/nmap/scripts/telnet-brute.nse | 156 | share/nmap/scripts/telnet-brute.nse | |
101 | share/nmap/scripts/upnp-info.nse | 157 | share/nmap/scripts/upnp-info.nse | |
102 | share/nmap/scripts/whois.nse | 158 | share/nmap/scripts/whois.nse | |
159 | share/nmap/scripts/x11-access.nse |
@@ -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 $ | |
2 | bin/nmapfe | 2 | bin/nmapfe | |
3 | bin/uninstall_zenmap | 3 | bin/uninstall_zenmap | |
4 | bin/xnmap | 4 | bin/xnmap | |
5 | bin/zenmap | 5 | bin/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 | |
206 | man/man1/zenmap.1 | 208 | man/man1/zenmap.1 | |
207 | share/applications/zenmap-root.desktop | 209 | share/applications/zenmap-root.desktop | |
208 | share/applications/zenmap.desktop | 210 | share/applications/zenmap.desktop | |
209 | share/zenmap/config/scan_profile.usp | 211 | share/zenmap/config/scan_profile.usp | |
210 | share/zenmap/config/zenmap.conf | 212 | share/zenmap/config/zenmap.conf | |
211 | share/zenmap/config/zenmap_version | 213 | share/zenmap/config/zenmap_version | |
212 | share/zenmap/docs/help.html | 214 | share/zenmap/docs/help.html | |
213 | share/zenmap/locale/de/LC_MESSAGES/zenmap.mo | 215 | share/zenmap/locale/de/LC_MESSAGES/zenmap.mo | |
214 | share/zenmap/locale/fr/LC_MESSAGES/zenmap.mo | 216 | share/zenmap/locale/fr/LC_MESSAGES/zenmap.mo | |
215 | share/zenmap/locale/hr/LC_MESSAGES/zenmap.mo | 217 | share/zenmap/locale/hr/LC_MESSAGES/zenmap.mo | |
216 | share/zenmap/locale/pt_BR/LC_MESSAGES/zenmap.mo | 218 | share/zenmap/locale/pt_BR/LC_MESSAGES/zenmap.mo | |
219 | share/zenmap/locale/ru/LC_MESSAGES/zenmap.mo | |||
217 | share/zenmap/misc/profile_editor.xml | 220 | share/zenmap/misc/profile_editor.xml | |
218 | share/zenmap/pixmaps/default_32.png | 221 | share/zenmap/pixmaps/default_32.png | |
219 | share/zenmap/pixmaps/default_75.png | 222 | share/zenmap/pixmaps/default_75.png | |
220 | share/zenmap/pixmaps/freebsd_32.png | 223 | share/zenmap/pixmaps/freebsd_32.png | |
221 | share/zenmap/pixmaps/freebsd_75.png | 224 | share/zenmap/pixmaps/freebsd_75.png | |
222 | share/zenmap/pixmaps/irix_32.png | 225 | share/zenmap/pixmaps/irix_32.png | |
223 | share/zenmap/pixmaps/irix_75.png | 226 | share/zenmap/pixmaps/irix_75.png | |
224 | share/zenmap/pixmaps/linux_32.png | 227 | share/zenmap/pixmaps/linux_32.png | |
225 | share/zenmap/pixmaps/linux_75.png | 228 | share/zenmap/pixmaps/linux_75.png | |
226 | share/zenmap/pixmaps/macosx_32.png | 229 | share/zenmap/pixmaps/macosx_32.png | |
227 | share/zenmap/pixmaps/macosx_75.png | 230 | share/zenmap/pixmaps/macosx_75.png | |
228 | share/zenmap/pixmaps/openbsd_32.png | 231 | share/zenmap/pixmaps/openbsd_32.png | |
229 | share/zenmap/pixmaps/openbsd_75.png | 232 | share/zenmap/pixmaps/openbsd_75.png |
@@ -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 | |||
3 | SHA1 (nmap-5.00.tar.bz2) = 3e7557f7fd52ccf8f052042fe1412ba0c964dee8 | 3 | SHA1 (nmap-5.21.tar.bz2) = ce5ff792161dae0037e41b31e0c2ef683ce94655 | |
4 | RMD160 (nmap-5.00.tar.bz2) = 429fff5e436826978426bd800698de8e0d78b662 | 4 | RMD160 (nmap-5.21.tar.bz2) = 85e912c3c6a7ed03eb1b399c812836071e4dcf9f | |
5 | Size (nmap-5.00.tar.bz2) = 9068342 bytes | 5 | Size (nmap-5.21.tar.bz2) = 10015121 bytes | |
6 | SHA1 (patch-aa) = 61593e0479a79bcb4cce2e88b2e5753fa14bc429 | 6 | SHA1 (patch-aa) = 61593e0479a79bcb4cce2e88b2e5753fa14bc429 | |
7 | SHA1 (patch-ab) = bef6a0bc8481702319d14d3427169562f13e1526 | 7 | SHA1 (patch-ab) = 22c377e9a340a6e6d7b9a36b63e6ffc47a084b3b | |
8 | SHA1 (patch-ac) = c22e8f6411b1152a6e7582c90e5ec5bd4c6acaad | 8 | SHA1 (patch-ac) = c22e8f6411b1152a6e7582c90e5ec5bd4c6acaad | |
9 | SHA1 (patch-ad) = 767ace3bb0c94db80ce3352692358b63463f4e30 | 9 | SHA1 (patch-ad) = 607225d4f0d1e9a7ea5f73aee79e71c6995f1c64 | |
10 | SHA1 (patch-aj) = 868440ce24a70c1a747af6d65eed24f20c4bb892 | 10 | SHA1 (patch-aj) = 868440ce24a70c1a747af6d65eed24f20c4bb892 |
@@ -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 | |||
3 | PKG_OPTIONS_VAR= PKG_OPTIONS.nmap | 3 | PKG_OPTIONS_VAR= PKG_OPTIONS.nmap | |
4 | 4 | |||
5 | PKG_SUPPORTED_OPTIONS= zenmap inet6 ndiff | 5 | PKG_SUPPORTED_OPTIONS= inet6 zenmap ndiff | |
6 | PKG_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) | |
10 | CONFIGURE_ARGS+= --enable-ipv6 | 11 | CONFIGURE_ARGS+= --enable-ipv6 | |
11 | .else | 12 | .else | |
12 | CONFIGURE_ARGS+= --disable-ipv6 | 13 | CONFIGURE_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) | |
20 | CONFIGURE_ARGS+= --with-zenmap | 21 | CONFIGURE_ARGS+= --with-zenmap | |
21 | PLIST_SRC+= ${PKGDIR}/PLIST.zenmap | 22 | PLIST_SRC+= ${PKGDIR}/PLIST.zenmap | |
22 | PYTHON_VERSIONS_ACCEPTED= 25 24 | 23 | PYTHON_VERSIONS_ACCEPTED= 26 25 24 | |
23 | PY_PATCHPLIST= yes | 24 | PY_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 | |
31 | CONFIGURE_ARGS+= --without-zenmap | 32 | CONFIGURE_ARGS+= --without-zenmap | |
32 | .endif | 33 | .endif | |
33 | 34 | |||
34 | .if !empty(PKG_OPTIONS:Mndiff) | 35 | .if !empty(PKG_OPTIONS:Mndiff) | |
35 | CONFIGURE_ARGS+= --with-ndiff | 36 | CONFIGURE_ARGS+= --with-ndiff | |
36 | PLIST_SRC+= ${PKGDIR}/PLIST.ndiff | 37 | PLIST_SRC+= ${PKGDIR}/PLIST.ndiff | |
37 | PYTHON_VERSIONS_ACCEPTED= 25 24 | 38 | PYTHON_VERSIONS_ACCEPTED= 26 25 24 | |
38 | .else | 39 | .else | |
39 | CONFIGURE_ARGS+= --without-ndiff | 40 | CONFIGURE_ARGS+= --without-ndiff | |
40 | .endif | 41 | .endif |
@@ -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); |
@@ -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 | |||
3 | Correct handling of the length of data returned by SIOCGIFCONF. The | 3 | Correct handling of the length of data returned by SIOCGIFCONF. The | |
4 | actual length of each item is never less than sizeof(struct ifreq), but | 4 | actual length of each item is never less than sizeof(struct ifreq), but | |
5 | may be more than that. If the platform's struct sockaddr has an sa_len | 5 | may be more than that. If the platform's struct sockaddr has an sa_len | |
6 | field, and if the length in sa_len is larger then the space available in | 6 | field, and if the length in sa_len is larger then the space available in | |
7 | ifr_ifru, then the data extends beyond the end of the ifr_ifru field by | 7 | ifr_ifru, then the data extends beyond the end of the ifr_ifru field by | |
8 | the difference in sizes. | 8 | the difference in sizes. | |
9 | 9 | |||
10 | The previous code of the form | 10 | The 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 | |||
14 | had two problems: | 14 | had two problems: | |
15 | 15 | |||
16 | 1) It assumes that ifr_name and ifr_ifru are the only members | 16 | 1) 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 | |||
23 | 2) It assumes that ifr->ifr_addr.sa_len will never be smaller than | 23 | 2) 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 */ |