CVS commit: pkgsrc/net/nmap

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Sep  7 02:56:52 UTC 2026

Modified Files:
        pkgsrc/net/nmap: distinfo options.mk
Added Files:
        pkgsrc/net/nmap/patches: patch-traceroute.cc

Log Message:
nmap: fix build with GCC 12; allow Lua 5.4


To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 pkgsrc/net/nmap/distinfo
cvs rdiff -u -r1.23 -r1.24 pkgsrc/net/nmap/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/net/nmap/patches/patch-traceroute.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/nmap/distinfo
diff -u pkgsrc/net/nmap/distinfo:1.95 pkgsrc/net/nmap/distinfo:1.96
--- pkgsrc/net/nmap/distinfo:1.95       Thu Sep  3 07:16:25 2026
+++ pkgsrc/net/nmap/distinfo    Mon Sep  7 02:56:52 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.95 2026/09/03 07:16:25 adam Exp $
+$NetBSD: distinfo,v 1.96 2026/09/07 02:56:52 adam Exp $
 
 BLAKE2s (nmap-7.991.tar.bz2) = 50d48fbfbddc2769c98a9c2c2193b04ccb641d573c5be584cc8b735c9bda2364
 SHA512 (nmap-7.991.tar.bz2) = d87836eedd453f4f5e55075b50640a6ad61cb5dbc1f887dbaf725fa8c32b6a472d838d174c68a2efa749b3b028512d2f0467aea0ff0b5f5752df714db62f8320
@@ -13,3 +13,4 @@ SHA1 (patch-nping_EchoServer.cc) = e5b02
 SHA1 (patch-nping_configure) = 5c25448a3b5a4cd5121a115867532aab81b12b26
 SHA1 (patch-nsock_tests_run__tests.sh) = 88a7447f93dd3377e7e24e317c55528a73a17401
 SHA1 (patch-protocols.cc) = c3e2013a0c7016fbe1cabef5226685bd74377302
+SHA1 (patch-traceroute.cc) = 3084f766e0ae49f11ff72e0a29549cd3bcfd4783

Index: pkgsrc/net/nmap/options.mk
diff -u pkgsrc/net/nmap/options.mk:1.23 pkgsrc/net/nmap/options.mk:1.24
--- pkgsrc/net/nmap/options.mk:1.23     Wed Nov 24 14:17:58 2021
+++ pkgsrc/net/nmap/options.mk  Mon Sep  7 02:56:52 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.23 2021/11/24 14:17:58 nia Exp $
+# $NetBSD: options.mk,v 1.24 2026/09/07 02:56:52 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.nmap
 
@@ -26,7 +26,7 @@ PKG_SUGGESTED_OPTIONS=        liblinear
 PLIST_VARS+=   lua
 
 .if !empty(PKG_OPTIONS:Mlua)
-LUA_VERSIONS_ACCEPTED= 53      # needs lua_isyieldable, introduced in Lua 5.3
+LUA_VERSIONS_ACCEPTED= 54 53   # needs lua_isyieldable, introduced in Lua 5.3
 .include "../../lang/lua/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-liblua=${BUILDLINK_PREFIX.lua}
 PLIST.lua=             yes

Added files:

Index: pkgsrc/net/nmap/patches/patch-traceroute.cc
diff -u /dev/null pkgsrc/net/nmap/patches/patch-traceroute.cc:1.1
--- /dev/null   Mon Sep  7 02:56:52 2026
+++ pkgsrc/net/nmap/patches/patch-traceroute.cc Mon Sep  7 02:56:52 2026
@@ -0,0 +1,14 @@
+$NetBSD: patch-traceroute.cc,v 1.1 2026/09/07 02:56:52 adam Exp $
+
+Fix build with GCC 12 (GCC 14 builds fine).
+
+--- traceroute.cc.orig 2026-09-07 02:53:42.122634335 +0000
++++ traceroute.cc
+@@ -119,6 +119,7 @@ individually.
+ #include <dnet.h>
+ 
+ #include <algorithm>
++#include <cstddef>
+ #include <list>
+ #include <map>
+ #include <set>