cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 07:28:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

nmap: Update to 7.80, add full variant, switch to Python 3

Browse Source 
* Update to 7.80

* Add "full" variants for nmap and ncat that support Lua scripts (and
  OpenSSL)

* Replace libcxx fix with upstream patch[1] (CHANGELOG change was
  removed)

* Switch ndiff to use Python 3 (using a patch from Debian[2], which
  comes from an upstream PR[3] plus a port of ndiff/setup.py)

[1]: https://github.com/nmap/nmap/commit/ea4e2d6657103a2c3d6f543a1a8619eb4d4472c8
[2]: https://salsa.debian.org/pkg-security-team/nmap/-/blob/0510c602dd45f4dc0b06a6f422a9b0855564ddbb/debian/patches/0004-Python3-port-of-ndiff.patch
[3]: https://github.com/nmap/nmap/pull/1807

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
This commit is contained in:
Jeffery To
2020-03-20 15:37:51 +08:00
committed by Nuno Goncalves
parent 59513531e1
commit 067c93b028
4 changed files with 1932 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/nmap/Makefile
+82 -31
View File
@@ -13,31 +13,32 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=nmap
PKG_VERSION:=7.70
PKG_RELEASE:=2
PKG_VERSION:=7.80
PKG_RELEASE:=1
PKG_MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com>
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://nmap.org/dist/
PKG_HASH:=847b068955f792f4cc247593aca6dc3dc4aae12976169873247488de147a6e18
PKG_LICENSE:=GPL-2.0
PKG_HASH:=fcfa5a0e42099e12e4bf7a68ebe6fde05553383a682e816a7ec9256ab4773faa
PKG_LICENSE:=GPL-2.0-only
PKG_LICENSE_FILES:=COPYING
PKG_CPE_ID:=cpe:/a:nmap:nmap
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
include ../../lang/python/python3-package.mk
NMAP_DEPENDS:=+libpcap +libstdcpp +zlib +libpcre
NCAT_DEPENDS:=+libpcap
NPING_DEPENDS:=+libpcap +libpthread +libstdcpp
NDIFF_DEPENDS:=+python
define Package/nmap/default
SUBMENU:=NMAP Suite
SECTION:=net
CATEGORY:=Network
URL:=http://nmap.org/
URL:=https://nmap.org/
endef
define Package/nmap
@@ -54,6 +55,13 @@ $(call Package/nmap/default)
TITLE:=Nmap (with OpenSSL support)
endef
define Package/nmap-full
$(call Package/nmap/default)
DEPENDS:=$(NMAP_DEPENDS) +libopenssl +liblua5.3 +libssh2
VARIANT:=full
TITLE:=Nmap (with OpenSSL and scripting support)
endef
define Package/ncat
$(call Package/nmap/default)
DEPENDS:=$(NCAT_DEPENDS)
@@ -68,6 +76,13 @@ $(call Package/nmap/default)
TITLE:=Ncat (with OpenSSL support)
endef
define Package/ncat-full
$(call Package/nmap/default)
DEPENDS:=$(NCAT_DEPENDS) +libopenssl +liblua5.3
VARIANT:=full
TITLE:=Ncat (with OpenSSL and scripting support)
endef
define Package/nping
$(call Package/nmap/default)
DEPENDS:=$(NPING_DEPENDS)
@@ -84,40 +99,73 @@ endef
define Package/ndiff
$(call Package/nmap/default)
DEPENDS:=$(NDIFF_DEPENDS)
VARIANT:=nossl
DEPENDS:=+python3-light +python3-xml
VARIANT:=python3
TITLE:=Utility to compare the results of Nmap scans
endef
CONFIGURE_ARGS += \
--with-libdnet=included \
--with-libpcre="$(STAGING_DIR)/usr" \
--with-liblinear=included \
--with-libpcap="$(STAGING_DIR)/usr" \
--without-liblua \
--with-libpcre="$(STAGING_DIR)/usr" \
--with-libz="$(STAGING_DIR)/usr" \
--with-ncat \
--without-localdirs \
--without-ndiff \
--without-nmap-update \
--without-subversion \
--without-zenmap
# --with-libnbase=included
# --with-libnsock=included
# --without-apr
ifeq ($(BUILD_VARIANT),full)
CONFIGURE_ARGS += \
--with-liblua="$(STAGING_DIR)/usr" \
--with-libssh2="$(STAGING_DIR)/usr" \
--with-openssl="$(STAGING_DIR)/usr" \
--without-nping
else ifeq ($(BUILD_VARIANT),ssl)
CONFIGURE_ARGS += \
--with-nping \
--with-openssl="$(STAGING_DIR)/usr" \
--without-liblua \
--without-libssh2
else # nossl
CONFIGURE_ARGS += \
--with-nping \
--without-liblua \
--without-libssh2 \
--without-openssl
endif
CONFIGURE_VARS += \
ac_cv_dnet_bsd_bpf=no \
CXXFLAGS="$$$$CXXFLAGS -fno-builtin"
ac_cv_dnet_bsd_bpf=no
ifeq ($(BUILD_VARIANT),ssl)
CONFIGURE_ARGS += --with-openssl="$(STAGING_DIR)/usr" --without-libssh2
else
CONFIGURE_ARGS += --without-openssl
PYTHON3_PKG_SETUP_DIR:=ndiff
PYTHON3_PKG_SETUP_ARGS:=
ifeq ($(BUILD_VARIANT),python3)
Build/Configure:=:
Build/Install:=:
endif
define Package/nmap/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/nmap $(1)/usr/bin/
$(INSTALL_DIR) $(1)/usr/share/nmap
$(CP) $(PKG_INSTALL_DIR)/usr/share/nmap/* $(1)/usr/share/nmap/
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/nmap/nmap* $(1)/usr/share/nmap/
endef
define Package/nmap-ssl/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/nmap $(1)/usr/bin/
$(INSTALL_DIR) $(1)/usr/share/nmap
$(CP) $(PKG_INSTALL_DIR)/usr/share/nmap/* $(1)/usr/share/nmap/
Package/nmap-ssl/install=$(Package/nmap/install)
define Package/nmap-full/install
$(call Package/nmap/install,$(1))
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/nmap/nse_main.lua $(1)/usr/share/nmap/
$(CP) $(PKG_INSTALL_DIR)/usr/share/nmap/{nselib,scripts} $(1)/usr/share/nmap/
endef
define Package/ncat/install
@@ -126,31 +174,34 @@ define Package/ncat/install
endef
define Package/ncat-ssl/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ncat $(1)/usr/bin/
$(call Package/ncat/install,$(1))
$(INSTALL_DIR) $(1)/usr/share/ncat
$(CP) $(PKG_INSTALL_DIR)/usr/share/ncat/ca-bundle.crt $(1)/usr/share/ncat/
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/ncat/ca-bundle.crt $(1)/usr/share/ncat/
endef
define Package/ndiff/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ndiff $(1)/usr/bin/
endef
Package/ncat-full/install=$(Package/ncat-ssl/install)
define Package/nping/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/nping $(1)/usr/bin/
endef
define Package/nping-ssl/install
Package/nping-ssl/install=$(Package/nping/install)
define Py3Package/ndiff/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/nping $(1)/usr/bin/
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ndiff $(1)/usr/bin/
endef
$(eval $(call BuildPackage,nmap))
$(eval $(call BuildPackage,nmap-ssl))
$(eval $(call BuildPackage,nmap-full))
$(eval $(call BuildPackage,ncat))
$(eval $(call BuildPackage,ncat-ssl))
$(eval $(call BuildPackage,ncat-full))
$(eval $(call BuildPackage,nping))
$(eval $(call BuildPackage,nping-ssl))
$(eval $(call Py3Package,ndiff))
$(eval $(call BuildPackage,ndiff))
$(eval $(call BuildPackage,ndiff-src))