On Sun, Dec 04, 2022 at 01:34:00PM +0000, Klemens Nanni wrote:
> Same fix as the borg 1.1 one except that borg 1.2 uses ports py-msgpack
> which has more consumers than borg 1.2:
>
> $ show-reverse-deps net/py-msgpack
> databases/py-influxdb,python3
> devel/py-buildbot/buildbot
> devel/py-buildslave
> editors/py-neovim
> editors/py-neovim,python3
> net/synapse
> net/synapse,
> sysutils/borgbackup/1.2
> sysutils/salt
> sysutils/salt-testing
> sysutils/vorta
> textproc/calibre
>
> I'm quite certain that all those are fine, but I have only tested borg
> myself.
>
> Good to go or does anyone want to do more tests?
with borg 1.2 rev bump now.
diff --git a/net/py-msgpack/Makefile b/net/py-msgpack/Makefile
index 30dc8b2ad05..d84d0feb2a4 100644
--- a/net/py-msgpack/Makefile
+++ b/net/py-msgpack/Makefile
@@ -1,7 +1,7 @@
COMMENT = messagepack (de)serializer
MODPY_EGG_VERSION = 1.0.4
-REVISION = 1
+REVISION = 2
EPOCH = 0
DISTNAME = msgpack-${MODPY_EGG_VERSION}
PKGNAME = py-msgpack-${MODPY_EGG_VERSION}
@@ -12,6 +12,17 @@ HOMEPAGE = https://msgpack.org/
MAINTAINER = Bjorn Ketelaars <b...@openbsd.org>
+# same cherry-pick as in sysutils/borgbackup/1.1, see details in
+# https://github.com/borgbackup/borg/pull/6149#issuecomment-1335632116 ff.
+MASTER_SITES0 = https://github.com/msgpack/msgpack-python/
+# merged "Fallback to compiler defines when __BYTE_ORDER is not available"
+# https://github.com/msgpack/msgpack-python/pull/513
+PATCHFILES = ${PKGSTEM}-fallback-byte-order-{pull/}513.patch:0
+# merged "Fix build error caused by ntohs, ntohl"
+# https://github.com/msgpack/msgpack-python/pull/514
+PATCHFILES += ${PKGSTEM}-fix-ntohs-{pull/}514.patch:0
+PATCH_DIST_STRIP = -p1
+
# Apache 2.0
PERMIT_PACKAGE = Yes
diff --git a/net/py-msgpack/distinfo b/net/py-msgpack/distinfo
index 19a28b8bd56..20031d52b78 100644
--- a/net/py-msgpack/distinfo
+++ b/net/py-msgpack/distinfo
@@ -1,2 +1,6 @@
SHA256 (msgpack-1.0.4.tar.gz) = 9dhpwY8DAgLrQS8Iso0q/upVPWYTruieIA16yn7wH18=
+SHA256 (py3-msgpack-fallback-byte-order-513.patch) =
GjRxKmf7lHx3ECyJ7dlMb7toXHn9JYt22IJZdZ/oAZ0=
+SHA256 (py3-msgpack-fix-ntohs-514.patch) =
qLf2uPaIcccB/8NrA4il8WDQjqlvEeaxit9IWiY6nW0=
SIZE (msgpack-1.0.4.tar.gz) = 128053
+SIZE (py3-msgpack-fallback-byte-order-513.patch) = 2775
+SIZE (py3-msgpack-fix-ntohs-514.patch) = 1383
diff --git a/sysutils/borgbackup/1.2/Makefile b/sysutils/borgbackup/1.2/Makefile
index d98ab2af988..53bff86a9cc 100644
--- a/sysutils/borgbackup/1.2/Makefile
+++ b/sysutils/borgbackup/1.2/Makefile
@@ -1,11 +1,11 @@
MODPY_EGG_VERSION = 1.2.2
-REVISION = 2
+REVISION = 3
COMPILER_LANGS = c
BUILD_DEPENDS = devel/py-pkgconfig${MODPY_FLAVOR} \
lang/cython${MODPY_FLAVOR}
-RUN_DEPENDS = net/py-msgpack${MODPY_FLAVOR}
+RUN_DEPENDS = net/py-msgpack${MODPY_FLAVOR}>=1.0.4p2v0
TEST_DEPENDS = devel/py-dateutil${MODPY_FLAVOR}
.include <bsd.port.mk>
