7113185 upgrade nmap to 5.51
authorSrinivasa Sarva <srinivasa.sarva@oracle.com>
Thu, 01 Dec 2011 15:42:32 -0800
changeset 605 8dca74ad1a27
parent 604 c25824a87b1f
child 606 c0d139b44cad
7113185 upgrade nmap to 5.51 6767323 nmapfe has unlocalized nmapfe.desktop 6964664 nmap's ip-spoofing capability is broken 6997071 nmap chokes if allowed to pick interface
components/nmap/Makefile
components/nmap/nmap.license
components/nmap/nmap.p5m
components/nmap/nmapfe.desktop
components/nmap/patches/1.configure.patch
components/nmap/patches/2.Makefile.patch
components/nmap/patches/3.Makefile.patch
components/nmap/patches/4.Makefile.patch
components/nmap/patches/5.configure.patch
components/nmap/patches/6.configure.patch
components/nmap/patches/7.configure.patch
components/nmap/patches/8.configure.patch
components/nmap/patches/9.Makefile.patch
components/nmap/patches/91.tcpip.cc.patch
components/nmap/patches/92.intf.c.patch
components/nmap/patches/93.setup.py.patch
components/nmap/patches/94.eth-dlpi.c.patch
components/nmap/patches/Makefile.in.patch
components/nmap/patches/configure.patch
components/nmap/patches/libdnet-stripped.configure.patch
components/nmap/patches/libdnet-stripped.src.eth-dlpi.c.patch
components/nmap/patches/libdnet-stripped.src.intf.c.patch
components/nmap/patches/libnetutil.Makefile.in.patch
components/nmap/patches/libnetutil.netutil.cc.patch
components/nmap/patches/nbase.Makefile.in.patch
components/nmap/patches/nbase.configure.patch
components/nmap/patches/ncat.Makefile.in.patch
components/nmap/patches/ncat.configure.patch
components/nmap/patches/nsock.src.Makefile.in.patch
components/nmap/patches/nsock.src.configure.patch
components/nmap/patches/zenmap.setup.py.patch
--- a/components/nmap/Makefile	Wed Nov 30 06:39:13 2011 -0800
+++ b/components/nmap/Makefile	Thu Dec 01 15:42:32 2011 -0800
@@ -25,12 +25,12 @@
 
 include ../../make-rules/shared-macros.mk
 
-COMPONENT_NAME=		nmap
-COMPONENT_VERSION=	5.21
-COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tgz
-COMPONENT_ARCHIVE_HASH=	sha1:ce212ce765f842b16059456cf0c9d9cfbbce25d6
-COMPONENT_ARCHIVE_URL=	 http://nmap.org/dist/$(COMPONENT_ARCHIVE)
+COMPONENT_NAME=         nmap
+COMPONENT_VERSION=      5.51
+COMPONENT_SRC=          $(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tgz
+COMPONENT_ARCHIVE_HASH= sha1:bad24e4d332b293d08d8ce38583fefa176e9198d
+COMPONENT_ARCHIVE_URL=  http://nmap.org/dist/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
--- a/components/nmap/nmap.license	Wed Nov 30 06:39:13 2011 -0800
+++ b/components/nmap/nmap.license	Thu Dec 01 15:42:32 2011 -0800
@@ -8,13 +8,14 @@
 chooses the other license.
 -----------------------------------------------------------------------
 
+
 /***************************************************************************
  * 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-2006 Insecure.Com LLC. Nmap is    *
+ * The Nmap Security Scanner is (C) 1996-2011 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            *
@@ -33,28 +34,19 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   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 just meant to        *
- * clarify our interpretation of derived works with some common examples.  *
- * These restrictions only apply when you actually redistribute Nmap.  For *
- * example, nothing stops you from writing and selling a proprietary       *
- * front-end to Nmap.  Just distribute it by itself, and point people to   *
- * http://insecure.org/nmap/ to download Nmap.                             *
- *                                                                         *
- * We don't consider these to be added restrictions on top of the GPL, but *
- * just a clarification of how we interpret "derived works" as it applies  *
- * to our GPL-licensed Nmap product.  This is similar to the way Linus     *
- * Torvalds has announced his interpretation of how "derived works"        *
- * applies to Linux kernel modules.  Our interpretation refers only to     *
- * Nmap - we don't speak for any other GPL products.                       *
+ * 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.                                                              *
  *                                                                         *
  * 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,  *
@@ -68,8 +60,8 @@
  * 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.                                     *
@@ -85,24 +77,24 @@
  *                                                                         *
  * Source code also allows you to port Nmap to new platforms, fix bugs,    *
  * and add new features.  You are highly encouraged to send your changes   *
- * to [email protected] for possible incorporation into the main         *
- * distribution.  By sending these changes to Fyodor or one the            *
+ * to [email protected] 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 Fyodor and 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.                                                              *
+ * 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              *
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU       *
- * General Public License for more details at                              *
- * http://www.gnu.org/copyleft/gpl.html , or in the COPYING file included  *
- * with Nmap.                                                              *
+ * General Public License v2.0 for more details at                         *
+ * http://www.gnu.org/licenses/gpl-2.0.html , or in the COPYING file       *
+ * included with Nmap.                                                     *
  *                                                                         *
  ***************************************************************************/
 
--- a/components/nmap/nmap.p5m	Wed Nov 30 06:39:13 2011 -0800
+++ b/components/nmap/nmap.p5m	Thu Dec 01 15:42:32 2011 -0800
@@ -32,8 +32,7 @@
     value="org.opensolaris.category.2008:System/Administration and Configuration"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=http://insecure.org/
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2007/129
+set name=org.opensolaris.arc-caseid value=PSARC/2007/129
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
@@ -50,17 +49,6 @@
 dir path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets
 dir path=usr/share
 dir path=usr/share/applications
-dir path=usr/share/locale
-dir path=usr/share/locale/de
-dir path=usr/share/locale/de/LC_MESSAGES
-dir path=usr/share/locale/fr
-dir path=usr/share/locale/fr/LC_MESSAGES
-dir path=usr/share/locale/hr
-dir path=usr/share/locale/hr/LC_MESSAGES
-dir path=usr/share/locale/pt_BR
-dir path=usr/share/locale/pt_BR/LC_MESSAGES
-dir path=usr/share/locale/ru
-dir path=usr/share/locale/ru/LC_MESSAGES
 dir path=usr/share/man
 dir path=usr/share/man/man1
 dir path=usr/share/ncat
@@ -69,16 +57,27 @@
 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/pixmaps
 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
 file path=usr/bin/ncat
 file path=usr/bin/ndiff
 file path=usr/bin/nmap
+file path=usr/bin/nping
 file path=usr/bin/zenmap
 file path=usr/lib/python2.6/vendor-packages/radialnet/__init__.py
 file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/__init__.py
@@ -114,48 +113,43 @@
 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/zenmapCore/BasePaths.py \
-    pkg.depend.bypass-generate=.*
+file \
+    path=usr/lib/python2.6/vendor-packages/zenmap-$(COMPONENT_VERSION)-py2.6.egg-info
+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
 file path=usr/lib/python2.6/vendor-packages/zenmapCore/Name.py
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/NetworkInventory.py \
-    pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/NetworkInventory.py
 file path=usr/lib/python2.6/vendor-packages/zenmapCore/NmapCommand.py
 file path=usr/lib/python2.6/vendor-packages/zenmapCore/NmapOptions.py
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/NmapParser.py \
-    pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/Paths.py \
-    pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/RecentScans.py \
-    pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/SearchResult.py \
-    pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/TargetList.py \
-    pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/NmapParser.py
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/Paths.py
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/RecentScans.py
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/ScriptArgsParser.py
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/ScriptMetadata.py
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/SearchResult.py
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/StringPool.py
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/TargetList.py
 file path=usr/lib/python2.6/vendor-packages/zenmapCore/UmitConf.py \
     pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/UmitConfigParser.py \
-    pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/UmitConfigParser.py
 file path=usr/lib/python2.6/vendor-packages/zenmapCore/UmitDB.py \
     pkg.depend.bypass-generate=.*
 file path=usr/lib/python2.6/vendor-packages/zenmapCore/UmitLogging.py
 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
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/About.py \
-    pkg.depend.bypass-generate=.*
+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=.*
 file path=usr/lib/python2.6/vendor-packages/zenmapGUI/BugReport.py
 file path=usr/lib/python2.6/vendor-packages/zenmapGUI/CrashReport.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/DiffCompare.py \
-    pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/DiffCompare.py
 file path=usr/lib/python2.6/vendor-packages/zenmapGUI/FileChoosers.py
 file path=usr/lib/python2.6/vendor-packages/zenmapGUI/FilterBar.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/Icons.py \
-    pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/Icons.py
 file path=usr/lib/python2.6/vendor-packages/zenmapGUI/MainWindow.py \
     pkg.depend.bypass-generate=.*
 file path=usr/lib/python2.6/vendor-packages/zenmapGUI/NmapOutputProperties.py \
@@ -163,6 +157,7 @@
 file path=usr/lib/python2.6/vendor-packages/zenmapGUI/NmapOutputViewer.py \
     pkg.depend.bypass-generate=.*
 file path=usr/lib/python2.6/vendor-packages/zenmapGUI/OptionBuilder.py
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/Print.py
 file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ProfileCombo.py
 file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ProfileEditor.py
 file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ProfileHelp.py
@@ -175,66 +170,48 @@
 file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanScanListPage.py
 file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanToolbar.py
 file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScansListStore.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/SearchGUI.py \
-    pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScriptInterface.py
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/SearchGUI.py
 file path=usr/lib/python2.6/vendor-packages/zenmapGUI/SearchWindow.py \
     pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/Splash.py \
-    pkg.depend.bypass-generate=.*
 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
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/__init__.py \
-    pkg.depend.bypass-generate=.*
+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 \
-    pkg.depend.bypass-generate=.*
+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 \
-    pkg.depend.bypass-generate=.*
+    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 \
-    pkg.depend.bypass-generate=.*
+    path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higlogindialogs.py
 file \
-    path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/hignotebooks.py \
-    pkg.depend.bypass-generate=.*
+    path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/hignotebooks.py
 file \
-    path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higprogressbars.py \
-    pkg.depend.bypass-generate=.*
+    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 \
-    pkg.depend.bypass-generate=.*
+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/higwindows.py
 file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/utils.py
-file nmapfe.desktop path=usr/share/applications/nmapfe.desktop
 file path=usr/share/applications/zenmap-root.desktop
 file path=usr/share/applications/zenmap.desktop
-file zenmap/share/zenmap/locale/de/LC_MESSAGES/zenmap.mo \
-    path=usr/share/locale/de/LC_MESSAGES/zenmap.mo
-file zenmap/share/zenmap/locale/fr/LC_MESSAGES/zenmap.mo \
-    path=usr/share/locale/fr/LC_MESSAGES/zenmap.mo
-file zenmap/share/zenmap/locale/hr/LC_MESSAGES/zenmap.mo \
-    path=usr/share/locale/hr/LC_MESSAGES/zenmap.mo
-file zenmap/share/zenmap/locale/pt_BR/LC_MESSAGES/zenmap.mo \
-    path=usr/share/locale/pt_BR/LC_MESSAGES/zenmap.mo
-file zenmap/share/zenmap/locale/ru/LC_MESSAGES/zenmap.mo \
-    path=usr/share/locale/ru/LC_MESSAGES/zenmap.mo
 file path=usr/share/man/man1/ncat.1
 file path=usr/share/man/man1/ndiff.1
 file path=usr/share/man/man1/nmap.1
+file path=usr/share/man/man1/nping.1
 file path=usr/share/man/man1/zenmap.1
-file ncat/certs/ca-bundle.crt path=usr/share/ncat/ca-bundle.crt
+file path=usr/share/ncat/ca-bundle.crt
 file path=usr/share/nmap/nmap-mac-prefixes
 file path=usr/share/nmap/nmap-os-db
+file path=usr/share/nmap/nmap-payloads
 file path=usr/share/nmap/nmap-protocols
 file path=usr/share/nmap/nmap-rpc
 file path=usr/share/nmap/nmap-service-probes
@@ -242,56 +219,43 @@
 file path=usr/share/nmap/nmap.dtd
 file path=usr/share/nmap/nmap.xsl
 file path=usr/share/nmap/nse_main.lua
+file path=usr/share/nmap/nselib/afp.lua
+file path=usr/share/nmap/nselib/asn1.lua
 file path=usr/share/nmap/nselib/base64.lua
+file path=usr/share/nmap/nselib/brute.lua
 file path=usr/share/nmap/nselib/citrixxml.lua
 file path=usr/share/nmap/nselib/comm.lua
-file nselib/data/favicon-db path=usr/share/nmap/nselib/data/favicon-db
-file nselib/data/folders.lst path=usr/share/nmap/nselib/data/folders.lst
-file nselib/data/http-fingerprints \
-    path=usr/share/nmap/nselib/data/http-fingerprints
-file nselib/data/oracle-sids path=usr/share/nmap/nselib/data/oracle-sids
-file nselib/data/passwords.lst path=usr/share/nmap/nselib/data/passwords.lst
-file nselib/data/psexec/README path=usr/share/nmap/nselib/data/psexec/README
-file nselib/data/psexec/backdoor.lua \
-    path=usr/share/nmap/nselib/data/psexec/backdoor.lua
-file nselib/data/psexec/default.lua \
-    path=usr/share/nmap/nselib/data/psexec/default.lua
-file nselib/data/psexec/drives.lua \
-    path=usr/share/nmap/nselib/data/psexec/drives.lua
-file nselib/data/psexec/encoder.c \
-    path=usr/share/nmap/nselib/data/psexec/encoder.c
-file nselib/data/psexec/examples.lua \
-    path=usr/share/nmap/nselib/data/psexec/examples.lua
-file nselib/data/psexec/experimental.lua \
-    path=usr/share/nmap/nselib/data/psexec/experimental.lua
-file nselib/data/psexec/network.lua \
-    path=usr/share/nmap/nselib/data/psexec/network.lua
-file nselib/data/psexec/nmap_service.c \
-    path=usr/share/nmap/nselib/data/psexec/nmap_service.c
-file nselib/data/psexec/nmap_service.exe \
-    path=usr/share/nmap/nselib/data/psexec/nmap_service.exe
-file nselib/data/psexec/nmap_service.vcproj \
-    path=usr/share/nmap/nselib/data/psexec/nmap_service.vcproj
-file nselib/data/psexec/pwdump.lua \
-    path=usr/share/nmap/nselib/data/psexec/pwdump.lua
-file nselib/data/usernames.lst path=usr/share/nmap/nselib/data/usernames.lst
-file nselib/data/yokoso-fingerprints \
-    path=usr/share/nmap/nselib/data/yokoso-fingerprints
 file path=usr/share/nmap/nselib/datafiles.lua
+file path=usr/share/nmap/nselib/dhcp.lua
 file path=usr/share/nmap/nselib/dns.lua
+file path=usr/share/nmap/nselib/dnssd.lua
+file path=usr/share/nmap/nselib/drda.lua
+file path=usr/share/nmap/nselib/ftp.lua
+file path=usr/share/nmap/nselib/giop.lua
 file path=usr/share/nmap/nselib/http.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/iscsi.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/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/netbios.lua
+file path=usr/share/nmap/nselib/nrpc.lua
 file path=usr/share/nmap/nselib/nsedebug.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/proxy.lua
+file path=usr/share/nmap/nselib/rmi.lua
+file path=usr/share/nmap/nselib/rpc.lua
 file path=usr/share/nmap/nselib/shortport.lua
 file path=usr/share/nmap/nselib/smb.lua
 file path=usr/share/nmap/nselib/smbauth.lua
@@ -302,56 +266,140 @@
 file path=usr/share/nmap/nselib/strbuf.lua
 file path=usr/share/nmap/nselib/strict.lua
 file path=usr/share/nmap/nselib/tab.lua
+file path=usr/share/nmap/nselib/target.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/vnc.lua
+file path=usr/share/nmap/nselib/wsdd.lua
+file path=usr/share/nmap/scripts/afp-brute.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/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/banner.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-ms-sql-discover.nse
+file path=usr/share/nmap/scripts/broadcast-upnp-info.nse
+file path=usr/share/nmap/scripts/broadcast-wsdd-discover.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
 file path=usr/share/nmap/scripts/citrix-enum-servers-xml.nse
 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/daap-get-library.nse
 file path=usr/share/nmap/scripts/daytime.nse
-file path=usr/share/nmap/scripts/db2-info.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/dns-cache-snoop.nse
+file path=usr/share/nmap/scripts/dns-fuzz.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-update.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/drda-brute.nse
+file path=usr/share/nmap/scripts/drda-info.nse
 file path=usr/share/nmap/scripts/finger.nse
+file path=usr/share/nmap/scripts/firewalk.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/html-title.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/giop-info.nse
+file path=usr/share/nmap/scripts/gopher-ls.nse
+file path=usr/share/nmap/scripts/hddtemp-info.nse
+file path=usr/share/nmap/scripts/hostmap.nse
 file path=usr/share/nmap/scripts/http-auth.nse
+file path=usr/share/nmap/scripts/http-brute.nse
 file path=usr/share/nmap/scripts/http-date.nse
+file path=usr/share/nmap/scripts/http-domino-enum-passwords.nse
 file path=usr/share/nmap/scripts/http-enum.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-headers.nse
 file path=usr/share/nmap/scripts/http-iis-webdav-vuln.nse
 file path=usr/share/nmap/scripts/http-malware-host.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-passwd.nse
+file path=usr/share/nmap/scripts/http-php-version.nse
+file path=usr/share/nmap/scripts/http-robots.txt.nse
+file path=usr/share/nmap/scripts/http-title.nse
 file path=usr/share/nmap/scripts/http-trace.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-vmware-path-vuln.nse
 file path=usr/share/nmap/scripts/iax2-version.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/ipidseq.nse
 file path=usr/share/nmap/scripts/irc-info.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/jdwp-version.nse
+file path=usr/share/nmap/scripts/ldap-brute.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/modbus-discover.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/ms-sql-brute.nse
+file path=usr/share/nmap/scripts/ms-sql-config.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/mysql-brute.nse
+file path=usr/share/nmap/scripts/mysql-databases.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-users.nse
+file path=usr/share/nmap/scripts/mysql-variables.nse
+file path=usr/share/nmap/scripts/nat-pmp-info.nse
 file path=usr/share/nmap/scripts/nbstat.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/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/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/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/p2p-conficker.nse
+file path=usr/share/nmap/scripts/path-mtu.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/realvnc-auth-bypass.nse
-file path=usr/share/nmap/scripts/robots.txt.nse
+file path=usr/share/nmap/scripts/resolveall.nse
+file path=usr/share/nmap/scripts/rmi-dumpregistry.nse
 file path=usr/share/nmap/scripts/rpcinfo.nse
 file path=usr/share/nmap/scripts/script.db
 file path=usr/share/nmap/scripts/skypev2-version.nse
@@ -363,6 +411,7 @@
 file path=usr/share/nmap/scripts/smb-enum-sessions.nse
 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-os-discovery.nse
 file path=usr/share/nmap/scripts/smb-psexec.nse
 file path=usr/share/nmap/scripts/smb-security-mode.nse
@@ -370,26 +419,47 @@
 file path=usr/share/nmap/scripts/smb-system-info.nse
 file path=usr/share/nmap/scripts/smbv2-enabled.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/sniffer-detect.nse
 file path=usr/share/nmap/scripts/snmp-brute.nse
+file path=usr/share/nmap/scripts/snmp-interfaces.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
+file path=usr/share/nmap/scripts/snmp-win32-services.nse
+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-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-enum-ciphers.nse
 file path=usr/share/nmap/scripts/sslv2.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-traceroute.nse
 file path=usr/share/nmap/scripts/telnet-brute.nse
 file path=usr/share/nmap/scripts/upnp-info.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/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 nmapfe.png path=usr/share/pixmaps/nmapfe.png
 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
 file path=usr/share/zenmap/docs/help.html
+file path=usr/share/zenmap/locale/de/LC_MESSAGES/zenmap.mo
+file path=usr/share/zenmap/locale/fr/LC_MESSAGES/zenmap.mo
+file path=usr/share/zenmap/locale/hr/LC_MESSAGES/zenmap.mo
+file path=usr/share/zenmap/locale/pt_BR/LC_MESSAGES/zenmap.mo
+file path=usr/share/zenmap/locale/ru/LC_MESSAGES/zenmap.mo
 file path=usr/share/zenmap/misc/profile_editor.xml
 file path=usr/share/zenmap/pixmaps/default_32.png
 file path=usr/share/zenmap/pixmaps/default_75.png
@@ -414,7 +484,6 @@
 file path=usr/share/zenmap/pixmaps/redhat_75.png
 file path=usr/share/zenmap/pixmaps/solaris_32.png
 file path=usr/share/zenmap/pixmaps/solaris_75.png
-file path=usr/share/zenmap/pixmaps/splash.png
 file path=usr/share/zenmap/pixmaps/throbber.gif
 file path=usr/share/zenmap/pixmaps/throbber.png
 file path=usr/share/zenmap/pixmaps/ubuntu_32.png
--- a/components/nmap/nmapfe.desktop	Wed Nov 30 06:39:13 2011 -0800
+++ b/components/nmap/nmapfe.desktop	Thu Dec 01 15:42:32 2011 -0800
@@ -2,7 +2,27 @@
 Encoding=UTF-8
 Name=NmapFE
 GenericName=Security Scanner
+GenericName[de]=Sicherheits-Scanner
+GenericName[es]=Escáner de seguridad
+GenericName[fr]=Scanner de sécurité
+GenericName[it]=Scansione di protezione
+GenericName[ja]=セキュリティースキャナ
+GenericName[ko]=보안 스캐너
+GenericName[pt_BR]=Escâner de segurança
+GenericName[zh_CN]=安全扫描程序
+GenericName[zh_HK]=安全性掃描器
+GenericName[zh_TW]=安全性掃描器
 Comment=Scan and monitor services provided by other computers on the network
+Comment[de]=Von anderen Computern im Netzwerk bereitgestellte Dienste suchen und überwachen
+Comment[es]=Explorar y monitorizar los servicios que proporcionen otros equipos de la red
+Comment[fr]=Examiner et contrôler les services fournis par d'autres ordinateurs sur le réseau
+Comment[it]=Servizi di scansione e monitoraggio forniti da altri computer della rete
+Comment[ja]=ネットワーク上のほかのコンピュータが提供するサービスをスキャンおよび監視します
+Comment[ko]=네트워크의 다른 컴퓨터에서 제공하는 검색 및 모니터 서비스
+Comment[pt_BR]=Explorar e monitorar os serviços fornecidos por outros computadores da rede
+Comment[zh_CN]=扫描和监视网络上其他计算机提供的服务
+Comment[zh_HK]=掃描和監視網路上其他電腦提供的服務
+Comment[zh_TW]=掃描和監視網路上其他電腦提供的服務
 Version=1.0
 TryExec=nmapfe
 Exec=nmapfe
--- a/components/nmap/patches/1.configure.patch	Wed Nov 30 06:39:13 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
---- nmap-5.21/nbase/configure.~1~	Thu Aug 13 14:54:55 2009
-+++ nmap-5.21/nbase/configure	Mon Mar 21 15:32:17 2011
[email protected]@ -1,4 +1,4 @@
--#! /bin/sh
-+#! /bin/bash
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.63.
- #
[email protected]@ -589,7 +589,7 @@
- subdirs=
- MFLAGS=
- MAKEFLAGS=
--SHELL=${CONFIG_SHELL-/bin/sh}
-+SHELL=${CONFIG_SHELL-/bin/bash}
- 
- # Identity of this package.
- PACKAGE_NAME=
[email protected]@ -657,7 +657,9 @@
- CPPFLAGS
- LDFLAGS
- CFLAGS
-+CXXFLAGS
- CC
-+CXX
- target_alias
- host_alias
- build_alias
[email protected]@ -706,7 +708,9 @@
- host_alias
- target_alias
- CC
-+CXX
- CFLAGS
-+CXXFLAGS
- LDFLAGS
- LIBS
- CPPFLAGS
[email protected]@ -748,7 +752,7 @@
- datadir='${datarootdir}'
- sysconfdir='${prefix}/etc'
- sharedstatedir='${prefix}/com'
--localstatedir='${prefix}/var'
-+localstatedir=
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
- docdir='${datarootdir}/doc/${PACKAGE}'
[email protected]@ -3916,6 +3920,10 @@
- 
- 	#include <stdlib.h>
- 
-+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-+#error "GNU __attribute__ extension not suported "
-+#endif
-+
- 	static void foo(void) __attribute__ ((noreturn));
- 
- 	static void
--- a/components/nmap/patches/2.Makefile.patch	Wed Nov 30 06:39:13 2011 -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
[email protected]@ -6,7 +6,7 @@
- srcdir = @[email protected]
- 
- CC = @[email protected]
--AR = ar
-+CXX = @[email protected]
- RANLIB = @[email protected]
- CCOPT = 
- DEFS = @[email protected]
[email protected]@ -14,12 +14,14 @@
- DEFS += -D_FORTIFY_SOURCE=2
- CPPFLAGS = @[email protected]
- CFLAGS = @[email protected] $(CCOPT) $(GLIB_CFLAGS) $(DEFS) $(INCLS)
-+CXXFLAGS = @[email protected]
- STATIC = 
- LDFLAGS = @[email protected] $(STATIC)
- LIBS =  @[email protected] 
- SHTOOL = ./shtool
- INSTALL = $(SHTOOL) install 
- MAKEDEPEND = @[email protected]
-+AR = /usr/ccs/bin/ar cq
- 
- TARGET = libnbase.a
- 
[email protected]@ -30,7 +32,7 @@
- 
- $(TARGET): $(DEPS) $(OBJS)
- 	rm -f [email protected]
--	$(AR) cr [email protected] $(OBJS)
-+	$(AR) [email protected] $(OBJS)
- 	$(RANLIB) [email protected]
- 
- clean:
[email protected]@ -51,8 +53,10 @@
- config.status: configure
- 	./config.status --recheck
- 
-+.c.o:
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o [email protected]
- .cc.o:
--	$(CC) -c $(CFLAGS) $*.cc
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< o [email protected]
- 
- # DO NOT DELETE -- Needed by makedepend
- 
--- a/components/nmap/patches/3.Makefile.patch	Wed Nov 30 06:39:13 2011 -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
[email protected]@ -43,11 +43,11 @@
- 	$(AR) cr [email protected] $(OBJS)
- 	$(RANLIB) [email protected]
- 
--$(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
[email protected]@ -75,6 +75,3 @@
- config.status: configure
- 	./config.status --recheck
- 
--makefile.dep:
--	$(CC) -MM $(CPPFLAGS) $(SRCS) > [email protected]
--include makefile.dep
--- a/components/nmap/patches/4.Makefile.patch	Wed Nov 30 06:39:13 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
---- nmap-5.21/ncat/Makefile.in	2010-01-11 11:41:56.000000000 -0800
-+++ nmap-5.21/ncat/Makefile.in	2010-03-12 08:44:44.631386263 -0800
[email protected]@ -120,11 +120,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)
- 
[email protected]@ -161,6 +161,6 @@
- .NOEXPORT:
- 
- makefile.dep:
--	$(CC) -MM $(CPPFLAGS) $(SRCS) > [email protected]
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -MM $(SRCS) > [email protected]
- include makefile.dep
- 
--- a/components/nmap/patches/5.configure.patch	Wed Nov 30 06:39:13 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,190 +0,0 @@
---- nmap-5.21/libdnet-stripped/configure.~1~	Thu Jan 14 08:47:28 2010
-+++ nmap-5.21/libdnet-stripped/configure	Mon Mar 21 15:33:21 2011
[email protected]@ -1,4 +1,4 @@
--#! /bin/sh
-+#! /bin/bash
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.63.
- #
[email protected]@ -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)
[email protected]@ -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
[email protected]@ -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+"[email protected]"}
-+	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/bash}} "$0" ${1+"[email protected]"}
- 	  else
- 	    # Oops.  We lost completely, so just stick with echo.
- 	    ECHO=echo
[email protected]@ -738,7 +738,7 @@
- subdirs=
- MFLAGS=
- MAKEFLAGS=
--SHELL=${CONFIG_SHELL-/bin/sh}
-+SHELL=${CONFIG_SHELL-/bin/bash}
- 
- # Identity of this package.
- PACKAGE_NAME=
[email protected]@ -965,7 +965,7 @@
- datadir='${datarootdir}'
- sysconfdir='${prefix}/etc'
- sharedstatedir='${prefix}/com'
--localstatedir='${prefix}/var'
-+localstateir=
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
- docdir='${datarootdir}/doc/${PACKAGE}'
[email protected]@ -2318,7 +2318,7 @@
-   $as_echo_n "(cached) " >&6
- else
-   cat >conftest.make <<\_ACEOF
--SHELL = /bin/sh
-+SHELL = /bin/bash
- all:
- 	@echo '@@@%%%=$(MAKE)[email protected]@@%%%'
- _ACEOF
[email protected]@ -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
[email protected]@ -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
[email protected]@ -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
[email protected]@ -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
[email protected]@ -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
[email protected]@ -4576,7 +4576,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.
[email protected]@ -12025,13 +12025,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
[email protected]@ -12039,13 +12039,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 <stropts.h>
-+#include <sys/types.h>
-+#include <net/if.h>
-+#include <sys/socket.h>
-+#include <sys/filio.h>
-+
- int
- main ()
- {
[email protected]@ -12095,7 +12094,7 @@
- #define HAVE_LIBSTR 1
- _ACEOF
- 
--  LIBS="-lstr $LIBS"
-+  LIBS=" -lc -lsocket -lresolv -lnsl -lgen $LIBS"
- 
- fi
- 
[email protected]@ -14380,15 +14379,8 @@
-     fi
- 	{ $as_echo "$as_me:$LINENO: checking for Linux PF_PACKET sockets" >&5
- $as_echo_n "checking for Linux PF_PACKET sockets... " >&6; }
--    if test "${ac_cv_dnet_linux_pf_packet+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--  if test -f /usr/include/netpacket/packet.h ; then
--	    ac_cv_dnet_linux_pf_packet=yes
--	else
-+
- 	    ac_cv_dnet_linux_pf_packet=no
--	fi
--fi
- 
-     { $as_echo "$as_me:$LINENO: result: $ac_cv_dnet_linux_pf_packet" >&5
- $as_echo "$ac_cv_dnet_linux_pf_packet" >&6; }
--- a/components/nmap/patches/6.configure.patch	Wed Nov 30 06:39:13 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
---- nmap-5.21/ncat/configure.~1~	Mon Jan 11 11:41:56 2010
-+++ nmap-5.21/ncat/configure	Mon Mar 21 15:32:46 2011
[email protected]@ -1,4 +1,4 @@
--#! /bin/sh
-+#! /bin/bash
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.63.
- #
[email protected]@ -589,7 +589,7 @@
- subdirs=
- MFLAGS=
- MAKEFLAGS=
--SHELL=${CONFIG_SHELL-/bin/sh}
-+SHELL=${CONFIG_SHELL-/bin/bash}
- 
- # Identity of this package.
- PACKAGE_NAME=
[email protected]@ -755,7 +755,7 @@
- datadir='${datarootdir}'
- sysconfdir='${prefix}/etc'
- sharedstatedir='${prefix}/com'
--localstatedir='${prefix}/var'
-+localstatedir=
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
- docdir='${datarootdir}/doc/${PACKAGE}'
--- a/components/nmap/patches/7.configure.patch	Wed Nov 30 06:39:13 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
---- nmap-5.21/nsock/src/configure.~1~	Fri Aug  7 11:18:16 2009
-+++ nmap-5.21/nsock/src/configure	Mon Mar 21 15:34:06 2011
[email protected]@ -1,4 +1,4 @@
--#! /bin/sh
-+#! /bin/bash
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.63.
- #
[email protected]@ -589,7 +589,7 @@
- subdirs=
- MFLAGS=
- MAKEFLAGS=
--SHELL=${CONFIG_SHELL-/bin/sh}
-+SHELL=${CONFIG_SHELL-/bin/bash}
- 
- # Identity of this package.
- PACKAGE_NAME=
[email protected]@ -751,7 +751,7 @@
- datadir='${datarootdir}'
- sysconfdir='${prefix}/etc'
- sharedstatedir='${prefix}/com'
--localstatedir='${prefix}/var'
-+localstatedir=
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
- docdir='${datarootdir}/doc/${PACKAGE}'
--- a/components/nmap/patches/8.configure.patch	Wed Nov 30 06:39:13 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
---- nmap-5.21/configure.~1~	Thu Nov  5 11:50:33 2009
-+++ nmap-5.21/configure	Mon Mar 21 16:56:04 2011
[email protected]@ -1,4 +1,4 @@
--#! /bin/sh
-+#! /bin/bash
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.63.
- #
[email protected]@ -589,7 +589,7 @@
- subdirs=
- MFLAGS=
- MAKEFLAGS=
--SHELL=${CONFIG_SHELL-/bin/sh}
-+SHELL=${CONFIG_SHELL-/bin/bash}
- 
- # Identity of this package.
- PACKAGE_NAME=
[email protected]@ -832,7 +832,7 @@
- datadir='${datarootdir}'
- sysconfdir='${prefix}/etc'
- sharedstatedir='${prefix}/com'
--localstatedir='${prefix}/var'
-+localstatedir=
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
- docdir='${datarootdir}/doc/${PACKAGE}'
[email protected]@ -3973,7 +3973,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 >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
[email protected]@ -4012,7 +4012,7 @@
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	CXXFLAGS=""
-+	CXXFLAGS="$CXXFLAGS"
-       cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
[email protected]@ -4052,7 +4052,7 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
--	 CXXFLAGS="-g"
-+	 CXXFLAGS="$CXXFLAGS"
- 	 cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
[email protected]@ -4109,15 +4109,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
[email protected]@ -4223,7 +4223,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
[email protected]@ -6024,8 +6024,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'`
[email protected]@ -6054,8 +6053,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'`
[email protected]@ -6723,7 +6721,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--#include <pcap.h>
-+#include <pcap/pcap.h>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (ac_try="$ac_compile"
[email protected]@ -6764,7 +6762,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <pcap.h>
-+#include <pcap/pcap.h>
- _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
- case "(($ac_try" in
--- a/components/nmap/patches/9.Makefile.patch	Wed Nov 30 06:39:13 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,140 +0,0 @@
---- nmap-5.21/Makefile.in	2009-12-12 12:26:15.000000000 -0800
-+++ nmap-5.21/Makefile.in	2010-02-23 11:34:57.694961587 -0800
[email protected]@ -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/
- [email protected]@
- prefix = @[email protected]
- exec_prefix = @[email protected]
[email protected]@ -13,12 +15,12 @@
- deskdir = $(prefix)/share/applications
- NMAPDEVDIR=~/nmap-private-dev
- 
--export [email protected]@
--export [email protected]@
--export LIBLUADIR = @[email protected]
-+export NBASEDIR=$(TOPDIR)/@[email protected]
-+export NSOCKDIR=$(TOPDIR)/@[email protected]
-+export LIBLUADIR=$(TOPDIR)/@[email protected]
- export NDIR=$(shell pwd)
--export LIBLUA_LIBS = @[email protected]
--export [email protected]@
-+export LIBLUA_LIBS=$(TOPDIR)/@[email protected]
-+export NCATDIR=$(TOPDIR)/@[email protected]
- CC = @[email protected]
- CXX = @[email protected]
- CCOPT = 
[email protected]@ -26,9 +28,9 @@
- STRIP = @[email protected]
- LIBPCAPDIR = @[email protected]
- LIBPCREDIR = @[email protected]
--export LIBDNETDIR = @[email protected]
--ZENMAPDIR = zenmap
--NDIFFDIR = ndiff
-+export LIBDNETDIR=$(TOPDIR)/@[email protected]
-+ZENMAPDIR=$(TOPDIR)/zenmap
-+NDIFFDIR=$(TOPDIR)/ndiff
- PYTHON = @[email protected]
- DEFS = @[email protected] -DNMAP_NAME=\"$(NMAP_NAME)\" -DNMAP_URL=\"$(NMAP_URL)\" -DNMAP_PLATFORM=\"$(NMAP_PLATFORM)\" -DNMAPDATADIR=\"$(nmapdatadir)\"
- # With GCC, add extra security checks to source code.
[email protected]@ -39,13 +41,13 @@
- # 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 = @[email protected] $(DBGFLAGS) $(CCOPT) $(DEFS)
-+export CXXFLAGS = @[email protected] $(DBGFLAGS) $(CCOPT) $(DEFS) $(INCLS)
-+export CFLAGS = @[email protected] $(DBGFLAGS) $(CCOPT) $(DEFS) $(INCLS)
- CPPFLAGS = @[email protected]
--export CFLAGS = $(CXXFLAGS)
- # CFLAGS = $(DEFS) $(INCLS)
- STATIC =
--LDFLAGS = @[email protected] $(DBGFLAGS) $(STATIC)
--LIBS =  @[email protected] @[email protected] @[email protected] @[email protected] @[email protected] @[email protected] @[email protected] @[email protected] 
-+LDFLAGS = @[email protected] $(DBGFLAGS) $(STATIC) -z ignore
-+LIBS =  @[email protected] @[email protected] @[email protected] @[email protected] @[email protected] @[email protected] @[email protected] @[email protected] -lsocket -lnsl -lgen
- # LIBS =  -lefence @[email protected]
- # LIBS =  -lrmalloc @[email protected]
- INSTALL = @[email protected]
[email protected]@ -95,7 +97,10 @@
- 
- # %.o : %.cc -- nope this is a GNU extension
- .cc.o:
--	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o [email protected]
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o [email protected]
-+
-+.c.o:
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o [email protected]
- 
- all: @[email protected] @[email protected] @[email protected] @[email protected] @[email protected] @[email protected] @[email protected]
- 	$(MAKE) $(TARGET) $(BUILDZENMAP) $(BUILDNDIFF)
[email protected]@ -103,7 +108,7 @@
- $(TARGET): @[email protected] @[email protected] @[email protected] @[email protected] $(NBASEDIR)/libnbase.a $(NSOCKDIR)/src/libnsock.a $(OBJS)
- 	@echo Compiling nmap
- 	rm -f [email protected]
--	$(CXX) $(LDFLAGS) -o [email protected] $(OBJS) $(LIBS)
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o [email protected] $(OBJS) $(LIBS)
- 
- pcre_build: $(LIBPCREDIR)/Makefile
- 	@echo Compiling libpcre; cd $(LIBPCREDIR) && $(MAKE)
[email protected]@ -207,7 +212,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.
[email protected]@ -252,6 +259,8 @@
- 	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)")
- 	$(INSTALL) -c -m 644 docs/zenmap.1 $(DESTDIR)$(mandir)/man1/
[email protected]@ -337,7 +346,7 @@
- 	./config.status --recheck
- 
- makefile.dep:
--	$(CXX) -MM $(CPPFLAGS) $(SRCS) > [email protected]
-+	$(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 }' > [email protected]
- include makefile.dep
- 
- # These the old names of scripts that have been renamed or deleted. Any
---- nmap-5.21/Makefile.in.orig	Thu Mar 17 14:57:06 2011
-+++ nmap-5.21/Makefile.in	Thu Mar 17 15:08:06 2011
[email protected]@ -32,6 +32,7 @@
- ZENMAPDIR=$(TOPDIR)/zenmap
- NDIFFDIR=$(TOPDIR)/ndiff
- PYTHON = @[email protected]
-+PYTHONDIR = @[email protected]
- DEFS = @[email protected] -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
[email protected]@ -262,7 +263,7 @@
- 	$(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.
[email protected]@ -276,7 +277,7 @@
- 	cd $(NDIFFDIR) && $(PYTHON) setup.py build $(if $(DESTDIR),--executable "$(DEFAULT_PYTHON_PATH)")
- 
- 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
--- a/components/nmap/patches/91.tcpip.cc.patch	Wed Nov 30 06:39:13 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- nmap-5.21/tcpip.cc	2010-01-14 19:55:23.000000000 -0800
-+++ nmap-5.21/tcpip.cc	2010-03-09 20:30:38.315876272 -0800
[email protected]@ -3124,7 +3124,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)
--- a/components/nmap/patches/92.intf.c.patch	Wed Nov 30 06:39:13 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- 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
[email protected]@ -323,7 +323,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) {
--#if defined(SIOCSIFHWADDR)
-+#if defined(SIOCSIFHWADDR) && (!defined(sun) && !defined(__sun) && !defined(__sun))
- 		if (addr_ntos(&entry->intf_link_addr, &ifr.ifr_hwaddr) < 0)
- 			return (-1);
- 		if (ioctl(intf->fd, SIOCSIFHWADDR, &ifr) < 0)
--- a/components/nmap/patches/93.setup.py.patch	Wed Nov 30 06:39:13 2011 -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
[email protected]@ -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)
--- a/components/nmap/patches/94.eth-dlpi.c.patch	Wed Nov 30 06:39:13 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
---- nmap-5.21/libdnet-stripped/src/eth-dlpi.c	2008-09-18 23:12:25.000000000 -0700
-+++ nmap-5.21/libdnet-stripped/src/eth-dlpi.c	2011-07-08 02:15:01.517564899 -0700
[email protected]@ -120,7 +120,7 @@
- {
- 	union DL_primitives *dlp;
- 	uint32_t buf[8192];
--	char *p, dev[16];
-+	char *p, dev[64];
- 	eth_t *e;
- 	int ppa;
- 
[email protected]@ -145,6 +145,9 @@
- 	ppa = atoi(p);
- 	*p = '\0';
- 
-+#if defined(sun) || defined(__sun) || defined(__sun)
-+	snprintf(dev, sizeof(dev), "/dev/net/%s", device);
-+#endif
- 	if ((e->fd = open(dev, O_RDWR)) < 0) {
- 		snprintf(dev, sizeof(dev), "/dev/%s", device);
- 		if ((e->fd = open(dev, O_RDWR)) < 0)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/nmap/patches/Makefile.in.patch	Thu Dec 01 15:42:32 2011 -0800
@@ -0,0 +1,154 @@
+--- 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
[email protected]@ -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/
+ [email protected]@
+ prefix = @[email protected]
+ exec_prefix = @[email protected]
[email protected]@ -14,12 +16,12 @@
+ deskdir = $(prefix)/share/applications
+ NMAPDEVDIR=~/nmap-private-dev
+ 
+-export [email protected]@
+-export [email protected]@
+-export LIBLUADIR = @[email protected]
++export NBASEDIR=$(TOPDIR)/@[email protected]
++export NSOCKDIR=$(TOPDIR)/@[email protected]
++export LIBLUADIR=$(TOPDIR)/@[email protected]
+ export NDIR=$(shell pwd)
+-export LIBLUA_LIBS = @[email protected]
+-export [email protected]@
++export LIBLUA_LIBS=$(TOPDIR)/@[email protected]
++export NCATDIR=$(TOPDIR)/@[email protected]
+ CC = @[email protected]
+ CXX = @[email protected]
+ CCOPT = 
[email protected]@ -27,27 +29,29 @@
+ STRIP = @[email protected]
+ LIBPCAPDIR = @[email protected]
+ LIBPCREDIR = @[email protected]
+-export LIBDNETDIR = @[email protected]
+-ZENMAPDIR = @[email protected]
+-NDIFFDIR = @[email protected]
++export LIBDNETDIR=$(TOPDIR)/@[email protected]
++ZENMAPDIR=$(TOPDIR)/zenmap
++NDIFFDIR=$(TOPDIR)/ndiff
+ NPINGDIR = @[email protected]
+ PYTHON = @[email protected]
++PYTHONDIR = @[email protected]
+ DEFS = @[email protected] -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 = @[email protected] $(DBGFLAGS) $(CCOPT) $(DEFS) $(INCLS)
++export CFLAGS = @[email protected] $(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 = @[email protected] $(DBGFLAGS) $(CCOPT)
+ CPPFLAGS = @[email protected] $(DEFS)
+-export CFLAGS = $(CXXFLAGS)
+ # CFLAGS = $(DEFS) $(INCLS)
+ STATIC =
+-LDFLAGS = @[email protected] $(DBGFLAGS) $(STATIC)
+-LIBS =  @[email protected] @[email protected] @[email protected] @[email protected] $(OPENSSL_LIBS) libnetutil/libnetutil.a @[email protected] @[email protected] @[email protected]
++LDFLAGS = @[email protected] $(DBGFLAGS) $(STATIC) -z ignore
++LIBS =  @[email protected] @[email protected] @[email protected] @[email protected] @[email protected] @[email protected] @[email protected] @[email protected] -lsocket -lnsl -lgen
+ OPENSSL_LIBS = @[email protected]
+ # LIBS =  -lefence @[email protected]
+ # LIBS =  -lrmalloc @[email protected]
[email protected]@ -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
[email protected]@ -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) @[email protected]
++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) @[email protected]
+ 
+-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) @[email protected]
++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) @[email protected]
+ 
+ # %.o : %.cc -- nope this is a GNU extension
+ .cc.o:
+-	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o [email protected]
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o [email protected]
++
++.c.o:
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o [email protected]
+ 
+ all: @[email protected] @[email protected] @[email protected] @[email protected] @[email protected] @[email protected] @[email protected] netutil_build
+ 	$(MAKE) $(TARGET) $(BUILDZENMAP) $(BUILDNDIFF) $(BUILDNPING)
[email protected]@ -109,7 +120,7 @@
+ $(TARGET): @[email protected] @[email protected] @[email protected] @[email protected] $(NBASEDIR)/libnbase.a $(NSOCKDIR)/src/libnsock.a libnetutil/libnetutil.a $(OBJS)
+ 	@echo Compiling nmap
+ 	rm -f [email protected]
+-	$(CXX) $(LDFLAGS) -o [email protected] $(OBJS) $(LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o [email protected] $(OBJS) $(LIBS)
+ 
+ pcre_build: $(LIBPCREDIR)/Makefile
+ 	@echo Compiling libpcre; cd $(LIBPCREDIR) && $(MAKE)
[email protected]@ -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.
[email protected]@ -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.
[email protected]@ -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
[email protected]@ -371,7 +386,7 @@
+ 	./config.status --recheck
+ 
+ makefile.dep:
+-	$(CXX) -MM $(CPPFLAGS) $(SRCS) > [email protected]
++	$(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 }' > [email protected]
+ include makefile.dep
+ 
+ # These the old names of scripts that have been renamed or deleted. Any
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/nmap/patches/configure.patch	Thu Dec 01 15:42:32 2011 -0800
@@ -0,0 +1,175 @@
+--- 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
[email protected]@ -1,4 +1,4 @@
+-#! /bin/sh
++#! /bin/bash
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by GNU Autoconf 2.66.
+ #
[email protected]@ -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=
[email protected]@ -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}'
[email protected]@ -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.  */
+ 
[email protected]@ -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.  */
+ 
[email protected]@ -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.  */
+ 
[email protected]@ -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
[email protected]@ -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
[email protected]@ -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'`
[email protected]@ -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'`
[email protected]@ -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'
[email protected]@ -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"
[email protected]@ -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"
[email protected]@ -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"
[email protected]@ -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"
[email protected]@ -7270,7 +7268,7 @@
+ 
+ 
+ LDFLAGS="$LDFLAGS -L$NBASEDIR"
+-CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/$NBASEDIR"
++CPPFLAGS="$CPPFLAGS -I$NBASEDIR"
+ LIBNBASE_LIBS="-lnbase"
+ 
+ 
[email protected]@ -7298,7 +7296,7 @@
+ 
+ 
+ LDFLAGS="$LDFLAGS -L$NSOCKDIR/src/"
+-CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/$NSOCKDIR/include"
++CPPFLAGS="$CPPFLAGS -I$NSOCKDIR/include"
+ LIBNSOCK_LIBS="-lnsock"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/nmap/patches/libdnet-stripped.configure.patch	Thu Dec 01 15:42:32 2011 -0800
@@ -0,0 +1,172 @@
+--- 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
[email protected]@ -1,4 +1,4 @@
+-#! /bin/sh
++#! /bin/bash
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by GNU Autoconf 2.63.
+ #
[email protected]@ -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)
[email protected]@ -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
[email protected]@ -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+"[email protected]"}
++	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/bash}} "$0" ${1+"[email protected]"}
+ 	  else
+ 	    # Oops.  We lost completely, so just stick with echo.
+ 	    ECHO=echo
[email protected]@ -738,7 +738,7 @@
+ subdirs=
+ MFLAGS=
+ MAKEFLAGS=
+-SHELL=${CONFIG_SHELL-/bin/sh}
++SHELL=${CONFIG_SHELL-/bin/bash}
+ 
+ # Identity of this package.
+ PACKAGE_NAME=
[email protected]@ -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}'
[email protected]@ -2318,7 +2318,7 @@
+   $as_echo_n "(cached) " >&6
+ else
+   cat >conftest.make <<\_ACEOF
+-SHELL = /bin/sh
++SHELL = /bin/bash
+ all:
+ 	@echo '@@@%%%=$(MAKE)[email protected]@@%%%'
+ _ACEOF
[email protected]@ -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
[email protected]@ -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
[email protected]@ -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
[email protected]@ -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
[email protected]@ -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
[email protected]@ -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.
[email protected]@ -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
[email protected]@ -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 <stropts.h>
++#include <sys/types.h>
++#include <net/if.h>
++#include <sys/socket.h>
++#include <sys/filio.h>
++
+ int
+ main ()
+ {
[email protected]@ -12096,7 +12095,7 @@
+ #define HAVE_LIBSTR 1
+ _ACEOF
+ 
+-  LIBS="-lstr $LIBS"
++  LIBS=" -lc -lsocket -lresolv -lnsl -lgen $LIBS"
+ 
+ fi
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/nmap/patches/libdnet-stripped.src.eth-dlpi.c.patch	Thu Dec 01 15:42:32 2011 -0800
@@ -0,0 +1,21 @@
+--- 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
[email protected]@ -134,7 +134,7 @@
+ {
+ 	union DL_primitives *dlp;
+ 	uint32_t buf[8192];
+-	char *p, dev[16];
++	char *p, dev[64];
+ 	eth_t *e;
+ 	int ppa;
+ 
[email protected]@ -159,6 +159,9 @@
+ 	ppa = atoi(p);
+ 	*p = '\0';
+ 
++#if defined(sun) || defined(__sun) || defined(__sun)
++	snprintf(dev, sizeof(dev), "/dev/net/%s", device);
++#endif
+ 	if ((e->fd = open(dev, O_RDWR)) < 0) {
+ 		snprintf(dev, sizeof(dev), "/dev/%s", device);
+ 		if ((e->fd = open(dev, O_RDWR)) < 0)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/nmap/patches/libdnet-stripped.src.intf.c.patch	Thu Dec 01 15:42:32 2011 -0800
@@ -0,0 +1,11 @@
+--- 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
[email protected]@ -323,7 +323,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) {
+-#if defined(SIOCSIFHWADDR)
++#if defined(SIOCSIFHWADDR) && (!defined(sun) && !defined(__sun) && !defined(__sun))
+ 		if (addr_ntos(&entry->intf_link_addr, &ifr.ifr_hwaddr) < 0)
+ 			return (-1);
+ 		if (ioctl(intf->fd, SIOCSIFHWADDR, &ifr) < 0)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/nmap/patches/libnetutil.Makefile.in.patch	Thu Dec 01 15:42:32 2011 -0800
@@ -0,0 +1,11 @@
+--- 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
[email protected]@ -3,7 +3,7 @@
+ 
+ CXX = @[email protected]
+ CXXFLAGS = @[email protected]
+-CPPFLAGS = @[email protected] $(DEFS)
++CPPFLAGS = -I/usr/include/lua -I../libdnet-stripped/include  -I../nbase -I../nsock/include $(DEFS)
+ DEFS = @[email protected]
+ DEFS += -D_FORTIFY_SOURCE=2
+ AR = ar
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/nmap/patches/libnetutil.netutil.cc.patch	Thu Dec 01 15:42:32 2011 -0800
@@ -0,0 +1,31 @@
+--- 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
[email protected]@ -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;
[email protected]@ -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());
[email protected]@ -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){
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/nmap/patches/nbase.Makefile.in.patch	Thu Dec 01 15:42:32 2011 -0800
@@ -0,0 +1,47 @@
+--- 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
[email protected]@ -6,7 +6,7 @@
+ srcdir = @[email protected]
+ 
+ CC = @[email protected]
+-AR = ar
++CXX = @[email protected]
+ RANLIB = @[email protected]
+ CCOPT = 
+ DEFS = @[email protected]
[email protected]@ -14,12 +14,14 @@
+ DEFS += -D_FORTIFY_SOURCE=2
+ CPPFLAGS = @[email protected]
+ CFLAGS = @[email protected] $(CCOPT) $(GLIB_CFLAGS) $(DEFS) $(INCLS)
++CXXFLAGS = @[email protected]
+ STATIC = 
+ LDFLAGS = @[email protected] $(STATIC)
+ LIBS =  @[email protected] 
+ SHTOOL = ./shtool
+ INSTALL = $(SHTOOL) install 
+ MAKEDEPEND = @[email protected]
++AR = /usr/bin/ar cq
+ 
+ TARGET = libnbase.a
+ 
[email protected]@ -30,7 +32,7 @@
+ 
+ $(TARGET): $(DEPS) $(OBJS)
+ 	rm -f [email protected]
+-	$(AR) cr [email protected] $(OBJS)
++	$(AR) [email protected] $(OBJS)
+ 	$(RANLIB) [email protected]
+ 
+ clean:
[email protected]@ -51,8 +53,10 @@
+ config.status: configure
+ 	./config.status --recheck
+ 
++.c.o:
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o [email protected]
+ .cc.o:
+-	$(CC) -c $(CFLAGS) $*.cc
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< o [email protected]
+ 
+ # DO NOT DELETE -- Needed by makedepend
+ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/nmap/patches/nbase.configure.patch	Thu Dec 01 15:42:32 2011 -0800
@@ -0,0 +1,57 @@
+--- 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
[email protected]@ -1,4 +1,4 @@
+-#! /bin/sh
++#! /bin/bash
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by GNU Autoconf 2.66.
+ #
[email protected]@ -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=
[email protected]@ -613,7 +613,9 @@
+ CPPFLAGS
+ LDFLAGS
+ CFLAGS
++CXXFLAGS
+ CC
++CXX
+ target_alias
+ host_alias
+ build_alias
[email protected]@ -663,7 +665,9 @@
+ host_alias
+ target_alias
+ CC
++CXX
+ CFLAGS
++CXXFLAGS
+ LDFLAGS
+ LIBS
+ CPPFLAGS
[email protected]@ -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}'
[email protected]@ -3773,6 +3777,10 @@
+ 
+ 	#include <stdlib.h>
+ 
++#if defined(__SUNPRO_C) || defined(__SUNPRO_CC)
++#error "GNU __attribute__ extension not suported "
++#endif
++
+ 	static void foo(void) __attribute__ ((noreturn));
+ 
+ 	static void
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/nmap/patches/ncat.Makefile.in.patch	Thu Dec 01 15:42:32 2011 -0800
@@ -0,0 +1,24 @@
+--- 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
[email protected]@ -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)
+ 
[email protected]@ -172,6 +172,6 @@
+ .NOEXPORT:
+ 
+ makefile.dep:
+-	$(CC) -MM $(CPPFLAGS) $(SRCS) > [email protected]
++	$(CC) $(CPPFLAGS) $(CFLAGS) -MM $(SRCS) > [email protected]
+ include makefile.dep
+ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/nmap/patches/ncat.configure.patch	Thu Dec 01 15:42:32 2011 -0800
@@ -0,0 +1,26 @@
+--- 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
[email protected]@ -1,4 +1,4 @@
+-#! /bin/sh
++#! /bin/bash
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by GNU Autoconf 2.66.
+ #
[email protected]@ -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=
[email protected]@ -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}'
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/nmap/patches/nsock.src.Makefile.in.patch	Thu Dec 01 15:42:32 2011 -0800
@@ -0,0 +1,23 @@
+--- 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
[email protected]@ -43,11 +43,11 @@
+ 	$(AR) cr [email protected] $(OBJS)
+ 	$(RANLIB) [email protected]
+ 
+-$(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
[email protected]@ -75,6 +75,3 @@
+ config.status: configure
+ 	./config.status --recheck
+ 
+-makefile.dep:
+-	$(CC) -MM $(CPPFLAGS) $(SRCS) > [email protected]
+-include makefile.dep
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/nmap/patches/nsock.src.configure.patch	Thu Dec 01 15:42:32 2011 -0800
@@ -0,0 +1,26 @@
+--- 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
[email protected]@ -1,4 +1,4 @@
+-#! /bin/sh
++#! /bin/bash
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by GNU Autoconf 2.66.
+ #
[email protected]@ -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=
[email protected]@ -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}'
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/nmap/patches/zenmap.setup.py.patch	Thu Dec 01 15:42:32 2011 -0800
@@ -0,0 +1,10 @@
+--- 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
[email protected]@ -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)