add upstreamm patch to ensure sodium_init can be run multiple time without failure

1 files changed, 28 insertions, 0 deletions

diff --git a/libsodium-upstream.patch b/libsodium-upstream.patch
new file mode 100644
index 0000000..711dc70
--- /dev/null
+++ b/libsodium-upstream.patch
@@ -0,0 +1,28 @@
+Adapted for 1.0.6 from upstream:
+
+
+
+From ecbf0f15206d6898b26fc4c12a5c03a2e1609995 Mon Sep 17 00:00:00 2001
+From: Frank Denis <github@pureftpd.org>
+Date: Fri, 18 Aug 2017 19:21:08 +0200
+Subject: [PATCH] If sodium_init() returns 1, this is fine.
+
+We actually want to do this so that multiple extensions using libsodium
+can be loaded simultaneously.
+---
+ libsodium.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libsodium.c b/libsodium.c
+index 6eb2234..9089a31 100644
+--- a/libsodium.c
++++ b/libsodium.c
+@@ -257,7 +257,7 @@ ZEND_GET_MODULE(libsodium)
+ 
+ PHP_MINIT_FUNCTION(libsodium)
+ {
+-    if (sodium_init() != 0) {
++    if (sodium_init() < 0) {
+         zend_error(E_ERROR, "sodium_init()");
+     }
+