wavemon: moved to github

[packages.git] / net / nmap / Makefile

diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index 87208e9..a24544e 100644 (file)
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2011 Nuno Goncalves <nunojpg@gmail.com>
+# Copyright (C) 2006-2014 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -11,19 +11,24 @@
 #
 
 include $(TOPDIR)/rules.mk
+
 PKG_NAME:=nmap
-PKG_VERSION:=5.51
+PKG_VERSION:=6.46
 PKG_RELEASE:=1
+
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://nmap.org/dist/
-PKG_MD5SUM:=0b80d2cb92ace5ebba8095a4c2850275
+PKG_MD5SUM:=5a36ad3a63d5b7ea5514f745a397436a
+
 PKG_INSTALL:=1
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/package.mk
 
 NMAP_DEPENDS:=+libpcap +libstdcpp
 NCAT_DEPENDS:=+libpcap
-NPING_DEPENDS:=+libpcap +libpthread
+NPING_DEPENDS:=+libpcap +libpthread +libstdcpp
 NDIFF_DEPENDS:=+python
 
 define Package/nmap/default
@@ -31,12 +36,12 @@ define Package/nmap/default
   SECTION:=net
   CATEGORY:=Network
   URL:=http://nmap.org/
-  MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com>
 endef
 
 define Package/nmap
 $(call Package/nmap/default)
   DEPENDS:=$(NMAP_DEPENDS)
+  VARIANT:=nossl
   TITLE:=Utility for network exploration or security auditing
 endef
 
@@ -50,6 +55,7 @@ endef
 define Package/ncat
 $(call Package/nmap/default)
   DEPENDS:=$(NCAT_DEPENDS)
+  VARIANT:=nossl
   TITLE:=Much-improved reimplementation of Netcat
 endef
 
@@ -63,12 +69,14 @@ endef
 define Package/nping
 $(call Package/nmap/default)
   DEPENDS:=$(NPING_DEPENDS)
+  VARIANT:=nossl
   TITLE:=Network packet generation tool / ping utility
 endef
 
 define Package/ndiff
 $(call Package/nmap/default)
   DEPENDS:=$(NDIFF_DEPENDS)
+  VARIANT:=nossl
   TITLE:=Utility to compare the results of Nmap scans
 endef
 
@@ -78,7 +86,7 @@ CONFIGURE_ARGS += \
        --with-libpcap="$(STAGING_DIR)/usr" \
        --without-liblua
 
-CONFIGURE_VARS += CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti"
+CONFIGURE_VARS += CXXFLAGS="$$$$CXXFLAGS -fno-builtin"
 
 ifeq ($(BUILD_VARIANT),ssl)
        CONFIGURE_ARGS += --with-openssl="$(STAGING_DIR)/usr"