Skip to content

Commit

Permalink
Fix msgpack runtime on sparc64
Browse files Browse the repository at this point in the history
	$ borg init -e none ./repo ; echo $?
	Unknown integrity data version 0 in integrity.1
	0

borg 1.1.x bundles msgpack-python, which 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, borg's 1.1-maint branch merged it, pull the PR.

borgbackup/1.2 and py-msgpack will get the same fix but in a different
commit as py-msgpack has more consumers than borg 1.2.

Tested on little endian amd64/base-clang and big endian macppc/base-clang,
sparc64/ports-gcc.
OK bket
  • Loading branch information
klemensn committed Dec 4, 2022
1 parent d964be5 commit 2e17e63
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
10 changes: 9 additions & 1 deletion sysutils/borgbackup/1.1/Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
PORTROACH = limit:^1\.1\.

MODPY_EGG_VERSION = 1.1.18
REVISION = 2
REVISION = 3

WANTLIB = ${COMPILER_LIBCXX} b2 m

LIB_DEPENDS = security/libb2

# same cherry-pick as in net/py-msgpack (used by borg 1.2.x), see details in
# https://github.com/borgbackup/borg/pull/6149#issuecomment-1335632116 ff.
MASTER_SITES0 = https://github.com/borgbackup/borg/
# merged "fix msgpack runtime on big-endian OpenBSD/sparc64"
# https://github.com/borgbackup/borg/pull/7181
PATCHFILES = ${PKGSTEM}-msgpack-fix-big-endian-{pull/}7181.patch:0
PATCH_DIST_STRIP = -p1

.include <bsd.port.mk>
2 changes: 2 additions & 0 deletions sysutils/borgbackup/1.1/distinfo
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
SHA256 (borgbackup-1.1.18.tar.gz) = XLpf59tNCJRLRn7BHvwBdoelErDZjM8K0aqcQylmUnU=
SHA256 (borgbackup-msgpack-fix-big-endian-7181.patch) = li9NhN0ARAsKffKO7Umhe+MKoo4uVcBcQOaAj+hpLo0=
SIZE (borgbackup-1.1.18.tar.gz) = 3854385
SIZE (borgbackup-msgpack-fix-big-endian-7181.patch) = 5633

0 comments on commit 2e17e63

Please sign in to comment.