On Mon, Oct 09, 2017 at 02:17:26PM +0200, Benoit Lecocq wrote:
> Hi,
>
> The following diffs updates py-asn1 and py-asn1-modules to the latest
> releases.
>
> Comments ? OK ?
That reads fine.
If consumers are happy, ok aja
>
> Cheers,
> benoit
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/py-asn1/Makefile,v
> retrieving revision 1.27
> diff -u -p -u -r1.27 Makefile
> --- Makefile 3 Jan 2017 19:19:48 -0000 1.27
> +++ Makefile 9 Oct 2017 12:13:00 -0000
> @@ -2,37 +2,31 @@
>
> COMMENT = ASN.1 library for Python
>
> -MODPY_EGG_VERSION = 0.1.9
> +MODPY_EGG_VERSION = 0.3.7
> DISTNAME = pyasn1-${MODPY_EGG_VERSION}
> PKGNAME = ${DISTNAME:S/py/py-/}
> CATEGORIES = devel
> PKG_ARCH = *
> EPOCH = 0
> -REVISION = 1
>
> -HOMEPAGE = http://pyasn1.sourceforge.net/
> +HOMEPAGE = https://github.com/etingof/pyasn1
>
> MAINTAINER = Benoit Lecocq <[email protected]>
>
> # BSD 2-Clause
> PERMIT_PACKAGE_CDROM = Yes
>
> -MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=pyasn1/}
> +MODPY_PI = Yes
> +MODPY_SETUPTOOLS = Yes
>
> MODULES = lang/python
> FLAVORS = python3
> FLAVOR ?=
>
> -MODPY_SETUPTOOLS = Yes
> -
> -DOCSDIR = ${PREFIX}/share/doc/${MODPY_PY_PREFIX}asn1
> -
> -post-install:
> - ${INSTALL_DATA_DIR} ${DOCSDIR}
> - ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}
> +TEST_DEPENDS = devel/py-test${MODPY_FLAVOR}
>
> do-test: fake
> - @cd ${WRKSRC} && ${MAKE_ENV} \
> - PYTHONPATH=${WRKSRC} ${MODPY_BIN} ./test/suite.py
> + @cd ${WRKSRC} && env PYTHONPATH=${WRKINST}/${MODPY_SITEPKG} \
> + ${MODPY_BIN} -m pytest
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/py-asn1/distinfo,v
> retrieving revision 1.17
> diff -u -p -u -r1.17 distinfo
> --- distinfo 29 Sep 2015 06:17:03 -0000 1.17
> +++ distinfo 9 Oct 2017 12:13:00 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (pyasn1-0.1.9.tar.gz) = hTys2W0fcB3dZ6oD7MBfUYkBNbcmLpInEBEvEqLtKn8=
> -SIZE (pyasn1-0.1.9.tar.gz) = 75947
> +SHA256 (pyasn1-0.3.7.tar.gz) = GH8qZtYXaD+OgtXAADO3yKAofh2oip1XeuvsMhytSWU=
> +SIZE (pyasn1-0.3.7.tar.gz) = 115350
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/py-asn1/pkg/PLIST,v
> retrieving revision 1.9
> diff -u -p -u -r1.9 PLIST
> --- pkg/PLIST 29 Sep 2015 06:17:04 -0000 1.9
> +++ pkg/PLIST 9 Oct 2017 12:13:00 -0000
> @@ -41,14 +41,30 @@ lib/python${MODPY_VERSION}/site-packages
>
> lib/python${MODPY_VERSION}/site-packages/pyasn1/codec/der/${MODPY_PYCACHE}encoder.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/pyasn1/codec/der/decoder.py
> lib/python${MODPY_VERSION}/site-packages/pyasn1/codec/der/encoder.py
> +lib/python${MODPY_VERSION}/site-packages/pyasn1/codec/native/
> +lib/python${MODPY_VERSION}/site-packages/pyasn1/codec/native/__init__.py
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pyasn1/codec/native/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/pyasn1/codec/native/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/pyasn1/codec/native/${MODPY_PYCACHE}decoder.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/pyasn1/codec/native/${MODPY_PYCACHE}encoder.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/pyasn1/codec/native/decoder.py
> +lib/python${MODPY_VERSION}/site-packages/pyasn1/codec/native/encoder.py
> lib/python${MODPY_VERSION}/site-packages/pyasn1/compat/
> lib/python${MODPY_VERSION}/site-packages/pyasn1/compat/__init__.py
>
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pyasn1/compat/${MODPY_PYCACHE}/
>
> lib/python${MODPY_VERSION}/site-packages/pyasn1/compat/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/pyasn1/compat/${MODPY_PYCACHE}octets.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/pyasn1/compat/${MODPY_PYCACHE}binary.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/pyasn1/compat/${MODPY_PYCACHE}calling.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/pyasn1/compat/${MODPY_PYCACHE}dateandtime.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/pyasn1/compat/${MODPY_PYCACHE}integer.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/pyasn1/compat/${MODPY_PYCACHE}octets.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/pyasn1/compat/${MODPY_PYCACHE}string.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/pyasn1/compat/binary.py
> +lib/python${MODPY_VERSION}/site-packages/pyasn1/compat/calling.py
> +lib/python${MODPY_VERSION}/site-packages/pyasn1/compat/dateandtime.py
> +lib/python${MODPY_VERSION}/site-packages/pyasn1/compat/integer.py
> lib/python${MODPY_VERSION}/site-packages/pyasn1/compat/octets.py
> +lib/python${MODPY_VERSION}/site-packages/pyasn1/compat/string.py
> lib/python${MODPY_VERSION}/site-packages/pyasn1/debug.py
> lib/python${MODPY_VERSION}/site-packages/pyasn1/error.py
> lib/python${MODPY_VERSION}/site-packages/pyasn1/type/
> @@ -75,11 +91,3 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/pyasn1/type/tagmap.py
> lib/python${MODPY_VERSION}/site-packages/pyasn1/type/univ.py
> lib/python${MODPY_VERSION}/site-packages/pyasn1/type/useful.py
> -share/doc/${MODPY_PY_PREFIX}asn1/
> -share/doc/${MODPY_PY_PREFIX}asn1/codecs.html
> -share/doc/${MODPY_PY_PREFIX}asn1/constraints.html
> -share/doc/${MODPY_PY_PREFIX}asn1/constructed.html
> -share/doc/${MODPY_PY_PREFIX}asn1/intro.html
> -share/doc/${MODPY_PY_PREFIX}asn1/pyasn1-tutorial.html
> -share/doc/${MODPY_PY_PREFIX}asn1/scalar.html
> -share/doc/${MODPY_PY_PREFIX}asn1/tagging.html
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/py-asn1-modules/Makefile,v
> retrieving revision 1.6
> diff -u -p -u -r1.6 Makefile
> --- Makefile 3 Jan 2017 19:19:48 -0000 1.6
> +++ Makefile 9 Oct 2017 12:12:08 -0000
> @@ -2,19 +2,18 @@
>
> COMMENT = collection of ASN.1 data structures for py-asn1
>
> -MODPY_EGG_VERSION = 0.0.8
> -REVISION = 2
> +MODPY_EGG_VERSION = 0.1.4
> DISTNAME = pyasn1-modules-${MODPY_EGG_VERSION}
> PKGNAME = ${DISTNAME:S/py/py-/}
> CATEGORIES = devel
> PKG_ARCH = *
>
> -HOMEPAGE = http://pyasn1.sourceforge.net/
> +HOMEPAGE = https://github.com/etingof/pyasn1
>
> # BSD 2-Clause
> PERMIT_PACKAGE_CDROM = Yes
>
> -MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=pyasn1/}
> +MODPY_PI = Yes
>
> MODULES = lang/python
>
> @@ -24,7 +23,7 @@ FLAVOR?=
> MODPY_SETUPTOOLS = Yes
>
> RUN_DEPENDS = devel/py-asn1${MODPY_FLAVOR}
> -TEST_DEPENDS = ${BUILD_PKGPATH}
> +TEST_DEPENDS = devel/py-test${MODPY_FLAVOR}
>
> MODPY_ADJ_FILES = tools/*.py
>
> @@ -32,12 +31,8 @@ post-install:
> cd ${WRKSRC}/tools; for i in *; do \
> ${INSTALL_SCRIPT} $$i ${PREFIX}/bin/$$i${MODPY_BIN_SUFFIX}; done
>
> -do-test:
> - for f in ${WRKSRC}/test/*.sh; do \
> - sed -i "s,^python ,${MODPY_BIN} ,g" "$$f" && \
> - cd ${WRKSRC}/tools && \
> - ${SETENV} ${MAKE_ENV} \ PYTHONPATH=${WRKSRC} sh "$$f" || \
> - exit 1; \
> - done
> +do-test: fake
> + @cd ${WRKSRC} && env PYTHONPATH=${WRKINST}/${MODPY_SITEPKG} \
> + ${MODPY_BIN} -m pytest
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/py-asn1-modules/distinfo,v
> retrieving revision 1.2
> diff -u -p -u -r1.2 distinfo
> --- distinfo 20 Nov 2015 14:59:13 -0000 1.2
> +++ distinfo 9 Oct 2017 12:12:08 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (pyasn1-modules-0.0.8.tar.gz) =
> EFYZNPGCm8xFXH7NzazbS+X/02lvJvRo6260HhB/ODc=
> -SIZE (pyasn1-modules-0.0.8.tar.gz) = 38776
> +SHA256 (pyasn1-modules-0.1.4.tar.gz) =
> sHwXvbNNb2Sq/qYmny6PswaldHPw842abKOJ1qswrEo=
> +SIZE (pyasn1-modules-0.1.4.tar.gz) = 65552
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/py-asn1-modules/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -u -r1.3 PLIST
> --- pkg/PLIST 5 Jan 2016 10:17:06 -0000 1.3
> +++ pkg/PLIST 9 Oct 2017 12:12:08 -0000
> @@ -1,4 +1,5 @@
> @comment $OpenBSD: PLIST,v 1.3 2016/01/05 10:17:06 sthen Exp $
> +bin/cmcdump.py${MODPY_BIN_SUFFIX}
> bin/cmpdump.py${MODPY_BIN_SUFFIX}
> bin/crldump.py${MODPY_BIN_SUFFIX}
> bin/crmfdump.py${MODPY_BIN_SUFFIX}
> @@ -10,6 +11,7 @@ bin/pkcs1dump.py${MODPY_BIN_SUFFIX}
> bin/pkcs7dump.py${MODPY_BIN_SUFFIX}
> bin/pkcs8dump.py${MODPY_BIN_SUFFIX}
> bin/snmpget.py${MODPY_BIN_SUFFIX}
> +bin/x509dump-rfc5280.py${MODPY_BIN_SUFFIX}
> bin/x509dump.py${MODPY_BIN_SUFFIX}
> lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/
>
> lib/python${MODPY_VERSION}/site-packages/pyasn1_modules-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
> @@ -35,11 +37,19 @@ lib/python${MODPY_VERSION}/site-packages
>
> lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/${MODPY_PYCACHE}rfc2459.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/${MODPY_PYCACHE}rfc2511.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/${MODPY_PYCACHE}rfc2560.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/${MODPY_PYCACHE}rfc3279.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/${MODPY_PYCACHE}rfc3280.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/${MODPY_PYCACHE}rfc3281.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/${MODPY_PYCACHE}rfc3412.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/${MODPY_PYCACHE}rfc3414.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/${MODPY_PYCACHE}rfc3447.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/${MODPY_PYCACHE}rfc3852.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/${MODPY_PYCACHE}rfc4210.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/${MODPY_PYCACHE}rfc4211.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/${MODPY_PYCACHE}rfc5208.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/${MODPY_PYCACHE}rfc5280.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/${MODPY_PYCACHE}rfc5652.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/${MODPY_PYCACHE}rfc6402.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/pem.py
> lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/rfc1155.py
> lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/rfc1157.py
> @@ -53,8 +63,16 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/rfc2459.py
> lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/rfc2511.py
> lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/rfc2560.py
> +lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/rfc3279.py
> +lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/rfc3280.py
> +lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/rfc3281.py
> lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/rfc3412.py
> lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/rfc3414.py
> lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/rfc3447.py
> +lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/rfc3852.py
> lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/rfc4210.py
> +lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/rfc4211.py
> lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/rfc5208.py
> +lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/rfc5280.py
> +lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/rfc5652.py
> +lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/rfc6402.py
--
Antoine
