Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pynacl: fix build with updated sodium-minimal patch

Browse source 
Commit 3da874371 ("libsodium: include ed25519_core in minimal build")
broke the build of PyNaCl. Add patch to always include all ed25519
functions which are now always covered even if libsodium is built with
the MINIMAL option.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry picked from commit ccd3b6c0a5)
This commit is contained in:
Daniel Golle 2021-10-10 22:47:34 +01:00 committed by Josef Schlehofer
parent e6330a60e7
commit 78aa0f6cac
No known key found for this signature in database
GPG key ID: B950216FE4329F4C
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lang/python/python-pynacl/Makefile
View file

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=python-pynacl PKG_NAME:=python-pynacl
PKG_VERSION:=1.4.0 PKG_VERSION:=1.4.0
PKG_RELEASE:=5 PKG_RELEASE:=6
PYPI_NAME:=PyNaCl PYPI_NAME:=PyNaCl
PKG_HASH:=54e9a2c849c742006516ad56a88f5c74bf2ce92c9f67435187c3c5953b346505 PKG_HASH:=54e9a2c849c742006516ad56a88f5c74bf2ce92c9f67435187c3c5953b346505

11
lang/python/python-pynacl/patches/001-always-compile-scalar-mult-ed25519.patch → lang/python/python-pynacl/patches/001-always-compile-ed25519.patch
View file

@ -9,3 +9,14 @@
static const int PYNACL_HAS_CRYPTO_SCALARMULT_ED25519 = 0; static const int PYNACL_HAS_CRYPTO_SCALARMULT_ED25519 = 0;
size_t (*crypto_scalarmult_ed25519_bytes)() = NULL; size_t (*crypto_scalarmult_ed25519_bytes)() = NULL;
--- a/src/bindings/minimal/crypto_core.h
+++ b/src/bindings/minimal/crypto_core.h
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-#ifdef SODIUM_LIBRARY_MINIMAL
+#if 0
static const int PYNACL_HAS_CRYPTO_CORE_ED25519 = 0;
size_t (*crypto_core_ed25519_bytes)() = NULL;