Skip to contentSkip to conversation

nmap: use system liblinear

PATCH New Fabrice Fontaine 3 participants 3 messages Oct 9, 2018 – Oct 24, 2018

lore
Share & tools
lore

Fabrice Fontaine

author
#0 lore raw

PATCH 1/1 nmap: use system liblinear

Use system liblinear instead of using included liblinear. liblinear in buildroot is at version 2.20 released on December 2017 whereas liblinear in nmap has not been updated since 7 years (except for liblinear.vcxproj which has been updated 2 years ago)

Do not use --with-liblinear option as otherwise nmap will forget to add -llinear to LIBS due to the following line in configure.ac:

if test $have_liblinear != yes; then
AC_CHECK_HEADERS([linear.h],
AC_CHECK_LIB(linear, predict, [have_liblinear=yes; LIBLINEAR_LIBS="-llinear"; break],, [-lm])
)

Signed-off-by Fabrice Fontaine <[email protected]>
---
 package/nmap/Config.in | 1 +
 package/nmap/nmap.mk   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
package/nmap/Config.in +1 -0
index c1aafeceb9..51dd3423ea 100644
@@ -3,6 +3,7 @@ config BR2_PACKAGE_NMAP
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	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
package/nmap/nmap.mk +2 -2
index 8809d4c037..761df3ffa8 100644
@@ -7,9 +7,9 @@
 NMAP_VERSION = 7.70
 NMAP_SITE = https://nmap.org/dist
 NMAP_SOURCE = nmap-$(NMAP_VERSION).tar.bz2
-NMAP_DEPENDENCIES = libpcap
+NMAP_DEPENDENCIES = liblinear libpcap
 NMAP_CONF_OPTS = --without-liblua --without-zenmap \
-	--with-libdnet=included --with-liblinear=included
+	--with-libdnet=included
 NMAP_LICENSE = nmap license
 NMAP_LICENSE_FILES = COPYING
Signature · 1 line
2.17.1
Applied
#1 lore raw

PATCH 1/1 nmap: use system liblinear

Hello,

Quoted 13 lines · Fabrice Fontaine

Use system liblinear instead of using included liblinear. liblinear in buildroot is at version 2.20 released on December 2017 whereas liblinear in nmap has not been updated since 7 years (except for liblinear.vcxproj which has been updated 2 years ago)

Do not use --with-liblinear option as otherwise nmap will forget to add -llinear to LIBS due to the following line in configure.ac:

if test $have_liblinear != yes; then
AC_CHECK_HEADERS([linear.h],
AC_CHECK_LIB(linear, predict, [have_liblinear=yes; LIBLINEAR_LIBS="-llinear"; break],, [-lm])
)

Quoted 5 lines
Signed-off-by Fabrice Fontaine <[email protected]>
---
 package/nmap/Config.in | 1 +
 package/nmap/nmap.mk   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 nmap: use system liblinear

In reply to Fabrice Fontaine
Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

Use system liblinear instead of using included liblinear. liblinear in buildroot is at version 2.20 released on December 2017 whereas liblinear in nmap has not been updated since 7 years (except for liblinear.vcxproj which has been updated 2 years ago)

Do not use --with-liblinear option as otherwise nmap will forget to add -llinear to LIBS due to the following line in configure.ac:

Quoted 6 lines

if test $have_liblinear != yes; then
AC_CHECK_HEADERS([linear.h],
AC_CHECK_LIB(linear, predict, [have_liblinear=yes; LIBLINEAR_LIBS="-llinear"; break],, [-lm])
)

Signed-off-by Fabrice Fontaine <[email protected]>

Committed to 2018.02.x and 2018.08.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard