[packages] fix nmap build variants (#9387)
The default variant of nmap does not appear to be building correctly, if at all (all invocations of configure have --with-openssl). Add a nossl variant to fix building. Set PKG_BULID_DIR to differ between variants to prevent overlapping of builds. Signed-off-by: Kevin Locke <klocke@digitalenginesoftware.com> git-svn-id: svn://svn.openwrt.org/openwrt/packages@26951 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
f65bb1625e
commit
534b833c16
@ -13,12 +13,14 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
PKG_NAME:=nmap
|
PKG_NAME:=nmap
|
||||||
PKG_VERSION:=5.51
|
PKG_VERSION:=5.51
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=2
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
||||||
PKG_SOURCE_URL:=http://nmap.org/dist/
|
PKG_SOURCE_URL:=http://nmap.org/dist/
|
||||||
PKG_MD5SUM:=0b80d2cb92ace5ebba8095a4c2850275
|
PKG_MD5SUM:=0b80d2cb92ace5ebba8095a4c2850275
|
||||||
PKG_INSTALL:=1
|
PKG_INSTALL:=1
|
||||||
|
|
||||||
|
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
||||||
NMAP_DEPENDS:=+libpcap +libstdcpp
|
NMAP_DEPENDS:=+libpcap +libstdcpp
|
||||||
@ -37,6 +39,7 @@ endef
|
|||||||
define Package/nmap
|
define Package/nmap
|
||||||
$(call Package/nmap/default)
|
$(call Package/nmap/default)
|
||||||
DEPENDS:=$(NMAP_DEPENDS)
|
DEPENDS:=$(NMAP_DEPENDS)
|
||||||
|
VARIANT:=nossl
|
||||||
TITLE:=Utility for network exploration or security auditing
|
TITLE:=Utility for network exploration or security auditing
|
||||||
endef
|
endef
|
||||||
|
|
||||||
@ -50,6 +53,7 @@ endef
|
|||||||
define Package/ncat
|
define Package/ncat
|
||||||
$(call Package/nmap/default)
|
$(call Package/nmap/default)
|
||||||
DEPENDS:=$(NCAT_DEPENDS)
|
DEPENDS:=$(NCAT_DEPENDS)
|
||||||
|
VARIANT:=nossl
|
||||||
TITLE:=Much-improved reimplementation of Netcat
|
TITLE:=Much-improved reimplementation of Netcat
|
||||||
endef
|
endef
|
||||||
|
|
||||||
@ -63,12 +67,14 @@ endef
|
|||||||
define Package/nping
|
define Package/nping
|
||||||
$(call Package/nmap/default)
|
$(call Package/nmap/default)
|
||||||
DEPENDS:=$(NPING_DEPENDS)
|
DEPENDS:=$(NPING_DEPENDS)
|
||||||
|
VARIANT:=nossl
|
||||||
TITLE:=Network packet generation tool / ping utility
|
TITLE:=Network packet generation tool / ping utility
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/ndiff
|
define Package/ndiff
|
||||||
$(call Package/nmap/default)
|
$(call Package/nmap/default)
|
||||||
DEPENDS:=$(NDIFF_DEPENDS)
|
DEPENDS:=$(NDIFF_DEPENDS)
|
||||||
|
VARIANT:=nossl
|
||||||
TITLE:=Utility to compare the results of Nmap scans
|
TITLE:=Utility to compare the results of Nmap scans
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user