head	1.2;
access;
symbols
	pkgsrc-2026Q3:1.2.0.2
	pkgsrc-2026Q3-base:1.2
	pkgsrc-2026Q2:1.1.0.10
	pkgsrc-2026Q2-base:1.1
	pkgsrc-2026Q1:1.1.0.8
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.6
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.4
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.2
	pkgsrc-2025Q2-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2026.09.14.22.10.12;	author tnn;	state Exp;
branches;
next	1.1;
commitid	BE2ZB9oJfLKkFDVG;

1.1
date	2025.05.15.15.47.08;	author adam;	state Exp;
branches;
next	;
commitid	LNdF6HnKr2Vvc1VF;


desc
@@


1.2
log
@nmap: make libpcap detection more robust in configure
@
text
@$NetBSD: patch-nping_configure,v 1.1 2025/05/15 15:47:08 adam Exp $

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,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 = 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 +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 = 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;
@


1.1
log
@nmap: add patches
@
text
@d1 1
a1 1
$NetBSD$
d3 3
a5 1
pcap_version is not portable.
d9 1
a9 1
@@@@ -6057,9 +6057,10 @@@@ else $as_nop
d16 2
a17 1
   int major, minor1, minor2;
d19 2
d24 1
a24 1
@@@@ -6095,9 +6096,10 @@@@ else $as_nop
d31 2
a32 1
   int major, minor;
d34 2
@