package/nmap: bump version to 7.60

Version 7.60 added optional support for libssh2:
http://seclists.org/nmap-announce/2017/4

Switched _SITE to https

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

diff --git a/package/nmap/nmap.hash b/package/nmap/nmap.hash
index 239ca138167500a43f4ed6f335efa72ac0e807a9..740ec7a001eb95a3c8cfbd0ae4df897e1883da4f 100644 (file)
--- a/package/nmap/nmap.hash
+++ b/package/nmap/nmap.hash
@@ -1,2 +1,2 @@
-# From https://nmap.org/dist/sigs/nmap-7.40.tar.bz2.digest.txt
-sha256 9e14665fffd054554d129d62c13ad95a7b5c7a046daa2290501909e65f4d3188  nmap-7.40.tar.bz2
+# From https://nmap.org/dist/sigs/nmap-7.60.tar.bz2.digest.txt
+sha256 a8796ecc4fa6c38aad6139d9515dc8113023a82e9d787e5a5fb5fa1b05516f21  nmap-7.60.tar.bz2

diff --git a/package/nmap/nmap.mk b/package/nmap/nmap.mk
index 37720e2cad30309548c851a387bd37aa67a63bcc..9db06d145537eb08ddf570f505587449ff090030 100644 (file)
--- a/package/nmap/nmap.mk
+++ b/package/nmap/nmap.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-NMAP_VERSION = 7.40
-NMAP_SITE = http://nmap.org/dist
+NMAP_VERSION = 7.60
+NMAP_SITE = https://nmap.org/dist
 NMAP_SOURCE = nmap-$(NMAP_VERSION).tar.bz2
 NMAP_DEPENDENCIES = libpcap pcre
 NMAP_CONF_OPTS = --without-liblua --without-zenmap \
@@ -27,6 +27,14 @@ define NMAP_WRAPPER_EXEC
 endef
 NMAP_POST_PATCH_HOOKS += NMAP_WRAPPER_EXEC
 
+ifeq ($(BR2_PACKAGE_LIBSSH2),y)
+NMAP_CONF_OPTS += --with-libssh2="$(STAGING_DIR)/usr"
+NMAP_DEPENDENCIES += libssh2
+NMAP_LIBS_FOR_STATIC_LINK += `$(PKG_CONFIG_HOST_BINARY) --libs libssh2`
+else
+NMAP_CONF_OPTS += --without-libssh2
+endif
+
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 NMAP_CONF_OPTS += --with-openssl="$(STAGING_DIR)/usr"
 NMAP_DEPENDENCIES += host-pkgconf openssl