[ptxdist] [PATCH 1/2] nmap: version bump: 5.51 -> 7.70

[ptxdist] [PATCH 1/2] nmap: version bump: 5.51 -> 7.70

[Uwe Kleine-König]

configure_helper criticize --with-libnbase=DIR, --with-libnsock=DIR and
--with-apr=PATH. There is nothing I can pass to the first two to
explicitly request using the in-tree libs. APR is only needed when also
using --with-nmap-update, which we don't have and --without-apr is broken.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 rules/nmap.in   |  2 --
 rules/nmap.make | 25 +++++++++++++------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/rules/nmap.in b/rules/nmap.in
index 3d08b40e32f3..0082c5edf6be 100644
--- a/rules/nmap.in
+++ b/rules/nmap.in
@@ -3,10 +3,8 @@ menuconfig NMAP
 	tristate
 	prompt "nmap                          "
 	select OPENSSL if NMAP_OPENSSL
-	select OPENSSL
 	select LIBPCRE
 	select LIBPCAP
-	select GCCLIBS_CXX
 	help
 	  Nmap ("Network Mapper") is a utility for network exploration
 	  or security auditing. Many systems and network administrators
diff --git a/rules/nmap.make b/rules/nmap.make
index 88de70bcf205..8d0868971619 100644
--- a/rules/nmap.make
+++ b/rules/nmap.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_NMAP) += nmap
 #
 # Paths and names
 #
-NMAP_VERSION	:= 5.51
-NMAP_MD5	:= 0b80d2cb92ace5ebba8095a4c2850275
+NMAP_VERSION	:= 7.70
+NMAP_MD5	:= 84eb6fbe788e0d4918c2b1e39421bf79
 NMAP		:= nmap-$(NMAP_VERSION)
 NMAP_SUFFIX	:= tar.bz2
 NMAP_URL	:= http://nmap.org/dist/$(NMAP).$(NMAP_SUFFIX)
@@ -30,24 +30,25 @@ NMAP_DIR	:= $(BUILDDIR)/$(NMAP)
 # Prepare
 # ----------------------------------------------------------------------------
 
-NMAP_PATH := PATH=$(CROSS_PATH)
-NMAP_ENV  := \
-	$(CROSS_ENV) \
-	ac_cv_linux_vers=$(KERNEL_HEADER_VERSION_MAJOR)
-
-#
-# autoconf
-#
-NMAP_AUTOCONF := \
+NMAP_CONF_TOOL := autoconf
+NMAP_CONF_OPT := \
 	$(CROSS_AUTOCONF_USR) \
+	--disable-nls \
+	--without-localdirs \
 	--without-ndiff \
 	--without-zenmap \
 	--without-nping \
 	--with-openssl=$(call ptx/ifdef,PTXCONF_NMAP_OPENSSL,$(SYSROOT),no) \
 	--with-libpcap \
 	--with-libpcre \
+	--without-libz \
+	--without-libssh2 \
+	--with-libdnet=included \
 	--without-liblua \
-	--without-ncat
+	--with-liblinear=included \
+	--without-ncat \
+	--without-nmap-update \
+	--without-subversion \
 
 
 # ----------------------------------------------------------------------------
-- 
2.16.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/2] nmap: add switch to build and install nping

[Uwe Kleine-König]

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 rules/nmap.in   | 3 +++
 rules/nmap.make | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/rules/nmap.in b/rules/nmap.in
index 0082c5edf6be..19de078ac51e 100644
--- a/rules/nmap.in
+++ b/rules/nmap.in
@@ -17,6 +17,9 @@ if NMAP
 config NMAP_OPENSSL
        bool "openssl support"
 
+config NMAP_NPING
+	bool "build and install nping"
+
 config NMAP_SERVICES
 	bool "Install nmap-services"
 	default y
diff --git a/rules/nmap.make b/rules/nmap.make
index 8d0868971619..1130fde4128a 100644
--- a/rules/nmap.make
+++ b/rules/nmap.make
@@ -37,7 +37,7 @@ NMAP_CONF_OPT := \
 	--without-localdirs \
 	--without-ndiff \
 	--without-zenmap \
-	--without-nping \
+	--$(call ptx/wwo, PTXCONF_NMAP_NPING)-nping \
 	--with-openssl=$(call ptx/ifdef,PTXCONF_NMAP_OPENSSL,$(SYSROOT),no) \
 	--with-libpcap \
 	--with-libpcre \
@@ -66,6 +66,10 @@ $(STATEDIR)/nmap.targetinstall:
 
 	@$(call install_copy, nmap, 0, 0, 0755, -, /usr/bin/nmap)
 
+ifdef PTXCONF_NMAP_NPING
+	@$(call install_copy, nmap, 0, 0, 0755, -, /usr/bin/nping)
+endif
+
 ifdef PTXCONF_NMAP_SERVICES
 	@$(call install_copy, nmap, 0, 0, 0644, -, \
 		/usr/share/nmap/nmap-mac-prefixes)
-- 
2.16.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de