diff options
Diffstat (limited to 'package/nmap')
-rw-r--r-- | package/nmap/Config.in | 30 | ||||
-rw-r--r-- | package/nmap/Makefile | 15 | ||||
-rw-r--r-- | package/nmap/src/sctp.h (renamed from package/nmap/extra/sctp.h) | 0 |
3 files changed, 4 insertions, 41 deletions
diff --git a/package/nmap/Config.in b/package/nmap/Config.in deleted file mode 100644 index f97017eeb..000000000 --- a/package/nmap/Config.in +++ /dev/null @@ -1,30 +0,0 @@ -config ADK_PACKAGE_NMAP - prompt "nmap.............................. Network exploration and/or security auditing utility" - tristate - default n - depends on ADK_CXX - select ADK_PACKAGE_LIBDNET - select ADK_PACKAGE_LIBPCAP - select ADK_PACKAGE_LIBPCRE - help - A free open source utility for network exploration or security auditing. - - http://www.insecure.org/nmap/ - -choice -prompt "C++ library to use" -depends on ADK_PACKAGE_NMAP -default ADK_COMPILE_NMAP_WITH_STDCXX if ADK_TARGET_LIB_GLIBC -default ADK_COMPILE_NMAP_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC - -config ADK_COMPILE_NMAP_WITH_STDCXX - bool "Standard C++ library" - select ADK_PACKAGE_LIBSTDCXX - help - -config ADK_COMPILE_NMAP_WITH_UCLIBCXX - bool "Embedded uClibc++ library" - select ADK_PACKAGE_UCLIBCXX - help - -endchoice diff --git a/package/nmap/Makefile b/package/nmap/Makefile index ecf92a914..22e84125b 100644 --- a/package/nmap/Makefile +++ b/package/nmap/Makefile @@ -9,7 +9,9 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 32d27de32166c02d670bb4a086185886 PKG_DESCR:= utility for network exploration or security auditing PKG_SECTION:= net +PKG_CXX:= NMAP PKG_DEPENDS:= libdnet libpcap libpcre +PKG_BUILDDEP+= libdnet libpcap pcre PKG_URL:= http://nmap.org PKG_SITES:= http://download.insecure.org/nmap/dist/ @@ -17,21 +19,14 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -ifeq ($(ADK_COMPILE_NMAP_WITH_UCLIBCXX),y) -PKG_DEPENDS+= uclibc++ -else -PKG_DEPENDS+= libstdcxx -endif - $(eval $(call PKG_template,NMAP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) TCPPFLAGS+= -DNOLUA ifeq ($(ADK_COMPILE_NMAP_WITH_UCLIBCXX),y) -CONFIGURE_ENV+= CXXFLAGS="-fno-builtin -fno-rtti -nostdinc++ \ +CONFIGURE_ENV+= CXXFLAGS="-fno-threadsafe-statics -fno-builtin -fno-rtti -nostdinc++ \ -I${STAGING_DIR}/usr/include/uClibc++" \ - LIBS="-nodefaultlibs -luClibc++ -lgcc" + LIBS="-nodefaultlibs -luClibc++ -lgcc -lm" endif -CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --without-openssl \ --without-zenmap \ --without-ndiff \ @@ -39,8 +34,6 @@ CONFIGURE_ARGS+= --without-openssl \ --with-libdnet="${STAGING_DIR}/usr" \ --with-libpcap="${STAGING_DIR}/usr" \ --with-libpcre="${STAGING_DIR}/usr" -BUILD_STYLE:= auto -INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_NMAP}/usr/share/nmap diff --git a/package/nmap/extra/sctp.h b/package/nmap/src/sctp.h index 2c24bfb53..2c24bfb53 100644 --- a/package/nmap/extra/sctp.h +++ b/package/nmap/src/sctp.h |