2 files changed, 69 insertions, 0 deletions
diff --git a/library/sodium-plus/build/pre-build.patch b/library/sodium-plus/build/pre-build.patch
new file mode 100644
index 000000000..d6304bf65
--- /dev/null
+++ b/library/sodium-plus/build/pre-build.patch
@@ -0,0 +1,57 @@
+diff --git a/lib/backend/sodiumnative.js b/lib/backend/sodiumnative.js
+index a592b10..f268085 100644
+--- a/lib/backend/sodiumnative.js
++++ b/lib/backend/sodiumnative.js
+@@ -1,12 +1,5 @@
+ let loaded = false;
+-let _sodium;
+-/* istanbul ignore next */
+-try {
+-    _sodium = require('sodium-native');
+-    loaded = true;
+-} catch (e) {
+-    _sodium = {};
+-}
++let _sodium = {};
+ const Backend = require('../backend');
+ const CryptographyKey = require('../cryptography-key');
+ const SodiumError = require('../sodium-error');
+diff --git a/lib/sodiumplus.js b/lib/sodiumplus.js
+index a592b10..f268085 100644
+--- a/lib/sodiumplus.js
++++ b/lib/sodiumplus.js
+@@ -4,7 +4,6 @@
+ const Ed25519PublicKey = require('./keytypes/ed25519pk');
+ const LibsodiumWrappersBackend = require('./backend/libsodium-wrappers');
+ const SodiumError = require('./sodium-error');
+-const SodiumNativeBackend = require('./backend/sodiumnative');
+ const X25519PublicKey = require('./keytypes/x25519pk');
+ const X25519SecretKey = require('./keytypes/x25519sk');
+ const Util = require('./util');
+@@ -41,7 +40,7 @@
+      * @return {boolean}
+      */
+     isSodiumNative() {
+-        return (this.backend instanceof SodiumNativeBackend);
++        return false;
+     }
+ 
+     /**
+@@ -60,16 +59,7 @@
+      * @return {Promise<SodiumPlus>}
+      */
+     static async auto() {
+-        let backend;
+-        try {
+-            backend = await SodiumNativeBackend.init();
+-        } catch (e) {
+-            backend = await LibsodiumWrappersBackend.init();
+-        }
+-        /* istanbul ignore if */
+-        if (!backend) {
+-            backend = await LibsodiumWrappersBackend.init();
+-        }
++        let backend = await LibsodiumWrappersBackend.init();
+         Util.populateConstants(backend);
+         return new SodiumPlus(backend);
+     }
diff --git a/library/sodium-plus/build/remove-sodium-native.sh b/library/sodium-plus/build/remove-sodium-native.sh
new file mode 100644
index 000000000..f09a5b274
--- /dev/null
+++ b/library/sodium-plus/build/remove-sodium-native.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+basedir=$(dirname $(readlink -f ${BASH_SOURCE[0]}))
+path="${basedir}/pre-build.patch"
+
+git apply --check "${path}"
+ret=$?
+if [[ $ret -ne 0 ]]; then
+  exit "${ret}"
+fi
+git apply "${path}"
+ret=$?
+exit $ret