Date: Tue, 03 Feb 2026 01:06:03 +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: 51ce0ab7e414 - main - security/nmap-devel: Sync patches and build configs with security/nmap Message-ID: <698149fb.31093.30a7d108@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=51ce0ab7e41419e37fbb0e6d10d246f3f95fc91a commit 51ce0ab7e41419e37fbb0e6d10d246f3f95fc91a Author: Cy Schubert <cy@FreeBSD.org> AuthorDate: 2026-02-03 00:16:13 +0000 Commit: Cy Schubert <cy@FreeBSD.org> CommitDate: 2026-02-03 01:05:18 +0000 security/nmap-devel: Sync patches and build configs with security/nmap --- security/nmap-devel/Makefile | 8 +++- security/nmap-devel/files/patch-configure | 56 ++++++++++++++++++++++ .../files/patch-libdnet-stripped_configure | 20 ++++++-- .../files/patch-libdnet-stripped_src_eth-bsd.c | 11 +++++ .../files/patch-libdnet-stripped_src_intf.c | 6 +-- .../nmap-devel/files/patch-libpcap_Makefile.in | 7 +-- 6 files changed, 97 insertions(+), 11 deletions(-) diff --git a/security/nmap-devel/Makefile b/security/nmap-devel/Makefile index ab45feb4b0af..146d54da3aea 100644 --- a/security/nmap-devel/Makefile +++ b/security/nmap-devel/Makefile @@ -1,5 +1,6 @@ PORTNAME= nmap PORTVERSION= 7.95.${NMAP_COMMIT_DATE} +PORTREVISION= 1 CATEGORIES= security PKGNAMESUFFIX= -devel @@ -18,9 +19,10 @@ LICENSE_PERMS= auto-accept dist-mirror pkg-mirror pkg-sell IGNORE_FreeBSD_13= Does not build on FreeBSD 13.x due to OpenSSL 1.1.1 -.if !defined(MASTERDIR) +LIB_DEPENDS= libpcre2-16.so:devel/pcre2 \ + libdbus-1.so:devel/dbus -LIB_DEPENDS= libpcre2-16.so:devel/pcre2 +.if !defined(MASTERDIR) USES= gmake cpe libtool @@ -42,6 +44,8 @@ CONFIGURE_ARGS=--without-localdirs \ MAKE_JOBS_UNSAFE= yes GNU_CONFIGURE_MANPREFIX=${PREFIX}/share +LDFLAGS+= -ldbus-1 + OPTIONS_DEFINE= DOCS NLS PCAP SSH2 SSL OPTIONS_DEFAULT=NLS SSH2 SSL OPTIONS_SUB= yes diff --git a/security/nmap-devel/files/patch-configure b/security/nmap-devel/files/patch-configure new file mode 100644 index 000000000000..332a95b99b08 --- /dev/null +++ b/security/nmap-devel/files/patch-configure @@ -0,0 +1,56 @@ +--- 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 + { 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 + { 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-devel/files/patch-libdnet-stripped_configure b/security/nmap-devel/files/patch-libdnet-stripped_configure index 06520638f3ea..3ac064bb4dc8 100644 --- a/security/nmap-devel/files/patch-libdnet-stripped_configure +++ b/security/nmap-devel/files/patch-libdnet-stripped_configure @@ -1,6 +1,6 @@ ---- libdnet-stripped/configure.orig 2025-04-30 19:58:18 UTC -+++ libdnet-stripped/configure -@@ -650,6 +650,9 @@ ac_includes_default="\ +--- 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 @@ -10,3 +10,17 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif" +@@ -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 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_dnet_bsd_bpf" >&5 diff --git a/security/nmap-devel/files/patch-libdnet-stripped_src_eth-bsd.c b/security/nmap-devel/files/patch-libdnet-stripped_src_eth-bsd.c new file mode 100644 index 000000000000..d66fadd31f5b --- /dev/null +++ b/security/nmap-devel/files/patch-libdnet-stripped_src_eth-bsd.c @@ -0,0 +1,11 @@ +--- 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) { + 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-devel/files/patch-libdnet-stripped_src_intf.c b/security/nmap-devel/files/patch-libdnet-stripped_src_intf.c index 649d6bedb578..f7adb16d22d2 100644 --- a/security/nmap-devel/files/patch-libdnet-stripped_src_intf.c +++ b/security/nmap-devel/files/patch-libdnet-stripped_src_intf.c @@ -1,6 +1,6 @@ ---- libdnet-stripped/src/intf.c.orig 2025-04-30 19:58:18 UTC -+++ libdnet-stripped/src/intf.c -@@ -178,7 +178,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 diff --git a/security/nmap-devel/files/patch-libpcap_Makefile.in b/security/nmap-devel/files/patch-libpcap_Makefile.in index 60dcc4e7d17e..a78c3fabce72 100644 --- a/security/nmap-devel/files/patch-libpcap_Makefile.in +++ b/security/nmap-devel/files/patch-libpcap_Makefile.in @@ -1,11 +1,12 @@ ---- libpcap/Makefile.in.orig 2025-04-30 19:58:18 UTC -+++ libpcap/Makefile.in -@@ -69,7 +69,7 @@ INSTALL_RPCAPD=@INSTALL_RPCAPD@ +--- 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) +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) INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?698149fb.31093.30a7d108>