diff options
Diffstat (limited to 'package/nmap')
-rw-r--r-- | package/nmap/Makefile | 12 | ||||
-rw-r--r-- | package/nmap/patches/patch-liblinear_Makefile | 16 |
2 files changed, 7 insertions, 21 deletions
diff --git a/package/nmap/Makefile b/package/nmap/Makefile index eb6f34892..fde000967 100644 --- a/package/nmap/Makefile +++ b/package/nmap/Makefile @@ -4,13 +4,13 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= nmap -PKG_VERSION:= 7.40 +PKG_VERSION:= 7.95 PKG_RELEASE:= 1 -PKG_HASH:= 9e14665fffd054554d129d62c13ad95a7b5c7a046daa2290501909e65f4d3188 +PKG_HASH:= e14ab530e47b5afd88f1c8a2bac7f89cd8fe6b478e22d255c5b9bddb7a1c5778 PKG_DESCR:= utility for network exploration or security auditing PKG_SECTION:= net/security -PKG_DEPENDS:= libdnet libpcap libpcre -PKG_BUILDDEP:= libdnet libpcap pcre +PKG_DEPENDS:= libdnet libpcap libpcre2 zlib +PKG_BUILDDEP:= libdnet libpcap pcre2 zlib PKG_NEEDS:= c++ PKG_URL:= http://nmap.org/ PKG_SITES:= http://download.insecure.org/nmap/dist/ @@ -26,16 +26,18 @@ TARGET_LDFLAGS+= -lpthread CONFIGURE_ENV+= ac_cv_dnet_bsd_bpf=no CONFIGURE_ARGS+= --without-openssl \ --without-zenmap \ + --without-nping \ --without-ndiff \ --without-liblua \ --with-libpcap="${STAGING_TARGET_DIR}/usr" \ --with-libpcre="${STAGING_TARGET_DIR}/usr" \ + --with-zlib="${STAGING_TARGET_DIR}/usr" \ --enable-static nmap-install: ${INSTALL_DIR} ${IDIR_NMAP}/usr/share/nmap ${INSTALL_DIR} ${IDIR_NMAP}/usr/bin - for file in mac-prefixes os-db protocols rpc service-probes services; do \ + for file in payloads mac-prefixes os-db protocols rpc service-probes services; do \ ${CP} ${WRKINST}/usr/share/nmap/nmap-$$file ${IDIR_NMAP}/usr/share/nmap; \ done ${INSTALL_BIN} ${WRKINST}/usr/bin/nmap ${IDIR_NMAP}/usr/bin/ diff --git a/package/nmap/patches/patch-liblinear_Makefile b/package/nmap/patches/patch-liblinear_Makefile deleted file mode 100644 index fdb24470d..000000000 --- a/package/nmap/patches/patch-liblinear_Makefile +++ /dev/null @@ -1,16 +0,0 @@ ---- nmap-6.40.orig/liblinear/Makefile 2011-09-23 23:15:09.000000000 +0200 -+++ nmap-6.40/liblinear/Makefile 2014-02-11 19:38:23.000000000 +0100 -@@ -1,10 +1,10 @@ - CXX ?= g++ - CC ?= gcc --CFLAGS = -Wall -Wconversion -O3 -fPIC -+CFLAGS ?= -Wall -Wconversion -O3 -fPIC - LIBS = blas/blas.a - SHVER = 1 --AR = ar --RANLIB = ranlib -+AR ?= ar -+RANLIB ?= ranlib - #LIBS = -lblas - - all: train predict |