From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- dev-python/libnacl/Manifest | 3 ++- dev-python/libnacl/files/libnacl-1.7.2-32bit.patch | 25 +++++++++++++++++++++ dev-python/libnacl/libnacl-1.7.2-r1.ebuild | 26 ++++++++++++++++++++++ dev-python/libnacl/libnacl-1.7.2.ebuild | 22 ------------------ 4 files changed, 53 insertions(+), 23 deletions(-) create mode 100644 dev-python/libnacl/files/libnacl-1.7.2-32bit.patch create mode 100644 dev-python/libnacl/libnacl-1.7.2-r1.ebuild delete mode 100644 dev-python/libnacl/libnacl-1.7.2.ebuild (limited to 'dev-python/libnacl') diff --git a/dev-python/libnacl/Manifest b/dev-python/libnacl/Manifest index 6bdf7fdb36f9..ed157f326e1b 100644 --- a/dev-python/libnacl/Manifest +++ b/dev-python/libnacl/Manifest @@ -1,5 +1,6 @@ +AUX libnacl-1.7.2-32bit.patch 890 BLAKE2B 40afbe3e71b550da59b9c26c2834ea72b151d847605572bec3b149edf714125698014a8e30c2e8d9c49cca489564ccf5fbdf0f7033caea528ee588716e222a2b SHA512 8ee93b8dcb23228b3f294a947a54f49afd9fc4dc9207fe999ca7349868cfc05741ea8cab004087c3f0544436fb445ea3f513b574076f6350b2390415a3be7426 DIST libnacl-1.6.1.tar.gz 39789 BLAKE2B 7c73f67d4faec8d6e53df21eb3c394d4f36754cd9ad1dfa63ef45aab43bb1832cace7446688b2b29b9923539e00d59f3a78c719b8b8770b2c6c217db19dd2f6d SHA512 90fd9302cdfbe84acfc7dff0ac95eeb05fd1bb346cd8b220613174d5d1ae5f627be06b4d588fd4a939c49a119ca557d68a06d3cbe1c0d409a253fdca96d944ac DIST libnacl-1.7.2.tar.gz 43343 BLAKE2B 4f7d03661e1385033c51821bf673c81ced11a1523b371ec7da42ed9cf75bdaadee1e679059dfae85871530652b5fea80bfb91c19a8a1eefb4ecf1b8661f11e19 SHA512 a4efbf73f73d9493ac365efa5a5bd6481f85ce4c880ad236bbf7478090bdea857e78e33e445c4e467d2a2032040863b835f32f9a942d2f1e467015bd76b0d469 EBUILD libnacl-1.6.1.ebuild 537 BLAKE2B ffafbfa23c490bf55d27d4562186d7858120b229e2a34373cac604cfdbe70861b73949c6ed14379b238ec07f6273e3bdd4c4188da2d31aa567ccac0c624c1d08 SHA512 2a064bb0ff321e00f4d3bf731ba074fa442f204733cb7ab4e656c622af2bccdbe1ba7d62a8bbcebb83c6ff376706d87981b4c002fba90cf6bf274d1ea4e60a6f -EBUILD libnacl-1.7.2.ebuild 570 BLAKE2B b6b5223ad1e606e7ffcdcd648ccd2b85707b15657a73df6eedc4b44670647c4a2f9748a7f685b7b97effa69892a33b4417f83e0ce2bdac315c9b95cb53c6892d SHA512 ad562c10146278a1ba0c404d33901c07c2273dbac478aa9a598ca873791b9123bc87a4fb4850674d8020b42943d823f7c80b5a24f2fffa2fc6757cacbc338055 +EBUILD libnacl-1.7.2-r1.ebuild 624 BLAKE2B c87aec1f0fe388ffa36db73124420cf0059d444f1e730c88382e452c2ed45541e8608517f024ea30db4071e0acccd6ea4948cc8d786ad3b63ad428d3faddbdee SHA512 94b678b892dbd5f52c7eb6f430c35219274a29f4dfb39c131c366012c269df356409ec2f1011f08bf3789e197046783ceaa25d7dc9899078dce947eccb239b58 MISC metadata.xml 495 BLAKE2B e77a0ee4b63cdc8594ff6dff8416db824eaf4a3fa50f143bcaf2c71b5e216078cd41ece0aad491240392896a06bf4dfb7f73dbd1e7e504999e1c32b642910537 SHA512 dd1c019a0685be6b3e1b6f124feeb0dd6ea0678e1f243504565bf467c62c3bbf4901990692b559c1e869d08bc4ee6338b8d7ae41410bc6a2d904d53283fd49b2 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 000000000000..f8a06d27949a --- /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-r1.ebuild b/dev-python/libnacl/libnacl-1.7.2-r1.ebuild new file mode 100644 index 000000000000..614f90975ef6 --- /dev/null +++ b/dev-python/libnacl/libnacl-1.7.2-r1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=(python3_{7..9}) +inherit distutils-r1 + +DESCRIPTION="Python ctypes wrapper for libsodium" +HOMEPAGE="https://libnacl.readthedocs.org/" +SRC_URI="https://github.com/saltstack/libnacl/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +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}" +} diff --git a/dev-python/libnacl/libnacl-1.7.2.ebuild b/dev-python/libnacl/libnacl-1.7.2.ebuild deleted file mode 100644 index 52fd6f2d3c6e..000000000000 --- a/dev-python/libnacl/libnacl-1.7.2.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=(python3_{7..9}) -inherit distutils-r1 - -DESCRIPTION="Python ctypes wrapper for libsodium" -HOMEPAGE="https://libnacl.readthedocs.org/" -SRC_URI="https://github.com/saltstack/libnacl/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm ~x86" - -RDEPEND="dev-libs/libsodium" -BDEPEND="${RDEPEND}" - -python_test() { - "${EPYTHON}" -m unittest discover -v -p 'test_*.py' tests/ || die "Tests failed with ${EPYTHON}" -} -- cgit v1.2.3