diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-03-27 09:31:24 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-03-27 15:27:57 +0200 |
| commit | dca477e0e26c705a153a3309085a69c0271ef78c (patch) | |
| tree | 52838d635bfeab08d5524b57d47bf785e5594ea1 | |
| parent | 04589d1ed73c4f5ae6d8793d8fba8bbf7150af4b (diff) | |
| download | ptxdist-dca477e0e26c705a153a3309085a69c0271ef78c.tar.gz ptxdist-dca477e0e26c705a153a3309085a69c0271ef78c.tar.xz | |
nmap: version bump 4.85BETA8 -> 5.51
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/nmap.in | 1 | ||||
| -rw-r--r-- | rules/nmap.make | 15 |
2 files changed, 7 insertions, 9 deletions
diff --git a/rules/nmap.in b/rules/nmap.in index d24d4034e..3d08b40e3 100644 --- a/rules/nmap.in +++ b/rules/nmap.in @@ -5,6 +5,7 @@ menuconfig 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 diff --git a/rules/nmap.make b/rules/nmap.make index 3659c68f1..6e69334db 100644 --- a/rules/nmap.make +++ b/rules/nmap.make @@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_NMAP) += nmap # # Paths and names # -NMAP_VERSION := 4.85BETA8 +NMAP_VERSION := 5.51 NMAP := nmap-$(NMAP_VERSION) NMAP_SUFFIX := tar.bz2 NMAP_URL := http://nmap.org/dist/$(NMAP).$(NMAP_SUFFIX) @@ -47,10 +47,13 @@ NMAP_ENV := \ # NMAP_AUTOCONF := $(CROSS_AUTOCONF_USR) \ $(GLOBAL_IPV6_OPTION) \ - --with-libpcre=$(SYSROOT)/usr \ - --with-libpcap=included \ + --with-libpcre \ + --with-libpcap \ --without-liblua \ + --without-ndiff \ --without-zenmap \ + --without-nping \ + --without-ncat \ \ --enable-protochain \ --disable-optimizer-dbg \ @@ -62,12 +65,6 @@ else NMAP_AUTOCONF += --without-openssl endif -ifdef PTXCONF_ARCH_MINGW -NMAP_AUTOCONF += --with-pcap=null -else -NMAP_AUTOCONF += --with-pcap=linux -endif - # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- |