From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 84C3313835A for ; Mon, 12 Apr 2021 13:20:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4FDDDE0866; Mon, 12 Apr 2021 13:20:41 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 39602E0841 for ; Mon, 12 Apr 2021 13:20:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A8CA3340CD2 for ; Mon, 12 Apr 2021 13:20:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1430959C for ; Mon, 12 Apr 2021 13:20:38 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1618233628.5a09551361bd28e2e8f248104a4656608800af61.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/libnacl/, dev-python/libnacl/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/libnacl/files/libnacl-1.7.2-32bit.patch dev-python/libnacl/libnacl-1.7.2-r1.ebuild dev-python/libnacl/libnacl-1.7.2.ebuild X-VCS-Directories: dev-python/libnacl/ dev-python/libnacl/files/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 5a09551361bd28e2e8f248104a4656608800af61 X-VCS-Branch: master Date: Mon, 12 Apr 2021 13:20:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8dff463f-e6fd-4374-899c-e26700d47d77 X-Archives-Hash: 2c543280aee0f7162d98087179e78ac7 commit: 5a09551361bd28e2e8f248104a4656608800af61 Author: Michał Górny gentoo org> AuthorDate: Mon Apr 12 13:11:49 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Apr 12 13:20:28 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a095513 dev-python/libnacl: Fix on 32-bit arches Closes: https://bugs.gentoo.org/768492 Signed-off-by: Michał Górny gentoo.org> dev-python/libnacl/files/libnacl-1.7.2-32bit.patch | 25 ++++++++++++++++++++++ ...ibnacl-1.7.2.ebuild => libnacl-1.7.2-r1.ebuild} | 4 ++++ 2 files changed, 29 insertions(+) diff --git a/dev-python/libnacl/files/libnacl-1.7.2-32bit.patch b/dev-python/libnacl/files/libnacl-1.7.2-32bit.patch new file mode 100644 index 00000000000..f8a06d27949 --- /dev/null +++ b/dev-python/libnacl/files/libnacl-1.7.2-32bit.patch @@ -0,0 +1,25 @@ +From f1567460f2d07822f2125778a55bf90b74ef807f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Mon, 12 Apr 2021 15:10:09 +0200 +Subject: [PATCH] Fix crypto_kdf_derive_from_key() on 32-bit platforms + +--- + libnacl/__init__.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libnacl/__init__.py b/libnacl/__init__.py +index 1aa722a..7649013 100644 +--- a/libnacl/__init__.py ++++ b/libnacl/__init__.py +@@ -1180,7 +1180,7 @@ def crypto_kdf_derive_from_key(subkey_size, subkey_id, context, master_key): + ''' + size = int(subkey_size) + buf = ctypes.create_string_buffer(size) +- nacl.crypto_kdf_derive_from_key(buf, subkey_size, subkey_id, context, master_key) ++ nacl.crypto_kdf_derive_from_key(buf, subkey_size, ctypes.c_ulonglong(subkey_id), context, master_key) + return buf.raw + + # Key Exchange API +-- +2.31.1 + diff --git a/dev-python/libnacl/libnacl-1.7.2.ebuild b/dev-python/libnacl/libnacl-1.7.2-r1.ebuild similarity index 91% rename from dev-python/libnacl/libnacl-1.7.2.ebuild rename to dev-python/libnacl/libnacl-1.7.2-r1.ebuild index 52fd6f2d3c6..614f90975ef 100644 --- a/dev-python/libnacl/libnacl-1.7.2.ebuild +++ b/dev-python/libnacl/libnacl-1.7.2-r1.ebuild @@ -17,6 +17,10 @@ KEYWORDS="amd64 ~arm ~x86" RDEPEND="dev-libs/libsodium" BDEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}"/libnacl-1.7.2-32bit.patch +) + python_test() { "${EPYTHON}" -m unittest discover -v -p 'test_*.py' tests/ || die "Tests failed with ${EPYTHON}" }