Re: py-msgpack 1.0.0 upgrade broke salt

On Tue 10/03/2020 19:49, Florian Obser wrote:
> The release notes have
>
> * Remove encoding option from the Packer and Unpacker.
>
> ( https://github.com/msgpack/msgpack-python/blob/v1.0.0/ChangeLog.rst )
>
> $ doas salt-minion
>

I discussed py-msgpack offlist with another user who needed
py-msgpack-1.0.0 for an update of a vim plugin. Although the update of
py-msgpack has been tested this issue has not been seen.

It seems that upstream of salt is still working on a solution [0]. Easy
fix therefore is to revert py-msgpack to 0.6.2, and bump its consumers.
Downside of course would be that specific vim plugins will start
complaining.

I had a look at the consumers of py-msgpack, which we have in ports.
All of them seem happy with py-msgpack-0.6.2. None of them, except
net/synapse, received an update recently. synapse relies on
msgpack>=0.5.2 [1]:

RUN_DEPENDS
/usr/ports/devel/py-test-expect
/usr/ports/devel/py-test-expect,python3
/usr/ports/editors/py-neovim
/usr/ports/editors/py-neovim,python3
/usr/ports/net/synapse
/usr/ports/sysutils/salt
TEST_DEPENDS
/usr/ports/editors/py-neovim
/usr/ports/editors/py-neovim,python3
/usr/ports/net/synapse
/usr/ports/sysutils/salt

Different route would be to support two versions of py-msgpack. For now
I propose to make sure that all ports work, thus revert. I will take a
look at the alternative route in the near future.

Comments/OK?

[0] https://github.com/saltstack/salt/issues/56007
[1] https://github.com/matrix-org/synapse/blob/master/synapse/python_dependencies.py


diff --git devel/py-test-expect/Makefile devel/py-test-expect/Makefile
index f19faf3d50b..0768ce54782 100644
--- devel/py-test-expect/Makefile
+++ devel/py-test-expect/Makefile
@@ -6,7 +6,7 @@ MODPY_EGG_VERSION = 1.1.0
DISTNAME = pytest-expect-${MODPY_EGG_VERSION}
PKGNAME = ${DISTNAME:S/py/py-/}
CATEGORIES = devel
-REVISION = 1
+REVISION = 2

HOMEPAGE = https://github.com/gsnedders/pytest-expect

diff --git editors/py-neovim/Makefile editors/py-neovim/Makefile
index ef30c889738..185624959d5 100644
--- editors/py-neovim/Makefile
+++ editors/py-neovim/Makefile
@@ -3,6 +3,7 @@
COMMENT = Python plugin support for Neovim

MODPY_EGG_VERSION = 0.4.0
+REVISION = 0
DISTNAME = pynvim-${MODPY_EGG_VERSION}
PKGNAME = py-neovim-${MODPY_EGG_VERSION}

diff --git net/py-msgpack/Makefile net/py-msgpack/Makefile
index ea82fc3e07a..c06d478b9de 100644
--- net/py-msgpack/Makefile
+++ net/py-msgpack/Makefile
@@ -2,7 +2,8 @@

COMMENT = messagepack (de)serializer

-MODPY_EGG_VERSION = 1.0.0
+MODPY_EGG_VERSION = 0.6.2
+EPOCH = 0
DISTNAME = msgpack-${MODPY_EGG_VERSION}
PKGNAME = py-msgpack-${MODPY_EGG_VERSION}

diff --git net/py-msgpack/distinfo net/py-msgpack/distinfo
index 5ec380d7403..8d9bdadf9d3 100644
--- net/py-msgpack/distinfo
+++ net/py-msgpack/distinfo
@@ -1,2 +1,2 @@
-SHA256 (msgpack-1.0.0.tar.gz) = lTTVzEgNSv9yAjNBGh92W+kIhXULB993I4CzTBDstcA=
-SIZE (msgpack-1.0.0.tar.gz) = 232331
+SHA256 (msgpack-0.6.2.tar.gz) = 6jwvhZNG/NVfxG6WiFMB2cL3o21FP12PKWeEDvoeGDA=
+SIZE (msgpack-0.6.2.tar.gz) = 119062
diff --git net/py-msgpack/pkg/PLIST net/py-msgpack/pkg/PLIST
index 7d948a0df47..2f24d170108 100644
--- net/py-msgpack/pkg/PLIST
+++ net/py-msgpack/pkg/PLIST
@@ -10,10 +10,8 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE
lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}ext.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}fallback.${MODPY_PYC_MAGIC_TAG}pyc
-${MODPY_COMMENT}@so lib/python${MODPY_VERSION}/site-packages/msgpack/_cmsgpack.so
+@so lib/python${MODPY_VERSION}/site-packages/msgpack/_cmsgpack.so
lib/python${MODPY_VERSION}/site-packages/msgpack/_version.py
lib/python${MODPY_VERSION}/site-packages/msgpack/exceptions.py
-lib/python${MODPY_VERSION}/site-packages/msgpack/ext.py
lib/python${MODPY_VERSION}/site-packages/msgpack/fallback.py
diff --git net/synapse/Makefile net/synapse/Makefile
index dd2b881637b..b9a8cb8416a 100644
--- net/synapse/Makefile
+++ net/synapse/Makefile
@@ -3,6 +3,7 @@
COMMENT = open network for secure, decentralized communication

MODPY_EGG_VERSION = 1.11.1
+REVISION = 0

GH_ACCOUNT = matrix-org
GH_PROJECT = synapse
diff --git sysutils/salt/Makefile sysutils/salt/Makefile
index 5129c2a60ad..74117bfa890 100644
--- sysutils/salt/Makefile
+++ sysutils/salt/Makefile
@@ -19,7 +19,7 @@ COMMENT = remote execution and configuration management system

MODPY_EGG_VERSION = 2018.3.3
DISTNAME = salt-${MODPY_EGG_VERSION}
-REVISION = 0
+REVISION = 1

CATEGORIES = sysutils net devel