On Thu 12/03/2020 20:30, Jeremie Courreges-Anglas wrote:
> >> >I discussed py-msgpack offlist with another user who needed
> >> >py-msgpack-1.0.0 for an update of a vim plugin.
>
> I'm no salt or vim user but... I think having salt working properly is
> much higher priority than an update for a vim plugin. Especially as 6.7
> is approaching.
>
> >>> 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.
>
> Do you need to bump all consumers? I suspect it would be enough to
> enforce the version requirements in sysutils/salt and bump its REVISION.
Likely caused by my ignorance, but I thought that I needed to bump all
consumers.
Enclosed a new diff which reverts py-msgpack to 0.6.2, and enforces
version requirements in salt and bumps REVISION. I will commit this
tonight unless someone has a better idea.
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 sysutils/salt/Makefile sysutils/salt/Makefile
index 5129c2a60ad..d75547f2fbc 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
@@ -40,7 +40,7 @@ BUILD_DEPENDS = textproc/py-yaml \
# requirements/base.txt
RUN_DEPENDS = devel/py-futures \
- net/py-msgpack \
+ net/py-msgpack<=0.6.2v0 \
textproc/py-MarkupSafe \
textproc/py-yaml \
www/py-jinja2 \
