From 79dfbd80168108750697e79b3470f916f85a8f01 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Wed, 5 Aug 2020 08:39:50 +0300 Subject: [PATCH] python-pynacl: fix build with new libsodium patch Fixes https://github.com/openwrt/packages/issues/13016 Patch [1] broke compilation for python-pynacl. The fix is to patch PyNaCl to consider that PYNACL_HAS_CRYPTO_SCALARMULT_ED25519 is always available. [1] https://github.com/openwrt/packages/commit/3ef28a4ab0cb60877c4ec68f5ba8c276021a1ab6 Signed-off-by: Alexandru Ardelean --- lang/python/python-pynacl/Makefile | 2 +- .../001-always-compile-scalar-mult-ed25519.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 lang/python/python-pynacl/patches/001-always-compile-scalar-mult-ed25519.patch diff --git a/lang/python/python-pynacl/Makefile b/lang/python/python-pynacl/Makefile index 69ed754dd..3d3d02a2e 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:=3 +PKG_RELEASE:=4 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-scalar-mult-ed25519.patch new file mode 100644 index 000000000..f1920e959 --- /dev/null +++ b/lang/python/python-pynacl/patches/001-always-compile-scalar-mult-ed25519.patch @@ -0,0 +1,13 @@ +diff --git a/src/bindings/minimal/crypto_scalarmult.h b/src/bindings/minimal/crypto_scalarmult.h +index 06ca1ef..9bc3d8e 100644 +--- 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;