From ccd3b6c0a5e15822b66b07524639b24753f7aea3 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 10 Oct 2021 22:47:34 +0100 Subject: [PATCH] pynacl: fix build with updated sodium-minimal patch 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 --- lang/python/python-pynacl/Makefile | 2 +- ...ed25519.patch => 001-always-compile-ed25519.patch} | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) rename lang/python/python-pynacl/patches/{001-always-compile-scalar-mult-ed25519.patch => 001-always-compile-ed25519.patch} (52%) diff --git a/lang/python/python-pynacl/Makefile b/lang/python/python-pynacl/Makefile index fe637bb253..d45a307d52 100644 --- a/lang/python/python-pynacl/Makefile +++ b/lang/python/python-pynacl/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-pynacl PKG_VERSION:=1.4.0 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PYPI_NAME:=PyNaCl PKG_HASH:=54e9a2c849c742006516ad56a88f5c74bf2ce92c9f67435187c3c5953b346505 diff --git a/lang/python/python-pynacl/patches/001-always-compile-scalar-mult-ed25519.patch b/lang/python/python-pynacl/patches/001-always-compile-ed25519.patch similarity index 52% rename from lang/python/python-pynacl/patches/001-always-compile-scalar-mult-ed25519.patch rename to lang/python/python-pynacl/patches/001-always-compile-ed25519.patch index 3a2571b4cc..274f1ab06c 100644 --- a/lang/python/python-pynacl/patches/001-always-compile-scalar-mult-ed25519.patch +++ b/lang/python/python-pynacl/patches/001-always-compile-ed25519.patch @@ -9,3 +9,14 @@ static const int PYNACL_HAS_CRYPTO_SCALARMULT_ED25519 = 0; 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;