CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2021/09/17 15:42:06 Modified files: net/curl : Tag: OPENBSD_6_9 Makefile distinfo Removed files: net/curl/patches: Tag: OPENBSD_6_9 patch-configure_ac Log message: net/curl: security update to 7.79.0 Includes fixes for CVE-2021-22945: UAF and double-free in MQTT sending CVE-2021-22946: Protocol downgrade required TLS bypassed CVE-2021-22947: STARTTLS protocol injection via MITM
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2021/09/17 15:13:23 Modified files: net/curl : Makefile distinfo Removed files: net/curl/patches: patch-configure_ac Log message: net/curl: security update to 7.79.0 Includes fixes for CVE-2021-22945: UAF and double-free in MQTT sending CVE-2021-22946: Protocol downgrade required TLS bypassed CVE-2021-22947: STARTTLS protocol injection via MITM
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ki...@cvs.openbsd.org 2021/09/17 15:04:11 Added files: games/openxcom/patches: patch-src_Engine_Language_cpp patch-src_Engine_OptionInfo_cpp patch-src_Menu_ListGamesState_cpp patch-src_Menu_ListLoadState_cpp patch-src_Savegame_Craft_cpp Log message: Unbreak build on sparc64. OK kmos@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/09/17 13:53:27 Modified files: multimedia/mkvtoolnix: Makefile multimedia/mkvtoolnix/pkg: PLIST Removed files: multimedia/mkvtoolnix/pkg: PFRAG.no-no_x11 Log message: Remove mkvtoolnix no-gui flavour, it requires Qt5 anyway so there isn't a huge point in it. Also it is broken. OK rsadowski
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/09/17 13:52:26 Modified files: mail/dovecot-pigeonhole: Tag: OPENBSD_6_9 Makefile distinfo mail/dovecot-pigeonhole/patches: Tag: OPENBSD_6_9 patch-src_lib-sieve_sieve-common_h patch-src_managesieve-login_Makefile_in Log message: MFC dovecot-pigeonhole backports, suggested by Brad
UPDATE: security/oletools switch to python3 and new dependency
Hi,
this updates oletools to 0.60, and while there, switches to python3, also some
cleanup
to the RUN_DEPS there.
However, it needs a new dependency, I put it under x11, might also go under
devel.
With that dependency, I've one odd problem,
When I change the
FLAVOR ?= python3
to
FLAVOR ?=
then building the port I always get python2 for some reason I don't understand.
I must do something stupidly wrong, cluebat welcome ;)
oletools patch below, easygui attached.
cheers,
Sebastian
Index: Makefile
===
RCS file: /cvs/ports/security/oletools/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- Makefile21 May 2021 19:50:34 - 1.13
+++ Makefile17 Sep 2021 19:34:45 -
@@ -2,9 +2,8 @@
COMMENT = python tools to analyze OLE files
-MODPY_EGG_VERSION = 0.53.1
+MODPY_EGG_VERSION = 0.60
DISTNAME = oletools-${MODPY_EGG_VERSION}
-REVISION = 0
CATEGORIES = security
@@ -16,14 +15,14 @@
PERMIT_PACKAGE = Yes
MODULES = lang/python
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_2}
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
EXTRACT_SUFX = .zip
RUN_DEPENDS += ${MODPY_TKINTER_DEPENDS} \
- devel/py-parsing
+ devel/py-parsing${MODPY_FLAVOR} \
+ x11/py-easygui${MODPY_FLAVOR}
MODPY_ADJ_FILES = oletools/*.py
Index: distinfo
===
RCS file: /cvs/ports/security/oletools/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo16 Nov 2018 08:02:25 - 1.9
+++ distinfo17 Sep 2021 19:34:45 -
@@ -1,2 +1,2 @@
-SHA256 (oletools-0.53.1.zip) = EOTv0NEgJClj4A7NLD2kmrX9eF6VDNwGurMiJBpiQSs=
-SIZE (oletools-0.53.1.zip) = 1643887
+SHA256 (oletools-0.60.zip) = 360DKKyDtPjbn0fnBsvWTbc5rk6/nZiy3MRlcoo19KY=
+SIZE (oletools-0.60.zip) = 3120953
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/oletools/pkg/PLIST,v
retrieving revision 1.8
diff -u -r1.8 PLIST
--- pkg/PLIST 16 Nov 2018 08:02:25 - 1.8
+++ pkg/PLIST 17 Sep 2021 19:34:45 -
@@ -1,17 +1,17 @@
-@comment $OpenBSD: PLIST,v 1.8 2018/11/16 08:02:25 rpointel Exp $
+@comment $OpenBSD: PLIST,v$
bin/ezhexviewer
+bin/ftguess
bin/mraptor
-@comment bin/mraptor3
bin/msodde
bin/olebrowse
bin/oledir
+bin/olefile
bin/oleid
bin/olemap
bin/olemeta
bin/oleobj
bin/oletimes
bin/olevba
-@comment bin/olevba3
bin/pyxswf
bin/rtfobj
lib/python${MODPY_VERSION}/site-packages/oletools/
@@ -26,12 +26,57 @@
lib/python${MODPY_VERSION}/site-packages/oletools/README.html
lib/python${MODPY_VERSION}/site-packages/oletools/README.rst
lib/python${MODPY_VERSION}/site-packages/oletools/__init__.py
-lib/python${MODPY_VERSION}/site-packages/oletools/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oletools/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/oletools/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oletools/${MODPY_PYCACHE}crypto.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oletools/${MODPY_PYCACHE}ezhexviewer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oletools/${MODPY_PYCACHE}ftguess.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oletools/${MODPY_PYCACHE}mraptor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oletools/${MODPY_PYCACHE}mraptor3.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oletools/${MODPY_PYCACHE}mraptor_milter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oletools/${MODPY_PYCACHE}msodde.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oletools/${MODPY_PYCACHE}olebrowse.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oletools/${MODPY_PYCACHE}oledir.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oletools/${MODPY_PYCACHE}oleform.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oletools/${MODPY_PYCACHE}oleid.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oletools/${MODPY_PYCACHE}olemap.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oletools/${MODPY_PYCACHE}olemeta.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oletools/${MODPY_PYCACHE}oleobj.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oletools/${MODPY_PYCACHE}oletimes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oletools/${MODPY_PYCACHE}olevba.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oletools/${MODPY_PYCACHE}olevba3.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oletools/${MODPY_PYCACHE}ooxml.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oletools/${MODPY_PYCACHE}ppt_parser.${MODPY_PYC_MAGIC_TAG}pyc
Re: [update] net/synapse-1.42.0 devel/py-jsonschema-3.2.0
On 9/17/21 4:16 PM, Aaron Bieber wrote: Stuart Henderson writes: On 2021/09/17 07:51, Aaron Bieber wrote: Stuart Henderson writes: Have you tested the jsonschema update with the other 2 ports that use it (anki, py-nbformat)? synapse doesn't seem to want to package and I am not sure why: ===> Building package for synapse-1.42.0 Create /usr/ports/packages/amd64/all/synapse-1.42.0.tgz Creating package synapse-1.42.0 checking dependencies|devel/py-jsonschema,python3 Error: Dependency py3-jsonschema->=3.0.0 doesn't match FULLPKGNAME: py3-jsonschema-2.6.0p3 checksumming... Error: @depend devel/py-jsonschema,python3:py3-jsonschema->=3.0.0:py3-jsonschema-2.6.0p3 pattern py3-jsonschema->=3.0.0 doesn't match default py3-jsonschema-2.6.0p3 At a guess, you probably have something in another directory in PORTSDIR_PATH that is confusing things. Ty! After retesting.. anki errors with: Error during startup: Traceback (most recent call last): File "/usr/local/lib/python3.8/site-packages/aqt/main.py", line 46, in __init__ self.setupAddons() File "/usr/local/lib/python3.8/site-packages/aqt/main.py", line 657, in setupAddons import aqt.addons File "/usr/local/lib/python3.8/site-packages/aqt/addons.py", line 11, in import jsonschema File "/usr/local/lib/python3.8/site-packages/jsonschema/__init__.py", line 21, in from jsonschema._types import TypeChecker File "/usr/local/lib/python3.8/site-packages/jsonschema/_types.py", line 3, in from pyrsistent import pmap ModuleNotFoundError: No module named 'pyrsistent' py-pyrsistent is also a new dependency for the new version of synapse. But it's not in the RUN_DEPENDS of anki, that's probably an issue in anki port that needs to be solved too. and nbformat dies with a bunch of errors: !!! Interrupted: 19 errors during collection !!! === 19 error in 1.02 seconds === :( smime.p7s Description: S/MIME Cryptographic Signature
Re: [update] net/synapse-1.42.0 devel/py-jsonschema-3.2.0
On 9/17/21 3:51 PM, Aaron Bieber wrote:
Stuart Henderson writes:
Have you tested the jsonschema update with the other 2 ports that use it
(anki, py-nbformat)?
synapse doesn't seem to want to package and I am not sure why:
===> Building package for synapse-1.42.0
Create /usr/ports/packages/amd64/all/synapse-1.42.0.tgz
Creating package synapse-1.42.0
checking dependencies|devel/py-jsonschema,python3
Error: Dependency py3-jsonschema->=3.0.0 doesn't match FULLPKGNAME:
py3-jsonschema-2.6.0p3
checksumming...
Error: @depend
devel/py-jsonschema,python3:py3-jsonschema->=3.0.0:py3-jsonschema-2.6.0p3
pattern py3-jsonschema->=3.0.0 doesn't match default py3-jsonschema-2.6.0p3
pkg_create: can't continue
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2142
'/usr/ports/packages/amd64/all/synapse-1.42.0.tgz': @trap "cd /usr/ports/pac...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2623
'_internal-package': @case X${_DEPENDS_CACHE} in X) _DEPENDS_CACHE=$(sudo -...)
*** Error 2 in /usr/ports/net/synapse (/usr/ports/infrastructure/mk/bsd.port.mk:2602
'package': @lock=synapse-1.42.0; export _LOCKS_HELD=" ...)
You seem to still have py3-jsonformat 2.6 instead of 3.2, did you patch
that port before building synapse? I did not run into that issue.
anki starts up fine, I clicked around in the UI and it seems to be
working as expected.
Great, I was still compiling it to verify, but there is no need anymore
as it seems :)
nbformat passes all its tests:
qbit@tal[0]:/usr/ports/devel/py-nbformat got:(master)$ make test
===> Regression tests for py3-nbformat-5.0.7
= test session starts ==
platform openbsd7 -- Python 3.8.12, pytest-4.4.0, py-1.8.0, pluggy-0.11.0
rootdir: /build/pobj/py-nbformat-5.0.7-python3/nbformat-5.0.7
collected 146 items
nbformat/tests/test_api.py [ 2%]
nbformat/tests/test_convert.py [ 5%]
nbformat/tests/test_nbformat.py .[ 8%]
nbformat/tests/test_reader.py . [ 9%]
nbformat/tests/test_sign.py ... [ 22%]
nbformat/tests/test_validator.py .. [ 32%]
nbformat/v1/tests/test_json.py . [ 32%]
nbformat/v1/tests/test_nbbase.py .. [ 36%]
nbformat/v2/tests/test_json.py ... [ 39%]
nbformat/v2/tests/test_nbbase.py . [ 47%]
nbformat/v2/tests/test_nbpy.py . [ 48%]
nbformat/v3/tests/test_json.py ... [ 56%]
nbformat/v3/tests/test_misc.py . [ 56%]
nbformat/v3/tests/test_nbbase.py .. [ 71%]
nbformat/v3/tests/test_nbpy.py . [ 75%]
nbformat/v4/tests/test_convert.py [ 78%]
nbformat/v4/tests/test_json.py . [ 86%]
nbformat/v4/tests/test_nbbase.py .. [ 96%]
nbformat/v4/tests/test_validate.py . [100%]
=== warnings summary ===
/usr/local/lib/python3.8/site-packages/jsonschema/compat.py:6
/usr/local/lib/python3.8/site-packages/jsonschema/compat.py:6:
DeprecationWarning: Using or importing the ABCs from 'collections' instead of
from 'collections.abc' is deprecated since Python 3.3, and in 3.10 it will stop
working
from collections import MutableMapping, Sequence # noqa
-- Docs: https://docs.pytest.org/en/latest/warnings.html
146 passed, 1 warnings in 2.26 seconds
jsonschema can move to py3-only.
On 2021/09/17 11:39, Renaud Allard wrote:
Hello,
Here is an update for net/synapse to 1.42.0. Unfortunately, it is also
dependent on devel/py-jsonschema >= 3.0.0. So here is the patch for that one
too.
Best Regards
Index: Makefile
===
RCS file: /cvs/ports/devel/py-jsonschema/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile21 May 2021 19:50:26 - 1.14
+++ Makefile17 Sep 2021 09:29:35 -
@@ -2,10 +2,9 @@
COMMENT = implementation of JSON Schema validation for Python
-MODPY_EGG_VERSION = 2.6.0
+MODPY_EGG_VERSION =3.2.0
DISTNAME =jsonschema-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 3
CATEGORIES = devel
Index: distinfo
===
RCS file: /cvs/ports/devel/py-jsonschema/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
---
Re: sparc64 bulk build report
On Fri, Sep 17, 2021 at 08:20:53AM +0300, Kirill Bychkov wrote: > > > > Built using OpenBSD 7.0-beta (GENERIC.MP) #970: Sat Sep 11 23:30:13 MDT 2021 > [...] > > http://build-failures.rhaalovely.net/sparc64/2021-09-12/games/openxcom.log > Hi, > The patch attached fixes build on ma Netra T1. Can't test runtime. > Still works on amd64. OK? > [...] ok kmos --Kurt
Re: [NEW] www/unit
On Thu, Sep 16, 2021 at 11:13:40PM +, Sergey A. Osokin wrote:
> On Thu, Sep 16, 2021 at 05:02:15PM +, Sergey A. Osokin wrote:
> > On Thu, Sep 16, 2021 at 05:47:19PM +0100, Stuart Henderson wrote:
> > > On 2021/09/16 16:05, Sergey A. Osokin wrote:
> > > > On Thu, Sep 16, 2021 at 04:00:08PM +0100, Stuart Henderson wrote:
> > > > > On 2021/09/16 14:46, Sergey A. Osokin wrote:
> > > > > > On Tue, Sep 07, 2021 at 12:56:03PM +, Sergey A. Osokin wrote:
> >
> > [...]
> >
> > > > NGINX Unit doesn't utilize perl-/python-/ruby-specific infrastructure,
> > > > it just install its own module for specific languages and their
> > > > versions.
> > >
> > > they are installed in a directory outside of /usr/local (the normal
> > > PREFIX for
> > > ports/packages).
>
> [...]
>
> > And here's the example: on both FreeBSD and NetBSD it's
> > ${PREFIX}/libexec/unit/modules directory.
>
> Updated the port followed by suggestions, could please take a look.
And one more.
--
Sergey Osokin
unit.tgz
Description: application/gtar-compressed
signature.asc
Description: PGP signature
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/09/17 08:51:00 Modified files: www/webkitgtk4 : Makefile distinfo www/webkitgtk4/patches: patch-Source_JavaScriptCore_assembler_ARM64Assembler_h Log message: Update to webkitgtk4-2.32.4.
Re: [update] net/synapse-1.42.0 devel/py-jsonschema-3.2.0
On 2021/09/17 15:28, Stuart Henderson wrote: > On 2021/09/17 16:21, Renaud Allard wrote: > > py-pyrsistent is also a new dependency for the new version of synapse. But > > pyrsistent is a dependency of the new version of jsonschema. > ...I see nothing using vcversioner any more. $ cat jsonschema.egg-info/requires.txt attrs>=17.4.0 pyrsistent>=0.14.0 setuptools six>=1.11.0 [:python_version < "3"] functools32 [:python_version < "3.8"] importlib_metadata [format] idna jsonpointer>1.13 rfc3987 strict-rfc3339 webcolors [format_nongpl] idna jsonpointer>1.13 webcolors rfc3986-validator>0.1.0 rfc3339-validator so RDEP on attrs, pyrsistent, six ?
Re: [update] net/synapse-1.42.0 devel/py-jsonschema-3.2.0
On 2021/09/17 16:21, Renaud Allard wrote: > py-pyrsistent is also a new dependency for the new version of synapse. But pyrsistent is a dependency of the new version of jsonschema.
Re: [update] net/synapse-1.42.0 devel/py-jsonschema-3.2.0
Stuart Henderson writes: > On 2021/09/17 07:51, Aaron Bieber wrote: >> >> Stuart Henderson writes: >> >> > Have you tested the jsonschema update with the other 2 ports that use it >> > (anki, py-nbformat)? >> >> synapse doesn't seem to want to package and I am not sure why: >> >> ===> Building package for synapse-1.42.0 >> Create /usr/ports/packages/amd64/all/synapse-1.42.0.tgz >> Creating package synapse-1.42.0 >> checking dependencies|devel/py-jsonschema,python3 >> Error: Dependency py3-jsonschema->=3.0.0 doesn't match FULLPKGNAME: >> py3-jsonschema-2.6.0p3 >> checksumming... >> Error: @depend >> devel/py-jsonschema,python3:py3-jsonschema->=3.0.0:py3-jsonschema-2.6.0p3 >> pattern py3-jsonschema->=3.0.0 doesn't match default py3-jsonschema-2.6.0p3 > > At a guess, you probably have something in another directory in > PORTSDIR_PATH that is confusing things. Ty! After retesting.. anki errors with: Error during startup: Traceback (most recent call last): File "/usr/local/lib/python3.8/site-packages/aqt/main.py", line 46, in __init__ self.setupAddons() File "/usr/local/lib/python3.8/site-packages/aqt/main.py", line 657, in setupAddons import aqt.addons File "/usr/local/lib/python3.8/site-packages/aqt/addons.py", line 11, in import jsonschema File "/usr/local/lib/python3.8/site-packages/jsonschema/__init__.py", line 21, in from jsonschema._types import TypeChecker File "/usr/local/lib/python3.8/site-packages/jsonschema/_types.py", line 3, in from pyrsistent import pmap ModuleNotFoundError: No module named 'pyrsistent' and nbformat dies with a bunch of errors: !!! Interrupted: 19 errors during collection !!! === 19 error in 1.02 seconds === :(
Re: [update] net/synapse-1.42.0 devel/py-jsonschema-3.2.0
On 2021/09/17 07:51, Aaron Bieber wrote: > > Stuart Henderson writes: > > > Have you tested the jsonschema update with the other 2 ports that use it > > (anki, py-nbformat)? > > synapse doesn't seem to want to package and I am not sure why: > > ===> Building package for synapse-1.42.0 > Create /usr/ports/packages/amd64/all/synapse-1.42.0.tgz > Creating package synapse-1.42.0 > checking dependencies|devel/py-jsonschema,python3 > Error: Dependency py3-jsonschema->=3.0.0 doesn't match FULLPKGNAME: > py3-jsonschema-2.6.0p3 > checksumming... > Error: @depend > devel/py-jsonschema,python3:py3-jsonschema->=3.0.0:py3-jsonschema-2.6.0p3 > pattern py3-jsonschema->=3.0.0 doesn't match default py3-jsonschema-2.6.0p3 At a guess, you probably have something in another directory in PORTSDIR_PATH that is confusing things.
Re: [update] net/synapse-1.42.0 devel/py-jsonschema-3.2.0
Stuart Henderson writes:
> Have you tested the jsonschema update with the other 2 ports that use it
> (anki, py-nbformat)?
synapse doesn't seem to want to package and I am not sure why:
===> Building package for synapse-1.42.0
Create /usr/ports/packages/amd64/all/synapse-1.42.0.tgz
Creating package synapse-1.42.0
checking dependencies|devel/py-jsonschema,python3
Error: Dependency py3-jsonschema->=3.0.0 doesn't match FULLPKGNAME:
py3-jsonschema-2.6.0p3
checksumming...
Error: @depend
devel/py-jsonschema,python3:py3-jsonschema->=3.0.0:py3-jsonschema-2.6.0p3
pattern py3-jsonschema->=3.0.0 doesn't match default py3-jsonschema-2.6.0p3
pkg_create: can't continue
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2142
'/usr/ports/packages/amd64/all/synapse-1.42.0.tgz': @trap "cd /usr/ports/pac...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2623
'_internal-package': @case X${_DEPENDS_CACHE} in X) _DEPENDS_CACHE=$(sudo -...)
*** Error 2 in /usr/ports/net/synapse
(/usr/ports/infrastructure/mk/bsd.port.mk:2602 'package': @lock=synapse-1.42.0;
export _LOCKS_HELD=" ...)
anki starts up fine, I clicked around in the UI and it seems to be
working as expected.
nbformat passes all its tests:
qbit@tal[0]:/usr/ports/devel/py-nbformat got:(master)$ make test
===> Regression tests for py3-nbformat-5.0.7
= test session starts ==
platform openbsd7 -- Python 3.8.12, pytest-4.4.0, py-1.8.0, pluggy-0.11.0
rootdir: /build/pobj/py-nbformat-5.0.7-python3/nbformat-5.0.7
collected 146 items
nbformat/tests/test_api.py [ 2%]
nbformat/tests/test_convert.py [ 5%]
nbformat/tests/test_nbformat.py .[ 8%]
nbformat/tests/test_reader.py . [ 9%]
nbformat/tests/test_sign.py ... [ 22%]
nbformat/tests/test_validator.py .. [ 32%]
nbformat/v1/tests/test_json.py . [ 32%]
nbformat/v1/tests/test_nbbase.py .. [ 36%]
nbformat/v2/tests/test_json.py ... [ 39%]
nbformat/v2/tests/test_nbbase.py . [ 47%]
nbformat/v2/tests/test_nbpy.py . [ 48%]
nbformat/v3/tests/test_json.py ... [ 56%]
nbformat/v3/tests/test_misc.py . [ 56%]
nbformat/v3/tests/test_nbbase.py .. [ 71%]
nbformat/v3/tests/test_nbpy.py . [ 75%]
nbformat/v4/tests/test_convert.py [ 78%]
nbformat/v4/tests/test_json.py . [ 86%]
nbformat/v4/tests/test_nbbase.py .. [ 96%]
nbformat/v4/tests/test_validate.py . [100%]
=== warnings summary ===
/usr/local/lib/python3.8/site-packages/jsonschema/compat.py:6
/usr/local/lib/python3.8/site-packages/jsonschema/compat.py:6:
DeprecationWarning: Using or importing the ABCs from 'collections' instead of
from 'collections.abc' is deprecated since Python 3.3, and in 3.10 it will stop
working
from collections import MutableMapping, Sequence # noqa
-- Docs: https://docs.pytest.org/en/latest/warnings.html
146 passed, 1 warnings in 2.26 seconds
>
> jsonschema can move to py3-only.
>
>
> On 2021/09/17 11:39, Renaud Allard wrote:
>> Hello,
>>
>> Here is an update for net/synapse to 1.42.0. Unfortunately, it is also
>> dependent on devel/py-jsonschema >= 3.0.0. So here is the patch for that one
>> too.
>>
>> Best Regards
>>
>
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/devel/py-jsonschema/Makefile,v
>> retrieving revision 1.14
>> diff -u -p -r1.14 Makefile
>> --- Makefile 21 May 2021 19:50:26 - 1.14
>> +++ Makefile 17 Sep 2021 09:29:35 -
>> @@ -2,10 +2,9 @@
>>
>> COMMENT = implementation of JSON Schema validation for Python
>>
>> -MODPY_EGG_VERSION = 2.6.0
>> +MODPY_EGG_VERSION = 3.2.0
>> DISTNAME = jsonschema-${MODPY_EGG_VERSION}
>> PKGNAME = py-${DISTNAME}
>> -REVISION = 3
>>
>> CATEGORIES =devel
>>
>> Index: distinfo
>> ===
>> RCS file: /cvs/ports/devel/py-jsonschema/distinfo,v
>> retrieving revision 1.2
>> diff -u -p -r1.2 distinfo
>> --- distinfo 5 Mar 2017 18:18:24 - 1.2
>> +++ distinfo 17 Sep 2021 09:29:35 -
>> @@ -1,2 +1,2 @@
>> -SHA256 (jsonschema-2.6.0.tar.gz) =
>>
[update] net/synapse-1.42.0 devel/py-jsonschema-3.2.0
Hello,
Here is an update for net/synapse to 1.42.0. Unfortunately, it is also
dependent on devel/py-jsonschema >= 3.0.0. So here is the patch for that
one too.
Best Regards
Index: Makefile
===
RCS file: /cvs/ports/devel/py-jsonschema/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile 21 May 2021 19:50:26 - 1.14
+++ Makefile 17 Sep 2021 09:29:35 -
@@ -2,10 +2,9 @@
COMMENT = implementation of JSON Schema validation for Python
-MODPY_EGG_VERSION = 2.6.0
+MODPY_EGG_VERSION = 3.2.0
DISTNAME = jsonschema-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 3
CATEGORIES = devel
Index: distinfo
===
RCS file: /cvs/ports/devel/py-jsonschema/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 5 Mar 2017 18:18:24 - 1.2
+++ distinfo 17 Sep 2021 09:29:35 -
@@ -1,2 +1,2 @@
-SHA256 (jsonschema-2.6.0.tar.gz) = b/XzGAhwg2yuQPBvoQQZ9VcggXXxOte8Jsqne+sfbgI=
-SIZE (jsonschema-2.6.0.tar.gz) = 53252
+SHA256 (jsonschema-3.2.0.tar.gz) = yKhbKNN3zHc35G4tnytPRO48Dh3qxr9G3e/HGH0weXo=
+SIZE (jsonschema-3.2.0.tar.gz) = 167226
Index: patches/patch-jsonschema_tests_test_jsonschema_test_suite_py
===
RCS file: patches/patch-jsonschema_tests_test_jsonschema_test_suite_py
diff -N patches/patch-jsonschema_tests_test_jsonschema_test_suite_py
--- patches/patch-jsonschema_tests_test_jsonschema_test_suite_py 16 Aug 2015 19:46:22 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-jsonschema_tests_test_jsonschema_test_suite_py,v 1.1.1.1 2015/08/16 19:46:22 edd Exp $
-
-Bad interpreter path.
-
jsonschema/tests/test_jsonschema_test_suite.py.orig Sun Aug 16 17:51:04 2015
-+++ jsonschema/tests/test_jsonschema_test_suite.py Sun Aug 16 17:51:16 2015
-@@ -47,7 +47,7 @@ TESTS_DIR = os.path.join(SUITE, "tests")
- JSONSCHEMA_SUITE = os.path.join(SUITE, "bin", "jsonschema_suite")
-
- remotes_stdout = subprocess.Popen(
--["python", JSONSCHEMA_SUITE, "remotes"], stdout=subprocess.PIPE,
-+[sys.executable, JSONSCHEMA_SUITE, "remotes"], stdout=subprocess.PIPE,
- ).stdout
-
- with closing(remotes_stdout):
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-jsonschema/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 19 Feb 2021 23:13:01 - 1.4
+++ pkg/PLIST 17 Sep 2021 09:29:35 -
@@ -15,39 +15,55 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSIO
lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}_format.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}_legacy_validators.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}_reflect.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}_types.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}_utils.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}_validators.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}validators.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/jsonschema/_format.py
+lib/python${MODPY_VERSION}/site-packages/jsonschema/_legacy_validators.py
lib/python${MODPY_VERSION}/site-packages/jsonschema/_reflect.py
+lib/python${MODPY_VERSION}/site-packages/jsonschema/_types.py
lib/python${MODPY_VERSION}/site-packages/jsonschema/_utils.py
lib/python${MODPY_VERSION}/site-packages/jsonschema/_validators.py
-lib/python${MODPY_VERSION}/site-packages/jsonschema/_version.py
+lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/
+lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/${MODPY_PYCACHE}issue232.${MODPY_PYC_MAGIC_TAG}pyc
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2021/09/17 06:28:14 Modified files: security/hcxtools: Makefile distinfo Log message: update: 6.2.0 -> 6.2.4 new options speed improvements bug fixes important notice: this is the last version supporting OpenSSL 1.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bl...@cvs.openbsd.org 2021/09/17 06:26:39 Modified files: devel/p5-AnyEvent: Makefile Added files: devel/p5-AnyEvent/patches: patch-lib_AnyEvent_TLS_pm Log message: p5-AnyEvent supports TLS only upto 1.2, disable TLS 1.3. This fixes unexpected EPIPE in t/80_ssltest.t test. OK tb@
Re: ports/devel/gdb update with riscv support
> From: Jeremie Courreges-Anglas > Date: Fri, 17 Sep 2021 13:43:19 +0200 > > On Fri, Sep 17 2021, Mark Kettenis wrote: > >> From: Jeremie Courreges-Anglas > >> Date: Fri, 17 Sep 2021 13:23:58 +0200 > >> > >> On Sat, Sep 04 2021, Jeremie Courreges-Anglas wrote: > >> > On Fri, Sep 03 2021, Jeremie Courreges-Anglas wrote: > >> >> So here's the result of the torture I've been doing to my self during > >> >> this hackathon. gdb-10.x inferior target support is broken for reasons > >> >> I still ignore and I've been told that moving to 9.x was already nice > >> >> enough. :) > >> >> > >> >> Regarding the changes below: > >> >> - DEBUG_PACKAGES, reminded by sthen@ > >> >> - disable mpfr, linking against libgmp.a breaks on powerpc with > >> >> relocation errors > >> >> - xxhash support added, just because it took me less time to just add > >> >> the dep. I didn't actually check for all possible new hidden deps > >> > > >> > To keep things simple I just force-disabled everything that seemed > >> > relevant. > >> > > >> >> - CFLAGS tweak maybe not needed any more? If this actually requires > >> >> C11 or C++11 support, COMPILER should be changed > >> > > >> > The port now requires C++11 support and thus base-clang or ports-gcc > >> > (tested on sparc64 with COMPILER=base-gcc). Both base-clang and > >> > ports-gcc default to C17 so no need to specify -std=gnu11. > >> > > >> > So along with m88k this also kills egdb support on sh (no idea whether > >> > it actually built/worked there, I only know that one file was patched). > >> > I don't consider this as a showstopper. If people care about egdb on > >> > those architectures it should be possible to add a devel/gdb-7 port. > >> > > >> >> - upstream moved file named to - so I moved > >> >> our files too, sorry for the churn. > >> >> - I also had to adapt our aarch64 and powerpc64 support patches to the > >> >> API changes that happened upstream > >> >> - i386 needed special love, some changes that happened in there haven't > >> >> been compile tested > >> >> - the ptid_get_pid->get_ptrace_pid issue has been solved upstream, so > >> >> a bunch of patches get removed > >> >> - some of the configure.nat dedup changes aren't strictly needed but > >> >> they just seem better in the long term. For example some of our > >> >> architectures didn't use bsd-kvm.c/libkvm. > >> >> - OpenBSD/riscv64 support files shamelessly copied from the FreeBSD > >> >> support (thanks!). Besides mechanical renaming, I think it's the only > >> >> relevant change I made there. riscv64 support means we can read > >> >> coredumps and print backtraces. We can't do inferior process > >> >> debugging yet because we just don't support PT_STEP (this may also be > >> >> a problem on other architectures). We also need a kernel diff that > >> >> I haven't sent yet. > >> >> - m88k support has been removed, sorry aoyama@ :-/ > >> >> - the python patch isn't needed anymore > >> > > >> > - added in the diff below: two hunks to keep building on OpenBSD/armv7, > >> > I had lost those bits initially present in Pascal's update to 8.2.1. > >> > > >> >> Thanks to all the folks who helped me test a previous diff on various > >> >> architectures! Even if there are still open questions (and I may have > >> >> forgotten some so reviews would be welcome), I hope we can commit this > >> >> update before tagging OpenBSD 7.0. Therefore I'll need another round of > >> >> tests! > >> >> > >> >> Things to test with -current devel/gdb *and* after applying the diff > >> >> below: > >> >> - egdb -ex run # for example du > >> >> - egdb -ex run # for example ls > >> > > >> > More complete/automated tests: > >> > - egdb -ex 'b main' -ex run -ex bt -ex continue -ex q > >> > /usr/src/usr.bin/du/obj/du > >> > - egdb -ex 'b main' -ex run -ex bt -ex continue -ex q > >> > /usr/src/bin/ls/obj/ls > >> > > >> >> - reading a coredump and printing a backtrace > >> >> - ? > >> > >> Updated diff after some tweaks and successful tests by jj@ on octeon. > >> > >> arch-specific test reports so far: > >> - ok: amd64, riscv64, sparc64, i386, powerpc, powerpc64, octeon > >> - not ok: arm64 (don't know how to run) > >> - unknown: alpha, armv7, hppa, loongson > >> - not applicable: sh, m88k > >> > >> Apart from the "unknown" architectures above, new tests on arm64 would > >> be sweet. The support for native inferior target should be hooked up > ^^ > >> now - but it may fail to build. > ^^ > > >> > >> (gdb-9.2-8.diff) > > > > Not sure what I'm doing wrong, but for me arm64 doesn't even build... > > I would suspect errors compiling aarch64-obsd-nat.c, right? If you send > me the error log I might be able to fix them. Yes. I can fix it myself, such that you can concentrate on the other missing bits. It's just that your message suggests it builds but doesn't run properly. So I was
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/09/17 05:47:35 Modified files: sysutils/exoscale-cli: Makefile distinfo Log message: Update to exoscale-cli-1.42.0.
Re: ports/devel/gdb update with riscv support
On Fri, Sep 17 2021, Mark Kettenis wrote: >> From: Jeremie Courreges-Anglas >> Date: Fri, 17 Sep 2021 13:23:58 +0200 >> >> On Sat, Sep 04 2021, Jeremie Courreges-Anglas wrote: >> > On Fri, Sep 03 2021, Jeremie Courreges-Anglas wrote: >> >> So here's the result of the torture I've been doing to my self during >> >> this hackathon. gdb-10.x inferior target support is broken for reasons >> >> I still ignore and I've been told that moving to 9.x was already nice >> >> enough. :) >> >> >> >> Regarding the changes below: >> >> - DEBUG_PACKAGES, reminded by sthen@ >> >> - disable mpfr, linking against libgmp.a breaks on powerpc with >> >> relocation errors >> >> - xxhash support added, just because it took me less time to just add >> >> the dep. I didn't actually check for all possible new hidden deps >> > >> > To keep things simple I just force-disabled everything that seemed >> > relevant. >> > >> >> - CFLAGS tweak maybe not needed any more? If this actually requires >> >> C11 or C++11 support, COMPILER should be changed >> > >> > The port now requires C++11 support and thus base-clang or ports-gcc >> > (tested on sparc64 with COMPILER=base-gcc). Both base-clang and >> > ports-gcc default to C17 so no need to specify -std=gnu11. >> > >> > So along with m88k this also kills egdb support on sh (no idea whether >> > it actually built/worked there, I only know that one file was patched). >> > I don't consider this as a showstopper. If people care about egdb on >> > those architectures it should be possible to add a devel/gdb-7 port. >> > >> >> - upstream moved file named to - so I moved >> >> our files too, sorry for the churn. >> >> - I also had to adapt our aarch64 and powerpc64 support patches to the >> >> API changes that happened upstream >> >> - i386 needed special love, some changes that happened in there haven't >> >> been compile tested >> >> - the ptid_get_pid->get_ptrace_pid issue has been solved upstream, so >> >> a bunch of patches get removed >> >> - some of the configure.nat dedup changes aren't strictly needed but >> >> they just seem better in the long term. For example some of our >> >> architectures didn't use bsd-kvm.c/libkvm. >> >> - OpenBSD/riscv64 support files shamelessly copied from the FreeBSD >> >> support (thanks!). Besides mechanical renaming, I think it's the only >> >> relevant change I made there. riscv64 support means we can read >> >> coredumps and print backtraces. We can't do inferior process >> >> debugging yet because we just don't support PT_STEP (this may also be >> >> a problem on other architectures). We also need a kernel diff that >> >> I haven't sent yet. >> >> - m88k support has been removed, sorry aoyama@ :-/ >> >> - the python patch isn't needed anymore >> > >> > - added in the diff below: two hunks to keep building on OpenBSD/armv7, >> > I had lost those bits initially present in Pascal's update to 8.2.1. >> > >> >> Thanks to all the folks who helped me test a previous diff on various >> >> architectures! Even if there are still open questions (and I may have >> >> forgotten some so reviews would be welcome), I hope we can commit this >> >> update before tagging OpenBSD 7.0. Therefore I'll need another round of >> >> tests! >> >> >> >> Things to test with -current devel/gdb *and* after applying the diff >> >> below: >> >> - egdb -ex run # for example du >> >> - egdb -ex run # for example ls >> > >> > More complete/automated tests: >> > - egdb -ex 'b main' -ex run -ex bt -ex continue -ex q >> > /usr/src/usr.bin/du/obj/du >> > - egdb -ex 'b main' -ex run -ex bt -ex continue -ex q >> > /usr/src/bin/ls/obj/ls >> > >> >> - reading a coredump and printing a backtrace >> >> - ? >> >> Updated diff after some tweaks and successful tests by jj@ on octeon. >> >> arch-specific test reports so far: >> - ok: amd64, riscv64, sparc64, i386, powerpc, powerpc64, octeon >> - not ok: arm64 (don't know how to run) >> - unknown: alpha, armv7, hppa, loongson >> - not applicable: sh, m88k >> >> Apart from the "unknown" architectures above, new tests on arm64 would >> be sweet. The support for native inferior target should be hooked up ^^ >> now - but it may fail to build. ^^ >> >> (gdb-9.2-8.diff) > > Not sure what I'm doing wrong, but for me arm64 doesn't even build... I would suspect errors compiling aarch64-obsd-nat.c, right? If you send me the error log I might be able to fix them. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/09/17 04:46:15 Modified files: net/librenms : Makefile distinfo net/librenms/pkg: PLIST Log message: update to librenms-21.9.0
graphics/djvulibre update
Dear ports@,
updating graphics/djvulibre to 3.5.28 fixes the following bugs:
CVE-2021-3630: out-of-bounds write
CVE-2019-15143: infinite recoursion
CVE-2019-15142: heap buffer over-read
CVE-2019-18804: NULL pointer deref
I added more bug fixes that are not yet in a release.
For testing I compiled graphics/djviewer and opened two old ebooks.
I also make tested graphics/ImageMagick.
mbuhl
Index: graphics/djvulibre/Makefile
===
RCS file: /cvs/ports/graphics/djvulibre/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- graphics/djvulibre/Makefile 12 Jul 2019 20:46:57 - 1.45
+++ graphics/djvulibre/Makefile 16 Sep 2021 21:01:47 -
@@ -2,9 +2,8 @@
COMMENT= view, decode and encode DjVu files
-DISTNAME= djvulibre-3.5.27
-REVISION= 6
-SHARED_LIBS= djvulibre 26.0# 27.0
+DISTNAME= djvulibre-3.5.28
+SHARED_LIBS= djvulibre 27.0# 28.0
CATEGORIES=graphics print
HOMEPAGE= http://djvu.sourceforge.net/
Index: graphics/djvulibre/distinfo
===
RCS file: /cvs/ports/graphics/djvulibre/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- graphics/djvulibre/distinfo 12 May 2015 16:10:27 - 1.9
+++ graphics/djvulibre/distinfo 16 Sep 2021 21:01:47 -
@@ -1,2 +1,2 @@
-SHA256 (djvulibre-3.5.27.tar.gz) = 5pZoJSVlYDh1+4hQDN4Cv5PRLUijiE5HJpbIlugfUF8=
-SIZE (djvulibre-3.5.27.tar.gz) = 3648522
+SHA256 (djvulibre-3.5.28.tar.gz) = /NAJ6nZU/eWoNgDrgHV706dpmOR9E8ZrVMjbhJ+PLtw=
+SIZE (djvulibre-3.5.28.tar.gz) = 3701161
Index: graphics/djvulibre/patches/patch-configure_ac
===
RCS file: /cvs/ports/graphics/djvulibre/patches/patch-configure_ac,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure_ac
--- graphics/djvulibre/patches/patch-configure_ac 12 May 2015 16:10:27
- 1.2
+++ graphics/djvulibre/patches/patch-configure_ac 16 Sep 2021 21:01:47
-
@@ -1,7 +1,8 @@
$OpenBSD: patch-configure_ac,v 1.2 2015/05/12 16:10:27 shadchin Exp $
configure.ac.orig Sun Mar 29 10:30:55 2015
-+++ configure.ac Sun Mar 29 10:31:17 2015
-@@ -129,7 +129,6 @@ RM="$RM -f"
+Index: configure.ac
+--- configure.ac.orig
configure.ac
+@@ -131,7 +131,6 @@ RM="$RM -f"
# Libtool & Compilers
AC_PROG_CC
AC_PROG_CXX
Index: graphics/djvulibre/patches/patch-libdjvu_DataPool_cpp
===
RCS file: graphics/djvulibre/patches/patch-libdjvu_DataPool_cpp
diff -N graphics/djvulibre/patches/patch-libdjvu_DataPool_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ graphics/djvulibre/patches/patch-libdjvu_DataPool_cpp 16 Sep 2021
21:01:47 -
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Fix CVE-2021-32492: Out-of-Bounds Read
+https://sourceforge.net/p/djvu/djvulibre-git/ci/cd8b5c97b27a5c1dc83046498b6ca49ad20aa9b6
+
+Index: libdjvu/DataPool.cpp
+--- libdjvu/DataPool.cpp.orig
libdjvu/DataPool.cpp
+@@ -791,6 +791,9 @@ DataPool::create(const GP & pool, int start,
+ DEBUG_MSG("DataPool::DataPool: pool=" << (void *)((DataPool *)pool) << "
start=" << start << " length= " << length << "\n");
+ DEBUG_MAKE_INDENT(3);
+
++ if (!pool)
++G_THROW( ERR_MSG("DataPool.zero_DataPool") );
++
+ DataPool *xpool=new DataPool();
+ GP retval=xpool;
+ xpool->init();
Index: graphics/djvulibre/patches/patch-libdjvu_DjVmDir_cpp
===
RCS file: graphics/djvulibre/patches/patch-libdjvu_DjVmDir_cpp
diff -N graphics/djvulibre/patches/patch-libdjvu_DjVmDir_cpp
--- graphics/djvulibre/patches/patch-libdjvu_DjVmDir_cpp2 Mar 2016
20:10:36 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,94 +0,0 @@
-$OpenBSD: patch-libdjvu_DjVmDir_cpp,v 1.1 2016/03/02 20:10:36 juanfra Exp $
-
-"accept documents with duplicate page titles"
-
-http://sourceforge.net/p/djvu/djvulibre-git/ci/77a4dca8dd3acd0acc1680fa14a352c11084e25d/
-https://bitbucket.org/jwilk/pdf2djvu/issues/113/duplicate-page-title-1
-
libdjvu/DjVmDir.cpp.orig Tue Jul 8 23:15:07 2014
-+++ libdjvu/DjVmDir.cppWed Feb 3 01:51:28 2016
-@@ -223,7 +223,6 @@ DjVmDir::decode(const GP )
-page2file.resize(-1);
-name2file.empty();
-id2file.empty();
-- title2file.empty();
-
-int ver=str.read8();
-bool bundled=(ver & 0x80)!=0;
-@@ -375,18 +374,6 @@ DjVmDir::decode(const GP )
- G_THROW( ERR_MSG("DjVmDir.dupl_id") "\t" + file->id);
- id2file[file->id]=file;
- }
--
-- // Generate title2file map
-- for(pos=files_list;pos;++pos)
-- {
-- GP file=files_list[pos];
-- if (file->title.length())
-- {
--if (title2file.contains(file->title))
-- G_THROW( ERR_MSG("DjVmDir.dupl_title") "\t" + file->title);
--
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/09/17 04:17:59 Modified files: www/composer : Makefile distinfo Log message: update to composer-2.1.8, mostly regression fixes
Re: [update] net/synapse-1.42.0 devel/py-jsonschema-3.2.0
Have you tested the jsonschema update with the other 2 ports that use it
(anki, py-nbformat)?
jsonschema can move to py3-only.
On 2021/09/17 11:39, Renaud Allard wrote:
> Hello,
>
> Here is an update for net/synapse to 1.42.0. Unfortunately, it is also
> dependent on devel/py-jsonschema >= 3.0.0. So here is the patch for that one
> too.
>
> Best Regards
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/py-jsonschema/Makefile,v
> retrieving revision 1.14
> diff -u -p -r1.14 Makefile
> --- Makefile 21 May 2021 19:50:26 - 1.14
> +++ Makefile 17 Sep 2021 09:29:35 -
> @@ -2,10 +2,9 @@
>
> COMMENT =implementation of JSON Schema validation for Python
>
> -MODPY_EGG_VERSION = 2.6.0
> +MODPY_EGG_VERSION = 3.2.0
> DISTNAME = jsonschema-${MODPY_EGG_VERSION}
> PKGNAME =py-${DISTNAME}
> -REVISION = 3
>
> CATEGORIES = devel
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/py-jsonschema/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo 5 Mar 2017 18:18:24 - 1.2
> +++ distinfo 17 Sep 2021 09:29:35 -
> @@ -1,2 +1,2 @@
> -SHA256 (jsonschema-2.6.0.tar.gz) =
> b/XzGAhwg2yuQPBvoQQZ9VcggXXxOte8Jsqne+sfbgI=
> -SIZE (jsonschema-2.6.0.tar.gz) = 53252
> +SHA256 (jsonschema-3.2.0.tar.gz) =
> yKhbKNN3zHc35G4tnytPRO48Dh3qxr9G3e/HGH0weXo=
> +SIZE (jsonschema-3.2.0.tar.gz) = 167226
> Index: patches/patch-jsonschema_tests_test_jsonschema_test_suite_py
> ===
> RCS file: patches/patch-jsonschema_tests_test_jsonschema_test_suite_py
> diff -N patches/patch-jsonschema_tests_test_jsonschema_test_suite_py
> --- patches/patch-jsonschema_tests_test_jsonschema_test_suite_py 16 Aug
> 2015 19:46:22 - 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,15 +0,0 @@
> -$OpenBSD: patch-jsonschema_tests_test_jsonschema_test_suite_py,v 1.1.1.1
> 2015/08/16 19:46:22 edd Exp $
> -
> -Bad interpreter path.
> -
> jsonschema/tests/test_jsonschema_test_suite.py.orig Sun Aug 16
> 17:51:04 2015
> -+++ jsonschema/tests/test_jsonschema_test_suite.py Sun Aug 16 17:51:16 2015
> -@@ -47,7 +47,7 @@ TESTS_DIR = os.path.join(SUITE, "tests")
> - JSONSCHEMA_SUITE = os.path.join(SUITE, "bin", "jsonschema_suite")
> -
> - remotes_stdout = subprocess.Popen(
> --["python", JSONSCHEMA_SUITE, "remotes"], stdout=subprocess.PIPE,
> -+[sys.executable, JSONSCHEMA_SUITE, "remotes"], stdout=subprocess.PIPE,
> - ).stdout
> -
> - with closing(remotes_stdout):
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/devel/py-jsonschema/pkg/PLIST,v
> retrieving revision 1.4
> diff -u -p -r1.4 PLIST
> --- pkg/PLIST 19 Feb 2021 23:13:01 - 1.4
> +++ pkg/PLIST 17 Sep 2021 09:29:35 -
> @@ -15,39 +15,55 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSIO
>
> lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}_format.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}_legacy_validators.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}_reflect.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}_types.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}_utils.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}_validators.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}validators.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/jsonschema/_format.py
> +lib/python${MODPY_VERSION}/site-packages/jsonschema/_legacy_validators.py
> lib/python${MODPY_VERSION}/site-packages/jsonschema/_reflect.py
> +lib/python${MODPY_VERSION}/site-packages/jsonschema/_types.py
> lib/python${MODPY_VERSION}/site-packages/jsonschema/_utils.py
> lib/python${MODPY_VERSION}/site-packages/jsonschema/_validators.py
> -lib/python${MODPY_VERSION}/site-packages/jsonschema/_version.py
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/09/17 01:43:41 Modified files: mail/mozilla-thunderbird: Makefile distinfo mail/thunderbird-i18n: Makefile.inc distinfo Log message: mail/mozilla-thunderbird: update to 91.1.1. See https://www.thunderbird.net/en-US/thunderbird/91.1.1/releasenotes/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2021/09/17 00:31:57 Modified files: editors/libreoffice: Makefile distinfo editors/libreoffice/pkg: PLIST-java Log message: update to 7.2.1.2
