CVS commit: pkgsrc/net/sdig

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Mar 21 09:42:00 UTC 2026

Modified Files:
        pkgsrc/net/sdig: distinfo
        pkgsrc/net/sdig/patches: patch-ab
Added Files:
        pkgsrc/net/sdig/patches: patch-nbname.c

Log Message:
sdig: Fix build with recent GCC

- Wrong number of arguments to function. This is problematic on all
  systems with GCC 14 or newer.
- Incorrect header for bzero. This is problematic on non-BSD systems.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/sdig/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/sdig/patches/patch-ab
cvs rdiff -u -r0 -r1.1 pkgsrc/net/sdig/patches/patch-nbname.c

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

Modified files:

Index: pkgsrc/net/sdig/distinfo
diff -u pkgsrc/net/sdig/distinfo:1.7 pkgsrc/net/sdig/distinfo:1.8
--- pkgsrc/net/sdig/distinfo:1.7        Tue Oct 26 11:06:55 2021
+++ pkgsrc/net/sdig/distinfo    Sat Mar 21 09:42:00 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 11:06:55 nia Exp $
+$NetBSD: distinfo,v 1.8 2026/03/21 09:42:00 nia Exp $
 
 BLAKE2s (sdig-0.30.tar.gz) = 4713daec95fb7f4090f4e4f512cbcd7afa9874588333e3c4481e112caa2a7558
 SHA512 (sdig-0.30.tar.gz) = 953ee1ab325db0808bc800bb3355d04e75b003f3c110e769d5ebf4ec49af726e928065360fff2bf541c70be70200aa767da8cfcd63f8c813b481db68822306cd
@@ -7,5 +7,6 @@ BLAKE2s (mactable.gz) = ef08dadc517d3a5d
 SHA512 (mactable.gz) = ac7d4b7ab6cb5a1d8dd9c765913e316c916b576d8602418dfa0b925e972546c1fd099a316721cf2a031044b512fa9acff3413dd511420bc3d52ca02b13217eb1
 Size (mactable.gz) = 36490 bytes
 SHA1 (patch-aa) = f70967610ce3aadc5e67d82cbf8d0d5325cf9c8c
-SHA1 (patch-ab) = 3b2d671d7d0ca66f8afe5c55bf075c6b62a9c95a
+SHA1 (patch-ab) = a1b87a4edd8eb02dbdd0cb0ae12882157c58f604
 SHA1 (patch-ac) = 0e5304f2d774ae8932ba5694b511410d52314f85
+SHA1 (patch-nbname.c) = cd5016adf4255ec3f807850776bcf63066a68d34

Index: pkgsrc/net/sdig/patches/patch-ab
diff -u pkgsrc/net/sdig/patches/patch-ab:1.2 pkgsrc/net/sdig/patches/patch-ab:1.3
--- pkgsrc/net/sdig/patches/patch-ab:1.2        Mon Apr  7 15:01:22 2003
+++ pkgsrc/net/sdig/patches/patch-ab    Sat Mar 21 09:42:00 2026
@@ -1,10 +1,12 @@
-$NetBSD: patch-ab,v 1.2 2003/04/07 15:01:22 bouyer Exp $
+$NetBSD: patch-ab,v 1.3 2026/03/21 09:42:00 nia Exp $
 
---- sdig.c.orig        Tue Jul 23 05:03:20 2002
-+++ sdig.c     Thu Apr  3 12:22:07 2003
-@@ -25,16 +25,21 @@
+--- sdig.c.orig        2002-07-23 03:03:20.000000000 +0000
++++ sdig.c
+@@ -24,17 +24,23 @@
+ #include <stdarg.h>
  #include <stdlib.h> 
  #include <string.h> 
++#include <strings.h>
  #include <unistd.h> 
 -#include <arpa/inet.h> 
 -#include <netinet/in.h> 
@@ -27,7 +29,7 @@ $NetBSD: patch-ab,v 1.2 2003/04/07 15:01
  
        stype   *firstsw = NULL;
        rtype   *firstrt = NULL;
-@@ -114,7 +119,7 @@
+@@ -114,7 +120,7 @@ static int findport(unsigned char *mac, 
  
        /* build the OID for the mapping of MAC addresses to port numbers */
  
@@ -36,15 +38,15 @@ $NetBSD: patch-ab,v 1.2 2003/04/07 15:01
                mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
  
        debug(5, "findport: query is [%s]\n", query);
-@@ -355,6 +360,7 @@
+@@ -355,6 +361,7 @@ static char *macmfr(unsigned char *inmac
        snprintf(macfind, sizeof(macfind), "%02x %02x %02x", 
                inmac[0], inmac[1], inmac[2]);
  
-+      debug("looking for MAC prefix [%s] in %s\n", macfind, mactable);
++      debug(1, "looking for MAC prefix [%s] in %s\n", macfind, mactable);
        while (fgets(buf, sizeof(buf), macdb)) {
                buf[strlen(buf) - 1] = '\0';
  
-@@ -494,14 +500,13 @@
+@@ -494,14 +501,13 @@ static void do_ifdescr(stype *sw, long p
  
        /* first get the switch's ifnum for the port */
        
@@ -61,7 +63,7 @@ $NetBSD: patch-ab,v 1.2 2003/04/07 15:01
  
        ifdescr = snmpget_str(sw->ip, sw->pw, query);
  
-@@ -728,6 +733,7 @@
+@@ -728,6 +734,7 @@ int main(int argc, char **argv)
  {
        char    *prog, *query, *conf = NULL, *mac = NULL;
        int     i;
@@ -69,7 +71,7 @@ $NetBSD: patch-ab,v 1.2 2003/04/07 15:01
  
        printf("Switch Digger %s - http://www.exploits.org/sdig/\n\n";,
                VERSION);
-@@ -791,7 +797,10 @@
+@@ -791,7 +798,10 @@ int main(int argc, char **argv)
                        mac, query);
  
                checkmac(mac);

Added files:

Index: pkgsrc/net/sdig/patches/patch-nbname.c
diff -u /dev/null pkgsrc/net/sdig/patches/patch-nbname.c:1.1
--- /dev/null   Sat Mar 21 09:42:00 2026
+++ pkgsrc/net/sdig/patches/patch-nbname.c      Sat Mar 21 09:42:00 2026
@@ -0,0 +1,14 @@
+$NetBSD: patch-nbname.c,v 1.1 2026/03/21 09:42:00 nia Exp $
+
+Need <strings.h> for bzero(3).
+
+--- nbname.c.orig      2026-03-21 09:16:34.404281065 +0000
++++ nbname.c
+@@ -23,6 +23,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <strings.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
+ #include <sys/time.h>