CVS commit: pkgsrc/net

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Apr  1 13:00:05 UTC 2026

Modified Files:
        pkgsrc/net/ndiff: Makefile distinfo
        pkgsrc/net/nmap: Makefile Makefile.common distinfo
        pkgsrc/net/zenmap: Makefile PLIST distinfo
Added Files:
        pkgsrc/net/zenmap/patches: patch-pyproject.toml
Removed Files:
        pkgsrc/net/nmap/patches: patch-nping_NpingOps.cc

Log Message:
ndiff nmap zenma: updated to 7.99

Nmap 7.99 [2026-03-26]

o Integrated many of the most-frequently-submitted IPv4 and IPv6 OS
  fingerprints, as well as dozens of updated service fingerprints.

o Upgraded included libraries: OpenSSL 3.0.19, libpcap 1.10.6, libpcre2 10.47,
  liblinear 2.50, zlib 1.3.2

o [Windows] Upgraded the included version of Npcap from 1.83 to 1.87, resolving
  several crashes and stability-related issues. See https://npcap.com/changelog

o [Zenmap][GH-3182] Zenmap is now distributed as a universal wheel
  (zenmap-7.99-py3-none-any.whl) instead of an RPM package so that it can be
  installed on any system with Python 3. [Daniel Miller]

o [Ncat][Windows] Limited the number of handles inherited by subprocesses
  launched with -e, preventing interference between clients when -e and
  --keep-open are used. Reported by Nimish Verma.

o [Ncat] Several fixes for regressions or longstanding failure cases in
  ncat-test.pl [Daniel Miller]:

  + [Windows] Fixed handling of socket EOF with --exec

  + Fixed the -i (idle timeout) option for listen mode, which was broken
    when adding the -q option in Ncat 7.96

  + Fixed HTTP proxy server when SSL is used.

  + DTLS (SSL over UDP) shutdown connection on stdin EOF.

o [Windows][GH-2711] Nmap now supports scanning over various VPN virtual
  adapters like OpenVPN TAP adapters. [Daniel Miller]

o [GH-3280] Fix a performance regression in reverse-DNS in Nmap 7.98. The fix
  for -3130 had caused Nmap to send requests too slowly. [Daniel Miller]

o [macOS][GH-3289] Fixed a configure-time failure in libdnet that resulted in
  incorrect MAC addresses being reported. [Daniel Miller]

o [Zenmap][GH-3189] Fix a crash in Zenmap topology and hosts viewer:
  "TypeError: format requires a mapping" [Daniel Miller]

o [GH-2955] Fix a routing issue with -e and -S related to -2206
  causing error "setup_target: failed to determine route" [Daniel Miller]

o [GH-3214] Improve compatibility of build process on various platforms and add
  multiplatform autobuilds in Github workflow. [Jordan Ritter]

o [NSE][GH-2183][GH-3239] Script hostmap-crtsh now reports only true subdomains
  of a given target hostname by default. In the past, it was reporting any
  DNS name that included the target hostname as a substring (but not
  necessarily as a suffix). The old behavior can be enabled by setting script
  argument hostmap-crtsh.lax. [Sweekar-cmd, nnposter]

o [NSE] Function url.parse_query was not interpreting plus signs as spaces.
  [nnposter]

o [NSE] Function url.parse was not properly parsing URLs with query strings
  but empty paths. [nnposter]

o [NSE][GH-3287] Functions tableaux.tcopy and tableaux.shallow_tcopy were
  not behaving the same when the input table had a custom __pairs metamethod.
  Both functions now perform a raw copy, ignoring the metamethod. [nnposter]

o [NSE] Function tableaux.shallow_tcopy did not work correctly for tables
  with Boolean keys. [nnposter]

o [NSE] IPP print queue job details were not getting populated, having
  a hard dependency on Apple-specific attributes. [nnposter]

o [NSE][GH-3245] Functions connect and close have been removed from the IPP
  library, as they served no purpose. [nnposter]

o [NSE] ipOps.expand_ip was crashing upon malformed IPv6 addresses. [nnposter]

o [NSE][GH-3262] FTP banner parsing is now more closely aligned with RFC 959,
  section 4.2. [nnposter]

o [NSE][GH-3253] Function stdnse.make_buffer now accepts an extra parameter
  that allows preloading the newly created buffer with data. [nnposter]

o [NSE][GH-3191][GH-3218] Script http-internal-ip-disclosure has been enhanced,
  including added support for IPv6 and HTTPS and more accurate processing
  of target responses. [nnposter]

o [NSE][GH-3194] RPC-based scripts were sporadically failing due to privileged
  port conflicts. [nnposter]

o [NSE][GH-3196] Script rlogin-brute was sporadically failing due to using
  an off-by-one range for privileged ports and not handling potential
  port conflicts. [nnposter]


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/ndiff/Makefile \
    pkgsrc/net/ndiff/distinfo
cvs rdiff -u -r1.152 -r1.153 pkgsrc/net/nmap/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/nmap/Makefile.common
cvs rdiff -u -r1.92 -r1.93 pkgsrc/net/nmap/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/net/nmap/patches/patch-nping_NpingOps.cc
cvs rdiff -u -r1.20 -r1.21 pkgsrc/net/zenmap/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/zenmap/PLIST
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/zenmap/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/zenmap/patches/patch-pyproject.toml

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

Modified files:

Index: pkgsrc/net/ndiff/Makefile
diff -u pkgsrc/net/ndiff/Makefile:1.11 pkgsrc/net/ndiff/Makefile:1.12
--- pkgsrc/net/ndiff/Makefile:1.11      Thu May 15 15:44:41 2025
+++ pkgsrc/net/ndiff/Makefile   Wed Apr  1 13:00:04 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2025/05/15 15:44:41 adam Exp $
+# $NetBSD: Makefile,v 1.12 2026/04/01 13:00:04 adam Exp $
 
 .include "../../net/nmap/Makefile.common"
 
@@ -16,11 +16,5 @@ TOOL_DEPENDS+=       ${PYPKGPREFIX}-setuptools
 
 USE_LANGUAGES= # none
 
-SUBST_CLASSES+=                version
-SUBST_STAGE.version=   pre-configure
-SUBST_MESSAGE.version= Fixing version.
-SUBST_FILES.version=   pyproject.toml
-SUBST_SED.version=     -e 's,7.96,${PKGVERSION_NOREV},'
-
 .include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/ndiff/distinfo
diff -u pkgsrc/net/ndiff/distinfo:1.11 pkgsrc/net/ndiff/distinfo:1.12
--- pkgsrc/net/ndiff/distinfo:1.11      Mon Aug 25 11:54:33 2025
+++ pkgsrc/net/ndiff/distinfo   Wed Apr  1 13:00:04 2026
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2025/08/25 11:54:33 adam Exp $
+$NetBSD: distinfo,v 1.12 2026/04/01 13:00:04 adam Exp $
 
-BLAKE2s (nmap-7.98.tar.bz2) = 1bc70d03fee3da63d804a1e21af732cb8c0a5ce3db55d8f1b970dfc0d8e59ebe
-SHA512 (nmap-7.98.tar.bz2) = 14e13689d1276f70efc8c905e8eb0a15970f4312c2ef86d8d97e9df11319735e7f7cd73f728f69cf43d27a078ef5ac1e0f39cd119d8cb9262060c42606c6cab3
-Size (nmap-7.98.tar.bz2) = 12273108 bytes
+BLAKE2s (nmap-7.99.tar.bz2) = 2a4f8ad74dd7b0206dd78ca01b1f783a49596e9f947d385627ad9abd9af70dac
+SHA512 (nmap-7.99.tar.bz2) = 9ff69659b76573eb10b6e472a0217032fd5fed20f0ac971b3736a4222fb6251c5fbf381ebea7ede313b8ff2feac90a848f645000c61200772d01b843594f4ba4
+Size (nmap-7.99.tar.bz2) = 13036588 bytes

Index: pkgsrc/net/nmap/Makefile
diff -u pkgsrc/net/nmap/Makefile:1.152 pkgsrc/net/nmap/Makefile:1.153
--- pkgsrc/net/nmap/Makefile:1.152      Thu Oct 23 20:38:52 2025
+++ pkgsrc/net/nmap/Makefile    Wed Apr  1 13:00:04 2026
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.152 2025/10/23 20:38:52 wiz Exp $
+# $NetBSD: Makefile,v 1.153 2026/04/01 13:00:04 adam Exp $
 
-PKGREVISION= 1
 .include "Makefile.common"
 
 COMMENT=       Network/port scanner with OS detection

Index: pkgsrc/net/nmap/Makefile.common
diff -u pkgsrc/net/nmap/Makefile.common:1.11 pkgsrc/net/nmap/Makefile.common:1.12
--- pkgsrc/net/nmap/Makefile.common:1.11        Mon Aug 25 11:54:33 2025
+++ pkgsrc/net/nmap/Makefile.common     Wed Apr  1 13:00:04 2026
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.11 2025/08/25 11:54:33 adam Exp $
+# $NetBSD: Makefile.common,v 1.12 2026/04/01 13:00:04 adam Exp $
 # used by net/ndiff/Makefile
 # used by net/nmap/Makefile
 # used by net/zenmap/Makefile
 
-DISTNAME=      nmap-7.98
+DISTNAME=      nmap-7.99
 CATEGORIES=    net security
 MASTER_SITES=  http://nmap.org/dist/
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/net/nmap/distinfo
diff -u pkgsrc/net/nmap/distinfo:1.92 pkgsrc/net/nmap/distinfo:1.93
--- pkgsrc/net/nmap/distinfo:1.92       Mon Aug 25 11:54:33 2025
+++ pkgsrc/net/nmap/distinfo    Wed Apr  1 13:00:04 2026
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.92 2025/08/25 11:54:33 adam Exp $
+$NetBSD: distinfo,v 1.93 2026/04/01 13:00:04 adam Exp $
 
-BLAKE2s (nmap-7.98.tar.bz2) = 1bc70d03fee3da63d804a1e21af732cb8c0a5ce3db55d8f1b970dfc0d8e59ebe
-SHA512 (nmap-7.98.tar.bz2) = 14e13689d1276f70efc8c905e8eb0a15970f4312c2ef86d8d97e9df11319735e7f7cd73f728f69cf43d27a078ef5ac1e0f39cd119d8cb9262060c42606c6cab3
-Size (nmap-7.98.tar.bz2) = 12273108 bytes
+BLAKE2s (nmap-7.99.tar.bz2) = 2a4f8ad74dd7b0206dd78ca01b1f783a49596e9f947d385627ad9abd9af70dac
+SHA512 (nmap-7.99.tar.bz2) = 9ff69659b76573eb10b6e472a0217032fd5fed20f0ac971b3736a4222fb6251c5fbf381ebea7ede313b8ff2feac90a848f645000c61200772d01b843594f4ba4
+Size (nmap-7.99.tar.bz2) = 13036588 bytes
 SHA1 (patch-charpool.cc) = 6d72e5723f41965fd80e166c5507167aab760022
 SHA1 (patch-configure) = 5d68f319f1581bb07a586e107155510c7decc342
 SHA1 (patch-libdnet-stripped_src_arp-bsd.c) = c56c4e70eca2fa04dd8aab38ed2c3f4cac83f5e3
 SHA1 (patch-libnetutil_netutil.cc) = 7bd1059d6cbcf4f6d129730d6c6f6bc3ab54c0a0
 SHA1 (patch-ncat_configure) = 32753ff3afe91d721a704455f404a9ae3ebc372e
 SHA1 (patch-nping_EchoServer.cc) = e5b0213e3cfff8a32b5ae291c1921a86b9b17dd3
-SHA1 (patch-nping_NpingOps.cc) = 074766040fbf6dc16315b6313d6dad4ff514a91a
 SHA1 (patch-nping_configure) = 5c25448a3b5a4cd5121a115867532aab81b12b26
 SHA1 (patch-nsock_tests_run__tests.sh) = 88a7447f93dd3377e7e24e317c55528a73a17401
 SHA1 (patch-protocols.cc) = c3e2013a0c7016fbe1cabef5226685bd74377302

Index: pkgsrc/net/zenmap/Makefile
diff -u pkgsrc/net/zenmap/Makefile:1.20 pkgsrc/net/zenmap/Makefile:1.21
--- pkgsrc/net/zenmap/Makefile:1.20     Mon Aug 25 11:54:33 2025
+++ pkgsrc/net/zenmap/Makefile  Wed Apr  1 13:00:05 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2025/08/25 11:54:33 adam Exp $
+# $NetBSD: Makefile,v 1.21 2026/04/01 13:00:05 adam Exp $
 
 .include "../../net/nmap/Makefile.common"
 
@@ -13,6 +13,7 @@ EXTRACT_ELEMENTS=     ${DISTNAME}/zenmap
 WHEEL_NAME=    zenmap-${PKGVERSION_NOREV}
 
 TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools>=78:../../devel/py-setuptools
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-gettext>=0:../../devel/py-setuptools-gettext
 
 USE_LANGUAGES= # none
 
@@ -20,10 +21,6 @@ DEPENDS+=    gtk3+-[0-9]*:../../x11/gtk3
 DEPENDS+=      nmap-[0-9]*:../../net/nmap
 DEPENDS+=      ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
 
-# XXX: wrong version in the distfile; fix on the next update.
-pre-configure:
-       ${ECHO} "VERSION = ${PKGVERSION_NOREV}" > ${WRKSRC}/zenmapCore/Version.py
-
 .include "../../lang/python/batteries-included.mk"
 .include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/zenmap/PLIST
diff -u pkgsrc/net/zenmap/PLIST:1.8 pkgsrc/net/zenmap/PLIST:1.9
--- pkgsrc/net/zenmap/PLIST:1.8 Tue Apr 15 12:02:01 2025
+++ pkgsrc/net/zenmap/PLIST     Wed Apr  1 13:00:05 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2025/04/15 12:02:01 abs Exp $
+@comment $NetBSD: PLIST,v 1.9 2026/04/01 13:00:05 adam Exp $
 bin/zenmap
 ${PYSITELIB}/${WHEEL_INFODIR}/METADATA
 ${PYSITELIB}/${WHEEL_INFODIR}/RECORD
@@ -375,3 +375,14 @@ ${PYSITELIB}/zenmapGUI/higwidgets/higtex
 ${PYSITELIB}/zenmapGUI/higwidgets/higwindows.py
 ${PYSITELIB}/zenmapGUI/higwidgets/higwindows.pyc
 ${PYSITELIB}/zenmapGUI/higwidgets/higwindows.pyo
+share/locale/de/LC_MESSAGES/zenmap.mo
+share/locale/es/LC_MESSAGES/zenmap.mo
+share/locale/fr/LC_MESSAGES/zenmap.mo
+share/locale/hi/LC_MESSAGES/zenmap.mo
+share/locale/hr/LC_MESSAGES/zenmap.mo
+share/locale/it/LC_MESSAGES/zenmap.mo
+share/locale/ja/LC_MESSAGES/zenmap.mo
+share/locale/pl/LC_MESSAGES/zenmap.mo
+share/locale/pt_BR/LC_MESSAGES/zenmap.mo
+share/locale/ru/LC_MESSAGES/zenmap.mo
+share/locale/zh/LC_MESSAGES/zenmap.mo

Index: pkgsrc/net/zenmap/distinfo
diff -u pkgsrc/net/zenmap/distinfo:1.11 pkgsrc/net/zenmap/distinfo:1.12
--- pkgsrc/net/zenmap/distinfo:1.11     Mon Aug 25 11:54:33 2025
+++ pkgsrc/net/zenmap/distinfo  Wed Apr  1 13:00:05 2026
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.11 2025/08/25 11:54:33 adam Exp $
+$NetBSD: distinfo,v 1.12 2026/04/01 13:00:05 adam Exp $
 
-BLAKE2s (nmap-7.98.tar.bz2) = 1bc70d03fee3da63d804a1e21af732cb8c0a5ce3db55d8f1b970dfc0d8e59ebe
-SHA512 (nmap-7.98.tar.bz2) = 14e13689d1276f70efc8c905e8eb0a15970f4312c2ef86d8d97e9df11319735e7f7cd73f728f69cf43d27a078ef5ac1e0f39cd119d8cb9262060c42606c6cab3
-Size (nmap-7.98.tar.bz2) = 12273108 bytes
+BLAKE2s (nmap-7.99.tar.bz2) = 2a4f8ad74dd7b0206dd78ca01b1f783a49596e9f947d385627ad9abd9af70dac
+SHA512 (nmap-7.99.tar.bz2) = 9ff69659b76573eb10b6e472a0217032fd5fed20f0ac971b3736a4222fb6251c5fbf381ebea7ede313b8ff2feac90a848f645000c61200772d01b843594f4ba4
+Size (nmap-7.99.tar.bz2) = 13036588 bytes
+SHA1 (patch-pyproject.toml) = 57c7caa4efd8ede5ea047c8176f1727e16eab91e

Added files:

Index: pkgsrc/net/zenmap/patches/patch-pyproject.toml
diff -u /dev/null pkgsrc/net/zenmap/patches/patch-pyproject.toml:1.1
--- /dev/null   Wed Apr  1 13:00:05 2026
+++ pkgsrc/net/zenmap/patches/patch-pyproject.toml      Wed Apr  1 13:00:05 2026
@@ -0,0 +1,23 @@
+$NetBSD: patch-pyproject.toml,v 1.1 2026/04/01 13:00:05 adam Exp $
+
+Don't install ndiff.
+
+--- pyproject.toml.orig        2026-04-01 12:55:12.423831238 +0000
++++ pyproject.toml
+@@ -24,8 +24,6 @@ Changelog = "https://nmap.org/changelog";
+ [project.gui-scripts]
+ zenmap = "zenmapGUI.App:run"
+ 
+-[project.scripts]
+-ndiff = "ndiff:run_main"
+ 
+ [tool.setuptools]
+ packages = [
+@@ -44,7 +42,6 @@ packages = [
+ "radialnet.gui",
+ "radialnet.util",
+ ]
+-py-modules = ["ndiff"]
+ 
+ [tool.setuptools.dynamic]
+ version = {attr = "zenmapCore.Version.VERSION"}