From 8fe5bdf99bd3979ba0283814e47eefa7b794f8a4 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 20 Jul 2017 18:23:39 +0300 Subject: [PATCH 1/5] Merge pull request #8870 from sprohaska/p/mongodb-arbiter-login npm-mongo: Upgrade to npm mongo@2.2.29 to fix arbiter login attempts --- .../.npm/package/npm-shrinkwrap.json | 35 +++++++++++-------- packages/npm-mongo/package.js | 4 +-- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json index d916f66718..defa257e62 100644 --- a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json +++ b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json @@ -8,7 +8,7 @@ "buffer-shims": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz", - "from": "buffer-shims@>=1.0.0 <2.0.0" + "from": "buffer-shims@>=1.0.0 <1.1.0" }, "core-util-is": { "version": "1.0.2", @@ -31,14 +31,14 @@ "from": "isarray@>=1.0.0 <1.1.0" }, "mongodb": { - "version": "2.2.24", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.2.24.tgz", - "from": "mongodb@2.2.24" + "version": "2.2.30", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.2.30.tgz", + "from": "mongodb@2.2.30" }, "mongodb-core": { - "version": "2.1.8", - "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.8.tgz", - "from": "mongodb-core@2.1.8" + "version": "2.1.14", + "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.14.tgz", + "from": "mongodb-core@2.1.14" }, "process-nextick-args": { "version": "1.0.7", @@ -46,13 +46,13 @@ "from": "process-nextick-args@>=1.0.6 <1.1.0" }, "readable-stream": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz", - "from": "readable-stream@2.1.5" + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.7.tgz", + "from": "readable-stream@2.2.7" }, "require_optional": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.0.tgz", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz", "from": "require_optional@>=1.0.0 <1.1.0" }, "resolve-from": { @@ -60,15 +60,20 @@ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz", "from": "resolve-from@>=2.0.0 <3.0.0" }, + "safe-buffer": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", + "from": "safe-buffer@>=5.1.0 <5.2.0" + }, "semver": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", "from": "semver@>=5.1.0 <6.0.0" }, "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "from": "string_decoder@>=0.10.0 <0.11.0" + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "from": "string_decoder@>=1.0.0 <1.1.0" }, "util-deprecate": { "version": "1.0.2", diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js index a4a7395c5c..84b27a141b 100644 --- a/packages/npm-mongo/package.js +++ b/packages/npm-mongo/package.js @@ -3,12 +3,12 @@ Package.describe({ summary: "Wrapper around the mongo npm package", - version: '2.2.24', + version: '2.2.30', documentation: null }); Npm.depends({ - mongodb: "2.2.24" + mongodb: "2.2.30" }); Package.onUse(function (api) { From 6e0e4211b46de51c385b0564ab589458377beed9 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 20 Jul 2017 18:26:30 +0300 Subject: [PATCH 2/5] Un-pin version of `npm-mongo` used in `mongo` package. --- packages/mongo/package.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mongo/package.js b/packages/mongo/package.js index 74cc22955b..32af4fbe5d 100644 --- a/packages/mongo/package.js +++ b/packages/mongo/package.js @@ -21,7 +21,7 @@ Npm.strip({ }); Package.onUse(function (api) { - api.use('npm-mongo@2.2.24', 'server'); + api.use('npm-mongo', 'server'); api.use('allow-deny'); api.use([ From 55cb31a275b5f3d04514a5bf0a5bd6255268bd89 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 20 Jul 2017 18:27:33 +0300 Subject: [PATCH 3/5] Bump package version of `mongo` in preparation for publishing. --- packages/mongo/package.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mongo/package.js b/packages/mongo/package.js index 32af4fbe5d..d2496a5745 100644 --- a/packages/mongo/package.js +++ b/packages/mongo/package.js @@ -9,7 +9,7 @@ Package.describe({ summary: "Adaptor for using MongoDB and Minimongo over DDP", - version: '1.1.19' + version: '1.1.20' }); Npm.depends({ From 3fd393764be4fa9bd8afb4fb751be2b2ee918f41 Mon Sep 17 00:00:00 2001 From: Hugh Willson Date: Thu, 20 Jul 2017 15:11:31 -0400 Subject: [PATCH 4/5] Bump mongo version to replace currently broken 1.1.20 version. https://github.com/meteor/meteor/pull/8931 https://github.com/meteor/meteor/commit/cbeba459ab123854bc898c3348aae9dd3e91f6b3#commitcomment-23208660 --- packages/mongo/package.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mongo/package.js b/packages/mongo/package.js index d2496a5745..c69267436d 100644 --- a/packages/mongo/package.js +++ b/packages/mongo/package.js @@ -9,7 +9,7 @@ Package.describe({ summary: "Adaptor for using MongoDB and Minimongo over DDP", - version: '1.1.20' + version: '1.1.21' }); Npm.depends({ From 9b60256056885405a58452fefc6fe43ba281e837 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 21 Jul 2017 13:09:44 +0300 Subject: [PATCH 5/5] Bump package version of `mongo` in preparation for publishing. --- packages/mongo/package.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mongo/package.js b/packages/mongo/package.js index c69267436d..07b47ecff2 100644 --- a/packages/mongo/package.js +++ b/packages/mongo/package.js @@ -9,7 +9,7 @@ Package.describe({ summary: "Adaptor for using MongoDB and Minimongo over DDP", - version: '1.1.21' + version: '1.1.22' }); Npm.depends({