diff --git a/net/nmap/Makefile b/net/nmap/Makefile index 9a432c3cab..4770949e29 100644 --- a/net/nmap/Makefile +++ b/net/nmap/Makefile @@ -13,13 +13,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nmap -PKG_VERSION:=7.99 +PKG_VERSION:=7.991 PKG_RELEASE:=1 PKG_MAINTAINER:=Nuno Gonçalves PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://nmap.org/dist/ -PKG_HASH:=df512492ffd108e53a27a06f26d8635bbe89e0e569455dc8ffef058c035d51b2 +PKG_HASH:=a5d507f29437bef3bedd4771ff9aaa8fc1c2a109ddba1f5b1cf12027456929be PKG_LICENSE:=NPSL-0.95 PKG_LICENSE_FILES:=LICENSE diff --git a/net/nmap/patches/001-Fix-compilation-when-NOLUA-flag-is-defined.patch b/net/nmap/patches/001-Fix-compilation-when-NOLUA-flag-is-defined.patch new file mode 100644 index 0000000000..80360be57f --- /dev/null +++ b/net/nmap/patches/001-Fix-compilation-when-NOLUA-flag-is-defined.patch @@ -0,0 +1,30 @@ +From 9126a3bac1d508619ba1eb2d451d5f915710c3eb Mon Sep 17 00:00:00 2001 +From: Ivan Pavlov +Date: Wed, 12 Aug 2026 11:21:17 +0300 +Subject: [PATCH] Fix compilation when NOLUA flag is defined + +Commit a24082eee41f ("Close/unload NSE with --release-mem to resolve +false-positive memory leaks") added a call to function close_nse(), +which is declared in file nse_main.h; this file is included conditionally +when NOLUA flag is not defined. If the condition is not met, a compilation +error occurs. Fixing by adding conditional compilation for the function call. + +Fixes: a24082eee41f ("Close/unload NSE with --release-mem to resolve false-positive memory leaks") + +Signed-off-by: Ivan Pavlov +--- + nmap.cc | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/nmap.cc ++++ b/nmap.cc +@@ -1858,7 +1858,9 @@ void nmap_free_mem() { + AllProbes::service_scan_free(); + traceroute_hop_cache_clear(); + nsock_set_default_engine(NULL); ++#ifndef NOLUA + close_nse(); ++#endif + } + + int nmap_main(int argc, char *argv[]) { diff --git a/net/nmap/patches/030-ncat-drop-ca-bundle.patch b/net/nmap/patches/030-ncat-drop-ca-bundle.patch index d303202b9f..e583cf7543 100644 --- a/net/nmap/patches/030-ncat-drop-ca-bundle.patch +++ b/net/nmap/patches/030-ncat-drop-ca-bundle.patch @@ -1,5 +1,8 @@ -Author: Konstantin Demin -Title: ncat: avoid shipping/using internal ca-bundle.crt +From c8793c02857d8d7ad2981cd862223e42862f9059 Mon Sep 17 00:00:00 2001 +From: Konstantin Demin +Date: Wed, 31 Jan 2024 12:24:53 +0300 +Subject: [PATCH] nmap: ncat: avoid shipping/using internal ca-bundle.crt + 1. ca-bundle.crt may provide outdated trusted CAs. 2. maintain trusted CAs in one place. @@ -23,7 +26,7 @@ Also remove references to NCAT_CA_CERTS_FILE and NCAT_CA_CERTS_PATH in order to ifneq ($(NOLUA),yes) --- a/ncat/ncat_posix.c +++ b/ncat/ncat_posix.c -@@ -409,28 +409,17 @@ void set_lf_mode(void) +@@ -433,28 +433,17 @@ void set_lf_mode(void) #ifdef HAVE_OPENSSL diff --git a/net/nmap/patches/100-nsock-Fix-compilation-error-with-OPENSSL_NO_DTLS.patch b/net/nmap/patches/100-nsock-Fix-compilation-error-with-OPENSSL_NO_DTLS.patch index 78f7e1f07d..281809c73b 100644 --- a/net/nmap/patches/100-nsock-Fix-compilation-error-with-OPENSSL_NO_DTLS.patch +++ b/net/nmap/patches/100-nsock-Fix-compilation-error-with-OPENSSL_NO_DTLS.patch @@ -21,7 +21,7 @@ Signed-off-by: Christian Marangi --- a/nsock/src/nsock_connect.c +++ b/nsock/src/nsock_connect.c -@@ -472,8 +472,12 @@ nsock_event_id nsock_connect_ssl(nsock_p +@@ -479,8 +479,12 @@ nsock_event_id nsock_connect_ssl(nsock_p if (proto == IPPROTO_UDP) {