From nobody Mon May 05 14:18:06 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZrkC31CBvz5vZK3; Mon, 05 May 2025 14:18:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZrkC30mt0z3NYD; Mon, 05 May 2025 14:18:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746454687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rHri5U7f5XpExIeN7W5MOxaYrENL+UuZA+ZrefEt3zA=; b=oFVvGx747BHFcDNq5qW1vCzEjfj6qeo8hLm2tDcZmlU5lUYNtKEkes/h1XcDk+VjyRyKJ+ LorG2+vMgPevMy+3XDFcebfw1nB1iU3QyDf5pP7iwJpCpZwsFS8LFS2SYcvXGkDYu4iNu3 Nlrg+6JI8FdG4ph9eihyk5dJ6jG2DOTaXVVwXkzefPAez1IpGUK4jhWbCTLhGNISaw4k1j VyGHRVPpMTAwcdplt/Si3QyglG9NSu0p0iEgYDVZHlcyrT5hQF/bXiBIojbCLlLozCvqR2 HAUoYamT+6bTo0/9UEp3fsNZcGmbUqoVIpZWhBQiOTA8jIw0dbduvNnqCTl7EA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746454687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rHri5U7f5XpExIeN7W5MOxaYrENL+UuZA+ZrefEt3zA=; b=oTsrlPN6ucJYywM/g+h3fp3Ht27g+Wb6M94HnEyrsyip/F95p/NdP6rF71XWkZuWK87rdW S9qUFYKApls8N6aGJ1CZHj9vgfuh+lap6osUYC5e8oSKuia5iwtKJrjylHLm6EB29+LG6V DofvEs9/OCGETMAUpAarv94MuA9FLV4jksSfsMfC1O+EpR51nN7t94prf/ZTuJsMVpKUUf mD9a38V/VrKI4O4alY2eVi03Fg+kaD7tlPIekQRukq1XYeC4T4g71d2dQq9DkxWKcOrJ10 8HO65nQnJScntdyrtu1ZnjdoeLPShia9Enfh4NEI4OmosRlGPIN+lh0RQJ7KJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746454687; a=rsa-sha256; cv=none; b=hv37TKVzBC3GgSka72NZciTwyAETZSWa3mUr/SpR6ZLI5sTyoRrA3nVjUH8oplqiZjIRg8 TAvShoRED7GKmCQPWLNJhvl77JfW8IENm2ALtbllk9wVfCTzrhiJm4cTGMg3zVDTxa3+A/ OI8rumCZtEHnTwwCbsg0PJcforY1foect48pT9sdgHSOpy00cG59tPAYze385jpiNAm1gD XF76Ftx2qHD7E6832ayGxmq5N0kAVdfkMNTySCgPBQ4FiZ2NVVh0XO7duD5YK3Lsl5fYnl +RIVYBkYBfyHt3pMFOdN/acViyVNm0WpX6gH+zLYS3FuvE36JesnBYQ1skOxwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZrkC30Cfsz2Hg; Mon, 05 May 2025 14:18:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 545EI6sK045324; Mon, 5 May 2025 14:18:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 545EI6ld045321; Mon, 5 May 2025 14:18:06 GMT (envelope-from git) Date: Mon, 5 May 2025 14:18:06 GMT Message-Id: <202505051418.545EI6ld045321@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 7fb570170257 - main - security/nmap-devel: Update to the latest GH commit List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7fb570170257bc4fbd563cd109dcbb2c241451cf Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=7fb570170257bc4fbd563cd109dcbb2c241451cf commit 7fb570170257bc4fbd563cd109dcbb2c241451cf Author: Cy Schubert AuthorDate: 2025-05-05 14:16:59 +0000 Commit: Cy Schubert 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 +@@ -650,6 +650,9 @@ ac_includes_default="\ + #ifdef HAVE_SYS_STAT_H + # include #endif +#ifdef HAVE_SYS_SOCKET_H +# include @@ -10,17 +10,3 @@ #ifdef HAVE_UNISTD_H # include #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@