pass-import is an extension for password-store aka pass(1) which allows importing from a variety of other password managers. I only wanted it for one of the csv formats but since I was there anyway I figured it would be useful to port pykeepass to allow that to work too, which in turn needs a specific version of py-construct.
The warning in py-construct's Makefile seems obsolete. plaso's Makefile
no longer references py-construct (it did previously), and it doesn't
show up in the code. It is a listed dep in some of plaso's dependencies
but again doesn't seem to actually show up in the code. So I don't
think udpating it is a problem (though pykeepass does want this
specific version at the moment).
py-construct diff inline, new ports attached. Any comments/OKs?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-construct/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 10 Oct 2020 18:45:00 -0000 1.8
+++ Makefile 1 Jul 2021 20:31:06 -0000
@@ -2,29 +2,28 @@
COMMENT = powerful declarative parser/builder for binary data
-# !!! do not update blindly: security/plaso needs a specific version
+# as of 2021/07/01, pykeepass needs this specific version
+MODPY_EGG_VERSION = 2.10.54
EPOCH = 0
-MODPY_EGG_VERSION = 2.5.3
+
DISTNAME = construct-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 2
CATEGORIES = devel
-HOMEPAGE = http://construct.readthedocs.io/
+HOMEPAGE = https://construct.readthedocs.io/
# MIT
PERMIT_PACKAGE = Yes
MODULES = lang/python
MODPY_SETUPTOOLS = Yes
-MODPY_PYTEST = Yes
-
MODPY_PI = Yes
FLAVORS = python3
FLAVOR = python3
-TEST_DEPENDS = math/py-numpy${MODPY_FLAVOR}
+# github version has tests, but they require arrow (not yet in ports)
+NO_TEST = Yes
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/py-construct/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 23 Feb 2017 13:11:20 -0000 1.2
+++ distinfo 1 Jul 2021 20:31:06 -0000
@@ -1,2 +1,2 @@
-SHA256 (construct-2.5.3.tar.gz) = siM7x8ak1zgD9YBrwxZ+STXao+qKXNBWy6u9ucPXmjY=
-SIZE (construct-2.5.3.tar.gz) = 688072
+SHA256 (construct-2.10.54.tar.gz) =
Te9rTuAm86Z6tTf+94PjLsYz11HeegADBgJfv9Mcf9g=
+SIZE (construct-2.10.54.tar.gz) = 1184400
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-construct/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 10 Oct 2020 18:45:00 -0000 1.3
+++ pkg/PLIST 1 Jul 2021 20:31:06 -0000
@@ -11,123 +11,25 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/construct/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/construct/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/construct/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/${MODPY_PYCACHE}adapters.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/construct/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/construct/${MODPY_PYCACHE}debug.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/${MODPY_PYCACHE}macros.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/construct/${MODPY_PYCACHE}expr.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/construct/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/adapters.py
lib/python${MODPY_VERSION}/site-packages/construct/core.py
lib/python${MODPY_VERSION}/site-packages/construct/debug.py
-lib/python${MODPY_VERSION}/site-packages/construct/formats/
-lib/python${MODPY_VERSION}/site-packages/construct/formats/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/construct/formats/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/construct/formats/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/formats/data/
-lib/python${MODPY_VERSION}/site-packages/construct/formats/data/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/construct/formats/data/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/construct/formats/data/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/formats/data/${MODPY_PYCACHE}cap.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/formats/data/${MODPY_PYCACHE}snoop.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/formats/data/cap.py
-lib/python${MODPY_VERSION}/site-packages/construct/formats/data/snoop.py
-lib/python${MODPY_VERSION}/site-packages/construct/formats/executable/
-lib/python${MODPY_VERSION}/site-packages/construct/formats/executable/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/construct/formats/executable/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/construct/formats/executable/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/formats/executable/${MODPY_PYCACHE}elf32.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/formats/executable/${MODPY_PYCACHE}pe32.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/formats/executable/elf32.py
-lib/python${MODPY_VERSION}/site-packages/construct/formats/executable/pe32.py
-lib/python${MODPY_VERSION}/site-packages/construct/formats/filesystem/
-lib/python${MODPY_VERSION}/site-packages/construct/formats/filesystem/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/construct/formats/filesystem/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/construct/formats/filesystem/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/formats/filesystem/${MODPY_PYCACHE}ext2.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/formats/filesystem/${MODPY_PYCACHE}fat16.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/formats/filesystem/${MODPY_PYCACHE}mbr.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/formats/filesystem/ext2.py
-lib/python${MODPY_VERSION}/site-packages/construct/formats/filesystem/fat16.py
-lib/python${MODPY_VERSION}/site-packages/construct/formats/filesystem/mbr.py
-lib/python${MODPY_VERSION}/site-packages/construct/formats/graphics/
-lib/python${MODPY_VERSION}/site-packages/construct/formats/graphics/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/construct/formats/graphics/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/construct/formats/graphics/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/formats/graphics/${MODPY_PYCACHE}bmp.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/formats/graphics/${MODPY_PYCACHE}emf.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/formats/graphics/${MODPY_PYCACHE}gif.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/formats/graphics/${MODPY_PYCACHE}png.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/formats/graphics/${MODPY_PYCACHE}wmf.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/formats/graphics/bmp.py
-lib/python${MODPY_VERSION}/site-packages/construct/formats/graphics/emf.py
-lib/python${MODPY_VERSION}/site-packages/construct/formats/graphics/gif.py
-lib/python${MODPY_VERSION}/site-packages/construct/formats/graphics/png.py
-lib/python${MODPY_VERSION}/site-packages/construct/formats/graphics/wmf.py
+lib/python${MODPY_VERSION}/site-packages/construct/expr.py
lib/python${MODPY_VERSION}/site-packages/construct/lib/
lib/python${MODPY_VERSION}/site-packages/construct/lib/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/construct/lib/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/construct/lib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/construct/lib/${MODPY_PYCACHE}binary.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/construct/lib/${MODPY_PYCACHE}bitstream.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/lib/${MODPY_PYCACHE}container.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/lib/${MODPY_PYCACHE}expr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/construct/lib/${MODPY_PYCACHE}containers.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/construct/lib/${MODPY_PYCACHE}hex.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/construct/lib/${MODPY_PYCACHE}py3compat.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/construct/lib/binary.py
lib/python${MODPY_VERSION}/site-packages/construct/lib/bitstream.py
-lib/python${MODPY_VERSION}/site-packages/construct/lib/container.py
-lib/python${MODPY_VERSION}/site-packages/construct/lib/expr.py
+lib/python${MODPY_VERSION}/site-packages/construct/lib/containers.py
lib/python${MODPY_VERSION}/site-packages/construct/lib/hex.py
lib/python${MODPY_VERSION}/site-packages/construct/lib/py3compat.py
-lib/python${MODPY_VERSION}/site-packages/construct/macros.py
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/construct/protocols/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/${MODPY_PYCACHE}ipstack.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/application/
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/application/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/construct/protocols/application/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/application/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/application/${MODPY_PYCACHE}dns.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/application/dns.py
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/ipstack.py
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer2/
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer2/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer2/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer2/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer2/${MODPY_PYCACHE}arp.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer2/${MODPY_PYCACHE}ethernet.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer2/${MODPY_PYCACHE}mtp2.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer2/arp.py
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer2/ethernet.py
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer2/mtp2.py
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer3/
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer3/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer3/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer3/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer3/${MODPY_PYCACHE}dhcpv4.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer3/${MODPY_PYCACHE}dhcpv6.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer3/${MODPY_PYCACHE}icmpv4.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer3/${MODPY_PYCACHE}igmpv2.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer3/${MODPY_PYCACHE}ipv4.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer3/${MODPY_PYCACHE}ipv6.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer3/${MODPY_PYCACHE}mtp3.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer3/dhcpv4.py
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer3/dhcpv6.py
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer3/icmpv4.py
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer3/igmpv2.py
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer3/ipv4.py
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer3/ipv6.py
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer3/mtp3.py
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer4/
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer4/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer4/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer4/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer4/${MODPY_PYCACHE}isup.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer4/${MODPY_PYCACHE}tcp.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer4/${MODPY_PYCACHE}udp.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer4/isup.py
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer4/tcp.py
-lib/python${MODPY_VERSION}/site-packages/construct/protocols/layer4/udp.py
lib/python${MODPY_VERSION}/site-packages/construct/version.py
pass-import.tgz
Description: application/tar-gz
