CVS commit: pkgsrc/security/dsniff

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jan  4 13:35:48 UTC 2026

Modified Files:
        pkgsrc/security/dsniff: distinfo
        pkgsrc/security/dsniff/patches: patch-aa patch-ad patch-ae
Added Files:
        pkgsrc/security/dsniff/patches: patch-dnsspoof.c patch-pcaputil.h
            patch-tcpkill.c patch-tcpnice.c

Log Message:
dsniff*: fix build with latest pcap


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/security/dsniff/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/dsniff/patches/patch-aa
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/dsniff/patches/patch-ad \
    pkgsrc/security/dsniff/patches/patch-ae
cvs rdiff -u -r0 -r1.1 pkgsrc/security/dsniff/patches/patch-dnsspoof.c \
    pkgsrc/security/dsniff/patches/patch-pcaputil.h \
    pkgsrc/security/dsniff/patches/patch-tcpkill.c \
    pkgsrc/security/dsniff/patches/patch-tcpnice.c

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

Modified files:

Index: pkgsrc/security/dsniff/distinfo
diff -u pkgsrc/security/dsniff/distinfo:1.15 pkgsrc/security/dsniff/distinfo:1.16
--- pkgsrc/security/dsniff/distinfo:1.15        Tue Oct 26 11:17:03 2021
+++ pkgsrc/security/dsniff/distinfo     Sun Jan  4 13:35:48 2026
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.15 2021/10/26 11:17:03 nia Exp $
+$NetBSD: distinfo,v 1.16 2026/01/04 13:35:48 wiz Exp $
 
 BLAKE2s (dsniff-2.3.tar.gz) = d19b54709be67ac0deff61bb5988ab2ade42f7e7a7f63bad04ead0a9ab71d421
 SHA512 (dsniff-2.3.tar.gz) = d27b2bf901cd7e2dcef0d6170318d131ba57d4881c0b85f24ee3de9581c41841eab4363cc8ea0dd6d7dcd1c27dcb61d054dfca964b5674301d8c7a173a9f113d
 Size (dsniff-2.3.tar.gz) = 126797 bytes
 SHA1 (patch-Makefile.in) = 90954f3959d2f55f5c50f1753210cee9fdc0a872
-SHA1 (patch-aa) = b3798143fa0a662870c3144f136773d575c54364
+SHA1 (patch-aa) = d5f59901b18789355ebb4c9878ed2458084adb34
 SHA1 (patch-ab) = 6385da7139dcb11ea29ffba468e7fac260b61b44
 SHA1 (patch-ac) = 1730b92ecd421e396781e2e4ba9b7a7d9b90d992
-SHA1 (patch-ad) = cab09e1b1a61fd6a3fa96c24fff3cd1519146a3e
-SHA1 (patch-ae) = e54a7be65c2e1d236b2427d216e1184ff6046a0b
+SHA1 (patch-ad) = c024e6e3b699df368542fe6a501efffa56cdd1e1
+SHA1 (patch-ae) = d79aa50233237a80b3c60bcb0b63dd4f15e0d1e7
 SHA1 (patch-ba) = 5f774dcb904681f123fa9cae25ea4d88afee6bb6
 SHA1 (patch-bb) = 58026805c5a8f91f7fa80a94ddbea0b8fadfadd5
 SHA1 (patch-bc) = 6d27957bd1d10b66428dbea214b0463fa8321bef
@@ -21,5 +21,9 @@ SHA1 (patch-bi) = 47c6b0e3682af9ee3b212b
 SHA1 (patch-bj) = b6d45af26058a221cb68d72c45e7358c1ef894c0
 SHA1 (patch-bk) = 3a36f7a11a5590daea9b1cf7c8d7772a88ff2a18
 SHA1 (patch-bl) = add5db6023f9e76e269e953eb95ff5b808f650ab
+SHA1 (patch-dnsspoof.c) = 9056b376d60739cc2aa333a009963612f50deadd
+SHA1 (patch-pcaputil.h) = 3d30e64e85d6dc60080a5fb1c16fc43a2ff16c9b
 SHA1 (patch-sshmitm.c) = b1b219739c05290eb2635ae17175966eb2150b68
+SHA1 (patch-tcpkill.c) = 175691ad54c5d65280371ea9b430a8eca8cfa124
+SHA1 (patch-tcpnice.c) = aa543822babbeaa926a4a548edf079a3a764ab23
 SHA1 (patch-webmitm.c) = 426f4eb0e6b704b487e032f3a772766a0f1de061

Index: pkgsrc/security/dsniff/patches/patch-aa
diff -u pkgsrc/security/dsniff/patches/patch-aa:1.2 pkgsrc/security/dsniff/patches/patch-aa:1.3
--- pkgsrc/security/dsniff/patches/patch-aa:1.2 Mon Apr 18 08:34:35 2016
+++ pkgsrc/security/dsniff/patches/patch-aa     Sun Jan  4 13:35:48 2026
@@ -1,4 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2016/04/18 08:34:35 leot Exp $
+$NetBSD: patch-aa,v 1.3 2026/01/04 13:35:48 wiz Exp $
+
+pcap-int.h does not exist any longer.
+Avoid conflict with libpcap.
 
 --- pcaputil.c.orig    2000-11-14 15:51:08.000000000 +0000
 +++ pcaputil.c
@@ -10,3 +13,12 @@ $NetBSD: patch-aa,v 1.2 2016/04/18 08:34
  #ifdef BSD
  #include <pcap-int.h>
  #endif
+@@ -56,7 +57,7 @@ pcap_dloff(pcap_t *pd)
+ }
+ 
+ pcap_t *
+-pcap_init(char *intf, char *filter, int snaplen)
++mypcap_init(char *intf, char *filter, int snaplen)
+ {
+       pcap_t *pd;
+       u_int net, mask;

Index: pkgsrc/security/dsniff/patches/patch-ad
diff -u pkgsrc/security/dsniff/patches/patch-ad:1.1 pkgsrc/security/dsniff/patches/patch-ad:1.2
--- pkgsrc/security/dsniff/patches/patch-ad:1.1 Sun Feb 18 18:56:13 2007
+++ pkgsrc/security/dsniff/patches/patch-ad     Sun Jan  4 13:35:48 2026
@@ -1,7 +1,28 @@
-$NetBSD: patch-ad,v 1.1 2007/02/18 18:56:13 adrianp Exp $
+$NetBSD: patch-ad,v 1.2 2026/01/04 13:35:48 wiz Exp $
+
+Add missing return values.
+Prepare for SUBST* in Makefile.
 
 --- configure.orig     2000-12-03 04:35:46.000000000 +0000
 +++ configure
+@@ -670,7 +670,7 @@ cat > conftest.$ac_ext << EOF
+ #line 671 "configure"
+ #include "confdefs.h"
+ 
+-main(){return(0);}
++int main(){return(0);}
+ EOF
+ if { (eval echo configure:676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cc_works=yes
+@@ -2263,7 +2263,7 @@ else
+ #line 2264 "configure"
+ #include "confdefs.h"
+ 
+-main()
++int main()
+ {
+   char c0 = 0x40, c1 = 0x80, c2 = 0x81;
+   exit(memcmp(&c0, &c2, 1) < 0 && memcmp(&c1, &c2, 1) < 0 ? 0 : 1);
 @@ -3083,10 +3083,10 @@ if test "${with_libnet+set}" = set; then
       ;;
    esac 
Index: pkgsrc/security/dsniff/patches/patch-ae
diff -u pkgsrc/security/dsniff/patches/patch-ae:1.1 pkgsrc/security/dsniff/patches/patch-ae:1.2
--- pkgsrc/security/dsniff/patches/patch-ae:1.1 Wed Oct  1 08:43:09 2008
+++ pkgsrc/security/dsniff/patches/patch-ae     Sun Jan  4 13:35:48 2026
@@ -1,4 +1,6 @@
-$NetBSD: patch-ae,v 1.1 2008/10/01 08:43:09 apb Exp $
+$NetBSD: patch-ae,v 1.2 2026/01/04 13:35:48 wiz Exp $
+
+Add missing header.
 
 --- buf.c.orig 2000-11-28 09:45:07.000000000 +0200
 +++ buf.c

Added files:

Index: pkgsrc/security/dsniff/patches/patch-dnsspoof.c
diff -u /dev/null pkgsrc/security/dsniff/patches/patch-dnsspoof.c:1.1
--- /dev/null   Sun Jan  4 13:35:49 2026
+++ pkgsrc/security/dsniff/patches/patch-dnsspoof.c     Sun Jan  4 13:35:48 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-dnsspoof.c,v 1.1 2026/01/04 13:35:48 wiz Exp $
+
+Avoid conflict with libpcap.
+
+--- dnsspoof.c.orig    2026-01-04 13:09:00.453429317 +0000
++++ dnsspoof.c
+@@ -304,7 +304,7 @@ main(int argc, char *argv[])
+       else snprintf(buf, sizeof(buf), "udp dst port 53 and not src %s",
+                     libnet_host_lookup(lnet_ip, 0));
+       
+-      if ((pcap_pd = pcap_init(dev, buf, 128)) == NULL)
++      if ((pcap_pd = mypcap_init(dev, buf, 128)) == NULL)
+               errx(1, "couldn't initialize sniffing");
+ 
+       if ((pcap_off = pcap_dloff(pcap_pd)) < 0)
Index: pkgsrc/security/dsniff/patches/patch-pcaputil.h
diff -u /dev/null pkgsrc/security/dsniff/patches/patch-pcaputil.h:1.1
--- /dev/null   Sun Jan  4 13:35:49 2026
+++ pkgsrc/security/dsniff/patches/patch-pcaputil.h     Sun Jan  4 13:35:48 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-pcaputil.h,v 1.1 2026/01/04 13:35:48 wiz Exp $
+
+Avoid conflict with libpcap.
+
+--- pcaputil.h.orig    2026-01-04 13:08:21.258572195 +0000
++++ pcaputil.h
+@@ -11,7 +11,7 @@
+ #ifndef PCAPUTIL_H
+ #define PCAPUTIL_H
+ 
+-pcap_t *pcap_init(char *intf, char *filter, int snaplen);
++pcap_t *mypcap_init(char *intf, char *filter, int snaplen);
+ 
+ int   pcap_dloff(pcap_t *pd);
+ 
Index: pkgsrc/security/dsniff/patches/patch-tcpkill.c
diff -u /dev/null pkgsrc/security/dsniff/patches/patch-tcpkill.c:1.1
--- /dev/null   Sun Jan  4 13:35:49 2026
+++ pkgsrc/security/dsniff/patches/patch-tcpkill.c      Sun Jan  4 13:35:48 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-tcpkill.c,v 1.1 2026/01/04 13:35:48 wiz Exp $
+
+Avoid conflict with libpcap.
+
+--- tcpkill.c.orig     2026-01-04 13:09:30.753713754 +0000
++++ tcpkill.c
+@@ -133,7 +133,7 @@ main(int argc, char *argv[])
+       
+       filter = copy_argv(argv);
+       
+-      if ((pd = pcap_init(intf, filter, 128)) == NULL)
++      if ((pd = mypcap_init(intf, filter, 128)) == NULL)
+               errx(1, "couldn't initialize sniffing");
+ 
+       if ((pcap_off = pcap_dloff(pd)) < 0)
Index: pkgsrc/security/dsniff/patches/patch-tcpnice.c
diff -u /dev/null pkgsrc/security/dsniff/patches/patch-tcpnice.c:1.1
--- /dev/null   Sun Jan  4 13:35:49 2026
+++ pkgsrc/security/dsniff/patches/patch-tcpnice.c      Sun Jan  4 13:35:48 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-tcpnice.c,v 1.1 2026/01/04 13:35:48 wiz Exp $
+
+Avoid conflict with libpcap.
+
+--- tcpnice.c.orig     2026-01-04 13:09:45.045453250 +0000
++++ tcpnice.c
+@@ -159,7 +159,7 @@ main(int argc, char *argv[])
+ 
+       filter = copy_argv(argv);
+       
+-      if ((pd = pcap_init(intf, filter, 128)) == NULL)
++      if ((pd = mypcap_init(intf, filter, 128)) == NULL)
+               errx(1, "couldn't initialize sniffing");
+ 
+       if ((pcap_off = pcap_dloff(pd)) < 0)