CVS commit: pkgsrc/net/scapy

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

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Thu Jan 19 00:35:26 UTC 2023

Modified Files:
        pkgsrc/net/scapy: Makefile PLIST distinfo options.mk
Removed Files:
        pkgsrc/net/scapy/files: ethertypes
        pkgsrc/net/scapy/patches: patch-ad

Log Message:
scapy: switch to use the project's own ethertypes definitions

There's no point shipping our own version of an ethertypes file which
is pretty incomplete compared to what scapy itself provides as its
internal definition should it not find one in the environment.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/net/scapy/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/scapy/PLIST
cvs rdiff -u -r1.19 -r1.20 pkgsrc/net/scapy/distinfo
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/scapy/options.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/net/scapy/files/ethertypes
cvs rdiff -u -r1.5 -r0 pkgsrc/net/scapy/patches/patch-ad

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.41 pkgsrc/net/scapy/Makefile:1.42
--- pkgsrc/net/scapy/Makefile:1.41      Tue Jan 17 01:33:17 2023
+++ pkgsrc/net/scapy/Makefile   Thu Jan 19 00:35:26 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2023/01/17 01:33:17 gutteridge Exp $
+# $NetBSD: Makefile,v 1.42 2023/01/19 00:35:26 gutteridge Exp $
 
 DISTNAME=      scapy-2.5.0
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=secdev/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -12,30 +13,18 @@ LICENSE=    gnu-gpl-v2
 
 NO_BUILD=      yes
 
-INSTALLATION_DIRS+=    share/examples/scapy
-
 USE_PKG_RESOURCES=     yes
 
 .include "options.mk"
 
-CONF_FILES=    ${PREFIX}/share/examples/scapy/ethertypes \
-               ${PKG_SYSCONFDIR}/ethertypes
-
 SUBST_CLASSES+=                config
 SUBST_STAGE.config=    pre-configure
-SUBST_FILES.config=    scapy/data.py setup.py
-SUBST_VARS.config=     PKG_SYSCONFDIR
+SUBST_FILES.config=    setup.py
 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}
-
-post-install:
-       ${INSTALL_DATA} ${WRKSRC}/ethertypes ${DESTDIR}${PREFIX}/share/examples/scapy/
-
 DATE_VAL=      ${DATE} "+%Y%m%d-%H%M%S"
 
 # XXX this needs to be reworked to use scapy's run_tests with py-tox, which is

Index: pkgsrc/net/scapy/PLIST
diff -u pkgsrc/net/scapy/PLIST:1.12 pkgsrc/net/scapy/PLIST:1.13
--- pkgsrc/net/scapy/PLIST:1.12 Tue Jan 17 01:33:17 2023
+++ pkgsrc/net/scapy/PLIST      Thu Jan 19 00:35:26 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2023/01/17 01:33:17 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.13 2023/01/19 00:35:26 gutteridge Exp $
 bin/scapy
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -1019,4 +1019,3 @@ ${PYSITELIB}/test/tls/example_server.py
 ${PYSITELIB}/test/tls/example_server.pyc
 ${PYSITELIB}/test/tls/example_server.pyo
 man/man1/scapy.1
-share/examples/scapy/ethertypes

Index: pkgsrc/net/scapy/distinfo
diff -u pkgsrc/net/scapy/distinfo:1.19 pkgsrc/net/scapy/distinfo:1.20
--- pkgsrc/net/scapy/distinfo:1.19      Tue Jan 17 01:33:17 2023
+++ pkgsrc/net/scapy/distinfo   Thu Jan 19 00:35:26 2023
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.19 2023/01/17 01:33:17 gutteridge Exp $
+$NetBSD: distinfo,v 1.20 2023/01/19 00:35:26 gutteridge Exp $
 
 BLAKE2s (scapy-2.5.0.tar.gz) = 048ee1b0af5fa86ac9e4bf29b0150f2c1f37694605932b237b8768ac299e039c
 SHA512 (scapy-2.5.0.tar.gz) = 4e5cacff0bbf6fd991ea24f4680049d042082fae4b349c8082078e6f01b38c09bb5c8276bfba15d4a88a1eb5af92c505848ec98556b10eecbd803f134a5b244a
 Size (scapy-2.5.0.tar.gz) = 6082895 bytes
 SHA1 (patch-ab) = 0f9761c3eac568543eaa951523bcb730198832d9
-SHA1 (patch-ad) = 874ee58db9203b8eac3b99336834b3764ffcb10d
 SHA1 (patch-scapy_arch_bpf_supersocket.py) = 0bbf632684e945f63e43075766574031620161d0
 SHA1 (patch-scapy_consts.py) = c897229e444d363e2aeea12cdd7264d3d275f4ab

Index: pkgsrc/net/scapy/options.mk
diff -u pkgsrc/net/scapy/options.mk:1.14 pkgsrc/net/scapy/options.mk:1.15
--- pkgsrc/net/scapy/options.mk:1.14    Thu Apr 21 11:00:00 2022
+++ pkgsrc/net/scapy/options.mk Thu Jan 19 00:35:26 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.14 2022/04/21 11:00:00 wiz Exp $
+# $NetBSD: options.mk,v 1.15 2023/01/19 00:35:26 gutteridge Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.scapy
 
@@ -28,6 +28,6 @@ PYTHON_VERSIONED_DEPENDENCIES+=       cryptogr
 ### Add in TeX support for psdump() and/or pdfdump()
 ###
 .if !empty(PKG_OPTIONS:Mscapy-pyx)
-PYTHON_VERSIONED_DEPENDENCIES= X
+PYTHON_VERSIONED_DEPENDENCIES+=        X
 .include "../../lang/python/versioned_dependencies.mk"
 .endif