Bump buildroot to 2019.02

2019-03-28 22:49:48 +01:00
parent 5598b1b762
commit 920d307141
5121 changed files with 78550 additions and 46132 deletions
--- a/bsp/buildroot/package/nmap/0002-configure.ac-fix-AC_CHECK_HEADER-call-to-test-for-li.patch
+++ b/bsp/buildroot/package/nmap/0002-configure.ac-fix-AC_CHECK_HEADER-call-to-test-for-li.patch
@@ -1,30 +0,0 @@
-From ff629766dbd3b5e179330ba4f07fd7e3d8384ec0 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-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 <jcmvbkbc@gmail.com>
---
- 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
-
--- a/bsp/buildroot/package/nmap/Config.in
+++ b/bsp/buildroot/package/nmap/Config.in
@@ -5,13 +5,56 @@ config BR2_PACKAGE_NMAP
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_LIBLINEAR
 	select BR2_PACKAGE_LIBPCAP
-	select BR2_PACKAGE_PCRE
+	select BR2_PACKAGE_NMAP_NMAP \
+	       if !BR2_PACKAGE_NMAP_NCAT && !BR2_PACKAGE_NMAP_NPING && !BR2_PACKAGE_NMAP_NDIFF
 	help
 	  Nmap ("Network Mapper") is a free and open source (license)
 	  utility for network discovery and security auditing.

 	  http://nmap.org

-comment "nmap needs a toolchain w/ C++, threads"
+if  BR2_PACKAGE_NMAP
+
+config BR2_PACKAGE_NMAP_NCAT
+	bool "install ncat"
+	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+	help
+	  Ncat is a feature-packed networking utility which reads and
+	  writes data across networks from the command line. Ncat was
+	  written for the Nmap Project as a much-improved
+	  reimplementation of the venerable Netcat.
+
+	  If symlink to "nc" is installed if neither netcat or
+	  netcat-openbsd is selected.
+
+comment "a symlink from ncat to 'nc' will be installed"
+	depends on BR2_PACKAGE_NMAP_NCAT
+	depends on !BR2_PACKAGE_NETCAT
+	depends on !BR2_PACKAGE_NETCAT_OPENBSD
+
+config BR2_PACKAGE_NMAP_NDIFF
+	bool "install ndiff"
+	# ndiff only works with python2.x
+	depends on BR2_PACKAGE_PYTHON
+	help
+	  This option installs the 'ndiff' tool.
+
+comment "ndiff needs Python 2.x"
+	depends on !BR2_PACKAGE_PYTHON
+
+config BR2_PACKAGE_NMAP_NMAP
+	bool "install nmap"
+	select BR2_PACKAGE_PCRE
+	help
+	  This option installs 'nmap' itself.
+
+config BR2_PACKAGE_NMAP_NPING
+	bool "install nping"
+	help
+	  This option installs the 'nping' tool.
+
+endif
+
+comment "nmap-nmap needs a toolchain w/ C++, threads"
 	depends on BR2_USE_MMU
 	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)
--- a/bsp/buildroot/package/nmap/nmap.hash
+++ b/bsp/buildroot/package/nmap/nmap.hash
@@ -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
--- a/bsp/buildroot/package/nmap/nmap.mk
+++ b/bsp/buildroot/package/nmap/nmap.mk
@@ -4,24 +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 liblinear pcre host-autoconf
+NMAP_DEPENDENCIES = liblinear libpcap
 NMAP_CONF_OPTS = --without-liblua --without-zenmap \
-	--with-libdnet=included \
-	--with-libpcre="$(STAGING_DIR)/usr" --without-ncat
+	--with-libdnet=included
 NMAP_LICENSE = nmap license
 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`

@@ -51,11 +42,46 @@ else
 NMAP_CONF_OPTS += --without-openssl
 endif

-# ndiff only works with python2.x
-ifeq ($(BR2_PACKAGE_PYTHON),y)
+NMAP_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR)
+
+ifeq ($(BR2_PACKAGE_NMAP_NCAT),y)
+NMAP_CONF_OPTS += --with-ncat
+NMAP_MAKE_OPTS += build-ncat
+NMAP_INSTALL_TARGET_OPTS += install-ncat
+else
+NMAP_CONF_OPTS += --without-ncat
+endif
+
+ifeq ($(BR2_PACKAGE_NMAP_NDIFF),y)
 NMAP_DEPENDENCIES += python
+NMAP_CONF_OPTS += --with-ndiff
+NMAP_MAKE_OPTS += build-ndiff
+NMAP_INSTALL_TARGET_OPTS += install-ndiff
 else
 NMAP_CONF_OPTS += --without-ndiff
 endif

+ifeq ($(BR2_PACKAGE_NMAP_NMAP),y)
+NMAP_DEPENDENCIES += pcre
+NMAP_CONF_OPTS += --with-libpcre="$(STAGING_DIR)/usr"
+NMAP_MAKE_OPTS += nmap
+NMAP_INSTALL_TARGET_OPTS += install-nmap
+endif
+
+ifeq ($(BR2_PACKAGE_NMAP_NPING),y)
+NMAP_CONF_OPTS += --with-nping
+NMAP_MAKE_OPTS += build-nping
+NMAP_INSTALL_TARGET_OPTS += install-nping
+else
+NMAP_CONF_OPTS += --without-nping
+endif
+
+# Add a symlink to "nc" if none of the competing netcats is selected
+ifeq ($(BR2_PACKAGE_NMAP_NCAT):$(BR2_PACKAGE_NETCAT)$(BR2_PACKAGE_NETCAT_OPENBSD),y:)
+define NMAP_INSTALL_NCAT_SYMLINK
+	ln -fs ncat $(TARGET_DIR)/usr/bin/nc
+endef
+NMAP_POST_INSTALL_TARGET_HOOKS += NMAP_INSTALL_NCAT_SYMLINK
+endif
+
 $(eval $(autotools-package))