nmap: update to version 6.47

for list of changes see:
http://seclists.org/nmap-dev/2014/q3/335

use nmap.inc to house most code.

Signed-off-by: Armin Kuster <akuster808@gmail.com>

2 files changed, 11 insertions, 7 deletions

diff --git a/recipes-security/nmap/nmap_6.46.bb b/recipes-security/nmap/nmap.inc
index a04dc7b..79fe7d4 100644
--- a/recipes-security/nmap/nmap_6.46.bb
+++ b/recipes-security/nmap/nmap.inc
@@ -2,12 +2,6 @@ SUMMARY = "network auditing tool"
 DESCRIPTION = "Nmap ("Network Mapper") is a free and open source (license) utility for network discovery and security auditing.\nGui support via appending to IMAGE_FEATURES x11-base in local.conf"
 SECTION = "security"
 LICENSE = "GPL-2.0"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-
-SRC_URI = "http://nmap.org/dist/${BPN}-${PV}.tar.bz2"
-
-SRC_URI[md5sum] = "5a36ad3a63d5b7ea5514f745a397436a"
-SRC_URI[sha256sum] = "3f89d9053c69507fe9533c40188a6561d49607a37b1db6380aed9039d4883137"
 
 inherit autotools-brokensep pkgconfig distro_features_check
 
@@ -43,7 +37,7 @@ FILES_${PN} = "${bindir}/nmap ${datadir}/nmap/*"
 # append packages if enabled
 FILES_${PN} += "${@bb.utils.contains("PACKAGECONFIG", "ncat", "${bindir}/ncat ${target_datadir}/ncat", "", d)}"
 FILES_${PN} += "${@bb.utils.contains("PACKAGECONFIG", "nping", "${bindir}/nping", "", d)}"
-FILES_${PN} += "${@bb.utils.contains("PACKAGECONFIG", "ndiff", "${bindir}/ndiff ${libdir}/python${PYTHON_BASEVERSION}/site-packages/ndiff*", "", d)}"
+FILES_${PN} += "${@bb.utils.contains("PACKAGECONFIG", "ndiff", "${bindir}/ndiff ${libdir}/python${PYTHON_BASEVERSION}/site-packages/ndiff.py*", "", d)}"
 
 PACKAGES += "${@bb.utils.contains("PACKAGECONFIG", "zenmap", "${PN}-zenmap", "", d)}"
 
diff --git a/recipes-security/nmap/nmap_6.47.bb b/recipes-security/nmap/nmap_6.47.bb
new file mode 100644
index 0000000..bcaee0c
--- /dev/null
+++ b/recipes-security/nmap/nmap_6.47.bb
@@ -0,0 +1,10 @@
+
+include nmap.inc
+
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+
+SRC_URI = "http://nmap.org/dist/${BPN}-${PV}.tar.bz2"
+
+
+SRC_URI[md5sum] = "edfe81f6763223c0a29bfa15a8526e2a"
+SRC_URI[sha256sum] = "8fa11e9e203ce2d81a207db5ca4f110a525f6c01c1dd0018325a7112a51aa591"