CVS commit: pkgsrc/net/scapy

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Tue Mar 23 02:03:11 UTC 2021

Modified Files:
        pkgsrc/net/scapy: Makefile distinfo
        pkgsrc/net/scapy/patches: patch-scapy_arch_bpf_supersocket.py

Log Message:
scapy: amend a patch and add a test dependency

Fix another spot that would be an issue with 32-bit environments. While
here, tcpreplay is a test dependency.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/net/scapy/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/scapy/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/net/scapy/patches/patch-scapy_arch_bpf_supersocket.py

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

Modified files:

Index: pkgsrc/net/scapy/Makefile
diff -u pkgsrc/net/scapy/Makefile:1.33 pkgsrc/net/scapy/Makefile:1.34
--- pkgsrc/net/scapy/Makefile:1.33      Sun Mar 21 19:50:54 2021
+++ pkgsrc/net/scapy/Makefile   Tue Mar 23 02:03:11 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2021/03/21 19:50:54 gutteridge Exp $
+# $NetBSD: Makefile,v 1.34 2021/03/23 02:03:11 gutteridge Exp $
 
 DISTNAME=      scapy-2.4.4
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=secdev/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -28,6 +29,8 @@ SUBST_VARS.config=    PKG_SYSCONFDIR
 SUBST_SED.config+=     -e "s|share/man|${PKGMANDIR}|g"
 SUBST_MESSAGE.config=  Fixing paths.
 
+TEST_DEPENDS+= tcpreplay-[0-9]*:../../net/tcpreplay
+
 post-extract:
        ${CP} ${FILESDIR}/ethertypes ${WRKSRC}
 

Index: pkgsrc/net/scapy/distinfo
diff -u pkgsrc/net/scapy/distinfo:1.12 pkgsrc/net/scapy/distinfo:1.13
--- pkgsrc/net/scapy/distinfo:1.12      Sun Mar 21 19:50:54 2021
+++ pkgsrc/net/scapy/distinfo   Tue Mar 23 02:03:11 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2021/03/21 19:50:54 gutteridge Exp $
+$NetBSD: distinfo,v 1.13 2021/03/23 02:03:11 gutteridge Exp $
 
 SHA1 (scapy-2.4.4.tar.gz) = 9bd34442e7feca4f37e928c7723d6180694f3bc8
 RMD160 (scapy-2.4.4.tar.gz) = 4269d7bde1d5e24f6ada49aa1fb467dee9c44495
@@ -6,5 +6,5 @@ SHA512 (scapy-2.4.4.tar.gz) = d607890183
 Size (scapy-2.4.4.tar.gz) = 3240879 bytes
 SHA1 (patch-ab) = 08f606f7ab380a3a4d3d2bc7a2fbddfc6720b4f3
 SHA1 (patch-ad) = bac7c72eff08608d4d73911a94bfc3125b8b53b6
-SHA1 (patch-scapy_arch_bpf_supersocket.py) = b2b119986b714ef478c2f8583358b8f1455135e4
+SHA1 (patch-scapy_arch_bpf_supersocket.py) = ad08376931780306a3b2a24747c344bd0086976b
 SHA1 (patch-scapy_consts.py) = 46da1b276299e1d98600ea477da8d19c1a78f3ef

Index: pkgsrc/net/scapy/patches/patch-scapy_arch_bpf_supersocket.py
diff -u pkgsrc/net/scapy/patches/patch-scapy_arch_bpf_supersocket.py:1.2 pkgsrc/net/scapy/patches/patch-scapy_arch_bpf_supersocket.py:1.3
--- pkgsrc/net/scapy/patches/patch-scapy_arch_bpf_supersocket.py:1.2    Sun Mar 21 19:50:54 2021
+++ pkgsrc/net/scapy/patches/patch-scapy_arch_bpf_supersocket.py        Tue Mar 23 02:03:11 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-scapy_arch_bpf_supersocket.py,v 1.2 2021/03/21 19:50:54 gutteridge Exp $
+$NetBSD: patch-scapy_arch_bpf_supersocket.py,v 1.3 2021/03/23 02:03:11 gutteridge Exp $
 
 Add DragonFly support.
 Fix NetBSD 32-bit architecture alignment.
@@ -26,12 +26,13 @@ Fix NetBSD 32-bit architecture alignment
  else:
      BPF_ALIGNMENT = 4  # sizeof(int32_t)
  
-@@ -281,7 +279,7 @@ class L2bpfListenSocket(_L2bpfSocket):
-             else:
-                 # struct bpf_hdr (64bit time_t) or struct bpf_xhdr
+@@ -283,6 +281,9 @@ class L2bpfListenSocket(_L2bpfSocket):
                  bh_tstamp_offset = 16
--        elif NETBSD:
-+        elif NETBSD or DRAGONFLY:
+         elif NETBSD:
              # struct bpf_hdr or struct bpf_hdr32
++            bh_tstamp_offset = sizeof(c_long) * 2
++        elif DRAGONFLY:
++            # struct bpf_hdr
              bh_tstamp_offset = 16
          else:
+             # struct bpf_hdr