From 0ee7ffb5e5d64cc7ccd0e841a456dab34a61cfcc Mon Sep 17 00:00:00 2001
From: mw75 <wolfshoehle@googlemail.com>
Date: Mon, 15 May 2017 14:57:35 +0200
Subject: [PATCH 1/3] Version check no meta (#1243)

* Version check on module loading - remove all metadata information bevor comparing the versions.

* refined regex
---
 red/runtime/nodes/registry/loader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/red/runtime/nodes/registry/loader.js b/red/runtime/nodes/registry/loader.js
index 124fd8e2e..817b18668 100644
--- a/red/runtime/nodes/registry/loader.js
+++ b/red/runtime/nodes/registry/loader.js
@@ -116,7 +116,7 @@ function loadNodeFiles(nodeFiles) {
         /* istanbul ignore else */
         if (nodeFiles.hasOwnProperty(module)) {
             if (nodeFiles[module].redVersion &&
-                !semver.satisfies(runtime.version().replace("-git",""), nodeFiles[module].redVersion)) {
+                !semver.satisfies(runtime.version().replace(/(\-[1-9A-Za-z-][0-9A-Za-z-\.]*)?(\+[0-9A-Za-z-\.]+)?$/,""), nodeFiles[module].redVersion)) {
                 //TODO: log it
                 runtime.log.warn("["+module+"] "+runtime.log._("server.node-version-mismatch",{version:nodeFiles[module].redVersion}));
                 continue;

From adebdf36a5458356d59c260c5e242cf453deb47c Mon Sep 17 00:00:00 2001
From: Simon Asp <simpasp@gmail.com>
Date: Sun, 18 Jun 2017 12:55:39 +0200
Subject: [PATCH 2/3] Bug fix in exec node. White spaces in arguments now works
 (#1285)

---
 nodes/core/core/75-exec.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nodes/core/core/75-exec.js b/nodes/core/core/75-exec.js
index 8205edfef..8bfc16fcd 100644
--- a/nodes/core/core/75-exec.js
+++ b/nodes/core/core/75-exec.js
@@ -46,10 +46,11 @@ module.exports = function(RED) {
                 var arg = node.cmd;
                 if ((node.addpay === true) && msg.hasOwnProperty("payload")) { arg += " "+msg.payload; }
                 if (node.append.trim() !== "") { arg += " "+node.append; }
-                // slice whole line by spaces (trying to honour quotes);
-                arg = arg.match(/(?:[^\s"]+|"[^"]*")+/g);
+                // slice whole line by spaces and removes any quotes since spawn can't handle them
+                arg = arg.match(/(?:[^\s"]+|"[^"]*")+/g).map((a) => {
+                  if (/^".*"$/.test(a)) { return a.slice(1,-1)} else {return a};
+                });
                 var cmd = arg.shift();
-                if (/^".*"$/.test(cmd)) { cmd = cmd.slice(1,-1); }
                 /* istanbul ignore else  */
                 if (RED.settings.verbose) { node.log(cmd+" ["+arg+"]"); }
                 child = spawn(cmd,arg);

From 9cd751e97700fbb69ad774ca6b998806ea04fab1 Mon Sep 17 00:00:00 2001
From: Chaya Stern <chayas@3base.co.il>
Date: Mon, 26 Jun 2017 12:07:44 +0300
Subject: [PATCH 3/3] Fix bug: Export Subflows (#1282)

* fix bug with export subflows

* fix bug with export config-nodes
---
 editor/js/nodes.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/editor/js/nodes.js b/editor/js/nodes.js
index 40e9806ba..07f77b9e0 100644
--- a/editor/js/nodes.js
+++ b/editor/js/nodes.js
@@ -508,10 +508,10 @@ RED.nodes = (function() {
     /**
      * Converts the current node selection to an exportable JSON Object
      **/
-    function createExportableNodeSet(set) {
+    function createExportableNodeSet(set, exportedSubflows, exportedConfigNodes) {
         var nns = [];
-        var exportedConfigNodes = {};
-        var exportedSubflows = {};
+        exportedConfigNodes = exportedConfigNodes || {};
+        exportedSubflows = exportedSubflows || {};
         for (var n=0;n<set.length;n++) {
             var node = set[n];
             if (node.type.substring(0,8) == "subflow:") {
@@ -525,7 +525,7 @@ RED.nodes = (function() {
                             subflowSet.push(n);
                         }
                     });
-                    var exportableSubflow = createExportableNodeSet(subflowSet);
+                    var exportableSubflow = createExportableNodeSet(subflowSet, exportedSubflows, exportedConfigNodes);
                     nns = exportableSubflow.concat(nns);
                 }
             }