On Thu, Feb 21 2019, "Elias M. Mariani" <[email protected]> wrote:
> https://pyzmq.readthedocs.io/en/latest/changelog.html
>
> - Update bundled libzmq to 4.3.1 (fixes CVE-2019-6250)
> https://nvd.nist.gov/vuln/detail/CVE-2019-6250
>
> Regression tests on consumers are working equal with this version and
> the previous one.
>
> Comments ? OKs ?
I don't understand the SETENV variable. Where is it used?
The two additional diffs below allow me to run tests successfully on
amd64.
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/py-zmq/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile 27 Nov 2018 08:25:13 -0000 1.21
+++ Makefile 22 Feb 2019 10:01:11 -0000
@@ -2,7 +2,7 @@
COMMENT = Python bindings for ZeroMQ
-MODPY_EGG_VERSION = 17.1.2
+MODPY_EGG_VERSION = 18.0.0
DISTNAME = pyzmq-${MODPY_EGG_VERSION}
PKGNAME = ${DISTNAME:S/py/py-/}
EPOCH = 0
@@ -25,6 +25,7 @@ LIB_DEPENDS = ${MODPY_LIB_DEPENDS} \
MODPY_PI = Yes
MODPY_DISTUTILS_BUILDARGS = --zmq=${LOCALBASE}
+SETENV = LC_CTYPE=en_US.UTF-8
# ulimit -n 1024
TEST_IS_INTERACTIVE = Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/py-zmq/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo 31 Oct 2018 12:27:23 -0000 1.15
+++ distinfo 22 Feb 2019 10:01:11 -0000
@@ -1,2 +1,2 @@
-SHA256 (pyzmq-17.1.2.tar.gz) = pyuCrBkQ8s9hpJE59JdPmUmER193Gw+qcwg5YH7u3d8=
-SIZE (pyzmq-17.1.2.tar.gz) = 1080194
+SHA256 (pyzmq-18.0.0.tar.gz) = swwznrWDVfUfT1TdYdeF8f9YyGvKHDpZFpd2MdEhhns=
+SIZE (pyzmq-18.0.0.tar.gz) = 1155815
Index: patches/patch-zmq_tests_test_context_py
===================================================================
RCS file: patches/patch-zmq_tests_test_context_py
diff -N patches/patch-zmq_tests_test_context_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-zmq_tests_test_context_py 22 Feb 2019 10:01:11 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Index: zmq/tests/test_context.py
+--- zmq/tests/test_context.py.orig
++++ zmq/tests/test_context.py
+@@ -145,8 +145,8 @@ class TestContext(BaseZMQTestCase):
+ ctx.term()
+
+ @mark.skipif(
+- sys.platform.startswith('win'),
+- reason='Segfaults on Windows')
++ sys.platform.startswith('win') or sys.platform.startswith('openbsd'),
++ reason='Segfaults on Windows and OpenBSD')
+ def test_destroy(self):
+ """Context.destroy should close sockets"""
+ ctx = self.Context()
Index: patches/patch-zmq_tests_test_socket_py
===================================================================
RCS file: patches/patch-zmq_tests_test_socket_py
diff -N patches/patch-zmq_tests_test_socket_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-zmq_tests_test_socket_py 22 Feb 2019 10:01:11 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: zmq/tests/test_socket.py
+--- zmq/tests/test_socket.py.orig
++++ zmq/tests/test_socket.py
+@@ -497,7 +497,7 @@ class TestSocket(BaseZMQTestCase):
+ ),
+ reason="only run on 64b and not on Travis."
+ )
+- @mark.large
++ @mark.skip(reason='hangs on amd64')
+ def test_large_send(self):
+ c = os.urandom(1)
+ N = 2**31 + 1
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/py-zmq/pkg/PLIST,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST
--- pkg/PLIST 31 Oct 2018 12:27:23 -0000 1.13
+++ pkg/PLIST 22 Feb 2019 10:01:11 -0000
@@ -63,6 +63,7 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSIO
lib/python${MODPY_VERSION}/site-packages/zmq/backend/cython/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/zmq/backend/cython/_device.so
lib/python${MODPY_VERSION}/site-packages/zmq/backend/cython/_poll.so
+lib/python${MODPY_VERSION}/site-packages/zmq/backend/cython/_proxy_steerable.so
lib/python${MODPY_VERSION}/site-packages/zmq/backend/cython/_version.so
lib/python${MODPY_VERSION}/site-packages/zmq/backend/cython/checkrc.pxd
lib/python${MODPY_VERSION}/site-packages/zmq/backend/cython/constant_enums.pxi
@@ -87,12 +88,14 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zmq/devices/${MODPY_PYCACHE}monitoredqueue.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/zmq/devices/${MODPY_PYCACHE}monitoredqueuedevice.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/zmq/devices/${MODPY_PYCACHE}proxydevice.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/zmq/devices/${MODPY_PYCACHE}proxysteerabledevice.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/zmq/devices/basedevice.py
lib/python${MODPY_VERSION}/site-packages/zmq/devices/monitoredqueue.pxd
lib/python${MODPY_VERSION}/site-packages/zmq/devices/monitoredqueue.py
lib/python${MODPY_VERSION}/site-packages/zmq/devices/monitoredqueue.so
lib/python${MODPY_VERSION}/site-packages/zmq/devices/monitoredqueuedevice.py
lib/python${MODPY_VERSION}/site-packages/zmq/devices/proxydevice.py
+lib/python${MODPY_VERSION}/site-packages/zmq/devices/proxysteerabledevice.py
lib/python${MODPY_VERSION}/site-packages/zmq/error.py
lib/python${MODPY_VERSION}/site-packages/zmq/eventloop/
lib/python${MODPY_VERSION}/site-packages/zmq/eventloop/__init__.py
@@ -212,6 +215,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zmq/tests/${MODPY_PYCACHE}test_multipart.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/zmq/tests/${MODPY_PYCACHE}test_pair.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/zmq/tests/${MODPY_PYCACHE}test_poll.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/zmq/tests/${MODPY_PYCACHE}test_proxy_steerable.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/zmq/tests/${MODPY_PYCACHE}test_pubsub.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/zmq/tests/${MODPY_PYCACHE}test_reqrep.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/zmq/tests/${MODPY_PYCACHE}test_retry_eintr.${MODPY_PYC_MAGIC_TAG}pyc
@@ -250,6 +254,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zmq/tests/test_multipart.py
lib/python${MODPY_VERSION}/site-packages/zmq/tests/test_pair.py
lib/python${MODPY_VERSION}/site-packages/zmq/tests/test_poll.py
+lib/python${MODPY_VERSION}/site-packages/zmq/tests/test_proxy_steerable.py
lib/python${MODPY_VERSION}/site-packages/zmq/tests/test_pubsub.py
lib/python${MODPY_VERSION}/site-packages/zmq/tests/test_reqrep.py
lib/python${MODPY_VERSION}/site-packages/zmq/tests/test_retry_eintr.py
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
