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 <redacted>

diff --git a/lang/python/python-pynacl/Makefile b/lang/python/python-pynacl/Makefile
index fe637bb253ab2e2b0e2223ff12efad463ddd2976..d45a307d52b17d3d300440e7918e32832b3d88cc 100644 (file)
--- 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 3a2571b4cc6d7f7e7bb369b5a7ab06091bfb9f8b..274f1ab06cfac95bdc667e8a10db4b5f8cf493be 100644 (file)
--- 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;