From nobody Sat Aug 13 18:54:57 2022 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M4qV94y3wz4YYdd; Sat, 13 Aug 2022 18:54:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M4qV93xHLz3kg3; Sat, 13 Aug 2022 18:54:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660416897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fqIG6YBcMo8IxhO4zgOLn+P5iPXnyodJKDF9vdakyF8=; b=sbPO2O8FObhNY+QCHav66PozWF2xJRr4ESNUJeO5Jj9rGxJaNJ9JaTnTg28KNu+Y+lDxmL DehRDm4Qu+fplf/GgTIhaCt8xzhXZ14DWaFBWavneh3+vZ8zzzkXbHfbAW3jiXiy/WW/Xn A0PtihzKaADS1DRPmrEI9qUP0YkWoEXdVmkoTNQK3kUU4mOhB4XohPGV6yzaDpgo02i9ks GZHL+do1BhSWr0yNFozFnOThAh8rGjEEuPbRi6g6pb5U9vOlt/eeoi4T+79DofnFsug1BA jE6L200ThfdE9xIB03rhRK0Cj8509EApPSQNwW7bgcvICyA0FBFMFESkBmQcLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4M4qV92N4FzMYl; Sat, 13 Aug 2022 18:54:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27DIsvDt072908; Sat, 13 Aug 2022 18:54:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27DIsv7f072907; Sat, 13 Aug 2022 18:54:57 GMT (envelope-from git) Date: Sat, 13 Aug 2022 18:54:57 GMT Message-Id: <202208131854.27DIsv7f072907@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Andree Subject: git: 0b4a732cb0ac - 2022Q3 - archivers/py-borgbackup: use fixed xxhash instead of avoiding it List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: 0b4a732cb0ac813fe1c4993e6375715dc1725e96 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660416897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fqIG6YBcMo8IxhO4zgOLn+P5iPXnyodJKDF9vdakyF8=; b=w+FjpL42kEd2KHv2G4s5NKtOXp3Lx3fEXyspXAzmezFAOHBhC088RAPcJHGzJtdGfgF8Vn zghhMFylxPJPQfnbFwbWHtQiFZ5yTsBTOuLx1aWGnHtJ7Ho1GJyiv5I5RhZYmZTl5EcnRI Atn4kv/kqgLf0/iQCxGvSCHEMgWJfzEugfzagNWeF1xTWqRNt5lA438eJOz9u+1Rl8n8pG cZG7nApDn+Ol6o01QXFpml0Cw1BDvBIIftjLjVXpqiH+OjemBHUcX9Ju/yOh3eOKv02dAi u8MPbWmUjbpISWDuelY4Ikr7F+qNNrHJ2tCA8TVy/+4u0/BQSMcoiYJdF9f7/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660416897; a=rsa-sha256; cv=none; b=XM74xob6IujlKe7++YRKBOaOPeYgIcT6WffS5HuuZPNK+K3Vx3lHAbp1BNGWmxKoe2cLtH D7qqXwQ9WOoZh3088BsThNWx2QHqa25L+MVEsfC6zC91yMZku3Uu8m0WGZsnwePRryDmNK VUZVjbh4tncBKSYQl9oQ4NKNPRJm6aDxi+pKdRJjkTo9qjfuBEc8MFwHjJTaj2zLPRjsbp 2xdBeDkhlKy4pQtLZiTLHRCEu8Ji7XwpThikUjluAXd5y0qYWjt5iT9uOfLokv7raXYJll Vz6SXSeFwqa4EwLl/zrVXaPV5pjqq4Gti/52c46/GkpR2fB2PJEmT7S+P33u4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=0b4a732cb0ac813fe1c4993e6375715dc1725e96 commit 0b4a732cb0ac813fe1c4993e6375715dc1725e96 Author: Matthias Andree AuthorDate: 2022-08-13 17:20:29 +0000 Commit: Matthias Andree CommitDate: 2022-08-13 18:54:30 +0000 archivers/py-borgbackup: use fixed xxhash instead of avoiding it This reverts commit 9db903a89b3d1d7c0be2a56059542f3fdb412908 because it does not fix the situation for lack of a PORTREVISION bump. Let us use the opportunity to fix the real bug instead. Now with xxhash fixed as of 0.8.1_2, drop 9db903a89, and bump PORTREVISION so we flush out the old garbage packages. A simple web search would have brought up that static_assert() is a C11 convenience macro defined in , and a detailed search would have turned up that this had been fixed in xxhash before. While here, add a smoke test to post-install. Proper fix was Reported by: Thierry Dussuet PR: 265060 MFH: 2022Q3 (cherry picked from commit 714af13781970db3ec794eab4627d585b63df00a) --- archivers/py-borgbackup/Makefile | 3 ++- archivers/py-borgbackup/files/patch-setup.py | 11 ----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/archivers/py-borgbackup/Makefile b/archivers/py-borgbackup/Makefile index 512b2292a8b6..3b80068b12bb 100644 --- a/archivers/py-borgbackup/Makefile +++ b/archivers/py-borgbackup/Makefile @@ -14,7 +14,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.7:devel/py-setuptools_scm@${PY_FLAVOR} LIB_DEPENDS= liblz4.so:archivers/liblz4 \ - libzstd.so:archivers/zstd + libzstd.so:archivers/zstd \ + libxxhash.so:devel/xxhash RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>=19.0:devel/py-packaging@${PY_FLAVOR} USES= python:3.5+ ssl diff --git a/archivers/py-borgbackup/files/patch-setup.py b/archivers/py-borgbackup/files/patch-setup.py deleted file mode 100644 index 399dc0b58daa..000000000000 --- a/archivers/py-borgbackup/files/patch-setup.py +++ /dev/null @@ -1,11 +0,0 @@ ---- setup.py.orig 2022-07-16 16:20:52 UTC -+++ setup.py -@@ -23,7 +23,7 @@ prefer_system_libzstd = True - prefer_system_libb2 = True - - # True: use the shared libxxhash (>= 0.6.5 [>= 0.7.2 on ARM]) from the system, False: use the bundled xxhash code --prefer_system_libxxhash = True -+prefer_system_libxxhash = False - - # prefer_system_msgpack is another option, but you need to set it in src/borg/helpers.py. -