CVS commit: pkgsrc/textproc/py-xml2rfc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/textproc/py-xml2rfc
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Sun, 24 Apr 2022 17:23:08 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Apr 24 17:23:08 UTC 2022

Modified Files:
        pkgsrc/textproc/py-xml2rfc: Makefile PLIST distinfo
        pkgsrc/textproc/py-xml2rfc/patches: patch-requirements.txt

Log Message:
py-xml2rfc: updated to 3.12.4

v3.12.3

Bug Fixes
- make xml2rfc/run.py executable
- sourcecode element definition copy-paste error

Chores
- add vscode dev container config
- Revert Jinja2 3.* update

v3.12.2

Bug Fixes
- Remove the blank line from the contact information in text output

Chores
- move /cli to root
- remove gui and package folders
- Docker build script updates
- Add executable permission to fix.pl
- remove font-install binary from repo

3.12.1

- Improve local file lookup: Add source directory to the allowed list, Disallow any files that are on child directories of the source directory, Add a warning when including `.ent` files.
- Update bibxml subdirectories list.
- Fixes manpage generation issue.

3.12.0

- Security release - disallow includes from local filesystem by default. Adds a `--allow-local-file-access` flag (and associated library configuration option) to allow it.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/textproc/py-xml2rfc/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/py-xml2rfc/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/py-xml2rfc/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/textproc/py-xml2rfc/patches/patch-requirements.txt

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

Modified files:

Index: pkgsrc/textproc/py-xml2rfc/Makefile
diff -u pkgsrc/textproc/py-xml2rfc/Makefile:1.7 pkgsrc/textproc/py-xml2rfc/Makefile:1.8
--- pkgsrc/textproc/py-xml2rfc/Makefile:1.7     Tue Apr 19 11:27:13 2022
+++ pkgsrc/textproc/py-xml2rfc/Makefile Sun Apr 24 17:23:07 2022
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2022/04/19 11:27:13 js Exp $
+# $NetBSD: Makefile,v 1.8 2022/04/24 17:23:07 adam Exp $
 
-DISTNAME=      xml2rfc-3.5.0
+DISTNAME=      xml2rfc-3.12.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   3
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=x/xml2rfc/}
 
@@ -11,23 +10,20 @@ HOMEPAGE=   https://github.com/ietf-tools/
 COMMENT=       IETF RFC 7749 XML-to-RFC conversion tool
 LICENSE=       modified-bsd
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-fonttools via py-weasyprint
-
 DEPENDS+=      ${PYPKGPREFIX}-appdirs>=1.4.4:../../devel/py-appdirs
 DEPENDS+=      ${PYPKGPREFIX}-configargparse>=1.2.3:../../devel/py-configargparse
-DEPENDS+=      ${PYPKGPREFIX}-country>=1.8,!=19.7.15:../../geography/py-country
+DEPENDS+=      ${PYPKGPREFIX}-country>=1.8:../../geography/py-country
 DEPENDS+=      ${PYPKGPREFIX}-flakes>=0.8.1:../../devel/py-flakes
 DEPENDS+=      ${PYPKGPREFIX}-google-i18n-address>=2.3.2:../../devel/py-google-i18n-address
 DEPENDS+=      ${PYPKGPREFIX}-html5lib>=1.0.1:../../textproc/py-html5lib
-DEPENDS+=      ${PYPKGPREFIX}-intervaltree>=2.1.0,!=3.0.0:../../devel/py-intervaltree
+DEPENDS+=      ${PYPKGPREFIX}-intervaltree>=2.1.0:../../devel/py-intervaltree
 DEPENDS+=      ${PYPKGPREFIX}-jinja2>=2.11:../../textproc/py-jinja2
 DEPENDS+=      ${PYPKGPREFIX}-kitchen>=1.2.6:../../devel/py-kitchen
-DEPENDS+=      ${PYPKGPREFIX}-lxml>=2.2.8,!=4.3.1:../../textproc/py-lxml
+DEPENDS+=      ${PYPKGPREFIX}-lxml>=4.3.2:../../textproc/py-lxml
 DEPENDS+=      ${PYPKGPREFIX}-requests>=2.5.0:../../devel/py-requests
 DEPENDS+=      ${PYPKGPREFIX}-setuptools>=24.2.0:../../devel/py-setuptools
 DEPENDS+=      ${PYPKGPREFIX}-six>=1.4.1:../../lang/py-six
 DEPENDS+=      ${PYPKGPREFIX}-yaml>=5.3.1:../../textproc/py-yaml
-
 TEST_DEPENDS+= ${PYPKGPREFIX}-PDF2>=0:../../print/py-PDF2
 TEST_DEPENDS+= ${PYPKGPREFIX}-cairo>=0:../../graphics/py-cairo
 TEST_DEPENDS+= ${PYPKGPREFIX}-decorator>=0:../../devel/py-decorator
@@ -39,9 +35,14 @@ USE_LANGUAGES=       # none
 
 USE_PKG_RESOURCES=     yes
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-fonttools via py-weasyprint
+
 do-test:
-       ${RUN} cd ${WRKSRC} && \
-       ${PYTHONBIN} -m unittest
+       ${RUN} cd ${WRKSRC} && ${PYTHONBIN} -m unittest
+
+post-install:
+       cd ${DESTDIR}${PREFIX}/bin && \
+       ${MV} xml2rfc xml2rfc-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/py-xml2rfc/PLIST
diff -u pkgsrc/textproc/py-xml2rfc/PLIST:1.1 pkgsrc/textproc/py-xml2rfc/PLIST:1.2
--- pkgsrc/textproc/py-xml2rfc/PLIST:1.1        Sat Jan 16 19:11:45 2021
+++ pkgsrc/textproc/py-xml2rfc/PLIST    Sun Apr 24 17:23:07 2022
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2021/01/16 19:11:45 riastradh Exp $
-bin/xml2rfc
+@comment $NetBSD: PLIST,v 1.2 2022/04/24 17:23:07 adam Exp $
+bin/xml2rfc-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -28,6 +28,8 @@ ${PYSITELIB}/xml2rfc/data/mt.css
 ${PYSITELIB}/xml2rfc/data/mt.js
 ${PYSITELIB}/xml2rfc/data/reference.rnc
 ${PYSITELIB}/xml2rfc/data/reference.rng
+${PYSITELIB}/xml2rfc/data/referencegroup.rnc
+${PYSITELIB}/xml2rfc/data/referencegroup.rng
 ${PYSITELIB}/xml2rfc/data/rfc7991.rnc
 ${PYSITELIB}/xml2rfc/data/rfc7991.rng
 ${PYSITELIB}/xml2rfc/data/v2.rnc
@@ -103,9 +105,6 @@ ${PYSITELIB}/xml2rfc/writers/__init__.py
 ${PYSITELIB}/xml2rfc/writers/base.py
 ${PYSITELIB}/xml2rfc/writers/base.pyc
 ${PYSITELIB}/xml2rfc/writers/base.pyo
-${PYSITELIB}/xml2rfc/writers/debug.py
-${PYSITELIB}/xml2rfc/writers/debug.pyc
-${PYSITELIB}/xml2rfc/writers/debug.pyo
 ${PYSITELIB}/xml2rfc/writers/doc.py
 ${PYSITELIB}/xml2rfc/writers/doc.pyc
 ${PYSITELIB}/xml2rfc/writers/doc.pyo

Index: pkgsrc/textproc/py-xml2rfc/distinfo
diff -u pkgsrc/textproc/py-xml2rfc/distinfo:1.4 pkgsrc/textproc/py-xml2rfc/distinfo:1.5
--- pkgsrc/textproc/py-xml2rfc/distinfo:1.4     Tue Apr 19 11:27:13 2022
+++ pkgsrc/textproc/py-xml2rfc/distinfo Sun Apr 24 17:23:07 2022
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2022/04/19 11:27:13 js Exp $
+$NetBSD: distinfo,v 1.5 2022/04/24 17:23:07 adam Exp $
 
-BLAKE2s (xml2rfc-3.5.0.tar.gz) = 29c4935a21de3f483276842782ca15aa7b62ae11c0f4c61553291899f8eca154
-SHA512 (xml2rfc-3.5.0.tar.gz) = eb6810e8e6eafa5b11dbb41c2b616e41cd746741bd0604eac56972d77ea4987d67b28ad0e41f19834d8e098805e483cb3a7ce0d0a3f1fcbc8a5cc412ee378d33
-Size (xml2rfc-3.5.0.tar.gz) = 4450772 bytes
-SHA1 (patch-requirements.txt) = 60035ebae7a74c1ff9be2ccd13705495c54fdc48
+BLAKE2s (xml2rfc-3.12.4.tar.gz) = 587e992657ec372d5e690bf52151ce811ca76ac55cb3134c766cc9638a2c0791
+SHA512 (xml2rfc-3.12.4.tar.gz) = 62bf49f0e0a5fe2b3ad8d781e8876344c1d565b4de74a794056ddecadeaae9d592fd0e9274bffc7ef025b9237a3b1c5c5d8b89c418f4551d403425a911710a83
+Size (xml2rfc-3.12.4.tar.gz) = 3043538 bytes
+SHA1 (patch-requirements.txt) = 922829fe7d1e1f2b417d4ac6fc60d6afa78fb1f3

Index: pkgsrc/textproc/py-xml2rfc/patches/patch-requirements.txt
diff -u pkgsrc/textproc/py-xml2rfc/patches/patch-requirements.txt:1.1 pkgsrc/textproc/py-xml2rfc/patches/patch-requirements.txt:1.2
--- pkgsrc/textproc/py-xml2rfc/patches/patch-requirements.txt:1.1       Tue Apr 19 11:27:13 2022
+++ pkgsrc/textproc/py-xml2rfc/patches/patch-requirements.txt   Sun Apr 24 17:23:08 2022
@@ -1,8 +1,8 @@
-$NetBSD: patch-requirements.txt,v 1.1 2022/04/19 11:27:13 js Exp $
+$NetBSD: patch-requirements.txt,v 1.2 2022/04/24 17:23:08 adam Exp $
 
 Relax jinja2 version requirements.
 
---- requirements.txt.orig      2020-09-29 11:31:03.000000000 +0000
+--- requirements.txt.orig      2022-04-12 19:25:32.000000000 +0000
 +++ requirements.txt
 @@ -3,7 +3,7 @@ configargparse>=1.2.3
  google-i18n-address>=2.3.2
@@ -10,6 +10,6 @@ Relax jinja2 version requirements.
  intervaltree>=2.1.0,!=3.0.0
 -jinja2>=2.11,<3.0
 +jinja2>=2.11
+ markupsafe==2.0.1
  kitchen>=1.2.6
  lxml>=2.2.8,!=4.3.1
- pycountry>=1.8,!=19.7.15

Prev by Date: CVS commit: pkgsrc/devel/tcllib
Next by Date: CVS commit: pkgsrc/fonts
Previous by Thread: CVS commit: pkgsrc/devel/tcllib
Next by Thread: CVS commit: pkgsrc/fonts
Indexes:

Home | Main Index | Thread Index | Old Index