summaryrefslogtreecommitdiff
path: root/lang/python/python-pynacl
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2021-10-10 22:47:34 +0100
committerDaniel Golle <daniel@makrotopia.org>2021-10-10 22:51:37 +0100
commitccd3b6c0a5e15822b66b07524639b24753f7aea3 (patch)
treea6fb18c07adab8752e28cc6843aa219cd400163b /lang/python/python-pynacl
parent4a02b717238eb5df48a97815ea25aa541e905daa (diff)
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>
Diffstat (limited to 'lang/python/python-pynacl')
-rw-r--r--lang/python/python-pynacl/Makefile2
-rw-r--r--lang/python/python-pynacl/patches/001-always-compile-ed25519.patch (renamed from lang/python/python-pynacl/patches/001-always-compile-scalar-mult-ed25519.patch)11
2 files changed, 12 insertions, 1 deletions
diff --git a/lang/python/python-pynacl/Makefile b/lang/python/python-pynacl/Makefile
index fe637bb25..d45a307d5 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
index 3a2571b4c..274f1ab06 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;