deepcrayon
/
buildroot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

package/nmap: remove ndiff option 

The ndiff package provided by Nmap relies on python2; moreover, there
have been pending pull requests to move ndiff to python3 for over two
years with very little engagement by the maintainers
(https://github.com/nmap/nmap/pull/1807).

Remove the option to select ndiff altogether, it is replaced by
python-pyndiff, which provides the same functionality (and more) as the
ndiff provided by nmap, and is compatible with python3.

Signed-off-by: Adam Duskett <aduskett@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2021.11.x
Adam Duskett 2021-10-12 10:48:37 -07:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent 1665e0a79b
commit 41f982f743
3 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Config.in.legacy
View File

@ -165,6 +165,15 @@ config BR2_PACKAGE_CANFESTIVAL
This package has been removed as it is unmaintained since
November 2017.
config BR2_PACKAGE_NMAP_NDIFF
bool "The ndiff utility has been removed"
select BR2_LEGACY
select BR2_PACKAGE_PYTHON_PYNDIFF
help
The ndiff utility provided by nmap requires python2 which is
deprecated. The same functionality is provided by the python
package pyndiff.
config BR2_GDB_VERSION_8_3
bool "gdb version 8.3.x removed"
select BR2_LEGACY

12
package/nmap/Config.in
View File

@ -6,7 +6,7 @@ config BR2_PACKAGE_NMAP
select BR2_PACKAGE_LIBLINEAR
select BR2_PACKAGE_LIBPCAP
select BR2_PACKAGE_NMAP_NMAP \
if !BR2_PACKAGE_NMAP_NCAT && !BR2_PACKAGE_NMAP_NPING && !BR2_PACKAGE_NMAP_NDIFF
if !BR2_PACKAGE_NMAP_NCAT && !BR2_PACKAGE_NMAP_NPING
help
Nmap ("Network Mapper") is a free and open source (license)
utility for network discovery and security auditing.
@ -32,16 +32,6 @@ comment "a symlink from ncat to 'nc' will be installed"
depends on !BR2_PACKAGE_NETCAT
depends on !BR2_PACKAGE_NETCAT_OPENBSD
config BR2_PACKAGE_NMAP_NDIFF
bool "install ndiff"
# ndiff only works with python2.x
depends on BR2_PACKAGE_PYTHON
help
This option installs the 'ndiff' tool.
comment "ndiff needs Python 2.x"
depends on !BR2_PACKAGE_PYTHON
config BR2_PACKAGE_NMAP_NMAP
bool "install nmap"
select BR2_PACKAGE_PCRE

9
package/nmap/nmap.mk
View File

@ -61,15 +61,6 @@ else
NMAP_CONF_OPTS += --without-ncat
endif
ifeq ($(BR2_PACKAGE_NMAP_NDIFF),y)
NMAP_DEPENDENCIES += python
NMAP_CONF_OPTS += --with-ndiff
NMAP_MAKE_OPTS += build-ndiff
NMAP_INSTALL_TARGET_OPTS += install-ndiff
else
NMAP_CONF_OPTS += --without-ndiff
endif
ifeq ($(BR2_PACKAGE_NMAP_NMAP),y)
NMAP_DEPENDENCIES += pcre
NMAP_CONF_OPTS += --with-libpcre="$(STAGING_DIR)/usr"