# HG changeset patch # User Stefan Teleman # Date 1361457805 28800 # Node ID f20006f42637dbc9086e7d4329b8ce66f895fa70 # Parent 1d59d8c2a11371c67538c0f6a9b773094d080466 15953796 Upgrade nmap to 6.25 diff -r 1d59d8c2a113 -r f20006f42637 components/nmap/Makefile --- a/components/nmap/Makefile Mon Feb 18 10:31:06 2013 -0800 +++ b/components/nmap/Makefile Thu Feb 21 06:43:25 2013 -0800 @@ -20,39 +20,40 @@ # # -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk COMPONENT_NAME= nmap -COMPONENT_VERSION= 5.51 -COMPONENT_PROJECT_URL= http://insecure.org/ +COMPONENT_VERSION= 6.25 +COMPONENT_PROJECT_URL= http://nmap.org/ COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tgz COMPONENT_ARCHIVE_HASH= \ - sha256:d44cd28fc087a98056234ac56fc187b6742daa5c20f56bc4d524548042f4b25e -COMPONENT_ARCHIVE_URL= http://nmap.org/dist/$(COMPONENT_ARCHIVE) + sha256:42c54fd5cc5f05e5df909757d62307102a8ff1dfaf5c2626b1cb5f2ecd009e57 +COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)dist/$(COMPONENT_ARCHIVE) COMPONENT_BUGDB= utility/nmap include ../../make-rules/prep.mk include ../../make-rules/configure.mk include ../../make-rules/ips.mk +# Can't use the Studio compilers as they don't support the GNU +# __attribute__ extension COMPILER = gcc COMPONENT_PRE_CONFIGURE_ACTION = \ - ($(CLONEY) $(SOURCE_DIR) $(@D)) + ($(CLONEY) $(SOURCE_DIR) $(@D)) CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" CONFIGURE_OPTIONS += CXX="$(CXX)" CONFIGURE_OPTIONS += CXXFLAGS="$(CXXFLAGS)" CONFIGURE_OPTIONS += CPPFLAGS="$(CPPFLAGS)" +CONFIGURE_OPTIONS += LDFLAGS="$(LDFLAGS)" CONFIGURE_OPTIONS += LIBS="-lsocket -lnsl" CONFIGURE_OPTIONS += PYTHON="$(PYTHON)" -CONFIGURE_OPTIONS += --disable-shared -CONFIGURE_OPTIONS += --enable-static -CONFIGURE_OPTIONS += --disable-libtool-lock +CONFIGURE_OPTIONS += --srcdir=$(BUILD_DIR_32) CONFIGURE_OPTIONS += --localstatedir=/var CONFIGURE_OPTIONS += --without-localdirs CONFIGURE_OPTIONS += --with-zenmap @@ -62,7 +63,12 @@ CONFIGURE_OPTIONS += --with-liblua CONFIGURE_OPTIONS += --with-ncat CONFIGURE_OPTIONS += --with-ndiff -CONFIGURE_OPTIONS += am_cv_python_pythondir=$(PYTHON_LIB) + +# pkgdepend doesn't like the first line of a Python script to be: +# '#!/usr/bin/env python' so turn it into '#!/usr/bin/python2.6' +COMPONENT_POST_INSTALL_ACTION += \ + $(GSED) -i -e 's?env python?python2.6?' \ + $(PROTOUSRBINDIR)/uninstall_zenmap # common targets build: $(BUILD_32) diff -r 1d59d8c2a113 -r f20006f42637 components/nmap/nmap.license --- a/components/nmap/nmap.license Mon Feb 18 10:31:06 2013 -0800 +++ b/components/nmap/nmap.license Thu Feb 21 06:43:25 2013 -0800 @@ -1,12 +1,16 @@ ---------------------- -- NMAP v5.51 - ---------------------- +-------------- +- nmap v6.25 - +-------------- Oracle Internal Tracking Number 9217 ------------------------------------------------------------------------ -/**************************************************************************** - * The Nmap Security Scanner is (C) 1996-2009 Insecure.Com LLC. Nmap is * +/*************************************************************************** + * COPYING -- Describes the terms under which Nmap is distributed. A copy * + * of the GNU GPL is appended to this file. * + * * + ***********************IMPORTANT NMAP LICENSE TERMS************************ + * * + * The Nmap Security Scanner is (C) 1996-2012 Insecure.Com LLC. Nmap is * * also a registered trademark of Insecure.Com LLC. This program is free * * software; you may redistribute and/or modify it under the terms of the * * GNU General Public License as published by the Free Software * @@ -16,11 +20,12 @@ * technology into proprietary software, we sell alternative licenses * * (contact sales@insecure.com). Dozens of software vendors already * * license Nmap technology such as host discovery, port scanning, OS * - * detection, and version detection. * + * detection, version detection, and the Nmap Scripting Engine. * * * * Note that the GPL places important restrictions on "derived works", yet * * it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we consider an application to constitute a * + * misunderstandings, we interpret that term as broadly as copyright law * + * allows. For example, we consider an application to constitute a * * "derivative work" for the purpose of this license if it does any of the * * following: * * o Integrates source code from Nmap * @@ -28,31 +33,32 @@ * nmap-os-db or nmap-service-probes. * * o Executes Nmap and parses the results (as opposed to typical shell or * * execution-menu apps, which simply display raw Nmap output and so are * - * not derivative works.) * + * not derivative works.) * * o Integrates/includes/aggregates Nmap into a proprietary executable * * installer, such as those produced by InstallShield. * * o Links to a library or executes a program that does any of the above * * * * The term "Nmap" should be taken to also include any portions or derived * - * works of Nmap. This list is not exclusive, but is meant to clarify our * - * interpretation of derived works with some common examples. Our * - * interpretation applies only to Nmap--we don't speak for other people's * - * GPL works. * + * works of Nmap, as well as other software we distribute under this * + * license such as Zenmap, Ncat, and Nping. This list is not exclusive, * + * but is meant to clarify our interpretation of derived works with some * + * common examples. Our interpretation applies only to Nmap--we don't * + * speak for other people's GPL works. * * * * If you have any questions about the GPL licensing restrictions on using * * Nmap in non-GPL works, we would be happy to help. As mentioned above, * * we also offer alternative license to integrate Nmap into proprietary * * applications and appliances. These contracts have been sold to dozens * * of software vendors, and generally include a perpetual license as well * - * as providing for priority support and updates as well as helping to * - * fund the continued development of Nmap technology. Please email * - * sales@insecure.com for further information. * + * as providing for priority support and updates. They also fund the * + * continued development of Nmap. Please email sales@insecure.com for * + * further information. * * * * As a special exception to the GPL terms, Insecure.Com LLC grants * * permission to link the code of this program with any version of the * * OpenSSL library which is distributed under a license identical to that * - * listed in the included COPYING.OpenSSL file, and distribute linked * - * combinations including the two. You must obey the GNU GPL in all * + * listed in the included docs/licenses/OpenSSL.txt file, and distribute * + * linked combinations including the two. You must obey the GNU GPL in all * * respects for all of the code used other than OpenSSL. If you modify * * this file, you may extend this exception to your version of the file, * * but you are not obligated to do so. * @@ -70,15 +76,16 @@ * and add new features. You are highly encouraged to send your changes * * to nmap-dev@insecure.org for possible incorporation into the main * * distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, it is assumed that you are * - * offering the Nmap Project (Insecure.Com LLC) the unlimited, * - * non-exclusive right to reuse, modify, and relicense the code. Nmap * - * will always be available Open Source, but this is important because the * - * inability to relicense code has caused devastating problems for other * - * Free Software projects (such as KDE and NASM). We also occasionally * - * relicense the code to third parties as discussed above. If you wish to * - * specify special license conditions of your contributions, just say so * - * when you send them. * + * Insecure.Org development mailing lists, or checking them into the Nmap * + * source code repository, it is understood (unless you specify otherwise) * + * that you are offering the Nmap Project (Insecure.Com LLC) the * + * unlimited, non-exclusive right to reuse, modify, and relicense the * + * code. Nmap will always be available Open Source, but this is important * + * because the inability to relicense code has caused devastating problems * + * for other Free Software projects (such as KDE and NASM). We also * + * occasionally relicense the code to third parties as discussed above. * + * If you wish to specify special license conditions of your * + * contributions, just say so when you send them. * * * * This program is distributed in the hope that it will be useful, but * * WITHOUT ANY WARRANTY; without even the implied warranty of * @@ -560,4 +567,3 @@ * derivative of this code cannot be changed. i.e. this code cannot simply be * copied and put under another distribution licence * [including the GNU Public Licence.] - diff -r 1d59d8c2a113 -r f20006f42637 components/nmap/nmap.p5m --- a/components/nmap/nmap.p5m Mon Feb 18 10:31:06 2013 -0800 +++ b/components/nmap/nmap.p5m Thu Feb 21 06:43:25 2013 -0800 @@ -18,78 +18,53 @@ # # CDDL HEADER END # -# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. # default mangler.man.stability volatile> +# Pull vendor-packages files from site-packages because nmap build installs +# them there and doesn't offer an overide. + \ + set action.hash %<\1>/site-packages/%<\2> > + set name=pkg.fmri \ value=pkg:/diagnostic/nmap@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.summary \ + value="Network exploration tool and security / port scanner." set name=pkg.description \ value="Nmap is useful for inventorying the network, managing service upgrade schedules, and monitoring host or service uptime." -set name=pkg.summary \ - value="Network exploration tool and security / port scanner." set name=info.classification \ value="org.opensolaris.category.2008:System/Administration and Configuration" set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) set name=org.opensolaris.arc-caseid value=PSARC/2007/129 set name=org.opensolaris.consolidation value=$(CONSOLIDATION) -dir path=usr -dir path=usr/bin -dir path=usr/lib -dir path=usr/lib/python2.6 -dir path=usr/lib/python2.6/vendor-packages -dir path=usr/lib/python2.6/vendor-packages/radialnet -dir path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets -dir path=usr/lib/python2.6/vendor-packages/radialnet/core -dir path=usr/lib/python2.6/vendor-packages/radialnet/gui -dir path=usr/lib/python2.6/vendor-packages/radialnet/util -dir path=usr/lib/python2.6/vendor-packages/zenmapCore -dir path=usr/lib/python2.6/vendor-packages/zenmapGUI -dir path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets -dir path=usr/share -dir path=usr/share/applications -dir path=usr/share/man -dir path=usr/share/man/man1 -dir path=usr/share/ncat -dir path=usr/share/nmap -dir path=usr/share/nmap/nselib -dir path=usr/share/nmap/nselib/data -dir path=usr/share/nmap/nselib/data/psexec -dir path=usr/share/nmap/scripts -dir path=usr/share/zenmap -dir path=usr/share/zenmap/config -dir path=usr/share/zenmap/docs -dir path=usr/share/zenmap/locale -dir path=usr/share/zenmap/locale/de -dir path=usr/share/zenmap/locale/de/LC_MESSAGES -dir path=usr/share/zenmap/locale/fr -dir path=usr/share/zenmap/locale/fr/LC_MESSAGES -dir path=usr/share/zenmap/locale/hr -dir path=usr/share/zenmap/locale/hr/LC_MESSAGES -dir path=usr/share/zenmap/locale/pt_BR -dir path=usr/share/zenmap/locale/pt_BR/LC_MESSAGES -dir path=usr/share/zenmap/locale/ru -dir path=usr/share/zenmap/locale/ru/LC_MESSAGES -dir path=usr/share/zenmap/misc -dir path=usr/share/zenmap/pixmaps -dir path=usr/share/zenmap/pixmaps/radialnet +dir path=usr +dir path=usr/bin file path=usr/bin/ncat file path=usr/bin/ndiff file path=usr/bin/nmap +link path=usr/bin/nmapfe target=zenmap file path=usr/bin/nping +file path=usr/bin/uninstall_zenmap +link path=usr/bin/xnmap target=zenmap file path=usr/bin/zenmap +dir path=usr/lib +dir path=usr/lib/python2.6 +dir path=usr/lib/python2.6/vendor-packages +dir path=usr/lib/python2.6/vendor-packages/radialnet file path=usr/lib/python2.6/vendor-packages/radialnet/__init__.py +dir path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/__init__.py file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/boxes.py file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/buttons.py -file \ - path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/comboboxes.py +file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/comboboxes.py file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/expanders.py file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/frames.py file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/labels.py file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/textview.py file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/windows.py +dir path=usr/lib/python2.6/vendor-packages/radialnet/core file path=usr/lib/python2.6/vendor-packages/radialnet/core/ArgvHandle.py file path=usr/lib/python2.6/vendor-packages/radialnet/core/Coordinate.py file path=usr/lib/python2.6/vendor-packages/radialnet/core/Graph.py @@ -97,6 +72,7 @@ file path=usr/lib/python2.6/vendor-packages/radialnet/core/Interpolation.py file path=usr/lib/python2.6/vendor-packages/radialnet/core/XMLHandler.py file path=usr/lib/python2.6/vendor-packages/radialnet/core/__init__.py +dir path=usr/lib/python2.6/vendor-packages/radialnet/gui file path=usr/lib/python2.6/vendor-packages/radialnet/gui/Application.py file path=usr/lib/python2.6/vendor-packages/radialnet/gui/ControlWidget.py file path=usr/lib/python2.6/vendor-packages/radialnet/gui/Dialogs.py @@ -108,15 +84,15 @@ file path=usr/lib/python2.6/vendor-packages/radialnet/gui/SaveDialog.py file path=usr/lib/python2.6/vendor-packages/radialnet/gui/Toolbar.py file path=usr/lib/python2.6/vendor-packages/radialnet/gui/__init__.py +dir path=usr/lib/python2.6/vendor-packages/radialnet/util file path=usr/lib/python2.6/vendor-packages/radialnet/util/__init__.py file path=usr/lib/python2.6/vendor-packages/radialnet/util/drawing.py file path=usr/lib/python2.6/vendor-packages/radialnet/util/geometry.py file path=usr/lib/python2.6/vendor-packages/radialnet/util/integration.py file path=usr/lib/python2.6/vendor-packages/radialnet/util/misc.py -file \ - path=usr/lib/python2.6/vendor-packages/zenmap-$(COMPONENT_VERSION)-py2.6.egg-info +file path=usr/lib/python2.6/vendor-packages/zenmap-$(COMPONENT_VERSION)-py2.6.egg-info +dir path=usr/lib/python2.6/vendor-packages/zenmapCore file path=usr/lib/python2.6/vendor-packages/zenmapCore/BasePaths.py -file path=usr/lib/python2.6/vendor-packages/zenmapCore/BugRegister.py file path=usr/lib/python2.6/vendor-packages/zenmapCore/Diff.py file path=usr/lib/python2.6/vendor-packages/zenmapCore/I18N.py file path=usr/lib/python2.6/vendor-packages/zenmapCore/NSEDocParser.py @@ -141,6 +117,7 @@ file path=usr/lib/python2.6/vendor-packages/zenmapCore/UmitOptionParser.py file path=usr/lib/python2.6/vendor-packages/zenmapCore/Version.py file path=usr/lib/python2.6/vendor-packages/zenmapCore/__init__.py +dir path=usr/lib/python2.6/vendor-packages/zenmapGUI file path=usr/lib/python2.6/vendor-packages/zenmapGUI/About.py file path=usr/lib/python2.6/vendor-packages/zenmapGUI/App.py \ pkg.depend.bypass-generate=.* @@ -177,38 +154,41 @@ file path=usr/lib/python2.6/vendor-packages/zenmapGUI/TargetCombo.py file path=usr/lib/python2.6/vendor-packages/zenmapGUI/TopologyPage.py file path=usr/lib/python2.6/vendor-packages/zenmapGUI/__init__.py +dir path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/__init__.py file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/gtkutils.py file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higboxes.py file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higbuttons.py file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higdialogs.py file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higentries.py -file \ - path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higexpanders.py +file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higexpanders.py file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higframe.py file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higlabels.py -file \ - path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higlogindialogs.py -file \ - path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/hignotebooks.py -file \ - path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higprogressbars.py -file \ - path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higscrollers.py +file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higlogindialogs.py +file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/hignotebooks.py +file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higprogressbars.py +file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higscrollers.py file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higspinner.py file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higtables.py -file \ - path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higtextviewers.py +file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higtextviewers.py file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higwindows.py file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/utils.py +dir path=usr/share +dir path=usr/share/applications file path=usr/share/applications/zenmap-root.desktop file path=usr/share/applications/zenmap.desktop +dir path=usr/share/man +dir path=usr/share/man/man1 file path=usr/share/man/man1/ncat.1 file path=usr/share/man/man1/ndiff.1 file path=usr/share/man/man1/nmap.1 +link path=usr/share/man/man1/nmapfe.1 target=zenmap.1 file path=usr/share/man/man1/nping.1 +link path=usr/share/man/man1/xnmap.1 target=zenmap.1 file path=usr/share/man/man1/zenmap.1 +dir path=usr/share/ncat file path=usr/share/ncat/ca-bundle.crt +dir path=usr/share/nmap file path=usr/share/nmap/nmap-mac-prefixes file path=usr/share/nmap/nmap-os-db file path=usr/share/nmap/nmap-payloads @@ -219,73 +199,167 @@ file path=usr/share/nmap/nmap.dtd file path=usr/share/nmap/nmap.xsl file path=usr/share/nmap/nse_main.lua +dir path=usr/share/nmap/nselib file path=usr/share/nmap/nselib/afp.lua +file path=usr/share/nmap/nselib/ajp.lua +file path=usr/share/nmap/nselib/amqp.lua file path=usr/share/nmap/nselib/asn1.lua +file path=usr/share/nmap/nselib/base32.lua file path=usr/share/nmap/nselib/base64.lua +file path=usr/share/nmap/nselib/bitcoin.lua +file path=usr/share/nmap/nselib/bittorrent.lua +file path=usr/share/nmap/nselib/bjnp.lua file path=usr/share/nmap/nselib/brute.lua +file path=usr/share/nmap/nselib/cassandra.lua file path=usr/share/nmap/nselib/citrixxml.lua file path=usr/share/nmap/nselib/comm.lua +file path=usr/share/nmap/nselib/creds.lua +file path=usr/share/nmap/nselib/cvs.lua +dir path=usr/share/nmap/nselib/data +dir path=usr/share/nmap/nselib/data/jdwp-class +dir path=usr/share/nmap/nselib/data/psexec file path=usr/share/nmap/nselib/datafiles.lua file path=usr/share/nmap/nselib/dhcp.lua +file path=usr/share/nmap/nselib/dhcp6.lua file path=usr/share/nmap/nselib/dns.lua +file path=usr/share/nmap/nselib/dnsbl.lua file path=usr/share/nmap/nselib/dnssd.lua file path=usr/share/nmap/nselib/drda.lua +file path=usr/share/nmap/nselib/eap.lua +file path=usr/share/nmap/nselib/eigrp.lua file path=usr/share/nmap/nselib/ftp.lua file path=usr/share/nmap/nselib/giop.lua +file path=usr/share/nmap/nselib/gps.lua file path=usr/share/nmap/nselib/http.lua +file path=usr/share/nmap/nselib/httpspider.lua +file path=usr/share/nmap/nselib/iax2.lua file path=usr/share/nmap/nselib/imap.lua file path=usr/share/nmap/nselib/informix.lua file path=usr/share/nmap/nselib/ipOps.lua +file path=usr/share/nmap/nselib/ipp.lua file path=usr/share/nmap/nselib/iscsi.lua +file path=usr/share/nmap/nselib/isns.lua +file path=usr/share/nmap/nselib/jdwp.lua file path=usr/share/nmap/nselib/json.lua file path=usr/share/nmap/nselib/ldap.lua file path=usr/share/nmap/nselib/listop.lua file path=usr/share/nmap/nselib/match.lua +file path=usr/share/nmap/nselib/membase.lua +file path=usr/share/nmap/nselib/mobileme.lua file path=usr/share/nmap/nselib/mongodb.lua file path=usr/share/nmap/nselib/msrpc.lua file path=usr/share/nmap/nselib/msrpcperformance.lua file path=usr/share/nmap/nselib/msrpctypes.lua file path=usr/share/nmap/nselib/mssql.lua file path=usr/share/nmap/nselib/mysql.lua +file path=usr/share/nmap/nselib/natpmp.lua +file path=usr/share/nmap/nselib/ncp.lua +file path=usr/share/nmap/nselib/ndmp.lua file path=usr/share/nmap/nselib/netbios.lua file path=usr/share/nmap/nselib/nrpc.lua file path=usr/share/nmap/nselib/nsedebug.lua +file path=usr/share/nmap/nselib/omp2.lua +file path=usr/share/nmap/nselib/ospf.lua file path=usr/share/nmap/nselib/packet.lua file path=usr/share/nmap/nselib/pgsql.lua file path=usr/share/nmap/nselib/pop3.lua +file path=usr/share/nmap/nselib/pppoe.lua file path=usr/share/nmap/nselib/proxy.lua +file path=usr/share/nmap/nselib/rdp.lua +file path=usr/share/nmap/nselib/redis.lua file path=usr/share/nmap/nselib/rmi.lua file path=usr/share/nmap/nselib/rpc.lua +file path=usr/share/nmap/nselib/rpcap.lua +file path=usr/share/nmap/nselib/rsync.lua +file path=usr/share/nmap/nselib/rtsp.lua +file path=usr/share/nmap/nselib/sasl.lua file path=usr/share/nmap/nselib/shortport.lua +file path=usr/share/nmap/nselib/sip.lua file path=usr/share/nmap/nselib/smb.lua file path=usr/share/nmap/nselib/smbauth.lua +file path=usr/share/nmap/nselib/smtp.lua file path=usr/share/nmap/nselib/snmp.lua +file path=usr/share/nmap/nselib/socks.lua +file path=usr/share/nmap/nselib/srvloc.lua file path=usr/share/nmap/nselib/ssh1.lua file path=usr/share/nmap/nselib/ssh2.lua +file path=usr/share/nmap/nselib/sslcert.lua file path=usr/share/nmap/nselib/stdnse.lua file path=usr/share/nmap/nselib/strbuf.lua file path=usr/share/nmap/nselib/strict.lua +file path=usr/share/nmap/nselib/stun.lua file path=usr/share/nmap/nselib/tab.lua file path=usr/share/nmap/nselib/target.lua +file path=usr/share/nmap/nselib/tftp.lua file path=usr/share/nmap/nselib/tns.lua file path=usr/share/nmap/nselib/unpwdb.lua file path=usr/share/nmap/nselib/upnp.lua file path=usr/share/nmap/nselib/url.lua +file path=usr/share/nmap/nselib/versant.lua file path=usr/share/nmap/nselib/vnc.lua +file path=usr/share/nmap/nselib/vulns.lua +file path=usr/share/nmap/nselib/vuzedht.lua file path=usr/share/nmap/nselib/wsdd.lua +file path=usr/share/nmap/nselib/xdmcp.lua +file path=usr/share/nmap/nselib/xmpp.lua +dir path=usr/share/nmap/scripts +file path=usr/share/nmap/scripts/acarsd-info.nse +file path=usr/share/nmap/scripts/address-info.nse file path=usr/share/nmap/scripts/afp-brute.nse +file path=usr/share/nmap/scripts/afp-ls.nse file path=usr/share/nmap/scripts/afp-path-vuln.nse file path=usr/share/nmap/scripts/afp-serverinfo.nse file path=usr/share/nmap/scripts/afp-showmount.nse +file path=usr/share/nmap/scripts/ajp-auth.nse +file path=usr/share/nmap/scripts/ajp-brute.nse +file path=usr/share/nmap/scripts/ajp-headers.nse +file path=usr/share/nmap/scripts/ajp-methods.nse +file path=usr/share/nmap/scripts/ajp-request.nse +file path=usr/share/nmap/scripts/amqp-info.nse file path=usr/share/nmap/scripts/asn-query.nse file path=usr/share/nmap/scripts/auth-owners.nse file path=usr/share/nmap/scripts/auth-spoof.nse +file path=usr/share/nmap/scripts/backorifice-brute.nse +file path=usr/share/nmap/scripts/backorifice-info.nse file path=usr/share/nmap/scripts/banner.nse +file path=usr/share/nmap/scripts/bitcoin-getaddr.nse +file path=usr/share/nmap/scripts/bitcoin-info.nse +file path=usr/share/nmap/scripts/bitcoinrpc-info.nse +file path=usr/share/nmap/scripts/bittorrent-discovery.nse +file path=usr/share/nmap/scripts/bjnp-discover.nse +file path=usr/share/nmap/scripts/broadcast-ataoe-discover.nse +file path=usr/share/nmap/scripts/broadcast-avahi-dos.nse +file path=usr/share/nmap/scripts/broadcast-bjnp-discover.nse +file path=usr/share/nmap/scripts/broadcast-db2-discover.nse +file path=usr/share/nmap/scripts/broadcast-dhcp-discover.nse +file path=usr/share/nmap/scripts/broadcast-dhcp6-discover.nse file path=usr/share/nmap/scripts/broadcast-dns-service-discovery.nse file path=usr/share/nmap/scripts/broadcast-dropbox-listener.nse +file path=usr/share/nmap/scripts/broadcast-eigrp-discovery.nse +file path=usr/share/nmap/scripts/broadcast-igmp-discovery.nse +file path=usr/share/nmap/scripts/broadcast-listener.nse file path=usr/share/nmap/scripts/broadcast-ms-sql-discover.nse +file path=usr/share/nmap/scripts/broadcast-netbios-master-browser.nse +file path=usr/share/nmap/scripts/broadcast-networker-discover.nse +file path=usr/share/nmap/scripts/broadcast-novell-locate.nse +file path=usr/share/nmap/scripts/broadcast-pc-anywhere.nse +file path=usr/share/nmap/scripts/broadcast-pc-duo.nse +file path=usr/share/nmap/scripts/broadcast-pim-discovery.nse +file path=usr/share/nmap/scripts/broadcast-ping.nse +file path=usr/share/nmap/scripts/broadcast-pppoe-discover.nse +file path=usr/share/nmap/scripts/broadcast-rip-discover.nse +file path=usr/share/nmap/scripts/broadcast-ripng-discover.nse +file path=usr/share/nmap/scripts/broadcast-sybase-asa-discover.nse +file path=usr/share/nmap/scripts/broadcast-tellstick-discover.nse file path=usr/share/nmap/scripts/broadcast-upnp-info.nse +file path=usr/share/nmap/scripts/broadcast-versant-locate.nse +file path=usr/share/nmap/scripts/broadcast-wake-on-lan.nse +file path=usr/share/nmap/scripts/broadcast-wpad-discover.nse file path=usr/share/nmap/scripts/broadcast-wsdd-discover.nse +file path=usr/share/nmap/scripts/broadcast-xdmcp-discover.nse +file path=usr/share/nmap/scripts/cassandra-brute.nse +file path=usr/share/nmap/scripts/cassandra-info.nse +file path=usr/share/nmap/scripts/cccam-version.nse file path=usr/share/nmap/scripts/citrix-brute-xml.nse file path=usr/share/nmap/scripts/citrix-enum-apps-xml.nse file path=usr/share/nmap/scripts/citrix-enum-apps.nse @@ -293,115 +367,291 @@ file path=usr/share/nmap/scripts/citrix-enum-servers.nse file path=usr/share/nmap/scripts/couchdb-databases.nse file path=usr/share/nmap/scripts/couchdb-stats.nse +file path=usr/share/nmap/scripts/creds-summary.nse +file path=usr/share/nmap/scripts/cups-info.nse +file path=usr/share/nmap/scripts/cups-queue-info.nse +file path=usr/share/nmap/scripts/cvs-brute-repository.nse +file path=usr/share/nmap/scripts/cvs-brute.nse file path=usr/share/nmap/scripts/daap-get-library.nse file path=usr/share/nmap/scripts/daytime.nse file path=usr/share/nmap/scripts/db2-das-info.nse file path=usr/share/nmap/scripts/db2-discover.nse file path=usr/share/nmap/scripts/dhcp-discover.nse +file path=usr/share/nmap/scripts/dict-info.nse +file path=usr/share/nmap/scripts/distcc-cve2004-2687.nse +file path=usr/share/nmap/scripts/dns-blacklist.nse +file path=usr/share/nmap/scripts/dns-brute.nse file path=usr/share/nmap/scripts/dns-cache-snoop.nse +file path=usr/share/nmap/scripts/dns-check-zone.nse +file path=usr/share/nmap/scripts/dns-client-subnet-scan.nse file path=usr/share/nmap/scripts/dns-fuzz.nse +file path=usr/share/nmap/scripts/dns-ip6-arpa-scan.nse +file path=usr/share/nmap/scripts/dns-nsec-enum.nse +file path=usr/share/nmap/scripts/dns-nsec3-enum.nse +file path=usr/share/nmap/scripts/dns-nsid.nse file path=usr/share/nmap/scripts/dns-random-srcport.nse file path=usr/share/nmap/scripts/dns-random-txid.nse file path=usr/share/nmap/scripts/dns-recursion.nse file path=usr/share/nmap/scripts/dns-service-discovery.nse +file path=usr/share/nmap/scripts/dns-srv-enum.nse file path=usr/share/nmap/scripts/dns-update.nse +file path=usr/share/nmap/scripts/dns-zeustracker.nse file path=usr/share/nmap/scripts/dns-zone-transfer.nse file path=usr/share/nmap/scripts/domcon-brute.nse file path=usr/share/nmap/scripts/domcon-cmd.nse file path=usr/share/nmap/scripts/domino-enum-users.nse +file path=usr/share/nmap/scripts/dpap-brute.nse file path=usr/share/nmap/scripts/drda-brute.nse file path=usr/share/nmap/scripts/drda-info.nse +file path=usr/share/nmap/scripts/duplicates.nse +file path=usr/share/nmap/scripts/eap-info.nse +file path=usr/share/nmap/scripts/epmd-info.nse +file path=usr/share/nmap/scripts/eppc-enum-processes.nse file path=usr/share/nmap/scripts/finger.nse file path=usr/share/nmap/scripts/firewalk.nse +file path=usr/share/nmap/scripts/firewall-bypass.nse +file path=usr/share/nmap/scripts/flume-master-info.nse file path=usr/share/nmap/scripts/ftp-anon.nse file path=usr/share/nmap/scripts/ftp-bounce.nse file path=usr/share/nmap/scripts/ftp-brute.nse file path=usr/share/nmap/scripts/ftp-libopie.nse file path=usr/share/nmap/scripts/ftp-proftpd-backdoor.nse +file path=usr/share/nmap/scripts/ftp-vsftpd-backdoor.nse +file path=usr/share/nmap/scripts/ftp-vuln-cve2010-4221.nse +file path=usr/share/nmap/scripts/ganglia-info.nse file path=usr/share/nmap/scripts/giop-info.nse +file path=usr/share/nmap/scripts/gkrellm-info.nse file path=usr/share/nmap/scripts/gopher-ls.nse +file path=usr/share/nmap/scripts/gpsd-info.nse +file path=usr/share/nmap/scripts/hadoop-datanode-info.nse +file path=usr/share/nmap/scripts/hadoop-jobtracker-info.nse +file path=usr/share/nmap/scripts/hadoop-namenode-info.nse +file path=usr/share/nmap/scripts/hadoop-secondary-namenode-info.nse +file path=usr/share/nmap/scripts/hadoop-tasktracker-info.nse +file path=usr/share/nmap/scripts/hbase-master-info.nse +file path=usr/share/nmap/scripts/hbase-region-info.nse file path=usr/share/nmap/scripts/hddtemp-info.nse -file path=usr/share/nmap/scripts/hostmap.nse +file path=usr/share/nmap/scripts/hostmap-bfk.nse +file path=usr/share/nmap/scripts/hostmap-robtex.nse +file path=usr/share/nmap/scripts/http-affiliate-id.nse +file path=usr/share/nmap/scripts/http-apache-negotiation.nse +file path=usr/share/nmap/scripts/http-auth-finder.nse file path=usr/share/nmap/scripts/http-auth.nse +file path=usr/share/nmap/scripts/http-awstatstotals-exec.nse +file path=usr/share/nmap/scripts/http-axis2-dir-traversal.nse +file path=usr/share/nmap/scripts/http-backup-finder.nse +file path=usr/share/nmap/scripts/http-barracuda-dir-traversal.nse file path=usr/share/nmap/scripts/http-brute.nse +file path=usr/share/nmap/scripts/http-cakephp-version.nse +file path=usr/share/nmap/scripts/http-chrono.nse +file path=usr/share/nmap/scripts/http-config-backup.nse +file path=usr/share/nmap/scripts/http-cors.nse file path=usr/share/nmap/scripts/http-date.nse +file path=usr/share/nmap/scripts/http-default-accounts.nse file path=usr/share/nmap/scripts/http-domino-enum-passwords.nse +file path=usr/share/nmap/scripts/http-drupal-enum-users.nse +file path=usr/share/nmap/scripts/http-drupal-modules.nse +file path=usr/share/nmap/scripts/http-email-harvest.nse file path=usr/share/nmap/scripts/http-enum.nse +file path=usr/share/nmap/scripts/http-exif-spider.nse file path=usr/share/nmap/scripts/http-favicon.nse file path=usr/share/nmap/scripts/http-form-brute.nse +file path=usr/share/nmap/scripts/http-form-fuzzer.nse +file path=usr/share/nmap/scripts/http-frontpage-login.nse +file path=usr/share/nmap/scripts/http-generator.nse +file path=usr/share/nmap/scripts/http-git.nse +file path=usr/share/nmap/scripts/http-gitweb-projects-enum.nse +file path=usr/share/nmap/scripts/http-google-malware.nse +file path=usr/share/nmap/scripts/http-grep.nse file path=usr/share/nmap/scripts/http-headers.nse +file path=usr/share/nmap/scripts/http-huawei-hg5xx-vuln.nse +file path=usr/share/nmap/scripts/http-icloud-findmyiphone.nse +file path=usr/share/nmap/scripts/http-icloud-sendmsg.nse file path=usr/share/nmap/scripts/http-iis-webdav-vuln.nse +file path=usr/share/nmap/scripts/http-joomla-brute.nse +file path=usr/share/nmap/scripts/http-litespeed-sourcecode-download.nse +file path=usr/share/nmap/scripts/http-majordomo2-dir-traversal.nse file path=usr/share/nmap/scripts/http-malware-host.nse +file path=usr/share/nmap/scripts/http-method-tamper.nse file path=usr/share/nmap/scripts/http-methods.nse file path=usr/share/nmap/scripts/http-open-proxy.nse +file path=usr/share/nmap/scripts/http-open-redirect.nse file path=usr/share/nmap/scripts/http-passwd.nse file path=usr/share/nmap/scripts/http-php-version.nse +file path=usr/share/nmap/scripts/http-phpself-xss.nse +file path=usr/share/nmap/scripts/http-proxy-brute.nse +file path=usr/share/nmap/scripts/http-put.nse +file path=usr/share/nmap/scripts/http-qnap-nas-info.nse +file path=usr/share/nmap/scripts/http-rfi-spider.nse file path=usr/share/nmap/scripts/http-robots.txt.nse +file path=usr/share/nmap/scripts/http-robtex-reverse-ip.nse +file path=usr/share/nmap/scripts/http-robtex-shared-ns.nse +file path=usr/share/nmap/scripts/http-sitemap-generator.nse +file path=usr/share/nmap/scripts/http-slowloris-check.nse +file path=usr/share/nmap/scripts/http-slowloris.nse +file path=usr/share/nmap/scripts/http-sql-injection.nse file path=usr/share/nmap/scripts/http-title.nse +file path=usr/share/nmap/scripts/http-tplink-dir-traversal.nse file path=usr/share/nmap/scripts/http-trace.nse +file path=usr/share/nmap/scripts/http-traceroute.nse +file path=usr/share/nmap/scripts/http-unsafe-output-escaping.nse file path=usr/share/nmap/scripts/http-userdir-enum.nse file path=usr/share/nmap/scripts/http-vhosts.nse +file path=usr/share/nmap/scripts/http-virustotal.nse +file path=usr/share/nmap/scripts/http-vlcstreamer-ls.nse file path=usr/share/nmap/scripts/http-vmware-path-vuln.nse +file path=usr/share/nmap/scripts/http-vuln-cve2009-3960.nse +file path=usr/share/nmap/scripts/http-vuln-cve2010-0738.nse +file path=usr/share/nmap/scripts/http-vuln-cve2010-2861.nse +file path=usr/share/nmap/scripts/http-vuln-cve2011-3192.nse +file path=usr/share/nmap/scripts/http-vuln-cve2011-3368.nse +file path=usr/share/nmap/scripts/http-vuln-cve2012-1823.nse +file path=usr/share/nmap/scripts/http-waf-detect.nse +file path=usr/share/nmap/scripts/http-waf-fingerprint.nse +file path=usr/share/nmap/scripts/http-wordpress-brute.nse +file path=usr/share/nmap/scripts/http-wordpress-enum.nse +file path=usr/share/nmap/scripts/http-wordpress-plugins.nse +file path=usr/share/nmap/scripts/iax2-brute.nse file path=usr/share/nmap/scripts/iax2-version.nse +file path=usr/share/nmap/scripts/icap-info.nse +file path=usr/share/nmap/scripts/imap-brute.nse file path=usr/share/nmap/scripts/imap-capabilities.nse file path=usr/share/nmap/scripts/informix-brute.nse file path=usr/share/nmap/scripts/informix-query.nse file path=usr/share/nmap/scripts/informix-tables.nse +file path=usr/share/nmap/scripts/ip-forwarding.nse +file path=usr/share/nmap/scripts/ip-geolocation-geobytes.nse +file path=usr/share/nmap/scripts/ip-geolocation-geoplugin.nse +file path=usr/share/nmap/scripts/ip-geolocation-ipinfodb.nse +file path=usr/share/nmap/scripts/ip-geolocation-maxmind.nse file path=usr/share/nmap/scripts/ipidseq.nse +file path=usr/share/nmap/scripts/ipv6-node-info.nse +file path=usr/share/nmap/scripts/ipv6-ra-flood.nse +file path=usr/share/nmap/scripts/irc-botnet-channels.nse +file path=usr/share/nmap/scripts/irc-brute.nse file path=usr/share/nmap/scripts/irc-info.nse +file path=usr/share/nmap/scripts/irc-sasl-brute.nse file path=usr/share/nmap/scripts/irc-unrealircd-backdoor.nse file path=usr/share/nmap/scripts/iscsi-brute.nse file path=usr/share/nmap/scripts/iscsi-info.nse +file path=usr/share/nmap/scripts/isns-info.nse +file path=usr/share/nmap/scripts/jdwp-exec.nse +file path=usr/share/nmap/scripts/jdwp-info.nse +file path=usr/share/nmap/scripts/jdwp-inject.nse file path=usr/share/nmap/scripts/jdwp-version.nse +file path=usr/share/nmap/scripts/krb5-enum-users.nse file path=usr/share/nmap/scripts/ldap-brute.nse +file path=usr/share/nmap/scripts/ldap-novell-getpass.nse file path=usr/share/nmap/scripts/ldap-rootdse.nse file path=usr/share/nmap/scripts/ldap-search.nse file path=usr/share/nmap/scripts/lexmark-config.nse +file path=usr/share/nmap/scripts/llmnr-resolve.nse +file path=usr/share/nmap/scripts/lltd-discovery.nse +file path=usr/share/nmap/scripts/maxdb-info.nse +file path=usr/share/nmap/scripts/mcafee-epo-agent.nse +file path=usr/share/nmap/scripts/membase-brute.nse +file path=usr/share/nmap/scripts/membase-http-info.nse +file path=usr/share/nmap/scripts/memcached-info.nse +file path=usr/share/nmap/scripts/metasploit-info.nse +file path=usr/share/nmap/scripts/metasploit-msgrpc-brute.nse +file path=usr/share/nmap/scripts/metasploit-xmlrpc-brute.nse +file path=usr/share/nmap/scripts/mmouse-brute.nse +file path=usr/share/nmap/scripts/mmouse-exec.nse file path=usr/share/nmap/scripts/modbus-discover.nse +file path=usr/share/nmap/scripts/mongodb-brute.nse file path=usr/share/nmap/scripts/mongodb-databases.nse file path=usr/share/nmap/scripts/mongodb-info.nse +file path=usr/share/nmap/scripts/mrinfo.nse file path=usr/share/nmap/scripts/ms-sql-brute.nse file path=usr/share/nmap/scripts/ms-sql-config.nse +file path=usr/share/nmap/scripts/ms-sql-dac.nse +file path=usr/share/nmap/scripts/ms-sql-dump-hashes.nse file path=usr/share/nmap/scripts/ms-sql-empty-password.nse file path=usr/share/nmap/scripts/ms-sql-hasdbaccess.nse file path=usr/share/nmap/scripts/ms-sql-info.nse file path=usr/share/nmap/scripts/ms-sql-query.nse file path=usr/share/nmap/scripts/ms-sql-tables.nse file path=usr/share/nmap/scripts/ms-sql-xp-cmdshell.nse +file path=usr/share/nmap/scripts/msrpc-enum.nse +file path=usr/share/nmap/scripts/mtrace.nse +file path=usr/share/nmap/scripts/mysql-audit.nse file path=usr/share/nmap/scripts/mysql-brute.nse file path=usr/share/nmap/scripts/mysql-databases.nse +file path=usr/share/nmap/scripts/mysql-dump-hashes.nse file path=usr/share/nmap/scripts/mysql-empty-password.nse file path=usr/share/nmap/scripts/mysql-info.nse +file path=usr/share/nmap/scripts/mysql-query.nse file path=usr/share/nmap/scripts/mysql-users.nse file path=usr/share/nmap/scripts/mysql-variables.nse +file path=usr/share/nmap/scripts/mysql-vuln-cve2012-2122.nse file path=usr/share/nmap/scripts/nat-pmp-info.nse +file path=usr/share/nmap/scripts/nat-pmp-mapport.nse file path=usr/share/nmap/scripts/nbstat.nse +file path=usr/share/nmap/scripts/ncp-enum-users.nse +file path=usr/share/nmap/scripts/ncp-serverinfo.nse +file path=usr/share/nmap/scripts/ndmp-fs-info.nse +file path=usr/share/nmap/scripts/ndmp-version.nse +file path=usr/share/nmap/scripts/nessus-brute.nse +file path=usr/share/nmap/scripts/nessus-xmlrpc-brute.nse file path=usr/share/nmap/scripts/netbus-auth-bypass.nse file path=usr/share/nmap/scripts/netbus-brute.nse file path=usr/share/nmap/scripts/netbus-info.nse file path=usr/share/nmap/scripts/netbus-version.nse +file path=usr/share/nmap/scripts/nexpose-brute.nse file path=usr/share/nmap/scripts/nfs-ls.nse file path=usr/share/nmap/scripts/nfs-showmount.nse file path=usr/share/nmap/scripts/nfs-statfs.nse +file path=usr/share/nmap/scripts/nping-brute.nse file path=usr/share/nmap/scripts/nrpe-enum.nse file path=usr/share/nmap/scripts/ntp-info.nse file path=usr/share/nmap/scripts/ntp-monlist.nse +file path=usr/share/nmap/scripts/omp2-brute.nse +file path=usr/share/nmap/scripts/omp2-enum-targets.nse +file path=usr/share/nmap/scripts/openlookup-info.nse +file path=usr/share/nmap/scripts/openvas-otp-brute.nse +file path=usr/share/nmap/scripts/oracle-brute-stealth.nse file path=usr/share/nmap/scripts/oracle-brute.nse file path=usr/share/nmap/scripts/oracle-enum-users.nse file path=usr/share/nmap/scripts/oracle-sid-brute.nse +file path=usr/share/nmap/scripts/ovs-agent-version.nse file path=usr/share/nmap/scripts/p2p-conficker.nse file path=usr/share/nmap/scripts/path-mtu.nse +file path=usr/share/nmap/scripts/pcanywhere-brute.nse file path=usr/share/nmap/scripts/pgsql-brute.nse file path=usr/share/nmap/scripts/pjl-ready-message.nse file path=usr/share/nmap/scripts/pop3-brute.nse file path=usr/share/nmap/scripts/pop3-capabilities.nse file path=usr/share/nmap/scripts/pptp-version.nse file path=usr/share/nmap/scripts/qscan.nse +file path=usr/share/nmap/scripts/quake3-info.nse +file path=usr/share/nmap/scripts/quake3-master-getservers.nse +file path=usr/share/nmap/scripts/rdp-enum-encryption.nse +file path=usr/share/nmap/scripts/rdp-vuln-ms12-020.nse file path=usr/share/nmap/scripts/realvnc-auth-bypass.nse +file path=usr/share/nmap/scripts/redis-brute.nse +file path=usr/share/nmap/scripts/redis-info.nse file path=usr/share/nmap/scripts/resolveall.nse +file path=usr/share/nmap/scripts/reverse-index.nse +file path=usr/share/nmap/scripts/rexec-brute.nse +file path=usr/share/nmap/scripts/riak-http-info.nse +file path=usr/share/nmap/scripts/rlogin-brute.nse file path=usr/share/nmap/scripts/rmi-dumpregistry.nse +file path=usr/share/nmap/scripts/rmi-vuln-classloader.nse +file path=usr/share/nmap/scripts/rpc-grind.nse +file path=usr/share/nmap/scripts/rpcap-brute.nse +file path=usr/share/nmap/scripts/rpcap-info.nse file path=usr/share/nmap/scripts/rpcinfo.nse +file path=usr/share/nmap/scripts/rsync-brute.nse +file path=usr/share/nmap/scripts/rsync-list-modules.nse +file path=usr/share/nmap/scripts/rtsp-methods.nse +file path=usr/share/nmap/scripts/rtsp-url-brute.nse +file path=usr/share/nmap/scripts/samba-vuln-cve-2012-1182.nse file path=usr/share/nmap/scripts/script.db +file path=usr/share/nmap/scripts/servicetags.nse +file path=usr/share/nmap/scripts/sip-brute.nse +file path=usr/share/nmap/scripts/sip-call-spoof.nse +file path=usr/share/nmap/scripts/sip-enum-users.nse +file path=usr/share/nmap/scripts/sip-methods.nse file path=usr/share/nmap/scripts/skypev2-version.nse file path=usr/share/nmap/scripts/smb-brute.nse file path=usr/share/nmap/scripts/smb-check-vulns.nse @@ -412,19 +662,30 @@ file path=usr/share/nmap/scripts/smb-enum-shares.nse file path=usr/share/nmap/scripts/smb-enum-users.nse file path=usr/share/nmap/scripts/smb-flood.nse +file path=usr/share/nmap/scripts/smb-ls.nse +file path=usr/share/nmap/scripts/smb-mbenum.nse file path=usr/share/nmap/scripts/smb-os-discovery.nse +file path=usr/share/nmap/scripts/smb-print-text.nse file path=usr/share/nmap/scripts/smb-psexec.nse file path=usr/share/nmap/scripts/smb-security-mode.nse file path=usr/share/nmap/scripts/smb-server-stats.nse file path=usr/share/nmap/scripts/smb-system-info.nse +file path=usr/share/nmap/scripts/smb-vuln-ms10-054.nse +file path=usr/share/nmap/scripts/smb-vuln-ms10-061.nse file path=usr/share/nmap/scripts/smbv2-enabled.nse +file path=usr/share/nmap/scripts/smtp-brute.nse file path=usr/share/nmap/scripts/smtp-commands.nse file path=usr/share/nmap/scripts/smtp-enum-users.nse file path=usr/share/nmap/scripts/smtp-open-relay.nse file path=usr/share/nmap/scripts/smtp-strangeport.nse +file path=usr/share/nmap/scripts/smtp-vuln-cve2010-4344.nse +file path=usr/share/nmap/scripts/smtp-vuln-cve2011-1720.nse +file path=usr/share/nmap/scripts/smtp-vuln-cve2011-1764.nse file path=usr/share/nmap/scripts/sniffer-detect.nse file path=usr/share/nmap/scripts/snmp-brute.nse +file path=usr/share/nmap/scripts/snmp-hh3c-logins.nse file path=usr/share/nmap/scripts/snmp-interfaces.nse +file path=usr/share/nmap/scripts/snmp-ios-config.nse file path=usr/share/nmap/scripts/snmp-netstat.nse file path=usr/share/nmap/scripts/snmp-processes.nse file path=usr/share/nmap/scripts/snmp-sysdescr.nse @@ -432,35 +693,82 @@ file path=usr/share/nmap/scripts/snmp-win32-shares.nse file path=usr/share/nmap/scripts/snmp-win32-software.nse file path=usr/share/nmap/scripts/snmp-win32-users.nse +file path=usr/share/nmap/scripts/socks-auth-info.nse +file path=usr/share/nmap/scripts/socks-brute.nse file path=usr/share/nmap/scripts/socks-open-proxy.nse -file path=usr/share/nmap/scripts/sql-injection.nse file path=usr/share/nmap/scripts/ssh-hostkey.nse file path=usr/share/nmap/scripts/ssh2-enum-algos.nse file path=usr/share/nmap/scripts/sshv1.nse file path=usr/share/nmap/scripts/ssl-cert.nse +file path=usr/share/nmap/scripts/ssl-date.nse file path=usr/share/nmap/scripts/ssl-enum-ciphers.nse +file path=usr/share/nmap/scripts/ssl-google-cert-catalog.nse +file path=usr/share/nmap/scripts/ssl-known-key.nse file path=usr/share/nmap/scripts/sslv2.nse +file path=usr/share/nmap/scripts/stun-info.nse +file path=usr/share/nmap/scripts/stun-version.nse file path=usr/share/nmap/scripts/stuxnet-detect.nse file path=usr/share/nmap/scripts/svn-brute.nse +file path=usr/share/nmap/scripts/targets-asn.nse +file path=usr/share/nmap/scripts/targets-ipv6-multicast-echo.nse +file path=usr/share/nmap/scripts/targets-ipv6-multicast-invalid-dst.nse +file path=usr/share/nmap/scripts/targets-ipv6-multicast-mld.nse +file path=usr/share/nmap/scripts/targets-ipv6-multicast-slaac.nse +file path=usr/share/nmap/scripts/targets-sniffer.nse file path=usr/share/nmap/scripts/targets-traceroute.nse file path=usr/share/nmap/scripts/telnet-brute.nse +file path=usr/share/nmap/scripts/telnet-encryption.nse +file path=usr/share/nmap/scripts/tftp-enum.nse +file path=usr/share/nmap/scripts/tls-nextprotoneg.nse +file path=usr/share/nmap/scripts/traceroute-geolocation.nse +file path=usr/share/nmap/scripts/unusual-port.nse file path=usr/share/nmap/scripts/upnp-info.nse +file path=usr/share/nmap/scripts/url-snarf.nse +file path=usr/share/nmap/scripts/versant-info.nse +file path=usr/share/nmap/scripts/vmauthd-brute.nse file path=usr/share/nmap/scripts/vnc-brute.nse file path=usr/share/nmap/scripts/vnc-info.nse +file path=usr/share/nmap/scripts/voldemort-info.nse +file path=usr/share/nmap/scripts/vuze-dht-info.nse file path=usr/share/nmap/scripts/wdb-version.nse file path=usr/share/nmap/scripts/whois.nse file path=usr/share/nmap/scripts/wsdd-discover.nse file path=usr/share/nmap/scripts/x11-access.nse +file path=usr/share/nmap/scripts/xdmcp-discover.nse +file path=usr/share/nmap/scripts/xmpp-brute.nse +file path=usr/share/nmap/scripts/xmpp-info.nse +dir path=usr/share/zenmap +dir path=usr/share/zenmap/config file path=usr/share/zenmap/config/scan_profile.usp file path=usr/share/zenmap/config/zenmap.conf file path=usr/share/zenmap/config/zenmap_version +dir path=usr/share/zenmap/docs file path=usr/share/zenmap/docs/help.html +dir path=usr/share/zenmap/locale +dir path=usr/share/zenmap/locale/de +dir path=usr/share/zenmap/locale/de/LC_MESSAGES file path=usr/share/zenmap/locale/de/LC_MESSAGES/zenmap.mo +dir path=usr/share/zenmap/locale/fr +dir path=usr/share/zenmap/locale/fr/LC_MESSAGES file path=usr/share/zenmap/locale/fr/LC_MESSAGES/zenmap.mo +dir path=usr/share/zenmap/locale/hr +dir path=usr/share/zenmap/locale/hr/LC_MESSAGES file path=usr/share/zenmap/locale/hr/LC_MESSAGES/zenmap.mo +dir path=usr/share/zenmap/locale/it +dir path=usr/share/zenmap/locale/it/LC_MESSAGES +file path=usr/share/zenmap/locale/it/LC_MESSAGES/zenmap.mo +dir path=usr/share/zenmap/locale/ja +dir path=usr/share/zenmap/locale/ja/LC_MESSAGES +file path=usr/share/zenmap/locale/ja/LC_MESSAGES/zenmap.mo +dir path=usr/share/zenmap/locale/pt_BR +dir path=usr/share/zenmap/locale/pt_BR/LC_MESSAGES file path=usr/share/zenmap/locale/pt_BR/LC_MESSAGES/zenmap.mo +dir path=usr/share/zenmap/locale/ru +dir path=usr/share/zenmap/locale/ru/LC_MESSAGES file path=usr/share/zenmap/locale/ru/LC_MESSAGES/zenmap.mo +dir path=usr/share/zenmap/misc file path=usr/share/zenmap/misc/profile_editor.xml +dir path=usr/share/zenmap/pixmaps file path=usr/share/zenmap/pixmaps/default_32.png file path=usr/share/zenmap/pixmaps/default_75.png file path=usr/share/zenmap/pixmaps/freebsd_32.png @@ -473,6 +781,7 @@ file path=usr/share/zenmap/pixmaps/macosx_75.png file path=usr/share/zenmap/pixmaps/openbsd_32.png file path=usr/share/zenmap/pixmaps/openbsd_75.png +dir path=usr/share/zenmap/pixmaps/radialnet file path=usr/share/zenmap/pixmaps/radialnet/border.png file path=usr/share/zenmap/pixmaps/radialnet/firewall.png file path=usr/share/zenmap/pixmaps/radialnet/logo.png @@ -505,9 +814,3 @@ file path=usr/share/zenmap/pixmaps/zenmap.png file path=usr/share/zenmap/su-to-zenmap.sh license nmap.license license=GPLv2 -link path=usr/bin/nmapfe target=zenmap -link path=usr/bin/xnmap target=zenmap -link path=usr/share/man/man1/nmapfe.1 target=zenmap.1 -link path=usr/share/man/man1/xnmap.1 target=zenmap.1 - - diff -r 1d59d8c2a113 -r f20006f42637 components/nmap/patches/Makefile.in.patch --- a/components/nmap/patches/Makefile.in.patch Mon Feb 18 10:31:06 2013 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,154 +0,0 @@ ---- nmap-5.21/Makefile.in.~1~ 2011-01-12 17:28:52.000000000 -0800 -+++ nmap-5.21/Makefile.in 2011-11-03 14:41:18.726644687 -0700 -@@ -1,7 +1,9 @@ -+SHELL = /bin/bash - # Extract the version string from nmap.h. - export NMAP_VERSION := $(shell grep '^\#[ \t]*define[ \t]\+NMAP_VERSION' nmap.h | sed -e 's/.*"\(.*\)".*/\1/' -e 'q') -+export TOPDIR=$(shell pwd) - NMAP_NAME= Nmap --NMAP_URL= http://nmap.org -+NMAP_URL= http://nmap.org/ - NMAP_PLATFORM=@host@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ -@@ -14,12 +16,12 @@ - deskdir = $(prefix)/share/applications - NMAPDEVDIR=~/nmap-private-dev - --export NBASEDIR=@NBASEDIR@ --export NSOCKDIR=@NSOCKDIR@ --export LIBLUADIR = @LIBLUADIR@ -+export NBASEDIR=$(TOPDIR)/@NBASEDIR@ -+export NSOCKDIR=$(TOPDIR)/@NSOCKDIR@ -+export LIBLUADIR=$(TOPDIR)/@LIBLUADIR@ - export NDIR=$(shell pwd) --export LIBLUA_LIBS = @LIBLUA_LIBS@ --export NCATDIR=@NCATDIR@ -+export LIBLUA_LIBS=$(TOPDIR)/@LIBLUA_LIBS@ -+export NCATDIR=$(TOPDIR)/@NCATDIR@ - CC = @CC@ - CXX = @CXX@ - CCOPT = -@@ -27,27 +29,29 @@ - STRIP = @STRIP@ - LIBPCAPDIR = @libpcapdir@ - LIBPCREDIR = @LIBPCREDIR@ --export LIBDNETDIR = @LIBDNETDIR@ --ZENMAPDIR = @ZENMAPDIR@ --NDIFFDIR = @NDIFFDIR@ -+export LIBDNETDIR=$(TOPDIR)/@LIBDNETDIR@ -+ZENMAPDIR=$(TOPDIR)/zenmap -+NDIFFDIR=$(TOPDIR)/ndiff - NPINGDIR = @NPINGDIR@ - PYTHON = @PYTHON@ -+PYTHONDIR = @pythondir@ - DEFS = @DEFS@ -DNMAP_NAME=\"$(NMAP_NAME)\" -DNMAP_URL=\"$(NMAP_URL)\" -DNMAP_PLATFORM=\"$(NMAP_PLATFORM)\" -DNMAPDATADIR=\"$(nmapdatadir)\" - # With GCC, add extra security checks to source code. - # http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html - # Level 1 only makes changes that don't affect "conforming" programs, - # while level 2 enforces additional restrictions. - DEFS += -D_FORTIFY_SOURCE=2 -+export CXXFLAGS = @CXXFLAGS@ $(DBGFLAGS) $(CCOPT) $(DEFS) $(INCLS) -+export CFLAGS = @CFLAGS@ $(DBGFLAGS) $(CCOPT) $(DEFS) $(INCLS) -+ - # For mtrace debugging -- see MTRACE define in main.cc for instructions - # Should only be enabled during debugging and not in any real release. - # DEFS += -DMTRACE=1 --CXXFLAGS = @CXXFLAGS@ $(DBGFLAGS) $(CCOPT) - CPPFLAGS = @CPPFLAGS@ $(DEFS) --export CFLAGS = $(CXXFLAGS) - # CFLAGS = $(DEFS) $(INCLS) - STATIC = --LDFLAGS = @LDFLAGS@ $(DBGFLAGS) $(STATIC) --LIBS = @LIBNBASE_LIBS@ @LIBNSOCK_LIBS@ @LIBPCRE_LIBS@ @LIBPCAP_LIBS@ $(OPENSSL_LIBS) libnetutil/libnetutil.a @LIBDNET_LIBS@ @LIBLUA_LIBS@ @LIBS@ -+LDFLAGS = @LDFLAGS@ $(DBGFLAGS) $(STATIC) -z ignore -+LIBS = @LIBNBASE_LIBS@ @LIBNSOCK_LIBS@ @LIBPCRE_LIBS@ @LIBPCAP_LIBS@ @OPENSSL_LIBS@ @LIBDNET_LIBS@ @LIBLUA_LIBS@ @LIBS@ -lsocket -lnsl -lgen - OPENSSL_LIBS = @OPENSSL_LIBS@ - # LIBS = -lefence @LIBS@ - # LIBS = -lrmalloc @LIBS@ -@@ -63,7 +67,7 @@ - # environment variable or none of them with --disable-nls. - ALL_LINGUAS = de es fr hr hu it jp pl pt_BR pt_PT ro ru sk zh - # A space-separated list of language codes requested by the user. --LINGUAS ?= $(ALL_LINGUAS) -+ - - - # DESTDIR is used by some package maintainers to install Nmap under -@@ -93,15 +97,22 @@ - endif - endif - --export SRCS = main.cc nmap.cc targets.cc tcpip.cc nmap_error.cc utils.cc idle_scan.cc osscan.cc osscan2.cc output.cc payload.cc scan_engine.cc timing.cc charpool.cc services.cc protocols.cc nmap_rpc.cc portlist.cc NmapOps.cc TargetGroup.cc Target.cc FingerPrintResults.cc service_scan.cc NmapOutputTable.cc MACLookup.cc nmap_tty.cc nmap_dns.cc traceroute.cc portreasons.cc xml.cc $(NSE_SRC) @COMPAT_SRCS@ -+NETUTIL_SRC= netutil.cc -+NETUTIL_HDRS= netutil.h -+NETUTIL_OBJS=netutil.o - --export HDRS = charpool.h FingerPrintResults.h global_structures.h idle_scan.h MACLookup.h nmap_amigaos.h nmap_dns.h nmap_error.h nmap.h NmapOps.h NmapOutputTable.h nmap_rpc.h nmap_tty.h nmap_winconfig.h osscan.h osscan2.h output.h payload.h portlist.h protocols.h scan_engine.h service_scan.h services.h TargetGroup.h Target.h targets.h tcpip.h timing.h utils.h traceroute.h portreasons.h xml.h $(NSE_HDRS) -+export SRCS = main.cc nmap.cc targets.cc tcpip.cc nmap_error.cc utils.cc idle_scan.cc osscan.cc osscan2.cc output.cc payload.cc scan_engine.cc timing.cc charpool.cc services.cc protocols.cc nmap_rpc.cc portlist.cc NmapOps.cc TargetGroup.cc Target.cc FingerPrintResults.cc service_scan.cc NmapOutputTable.cc MACLookup.cc nmap_tty.cc nmap_dns.cc traceroute.cc portreasons.cc xml.cc $(NSE_SRC) libnetutil/$(NETUTIL_SRC) @COMPAT_SRCS@ - --OBJS = main.o nmap.o targets.o tcpip.o nmap_error.o utils.o idle_scan.o osscan.o osscan2.o output.o payload.o scan_engine.o timing.o charpool.o services.o protocols.o nmap_rpc.o portlist.o NmapOps.o TargetGroup.o Target.o FingerPrintResults.o service_scan.o NmapOutputTable.o MACLookup.o nmap_tty.o nmap_dns.o traceroute.o portreasons.o xml.o $(NSE_OBJS) @COMPAT_OBJS@ -+export HDRS = charpool.h FingerPrintResults.h global_structures.h idle_scan.h MACLookup.h nmap_amigaos.h nmap_dns.h nmap_error.h nmap.h NmapOps.h NmapOutputTable.h nmap_rpc.h nmap_tty.h nmap_winconfig.h osscan.h osscan2.h output.h payload.h portlist.h protocols.h scan_engine.h service_scan.h services.h TargetGroup.h Target.h targets.h tcpip.h timing.h utils.h traceroute.h portreasons.h xml.h $(NSE_HDRS) libnetutil/$(NETUTIL_HDRS) -+ -+OBJS = main.o nmap.o targets.o tcpip.o nmap_error.o utils.o idle_scan.o osscan.o osscan2.o output.o payload.o scan_engine.o timing.o charpool.o services.o protocols.o nmap_rpc.o portlist.o NmapOps.o TargetGroup.o Target.o FingerPrintResults.o service_scan.o NmapOutputTable.o MACLookup.o nmap_tty.o nmap_dns.o traceroute.o portreasons.o xml.o $(NSE_OBJS) libnetutil/$(NETUTIL_OBJS) @COMPAT_OBJS@ - - # %.o : %.cc -- nope this is a GNU extension - .cc.o: -- $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@ -+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@ -+ -+.c.o: -+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ - - all: @LUA_BUILD@ @PCAP_BUILD@ @PCRE_BUILD@ @DNET_BUILD@ @NBASE_BUILD@ @NSOCK_BUILD@ @NCAT_BUILD@ netutil_build - $(MAKE) $(TARGET) $(BUILDZENMAP) $(BUILDNDIFF) $(BUILDNPING) -@@ -109,7 +120,7 @@ - $(TARGET): @LUA_DEPENDS@ @PCAP_DEPENDS@ @PCRE_DEPENDS@ @DNET_DEPENDS@ $(NBASEDIR)/libnbase.a $(NSOCKDIR)/src/libnsock.a libnetutil/libnetutil.a $(OBJS) - @echo Compiling nmap - rm -f $@ -- $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) - - pcre_build: $(LIBPCREDIR)/Makefile - @echo Compiling libpcre; cd $(LIBPCREDIR) && $(MAKE) -@@ -225,7 +236,9 @@ - config.cache config.log config.status - - install-nmap: $(TARGET) -- $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(nmapdatadir) -+ $(INSTALL) -d $(DESTDIR)$(bindir) -+ $(INSTALL) -d $(DESTDIR)$(mandir)/man1 -+ $(INSTALL) -d $(DESTDIR)$(nmapdatadir) - $(INSTALL) -c -m 755 nmap $(DESTDIR)$(bindir)/nmap - # Use strip -x to avoid stripping dynamically loaded NSE functions. See - # http://seclists.org/nmap-dev/2007/q4/0272.html. -@@ -277,8 +290,10 @@ - cd $(ZENMAPDIR) && $(PYTHON) setup.py build $(if $(DESTDIR),--executable "$(DEFAULT_PYTHON_PATH)") - - install-zenmap: $(ZENMAPDIR)/setup.py -+ $(INSTALL) -d $(DESTDIR)$(bindir) -+ $(INSTALL) -d $(DESTDIR)$(mandir)/man1 - $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 -- cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --force $(if $(DESTDIR),--root "$(DESTDIR)") -+ cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --force $(if $(DESTDIR),--root "$(DESTDIR)") --install-lib $(PYTHONDIR) - $(INSTALL) -c -m 644 docs/zenmap.1 $(DESTDIR)$(mandir)/man1/ - # Create a symlink from nmapfe to zenmap if nmapfe doesn't exist or is - # already a link. -@@ -295,7 +310,7 @@ - @cd $(NPINGDIR) && $(MAKE) - - install-ndiff: -- cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" $(if $(DESTDIR),--root "$(DESTDIR)") -+ cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" $(if $(DESTDIR),--root "$(DESTDIR)") --install-lib $(PYTHONDIR) - - NSE_FILES = scripts/script.db scripts/*.nse - NSE_LIB_LUA_FILES = nselib/*.lua -@@ -371,7 +386,7 @@ - ./config.status --recheck - - makefile.dep: -- $(CXX) -MM $(CPPFLAGS) $(SRCS) > $@ -+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -MM $(CPPFLAGS) $(SRCS) | grep -v '/usr/gnu' | grep -v '/usr/include' | grep -v '/usr/sfw' | nawk 'NR>1 { if ($$0 ~ /^.*\.o:/ && line ~ /\\$$/ ) sub(/ \\$$/, "", line); print line } { line = $$0 } END { sub(/ \\$$/, "", line); print line }' > $@ - include makefile.dep - - # These the old names of scripts that have been renamed or deleted. Any diff -r 1d59d8c2a113 -r f20006f42637 components/nmap/patches/configure.patch --- a/components/nmap/patches/configure.patch Mon Feb 18 10:31:06 2013 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,175 +0,0 @@ ---- nmap-5.21/configure.~1~ 2011-01-21 13:00:04.000000000 -0800 -+++ nmap-5.21/configure 2011-11-28 14:45:27.152150862 -0800 -@@ -1,4 +1,4 @@ --#! /bin/sh -+#! /bin/bash - # Guess values for system-dependent variables and create Makefiles. - # Generated by GNU Autoconf 2.66. - # -@@ -237,7 +237,7 @@ - fi - fi - fi --SHELL=${CONFIG_SHELL-/bin/sh} -+SHELL=${CONFIG_SHELL-/bin/bash} - export SHELL - # Unset more variables known to interfere with behavior of common tools. - CLICOLOR_FORCE= GREP_OPTIONS= -@@ -800,7 +800,7 @@ - datadir='${datarootdir}' - sysconfdir='${prefix}/etc' - sharedstatedir='${prefix}/com' --localstatedir='${prefix}/var' -+localstatedir= - includedir='${prefix}/include' - oldincludedir='/usr/include' - docdir='${datarootdir}/doc/${PACKAGE}' -@@ -3985,7 +3985,7 @@ - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no -- CXXFLAGS="-g" -+ CXXFLAGS="$CXXFLAGS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -4000,7 +4000,7 @@ - if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_prog_cxx_g=yes - else -- CXXFLAGS="" -+ CXXFLAGS="CXXFLAGS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -4016,7 +4016,7 @@ - - else - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -- CXXFLAGS="-g" -+ CXXFLAGS="CXXFLAGS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -4044,15 +4044,15 @@ - CXXFLAGS=$ac_save_CXXFLAGS - elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then -- CXXFLAGS="-g -O2" -+ CXXFLAGS="$CXXFLAGS" - else -- CXXFLAGS="-g" -+ CXXFLAGS="$CXXFLAGS" - fi - else - if test "$GXX" = yes; then -- CXXFLAGS="-O2" -+ CXXFLAGS="$CXXFLAGS" - else -- CXXFLAGS= -+ CXXFLAGS="$CXXFLAGS" - fi - fi - ac_ext=c -@@ -4250,7 +4250,7 @@ - if test -n "$GXX"; then - # -fno-strict-aliasing disables strict-aliasing optimizations that assume - # that pointers of different types never point to the same object. -- CXXFLAGS="$CXXFLAGS -Wall -fno-strict-aliasing" -+ CXXFLAGS="$CXXFLAGS" - fi - - # Remember that all following tests will run with this CXXFLAGS by default -@@ -5687,8 +5687,7 @@ - else - am_py_prefix=$prefix - fi -- am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null || -- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` -+ am_cv_python_pythondir="$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages" - case $am_cv_python_pythondir in - $am_py_prefix*) - am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` -@@ -5717,8 +5716,7 @@ - else - am_py_exec_prefix=$exec_prefix - fi -- am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null || -- echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` -+ am_cv_python_pyexecdir="$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages" - case $am_cv_python_pyexecdir in - $am_py_exec_prefix*) - am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` -@@ -6193,7 +6191,7 @@ - if test "${LIBPCAP_INC+set}" = "set"; then - CPPFLAGS="$CPPFLAGS -I$LIBPCAP_INC" - else -- CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/$libpcapdir" -+ CPPFLAGS="$CPPFLAGS -I$libpcapdir" - fi - LIBPCAP_LIBS='$(LIBPCAPDIR)/libpcap.a' - PCAP_DEPENDS='$(LIBPCAPDIR)/libpcap.a' -@@ -6341,7 +6339,7 @@ - if test $have_pcre != yes ; then - subdirs="$subdirs libpcre" - -- CPPFLAGS="-I\$(top_srcdir)/$LIBPCREDIR $CPPFLAGS" -+ CPPFLAGS="-I$LIBPCREDIR $CPPFLAGS" - LIBPCRE_LIBS="$LIBPCREDIR/libpcre.a" - PCRE_DEPENDS="$LIBPCREDIR/libpcre.a" - PCRE_BUILD="pcre_build" -@@ -6407,9 +6405,9 @@ - if test $have_dnet != yes ; then - subdirs="$subdirs libdnet-stripped" - -- CPPFLAGS="-I\$(top_srcdir)/$LIBDNETDIR/include $CPPFLAGS" -- LIBDNET_LIBS="\$(top_srcdir)/$LIBDNETDIR/src/.libs/libdnet.a" -- DNET_DEPENDS="\$(top_srcdir)/$LIBDNETDIR/src/.libs/libdnet.a" -+ CPPFLAGS="-I$LIBDNETDIR/include $CPPFLAGS" -+ LIBDNET_LIBS="$LIBDNETDIR/src/.libs/libdnet.a" -+ DNET_DEPENDS="$LIBDNETDIR/src/.libs/libdnet.a" - DNET_BUILD="dnet_build" - DNET_CLEAN="dnet_clean" - DNET_DIST_CLEAN="dnet_dist_clean" -@@ -6442,9 +6440,9 @@ - yes) - ;; - included) -- CPPFLAGS="-I\$(top_srcdir)/$LIBLUADIR $CPPFLAGS" -- LIBLUA_LIBS="\$(top_srcdir)/$LIBLUADIR/liblua.a" -- LUA_DEPENDS="\$(top_srcdir)/$LIBLUADIR/liblua.a" -+ CPPFLAGS="-I$LIBLUADIR $CPPFLAGS" -+ LIBLUA_LIBS="$LIBLUADIR/liblua.a" -+ LUA_DEPENDS="$LIBLUADIR/liblua.a" - LUA_BUILD="lua_build" - LUA_CLEAN="lua_clean" - LUA_DIST_CLEAN="lua_dist_clean" -@@ -6737,9 +6735,9 @@ - if test $have_lua != yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } -- CPPFLAGS="-I\$(top_srcdir)/$LIBLUADIR $CPPFLAGS" -- LIBLUA_LIBS="\$(top_srcdir)/$LIBLUADIR/liblua.a" -- LUA_DEPENDS="\$(top_srcdir)/$LIBLUADIR/liblua.a" -+ CPPFLAGS="-I$LIBLUADIR $CPPFLAGS" -+ LIBLUA_LIBS="\$LIBLUADIR/liblua.a" -+ LUA_DEPENDS="\$LIBLUADIR/liblua.a" - LUA_BUILD="lua_build" - LUA_CLEAN="lua_clean" - LUA_DIST_CLEAN="lua_dist_clean" -@@ -7270,7 +7268,7 @@ - - - LDFLAGS="$LDFLAGS -L$NBASEDIR" --CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/$NBASEDIR" -+CPPFLAGS="$CPPFLAGS -I$NBASEDIR" - LIBNBASE_LIBS="-lnbase" - - -@@ -7298,7 +7296,7 @@ - - - LDFLAGS="$LDFLAGS -L$NSOCKDIR/src/" --CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/$NSOCKDIR/include" -+CPPFLAGS="$CPPFLAGS -I$NSOCKDIR/include" - LIBNSOCK_LIBS="-lnsock" diff -r 1d59d8c2a113 -r f20006f42637 components/nmap/patches/libdnet-stripped.configure.patch --- a/components/nmap/patches/libdnet-stripped.configure.patch Mon Feb 18 10:31:06 2013 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,172 +0,0 @@ ---- nmap-5.21/libdnet-stripped/configure.~1~ 2010-05-07 14:08:32.000000000 -0700 -+++ nmap-5.21/libdnet-stripped/configure 2011-11-10 11:13:38.610319958 -0800 -@@ -1,4 +1,4 @@ --#! /bin/sh -+#! /bin/bash - # Guess values for system-dependent variables and create Makefiles. - # Generated by GNU Autoconf 2.63. - # -@@ -573,7 +573,7 @@ - - - # Check that we are running under the correct shell. --SHELL=${CONFIG_SHELL-/bin/sh} -+SHELL=${CONFIG_SHELL-/bin/bash} - - case X$lt_ECHO in - X*--fallback-echo) -@@ -657,7 +657,7 @@ - elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running configure again with it. -- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -+ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/bash} - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL -@@ -699,7 +699,7 @@ - if test "$prev" != 'sed 50q "$0"'; then - echo_test_string=`eval $prev` - export echo_test_string -- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} -+ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/bash}} "$0" ${1+"$@"} - else - # Oops. We lost completely, so just stick with echo. - ECHO=echo -@@ -738,7 +738,7 @@ - subdirs= - MFLAGS= - MAKEFLAGS= --SHELL=${CONFIG_SHELL-/bin/sh} -+SHELL=${CONFIG_SHELL-/bin/bash} - - # Identity of this package. - PACKAGE_NAME= -@@ -965,7 +965,7 @@ - datadir='${datarootdir}' - sysconfdir='${prefix}/etc' - sharedstatedir='${prefix}/com' --localstatedir='${prefix}/var' -+localstatedir= - includedir='${prefix}/include' - oldincludedir='/usr/include' - docdir='${datarootdir}/doc/${PACKAGE}' -@@ -2318,7 +2318,7 @@ - $as_echo_n "(cached) " >&6 - else - cat >conftest.make <<\_ACEOF --SHELL = /bin/sh -+SHELL = /bin/bash - all: - @echo '@@@%%%=$(MAKE)=@@@%%%' - _ACEOF -@@ -3298,7 +3298,7 @@ - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - ac_cv_prog_cc_g=no -- CFLAGS="-g" -+ CFLAGS="$CFLAGS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -3337,7 +3337,7 @@ - $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- CFLAGS="" -+ CFLAGS="$CFLAGS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -3377,7 +3377,7 @@ - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_c_werror_flag=$ac_save_c_werror_flag -- CFLAGS="-g" -+ CFLAGS="$CFLAGS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -3434,15 +3434,15 @@ - CFLAGS=$ac_save_CFLAGS - elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then -- CFLAGS="-g -O2" -+ CFLAGS="$CFLAGS" - else -- CFLAGS="-g" -+ CFLAGS="$CFLAGS" - fi - else - if test "$GCC" = yes; then -- CFLAGS="-O2" -+ CFLAGS="$CFLAGS" - else -- CFLAGS= -+ CFLAGS="$CFLAGS" - fi - fi - { $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -@@ -3671,7 +3671,7 @@ - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -- # Solaris 8's {/usr,}/bin/sh. -+ # Solaris 8's {/usr,}/bin/bash. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -@@ -4607,7 +4607,7 @@ - for i in 1 2 3 4 5 6 7 8 ; do - teststring=$teststring$teststring - done -- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} -+ SHELL=${SHELL-${CONFIG_SHELL-/bin/bash}} - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. -@@ -12026,13 +12026,13 @@ - - # DLPI needs putmsg under HPUX so test for -lstr while we're at it - --{ $as_echo "$as_me:$LINENO: checking for putmsg in -lstr" >&5 --$as_echo_n "checking for putmsg in -lstr... " >&6; } -+{ $as_echo "$as_me:$LINENO: checking for putmsg in -lc" >&5 -+$as_echo_n "checking for putmsg in -lc... " >&6; } - if test "${ac_cv_lib_str_putmsg+set}" = set; then - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lstr $LIBS" -+LIBS=" -lc -lsocket -lresolv -lnsl -lgen $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -12040,13 +12040,12 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char putmsg (); -+#include -+#include -+#include -+#include -+#include -+ - int - main () - { -@@ -12096,7 +12095,7 @@ - #define HAVE_LIBSTR 1 - _ACEOF - -- LIBS="-lstr $LIBS" -+ LIBS=" -lc -lsocket -lresolv -lnsl -lgen $LIBS" - - fi diff -r 1d59d8c2a113 -r f20006f42637 components/nmap/patches/libdnet-stripped.src.eth-dlpi.c.patch --- a/components/nmap/patches/libdnet-stripped.src.eth-dlpi.c.patch Mon Feb 18 10:31:06 2013 -0800 +++ b/components/nmap/patches/libdnet-stripped.src.eth-dlpi.c.patch Thu Feb 21 06:43:25 2013 -0800 @@ -1,5 +1,5 @@ ---- nmap-5.21/libdnet-stripped/src/eth-dlpi.c.~1~ 2010-02-28 11:45:39.000000000 -0800 -+++ nmap-5.21/libdnet-stripped/src/eth-dlpi.c 2011-11-10 15:34:38.200529059 -0800 +--- nmap-6.25/libdnet-stripped/src/eth-dlpi.c.orig 2012-12-06 13:42:33.456937114 -0800 ++++ nmap-6.25/libdnet-stripped/src/eth-dlpi.c 2012-12-06 13:43:16.505962826 -0800 @@ -134,7 +134,7 @@ { union DL_primitives *dlp; @@ -18,4 +18,4 @@ +#endif if ((e->fd = open(dev, O_RDWR)) < 0) { snprintf(dev, sizeof(dev), "/dev/%s", device); - if ((e->fd = open(dev, O_RDWR)) < 0) + if ((e->fd = open(dev, O_RDWR)) < 0) { diff -r 1d59d8c2a113 -r f20006f42637 components/nmap/patches/libdnet-stripped.src.intf.c.patch --- a/components/nmap/patches/libdnet-stripped.src.intf.c.patch Mon Feb 18 10:31:06 2013 -0800 +++ b/components/nmap/patches/libdnet-stripped.src.intf.c.patch Thu Feb 21 06:43:25 2013 -0800 @@ -1,6 +1,6 @@ ---- nmap-5.21/libdnet-stripped/src/intf.c 2009-08-06 17:11:57.000000000 -0700 -+++ nmap-5.21/libdnet-stripped/src/intf.c 2010-03-09 20:32:28.207885025 -0800 -@@ -323,7 +323,7 @@ +--- nmap-6.25/libdnet-stripped/src/intf.c.orig 2012-12-06 13:43:47.010382941 -0800 ++++ nmap-6.25/libdnet-stripped/src/intf.c 2012-12-06 13:43:55.634656979 -0800 +@@ -339,7 +339,7 @@ /* Set link-level address. */ if (entry->intf_link_addr.addr_type == ADDR_TYPE_ETH && addr_cmp(&entry->intf_link_addr, &orig->intf_link_addr) != 0) { diff -r 1d59d8c2a113 -r f20006f42637 components/nmap/patches/libdnet-stripped.src.vmtypes.patch --- a/components/nmap/patches/libdnet-stripped.src.vmtypes.patch Mon Feb 18 10:31:06 2013 -0800 +++ b/components/nmap/patches/libdnet-stripped.src.vmtypes.patch Thu Feb 21 06:43:25 2013 -0800 @@ -1,5 +1,5 @@ ---- nmap-5.51/libdnet-stripped/include/dnet/fw.h.orig Fri May 4 09:39:17 2012 -+++ nmap-5.51/libdnet-stripped/include/dnet/fw.h Fri May 4 09:39:30 2012 +--- nmap-6.25/libdnet-stripped/include/dnet/fw.h.orig 2012-12-06 13:46:17.245644790 -0800 ++++ nmap-6.25/libdnet-stripped/include/dnet/fw.h 2012-12-06 13:48:24.783484617 -0800 @@ -39,16 +39,16 @@ (rule)->fw_dport[0] = dp1; (rule)->fw_dport[1] = dp2; \ } while (0) @@ -23,8 +23,8 @@ __END_DECLS #endif /* DNET_FW_H */ ---- nmap-5.51/libdnet-stripped/src/fw-none.c.orig Fri May 4 09:43:16 2012 -+++ nmap-5.51/libdnet-stripped/src/fw-none.c Fri May 4 09:43:28 2012 +--- nmap-6.25/libdnet-stripped/src/fw-none.c.orig 2012-12-06 13:58:57.466770363 -0800 ++++ nmap-6.25/libdnet-stripped/src/fw-none.c 2012-12-06 13:48:40.567679655 -0800 @@ -14,7 +14,7 @@ #include "dnet.h" @@ -34,7 +34,7 @@ fw_open(void) { errno = ENOSYS; -@@ -22,7 +22,7 @@ +@@ -22,28 +22,28 @@ } int @@ -43,7 +43,6 @@ { errno = ENOSYS; return (-1); -@@ -29,7 +29,7 @@ } int @@ -52,7 +51,6 @@ { errno = ENOSYS; return (-1); -@@ -36,14 +36,14 @@ } int diff -r 1d59d8c2a113 -r f20006f42637 components/nmap/patches/libnetutil.Makefile.in.patch --- a/components/nmap/patches/libnetutil.Makefile.in.patch Mon Feb 18 10:31:06 2013 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ ---- nmap-5.21/libnetutil/Makefile.in.orig 2011-11-02 17:32:01.256611459 -0700 -+++ nmap-5.21/libnetutil/Makefile.in 2011-11-02 17:32:50.170962769 -0700 -@@ -3,7 +3,7 @@ - - CXX = @CXX@ - CXXFLAGS = @CXXFLAGS@ --CPPFLAGS = @CPPFLAGS@ $(DEFS) -+CPPFLAGS = -I/usr/include/lua -I../libdnet-stripped/include -I../nbase -I../nsock/include $(DEFS) - DEFS = @DEFS@ - DEFS += -D_FORTIFY_SOURCE=2 - AR = ar diff -r 1d59d8c2a113 -r f20006f42637 components/nmap/patches/libnetutil.netutil.cc.patch --- a/components/nmap/patches/libnetutil.netutil.cc.patch Mon Feb 18 10:31:06 2013 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ ---- nmap-5.21/libnetutil/netutil.cc.~1~ 2011-01-20 16:04:16.000000000 -0800 -+++ nmap-5.21/libnetutil/netutil.cc 2011-11-11 15:53:34.504536073 -0800 -@@ -616,7 +616,8 @@ - - /* Returns whether the system supports pcap_get_selectable_fd() properly */ - int pcap_selectable_fd_valid() { --#if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) && (__FreeBSD_version < 500000)) -+#if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) && (__FreeBSD_version < 500000)) \ -+ || (defined(sun) || defined(__sun) || defined(__sun__)) - return 0; - #else - return 1; -@@ -630,7 +631,8 @@ - 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(sun) || defined(__sun) || defined(__sun__)) - return -1; - #else - assert(pcap_selectable_fd_valid()); -@@ -1162,7 +1164,7 @@ - devs[count].device_type = devt_ethernet; - - /* If the device type is ethernet, get the MAC address. */ --#ifdef SIOCGIFHWADDR -+#if defined(SIOCGIFHWADDR) && (!defined(sun) && !defined(__sun) && !defined(__sun__)) - memcpy(&tmpifr.ifr_addr, sin, MIN(sizeof(tmpifr.ifr_addr), sizeof(*sin))); - rc = ioctl(sd, SIOCGIFHWADDR, &tmpifr); - if (rc < 0 && errno != EADDRNOTAVAIL){ diff -r 1d59d8c2a113 -r f20006f42637 components/nmap/patches/nbase.Makefile.in.patch --- a/components/nmap/patches/nbase.Makefile.in.patch Mon Feb 18 10:31:06 2013 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ ---- nmap-5.21/nbase/Makefile.in 2009-03-25 05:49:32.000000000 -0700 -+++ nmap-5.21/nbase/Makefile.in 2010-02-23 10:25:33.136566614 -0800 -@@ -6,7 +6,7 @@ - srcdir = @srcdir@ - - CC = @CC@ --AR = ar -+CXX = @CXX@ - RANLIB = @RANLIB@ - CCOPT = - DEFS = @DEFS@ -@@ -14,12 +14,14 @@ - DEFS += -D_FORTIFY_SOURCE=2 - CPPFLAGS = @CPPFLAGS@ - CFLAGS = @CFLAGS@ $(CCOPT) $(GLIB_CFLAGS) $(DEFS) $(INCLS) -+CXXFLAGS = @CXXFLAGS@ - STATIC = - LDFLAGS = @LDFLAGS@ $(STATIC) - LIBS = @LIBS@ - SHTOOL = ./shtool - INSTALL = $(SHTOOL) install - MAKEDEPEND = @MAKEDEPEND@ -+AR = /usr/bin/ar cq - - TARGET = libnbase.a - -@@ -30,7 +32,7 @@ - - $(TARGET): $(DEPS) $(OBJS) - rm -f $@ -- $(AR) cr $@ $(OBJS) -+ $(AR) $@ $(OBJS) - $(RANLIB) $@ - - clean: -@@ -51,8 +53,10 @@ - config.status: configure - ./config.status --recheck - -+.c.o: -+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ - .cc.o: -- $(CC) -c $(CFLAGS) $*.cc -+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< o $@ - - # DO NOT DELETE -- Needed by makedepend - diff -r 1d59d8c2a113 -r f20006f42637 components/nmap/patches/nbase.configure.patch --- a/components/nmap/patches/nbase.configure.patch Mon Feb 18 10:31:06 2013 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,57 +0,0 @@ ---- nmap-5.21/nbase/configure.~1~ 2011-01-21 13:00:04.000000000 -0800 -+++ nmap-5.21/nbase/configure 2011-11-28 14:25:47.655764658 -0800 -@@ -1,4 +1,4 @@ --#! /bin/sh -+#! /bin/bash - # Guess values for system-dependent variables and create Makefiles. - # Generated by GNU Autoconf 2.66. - # -@@ -237,7 +237,7 @@ - fi - fi - fi --SHELL=${CONFIG_SHELL-/bin/sh} -+SHELL=${CONFIG_SHELL-/bin/bash} - export SHELL - # Unset more variables known to interfere with behavior of common tools. - CLICOLOR_FORCE= GREP_OPTIONS= -@@ -613,7 +613,9 @@ - CPPFLAGS - LDFLAGS - CFLAGS -+CXXFLAGS - CC -+CXX - target_alias - host_alias - build_alias -@@ -663,7 +665,9 @@ - host_alias - target_alias - CC -+CXX - CFLAGS -+CXXFLAGS - LDFLAGS - LIBS - CPPFLAGS -@@ -705,7 +709,7 @@ - datadir='${datarootdir}' - sysconfdir='${prefix}/etc' - sharedstatedir='${prefix}/com' --localstatedir='${prefix}/var' -+localstatedir= - includedir='${prefix}/include' - oldincludedir='/usr/include' - docdir='${datarootdir}/doc/${PACKAGE}' -@@ -3773,6 +3777,10 @@ - - #include - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#error "GNU __attribute__ extension not suported " -+#endif -+ - static void foo(void) __attribute__ ((noreturn)); - - static void diff -r 1d59d8c2a113 -r f20006f42637 components/nmap/patches/ncat.Makefile.in.patch --- a/components/nmap/patches/ncat.Makefile.in.patch Mon Feb 18 10:31:06 2013 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ ---- nmap-5.21/ncat/Makefile.in.orig 2011-11-01 11:54:32.150993236 -0700 -+++ nmap-5.21/ncat/Makefile.in 2011-11-01 11:56:09.158430172 -0700 -@@ -126,11 +126,11 @@ - - .PHONY: uninstall all clean distclean - --$(NBASEDIR)/libnbase.a: $(NBASEDIR)/Makefile -+$(NBASEDIR)/libnbase.a: - @echo Compiling libnbase; - cd $(NBASEDIR) && $(MAKE) - --$(NSOCKDIR)/libnsock.a: $(NSOCKDIR)/Makefile -+$(NSOCKDIR)/libnsock.a: - @echo Compiling libnsock; - cd $(NSOCKDIR) && $(MAKE) - -@@ -172,6 +172,6 @@ - .NOEXPORT: - - makefile.dep: -- $(CC) -MM $(CPPFLAGS) $(SRCS) > $@ -+ $(CC) $(CPPFLAGS) $(CFLAGS) -MM $(SRCS) > $@ - include makefile.dep - diff -r 1d59d8c2a113 -r f20006f42637 components/nmap/patches/ncat.configure.patch --- a/components/nmap/patches/ncat.configure.patch Mon Feb 18 10:31:06 2013 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ ---- nmap-5.21/ncat/configure.~1~ 2011-01-21 13:00:04.000000000 -0800 -+++ nmap-5.21/ncat/configure 2011-11-28 14:35:56.320662714 -0800 -@@ -1,4 +1,4 @@ --#! /bin/sh -+#! /bin/bash - # Guess values for system-dependent variables and create Makefiles. - # Generated by GNU Autoconf 2.66. - # -@@ -237,7 +237,7 @@ - fi - fi - fi --SHELL=${CONFIG_SHELL-/bin/sh} -+SHELL=${CONFIG_SHELL-/bin/bash} - export SHELL - # Unset more variables known to interfere with behavior of common tools. - CLICOLOR_FORCE= GREP_OPTIONS= -@@ -713,7 +713,7 @@ - datadir='${datarootdir}' - sysconfdir='${prefix}/etc' - sharedstatedir='${prefix}/com' --localstatedir='${prefix}/var' -+localstatedir= - includedir='${prefix}/include' - oldincludedir='/usr/include' - docdir='${datarootdir}/doc/${PACKAGE}' diff -r 1d59d8c2a113 -r f20006f42637 components/nmap/patches/nmap-6.25-parfait.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/nmap/patches/nmap-6.25-parfait.patch Thu Feb 21 06:43:25 2013 -0800 @@ -0,0 +1,350 @@ +As part of the update of nmap to version 6.25, a 3PSC form was created: +http://psarc.us.oracle.com/arc/PSARC/2012/376/nmap_6.25_3PSC_20121218.txt + +To answer one of the questions, a Parfait code analysis of the nmap 6.25 +code was run. The results were reported upstream: +http://seclists.org/nmap-dev/2012/q4/412 + +The nmap maintainers analyzed these results and responded: +http://seclists.org/nmap-dev/2012/q4/504 + +This is the patch they generated, with just 'nmap-6.25/' prepended to +the filenames on the "^--- " and "+++ " diff lines. + + + +From a632df5fbeecf6271aadbd3bcc1c927977a7ba2c Mon Sep 17 00:00:00 2001 +From: David Fifield +Date: Thu, 20 Dec 2012 22:22:49 -0800 +Subject: [PATCH 1/4] Add an ncat_assert macro. + +This is an assert that will remain even if NDEBUG is defined. +--- + ncat/util.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git ncat/util.h ncat/util.h +index bf9b42e..18de755 100644 +--- nmap-6.25/ncat/util.h ++++ nmap-6.25/ncat/util.h +@@ -127,6 +127,13 @@ void logdebug(const char *fmt, ...) + __attribute__ ((format (printf, 1, 2))); + + /* handle errors */ ++ ++#define ncat_assert(expr) \ ++do { \ ++ if (!(expr)) \ ++ bye("assertion failed: %s", #expr); \ ++} while (0) ++ + void die(char *); + + void bye(const char *, ...) +-- +1.7.10.4 + +From cf5b5e2f5fdd4f7744e91c097d0395736e0744ab Mon Sep 17 00:00:00 2001 +From: David Fifield +Date: Thu, 20 Dec 2012 22:32:03 -0800 +Subject: [PATCH 2/4] Assert that get_fdinfo doesn't return NULL. + +Resolves these Parfait reports +(http://seclists.org/nmap-dev/2012/q4/412). + +Error: Null pointer dereference (CWE 476) + Read from null pointer 'fdn' + at line 328 of components/nmap/build/amd64/ncat/ncat_core.c in function 'blocking_fdinfo_send'. + Function 'get_fdinfo' may return constant 'NULL' at line 615, called at line 366 in function 'ncat_broadcast'. + Constant 'NULL' passed into function 'blocking_fdinfo_send', argument 'fdn', from call at line 367. + Null pointer introduced at line 615 of components/nmap/build/amd64/ncat/util.c in function 'get_fdinfo'. + at line 330 of components/nmap/build/amd64/ncat/ncat_core.c in function 'blocking_fdinfo_send'. + Function 'get_fdinfo' may return constant 'NULL' at line 615, called at line 366 in function 'ncat_broadcast'. + Constant 'NULL' passed into function 'blocking_fdinfo_send', argument 'fdn', from call at line 367. + Null pointer introduced at line 615 of components/nmap/build/amd64/ncat/util.c in function 'get_fdinfo'. +Error: Null pointer dereference (CWE 476) + Read from null pointer 'fdn' + at line 946 of components/nmap/build/amd64/ncat/ncat_listen.c in function 'shutdown_sockets'. + Function 'get_fdinfo' may return constant 'NULL' at line 615, called at line 945. + Null pointer introduced at line 615 of components/nmap/build/amd64/ncat/util.c in function 'get_fdinfo'. +--- + ncat/ncat_core.c | 1 + + ncat/ncat_listen.c | 6 ++++-- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git ncat/ncat_core.c ncat/ncat_core.c +index e6cb16c..42cf389 100644 +--- nmap-6.25/ncat/ncat_core.c ++++ nmap-6.25/ncat/ncat_core.c +@@ -364,6 +364,7 @@ int ncat_broadcast(fd_set *fds, const fd_list_t *fdlist, const char *msg, size_t + continue; + + fdn = get_fdinfo(fdlist, i); ++ ncat_assert(fdn != NULL); + if (blocking_fdinfo_send(fdn, msg, size) <= 0) { + if (o.debug > 1) + logdebug("Error sending to fd %d: %s.\n", i, socket_strerror(socket_errno())); +diff --git ncat/ncat_listen.c ncat/ncat_listen.c +index 5a0b502..3e0a104 100644 +--- nmap-6.25/ncat/ncat_listen.c ++++ nmap-6.25/ncat/ncat_listen.c +@@ -293,6 +293,7 @@ static int ncat_listen_stream(int proto) + FD_CLR(i, &master_readfds); + FD_CLR(i, &master_writefds); + fdi = get_fdinfo(&client_fdlist, i); ++ ncat_assert(fdi != NULL); + switch (ssl_handshake(fdi)) { + case NCAT_SSL_HANDSHAKE_COMPLETED: + /* Clear from sslpending_fds once ssl is established */ +@@ -535,7 +536,7 @@ int read_socket(int recv_fd) + int nbytes, pending; + + fdn = get_fdinfo(&client_fdlist, recv_fd); +- assert(fdn != NULL); ++ ncat_assert(fdn != NULL); + + nbytes = 0; + do { +@@ -838,7 +839,7 @@ static void read_and_broadcast(int recv_fd) + int pending; + + fdn = get_fdinfo(&client_fdlist, recv_fd); +- assert(fdn); ++ ncat_assert(fdn != NULL); + + /* Loop while ncat_recv indicates data is pending. */ + do { +@@ -943,6 +944,7 @@ static void shutdown_sockets(int how) + continue; + + fdn = get_fdinfo(&broadcast_fdlist, i); ++ ncat_assert(fdn != NULL); + shutdown(fdn->fd, how); + } + } +-- +1.7.10.4 + +From b7b822c8a0f4810d19d5b061c6fbaac0a2ad5723 Mon Sep 17 00:00:00 2001 +From: David Fifield +Date: Fri, 21 Dec 2012 12:22:30 -0800 +Subject: [PATCH 3/4] Make PortList::mapPort return void. + +Contrary to the doc comment, this function could never return false but +only cause a fatal error. + +Resolves these Parfait reports +(http://seclists.org/nmap-dev/2012/q4/412). + +Error: Null pointer dereference (CWE 476) + Read from null pointer 'port' + at line 344 of components/nmap/build/amd64/portlist.cc in function 'PortList::setServiceProbeResults(unsigned short, int, serviceprobestate, char const*, service_tunnel_type, char const*, char const*, char const*, char const*, char const*, char const*, std::vector > const*, char const*)'. + Function 'PortList::createPort(unsigned short, unsigned char)' may return constant 'NULL' at line 671, called at line 343. + Null pointer introduced at line 671 in function 'PortList::createPort(unsigned short, unsigned char)'. +Error: Null pointer dereference (CWE 476) + Write to null pointer 'current' + at line 520 of components/nmap/build/amd64/portlist.cc in function 'PortList::setPortState(unsigned short, unsigned char, int)'. + Function 'PortList::createPort(unsigned short, unsigned char)' may return constant 'NULL' at line 671, called at line 518. + Null pointer introduced at line 671 in function 'PortList::createPort(unsigned short, unsigned char)'. +Error: Null pointer dereference (CWE 476) + Write to null pointer 'answer' + at line 880 of components/nmap/build/amd64/portlist.cc in function 'PortList::setStateReason(unsigned short, unsigned char, unsigned short, unsigned char, sockaddr_storage const*)'. + Function 'PortList::createPort(unsigned short, unsigned char)' may return constant 'NULL' at line 671, called at line 877. + Null pointer introduced at line 671 in function 'PortList::createPort(unsigned short, unsigned char)'. + at line 885 of components/nmap/build/amd64/portlist.cc in function 'PortList::setStateReason(unsigned short, unsigned char, unsigned short, unsigned char, sockaddr_storage const*)'. + Function 'PortList::createPort(unsigned short, unsigned char)' may return constant 'NULL' at line 671, called at line 877. + Null pointer introduced at line 671 in function 'PortList::createPort(unsigned short, unsigned char)'. +--- + portlist.cc | 17 +++++------------ + portlist.h | 2 +- + 2 files changed, 6 insertions(+), 13 deletions(-) + +diff --git portlist.cc portlist.cc +index 0c8af80..cd40d04 100644 +--- nmap-6.25/portlist.cc ++++ nmap-6.25/portlist.cc +@@ -629,8 +629,8 @@ Port *PortList::nextPort(const Port *cur, Port *next, + } + + /* Convert portno and protocol into the internal indices used to index +- port_list. Returns false on error, true otherwise. */ +-bool PortList::mapPort(u16 *portno, u8 *protocol) const { ++ port_list. */ ++void PortList::mapPort(u16 *portno, u8 *protocol) const { + int mapped_portno, mapped_protocol; + + mapped_protocol = INPROTO2PORTLISTPROTO(*protocol); +@@ -638,7 +638,6 @@ bool PortList::mapPort(u16 *portno, u8 *protocol) const { + if (*protocol == IPPROTO_IP) + assert(*portno < 256); + if(port_map[mapped_protocol]==NULL || port_list[mapped_protocol]==NULL) { +- assert(0); + fatal("%s(%i,%i): you're trying to access uninitialized protocol", __func__, *portno, *protocol); + } + mapped_portno = port_map[mapped_protocol][*portno]; +@@ -648,14 +647,10 @@ bool PortList::mapPort(u16 *portno, u8 *protocol) const { + + *portno = mapped_portno; + *protocol = mapped_protocol; +- +- return true; + } + + const Port *PortList::lookupPort(u16 portno, u8 protocol) const { +- if (!mapPort(&portno, &protocol)) +- return NULL; +- ++ mapPort(&portno, &protocol); + return port_list[protocol][portno]; + } + +@@ -667,8 +662,7 @@ Port *PortList::createPort(u16 portno, u8 protocol) { + + mapped_portno = portno; + mapped_protocol = protocol; +- if (!mapPort(&mapped_portno, &mapped_protocol)) +- return NULL; ++ mapPort(&mapped_portno, &mapped_protocol); + + p = port_list[mapped_protocol][mapped_portno]; + if (p == NULL) { +@@ -688,8 +682,7 @@ int PortList::forgetPort(u16 portno, u8 protocol) { + + log_write(LOG_PLAIN, "Removed %d\n", portno); + +- if (!mapPort(&portno, &protocol)) +- return -1; ++ mapPort(&portno, &protocol); + + answer = port_list[protocol][portno]; + if (answer == NULL) +diff --git portlist.h portlist.h +index 8eaee1c..d7faf71 100644 +--- nmap-6.25/portlist.h ++++ nmap-6.25/portlist.h +@@ -290,7 +290,7 @@ class PortList { + bool hasOpenPorts() const; + + private: +- bool mapPort(u16 *portno, u8 *protocol) const; ++ void mapPort(u16 *portno, u8 *protocol) const; + /* Get Port structure from PortList structure.*/ + const Port *lookupPort(u16 portno, u8 protocol) const; + Port *createPort(u16 portno, u8 protocol); +-- +1.7.10.4 + +From 536eb67f24f9f101cd4aa1c82510ebbe8086923d Mon Sep 17 00:00:00 2001 +From: David Fifield +Date: Fri, 21 Dec 2012 13:09:56 -0800 +Subject: [PATCH 4/4] Make ServiceNFO::currentprobe_timemsleft take a probe + argument. + +It seems that this function was usually called after having called +currentProbe outside the call to currentprobe_timemsleft, with the call +to currentProbe inside the function having the same result. This is a +bit tenuous, so make the probe we're talking about explicit. + +Resolves these Parfait reports +(http://seclists.org/nmap-dev/2012/q4/412). + +Error: Null pointer dereference (CWE 476) + Read from null pointer 'ServiceNFO::currentProbe(this)' + at line 1813 of components/nmap/build/amd64/service_scan.cc in function 'ServiceNFO::currentprobe_timemsleft(timeval const*)'. + Function 'ServiceNFO::currentProbe()' may return constant 'NULL' at line 1707, called at line 1813. + Null pointer introduced at line 1707 in function 'ServiceNFO::currentProbe()'. +--- + service_scan.cc | 25 ++++++++++++++----------- + 1 file changed, 14 insertions(+), 11 deletions(-) + +diff --git service_scan.cc service_scan.cc +index b800665..9428a9a 100644 +--- nmap-6.25/service_scan.cc ++++ nmap-6.25/service_scan.cc +@@ -191,7 +191,7 @@ public: + // Number of milliseconds left to complete the present probe, or 0 if + // the probe is already expired. Timeval can omitted, it is just there + // as an optimization in case you have it handy. +- int currentprobe_timemsleft(const struct timeval *now = NULL); ++ int probe_timemsleft(const ServiceProbe *probe, const struct timeval *now = NULL); + enum serviceprobestate probe_state; // defined in portlist.h + nsock_iod niod; // The IO Descriptor being used in this probe (or NULL) + u16 portno; // in host byte order +@@ -1799,7 +1799,7 @@ void ServiceNFO::resetProbes(bool freefp) { + } + + +-int ServiceNFO::currentprobe_timemsleft(const struct timeval *now) { ++int ServiceNFO::probe_timemsleft(const ServiceProbe *probe, const struct timeval *now) { + int timeused, timeleft; + + if (now) +@@ -1810,7 +1810,11 @@ int ServiceNFO::currentprobe_timemsleft(const struct timeval *now) { + timeused = TIMEVAL_MSEC_SUBTRACT(tv, currentprobe_exec_time); + } + +- timeleft = currentProbe()->totalwaitms - timeused; ++ // Historically this function was always called with the assumption that ++ // probe == currentProbe(). Check that this remains the case. ++ assert(probe == currentProbe()); ++ ++ timeleft = probe->totalwaitms - timeused; + return (timeleft < 0)? 0 : timeleft; + } + +@@ -1941,7 +1945,7 @@ static void adjustPortStateIfNecessary(ServiceNFO *svc) { + probestring = probe->getProbeString(&probestringlen); + assert(probestringlen > 0); + // Now we write the string to the IOD +- nsock_write(nsp, nsi, servicescan_write_handler, svc->currentprobe_timemsleft(), svc, ++ nsock_write(nsp, nsi, servicescan_write_handler, svc->probe_timemsleft(probe), svc, + (const char *) probestring, probestringlen); + return 0; + } +@@ -1967,7 +1971,7 @@ static void startNextProbe(nsock_pool nsp, nsock_iod nsi, ServiceGroup *SG, + svc->currentprobe_exec_time = *nsock_gettimeofday(); + send_probe_text(nsp, nsi, svc, probe); + nsock_read(nsp, nsi, servicescan_read_handler, +- svc->currentprobe_timemsleft(nsock_gettimeofday()), svc); ++ svc->probe_timemsleft(probe, nsock_gettimeofday()), svc); + } else { + // Should only happen if someone has a highly perverse nmap-service-probes + // file. Null scan should generally never be the only probe. +@@ -2016,7 +2020,7 @@ static void startNextProbe(nsock_pool nsp, nsock_iod nsi, ServiceGroup *SG, + send_probe_text(nsp, nsi, svc, probe); + // Now let us read any results + nsock_read(nsp, nsi, servicescan_read_handler, +- svc->currentprobe_timemsleft(nsock_gettimeofday()), svc); ++ svc->probe_timemsleft(probe, nsock_gettimeofday()), svc); + } + } else { + // No more probes remaining! Failed to match +@@ -2261,7 +2265,7 @@ static void servicescan_connect_handler(nsock_pool nsp, nsock_event nse, void *m + svc->currentprobe_exec_time = *nsock_gettimeofday(); + send_probe_text(nsp, nsi, svc, probe); + // Now let us read any results +- nsock_read(nsp, nsi, servicescan_read_handler, svc->currentprobe_timemsleft(nsock_gettimeofday()), svc); ++ nsock_read(nsp, nsi, servicescan_read_handler, svc->probe_timemsleft(probe, nsock_gettimeofday()), svc); + } else if (status == NSE_STATUS_TIMEOUT || status == NSE_STATUS_ERROR) { + // This is not good. The connect() really shouldn't generally + // be timing out like that. We'll mark this svc as incomplete +@@ -2421,13 +2425,12 @@ static void servicescan_read_handler(nsock_pool nsp, nsock_event nse, void *myda + // to timeout. For now I'll limit it to 4096 bytes just to + // avoid reading megs from services like chargen. But better + // approach is needed. +- if (svc->currentprobe_timemsleft() > 0 && readstrlen < 4096) { +- nsock_read(nsp, nsi, servicescan_read_handler, svc->currentprobe_timemsleft(), svc); ++ if (svc->probe_timemsleft(probe) > 0 && readstrlen < 4096) { ++ nsock_read(nsp, nsi, servicescan_read_handler, svc->probe_timemsleft(probe), svc); + } else { + // Failed -- lets go to the next probe. + if (readstrlen > 0) +- svc->addToServiceFingerprint(svc->currentProbe()->getName(), readstr, +- readstrlen); ++ svc->addToServiceFingerprint(probe->getName(), readstr, readstrlen); + startNextProbe(nsp, nsi, SG, svc, false); + } + } +-- +1.7.10.4 + diff -r 1d59d8c2a113 -r f20006f42637 components/nmap/patches/nsock.src.Makefile.in.patch --- a/components/nmap/patches/nsock.src.Makefile.in.patch Mon Feb 18 10:31:06 2013 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ ---- nmap-5.21/nsock/src/Makefile.in 2009-08-07 10:53:50.000000000 -0700 -+++ nmap-5.21/nsock/src/Makefile.in 2010-02-23 11:27:25.487769258 -0800 -@@ -43,11 +43,11 @@ - $(AR) cr $@ $(OBJS) - $(RANLIB) $@ - --$(NBASEDIR)/libnbase.a: $(NBASEDIR)/Makefile -+$(NBASEDIR)/libnbase.a: - cd $(NBASEDIR) && $(MAKE) - - clean: -- rm -f $(OBJS) $(TARGET) makefile.dep -+ rm -f $(OBJS) $(TARGET) - - distclean: clean - rm -f Makefile config.log config.status nsock_config.h -@@ -75,6 +75,3 @@ - config.status: configure - ./config.status --recheck - --makefile.dep: -- $(CC) -MM $(CPPFLAGS) $(SRCS) > $@ --include makefile.dep diff -r 1d59d8c2a113 -r f20006f42637 components/nmap/patches/nsock.src.configure.patch --- a/components/nmap/patches/nsock.src.configure.patch Mon Feb 18 10:31:06 2013 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ ---- nmap-5.21/nsock/src/configure.~1~ 2011-01-21 13:00:04.000000000 -0800 -+++ nmap-5.21/nsock/src/configure 2011-11-28 14:42:04.611753978 -0800 -@@ -1,4 +1,4 @@ --#! /bin/sh -+#! /bin/bash - # Guess values for system-dependent variables and create Makefiles. - # Generated by GNU Autoconf 2.66. - # -@@ -237,7 +237,7 @@ - fi - fi - fi --SHELL=${CONFIG_SHELL-/bin/sh} -+SHELL=${CONFIG_SHELL-/bin/bash} - export SHELL - # Unset more variables known to interfere with behavior of common tools. - CLICOLOR_FORCE= GREP_OPTIONS= -@@ -709,7 +709,7 @@ - datadir='${datarootdir}' - sysconfdir='${prefix}/etc' - sharedstatedir='${prefix}/com' --localstatedir='${prefix}/var' -+localstatedir= - includedir='${prefix}/include' - oldincludedir='/usr/include' - docdir='${datarootdir}/doc/${PACKAGE}' diff -r 1d59d8c2a113 -r f20006f42637 components/nmap/patches/tcpip.cc.patch --- a/components/nmap/patches/tcpip.cc.patch Mon Feb 18 10:31:06 2013 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ ---- nmap-5.51/tcpip.cc.orig 2012-07-12 12:01:16.192754248 -0700 -+++ nmap-5.51/tcpip.cc 2012-07-12 12:02:28.509427779 -0700 -@@ -1319,6 +1319,11 @@ - offset = 16; - break; - #endif -+#ifdef DLT_IPNET -+ case DLT_IPNET: -+ offset = 24; -+ break; -+#endif - default: - p = (char *) pcap_next(pd, &head); - if (head.caplen == 0) { diff -r 1d59d8c2a113 -r f20006f42637 components/nmap/patches/zenmap.setup.py.patch --- a/components/nmap/patches/zenmap.setup.py.patch Mon Feb 18 10:31:06 2013 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ ---- nmap-5.21/zenmap/setup.py 2010-01-26 16:57:31.000000000 -0800 -+++ nmap-5.21/zenmap/setup.py 2010-02-24 10:12:10.652841785 -0800 -@@ -324,7 +324,6 @@ - if not re_sys.match(line): - break - uline += 1 -- ucontent.insert(uline, "\nimport sys\nsys.path.append(%s)\n" % repr(modules)) - - ufile = open(app_file_name, "w") - ufile.writelines(ucontent)