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 <daniel@makrotopia.org>
(cherry picked from commit ccd3b6c0a5e15822b66b07524639b24753f7aea3)

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-ed25519.patch b/lang/python/python-pynacl/patches/001-always-compile-ed25519.patch
new file mode 100644 (file)
index 0000000..274f1ab
--- /dev/null
+++ b/lang/python/python-pynacl/patches/001-always-compile-ed25519.patch
@@ -0,0 +1,22 @@
+--- a/src/bindings/minimal/crypto_scalarmult.h
++++ b/src/bindings/minimal/crypto_scalarmult.h
+@@ -13,7 +13,7 @@
+  * limitations under the License.
+  */
+ 
+-#ifdef SODIUM_LIBRARY_MINIMAL
++#if 0
+ 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;

diff --git a/lang/python/python-pynacl/patches/001-always-compile-scalar-mult-ed25519.patch b/lang/python/python-pynacl/patches/001-always-compile-scalar-mult-ed25519.patch
deleted file mode 100644 (file)
index 3a2571b..0000000
--- a/lang/python/python-pynacl/patches/001-always-compile-scalar-mult-ed25519.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/bindings/minimal/crypto_scalarmult.h
-+++ b/src/bindings/minimal/crypto_scalarmult.h
-@@ -13,7 +13,7 @@
-  * limitations under the License.
-  */
- 
--#ifdef SODIUM_LIBRARY_MINIMAL
-+#if 0
- static const int PYNACL_HAS_CRYPTO_SCALARMULT_ED25519 = 0;
- 
- size_t (*crypto_scalarmult_ed25519_bytes)() = NULL;