From ec32988be5d97dbeda48317ce3e349a06c05966c Mon Sep 17 00:00:00 2001 From: kn Date: Mon, 5 Dec 2022 17:54:53 +0000 Subject: [PATCH] Fix msgpack runtime on sparc64 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, hence the separate commit. $ borg init -e none ./repo ; echo $? Unknown integrity data version 0 in integrity.1 0 msgpack-python messed up __BYTE_ORDER handling, but only on sparc64 using ports GCC 8.4.0; macppc base clang 13 is fine. msgpack-python got fixed, pull the PR and bump borg 1.2. Teste on little endian amd64/base-clang and big endian macppc/base-clang, sparc64/ports-gcc. OK bket --- net/py-msgpack/Makefile | 13 ++++++++++++- net/py-msgpack/distinfo | 4 ++++ sysutils/borgbackup/1.2/Makefile | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) 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 +# 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..5880e43724d 100644 --- a/sysutils/borgbackup/1.2/Makefile +++ b/sysutils/borgbackup/1.2/Makefile @@ -1,5 +1,5 @@ MODPY_EGG_VERSION = 1.2.2 -REVISION = 2 +REVISION = 3 COMPILER_LANGS = c