Merge branch 'dev-bundle-bump' into devel

History.md

@@ -12,6 +12,7 @@
 * When validateLoginAttempt callbacks return false, don't override a more
   specific error message.
 
+* Upgrade Node.js from 0.10.25 to 0.10.26.
 
 ## v0.8.0
 

docs/client/concepts.html

@@ -741,7 +741,7 @@ <h3 class="nosection">Running on your own infrastructure</h3>
 This command will generate a fully-contained Node.js application in the form of
 a tarball.  To run this application, you need to provide Node.js 0.10 and a
 MongoDB server.  (The current release of Meteor has been tested with Node
-0.10.25; older versions contain a serious bug that can cause production servers
+0.10.26; older versions contain a serious bug that can cause production servers
 to stall.) You can then run the application by invoking node, specifying the
 HTTP port for the application to listen on, and the MongoDB endpoint.  If
 you don't already have a MongoDB server, we can recommend our friends at

meteor

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-BUNDLE_VERSION=0.3.33
+BUNDLE_VERSION=0.3.34
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

scripts/generate-dev-bundle.sh

@@ -76,7 +76,7 @@ cd node
 # When upgrading node versions, also update the values of MIN_NODE_VERSION at
 # the top of tools/meteor.js and tools/server/boot.js, and the text in
 # docs/client/concepts.html and the README in tools/bundler.js.
-git checkout v0.10.25
+git checkout v0.10.26
 
 ./configure --prefix="$DIR"
 make -j4
@@ -107,6 +107,7 @@ npm install [email protected]
 npm install [email protected]
 npm install [email protected]
 npm install [email protected]
+npm install [email protected]
 npm install [email protected]
 
 # Fork of 1.0.2 with https://github.com/nodejitsu/node-http-proxy/pull/592
@@ -141,7 +142,7 @@ cd ../..
 # particular version of openssl on the host system.
 
 cd "$DIR/build"
-OPENSSL="openssl-1.0.1f"
+OPENSSL="openssl-1.0.1g"
 OPENSSL_URL="http://www.openssl.org/source/$OPENSSL.tar.gz"
 wget $OPENSSL_URL || curl -O $OPENSSL_URL
 tar xzf $OPENSSL.tar.gz

tools/bundler.js

@@ -1537,7 +1537,7 @@ var writeSiteArchive = function (targets, outputPath, options) {
 
       builder.write('README', { data: new Buffer(
 "This is a Meteor application bundle. It has only one dependency:\n" +
-"Node.js 0.10.25 or newer, plus the 'fibers' module. To run the application:\n" +
+"Node.js 0.10.26 or newer, plus the 'fibers' module. To run the application:\n" +
 "\n" +
 "  $ rm -r programs/server/node_modules/fibers\n" +
 "  $ npm install [email protected]\n" +

tools/main.js

@@ -330,7 +330,7 @@ Fiber(function () {
 
   // Check required Node version.
   // This code is duplicated in tools/server/boot.js.
-  var MIN_NODE_VERSION = 'v0.10.25';
+  var MIN_NODE_VERSION = 'v0.10.26';
   if (require('semver').lt(process.version, MIN_NODE_VERSION)) {
     process.stderr.write(
       'Meteor requires Node ' + MIN_NODE_VERSION + ' or later.\n');

tools/server/boot.js

@@ -5,8 +5,8 @@ var Future = require(path.join("fibers", "future"));
 var _ = require('underscore');
 var sourcemap_support = require('source-map-support');
 
-// This code is duplicated in tools/meteor.js.
-var MIN_NODE_VERSION = 'v0.10.25';
+// This code is duplicated in tools/main.js.
+var MIN_NODE_VERSION = 'v0.10.26';
 
 if (require('semver').lt(process.version, MIN_NODE_VERSION)) {
   process.stderr.write(