CVS commit: pkgsrc/net/nmap

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Dec 17 13:29:09 UTC 2024

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

Log Message:
nmap: fix detection of pkgsrc libpcap


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 pkgsrc/net/nmap/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/nmap/patches/patch-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.89 pkgsrc/net/nmap/distinfo:1.90
--- pkgsrc/net/nmap/distinfo:1.89       Thu Apr 25 07:15:03 2024
+++ pkgsrc/net/nmap/distinfo    Tue Dec 17 13:29:09 2024
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.89 2024/04/25 07:15:03 adam Exp $
+$NetBSD: distinfo,v 1.90 2024/12/17 13:29:09 tnn Exp $
 
 BLAKE2s (nmap-7.95.tar.bz2) = 07bd501519952dae05b65ad465ef1417bd3aeb22e36ff0dde875e78194d82af8
 SHA512 (nmap-7.95.tar.bz2) = fd95a8bc627a2b8b507353f761dc9fdc8e880a0dd2d75a51b9cb3ec664318796af9bb16a6ff9a1358bd77ad669c2a54e333be630f201f69287692a7d2d41c17e
 Size (nmap-7.95.tar.bz2) = 11717069 bytes
 SHA1 (patch-charpool.cc) = 6d72e5723f41965fd80e166c5507167aab760022
-SHA1 (patch-configure) = 5fc39f084eadd6ea0560cd8e6f52074113566600
+SHA1 (patch-configure) = aeaf9434958c576765a89412eb359611da23ddc0
 SHA1 (patch-libdnet-stripped_src_arp-bsd.c) = c56c4e70eca2fa04dd8aab38ed2c3f4cac83f5e3
 SHA1 (patch-libnetutil_netutil.cc) = 7bd1059d6cbcf4f6d129730d6c6f6bc3ab54c0a0
 SHA1 (patch-nping_EchoServer.cc) = e5b0213e3cfff8a32b5ae291c1921a86b9b17dd3

Index: pkgsrc/net/nmap/patches/patch-configure
diff -u pkgsrc/net/nmap/patches/patch-configure:1.1 pkgsrc/net/nmap/patches/patch-configure:1.2
--- pkgsrc/net/nmap/patches/patch-configure:1.1 Fri Nov 20 15:37:40 2015
+++ pkgsrc/net/nmap/patches/patch-configure     Tue Dec 17 13:29:09 2024
@@ -1,10 +1,14 @@
-$NetBSD: patch-configure,v 1.1 2015/11/20 15:37:40 adam Exp $
+$NetBSD: patch-configure,v 1.2 2024/12/17 13:29:09 tnn Exp $
 
 External liblinear must be configured later.
 
---- configure.orig     2015-11-10 04:26:26.000000000 +0000
+--- configure.orig     2024-04-12 17:20:04.000000000 +0000
 +++ configure
-@@ -6192,6 +6192,7 @@ else
+@@ -7137,9 +7137,11 @@ else $as_nop
+ /* end confdefs.h.  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
  extern char pcap_version[];
  int main() {
    int major, minor1, minor2;
@@ -12,7 +16,7 @@ External liblinear must be configured la
    sscanf(pcap_version,"%d.%d.%d", &major, &minor1, &minor2);
    if (major > 0)
      return 0;
-@@ -6894,7 +6895,6 @@ if test "${with_liblinear+set}" = set; t
+@@ -8162,7 +8164,6 @@ then :
    *)
      CPPFLAGS="-I$with_liblinear/include $CPPFLAGS"
      LDFLAGS="-L$with_liblinear/lib $LDFLAGS"