CVS commit: pkgsrc/net/nmap

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Sep 14 22:10:12 UTC 2026

Modified Files:
        pkgsrc/net/nmap: distinfo
        pkgsrc/net/nmap/patches: patch-configure patch-ncat_configure
            patch-nping_configure

Log Message:
nmap: make libpcap detection more robust in configure


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 pkgsrc/net/nmap/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/nmap/patches/patch-configure
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/nmap/patches/patch-ncat_configure \
    pkgsrc/net/nmap/patches/patch-nping_configure

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.96 pkgsrc/net/nmap/distinfo:1.97
--- pkgsrc/net/nmap/distinfo:1.96       Mon Sep  7 02:56:52 2026
+++ pkgsrc/net/nmap/distinfo    Mon Sep 14 22:10:11 2026
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.96 2026/09/07 02:56:52 adam Exp $
+$NetBSD: distinfo,v 1.97 2026/09/14 22:10:11 tnn Exp $
 
 BLAKE2s (nmap-7.991.tar.bz2) = 50d48fbfbddc2769c98a9c2c2193b04ccb641d573c5be584cc8b735c9bda2364
 SHA512 (nmap-7.991.tar.bz2) = d87836eedd453f4f5e55075b50640a6ad61cb5dbc1f887dbaf725fa8c32b6a472d838d174c68a2efa749b3b028512d2f0467aea0ff0b5f5752df714db62f8320
 Size (nmap-7.991.tar.bz2) = 12877122 bytes
 SHA1 (patch-charpool.cc) = 6d72e5723f41965fd80e166c5507167aab760022
-SHA1 (patch-configure) = 5d68f319f1581bb07a586e107155510c7decc342
+SHA1 (patch-configure) = 70167bb20f9317536dbdd8a970bb4c3c8ad6feea
 SHA1 (patch-libdnet-stripped_src_arp-bsd.c) = c56c4e70eca2fa04dd8aab38ed2c3f4cac83f5e3
 SHA1 (patch-libnetutil_netutil.cc) = 7bd1059d6cbcf4f6d129730d6c6f6bc3ab54c0a0
-SHA1 (patch-ncat_configure) = 32753ff3afe91d721a704455f404a9ae3ebc372e
+SHA1 (patch-ncat_configure) = f5a6f1e7e4cb8d863d7ccb19a80576e3edf7c685
 SHA1 (patch-nmap.cc) = d5da780c4fd40d5cee5176a6c3bc0255308f8e5d
 SHA1 (patch-nping_EchoServer.cc) = e5b0213e3cfff8a32b5ae291c1921a86b9b17dd3
-SHA1 (patch-nping_configure) = 5c25448a3b5a4cd5121a115867532aab81b12b26
+SHA1 (patch-nping_configure) = a13d2e2a37e271bc6cd31e5492a094df660cc08c
 SHA1 (patch-nsock_tests_run__tests.sh) = 88a7447f93dd3377e7e24e317c55528a73a17401
 SHA1 (patch-protocols.cc) = c3e2013a0c7016fbe1cabef5226685bd74377302
 SHA1 (patch-traceroute.cc) = 3084f766e0ae49f11ff72e0a29549cd3bcfd4783

Index: pkgsrc/net/nmap/patches/patch-configure
diff -u pkgsrc/net/nmap/patches/patch-configure:1.3 pkgsrc/net/nmap/patches/patch-configure:1.4
--- pkgsrc/net/nmap/patches/patch-configure:1.3 Thu May 15 15:44:41 2025
+++ pkgsrc/net/nmap/patches/patch-configure     Mon Sep 14 22:10:12 2026
@@ -1,36 +1,44 @@
-$NetBSD: patch-configure,v 1.3 2025/05/15 15:44:41 adam Exp $
+$NetBSD: patch-configure,v 1.4 2026/09/14 22:10:12 tnn Exp $
 
-pcap_version is not portable.
+pcap_version is not portable; use pcap_lib_version(), which returns a
+string like "libpcap version 1.10.7 (...)", so skip to the first digit
+before parsing it.
 
 External liblinear must be configured later.
 
 --- configure.orig     2025-05-06 17:33:27.000000000 +0000
 +++ configure
-@@ -6274,9 +6274,10 @@ else
+@@ -6274,9 +6274,12 @@ else
  /* end confdefs.h.  */
  
  #include <stdio.h>
 -extern char pcap_version[];
 +#include <pcap/pcap.h>
  int main() {
-   int major, minor1, minor2;
+-  int major, minor1, minor2;
++  int major = 0, minor1 = 0, minor2 = 0;
 +  const char *pcap_version = pcap_lib_version();
++  while (*pcap_version != '\0' && (*pcap_version < '0' || *pcap_version > '9'))
++    pcap_version++;
    sscanf(pcap_version,"%d.%d.%d", &major, &minor1, &minor2);
    if (major > 0)
      return 0;
-@@ -6310,9 +6311,10 @@ else
+@@ -6310,9 +6313,12 @@ else
  #ifdef HAVE_NET_BPF_H
  #include <net/bpf.h>
  #endif
 -extern char pcap_version[];
 +#include <pcap/pcap.h>
  int main() {
-   int major, minor;
-+  const char *pcap_version = pcap_lib_version(); 
+-  int major, minor;
++  int major = 0, minor = 0;
++  const char *pcap_version = pcap_lib_version();
++  while (*pcap_version != '\0' && (*pcap_version < '0' || *pcap_version > '9'))
++    pcap_version++;
    sscanf(pcap_version,"%d.%d", &major, &minor);
    if ((major == 1 && minor >= 1) || major > 1)
      return 0;
-@@ -7196,7 +7198,6 @@ if test "${with_liblinear+set}" = set; t
+@@ -7196,7 +7202,6 @@ if test "${with_liblinear+set}" = set; t
    *)
      CPPFLAGS="-I$with_liblinear/include $CPPFLAGS"
      LDFLAGS="-L$with_liblinear/lib $LDFLAGS"

Index: pkgsrc/net/nmap/patches/patch-ncat_configure
diff -u pkgsrc/net/nmap/patches/patch-ncat_configure:1.1 pkgsrc/net/nmap/patches/patch-ncat_configure:1.2
--- pkgsrc/net/nmap/patches/patch-ncat_configure:1.1    Thu May 15 15:47:08 2025
+++ pkgsrc/net/nmap/patches/patch-ncat_configure        Mon Sep 14 22:10:12 2026
@@ -1,30 +1,38 @@
-$NetBSD: patch-ncat_configure,v 1.1 2025/05/15 15:47:08 adam Exp $
+$NetBSD: patch-ncat_configure,v 1.2 2026/09/14 22:10:12 tnn Exp $
 
-pcap_version is not portable.
+pcap_version is not portable; use pcap_lib_version(), which returns a
+string like "libpcap version 1.10.7 (...)", so skip to the first digit
+before parsing it.
 
 --- ncat/configure.orig        2025-05-15 09:52:29.731026958 +0000
 +++ ncat/configure
-@@ -4832,9 +4832,10 @@ else
+@@ -4832,9 +4832,12 @@ else
  /* end confdefs.h.  */
  
  #include <stdio.h>
 -extern char pcap_version[];
 +#include <pcap/pcap.h>
  int main() {
-   int major, minor1, minor2;
+-  int major, minor1, minor2;
++  int major = 0, minor1 = 0, minor2 = 0;
 +  const char *pcap_version = pcap_lib_version();
++  while (*pcap_version != '\0' && (*pcap_version < '0' || *pcap_version > '9'))
++    pcap_version++;
    sscanf(pcap_version,"%d.%d.%d", &major, &minor1, &minor2);
    if (major > 0)
      return 0;
-@@ -4868,9 +4869,10 @@ else
+@@ -4868,9 +4871,12 @@ else
  #ifdef HAVE_NET_BPF_H
  #include <net/bpf.h>
  #endif
 -extern char pcap_version[];
 +#include <pcap/pcap.h>
  int main() {
-   int major, minor;
+-  int major, minor;
++  int major = 0, minor = 0;
 +  const char *pcap_version = pcap_lib_version();
++  while (*pcap_version != '\0' && (*pcap_version < '0' || *pcap_version > '9'))
++    pcap_version++;
    sscanf(pcap_version,"%d.%d", &major, &minor);
    if ((major == 1 && minor >= 1) || major > 1)
      return 0;
Index: pkgsrc/net/nmap/patches/patch-nping_configure
diff -u pkgsrc/net/nmap/patches/patch-nping_configure:1.1 pkgsrc/net/nmap/patches/patch-nping_configure:1.2
--- pkgsrc/net/nmap/patches/patch-nping_configure:1.1   Thu May 15 15:47:08 2025
+++ pkgsrc/net/nmap/patches/patch-nping_configure       Mon Sep 14 22:10:12 2026
@@ -1,30 +1,38 @@
-$NetBSD: patch-nping_configure,v 1.1 2025/05/15 15:47:08 adam Exp $
+$NetBSD: patch-nping_configure,v 1.2 2026/09/14 22:10:12 tnn Exp $
 
-pcap_version is not portable.
+pcap_version is not portable; use pcap_lib_version(), which returns a
+string like "libpcap version 1.10.7 (...)", so skip to the first digit
+before parsing it.
 
 --- nping/configure.orig       2025-05-15 09:53:51.037421707 +0000
 +++ nping/configure
-@@ -6057,9 +6057,10 @@ else $as_nop
+@@ -6057,9 +6057,12 @@ else $as_nop
  /* end confdefs.h.  */
  
  #include <stdio.h>
 -extern char pcap_version[];
 +#include <pcap/pcap.h>
  int main() {
-   int major, minor1, minor2;
+-  int major, minor1, minor2;
++  int major = 0, minor1 = 0, minor2 = 0;
 +  const char *pcap_version = pcap_lib_version();
++  while (*pcap_version != '\0' && (*pcap_version < '0' || *pcap_version > '9'))
++    pcap_version++;
    sscanf(pcap_version,"%d.%d.%d", &major, &minor1, &minor2);
    if (major > 0)
      return 0;
-@@ -6095,9 +6096,10 @@ else $as_nop
+@@ -6095,9 +6098,12 @@ else $as_nop
  #ifdef HAVE_NET_BPF_H
  #include <net/bpf.h>
  #endif
 -extern char pcap_version[];
 +#include <pcap/pcap.h>
  int main() {
-   int major, minor;
+-  int major, minor;
++  int major = 0, minor = 0;
 +  const char *pcap_version = pcap_lib_version();
++  while (*pcap_version != '\0' && (*pcap_version < '0' || *pcap_version > '9'))
++    pcap_version++;
    sscanf(pcap_version,"%d.%d", &major, &minor);
    if ((major == 1 && minor >= 1) || major > 1)
      return 0;