From 3ec09f996cad3cacb8d33bfe0331c6045066371c Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Wed, 22 Jun 2022 10:25:46 +0000 Subject: Adding metadata --- dev-python/libnacl/Manifest | 1 - 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.8.0.ebuild | 2 +- 4 files changed, 1 insertion(+), 53 deletions(-) delete mode 100644 dev-python/libnacl/files/libnacl-1.7.2-32bit.patch delete mode 100644 dev-python/libnacl/libnacl-1.7.2-r1.ebuild (limited to 'dev-python/libnacl') diff --git a/dev-python/libnacl/Manifest b/dev-python/libnacl/Manifest index b62fd3b8ac51..647e0d3abd16 100644 --- a/dev-python/libnacl/Manifest +++ b/dev-python/libnacl/Manifest @@ -1,2 +1 @@ -DIST libnacl-1.7.2.tar.gz 43343 BLAKE2B 4f7d03661e1385033c51821bf673c81ced11a1523b371ec7da42ed9cf75bdaadee1e679059dfae85871530652b5fea80bfb91c19a8a1eefb4ecf1b8661f11e19 SHA512 a4efbf73f73d9493ac365efa5a5bd6481f85ce4c880ad236bbf7478090bdea857e78e33e445c4e467d2a2032040863b835f32f9a942d2f1e467015bd76b0d469 DIST libnacl-1.8.0.gh.tar.gz 43351 BLAKE2B 4ba0ebcb50755d80418ffe7238c65d9309954cb2a0eac61937c488144b56093f3fcd87f0bf22a290c7b415c70cb781fbf7a2c608863d43694230fe34b3ad418e SHA512 7a39d646083591782691c4d58fd4d743b385ee553bcc4c4741707a237fa3b1213629b5070390526175bdfe8436859aa7711779ff8b22a981227edb30b94e82d6 diff --git a/dev-python/libnacl/files/libnacl-1.7.2-32bit.patch b/dev-python/libnacl/files/libnacl-1.7.2-32bit.patch deleted file mode 100644 index f8a06d27949a..000000000000 --- a/dev-python/libnacl/files/libnacl-1.7.2-32bit.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index 5971100d8c52..000000000000 --- a/dev-python/libnacl/libnacl-1.7.2-r1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9,10} ) -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 ~arm64 ~riscv 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.8.0.ebuild b/dev-python/libnacl/libnacl-1.8.0.ebuild index be648d7f1677..4e4e39061665 100644 --- a/dev-python/libnacl/libnacl-1.8.0.ebuild +++ b/dev-python/libnacl/libnacl-1.8.0.ebuild @@ -22,7 +22,7 @@ SRC_URI=" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~riscv x86" RDEPEND=" dev-libs/libsodium -- cgit v1.3