cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix msgpack runtime on sparc64

Browse Source 
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
This commit is contained in:
kn 2022-12-05 17:54:53 +00:00
parent 0b49375c89
commit ec32988be5
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
net/py-msgpack/Makefile
View File

@ -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 <bket@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

4
net/py-msgpack/distinfo
View File

@ -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

2
sysutils/borgbackup/1.2/Makefile
View File

@ -1,5 +1,5 @@
MODPY_EGG_VERSION = 1.2.2
REVISION = 2
REVISION = 3
COMPILER_LANGS = c