Commit be886873 authored by Cy Schubert's avatar Cy Schubert
Browse files

security/nmap: Update to 7.98

parent 12d307f3
Loading
Loading
Loading
Loading
+10 −3
Original line number Diff line number Diff line
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
+3 −3
Original line number Diff line number Diff line
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
+46 −10
Original line number Diff line number Diff line
--- 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
+14 −14
Original line number Diff line number Diff line
--- 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
@@ -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
+# PR ports/154353 : support building in FreeBSD jail
+    ac_cv_dnet_bsd_bpf=yes
-    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
+7 −7
Original line number Diff line number Diff line
--- 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
Loading