From nobody Sat Aug 13 18:51:33 2022 X-Original-To: dev-commits-ports-main@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 4M4qQF59rtz4YXLr; Sat, 13 Aug 2022 18:51:33 +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 4M4qQF3hQ2z3jnb; Sat, 13 Aug 2022 18:51:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660416693; 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=ptyYLCe6q/S/L7AsGNjRANmjuw62g9Hip7WPrQHmTis=; b=B2mBlpOCHoWtPoWE39W5WjsWXtbbjM/oz9wCZq4mOV+e+KjSJJXv8lRQElPbYHwe7KMPFM b3lF/Ru95c5CF+jsnyTUTiAM/70fLPWIhWxvS81IpV+FLrb7qcCJo7AOm9U4r7QQnUtKVQ D3BuEOSX9W+k4NvZj2wJDOWgP7bzWsMU1nmXxr3Px9K1F587PRArxdBHhXXi436/2Z525z vmRpg9B6vnUM6Fm57YdqFKYamogPXWk5spJQNyN5KdxDSEqavP83ylnmOgb7UlwYpaEx30 7CTqoFlfucjKwXUTheeokTDmsh1rKhI2hteCIeaqH5S9JsT3MixgIAYmRa1i8w== 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 4M4qQF27TyzLyQ; Sat, 13 Aug 2022 18:51:33 +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 27DIpXYn069784; Sat, 13 Aug 2022 18:51:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27DIpXGn069783; Sat, 13 Aug 2022 18:51:33 GMT (envelope-from git) Date: Sat, 13 Aug 2022 18:51:33 GMT Message-Id: <202208131851.27DIpXGn069783@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 714af1378197 - main - archivers/py-borgbackup: use fixed xxhash instead of avoiding it List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 714af13781970db3ec794eab4627d585b63df00a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660416693; 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=ptyYLCe6q/S/L7AsGNjRANmjuw62g9Hip7WPrQHmTis=; b=d5lT/57t9zLzAp+N+55LpaPM0Z1apvurpGgFVHqhAygwLMpBPqj7cl+w/9cCdcbNypu8q4 c171ywprogYjf1SGhzQT/jlKAAwJwFZ0yt08uep+hd3AZimtplD03z0C+t6jTu4hrn0u8/ XuQxsfsLlTa3evAKTjN0ndU9Ijm2PrGeTr6oXewl1uGD1VDKag/OWfKvZR5giC5VJxkGcL IPl/NNKV6z0tDsZsQRczgtaDf/YXdibyAlpUngUSkvLwWPBA+rszvQfmfDPp2Pegnl0Pwg ru5JsPCVx+Nus8W4lTxBUTjo01+OphkDbexDXgl451eujeG4+Zm+edWMLaIXjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660416693; a=rsa-sha256; cv=none; b=YcF+2AjCDerqD3Op+L2/Rg8wqxY/HHvdTVHrEn3YvjtxGQDbseQdPt+n2WYorHyRvk1k/m HUSRTrQIq4afGx/wjYHo6FqkeTzPwA3GFEgvD4/2dVewvuN+rMjbfcaTAGiSO3p5Vre2IM 5DFAEADPaYheLO2uPssA+VeJVuFR3smZy/zITOdPmczCsrhCja/pILfNc7cxECqs9knmf/ U9vslA0aOSN4jlFN9jqGM8P0As/BhCmX3tPJjoS5cHRGoAN1eiIyGXlPVMxrzrmGTliNRb denkjTWuPMccnmehxnS6oQq+O1bpLkS4CVwMbCA96GoijKsq0WpjSnnWBcvHiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=714af13781970db3ec794eab4627d585b63df00a commit 714af13781970db3ec794eab4627d585b63df00a Author: Matthias Andree AuthorDate: 2022-08-13 17:20:29 +0000 Commit: Matthias Andree CommitDate: 2022-08-13 18:51:25 +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 --- 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 0638addb75a3..ec020d2659a9 100644 --- a/archivers/py-borgbackup/Makefile +++ b/archivers/py-borgbackup/Makefile @@ -13,7 +13,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 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. -