3 files changed, 36 insertions, 103 deletions

diff --git a/recipes-security/nmap/files/lua.patch b/recipes-security/nmap/files/lua.patch
deleted file mode 100644
index 7cb86ab..0000000
--- a/recipes-security/nmap/files/lua.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Added missing definitions which caused failuire at do_configure
-with --without-liblua option.
-
-Upstream Status : pending
-
-Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com>
---- a/output.h
-+++ b/output.h
-@@ -226,6 +226,10 @@
- void printscriptresults(ScriptResults *scriptResults, stype scantype);
- 
- void printhostscriptresults(Target *currenths);
-+
-+/*This is a helper function to determine the ordering of the script results
-+  based on their id */
-+bool comparescriptids(ScriptResult first, ScriptResult second);
- #endif
- 
- /* Print a table with traceroute hops. */
-@@ -253,8 +257,4 @@
-    were found. */
- void printdatafilepaths();
- 
--/*This is a helper function to determine the ordering of the script results
--  based on their id */
--bool comparescriptids(ScriptResult first, ScriptResult second);
--
- #endif /* OUTPUT_H */
---- a/output.cc
-+++ b/output.cc
-@@ -2613,6 +2613,7 @@
-   }
- }
- 
-+#ifndef NOLUA
- /*This is a helper function to determine the ordering of the script results
-   based on their id */
- bool comparescriptids(ScriptResult first, ScriptResult second){
-@@ -2625,5 +2626,6 @@
-     else
-         return false;
- }
-+#endif
- 
- 
---- a/portlist.cc
-+++ b/portlist.cc
-@@ -144,6 +144,7 @@
-   }
- }
- 
-+#ifndef NOLUA
- void Port::freeScriptResults(void)
- {
-     while (!scriptResults.empty()) {
-@@ -151,6 +152,7 @@
-         scriptResults.pop_front();
-     }
- }
-+#endif
- 
- /* Fills in namebuf (as long as there is space in buflen) with the
-    Name nmap normal output will use to describe the port.  This takes
---- a/Target.cc
-+++ b/Target.cc
-@@ -162,10 +162,12 @@
- 
- Target::~Target() {
-   FreeInternal();
-+#ifndef NOLUA
-   while (!scriptResults.empty()) {
-     scriptResults.front().clear();
-     scriptResults.pop_front();
-   }
-+#endif
- }
- 
- void Target::FreeInternal() {
-
diff --git a/recipes-security/nmap/nmap_6.25.bb b/recipes-security/nmap/nmap_6.25.bb
deleted file mode 100644
index 5efcc70..0000000
--- a/recipes-security/nmap/nmap_6.25.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY = "network auditing tool"
-DESCRIPTION = "Nmap ("Network Mapper") is a free and open source (license) utility for network discovery and security auditing."
-SECTION = "security"
-LICENSE = "GPL-2.0"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-FILES_${PN} += "${target_datadir}/ncat"
-
-SRC_URI = "http://nmap.org/dist/${PN}-${PV}.tar.bz2 \
-           file://lua.patch"
-
-SRC_URI[md5sum] = "fcc80f94ff3adcb11eedf91092ea6f5e"
-SRC_URI[sha256sum] = "3349cc6d36b86b95ca2b8075d16615a3a598cef494920d6652f9a8bf9f7660b5"
-
-inherit autotools-brokensep
-
-DEPENDS = "libpcap"
-
-EXTRA_OECONF = "--without-liblua --without-zenmap --without-subversion --with-pcap=linux"
-
-do_configure() {
-    autoconf
-    oe_runconf
-}
-
diff --git a/recipes-security/nmap/nmap_6.46.bb b/recipes-security/nmap/nmap_6.46.bb
new file mode 100644
index 0000000..42db71f
--- /dev/null
+++ b/recipes-security/nmap/nmap_6.46.bb
@@ -0,0 +1,36 @@
+SUMMARY = "network auditing tool"
+DESCRIPTION = "Nmap ("Network Mapper") is a free and open source (license) utility for network discovery and security auditing."
+SECTION = "security"
+LICENSE = "GPL-2.0"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+FILES_${PN} += "${target_datadir}/ncat"
+
+SRC_URI = "http://nmap.org/dist/${BPN}-${PV}.tar.bz2"
+
+SRC_URI[md5sum] = "5a36ad3a63d5b7ea5514f745a397436a"
+SRC_URI[sha256sum] = "3f89d9053c69507fe9533c40188a6561d49607a37b1db6380aed9039d4883137"
+
+inherit autotools-brokensep
+
+DEPENDS = "libpcap"
+
+EXTRA_OECONF = "--without-liblua --without-zenmap --without-subversion --with-pcap=linux"
+
+do_configure() {
+    autoconf
+    oe_runconf
+}
+
+# should add a conditional for "--without-zenmap" test. 
+# zenmap builds if the below are uncommented. Not tested
+#PACKAGES =+ "${PN}-zenmap"
+#FILES_${PN}-zenmap = "/usr/share/zenmap/*"
+
+#  should add a conditional based for "--without-ndiff"
+PACKAGES =+ "${PN}-python"
+DESCRIPTION_${PN}-python = \
+"The ${PN}-python package includes the ndiff utility. \
+Ndiff is a tool to aid in the comparison of Nmap scans."
+FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*"
+
+