Re: UPDATE: net/scapy

? scapy-2.4.5_4.diff
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/scapy/Makefile,v
retrieving revision 1.43
diff -u -p -u -p -r1.43 Makefile
--- Makefile 2 Nov 2021 00:01:52 -0000 1.43
+++ Makefile 25 Feb 2022 12:05:03 -0000
@@ -2,8 +2,7 @@

COMMENT = powerful interactive packet manipulation in python

-MODPY_EGG_VERSION = 2.4.4
-REVISION = 2
+MODPY_EGG_VERSION = 2.4.5

DISTNAME = scapy-${MODPY_EGG_VERSION}

@@ -23,10 +22,11 @@ EXTRACT_ONLY = ${DISTNAME}${EXTRACT_SUF
MODULES = lang/python
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
+
UPDATE_PLIST_ARGS = -i MODPY_PY_PREFIX

.include <bsd.port.arch.mk>
-.if ${PROPERTIES:Mcxx11}
+.if ${PROPERTIES:Mrust}
# py-cryptography is only for architectures with newer compilers.
# it is not needed for all features; include the dependency
# where available but skip it on base-gcc architectures.
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/scapy/distinfo,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 distinfo
--- distinfo 5 Nov 2020 14:49:02 -0000 1.12
+++ distinfo 25 Feb 2022 12:05:03 -0000
@@ -1,4 +1,4 @@
SHA256 (ethertypes-20120703) = 7Tj51kS+/IfrQahknDEAcyQNmozXWy+cEVtdnX5dAzw=
-SHA256 (scapy-2.4.4.tar.gz) = 7P16FM2cPvDrCNKNW7cdlyGe3/FFTMvf8in2drJ5AO4=
+SHA256 (scapy-2.4.5.tar.gz) = vHB+NgR4RJa2ZlqeWyppw2zJ+wMq9IZLKQUVMbJMhZM=
SIZE (ethertypes-20120703) = 1362
-SIZE (scapy-2.4.4.tar.gz) = 1039342
+SIZE (scapy-2.4.5.tar.gz) = 1111959
Index: patches/patch-setup_cfg
===================================================================
RCS file: patches/patch-setup_cfg
diff -N patches/patch-setup_cfg
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-setup_cfg 25 Feb 2022 12:05:03 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: setup.cfg
+--- setup.cfg.orig
++++ setup.cfg
+@@ -2,7 +2,7 @@
+ universal = 1
+
+ [metadata]
+-description-file = README.md
++description_file = README.md
+ license_file = LICENSE
+
+ [sdist]
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/scapy/pkg/PLIST,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 PLIST
--- pkg/PLIST 30 Dec 2020 21:38:58 -0000 1.13
+++ pkg/PLIST 25 Feb 2022 12:05:03 -0000
@@ -36,6 +36,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}extlib.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}fields.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}interfaces.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}packet.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}pipetool.${MODPY_PYC_MAGIC_TAG}pyc
@@ -58,8 +59,8 @@ lib/python${MODPY_VERSION}/site-packages
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scapy/arch/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/scapy/arch/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scapy/arch/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/arch/${MODPY_PYCACHE}libpcap.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scapy/arch/${MODPY_PYCACHE}linux.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/scapy/arch/${MODPY_PYCACHE}pcapdnet.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scapy/arch/${MODPY_PYCACHE}solaris.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scapy/arch/${MODPY_PYCACHE}unix.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scapy/arch/bpf/
@@ -73,8 +74,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/scapy/arch/bpf/core.py
lib/python${MODPY_VERSION}/site-packages/scapy/arch/bpf/supersocket.py
lib/python${MODPY_VERSION}/site-packages/scapy/arch/common.py
+lib/python${MODPY_VERSION}/site-packages/scapy/arch/libpcap.py
lib/python${MODPY_VERSION}/site-packages/scapy/arch/linux.py
-lib/python${MODPY_VERSION}/site-packages/scapy/arch/pcapdnet.py
lib/python${MODPY_VERSION}/site-packages/scapy/arch/solaris.py
lib/python${MODPY_VERSION}/site-packages/scapy/arch/unix.py
lib/python${MODPY_VERSION}/site-packages/scapy/arch/windows/
@@ -169,6 +170,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}openflow3.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}ospf.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}pfcp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}pim.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}pnio.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}pnio_dcp.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}pnio_rpc.${MODPY_PYC_MAGIC_TAG}pyc
@@ -201,19 +203,24 @@ lib/python${MODPY_VERSION}/site-packages
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/${MODPY_PYCACHE}ccp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/${MODPY_PYCACHE}doip.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/${MODPY_PYCACHE}ecu.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/${MODPY_PYCACHE}enumerator.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/${MODPY_PYCACHE}graph.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/${MODPY_PYCACHE}someip.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/${MODPY_PYCACHE}uds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/${MODPY_PYCACHE}uds_ecu_states.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/${MODPY_PYCACHE}uds_logging.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/bmw/
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/bmw/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/bmw/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/bmw/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/bmw/${MODPY_PYCACHE}definitions.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/bmw/${MODPY_PYCACHE}enet.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/bmw/${MODPY_PYCACHE}hsfz.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/bmw/definitions.py
-lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/bmw/enet.py
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/bmw/hsfz.py
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/ccp.py
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/doip.py
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/ecu.py
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/enumerator.py
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/gm/
@@ -221,9 +228,14 @@ lib/python${MODPY_VERSION}/site-packages
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/gm/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/gm/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/gm/${MODPY_PYCACHE}gmlan.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/gm/${MODPY_PYCACHE}gmlan_ecu_states.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/gm/${MODPY_PYCACHE}gmlan_logging.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/gm/${MODPY_PYCACHE}gmlanutils.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/gm/gmlan.py
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/gm/gmlan_ecu_states.py
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/gm/gmlan_logging.py
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/gm/gmlanutils.py
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/graph.py
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/${MODPY_PYCACHE}/
@@ -274,12 +286,28 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/tid/tids.py
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/someip.py
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/uds.py
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/uds_ecu_states.py
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/uds_logging.py
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/volkswagen/
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/volkswagen/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/volkswagen/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/volkswagen/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/volkswagen/${MODPY_PYCACHE}definitions.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/volkswagen/definitions.py
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/xcp/
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/xcp/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/xcp/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/xcp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/xcp/${MODPY_PYCACHE}cto_commands_master.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/xcp/${MODPY_PYCACHE}cto_commands_slave.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/xcp/${MODPY_PYCACHE}scanner.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/xcp/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/xcp/${MODPY_PYCACHE}xcp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/xcp/cto_commands_master.py
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/xcp/cto_commands_slave.py
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/xcp/scanner.py
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/xcp/utils.py
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/xcp/xcp.py
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/avs.py
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/bfd.py
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/bgp.py
@@ -339,6 +367,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/openflow3.py
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/ospf.py
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/pfcp.py
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/pim.py
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/pnio.py
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/pnio_dcp.py
lib/python${MODPY_VERSION}/site-packages/scapy/contrib/pnio_rpc.py
@@ -385,6 +414,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/scapy/error.py
lib/python${MODPY_VERSION}/site-packages/scapy/extlib.py
lib/python${MODPY_VERSION}/site-packages/scapy/fields.py
+lib/python${MODPY_VERSION}/site-packages/scapy/interfaces.py
lib/python${MODPY_VERSION}/site-packages/scapy/layers/
lib/python${MODPY_VERSION}/site-packages/scapy/layers/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}/
@@ -431,6 +461,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}smb2.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}snmp.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}tftp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}tuntap.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}usb.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}vrrp.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}vxlan.${MODPY_PYC_MAGIC_TAG}pyc
@@ -548,6 +579,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/record_tls13.py
lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/session.py
lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/tools.py
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/tuntap.py
lib/python${MODPY_VERSION}/site-packages/scapy/layers/usb.py
lib/python${MODPY_VERSION}/site-packages/scapy/layers/vrrp.py
lib/python${MODPY_VERSION}/site-packages/scapy/layers/vxlan.py
@@ -610,8 +642,10 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSIO
lib/python${MODPY_VERSION}/site-packages/scapy/tools/automotive/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scapy/tools/automotive/${MODPY_PYCACHE}isotpscanner.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scapy/tools/automotive/${MODPY_PYCACHE}obdscanner.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/tools/automotive/${MODPY_PYCACHE}xcpscanner.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scapy/tools/automotive/isotpscanner.py
lib/python${MODPY_VERSION}/site-packages/scapy/tools/automotive/obdscanner.py
+lib/python${MODPY_VERSION}/site-packages/scapy/tools/automotive/xcpscanner.py
lib/python${MODPY_VERSION}/site-packages/scapy/tools/check_asdis.py
lib/python${MODPY_VERSION}/site-packages/scapy/tools/generate_ethertypes.py
lib/python${MODPY_VERSION}/site-packages/scapy/tools/scapy_pyannotate.py
> Oh, the ".if ${PROPERTIES:Mcxx11}" should change to ".if ${PROPERTIES:Mrust}"

Updated. Thanks.

> btw you can use "cvs add" and "cvs rm" to add/remove files even against
>
> anoncvs, then a diff with "cvs diff -uNp" will include those changes.

Oh, that makes it easier. Mercy :)

>however it is not usually helpful to
>
> fiddle with whitespace in a simple update to a port.

Do you mean indentation? I like to keep everything aligned. It's also easier to read. I use tabs though.

Nevertheless, I reverted to the previous format.

Have a nice day.
~Ricardo

------- Original Message -------

On Friday, February 25th, 2022 at 11:21 AM, Stuart Henderson <stu@spacehopper.org> wrote:

> On 2022/02/25 09:41, Ricardo wrote:
>
> > Hey ports@,
> >
> > Attached is an update to net/scapy (changes: https://github.com/secdev/scapy/releases/tag/v2.4.5).
> >
> > Tested on amd64.
> >
> > Obrigado.
> >
> > ~Ricardo
>
> Oh, the ".if ${PROPERTIES:Mcxx11}" should change to ".if ${PROPERTIES:Mrust}"
>
> btw you can use "cvs add" and "cvs rm" to add/remove files even against
>
> anoncvs, then a diff with "cvs diff -uNp" will include those changes.
>
> Otherwise I will leave this to bluhm@, however it is not usually helpful to
>
> fiddle with whitespace in a simple update to a port.