git: 7fb570170257 - main - security/nmap-devel: Update to the latest GH commit

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Cy Schubert <cy_at_FreeBSD.org>
Date: Mon, 05 May 2025 14:18:06 UTC
The branch main has been updated by cy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7fb570170257bc4fbd563cd109dcbb2c241451cf

commit 7fb570170257bc4fbd563cd109dcbb2c241451cf
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2025-05-05 14:16:59 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2025-05-05 14:18:03 +0000

    security/nmap-devel: Update to the latest GH commit
---
 security/nmap-devel/Makefile                       |  4 ++--
 security/nmap-devel/distinfo                       |  6 +++---
 .../files/patch-libdnet-stripped_configure         | 22 ++++------------------
 .../files/patch-libdnet-stripped_src_eth-bsd.c     | 11 -----------
 .../files/patch-libdnet-stripped_src_intf.c        |  6 +++---
 security/nmap-devel/files/patch-liblua_Makefile    |  6 +++---
 .../nmap-devel/files/patch-libpcap_Makefile.in     | 10 ++++------
 7 files changed, 19 insertions(+), 46 deletions(-)

diff --git a/security/nmap-devel/Makefile b/security/nmap-devel/Makefile
index 108bf3a940b9..a42f4373b950 100644
--- a/security/nmap-devel/Makefile
+++ b/security/nmap-devel/Makefile
@@ -27,8 +27,8 @@ EXTRACT_AFTER_ARGS=	--exclude ${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}/mswin3
 			--no-same-owner --no-same-permissions
 
 USE_GITHUB=	yes
-GH_TAGNAME=	4ab57093d
-NMAP_COMMIT_DATE=	20250323
+GH_TAGNAME=	eddc779a0
+NMAP_COMMIT_DATE=	20250430
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=--without-localdirs \
diff --git a/security/nmap-devel/distinfo b/security/nmap-devel/distinfo
index e37f4264abf9..8098b0d35901 100644
--- a/security/nmap-devel/distinfo
+++ b/security/nmap-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743051294
-SHA256 (nmap-nmap-7.95.20250323-4ab57093d_GH0.tar.gz) = 14cfca5207b5770c8d7556561f29d2a4d76ec8a5639ee8f339e073f7003173c9
-SIZE (nmap-nmap-7.95.20250323-4ab57093d_GH0.tar.gz) = 15445384
+TIMESTAMP = 1746453321
+SHA256 (nmap-nmap-7.95.20250430-eddc779a0_GH0.tar.gz) = 4050bd2f708e25d8f3d95ad6dd74f5becf682d447e78f314cfdbb86fb56b00db
+SIZE (nmap-nmap-7.95.20250430-eddc779a0_GH0.tar.gz) = 15802043
diff --git a/security/nmap-devel/files/patch-libdnet-stripped_configure b/security/nmap-devel/files/patch-libdnet-stripped_configure
index 74170ec491a6..06520638f3ea 100644
--- a/security/nmap-devel/files/patch-libdnet-stripped_configure
+++ b/security/nmap-devel/files/patch-libdnet-stripped_configure
@@ -1,8 +1,8 @@
---- libdnet-stripped/configure.orig	2017-08-02 18:48:27 UTC
+--- libdnet-stripped/configure.orig	2025-04-30 19:58:18 UTC
 +++ libdnet-stripped/configure
-@@ -764,6 +764,9 @@ ac_includes_default="\
- #ifdef HAVE_STDINT_H
- # include <stdint.h>
+@@ -650,6 +650,9 @@ ac_includes_default="\
+ #ifdef HAVE_SYS_STAT_H
+ # include <sys/stat.h>
  #endif
 +#ifdef HAVE_SYS_SOCKET_H
 +# include <sys/socket.h>
@@ -10,17 +10,3 @@
  #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
- fi
- 
-     { $as_echo "$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
deleted file mode 100644
index 24d538b095f8..000000000000
--- a/security/nmap-devel/files/patch-libdnet-stripped_src_eth-bsd.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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;
- 
- 	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);
- 			/* This would be O_WRONLY, but Mac OS X 10.6 has a bug
- 			   where that prevents other users of the interface
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 188374dfaaee..649d6bedb578 100644
--- a/security/nmap-devel/files/patch-libdnet-stripped_src_intf.c
+++ b/security/nmap-devel/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.orig	2025-04-30 19:58:18 UTC
 +++ libdnet-stripped/src/intf.c
-@@ -163,7 +163,7 @@ intf_open(void)
+@@ -178,7 +178,7 @@ intf_open(void)
  #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-devel/files/patch-liblua_Makefile b/security/nmap-devel/files/patch-liblua_Makefile
index 5ff1968b2350..d21c7f3f7947 100644
--- a/security/nmap-devel/files/patch-liblua_Makefile
+++ b/security/nmap-devel/files/patch-liblua_Makefile
@@ -1,8 +1,8 @@
---- liblua/Makefile.orig	2016-07-02 17:02:27 UTC
+--- liblua/Makefile.orig	2025-04-30 19:58:18 UTC
 +++ liblua/Makefile
-@@ -6,8 +6,8 @@
+@@ -6,8 +6,8 @@ PLAT= guess
  # Your platform. See PLATS for possible values.
- PLAT= none
+ PLAT= guess
  
 -CC= gcc -std=gnu99
 -CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS)
diff --git a/security/nmap-devel/files/patch-libpcap_Makefile.in b/security/nmap-devel/files/patch-libpcap_Makefile.in
index 91bae33073bf..60dcc4e7d17e 100644
--- a/security/nmap-devel/files/patch-libpcap_Makefile.in
+++ b/security/nmap-devel/files/patch-libpcap_Makefile.in
@@ -1,13 +1,11 @@
---- 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-30 19:58:18 UTC
++++ libpcap/Makefile.in
+@@ -69,7 +69,7 @@ INSTALL_RPCAPD=@INSTALL_RPCAPD@
+ 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)
  
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@