Skip to contentSkip to conversation

nmap: bump to version 7.70

PATCH New Baruch Siach 2 participants 2 messages Apr 10, 2018

lore
Share & tools
lore

Baruch Siach

author
#0 lore raw

PATCH 1/1 nmap: bump to version 7.70

Drop libssh2 configure test fix; the issue is fixed upstream.

Add license file hash.

Cc Carlos Santos <[email protected]>
Signed-off-by Baruch Siach <[email protected]>
---
 ...c-fix-AC_CHECK_HEADER-call-to-test-for-li.patch | 30 ----------------------
 package/nmap/nmap.hash                             |  6 +++--
 package/nmap/nmap.mk                               | 12 ++-------
 3 files changed, 6 insertions(+), 42 deletions(-)
 delete mode 100644 package/nmap/0002-configure.ac-fix-AC_CHECK_HEADER-call-to-test-for-li.patch
package/nmap/0002-configure.ac-fix-AC_CHECK_HEADER-call-to-test-for-li.patch deleted +0 -30
deleted file mode 100644
index ed5cae259e4b..000000000000
@@ -1,30 +0,0 @@
-From ff629766dbd3b5e179330ba4f07fd7e3d8384ec0 Mon Sep 17 00:00:00 2001
-From: Max Filippov <[email protected]>
-Date: Wed, 1 Nov 2017 15:30:40 +0100
-Subject: [PATCH] configure.ac: fix AC_CHECK_HEADER call to test for libssh2
-
-The -lm argument is passed as an argument to AC_CHECK_HEADER(), which
-doesn't make sense. The intention was to pass it as the fifth
-argument of AC_CHECK_LIB().
-
-Signed-off-by: Max Filippov <[email protected]>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 3d00e164e..67db42e08 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -674,7 +674,7 @@ AC_HELP_STRING([--without-libssh2], [Compile without libssh2]),
-       AC_CHECK_LIB(ssh2, libssh2_version,
-         [have_libssh2=yes
-         LIBSSH2_INC=$with_libssh2/include
--        LIBSSH2_LIB=$with_libssh2/lib])],,[-lm])
-+        LIBSSH2_LIB=$with_libssh2/lib],,[-lm])])
- 
-     LDFLAGS=$_ldflags
-     CPPFLAGS=$_cppflags
--- 
-2.13.6
-
package/nmap/nmap.hash +4 -2
index 740ec7a001eb..349f98d48b9f 100644
@@ -1,2 +1,4 @@
-# From https://nmap.org/dist/sigs/nmap-7.60.tar.bz2.digest.txt
-sha256 a8796ecc4fa6c38aad6139d9515dc8113023a82e9d787e5a5fb5fa1b05516f21  nmap-7.60.tar.bz2
+# From https://nmap.org/dist/sigs/nmap-7.70.tar.bz2.digest.txt
+sha256 847b068955f792f4cc247593aca6dc3dc4aae12976169873247488de147a6e18  nmap-7.70.tar.bz2
+# Locally calculated
+sha256 e013006fbdb7a7923e456e72272b115a5d722a3c6a372f27b5e8fcd282104651  COPYING
package/nmap/nmap.mk +2 -10
index 92a2be1b5406..391215dbf4fb 100644
@@ -4,23 +4,15 @@
 #
 ################################################################################
 
-NMAP_VERSION = 7.60
+NMAP_VERSION = 7.70
 NMAP_SITE = https://nmap.org/dist
 NMAP_SOURCE = nmap-$(NMAP_VERSION).tar.bz2
-NMAP_DEPENDENCIES = libpcap host-autoconf
+NMAP_DEPENDENCIES = libpcap
 NMAP_CONF_OPTS = --without-liblua --without-zenmap \
 	--with-libdnet=included --with-liblinear=included
 NMAP_LICENSE = GPL-2.0
 NMAP_LICENSE_FILES = COPYING
 
-# nmap doesn't autoreconf properly, so we just re-generate the
-# top-level configure script, since we are patching configure.ac.
-define NMAP_DO_AUTOCONF
-	(cd $(@D); $(HOST_DIR)/bin/autoconf)
-endef
-
-NMAP_PRE_CONFIGURE_HOOKS += NMAP_DO_AUTOCONF
-
 # needed by libpcap
 NMAP_LIBS_FOR_STATIC_LINK += `$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`
Signature · 1 line
2.16.3
Applied
#1 lore raw

PATCH 1/1 nmap: bump to version 7.70

Hello,

Quoted 4 lines · Baruch Siach

Drop libssh2 configure test fix; the issue is fixed upstream.

Add license file hash.

Quoted 8 lines
Cc Carlos Santos <[email protected]>
Signed-off-by Baruch Siach <[email protected]>
---
 ...c-fix-AC_CHECK_HEADER-call-to-test-for-li.patch | 30 ----------------------
 package/nmap/nmap.hash                             |  6 +++--
 package/nmap/nmap.mk                               | 12 ++-------
 3 files changed, 6 insertions(+), 42 deletions(-)
 delete mode 100644 package/nmap/0002-configure.ac-fix-AC_CHECK_HEADER-call-to-test-for-li.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com