Date: Tue, 03 Feb 2026 01:06:02 +0000 From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: be8868737f7b - main - security/nmap: Update to 7.98 Message-ID: <698149fa.30229.72c4fe12@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=be8868737f7ba298396a5bbb94f4fa2b3a5e6efb commit be8868737f7ba298396a5bbb94f4fa2b3a5e6efb Author: Cy Schubert <cy@FreeBSD.org> AuthorDate: 2026-02-03 00:24:07 +0000 Commit: Cy Schubert <cy@FreeBSD.org> CommitDate: 2026-02-03 01:05:18 +0000 security/nmap: Update to 7.98 --- security/nmap/Makefile | 13 +++-- security/nmap/distinfo | 6 +-- security/nmap/files/patch-configure | 56 ++++++++++++++++++---- .../nmap/files/patch-libdnet-stripped_configure | 34 ++++++------- .../files/patch-libdnet-stripped_src_eth-bsd.c | 14 +++--- .../nmap/files/patch-libdnet-stripped_src_intf.c | 8 ++-- security/nmap/files/patch-libpcap_Makefile.in | 9 ++-- security/nmap/files/patch-libssh2_src_openssl.h | 14 ------ security/nmap/pkg-plist | 9 +++- 9 files changed, 99 insertions(+), 64 deletions(-) diff --git a/security/nmap/Makefile b/security/nmap/Makefile index 792600e8aa89..f8a2cadce077 100644 --- a/security/nmap/Makefile +++ b/security/nmap/Makefile @@ -1,6 +1,5 @@ PORTNAME= nmap -DISTVERSION= 7.94 -PORTREVISION= 3 +DISTVERSION= 7.98 CATEGORIES= security MASTER_SITES= https://nmap.org/dist/ \ LOCAL/ohauer @@ -18,6 +17,9 @@ LICENSE_NAME= Nmap Public Source License LICENSE_PERMS= auto-accept dist-mirror pkg-mirror pkg-sell LICENSE_FILE= ${WRKSRC}/LICENSE +LIB_DEPENDS= libpcre2-16.so:devel/pcre2 \ + libdbus-1.so:devel/dbus + .if !defined(MASTERDIR) USES= tar:bzip2 gmake cpe @@ -26,9 +28,13 @@ USES= tar:bzip2 gmake cpe EXTRACT_AFTER_ARGS= --exclude ${DISTNAME}/mswin32 \ --no-same-owner --no-same-permissions +MAKE_JOBS_UNSAFE= yes + GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX=${PREFIX}/share +LDFLAGS+= -ldbus-1 + OPTIONS_SUB= yes OPTIONS_DEFINE= DOCS NLS PCAP SSH2 SSL OPTIONS_DEFAULT=NLS SSH2 SSL @@ -53,10 +59,11 @@ STRIP_FILES+= nmap nping CONFIGURE_ARGS+=--without-localdirs \ --without-zenmap \ --without-ndiff \ - --with-libpcre=included \ --with-liblua=included \ --without-nmap-update + + .include <bsd.port.options.mk> .if defined(SSL_DEFAULT) && ${SSL_DEFAULT} == libressl diff --git a/security/nmap/distinfo b/security/nmap/distinfo index 6bb14c6c3549..3afdf4d89497 100644 --- a/security/nmap/distinfo +++ b/security/nmap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1684706420 -SHA256 (nmap-7.94.tar.bz2) = d71be189eec43d7e099bac8571509d316c4577ca79491832ac3e1217bc8f92cc -SIZE (nmap-7.94.tar.bz2) = 11102195 +TIMESTAMP = 1770074516 +SHA256 (nmap-7.98.tar.bz2) = ce847313eaae9e5c9f21708e42d2ab7b56c7e0eb8803729a3092f58886d897e6 +SIZE (nmap-7.98.tar.bz2) = 12273108 diff --git a/security/nmap/files/patch-configure b/security/nmap/files/patch-configure index 96651d558b5a..332a95b99b08 100644 --- a/security/nmap/files/patch-configure +++ b/security/nmap/files/patch-configure @@ -1,20 +1,56 @@ ---- configure.orig 2020-08-27 19:13:31 UTC -+++ configure -@@ -2529,7 +2529,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $ +--- configure.orig 2025-05-21 13:47:38.000000000 -0700 ++++ configure 2026-02-02 15:27:39.745358000 -0800 +@@ -3103,7 +3103,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 +set dummy ${ac_tool_prefix}$CXX; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_CC+:} false; then : -@@ -3362,7 +3362,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $ + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + printf %s "checking for $ac_word... " >&6; } + if test ${ac_cv_prog_CC+y} +@@ -3124,7 +3124,7 @@ + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then +- ac_cv_prog_CC="${ac_tool_prefix}gcc" ++ ac_cv_prog_CC="${ac_tool_prefix}$CXX" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -3169,7 +3169,7 @@ + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then +- ac_cv_prog_ac_ct_CC="gcc" ++ ac_cv_prog_ac_ct_CC="$CXX" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -4135,7 +4135,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 +set dummy ${ac_tool_prefix}$CXX; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_CC+:} false; then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + printf %s "checking for $ac_word... " >&6; } + if test ${ac_cv_prog_CC+y} +@@ -4156,7 +4156,7 @@ + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then +- ac_cv_prog_CC="${ac_tool_prefix}gcc" ++ ac_cv_prog_CC="${ac_tool_prefix}$CXX" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -4201,7 +4201,7 @@ + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then +- ac_cv_prog_ac_ct_CC="gcc" ++ ac_cv_prog_ac_ct_CC="$CXX" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi diff --git a/security/nmap/files/patch-libdnet-stripped_configure b/security/nmap/files/patch-libdnet-stripped_configure index 74170ec491a6..3ac064bb4dc8 100644 --- a/security/nmap/files/patch-libdnet-stripped_configure +++ b/security/nmap/files/patch-libdnet-stripped_configure @@ -1,8 +1,8 @@ ---- libdnet-stripped/configure.orig 2017-08-02 18:48:27 UTC -+++ libdnet-stripped/configure -@@ -764,6 +764,9 @@ ac_includes_default="\ - #ifdef HAVE_STDINT_H - # include <stdint.h> +--- libdnet-stripped/configure.orig 2025-08-09 12:07:16.000000000 -0700 ++++ libdnet-stripped/configure 2026-02-02 15:30:56.588281000 -0800 +@@ -643,6 +643,9 @@ + #ifdef HAVE_SYS_STAT_H + # include <sys/stat.h> #endif +#ifdef HAVE_SYS_SOCKET_H +# include <sys/socket.h> @@ -10,17 +10,17 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif" -@@ -11828,11 +11831,8 @@ $as_echo_n "checking for Berkeley Packet Filter... " > - if ${ac_cv_dnet_bsd_bpf+:} false; then : - $as_echo_n "(cached) " >&6 - else -- if test -c /dev/bpf0 ; then -- ac_cv_dnet_bsd_bpf=yes -- else -- ac_cv_dnet_bsd_bpf=no -- fi -+# PR ports/154353 : support building in FreeBSD jail -+ ac_cv_dnet_bsd_bpf=yes +@@ -15136,13 +15139,6 @@ + if test ${ac_cv_dnet_bsd_bpf+y} + then : + printf %s "(cached) " >&6 +-else case e in #( +- e) if test -c /dev/bpf -o -c /dev/bpf0 ; then +- ac_cv_dnet_bsd_bpf=yes +- else +- ac_cv_dnet_bsd_bpf=no +- fi ;; +-esac fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_dnet_bsd_bpf" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_dnet_bsd_bpf" >&5 diff --git a/security/nmap/files/patch-libdnet-stripped_src_eth-bsd.c b/security/nmap/files/patch-libdnet-stripped_src_eth-bsd.c index 24d538b095f8..d66fadd31f5b 100644 --- a/security/nmap/files/patch-libdnet-stripped_src_eth-bsd.c +++ b/security/nmap/files/patch-libdnet-stripped_src_eth-bsd.c @@ -1,11 +1,11 @@ ---- libdnet-stripped/src/eth-bsd.c.orig 2009-11-09 04:49:32 UTC -+++ libdnet-stripped/src/eth-bsd.c -@@ -45,7 +45,7 @@ eth_open(const char *device) - int i; +--- libdnet-stripped/src/eth-bsd.c.orig 2025-06-05 15:22:27.000000000 -0700 ++++ libdnet-stripped/src/eth-bsd.c 2026-02-02 15:33:01.105641000 -0800 +@@ -46,7 +46,7 @@ if ((e = calloc(1, sizeof(*e))) != NULL) { -- for (i = 0; i < 128; i++) { -+ for (i = 0; i < 1024; i++) { - snprintf(file, sizeof(file), "/dev/bpf%d", i); + char file[32] = "/dev/bpf"; +- for (i = 0; i <= 128; i++) { ++ for (i = 0; i <= 1024; i++) { /* This would be O_WRONLY, but Mac OS X 10.6 has a bug where that prevents other users of the interface + from seeing incoming traffic, even in other diff --git a/security/nmap/files/patch-libdnet-stripped_src_intf.c b/security/nmap/files/patch-libdnet-stripped_src_intf.c index 188374dfaaee..f7adb16d22d2 100644 --- a/security/nmap/files/patch-libdnet-stripped_src_intf.c +++ b/security/nmap/files/patch-libdnet-stripped_src_intf.c @@ -1,11 +1,11 @@ ---- libdnet-stripped/src/intf.c.orig 2016-07-27 20:11:27 UTC -+++ libdnet-stripped/src/intf.c -@@ -163,7 +163,7 @@ intf_open(void) +--- libdnet-stripped/src/intf.c.orig 2025-03-31 12:30:47.000000000 -0700 ++++ libdnet-stripped/src/intf.c 2026-02-02 15:34:47.918928000 -0800 +@@ -178,7 +178,7 @@ #if defined(SIOCGLIFCONF) || defined(SIOCGIFNETMASK_IN6) || defined(SIOCGIFNETMASK6) if ((intf->fd6 = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) { # ifdef EPROTONOSUPPORT - if (errno != EPROTONOSUPPORT) + if (errno != EPROTONOSUPPORT && errno != EAFNOSUPPORT) - # endif + #endif return (intf_close(intf)); } diff --git a/security/nmap/files/patch-libpcap_Makefile.in b/security/nmap/files/patch-libpcap_Makefile.in index 91bae33073bf..a78c3fabce72 100644 --- a/security/nmap/files/patch-libpcap_Makefile.in +++ b/security/nmap/files/patch-libpcap_Makefile.in @@ -1,11 +1,10 @@ ---- libpcap/Makefile.in.orig 2022-08-31 11:39:55.000000000 -0700 -+++ libpcap/Makefile.in 2022-09-28 08:38:02.131119000 -0700 -@@ -70,8 +70,8 @@ - EXTRA_NETWORK_LIBS=@EXTRA_NETWORK_LIBS@ +--- libpcap/Makefile.in.orig 2025-04-14 12:06:54.000000000 -0700 ++++ libpcap/Makefile.in 2026-02-02 15:36:39.094534000 -0800 +@@ -69,7 +69,8 @@ + INSTALL_RPCAPD=@INSTALL_RPCAPD@ # Standard CFLAGS for building members of a shared library -FULL_CFLAGS = $(CCOPT) @V_LIB_CCOPT_FAT@ $(SHLIB_CCOPT) $(INCLS) $(DEFS) $(CFLAGS) --CXXFLAGS = $(CCOPT) @V_LIB_CCOPT_FAT@ $(SHLIB_CCOPT) $(INCLS) $(DEFS) $(CFLAGS) +FULL_CFLAGS = -I. $(CCOPT) @V_LIB_CCOPT_FAT@ $(SHLIB_CCOPT) $(INCLS) $(DEFS) $(CFLAGS) +CXXFLAGS = -I. $(CCOPT) @V_LIB_CCOPT_FAT@ $(SHLIB_CCOPT) $(INCLS) $(DEFS) $(CFLAGS) diff --git a/security/nmap/files/patch-libssh2_src_openssl.h b/security/nmap/files/patch-libssh2_src_openssl.h deleted file mode 100644 index a43c568b30cb..000000000000 --- a/security/nmap/files/patch-libssh2_src_openssl.h +++ /dev/null @@ -1,14 +0,0 @@ ---- libssh2/src/openssl.h.orig 2022-06-29 20:40:29 UTC -+++ libssh2/src/openssl.h -@@ -57,8 +57,9 @@ - #include <openssl/pem.h> - #include <openssl/rand.h> - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \ -- !defined(LIBRESSL_VERSION_NUMBER) -+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ -+ ((!defined LIBRESSL_VERSION_NUMBER) || \ -+ (defined LIBRESSL_VERSION_NUMBER && LIBRESSL_VERSION_NUMBER >= 0x30500000L)) - # define HAVE_OPAQUE_STRUCTS 1 - #endif - diff --git a/security/nmap/pkg-plist b/security/nmap/pkg-plist index bece8bb0a8ab..4319146695d1 100644 --- a/security/nmap/pkg-plist +++ b/security/nmap/pkg-plist @@ -116,6 +116,7 @@ share/man/man1/nping.1.gz %%DATADIR%%/nselib/httpspider.lua %%DATADIR%%/nselib/iax2.lua %%DATADIR%%/nselib/idna.lua +%%DATADIR%%/nselib/iec61850mms.lua %%DATADIR%%/nselib/ike.lua %%DATADIR%%/nselib/imap.lua %%DATADIR%%/nselib/informix.lua @@ -161,7 +162,6 @@ share/man/man1/nping.1.gz %%DATADIR%%/nselib/ospf.lua %%DATADIR%%/nselib/outlib.lua %%DATADIR%%/nselib/packet.lua -%%DATADIR%%/nselib/pcre.luadoc %%DATADIR%%/nselib/pgsql.lua %%DATADIR%%/nselib/pop3.lua %%DATADIR%%/nselib/pppoe.lua @@ -363,6 +363,7 @@ share/man/man1/nping.1.gz %%DATADIR%%/scripts/hadoop-namenode-info.nse %%DATADIR%%/scripts/hadoop-secondary-namenode-info.nse %%DATADIR%%/scripts/hadoop-tasktracker-info.nse +%%DATADIR%%/scripts/hartip-info.nse %%DATADIR%%/scripts/hbase-master-info.nse %%DATADIR%%/scripts/hbase-region-info.nse %%DATADIR%%/scripts/hddtemp-info.nse @@ -509,6 +510,7 @@ share/man/man1/nping.1.gz %%DATADIR%%/scripts/iax2-version.nse %%DATADIR%%/scripts/icap-info.nse %%DATADIR%%/scripts/iec-identify.nse +%%DATADIR%%/scripts/iec61850-mms.nse %%DATADIR%%/scripts/ike-version.nse %%DATADIR%%/scripts/imap-brute.nse %%DATADIR%%/scripts/imap-capabilities.nse @@ -564,6 +566,8 @@ share/man/man1/nping.1.gz %%DATADIR%%/scripts/metasploit-msgrpc-brute.nse %%DATADIR%%/scripts/metasploit-xmlrpc-brute.nse %%DATADIR%%/scripts/mikrotik-routeros-brute.nse +%%DATADIR%%/scripts/mikrotik-routeros-username-brute.nse +%%DATADIR%%/scripts/mikrotik-routeros-version.nse %%DATADIR%%/scripts/mmouse-brute.nse %%DATADIR%%/scripts/mmouse-exec.nse %%DATADIR%%/scripts/modbus-discover.nse @@ -585,6 +589,7 @@ share/man/man1/nping.1.gz %%DATADIR%%/scripts/ms-sql-xp-cmdshell.nse %%DATADIR%%/scripts/msrpc-enum.nse %%DATADIR%%/scripts/mtrace.nse +%%DATADIR%%/scripts/multicast-profinet-discovery.nse %%DATADIR%%/scripts/murmur-version.nse %%DATADIR%%/scripts/mysql-audit.nse %%DATADIR%%/scripts/mysql-brute.nse @@ -647,6 +652,7 @@ share/man/man1/nping.1.gz %%DATADIR%%/scripts/pop3-ntlm-info.nse %%DATADIR%%/scripts/port-states.nse %%DATADIR%%/scripts/pptp-version.nse +%%DATADIR%%/scripts/profinet-cm-lookup.nse %%DATADIR%%/scripts/puppet-naivesigning.nse %%DATADIR%%/scripts/qconn-exec.nse %%DATADIR%%/scripts/qscan.nse @@ -772,6 +778,7 @@ share/man/man1/nping.1.gz %%DATADIR%%/scripts/supermicro-ipmi-conf.nse %%DATADIR%%/scripts/svn-brute.nse %%DATADIR%%/scripts/targets-asn.nse +%%DATADIR%%/scripts/targets-ipv6-eui64.nse %%DATADIR%%/scripts/targets-ipv6-map4to6.nse %%DATADIR%%/scripts/targets-ipv6-multicast-echo.nse %%DATADIR%%/scripts/targets-ipv6-multicast-invalid-dst.nsehome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?698149fa.30229.72c4fe12>