diff -Nru nodejs-0.10.28/AUTHORS nodejs-0.10.29/AUTHORS --- nodejs-0.10.28/AUTHORS 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/AUTHORS 2014-06-09 17:04:36.000000000 +0000 @@ -500,3 +500,7 @@ Josh Dague Goh Yisheng (Andrew) William Bert +Greg Sabia Tucker +Calvin Metcalf +cjihrig +Chris Barber diff -Nru nodejs-0.10.28/ChangeLog nodejs-0.10.29/ChangeLog --- nodejs-0.10.28/ChangeLog 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/ChangeLog 2014-06-09 17:04:36.000000000 +0000 @@ -1,4 +1,32 @@ -2014.05.01, Version 0.10.28 (Stable) +2014.06.05, Version 0.10.29 (Stable) + +* openssl: to 1.0.1h (CVE-2014-0224) + +* npm: upgrade to 1.4.10 + +* utf8: Prevent Node from sending invalid UTF-8 (Felix Geisendörfer) + - *NOTE* this introduces a breaking change, previously you could construct + invalid UTF-8 and invoke an error in a client that was expecting valid + UTF-8, now unmatched surrogate pairs are replaced with the unknown UTF-8 + character. To restore the old functionality simply have NODE_INVALID_UTF8 + environment variable set. + +* child_process: do not set args before throwing (Greg Sabia Tucker) + +* child_process: spawn() does not throw TypeError (Greg Sabia Tucker) + +* constants: export O_NONBLOCK (Fedor Indutny) + +* crypto: improve memory usage (Alexis Campailla) + +* fs: close file if fstat() fails in readFile() (cjihrig) + +* lib: name EventEmitter prototype methods (Ben Noordhuis) + +* tls: fix performance issue (Alexis Campailla) + + +2014.05.01, Version 0.10.28 (Stable), b148cbe09d4657766fdb61575ba985734c2ff0a8 * npm: upgrade to v1.4.9 diff -Nru nodejs-0.10.28/common.gypi nodejs-0.10.29/common.gypi --- nodejs-0.10.28/common.gypi 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/common.gypi 2014-06-09 17:04:36.000000000 +0000 @@ -1,13 +1,13 @@ { 'variables': { - 'werror': '', # Turn off -Werror in V8 build. - 'visibility%': 'hidden', # V8's visibility setting - 'target_arch%': 'ia32', # set v8's target architecture - 'host_arch%': 'ia32', # set v8's host architecture - 'want_separate_host_toolset': 0, # V8 should not build target and host - 'library%': 'static_library', # allow override to 'shared_library' for DLL/.so builds - 'component%': 'static_library', # NB. these names match with what V8 expects - 'msvs_multi_core_compile': '0', # we do enable multicore compiles, but not using the V8 way + 'werror': '', # Turn off -Werror in V8 build. + 'visibility%': 'hidden', # V8's visibility setting + 'target_arch%': 'ia32', # set v8's target architecture + 'host_arch%': 'ia32', # set v8's host architecture + 'want_separate_host_toolset%': 0, # V8 should not build target and host + 'library%': 'static_library', # allow override to 'shared_library' for DLL/.so builds + 'component%': 'static_library', # NB. these names match with what V8 expects + 'msvs_multi_core_compile': '0', # we do enable multicore compiles, but not using the V8 way 'gcc_version%': 'unknown', 'clang%': 0, 'python%': 'python', diff -Nru nodejs-0.10.28/configure nodejs-0.10.29/configure --- nodejs-0.10.28/configure 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/configure 2014-06-09 17:04:36.000000000 +0000 @@ -471,6 +471,9 @@ o['variables']['host_arch'] = host_arch o['variables']['target_arch'] = target_arch + if target_arch != host_arch and not options.without_snapshot: + o['variables']['want_separate_host_toolset'] = 1 + if target_arch == 'arm': configure_arm(o) elif target_arch in ('mips', 'mipsel'): diff -Nru nodejs-0.10.28/debian/changelog nodejs-0.10.29/debian/changelog --- nodejs-0.10.28/debian/changelog 2014-05-03 02:21:02.000000000 +0000 +++ nodejs-0.10.29/debian/changelog 2014-06-19 18:35:53.000000000 +0000 @@ -1,3 +1,9 @@ +nodejs (0.10.29-1chl1~saucy1) saucy; urgency=low + + * 0.10.29 (stable) release. + + -- Chris Lea Thu, 19 Jun 2014 11:34:52 -0700 + nodejs (0.10.28-1chl1~saucy1) saucy; urgency=low * 0.10.28 (stable) release. diff -Nru nodejs-0.10.28/deps/npm/bin/npm nodejs-0.10.29/deps/npm/bin/npm --- nodejs-0.10.28/deps/npm/bin/npm 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/bin/npm 2014-06-09 17:04:36.000000000 +0000 @@ -1,4 +1,5 @@ #!/bin/sh +(set -o igncr) 2>/dev/null && set -o igncr; # cygwin encoding fix basedir=`dirname "$0"` diff -Nru nodejs-0.10.28/deps/npm/doc/api/npm-cache.md nodejs-0.10.29/deps/npm/doc/api/npm-cache.md --- nodejs-0.10.28/deps/npm/doc/api/npm-cache.md 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/doc/api/npm-cache.md 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,30 @@ +npm-cache(3) -- manage the npm cache programmatically +===================================================== + +## SYNOPSIS + + npm.commands.cache([args], callback) + + // helpers + npm.commands.cache.clean([args], callback) + npm.commands.cache.add([args], callback) + npm.commands.cache.read(name, version, forceBypass, callback) + +## DESCRIPTION + +This acts much the same ways as the npm-cache(1) command line +functionality. + +The callback is called with the package.json data of the thing that is +eventually added to or read from the cache. + +The top level `npm.commands.cache(...)` functionality is a public +interface, and like all commands on the `npm.commands` object, it will +match the command line behavior exactly. + +However, the cache folder structure and the cache helper functions are +considered **internal** API surface, and as such, may change in future +releases of npm, potentially without warning or significant version +incrementation. + +Use at your own risk. diff -Nru nodejs-0.10.28/deps/npm/doc/cli/npm-cache.md nodejs-0.10.29/deps/npm/doc/cli/npm-cache.md --- nodejs-0.10.28/deps/npm/doc/cli/npm-cache.md 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/doc/cli/npm-cache.md 2014-06-09 17:04:36.000000000 +0000 @@ -37,16 +37,14 @@ For each package that is added to the cache, three pieces of information are stored in `{cache}/{name}/{version}`: -* .../package/: - A folder containing the package contents as they appear in the tarball. -* .../package.json: - The package.json file, as npm sees it, with overlays applied and a _id attribute. +* .../package/package.json: + The package.json file, as npm sees it. * .../package.tgz: The tarball for that version. Additionally, whenever a registry request is made, a `.cache.json` file is placed at the corresponding URI, to store the ETag and the requested -data. +data. This is stored in `{cache}/{hostname}/{path}/.cache.json`. Commands that make non-essential registry requests (such as `search` and `view`, or the completion scripts) generally specify a minimum timeout. diff -Nru nodejs-0.10.28/deps/npm/doc/cli/npm.md nodejs-0.10.29/deps/npm/doc/cli/npm.md --- nodejs-0.10.28/deps/npm/doc/cli/npm.md 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/doc/cli/npm.md 2014-06-09 17:04:36.000000000 +0000 @@ -31,6 +31,22 @@ Use the `npm search` command to show everything that's available. Use `npm ls` to show everything you've installed. +## DEPENDENCIES + +If a package references to another package with a git URL, npm depends +on a preinstalled git. + +If one of the packages npm tries to install is a native node module and +requires compiling of C++ Code, npm will use +[node-gyp](https://github.com/TooTallNate/node-gyp) for that task. +For a Unix system, [node-gyp](https://github.com/TooTallNate/node-gyp) +needs Python, make and a buildchain like GCC. On Windows, +Python and Microsoft Visual Studio C++ is needed. Python 3 is +not supported by [node-gyp](https://github.com/TooTallNate/node-gyp). +For more information visit +[the node-gyp repository](https://github.com/TooTallNate/node-gyp) and +the [node-gyp Wiki](https://github.com/TooTallNate/node-gyp/wiki). + ## DIRECTORIES See `npm-folders(5)` to learn about where npm puts stuff. diff -Nru nodejs-0.10.28/deps/npm/doc/cli/npm-run-script.md nodejs-0.10.29/deps/npm/doc/cli/npm-run-script.md --- nodejs-0.10.28/deps/npm/doc/cli/npm-run-script.md 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/doc/cli/npm-run-script.md 2014-06-09 17:04:36.000000000 +0000 @@ -3,13 +3,15 @@ ## SYNOPSIS - npm run-script [] + npm run-script [] [command] + npm run [] [command] ## DESCRIPTION This runs an arbitrary command from a package's `"scripts"` object. If no package name is provided, it will search for a `package.json` -in the current folder and use its `"scripts"` object. +in the current folder and use its `"scripts"` object. If no `"command"` +is provided, it will list the available top level scripts. It is used by the test, start, restart, and stop commands, but can be called directly, as well. diff -Nru nodejs-0.10.28/deps/npm/doc/files/npmrc.md nodejs-0.10.29/deps/npm/doc/files/npmrc.md --- nodejs-0.10.28/deps/npm/doc/files/npmrc.md 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/doc/files/npmrc.md 2014-06-09 17:04:36.000000000 +0000 @@ -13,8 +13,9 @@ ## FILES -The three relevant files are: +The four relevant files are: +* per-project config file (/path/to/my/project/.npmrc) * per-user config file (~/.npmrc) * global config file ($PREFIX/npmrc) * npm builtin config file (/path/to/npm/npmrc) @@ -29,6 +30,17 @@ priority order. For example, a setting in the userconfig file would override the setting in the globalconfig file. +### Per-project config file + +When working locally in a project, a `.npmrc` file in the root of the +project (ie, a sibling of `node_modules` and `package.json`) will set +config values specific to this project. + +Note that this only applies to the root of the project that you're +running npm in. It has no effect when your module is published. For +example, you can't publish a module that forces itself to install +globally, or in a different location. + ### Per-user config file `$HOME/.npmrc` (or the `userconfig` param, if set in the environment diff -Nru nodejs-0.10.28/deps/npm/doc/misc/npm-config.md nodejs-0.10.29/deps/npm/doc/misc/npm-config.md --- nodejs-0.10.28/deps/npm/doc/misc/npm-config.md 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/doc/misc/npm-config.md 2014-06-09 17:04:36.000000000 +0000 @@ -24,8 +24,9 @@ ### npmrc Files -The three relevant files are: +The four relevant files are: +* per-project config file (/path/to/my/project/.npmrc) * per-user config file (~/.npmrc) * global config file ($PREFIX/npmrc) * npm builtin config file (/path/to/npm/npmrc) @@ -712,6 +713,17 @@ Note that git requires you to have set up GPG keys in your git configs for this to work properly. +### spin + +* Default: true +* Type: Boolean or `"always"` + +When set to `true`, npm will display an ascii spinner while it is doing +things, if `process.stderr` is a TTY. + +Set to `false` to suppress the spinner, or set to `always` to output +the spinner even for non-TTY outputs. + ### strict-ssl * Default: true diff -Nru nodejs-0.10.28/deps/npm/doc/misc/npm-faq.md nodejs-0.10.29/deps/npm/doc/misc/npm-faq.md --- nodejs-0.10.28/deps/npm/doc/misc/npm-faq.md 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/doc/misc/npm-faq.md 2014-06-09 17:04:36.000000000 +0000 @@ -258,7 +258,7 @@ configuration settings, so this would be rather difficult to do properly. It would have to track every previous value for this config, and always accept any of them, or else yesterday's install may -be broken tomorrow. Complexity hurdle #5. +be broken tomorrow. Complexity hurdle #4. Never going to happen. The folder is named `node_modules`. It is written indelibly in the Node Way, handed down from the ancient times @@ -340,7 +340,7 @@ The npm open source project, The npm Registry, and [the community website](https://www.npmjs.org) are maintained and operated by the -good folks at [npm, Inc.](https://www.npmjs.com) +good folks at [npm, Inc.](http://www.npmjs.com) ## I have a question or request not addressed here. Where should I put it? diff -Nru nodejs-0.10.28/deps/npm/doc/misc/npm-index.md nodejs-0.10.29/deps/npm/doc/misc/npm-index.md --- nodejs-0.10.28/deps/npm/doc/misc/npm-index.md 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/doc/misc/npm-index.md 2014-06-09 17:04:36.000000000 +0000 @@ -209,6 +209,10 @@ Bugs for a package in a web browser maybe +## npm-cache(3) + +manage the npm cache programmatically + ## npm-commands(3) npm commands diff -Nru nodejs-0.10.28/deps/npm/doc/misc/npm-scripts.md nodejs-0.10.29/deps/npm/doc/misc/npm-scripts.md --- nodejs-0.10.28/deps/npm/doc/misc/npm-scripts.md 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/doc/misc/npm-scripts.md 2014-06-09 17:04:36.000000000 +0000 @@ -34,7 +34,7 @@ stop and start scripts if no `restart` script is provided. Additionally, arbitrary scripts can be run by doing -`npm run-script `. +`npm run-script `. ## NOTE: INSTALL SCRIPTS ARE AN ANTIPATTERN diff -Nru nodejs-0.10.28/deps/npm/doc/misc/semver.md nodejs-0.10.29/deps/npm/doc/misc/semver.md --- nodejs-0.10.28/deps/npm/doc/misc/semver.md 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/doc/misc/semver.md 2014-06-09 17:04:36.000000000 +0000 @@ -34,7 +34,7 @@ ## Versions -A "version" is described by the v2.0.0 specification found at +A "version" is described by the `v2.0.0` specification found at . A leading `"="` or `"v"` character is stripped off and ignored. @@ -43,9 +43,10 @@ The following range styles are supported: -* `1.2.3` A specific version. When nothing else will do. Note that - build metadata is still ignored, so `1.2.3+build2012` will satisfy - this range. +* `1.2.3` A specific version. When nothing else will do. Must be a full + version number, with major, minor, and patch versions specified. + Note that build metadata is still ignored, so `1.2.3+build2012` will + satisfy this range. * `>1.2.3` Greater than a specific version. * `<1.2.3` Less than a specific version. If there is no prerelease tag on the version range, then no prerelease version will be allowed @@ -56,26 +57,33 @@ * `<=1.2.3` Less than or equal to. In this case, prerelease versions ARE allowed, so `1.2.3-beta` would satisfy. * `1.2.3 - 2.3.4` := `>=1.2.3 <=2.3.4` -* `~1.2.3` := `>=1.2.3-0 <1.3.0-0` "Reasonably close to 1.2.3". When +* `~1.2.3` := `>=1.2.3-0 <1.3.0-0` "Reasonably close to `1.2.3`". When using tilde operators, prerelease versions are supported as well, but a prerelease of the next significant digit will NOT be satisfactory, so `1.3.0-beta` will not satisfy `~1.2.3`. -* `^1.2.3` := `>=1.2.3-0 <2.0.0-0` "Compatible with 1.2.3". When +* `^1.2.3` := `>=1.2.3-0 <2.0.0-0` "Compatible with `1.2.3`". When using caret operators, anything from the specified version (including prerelease) will be supported up to, but not including, the next major version (or its prereleases). `1.5.1` will satisfy `^1.2.3`, while `1.2.2` and `2.0.0-beta` will not. -* `^0.1.3` := `>=0.1.3-0 <0.2.0-0` "Compatible with 0.1.3". 0.x.x versions are +* `^0.1.3` := `>=0.1.3-0 <0.2.0-0` "Compatible with `0.1.3`". `0.x.x` versions are special: the first non-zero component indicates potentially breaking changes, meaning the caret operator matches any version with the same first non-zero component starting at the specified version. -* `^0.0.2` := `=0.0.2` "Only the version 0.0.2 is considered compatible" -* `~1.2` := `>=1.2.0-0 <1.3.0-0` "Any version starting with 1.2" -* `^1.2` := `>=1.2.0-0 <2.0.0-0` "Any version compatible with 1.2" -* `1.2.x` := `>=1.2.0-0 <1.3.0-0` "Any version starting with 1.2" -* `~1` := `>=1.0.0-0 <2.0.0-0` "Any version starting with 1" -* `^1` := `>=1.0.0-0 <2.0.0-0` "Any version compatible with 1" -* `1.x` := `>=1.0.0-0 <2.0.0-0` "Any version starting with 1" +* `^0.0.2` := `=0.0.2` "Only the version `0.0.2` is considered compatible" +* `~1.2` := `>=1.2.0-0 <1.3.0-0` "Any version starting with `1.2`" +* `^1.2` := `>=1.2.0-0 <2.0.0-0` "Any version compatible with `1.2`" +* `1.2.x` := `>=1.2.0-0 <1.3.0-0` "Any version starting with `1.2`" +* `1.2.*` Same as `1.2.x`. +* `1.2` Same as `1.2.x`. +* `~1` := `>=1.0.0-0 <2.0.0-0` "Any version starting with `1`" +* `^1` := `>=1.0.0-0 <2.0.0-0` "Any version compatible with `1`" +* `1.x` := `>=1.0.0-0 <2.0.0-0` "Any version starting with `1`" +* `1.*` Same as `1.x`. +* `1` Same as `1.x`. +* `*` Any version whatsoever. +* `x` Same as `*`. +* `""` (just an empty string) Same as `*`. Ranges can be joined with either a space (which implies "and") or a @@ -90,42 +98,50 @@ Strict-mode Comparators and Ranges will be strict about the SemVer strings that they parse. -* valid(v): Return the parsed version, or null if it's not valid. -* inc(v, release): Return the version incremented by the release type - (major, minor, patch, or prerelease), or null if it's not valid. +* `valid(v)`: Return the parsed version, or null if it's not valid. +* `inc(v, release)`: Return the version incremented by the release + type (`major`, `premajor`, `minor`, `preminor`, `patch`, + `prepatch`, or `prerelease`), or null if it's not valid + * `premajor` in one call will bump the version up to the next major + version and down to a prerelease of that major version. + `preminor`, and `prepatch` work the same way. + * If called from a non-prerelease version, the `prerelease` will work the + same as `prepatch`. It increments the patch version, then makes a + prerelease. If the input version is already a prerelease it simply + increments it. ### Comparison -* gt(v1, v2): `v1 > v2` -* gte(v1, v2): `v1 >= v2` -* lt(v1, v2): `v1 < v2` -* lte(v1, v2): `v1 <= v2` -* eq(v1, v2): `v1 == v2` This is true if they're logically equivalent, +* `gt(v1, v2)`: `v1 > v2` +* `gte(v1, v2)`: `v1 >= v2` +* `lt(v1, v2)`: `v1 < v2` +* `lte(v1, v2)`: `v1 <= v2` +* `eq(v1, v2)`: `v1 == v2` This is true if they're logically equivalent, even if they're not the exact same string. You already know how to compare strings. -* neq(v1, v2): `v1 != v2` The opposite of eq. -* cmp(v1, comparator, v2): Pass in a comparison string, and it'll call +* `neq(v1, v2)`: `v1 != v2` The opposite of `eq`. +* `cmp(v1, comparator, v2)`: Pass in a comparison string, and it'll call the corresponding function above. `"==="` and `"!=="` do simple string comparison, but are included for completeness. Throws if an invalid comparison string is provided. -* compare(v1, v2): Return 0 if v1 == v2, or 1 if v1 is greater, or -1 if - v2 is greater. Sorts in ascending order if passed to Array.sort(). -* rcompare(v1, v2): The reverse of compare. Sorts an array of versions - in descending order when passed to Array.sort(). +* `compare(v1, v2)`: Return `0` if `v1 == v2`, or `1` if `v1` is greater, or `-1` if + `v2` is greater. Sorts in ascending order if passed to `Array.sort()`. +* `rcompare(v1, v2)`: The reverse of compare. Sorts an array of versions + in descending order when passed to `Array.sort()`. ### Ranges -* validRange(range): Return the valid range or null if it's not valid -* satisfies(version, range): Return true if the version satisfies the +* `validRange(range)`: Return the valid range or null if it's not valid +* `satisfies(version, range)`: Return true if the version satisfies the range. -* maxSatisfying(versions, range): Return the highest version in the list - that satisfies the range, or null if none of them do. -* gtr(version, range): Return true if version is greater than all the +* `maxSatisfying(versions, range)`: Return the highest version in the list + that satisfies the range, or `null` if none of them do. +* `gtr(version, range)`: Return `true` if version is greater than all the versions possible in the range. -* ltr(version, range): Return true if version is less than all the +* `ltr(version, range)`: Return `true` if version is less than all the versions possible in the range. -* outside(version, range, hilo): Return true if the version is outside +* `outside(version, range, hilo)`: Return true if the version is outside the bounds of the range in either the high or low direction. The `hilo` argument must be either the string `'>'` or `'<'`. (This is the function called by `gtr` and `ltr`.) @@ -134,8 +150,8 @@ greater than a range, less than a range, *or* satisfy a range! For example, the range `1.2 <1.2.9 || >2.0.0` would have a hole from `1.2.9` until `2.0.0`, so the version `1.2.10` would not be greater than the -range (because 2.0.1 satisfies, which is higher), nor less than the -range (since 1.2.8 satisfies, which is lower), and it also does not +range (because `2.0.1` satisfies, which is higher), nor less than the +range (since `1.2.8` satisfies, which is lower), and it also does not satisfy the range. If you want to know if a version satisfies or does not satisfy a diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-bin.html nodejs-0.10.29/deps/npm/html/doc/api/npm-bin.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-bin.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-bin.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,17 +10,13 @@

npm-bin

Display npm bin folder

- -

SYNOPSIS

- -
npm.commands.bin(args, cb)
- -

DESCRIPTION

- +

SYNOPSIS

+
npm.commands.bin(args, cb)
+

DESCRIPTION

Print the folder where npm will install executables.

-

This function should not be used programmatically. Instead, just refer to the npm.bin member.

+
@@ -32,5 +28,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-bugs.html nodejs-0.10.29/deps/npm/html/doc/api/npm-bugs.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-bugs.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-bugs.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,23 +10,18 @@

npm-bugs

Bugs for a package in a web browser maybe

- -

SYNOPSIS

- -
npm.commands.bugs(package, callback)
- -

DESCRIPTION

- +

SYNOPSIS

+
npm.commands.bugs(package, callback)
+

DESCRIPTION

This command tries to guess at the likely location of a package's bug tracker URL, and then tries to open it using the --browser config param.

-

Like other commands, the first parameter is an array. This command only uses the first element, which is expected to be a package name with an optional version number.

-

This command will launch a browser, so this command may not be the most friendly for programmatic use.

+
@@ -38,5 +33,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-cache.html nodejs-0.10.29/deps/npm/html/doc/api/npm-cache.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-cache.html 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-cache.html 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,46 @@ + + + npm-cache + + + + + + +
+ +

npm-cache

manage the npm cache programmatically

+

SYNOPSIS

+
npm.commands.cache([args], callback)
+
+// helpers
+npm.commands.cache.clean([args], callback)
+npm.commands.cache.add([args], callback)
+npm.commands.cache.read(name, version, forceBypass, callback)
+

DESCRIPTION

+

This acts much the same ways as the npm-cache(1) command line +functionality.

+

The callback is called with the package.json data of the thing that is +eventually added to or read from the cache.

+

The top level npm.commands.cache(...) functionality is a public +interface, and like all commands on the npm.commands object, it will +match the command line behavior exactly.

+

However, the cache folder structure and the cache helper functions are +considered internal API surface, and as such, may change in future +releases of npm, potentially without warning or significant version +incrementation.

+

Use at your own risk.

+ +
+ + + + + + + + + + + + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-commands.html nodejs-0.10.29/deps/npm/html/doc/api/npm-commands.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-commands.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-commands.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,26 +10,21 @@

npm-commands

npm commands

- -

SYNOPSIS

- -
npm.commands[<command>](args, callback)
- -

DESCRIPTION

- +

SYNOPSIS

+
npm.commands[<command>](args, callback)
+

DESCRIPTION

npm comes with a full set of commands, and each of the commands takes a similar set of arguments.

-

In general, all commands on the command object take an array of positional argument strings. The last argument to any function is a callback. Some commands are special and take other optional arguments.

-

All commands have their own man page. See man npm-<command> for command-line usage, or man 3 npm-<command> for programmatic usage.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -41,5 +36,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-config.html nodejs-0.10.29/deps/npm/html/doc/api/npm-config.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-config.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-config.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,31 +10,42 @@

npm-config

Manage the npm configuration files

- -

SYNOPSIS

- +

SYNOPSIS

npm.commands.config(args, callback)
 var val = npm.config.get(key)
-npm.config.set(key, val)
- -

DESCRIPTION

- +npm.config.set(key, val) +

DESCRIPTION

This function acts much the same way as the command-line version. The first element in the array tells config what to do. Possible values are:

- -

  • set

    Sets a config parameter. The second element in args is interpreted as the -key, and the third element is interpreted as the value.

  • get

    Gets the value of a config parameter. The second element in args is the -key to get the value of.

  • delete (rm or del)

    Deletes a parameter from the config. The second element in args is the -key to delete.

  • list (ls)

    Show all configs that aren't secret. No parameters necessary.

  • edit:

    Opens the config file in the default editor. This command isn't very useful -programmatically, but it is made available.

- +
    +

  • set

    +

    Sets a config parameter. The second element in args is interpreted as the + key, and the third element is interpreted as the value.

    +
    • +

  • get

    +

    Gets the value of a config parameter. The second element in args is the + key to get the value of.

    +
    • +

  • delete (rm or del)

    +

    Deletes a parameter from the config. The second element in args is the + key to delete.

    +
    • +

  • list (ls)

    +

    Show all configs that aren't secret. No parameters necessary.

    +
    • +

  • edit:

    +

    Opens the config file in the default editor. This command isn't very useful + programmatically, but it is made available.

    +
    • +

To programmatically access npm configuration settings, or set them for the duration of a program, use the npm.config.set and npm.config.get functions instead.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -46,5 +57,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-deprecate.html nodejs-0.10.29/deps/npm/html/doc/api/npm-deprecate.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-deprecate.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-deprecate.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,30 +10,32 @@

npm-deprecate

Deprecate a version of a package

- -

SYNOPSIS

- -
npm.commands.deprecate(args, callback)
- -

DESCRIPTION

- +

SYNOPSIS

+
npm.commands.deprecate(args, callback)
+

DESCRIPTION

This command will update the npm registry entry for a package, providing a deprecation warning to all who attempt to install it.

-

The 'args' parameter must have exactly two elements:

- -

  • package[@version]

    The version portion is optional, and may be either a range, or a -specific version, or a tag.

  • message

    The warning message that will be printed whenever a user attempts to -install the package.

- +
    +

  • package[@version]

    +

    The version portion is optional, and may be either a range, or a + specific version, or a tag.

    +
    • +

  • message

    +

    The warning message that will be printed whenever a user attempts to + install the package.

    +
    • +

Note that you must be the package owner to deprecate something. See the owner and adduser help topics.

-

To un-deprecate a package, specify an empty string ("") for the message argument.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -45,5 +47,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-docs.html nodejs-0.10.29/deps/npm/html/doc/api/npm-docs.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-docs.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-docs.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,23 +10,18 @@

npm-docs

Docs for a package in a web browser maybe

- -

SYNOPSIS

- -
npm.commands.docs(package, callback)
- -

DESCRIPTION

- +

SYNOPSIS

+
npm.commands.docs(package, callback)
+

DESCRIPTION

This command tries to guess at the likely location of a package's documentation URL, and then tries to open it using the --browser config param.

-

Like other commands, the first parameter is an array. This command only uses the first element, which is expected to be a package name with an optional version number.

-

This command will launch a browser, so this command may not be the most friendly for programmatic use.

+
@@ -38,5 +33,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-edit.html nodejs-0.10.29/deps/npm/html/doc/api/npm-edit.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-edit.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-edit.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,28 +10,21 @@

npm-edit

Edit an installed package

- -

SYNOPSIS

- -
npm.commands.edit(package, callback)
- -

DESCRIPTION

- +

SYNOPSIS

+
npm.commands.edit(package, callback)
+

DESCRIPTION

Opens the package folder in the default editor (or whatever you've configured as the npm editor config -- see npm help config.)

-

After it has been edited, the package is rebuilt so as to pick up any changes in compiled packages.

-

For instance, you can do npm install connect to install connect into your package, and then npm.commands.edit(["connect"], callback) to make a few changes to your locally installed copy.

-

The first parameter is a string array with a single element, the package to open. The package can optionally have a version number attached.

-

Since this command opens an editor in a new process, be careful about where and how this is used.

+
@@ -43,5 +36,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-explore.html nodejs-0.10.29/deps/npm/html/doc/api/npm-explore.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-explore.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-explore.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,22 +10,16 @@

npm-explore

Browse an installed package

- -

SYNOPSIS

- -
npm.commands.explore(args, callback)
- -

DESCRIPTION

- +

SYNOPSIS

+
npm.commands.explore(args, callback)
+

DESCRIPTION

Spawn a subshell in the directory of the installed package specified.

-

If a command is specified, then it is run in the subshell, which then immediately terminates.

-

Note that the package is not automatically rebuilt afterwards, so be sure to use npm rebuild <pkg> if you make any changes.

-

The first element in the 'args' parameter must be a package name. After that is the optional command, which can be any number of strings. All of the strings will be combined into one, space-delimited command.

+
@@ -37,5 +31,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-help-search.html nodejs-0.10.29/deps/npm/html/doc/api/npm-help-search.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-help-search.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-help-search.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,30 +10,29 @@

npm-help-search

Search the help pages

- -

SYNOPSIS

- -
npm.commands.helpSearch(args, [silent,] callback)
- -

DESCRIPTION

- +

SYNOPSIS

+
npm.commands.helpSearch(args, [silent,] callback)
+

DESCRIPTION

This command is rarely useful, but it exists in the rare case that it is.

-

This command takes an array of search terms and returns the help pages that match in order of best match.

-

If there is only one match, then npm displays that help section. If there are multiple results, the results are printed to the screen formatted and the array of results is returned. Each result is an object with these properties:

- -
  • hits: -A map of args to number of hits on that arg. For example, {"npm": 3}
  • found: -Total number of unique args that matched.
  • totalHits: -Total number of hits.
  • lines: -An array of all matching lines (and some adjacent lines).
  • file: -Name of the file that matched
- +
    +
  • hits: +A map of args to number of hits on that arg. For example, {"npm": 3}
    • +
  • found: +Total number of unique args that matched.
    • +
  • totalHits: +Total number of hits.
    • +
  • lines: +An array of all matching lines (and some adjacent lines).
    • +
  • file: +Name of the file that matched
    • +

The silent parameter is not neccessary not used, but it may in the future.

+
@@ -45,5 +44,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm.html nodejs-0.10.29/deps/npm/html/doc/api/npm.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,9 +10,7 @@

npm

node package manager

- -

SYNOPSIS

- +

SYNOPSIS

var npm = require("npm")
 npm.load([configObject, ]function (er, npm) {
   // use the npm object, now that it's loaded.
@@ -23,18 +21,13 @@
   console.log("prefix = %s", npm.prefix)
 
   npm.commands.install(["package"], cb)
-})
- -

VERSION

- -

1.4.9

- -

DESCRIPTION

- +}) +

VERSION

+

1.4.14

+

DESCRIPTION

This is the API documentation for npm. To find documentation of the command line client, see npm(1).

-

Prior to using npm's commands, npm.load() must be called. If you provide configObject as an object hash of top-level configs, they override the values stored in the various config @@ -42,58 +35,70 @@ is parsed from the command line options. Additional configuration params are loaded from two configuration files. See npm-config(1), npm-config(7), and npmrc(5) for more information.

-

After that, each of the functions are accessible in the commands object: npm.commands.<cmd>. See npm-index(7) for a list of all possible commands.

-

All commands on the command object take an array of positional argument strings. The last argument to any function is a callback. Some commands take other optional arguments.

-

Configs cannot currently be set on a per function basis, as each call to npm.config.set will change the value for all npm commands in that process.

-

To find API documentation for a specific command, run the npm apihelp command.

- -

METHODS AND PROPERTIES

- -

  • npm.load(configs, cb)

    Load the configuration params, and call the cb function once the -globalconfig and userconfig files have been loaded as well, or on -nextTick if they've already been loaded.

  • npm.config

    An object for accessing npm configuration parameters.

    • npm.config.get(key)

    • npm.config.set(key, val)

    • npm.config.del(key)

  • npm.dir or npm.root

    The node_modules directory where npm will operate.

  • npm.prefix

    The prefix where npm is operating. (Most often the current working -directory.)

  • npm.cache

    The place where npm keeps JSON and tarballs it fetches from the -registry (or uploads to the registry).

  • npm.tmp

    npm's temporary working directory.

  • npm.deref

    Get the "real" name for a command that has either an alias or -abbreviation.

- -

MAGIC

- +

METHODS AND PROPERTIES

+
    +

  • npm.load(configs, cb)

    +

    Load the configuration params, and call the cb function once the + globalconfig and userconfig files have been loaded as well, or on + nextTick if they've already been loaded.

    +
    • +

  • npm.config

    +

    An object for accessing npm configuration parameters.

    +
      +
    • npm.config.get(key)
      • +
    • npm.config.set(key, val)
      • +
    • npm.config.del(key)
      • +
    +
    • +

  • npm.dir or npm.root

    +

    The node_modules directory where npm will operate.

    +
    • +

  • npm.prefix

    +

    The prefix where npm is operating. (Most often the current working + directory.)

    +
    • +

  • npm.cache

    +

    The place where npm keeps JSON and tarballs it fetches from the + registry (or uploads to the registry).

    +
    • +

  • npm.tmp

    +

    npm's temporary working directory.

    +
    • +

  • npm.deref

    +

    Get the "real" name for a command that has either an alias or + abbreviation.

    +
    • +
+

MAGIC

For each of the methods in the npm.commands hash, a method is added to the npm object, which takes a set of positional string arguments rather than an array and a callback.

-

If the last argument is a callback, then it will use the supplied callback. However, if no callback is provided, then it will print out the error or results.

-

For example, this would work in a node repl:

- 
> npm = require("npm")
 > npm.load()  // wait a sec...
-> npm.install("dnode", "express")
- -

Note that that won't work in a node program, since the install +> npm.install("dnode", "express") +

Note that that won't work in a node program, since the install method will get called before the configuration load is completed.

- -

ABBREVS

- +

ABBREVS

In order to support npm ins foo instead of npm install foo, the npm.commands object has a set of abbreviations as well as the full method names. Use the npm.deref method to find the real name.

-

For example:

- -
var cmd = npm.deref("unp") // cmd === "unpublish"
+
var cmd = npm.deref("unp") // cmd === "unpublish"
+
@@ -105,5 +110,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-init.html nodejs-0.10.29/deps/npm/html/doc/api/npm-init.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-init.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-init.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,33 +10,24 @@

npm init

Interactively create a package.json file

- -

SYNOPSIS

- -
npm.commands.init(args, callback)
- -

DESCRIPTION

- +

SYNOPSIS

+
npm.commands.init(args, callback)
+

DESCRIPTION

This will ask you a bunch of questions, and then write a package.json for you.

-

It attempts to make reasonable guesses about what you want things to be set to, and then writes a package.json file with the options you've selected.

-

If you already have a package.json file, it'll read that first, and default to the options in there.

-

It is strictly additive, so it does not delete options from your package.json without a really good reason to do so.

-

Since this function expects to be run on the command-line, it doesn't work very well as a programmatically. The best option is to roll your own, and since JavaScript makes it stupid simple to output formatted JSON, that is the preferred method. If you're sure you want to handle command-line prompting, then go ahead and use this programmatically.

- -

SEE ALSO

- +

SEE ALSO

package.json(5)

+
@@ -48,5 +39,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-install.html nodejs-0.10.29/deps/npm/html/doc/api/npm-install.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-install.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-install.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,23 +10,17 @@

npm-install

install a package programmatically

- -

SYNOPSIS

- -
npm.commands.install([where,] packages, callback)
- -

DESCRIPTION

- +

SYNOPSIS

+
npm.commands.install([where,] packages, callback)
+

DESCRIPTION

This acts much the same ways as installing on the command-line.

-

The 'where' parameter is optional and only used internally, and it specifies where the packages should be installed to.

-

The 'packages' parameter is an array of strings. Each element in the array is the name of a package to be installed.

-

Finally, 'callback' is a function that will be called when all packages have been installed or when an error has been encountered.

+
@@ -38,5 +32,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-link.html nodejs-0.10.29/deps/npm/html/doc/api/npm-link.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-link.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-link.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,37 +10,27 @@

npm-link

Symlink a package folder

- -

SYNOPSIS

- +

SYNOPSIS

npm.command.link(callback)
-npm.command.link(packages, callback)
- -

DESCRIPTION

- +npm.command.link(packages, callback) +

DESCRIPTION

Package linking is a two-step process.

-

Without parameters, link will create a globally-installed symbolic link from prefix/package-name to the current folder.

-

With a parameters, link will create a symlink from the local node_modules folder to the global symlink.

-

When creating tarballs for npm publish, the linked packages are "snapshotted" to their current state by resolving the symbolic links.

-

This is handy for installing your own stuff, so that you can work on it and test it iteratively without having to continually rebuild.

-

For example:

- 
npm.commands.link(cb)           # creates global link from the cwd
                                 # (say redis package)
-npm.commands.link('redis', cb)  # link-install the package
- -

Now, any changes to the redis package will be reflected in +npm.commands.link('redis', cb) # link-install the package +

Now, any changes to the redis package will be reflected in the package in the current working directory

+
@@ -52,5 +42,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-load.html nodejs-0.10.29/deps/npm/html/doc/api/npm-load.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-load.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-load.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,30 +10,22 @@

npm-load

Load config settings

- -

SYNOPSIS

- -
npm.load(conf, cb)
- -

DESCRIPTION

- +

SYNOPSIS

+
npm.load(conf, cb)
+

DESCRIPTION

npm.load() must be called before any other function call. Both parameters are optional, but the second is recommended.

-

The first parameter is an object hash of command-line config params, and the second parameter is a callback that will be called when npm is loaded and ready to serve.

-

The first parameter should follow a similar structure as the package.json config object.

-

For example, to emulate the --dev flag, pass an object that looks like this:

- 
{
   "dev": true
-}
+} +

For a list of all the available command-line configs, see npm help config

-

For a list of all the available command-line configs, see npm help config

@@ -45,5 +37,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-ls.html nodejs-0.10.29/deps/npm/html/doc/api/npm-ls.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-ls.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-ls.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,57 +10,48 @@

npm-ls

List installed packages

- -

SYNOPSIS

- -
npm.commands.ls(args, [silent,] callback)
- -

DESCRIPTION

- +

SYNOPSIS

+
npm.commands.ls(args, [silent,] callback)
+

DESCRIPTION

This command will print to stdout all the versions of packages that are installed, as well as their dependencies, in a tree-structure. It will also return that data using the callback.

-

This command does not take any arguments, but args must be defined. Beyond that, if any arguments are passed in, npm will politely warn that it does not take positional arguments, though you may set config flags like with any other command, such as global to list global packages.

-

It will print out extraneous, missing, and invalid packages.

-

If the silent parameter is set to true, nothing will be output to the screen, but the data will still be returned.

-

Callback is provided an error if one occurred, the full data about which packages are installed and which dependencies they will receive, and a "lite" data object which just shows which versions are installed where. Note that the full data object is a circular structure, so care must be taken if it is serialized to JSON.

- -

CONFIGURATION

- +

CONFIGURATION

long

- -
  • Default: false
  • Type: Boolean
- +
    +
  • Default: false
    • +
  • Type: Boolean
    • +

Show extended information.

-

parseable

- -
  • Default: false
  • Type: Boolean
- +
    +
  • Default: false
    • +
  • Type: Boolean
    • +

Show parseable output instead of tree view.

-

global

- -
  • Default: false
  • Type: Boolean
- +
    +
  • Default: false
    • +
  • Type: Boolean
    • +

List packages in the global install prefix instead of in the current project.

-

Note, if parseable is set or long isn't set, then duplicates will be trimmed. This means that if a submodule a same dependency as a parent module, then the dependency will only be output once.

+
@@ -72,5 +63,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-outdated.html nodejs-0.10.29/deps/npm/html/doc/api/npm-outdated.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-outdated.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-outdated.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,17 +10,13 @@

npm-outdated

Check for outdated packages

- -

SYNOPSIS

- -
npm.commands.outdated([packages,] callback)
- -

DESCRIPTION

- +

SYNOPSIS

+
npm.commands.outdated([packages,] callback)
+

DESCRIPTION

This command will check the registry to see if the specified packages are currently outdated.

-

If the 'packages' parameter is left out, npm will check all packages.

+
@@ -32,5 +28,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-owner.html nodejs-0.10.29/deps/npm/html/doc/api/npm-owner.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-owner.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-owner.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,32 +10,32 @@

npm-owner

Manage package owners

- -

SYNOPSIS

- -
npm.commands.owner(args, callback)
- -

DESCRIPTION

- +

SYNOPSIS

+
npm.commands.owner(args, callback)
+

DESCRIPTION

The first element of the 'args' parameter defines what to do, and the subsequent elements depend on the action. Possible values for the action are (order of parameters are given in parenthesis):

- -
  • ls (package): +
      +
    • ls (package): List all the users who have access to modify a package and push new versions. -Handy when you need to know who to bug for help.
    • add (user, package): +Handy when you need to know who to bug for help.
      • +
    • add (user, package): Add a new user as a maintainer of a package. This user is enabled to modify -metadata, publish new versions, and add other owners.
    • rm (user, package): +metadata, publish new versions, and add other owners.
      • +
    • rm (user, package): Remove a user from the package owner list. This immediately revokes their -privileges.
    - +privileges.
    • +

Note that there is only one level of access. Either you can modify a package, or you can't. Future versions may contain more fine-grained access levels, but that is not implemented at this time.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -47,5 +47,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-pack.html nodejs-0.10.29/deps/npm/html/doc/api/npm-pack.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-pack.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-pack.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,23 +10,18 @@

npm-pack

Create a tarball from a package

- -

SYNOPSIS

- -
npm.commands.pack([packages,] callback)
- -

DESCRIPTION

- +

SYNOPSIS

+
npm.commands.pack([packages,] callback)
+

DESCRIPTION

For anything that's installable (that is, a package folder, tarball, tarball url, name@tag, name@version, or name), this command will fetch it to the cache, and then copy the tarball to the current working directory as <name>-<version>.tgz, and then write the filenames out to stdout.

-

If the same package is specified multiple times, then the file will be overwritten the second time.

-

If no arguments are supplied, then npm packs the current package folder.

+
@@ -38,5 +33,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-prefix.html nodejs-0.10.29/deps/npm/html/doc/api/npm-prefix.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-prefix.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-prefix.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,19 +10,14 @@

npm-prefix

Display prefix

- -

SYNOPSIS

- -
npm.commands.prefix(args, callback)
- -

DESCRIPTION

- +

SYNOPSIS

+
npm.commands.prefix(args, callback)
+

DESCRIPTION

Print the prefix to standard out.

-

'args' is never used and callback is never called with data. 'args' must be present or things will break.

-

This function is not useful programmatically

+
@@ -34,5 +29,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-prune.html nodejs-0.10.29/deps/npm/html/doc/api/npm-prune.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-prune.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-prune.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,21 +10,15 @@

npm-prune

Remove extraneous packages

- -

SYNOPSIS

- -
npm.commands.prune([packages,] callback)
- -

DESCRIPTION

- +

SYNOPSIS

+
npm.commands.prune([packages,] callback)
+

DESCRIPTION

This command removes "extraneous" packages.

-

The first parameter is optional, and it specifies packages to be removed.

-

No packages are specified, then all packages will be checked.

-

Extraneous packages are packages that are not listed on the parent package's dependencies list.

+
@@ -36,5 +30,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-publish.html nodejs-0.10.29/deps/npm/html/doc/api/npm-publish.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-publish.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-publish.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,30 +10,31 @@

npm-publish

Publish a package

- -

SYNOPSIS

- -
npm.commands.publish([packages,] callback)
- -

DESCRIPTION

- +

SYNOPSIS

+
npm.commands.publish([packages,] callback)
+

DESCRIPTION

Publishes a package to the registry so that it can be installed by name. Possible values in the 'packages' array are:

- -

  • <folder>: -A folder containing a package.json file

  • <tarball>: +

      +

    • <folder>: +A folder containing a package.json file

      +
      • +

    • <tarball>: A url or file path to a gzipped tar archive containing a single folder -with a package.json file inside.

    - +with a package.json file inside.

    +
    • +

If the package array is empty, npm will try to publish something in the current working directory.

-

This command could fails if one of the packages specified already exists in the registry. Overwrites when the "force" environment variable is set.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -45,5 +46,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-rebuild.html nodejs-0.10.29/deps/npm/html/doc/api/npm-rebuild.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-rebuild.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-rebuild.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,20 +10,15 @@

npm-rebuild

Rebuild a package

- -

SYNOPSIS

- -
npm.commands.rebuild([packages,] callback)
- -

DESCRIPTION

- +

SYNOPSIS

+
npm.commands.rebuild([packages,] callback)
+

DESCRIPTION

This command runs the npm build command on each of the matched packages. This is useful when you install a new version of node, and must recompile all your C++ addons with the new binary. If no 'packages' parameter is specify, every package will be rebuilt.

- -

CONFIGURATION

- +

CONFIGURATION

See npm help build

+
@@ -35,5 +30,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-repo.html nodejs-0.10.29/deps/npm/html/doc/api/npm-repo.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-repo.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-repo.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,23 +10,18 @@

npm-repo

Open package repository page in the browser

- -

SYNOPSIS

- -
npm.commands.repo(package, callback)
- -

DESCRIPTION

- +

SYNOPSIS

+
npm.commands.repo(package, callback)
+

DESCRIPTION

This command tries to guess at the likely location of a package's repository URL, and then tries to open it using the --browser config param.

-

Like other commands, the first parameter is an array. This command only uses the first element, which is expected to be a package name with an optional version number.

-

This command will launch a browser, so this command may not be the most friendly for programmatic use.

+
@@ -38,5 +33,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-restart.html nodejs-0.10.29/deps/npm/html/doc/api/npm-restart.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-restart.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-restart.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,25 +10,21 @@

npm-restart

Start a package

- -

SYNOPSIS

- -
npm.commands.restart(packages, callback)
- -

DESCRIPTION

- +

SYNOPSIS

+
npm.commands.restart(packages, callback)
+

DESCRIPTION

This runs a package's "restart" script, if one was provided. Otherwise it runs package's "stop" script, if one was provided, and then the "start" script.

-

If no version is specified, then it restarts the "active" version.

-

npm can run tests on multiple packages. Just specify multiple packages in the packages parameter.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -40,5 +36,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-root.html nodejs-0.10.29/deps/npm/html/doc/api/npm-root.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-root.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-root.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,19 +10,14 @@

npm-root

Display npm root

- -

SYNOPSIS

- -
npm.commands.root(args, callback)
- -

DESCRIPTION

- +

SYNOPSIS

+
npm.commands.root(args, callback)
+

DESCRIPTION

Print the effective node_modules folder to standard out.

-

'args' is never used and callback is never called with data. 'args' must be present or things will break.

-

This function is not useful programmatically.

+
@@ -34,5 +29,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-run-script.html nodejs-0.10.29/deps/npm/html/doc/api/npm-run-script.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-run-script.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-run-script.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,27 +10,26 @@

npm-run-script

Run arbitrary package scripts

- -

SYNOPSIS

- -
npm.commands.run-script(args, callback)
- -

DESCRIPTION

- +

SYNOPSIS

+
npm.commands.run-script(args, callback)
+

DESCRIPTION

This runs an arbitrary command from a package's "scripts" object.

-

It is used by the test, start, restart, and stop commands, but can be called directly, as well.

-

The 'args' parameter is an array of strings. Behavior depends on the number of elements. If there is only one element, npm assumes that the element represents a command to be run on the local repository. If there is more than one element, then the first is assumed to be the package and the second is assumed to be the command to run. All other elements are ignored.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -42,5 +41,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-search.html nodejs-0.10.29/deps/npm/html/doc/api/npm-search.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-search.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-search.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,30 +10,38 @@

npm-search

Search for packages

- -

SYNOPSIS

- -
npm.commands.search(searchTerms, [silent,] [staleness,] callback)
- -

DESCRIPTION

- +

SYNOPSIS

+
npm.commands.search(searchTerms, [silent,] [staleness,] callback)
+

DESCRIPTION

Search the registry for packages matching the search terms. The available parameters are:

- -
  • searchTerms: -Array of search terms. These terms are case-insensitive.
  • silent: -If true, npm will not log anything to the console.
  • staleness: +
      +
    • searchTerms: +Array of search terms. These terms are case-insensitive.
      • +
    • silent: +If true, npm will not log anything to the console.
      • +
    • staleness: This is the threshold for stale packages. "Fresh" packages are not refreshed -from the registry. This value is measured in seconds.

    • callback: +from the registry. This value is measured in seconds.

      • +

    • callback: Returns an object where each key is the name of a package, and the value is information about that package along with a 'words' property, which is a space-delimited string of all of the interesting words in that package. -The only properties included are those that are searched, which generally include:

      • name
      • description
      • maintainers
      • url
      • keywords
    - +The only properties included are those that are searched, which generally include:

    +
      +
    • name
      • +
    • description
      • +
    • maintainers
      • +
    • url
      • +
    • keywords
      • +
    +
    • +

A search on the registry excludes any result that does not match all of the search terms. It also removes any items from the results that contain an excluded term (the "searchexclude" config). The search is case insensitive and doesn't try to read your mind (it doesn't do any verb tense matching or the like).

+
@@ -45,5 +53,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-shrinkwrap.html nodejs-0.10.29/deps/npm/html/doc/api/npm-shrinkwrap.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-shrinkwrap.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-shrinkwrap.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,24 +10,18 @@

npm-shrinkwrap

programmatically generate package shrinkwrap file

- -

SYNOPSIS

- -
npm.commands.shrinkwrap(args, [silent,] callback)
- -

DESCRIPTION

- +

SYNOPSIS

+
npm.commands.shrinkwrap(args, [silent,] callback)
+

DESCRIPTION

This acts much the same ways as shrinkwrapping on the command-line.

-

This command does not take any arguments, but 'args' must be defined. Beyond that, if any arguments are passed in, npm will politely warn that it does not take positional arguments.

-

If the 'silent' parameter is set to true, nothing will be output to the screen, but the shrinkwrap file will still be written.

-

Finally, 'callback' is a function that will be called when the shrinkwrap has been saved.

+
@@ -39,5 +33,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-start.html nodejs-0.10.29/deps/npm/html/doc/api/npm-start.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-start.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-start.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,17 +10,13 @@

npm-start

Start a package

- -

SYNOPSIS

- -
npm.commands.start(packages, callback)
- -

DESCRIPTION

- +

SYNOPSIS

+
npm.commands.start(packages, callback)
+

DESCRIPTION

This runs a package's "start" script, if one was provided.

-

npm can run tests on multiple packages. Just specify multiple packages in the packages parameter.

+
@@ -32,5 +28,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-stop.html nodejs-0.10.29/deps/npm/html/doc/api/npm-stop.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-stop.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-stop.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,17 +10,13 @@

npm-stop

Stop a package

- -

SYNOPSIS

- -
npm.commands.stop(packages, callback)
- -

DESCRIPTION

- +

SYNOPSIS

+
npm.commands.stop(packages, callback)
+

DESCRIPTION

This runs a package's "stop" script, if one was provided.

-

npm can run stop on multiple packages. Just specify multiple packages in the packages parameter.

+
@@ -32,5 +28,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-submodule.html nodejs-0.10.29/deps/npm/html/doc/api/npm-submodule.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-submodule.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-submodule.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,31 +10,27 @@

npm-submodule

Add a package as a git submodule

- -

SYNOPSIS

- -
npm.commands.submodule(packages, callback)
- -

DESCRIPTION

- +

SYNOPSIS

+
npm.commands.submodule(packages, callback)
+

DESCRIPTION

For each package specified, npm will check if it has a git repository url in its package.json description then add it as a git submodule at node_modules/<pkg name>.

-

This is a convenience only. From then on, it's up to you to manage updates by using the appropriate git commands. npm will stubbornly refuse to update, modify, or remove anything with a .git subfolder in it.

-

This command also does not install missing dependencies, if the package does not include them in its git repository. If npm ls reports that things are missing, you can either install, link, or submodule them yourself, or you can do npm explore <pkgname> -- npm install to install the dependencies into the submodule folder.

+

SEE ALSO

+
    +
  • npm help json
    • +
  • git help submodule
    • +
-

SEE ALSO

- -
  • npm help json
  • git help submodule
@@ -46,5 +42,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-tag.html nodejs-0.10.29/deps/npm/html/doc/api/npm-tag.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-tag.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-tag.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,27 +10,21 @@

npm-tag

Tag a published version

- -

SYNOPSIS

- -
npm.commands.tag(package@version, tag, callback)
- -

DESCRIPTION

- +

SYNOPSIS

+
npm.commands.tag(package@version, tag, callback)
+

DESCRIPTION

Tags the specified version of the package with the specified tag, or the --tag config if not specified.

-

The 'package@version' is an array of strings, but only the first two elements are currently used.

-

The first element must be in the form package@version, where package is the package name and version is the version number (much like installing a specific version).

-

The second element is the name of the tag to tag this version with. If this parameter is missing or falsey (empty), the default froom the config will be used. For more information about how to set this config, check man 3 npm-config for programmatic usage or man npm-config for cli usage.

+
@@ -42,5 +36,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-test.html nodejs-0.10.29/deps/npm/html/doc/api/npm-test.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-test.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-test.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,20 +10,15 @@

npm-test

Test a package

- -

SYNOPSIS

- -
  npm.commands.test(packages, callback)
- -

DESCRIPTION

- +

SYNOPSIS

+
  npm.commands.test(packages, callback)
+

DESCRIPTION

This runs a package's "test" script, if one was provided.

-

To run tests as a condition of installation, set the npat config to true.

-

npm can run tests on multiple packages. Just specify multiple packages in the packages parameter.

+
@@ -35,5 +30,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-uninstall.html nodejs-0.10.29/deps/npm/html/doc/api/npm-uninstall.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-uninstall.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-uninstall.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,20 +10,15 @@

npm-uninstall

uninstall a package programmatically

- -

SYNOPSIS

- -
npm.commands.uninstall(packages, callback)
- -

DESCRIPTION

- +

SYNOPSIS

+
npm.commands.uninstall(packages, callback)
+

DESCRIPTION

This acts much the same ways as uninstalling on the command-line.

-

The 'packages' parameter is an array of strings. Each element in the array is the name of a package to be uninstalled.

-

Finally, 'callback' is a function that will be called when all packages have been uninstalled or when an error has been encountered.

+
@@ -35,5 +30,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-unpublish.html nodejs-0.10.29/deps/npm/html/doc/api/npm-unpublish.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-unpublish.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-unpublish.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,24 +10,18 @@

npm-unpublish

Remove a package from the registry

- -

SYNOPSIS

- -
npm.commands.unpublish(package, callback)
- -

DESCRIPTION

- +

SYNOPSIS

+
npm.commands.unpublish(package, callback)
+

DESCRIPTION

This removes a package version from the registry, deleting its entry and removing the tarball.

-

The package parameter must be defined.

-

Only the first element in the package parameter is used. If there is no first element, then npm assumes that the package at the current working directory is what is meant.

-

If no version is specified, or if all versions are removed then the root package entry is removed from the registry entirely.

+
@@ -39,5 +33,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-update.html nodejs-0.10.29/deps/npm/html/doc/api/npm-update.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-update.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-update.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,16 +10,12 @@

npm-update

Update a package

- -

SYNOPSIS

- -
npm.commands.update(packages, callback)
- -

DESCRIPTION

- +

SYNOPSIS

+
npm.commands.update(packages, callback)
+

DESCRIPTION

Updates a package, upgrading it to the latest version. It also installs any missing packages.

-

The 'packages' argument is an array of packages to update. The 'callback' parameter will be called when done or when an error occurs.

+
@@ -31,5 +27,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-version.html nodejs-0.10.29/deps/npm/html/doc/api/npm-version.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-version.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-version.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,22 +10,17 @@

npm-version

Bump a package version

- -

SYNOPSIS

- -
npm.commands.version(newversion, callback)
- -

DESCRIPTION

- +

SYNOPSIS

+
npm.commands.version(newversion, callback)
+

DESCRIPTION

Run this in a package directory to bump the version and write the new data back to the package.json file.

-

If run in a git repo, it will also create a version commit and tag, and fail if the repo is not clean.

-

Like all other commands, this function takes a string array as its first parameter. The difference, however, is this function will fail if it does not have exactly one element. The only element should be a version number.

+
@@ -37,5 +32,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-view.html nodejs-0.10.29/deps/npm/html/doc/api/npm-view.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-view.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-view.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,97 +10,66 @@

npm-view

View registry info

- -

SYNOPSIS

- -
npm.commands.view(args, [silent,] callback)
- -

DESCRIPTION

- +

SYNOPSIS

+
npm.commands.view(args, [silent,] callback)
+

DESCRIPTION

This command shows data about a package and prints it to the stream referenced by the outfd config, which defaults to stdout.

-

The "args" parameter is an ordered list that closely resembles the command-line usage. The elements should be ordered such that the first element is the package and version (package@version). The version is optional. After that, the rest of the parameters are fields with optional subfields ("field.subfield") which can be used to get only the information desired from the registry.

-

The callback will be passed all of the data returned by the query.

-

For example, to get the package registry entry for the connect package, you can do this:

- -
npm.commands.view(["connect"], callback)
- -

If no version is specified, "latest" is assumed.

- +
npm.commands.view(["connect"], callback)
+

If no version is specified, "latest" is assumed.

Field names can be specified after the package descriptor. For example, to show the dependencies of the ronn package at version 0.3.5, you could do the following:

- -
npm.commands.view(["ronn@0.3.5", "dependencies"], callback)
- -

You can view child field by separating them with a period. +

npm.commands.view(["ronn@0.3.5", "dependencies"], callback)
+

You can view child field by separating them with a period. To view the git repository URL for the latest version of npm, you could do this:

- -
npm.commands.view(["npm", "repository.url"], callback)
- -

For fields that are arrays, requesting a non-numeric field will return +

npm.commands.view(["npm", "repository.url"], callback)
+

For fields that are arrays, requesting a non-numeric field will return all of the values from the objects in the list. For example, to get all the contributor names for the "express" project, you can do this:

- -
npm.commands.view(["express", "contributors.email"], callback)
- -

You may also use numeric indices in square braces to specifically select +

npm.commands.view(["express", "contributors.email"], callback)
+

You may also use numeric indices in square braces to specifically select an item in an array field. To just get the email address of the first contributor in the list, you can do this:

- -
npm.commands.view(["express", "contributors[0].email"], callback)
- -

Multiple fields may be specified, and will be printed one after another. +

npm.commands.view(["express", "contributors[0].email"], callback)
+

Multiple fields may be specified, and will be printed one after another. For exampls, to get all the contributor names and email addresses, you can do this:

- -
npm.commands.view(["express", "contributors.name", "contributors.email"], callback)
- -

"Person" fields are shown as a string if they would be shown as an +

npm.commands.view(["express", "contributors.name", "contributors.email"], callback)
+

"Person" fields are shown as a string if they would be shown as an object. So, for example, this will show the list of npm contributors in the shortened string format. (See npm help json for more on this.)

- -
npm.commands.view(["npm", "contributors"], callback)
- -

If a version range is provided, then data will be printed for every +

npm.commands.view(["npm", "contributors"], callback)
+

If a version range is provided, then data will be printed for every matching version of the package. This will show which version of jsdom was required by each matching version of yui3:

- -
npm.commands.view(["yui3@'>0.5.4'", "dependencies.jsdom"], callback)
- -

OUTPUT

- +
npm.commands.view(["yui3@'>0.5.4'", "dependencies.jsdom"], callback)
+

OUTPUT

If only a single string field for a single version is output, then it will not be colorized or quoted, so as to enable piping the output to another command.

-

If the version range matches multiple versions, than each printed value will be prefixed with the version it applies to.

-

If multiple fields are requested, than each of them are prefixed with the field name.

-

Console output can be disabled by setting the 'silent' parameter to true.

- -

RETURN VALUE

- +

RETURN VALUE

The data returned will be an object in this formation:

- 
{ <version>:
   { <field>: <value>
   , ... }
-, ... }
+, ... } +

corresponding to the list of fields selected.

-

corresponding to the list of fields selected.

@@ -112,5 +81,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/api/npm-whoami.html nodejs-0.10.29/deps/npm/html/doc/api/npm-whoami.html --- nodejs-0.10.28/deps/npm/html/doc/api/npm-whoami.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/api/npm-whoami.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,19 +10,14 @@

npm-whoami

Display npm username

- -

SYNOPSIS

- -
npm.commands.whoami(args, callback)
- -

DESCRIPTION

- +

SYNOPSIS

+
npm.commands.whoami(args, callback)
+

DESCRIPTION

Print the username config to standard output.

-

'args' is never used and callback is never called with data. 'args' must be present or things will break.

-

This function is not useful programmatically

+
@@ -34,5 +29,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-adduser.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-adduser.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-adduser.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-adduser.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,37 +10,31 @@

npm-adduser

Add a registry user account

- -

SYNOPSIS

- -
npm adduser
- -

DESCRIPTION

- +

SYNOPSIS

+
npm adduser
+

DESCRIPTION

Create or verify a user named <username> in the npm registry, and save the credentials to the .npmrc file.

-

The username, password, and email are read in from prompts.

-

You may use this command to change your email address, but not username or password.

-

To reset your password, go to https://npmjs.org/forgot

-

You may use this command multiple times with the same user account to authorize on a new machine.

- -

CONFIGURATION

- +

CONFIGURATION

registry

- -

Default: http://registry.npmjs.org/

- +

Default: http://registry.npmjs.org/

The base URL of the npm package registry.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -52,5 +46,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-bin.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-bin.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-bin.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-bin.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,18 +10,20 @@

npm-bin

Display npm bin folder

- -

SYNOPSIS

- -
npm bin
- -

DESCRIPTION

- +

SYNOPSIS

+
npm bin
+

DESCRIPTION

Print the folder where npm will install executables.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -33,5 +35,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-bugs.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-bugs.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-bugs.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-bugs.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,36 +10,39 @@

npm-bugs

Bugs for a package in a web browser maybe

- -

SYNOPSIS

- +

SYNOPSIS

npm bugs <pkgname>
-npm bugs (with no args in a package dir)
- -

DESCRIPTION

- +npm bugs (with no args in a package dir) +

DESCRIPTION

This command tries to guess at the likely location of a package's bug tracker URL, and then tries to open it using the --browser config param. If no package name is provided, it will search for a package.json in the current folder and use the name property.

- -

CONFIGURATION

- +

CONFIGURATION

browser

- -
  • Default: OS X: "open", Windows: "start", Others: "xdg-open"
  • Type: String
- +
    +
  • Default: OS X: "open", Windows: "start", Others: "xdg-open"
    • +
  • Type: String
    • +

The browser that is called by the npm bugs command to open websites.

-

registry

- -
  • Default: https://registry.npmjs.org/
  • Type: url
- +

The base URL of the npm package registry.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -51,5 +54,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-build.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-build.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-build.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-build.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,23 +10,23 @@

npm-build

Build a package

- -

SYNOPSIS

- -
npm build <package-folder>
- -
  • <package-folder>: -A folder containing a package.json file in its root.
- -

DESCRIPTION

- +

SYNOPSIS

+
npm build <package-folder>
+
    +
  • <package-folder>: +A folder containing a package.json file in its root.
    • +
+

DESCRIPTION

This is the plumbing command called by npm link and npm install.

-

It should generally not be called directly.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -38,5 +38,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-bundle.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-bundle.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-bundle.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-bundle.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,18 +10,16 @@

npm-bundle

REMOVED

- -

DESCRIPTION

- +

DESCRIPTION

The npm bundle command has been removed in 1.0, for the simple reason that it is no longer necessary, as the default behavior is now to install packages into the local space.

-

Just use npm install now to do what npm bundle used to do.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -33,5 +31,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-cache.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-cache.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-cache.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-cache.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,9 +10,7 @@

npm-cache

Manipulates packages cache

- -

SYNOPSIS

- +

SYNOPSIS

npm cache add <tarball file>
 npm cache add <folder>
 npm cache add <tarball url>
@@ -20,54 +18,58 @@
 
 npm cache ls [<path>]
 
-npm cache clean [<path>]
- -

DESCRIPTION

- +npm cache clean [<path>] +

DESCRIPTION

Used to add, list, or clear the npm cache folder.

- -

  • add: +

      +

    • add: Add the specified package to the local cache. This command is primarily intended to be used internally by npm, but it can provide a way to -add data to the local installation cache explicitly.

    • ls: +add data to the local installation cache explicitly.

      +
      • +

    • ls: Show the data in the cache. Argument is a path to show in the cache folder. Works a bit like the find program, but limited by the -depth config.

    • clean: +depth config.

      +
      • +

    • clean: Delete data out of the cache folder. If an argument is provided, then it specifies a subpath to delete. If no argument is provided, then -the entire cache is cleared.

    - -

    DETAILS

    - +the entire cache is cleared.

    +
    • +
+

DETAILS

npm stores cache data in the directory specified in npm config get cache. For each package that is added to the cache, three pieces of information are stored in {cache}/{name}/{version}:

- -
  • .../package/: -A folder containing the package contents as they appear in the tarball.
  • .../package.json: -The package.json file, as npm sees it, with overlays applied and a _id attribute.
  • .../package.tgz: -The tarball for that version.
- +
    +
  • .../package/package.json: +The package.json file, as npm sees it.
    • +
  • .../package.tgz: +The tarball for that version.
    • +

Additionally, whenever a registry request is made, a .cache.json file is placed at the corresponding URI, to store the ETag and the requested -data.

- +data. This is stored in {cache}/{hostname}/{path}/.cache.json.

Commands that make non-essential registry requests (such as search and view, or the completion scripts) generally specify a minimum timeout. If the .cache.json file is younger than the specified timeout, then they do not make an HTTP request to the registry.

- -

CONFIGURATION

- +

CONFIGURATION

cache

-

Default: ~/.npm on Posix, or %AppData%/npm-cache on Windows.

-

The root cache folder.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -79,5 +81,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-completion.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-completion.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-completion.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-completion.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,31 +10,27 @@

npm-completion

Tab Completion for npm

- -

SYNOPSIS

- -
. <(npm completion)
- -

DESCRIPTION

- +

SYNOPSIS

+
. <(npm completion)
+

DESCRIPTION

Enables tab-completion in all npm commands.

-

The synopsis above loads the completions into your current shell. Adding it to your ~/.bashrc or ~/.zshrc will make the completions available everywhere.

-

You may of course also pipe the output of npm completion to a file such as /usr/local/etc/bash_completion.d/npm if you have a system that will read that file for you.

-

When COMP_CWORD, COMP_LINE, and COMP_POINT are defined in the environment, npm completion acts in "plumbing mode", and outputs completions based on the arguments.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -46,5 +42,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-config.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-config.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-config.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-config.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,9 +10,7 @@

npm-config

Manage the npm configuration files

- -

SYNOPSIS

- +

SYNOPSIS

npm config set <key> <value> [--global]
 npm config get <key>
 npm config delete <key>
@@ -20,61 +18,43 @@
 npm config edit
 npm c [set|get|delete|list]
 npm get <key>
-npm set <key> <value> [--global]
- -

DESCRIPTION

- +npm set <key> <value> [--global] +

DESCRIPTION

npm gets its config settings from the command line, environment variables, npmrc files, and in some cases, the package.json file.

-

See npmrc(5) for more information about the npmrc files.

-

See npm-config(7) for a more thorough discussion of the mechanisms involved.

-

The npm config command can be used to update and edit the contents of the user and global npmrc files.

- -

Sub-commands

- +

Sub-commands

Config supports the following sub-commands:

-

set

- -
npm config set key value
- -

Sets the config key to the value.

- +
npm config set key value
+

Sets the config key to the value.

If value is omitted, then it sets it to "true".

-

get

- -
npm config get key
- -

Echo the config value to stdout.

- +
npm config get key
+

Echo the config value to stdout.

list

- -
npm config list
- -

Show all the config settings.

- +
npm config list
+

Show all the config settings.

delete

- -
npm config delete key
- -

Deletes the key from all configuration files.

- +
npm config delete key
+

Deletes the key from all configuration files.

edit

- -
npm config edit
- -

Opens the config file in an editor. Use the --global flag to edit the +

npm config edit
+

Opens the config file in an editor. Use the --global flag to edit the global config.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -86,5 +66,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-dedupe.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-dedupe.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-dedupe.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-dedupe.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,60 +10,48 @@

npm-dedupe

Reduce duplication

- -

SYNOPSIS

- +

SYNOPSIS

npm dedupe [package names...]
-npm ddp [package names...]
- -

DESCRIPTION

- +npm ddp [package names...] +

DESCRIPTION

Searches the local package tree and attempts to simplify the overall structure by moving dependencies further up the tree, where they can be more effectively shared by multiple dependent packages.

-

For example, consider this dependency graph:

- 
a
 +-- b <-- depends on c@1.0.x
 |   `-- c@1.0.3
 `-- d <-- depends on c@~1.0.9
-    `-- c@1.0.10
- -

In this case, npm-dedupe(1) will transform the tree to:

- + `-- c@1.0.10 +

In this case, npm-dedupe(1) will transform the tree to:

a
 +-- b
 +-- d
-`-- c@1.0.10
- -

Because of the hierarchical nature of node's module lookup, b and d +`-- c@1.0.10 +

Because of the hierarchical nature of node's module lookup, b and d will both get their dependency met by the single c package at the root level of the tree.

-

If a suitable version exists at the target location in the tree already, then it will be left untouched, but the other duplicates will be deleted.

-

If no suitable version can be found, then a warning is printed, and nothing is done.

-

If any arguments are supplied, then they are filters, and only the named packages will be touched.

-

Note that this operation transforms the dependency tree, and may result in packages getting updated versions, perhaps from the npm registry.

-

This feature is experimental, and may change in future versions.

-

The --tag argument will apply to all of the affected dependencies. If a tag with the given name exists, the tagged version is preferred over newer versions.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -75,5 +63,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-deprecate.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-deprecate.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-deprecate.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-deprecate.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,29 +10,23 @@

npm-deprecate

Deprecate a version of a package

- -

SYNOPSIS

- -
npm deprecate <name>[@<version>] <message>
- -

DESCRIPTION

- +

SYNOPSIS

+
npm deprecate <name>[@<version>] <message>
+

DESCRIPTION

This command will update the npm registry entry for a package, providing a deprecation warning to all who attempt to install it.

-

It works on version ranges as well as specific versions, so you can do something like this:

- -
npm deprecate my-thing@"< 0.2.3" "critical bug fixed in v0.2.3"
- -

Note that you must be the package owner to deprecate something. See the +

npm deprecate my-thing@"< 0.2.3" "critical bug fixed in v0.2.3"
+

Note that you must be the package owner to deprecate something. See the owner and adduser help topics.

-

To un-deprecate a package, specify an empty string ("") for the message argument.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -44,5 +38,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-docs.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-docs.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-docs.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-docs.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,39 +10,41 @@

npm-docs

Docs for a package in a web browser maybe

- -

SYNOPSIS

- +

SYNOPSIS

npm docs [<pkgname> [<pkgname> ...]]
 npm docs (with no args in a package dir)
 npm home [<pkgname> [<pkgname> ...]]
-npm home (with no args in a package dir)
- -

DESCRIPTION

- +npm home (with no args in a package dir) +

DESCRIPTION

This command tries to guess at the likely location of a package's documentation URL, and then tries to open it using the --browser config param. You can pass multiple package names at once. If no package name is provided, it will search for a package.json in the current folder and use the name property.

- -

CONFIGURATION

- +

CONFIGURATION

browser

- -
  • Default: OS X: "open", Windows: "start", Others: "xdg-open"
  • Type: String
- +
    +
  • Default: OS X: "open", Windows: "start", Others: "xdg-open"
    • +
  • Type: String
    • +

The browser that is called by the npm docs command to open websites.

-

registry

- -
  • Default: https://registry.npmjs.org/
  • Type: url
- +

The base URL of the npm package registry.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -54,5 +56,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-edit.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-edit.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-edit.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-edit.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,35 +10,34 @@

npm-edit

Edit an installed package

- -

SYNOPSIS

- -
npm edit <name>[@<version>]
- -

DESCRIPTION

- +

SYNOPSIS

+
npm edit <name>[@<version>]
+

DESCRIPTION

Opens the package folder in the default editor (or whatever you've configured as the npm editor config -- see npm-config(7).)

-

After it has been edited, the package is rebuilt so as to pick up any changes in compiled packages.

-

For instance, you can do npm install connect to install connect into your package, and then npm edit connect to make a few changes to your locally installed copy.

- -

CONFIGURATION

- +

CONFIGURATION

editor

- -
  • Default: EDITOR environment variable if set, or "vi" on Posix, -or "notepad" on Windows.
  • Type: path
- +
    +
  • Default: EDITOR environment variable if set, or "vi" on Posix, +or "notepad" on Windows.
    • +
  • Type: path
    • +

The command to run for npm edit or npm config edit.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -50,5 +49,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-explore.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-explore.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-explore.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-explore.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,38 +10,35 @@

npm-explore

Browse an installed package

- -

SYNOPSIS

- -
npm explore <name>[@<version>] [ -- <cmd>]
- -

DESCRIPTION

- +

SYNOPSIS

+
npm explore <name>[@<version>] [ -- <cmd>]
+

DESCRIPTION

Spawn a subshell in the directory of the installed package specified.

-

If a command is specified, then it is run in the subshell, which then immediately terminates.

-

This is particularly handy in the case of git submodules in the node_modules folder:

- -
npm explore some-dependency -- git pull origin master
- -

Note that the package is not automatically rebuilt afterwards, so be +

npm explore some-dependency -- git pull origin master
+

Note that the package is not automatically rebuilt afterwards, so be sure to use npm rebuild <pkg> if you make any changes.

- -

CONFIGURATION

- +

CONFIGURATION

shell

- -
  • Default: SHELL environment variable, or "bash" on Posix, or "cmd" on -Windows
  • Type: path
- +
    +
  • Default: SHELL environment variable, or "bash" on Posix, or "cmd" on +Windows
    • +
  • Type: path
    • +

The shell to run for the npm explore command.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -53,5 +50,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-help.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-help.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-help.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-help.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,34 +10,37 @@

npm-help

Get help on npm

- -

SYNOPSIS

- +

SYNOPSIS

npm help <topic>
-npm help some search terms
- -

DESCRIPTION

- +npm help some search terms +

DESCRIPTION

If supplied a topic, then show the appropriate documentation page.

-

If the topic does not exist, or if multiple terms are provided, then run the help-search command to find a match. Note that, if help-search finds a single subject, then it will run help on that topic, so unique matches are equivalent to specifying a topic name.

- -

CONFIGURATION

- +

CONFIGURATION

viewer

- -
  • Default: "man" on Posix, "browser" on Windows
  • Type: path
- +
    +
  • Default: "man" on Posix, "browser" on Windows
    • +
  • Type: path
    • +

The program to use to view help content.

-

Set to "browser" to view html help content in the default web browser.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -49,5 +52,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-help-search.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-help-search.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-help-search.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-help-search.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,36 +10,31 @@

npm-help-search

Search npm help documentation

- -

SYNOPSIS

- -
npm help-search some search terms
- -

DESCRIPTION

- +

SYNOPSIS

+
npm help-search some search terms
+

DESCRIPTION

This command will search the npm markdown documentation files for the terms provided, and then list the results, sorted by relevance.

-

If only one result is found, then it will show that help topic.

-

If the argument to npm help is not a known help topic, then it will call help-search. It is rarely if ever necessary to call this command directly.

- -

CONFIGURATION

- +

CONFIGURATION

long

- -
  • Type: Boolean
  • Default false
- +
    +
  • Type: Boolean
    • +
  • Default false
    • +

If true, the "long" flag will cause help-search to output context around where the terms were found in the documentation.

-

If false, then help-search will just list out the help topics found.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -51,5 +46,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm.html nodejs-0.10.29/deps/npm/html/doc/cli/npm.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,129 +10,139 @@

npm

node package manager

- -

SYNOPSIS

- -
npm <command> [args]
- -

VERSION

- -

1.4.9

- -

DESCRIPTION

- +

SYNOPSIS

+
npm <command> [args]
+

VERSION

+

1.4.14

+

DESCRIPTION

npm is the package manager for the Node JavaScript platform. It puts modules in place so that node can find them, and manages dependency conflicts intelligently.

-

It is extremely configurable to support a wide variety of use cases. Most commonly, it is used to publish, discover, install, and develop node programs.

-

Run npm help to get a list of available commands.

- -

INTRODUCTION

- +

INTRODUCTION

You probably got npm because you want to install stuff.

-

Use npm install blerg to install the latest version of "blerg". Check out npm-install(1) for more info. It can do a lot of stuff.

-

Use the npm search command to show everything that's available. Use npm ls to show everything you've installed.

- -

DIRECTORIES

- +

DEPENDENCIES

+

If a package references to another package with a git URL, npm depends +on a preinstalled git.

+

If one of the packages npm tries to install is a native node module and +requires compiling of C++ Code, npm will use +node-gyp for that task. +For a Unix system, node-gyp +needs Python, make and a buildchain like GCC. On Windows, +Python and Microsoft Visual Studio C++ is needed. Python 3 is +not supported by node-gyp. +For more information visit +the node-gyp repository and +the node-gyp Wiki.

+

DIRECTORIES

See npm-folders(5) to learn about where npm puts stuff.

-

In particular, npm has two modes of operation:

- -
  • global mode:
    npm installs packages into the install prefix at -prefix/lib/node_modules and bins are installed in prefix/bin.
  • local mode:
    npm installs packages into the current project directory, which +
      +
    • global mode:
      npm installs packages into the install prefix at +prefix/lib/node_modules and bins are installed in prefix/bin.
      • +
    • local mode:
      npm installs packages into the current project directory, which defaults to the current working directory. Packages are installed to -./node_modules, and bins are installed to ./node_modules/.bin.
    - +./node_modules, and bins are installed to ./node_modules/.bin.
    • +

Local mode is the default. Use --global or -g on any command to operate in global mode instead.

- -

DEVELOPER USAGE

- +

DEVELOPER USAGE

If you're using npm to develop and publish your code, check out the following help topics:

- -
  • json: -Make a package.json file. See package.json(5).
  • link: +
      +
    • json: +Make a package.json file. See package.json(5).
      • +
    • link: For linking your current working code into Node's path, so that you don't have to reinstall every time you make a change. Use -npm link to do this.
    • install: +npm link to do this.
      • +
    • install: It's a good idea to install things if you don't need the symbolic link. Especially, installing other peoples code from the registry is done via -npm install
    • adduser: +npm install
      • +
    • adduser: Create an account or log in. Credentials are stored in the -user config file.
    • publish: -Use the npm publish command to upload your code to the registry.
    - -

    CONFIGURATION

    - +user config file.
    • +
  • publish: +Use the npm publish command to upload your code to the registry.
    • +
+

CONFIGURATION

npm is extremely configurable. It reads its configuration options from 5 places.

- -
  • Command line switches:
    Set a config with --key val. All keys take a value, even if they +
      +
    • Command line switches:
      Set a config with --key val. All keys take a value, even if they are booleans (the config parser doesn't know what the options are at the time of parsing.) If no value is provided, then the option is set -to boolean true.
    • Environment Variables:
      Set any config by prefixing the name in an environment variable with -npm_config_. For example, export npm_config_key=val.
    • User Configs:
      The file at $HOME/.npmrc is an ini-formatted list of configs. If +to boolean true.
      • +
    • Environment Variables:
      Set any config by prefixing the name in an environment variable with +npm_config_. For example, export npm_config_key=val.
      • +
    • User Configs:
      The file at $HOME/.npmrc is an ini-formatted list of configs. If present, it is parsed. If the userconfig option is set in the cli -or env, then that will be used instead.
    • Global Configs:
      The file found at ../etc/npmrc (from the node executable, by default +or env, then that will be used instead.
      • +
    • Global Configs:
      The file found at ../etc/npmrc (from the node executable, by default this resolves to /usr/local/etc/npmrc) will be parsed if it is found. If the globalconfig option is set in the cli, env, or user config, -then that file is parsed instead.
    • Defaults:
      npm's default configuration options are defined in -lib/utils/config-defs.js. These must not be changed.
    - +then that file is parsed instead.
    • +
  • Defaults:
    npm's default configuration options are defined in +lib/utils/config-defs.js. These must not be changed.
    • +

See npm-config(7) for much much more information.

- -

CONTRIBUTIONS

- +

CONTRIBUTIONS

Patches welcome!

- -
  • code: +
      +
    • code: Read through npm-coding-style(7) if you plan to submit code. -You don't have to agree with it, but you do have to follow it.
    • docs: +You don't have to agree with it, but you do have to follow it.
      • +
    • docs: If you find an error in the documentation, edit the appropriate markdown -file in the "doc" folder. (Don't worry about generating the man page.)
    - +file in the "doc" folder. (Don't worry about generating the man page.)
    • +

Contributors are listed in npm's package.json file. You can view them easily by doing npm view npm contributors.

-

If you would like to contribute, but don't know what to work on, check the issues list or ask on the mailing list.

- - - -

BUGS

- + +

BUGS

When you find issues, please report them:

- - - +

Be sure to include all of the output from the npm command that didn't work as expected. The npm-debug.log file is also helpful to provide.

-

You can also look for isaacs in #node.js on irc://irc.freenode.net. He will no doubt tell you to put the output in a gist or email.

- -

AUTHOR

- +

AUTHOR

Isaac Z. Schlueter :: isaacs :: @izs :: -i@izs.me

- -

SEE ALSO

+i@izs.me

+

SEE ALSO

+ -
@@ -144,5 +154,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-init.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-init.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-init.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-init.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,27 +10,23 @@

npm-init

Interactively create a package.json file

- -

SYNOPSIS

- -
npm init
- -

DESCRIPTION

- +

SYNOPSIS

+
npm init
+

DESCRIPTION

This will ask you a bunch of questions, and then write a package.json for you.

-

It attempts to make reasonable guesses about what you want things to be set to, and then writes a package.json file with the options you've selected.

-

If you already have a package.json file, it'll read that first, and default to the options in there.

-

It is strictly additive, so it does not delete options from your package.json without a really good reason to do so.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -42,5 +38,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-install.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-install.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-install.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-install.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,9 +10,7 @@

npm-install

Install a package

- -

SYNOPSIS

- +

SYNOPSIS

npm install (with no args in a package dir)
 npm install <tarball file>
 npm install <tarball url>
@@ -21,92 +19,144 @@
 npm install <name>@<tag>
 npm install <name>@<version>
 npm install <name>@<version range>
-npm i (with any of the previous argument usage)
- -

DESCRIPTION

- +npm i (with any of the previous argument usage) +

DESCRIPTION

This command installs a package, and any packages that it depends on. If the package has a shrinkwrap file, the installation of dependencies will be driven by that. See npm-shrinkwrap(1).

-

A package is:

- -
  • a) a folder containing a program described by a package.json file
  • b) a gzipped tarball containing (a)
  • c) a url that resolves to (b)
  • d) a <name>@<version> that is published on the registry (see npm-registry(7)) with (c)
  • e) a <name>@<tag> that points to (d)
  • f) a <name> that has a "latest" tag satisfying (e)
  • g) a <git remote url> that resolves to (b)
- +
    +
  • a) a folder containing a program described by a package.json file
    • +
  • b) a gzipped tarball containing (a)
    • +
  • c) a url that resolves to (b)
    • +
  • d) a <name>@<version> that is published on the registry (see npm-registry(7)) with (c)
    • +
  • e) a <name>@<tag> that points to (d)
    • +
  • f) a <name> that has a "latest" tag satisfying (e)
    • +
  • g) a <git remote url> that resolves to (b)
    • +

Even if you never publish your package, you can still get a lot of benefits of using npm if you just want to write a node program (a), and perhaps if you also want to be able to easily install it elsewhere after packing it up into a tarball (b).

- -

  • npm install (in package directory, no arguments):

    Install the dependencies in the local node_modules folder.

    In global mode (ie, with -g or --global appended to the command), -it installs the current package context (ie, the current working -directory) as a global package.

    By default, npm install will install all modules listed as -dependencies. With the --production flag, -npm will not install modules listed in devDependencies.

  • npm install <folder>:

    Install a package that is sitting in a folder on the filesystem.

  • npm install <tarball file>:

    Install a package that is sitting on the filesystem. Note: if you just want -to link a dev directory into your npm root, you can do this more easily by -using npm link.

    Example:

      npm install ./package.tgz

  • npm install <tarball url>:

    Fetch the tarball url, and then install it. In order to distinguish between -this and other options, the argument must start with "http://" or "https://"

    Example:

      npm install https://github.com/indexzero/forever/tarball/v0.5.6

  • npm install <name> [--save|--save-dev|--save-optional]:

    Do a <name>@<tag> install, where <tag> is the "tag" config. (See -npm-config(7).)

    In most cases, this will install the latest version -of the module published on npm.

    Example:

    npm install sax

    npm install takes 3 exclusive, optional flags which save or update -the package version in your main package.json:

    • --save: Package will appear in your dependencies.

    • --save-dev: Package will appear in your devDependencies.

    • --save-optional: Package will appear in your optionalDependencies.

      When using any of the above options to save dependencies to your -package.json, there is an additional, optional flag:

    • --save-exact: Saved dependencies will be configured with an +

        +

      • npm install (in package directory, no arguments):

        +

        Install the dependencies in the local node_modules folder.

        +

        In global mode (ie, with -g or --global appended to the command), + it installs the current package context (ie, the current working + directory) as a global package.

        +

        By default, npm install will install all modules listed as + dependencies. With the --production flag, + npm will not install modules listed in devDependencies.

        +
        • +

      • npm install <folder>:

        +

        Install a package that is sitting in a folder on the filesystem.

        +
        • +

      • npm install <tarball file>:

        +

        Install a package that is sitting on the filesystem. Note: if you just want + to link a dev directory into your npm root, you can do this more easily by + using npm link.

        +

        Example:

        +
            npm install ./package.tgz
+
        • +

      • npm install <tarball url>:

        +

        Fetch the tarball url, and then install it. In order to distinguish between + this and other options, the argument must start with "http://" or "https://"

        +

        Example:

        +
            npm install https://github.com/indexzero/forever/tarball/v0.5.6
+
        • +

      • npm install <name> [--save|--save-dev|--save-optional]:

        +

        Do a <name>@<tag> install, where <tag> is the "tag" config. (See + npm-config(7).)

        +

        In most cases, this will install the latest version + of the module published on npm.

        +

        Example:

        +
            npm install sax
+

        npm install takes 3 exclusive, optional flags which save or update + the package version in your main package.json:

        +
          +

        • --save: Package will appear in your dependencies.

          +
          • +

        • --save-dev: Package will appear in your devDependencies.

          +
          • +

        • --save-optional: Package will appear in your optionalDependencies.

          +

          When using any of the above options to save dependencies to your +package.json, there is an additional, optional flag:

          +
          • +

        • --save-exact: Saved dependencies will be configured with an exact version rather than using npm's default semver range -operator.

          Examples:

          npm install sax --save - npm install node-tap --save-dev - npm install dtrace-provider --save-optional - npm install readable-stream --save --save-exact

          Note: If there is a file or folder named <name> in the current +operator.

          +

          Examples:

          +
          npm install sax --save
+npm install node-tap --save-dev
+npm install dtrace-provider --save-optional
+npm install readable-stream --save --save-exact
+
          • +
        +
        • +
      +
      **Note**: If there is a file or folder named `<name>` in the current
 working directory, then it will try to install that, and only try to
-fetch the package by name if it is not valid.

  • npm install <name>@<tag>:

    Install the version of the package that is referenced by the specified tag. -If the tag does not exist in the registry data for that package, then this -will fail.

    Example:

      npm install sax@latest

  • npm install <name>@<version>:

    Install the specified version of the package. This will fail if the version -has not been published to the registry.

    Example:

      npm install sax@0.1.1

  • npm install <name>@<version range>:

    Install a version of the package matching the specified version range. This -will follow the same rules for resolving dependencies described in package.json(5).

    Note that most version ranges must be put in quotes so that your shell will -treat it as a single argument.

    Example:

    npm install sax@">=0.1.0 <0.2.0"

  • npm install <git remote url>:

    Install a package by cloning a git remote url. The format of the git -url is:

    <protocol>://[<user>@]<hostname><separator><path>[#<commit-ish>]

    <protocol> is one of git, git+ssh, git+http, or -git+https. If no <commit-ish> is specified, then master is -used.

    Examples:

      git+ssh://git@github.com:npm/npm.git#v1.0.27
-  git+https://isaacs@github.com/npm/npm.git
-  git://github.com/npm/npm.git#v1.0.27
- +fetch the package by name if it is not valid. +
    +

  • npm install <name>@<tag>:

    +

    Install the version of the package that is referenced by the specified tag. + If the tag does not exist in the registry data for that package, then this + will fail.

    +

    Example:

    +
        npm install sax@latest
+
    • +

  • npm install <name>@<version>:

    +

    Install the specified version of the package. This will fail if the version + has not been published to the registry.

    +

    Example:

    +
        npm install sax@0.1.1
+
    • +

  • npm install <name>@<version range>:

    +

    Install a version of the package matching the specified version range. This + will follow the same rules for resolving dependencies described in package.json(5).

    +

    Note that most version ranges must be put in quotes so that your shell will + treat it as a single argument.

    +

    Example:

    +
        npm install sax@">=0.1.0 <0.2.0"
+
    • +

  • npm install <git remote url>:

    +

    Install a package by cloning a git remote url. The format of the git + url is:

    +
        <protocol>://[<user>@]<hostname><separator><path>[#<commit-ish>]
+

    <protocol> is one of git, git+ssh, git+http, or + git+https. If no <commit-ish> is specified, then master is + used.

    +

    Examples:

    +
        git+ssh://git@github.com:npm/npm.git#v1.0.27
+    git+https://isaacs@github.com/npm/npm.git
+    git://github.com/npm/npm.git#v1.0.27
+
    • +

You may combine multiple arguments, and even multiple types of arguments. For example:

- -
npm install sax@">=0.1.0 <0.2.0" bench supervisor
- -

The --tag argument will apply to all of the specified install targets. If a +

npm install sax@">=0.1.0 <0.2.0" bench supervisor
+

The --tag argument will apply to all of the specified install targets. If a tag with the given name exists, the tagged version is preferred over newer versions.

-

The --force argument will force npm to fetch remote resources even if a local copy exists on disk.

- -
npm install sax --force
- -

The --global argument will cause npm to install the package globally +

npm install sax --force
+

The --global argument will cause npm to install the package globally rather than locally. See npm-folders(5).

-

The --link argument will cause npm to link global installs into the local space in some cases.

-

The --no-bin-links argument will prevent npm from creating symlinks for any binaries the package might contain.

-

The --no-optional argument will prevent optional dependencies from being installed.

-

The --no-shrinkwrap argument, which will ignore an available shrinkwrap file and use the package.json instead.

-

The --nodedir=/path/to/node/source argument will allow npm to find the node source code so that npm can compile native modules.

-

See npm-config(7). Many of the configuration params have some effect on installation, since that's most of what npm does.

- -

ALGORITHM

- +

ALGORITHM

To install a package, npm uses the following algorithm:

- 
install(where, what, family, ancestors)
 fetch what, unpack to <where>/node_modules/<what>
 for each dep in what.dependencies
@@ -115,46 +165,50 @@
     not in <where>/node_modules/<what>/node_modules/*
     and not in <family>
   add precise version deps to <family>
-  install(<where>/node_modules/<what>, dep, family)
- -

For this package{dep} structure: A{B,C}, B{C}, C{D}, + install(<where>/node_modules/<what>, dep, family) +

For this package{dep} structure: A{B,C}, B{C}, C{D}, this algorithm produces:

- 
A
 +-- B
 `-- C
-    `-- D
- -

That is, the dependency from B to C is satisfied by the fact that A + `-- D +

That is, the dependency from B to C is satisfied by the fact that A already caused C to be installed at a higher level.

-

See npm-folders(5) for a more detailed description of the specific folder structures that npm creates.

- -

Limitations of npm's Install Algorithm

- +

Limitations of npm's Install Algorithm

There are some very rare and pathological edge-cases where a cycle can cause npm to try to install a never-ending tree of packages. Here is the simplest case:

- -
A -> B -> A' -> B' -> A -> B -> A' -> B' -> A -> ...
- -

where A is some version of a package, and A' is a different version +

A -> B -> A' -> B' -> A -> B -> A' -> B' -> A -> ...
+

where A is some version of a package, and A' is a different version of the same package. Because B depends on a different version of A than the one that is already in the tree, it must install a separate copy. The same is true of A', which must install B'. Because B' depends on the original version of A, which has been overridden, the cycle falls into infinite regress.

-

To avoid this situation, npm flat-out refuses to install any name@version that is already present anywhere in the tree of package folder ancestors. A more correct, but more complex, solution would be to symlink the existing version into the new location. If this ever affects a real use-case, it will be investigated.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -166,5 +220,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-link.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-link.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-link.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-link.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,60 +10,51 @@

npm-link

Symlink a package folder

- -

SYNOPSIS

- +

SYNOPSIS

npm link (in package folder)
 npm link <pkgname>
-npm ln (with any of the previous argument usage)
- -

DESCRIPTION

- +npm ln (with any of the previous argument usage) +

DESCRIPTION

Package linking is a two-step process.

-

First, npm link in a package folder will create a globally-installed symbolic link from prefix/package-name to the current folder.

-

Next, in some other location, npm link package-name will create a symlink from the local node_modules folder to the global symlink.

-

Note that package-name is taken from package.json, not from directory name.

-

When creating tarballs for npm publish, the linked packages are "snapshotted" to their current state by resolving the symbolic links.

-

This is handy for installing your own stuff, so that you can work on it and test it iteratively without having to continually rebuild.

-

For example:

- 
cd ~/projects/node-redis    # go into the package directory
 npm link                    # creates global link
 cd ~/projects/node-bloggy   # go into some other package directory.
-npm link redis              # link-install the package
- -

Now, any changes to ~/projects/node-redis will be reflected in +npm link redis # link-install the package +

Now, any changes to ~/projects/node-redis will be reflected in ~/projects/node-bloggy/node_modules/redis/

-

You may also shortcut the two steps in one. For example, to do the above use-case in a shorter way:

- 
cd ~/projects/node-bloggy  # go into the dir of your main project
-npm link ../node-redis     # link the dir of your dependency
- -

The second line is the equivalent of doing:

- +npm link ../node-redis # link the dir of your dependency +

The second line is the equivalent of doing:

(cd ../node-redis; npm link)
-npm link redis
- -

That is, it first creates a global link, and then links the global +npm link redis +

That is, it first creates a global link, and then links the global installation target into your project's node_modules folder.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -75,5 +66,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-ls.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-ls.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-ls.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-ls.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,72 +10,70 @@

npm-ls

List installed packages

- -

SYNOPSIS

- +

SYNOPSIS

npm list [<pkg> ...]
 npm ls [<pkg> ...]
 npm la [<pkg> ...]
-npm ll [<pkg> ...]
- -

DESCRIPTION

- +npm ll [<pkg> ...] +

DESCRIPTION

This command will print to stdout all the versions of packages that are installed, as well as their dependencies, in a tree-structure.

-

Positional arguments are name@version-range identifiers, which will limit the results to only the paths to the packages named. Note that nested packages will also show the paths to the specified packages. For example, running npm ls promzard in npm's source tree will show:

- -
npm@1.4.9 /path/to/npm
+
npm@1.4.14 /path/to/npm
 └─┬ init-package-json@0.0.4
-  └── promzard@0.1.5

-
-
It will print out extraneous, missing, and invalid packages.

-
+  └── promzard@0.1.5
+

It will print out extraneous, missing, and invalid packages.

If a project specifies git urls for dependencies these are shown in parentheses after the name@version to make it easier for users to recognize potential forks of a project.

-

When run as ll or la, it shows extended information by default.

- -

CONFIGURATION

- +

CONFIGURATION

json

- -
  • Default: false
  • Type: Boolean
- +
    +
  • Default: false
    • +
  • Type: Boolean
    • +

Show information in JSON format.

-

long

- -
  • Default: false
  • Type: Boolean
- +
    +
  • Default: false
    • +
  • Type: Boolean
    • +

Show extended information.

-

parseable

- -
  • Default: false
  • Type: Boolean
- +
    +
  • Default: false
    • +
  • Type: Boolean
    • +

Show parseable output instead of tree view.

-

global

- -
  • Default: false
  • Type: Boolean
- +
    +
  • Default: false
    • +
  • Type: Boolean
    • +

List packages in the global install prefix instead of in the current project.

-

depth

- -
  • Type: Int
- +
    +
  • Type: Int
    • +

Max display depth of the dependency tree.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -87,5 +85,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-outdated.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-outdated.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-outdated.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-outdated.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,56 +10,52 @@

npm-outdated

Check for outdated packages

- -

SYNOPSIS

- -
npm outdated [<name> [<name> ...]]
- -

DESCRIPTION

- +

SYNOPSIS

+
npm outdated [<name> [<name> ...]]
+

DESCRIPTION

This command will check the registry to see if any (or, specific) installed packages are currently outdated.

-

The resulting field 'wanted' shows the latest version according to the version specified in the package.json, the field 'latest' the very latest version of the package.

- -

CONFIGURATION

- +

CONFIGURATION

json

- -
  • Default: false
  • Type: Boolean
- +
    +
  • Default: false
    • +
  • Type: Boolean
    • +

Show information in JSON format.

-

long

- -
  • Default: false
  • Type: Boolean
- +
    +
  • Default: false
    • +
  • Type: Boolean
    • +

Show extended information.

-

parseable

- -
  • Default: false
  • Type: Boolean
- +
    +
  • Default: false
    • +
  • Type: Boolean
    • +

Show parseable output instead of tree view.

-

global

- -
  • Default: false
  • Type: Boolean
- +
    +
  • Default: false
    • +
  • Type: Boolean
    • +

Check packages in the global install prefix instead of in the current project.

-

depth

- -
  • Type: Int
- +
    +
  • Type: Int
    • +

Max depth for checking dependency tree.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -71,5 +67,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-owner.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-owner.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-owner.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-owner.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,32 +10,34 @@

npm-owner

Manage package owners

- -

SYNOPSIS

- +

SYNOPSIS

npm owner ls <package name>
 npm owner add <user> <package name>
-npm owner rm <user> <package name>
- -

DESCRIPTION

- +npm owner rm <user> <package name> +

DESCRIPTION

Manage ownership of published packages.

- -
  • ls: +
      +
    • ls: List all the users who have access to modify a package and push new versions. -Handy when you need to know who to bug for help.
    • add: +Handy when you need to know who to bug for help.
      • +
    • add: Add a new user as a maintainer of a package. This user is enabled to modify -metadata, publish new versions, and add other owners.
    • rm: +metadata, publish new versions, and add other owners.
      • +
    • rm: Remove a user from the package owner list. This immediately revokes their -privileges.
    - +privileges.
    • +

Note that there is only one level of access. Either you can modify a package, or you can't. Future versions may contain more fine-grained access levels, but that is not implemented at this time.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -47,5 +49,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-pack.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-pack.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-pack.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-pack.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,27 +10,26 @@

npm-pack

Create a tarball from a package

- -

SYNOPSIS

- -
npm pack [<pkg> [<pkg> ...]]
- -

DESCRIPTION

- +

SYNOPSIS

+
npm pack [<pkg> [<pkg> ...]]
+

DESCRIPTION

For anything that's installable (that is, a package folder, tarball, tarball url, name@tag, name@version, or name), this command will fetch it to the cache, and then copy the tarball to the current working directory as <name>-<version>.tgz, and then write the filenames out to stdout.

-

If the same package is specified multiple times, then the file will be overwritten the second time.

-

If no arguments are supplied, then npm packs the current package folder.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -42,5 +41,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-prefix.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-prefix.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-prefix.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-prefix.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,18 +10,20 @@

npm-prefix

Display prefix

- -

SYNOPSIS

- -
npm prefix
- -

DESCRIPTION

- +

SYNOPSIS

+
npm prefix
+

DESCRIPTION

Print the prefix to standard out.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -33,5 +35,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-prune.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-prune.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-prune.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-prune.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,27 +10,24 @@

npm-prune

Remove extraneous packages

- -

SYNOPSIS

- +

SYNOPSIS

npm prune [<name> [<name ...]]
-npm prune [<name> [<name ...]] [--production]
- -

DESCRIPTION

- +npm prune [<name> [<name ...]] [--production] +

DESCRIPTION

This command removes "extraneous" packages. If a package name is provided, then only packages matching one of the supplied names are removed.

-

Extraneous packages are packages that are not listed on the parent package's dependencies list.

-

If the --production flag is specified, this command will remove the packages specified in your devDependencies.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -42,5 +39,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-publish.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-publish.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-publish.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-publish.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,34 +10,39 @@

npm-publish

Publish a package

- -

SYNOPSIS

- +

SYNOPSIS

npm publish <tarball> [--tag <tag>]
-npm publish <folder> [--tag <tag>]
- -

DESCRIPTION

- +npm publish <folder> [--tag <tag>] +

DESCRIPTION

Publishes a package to the registry so that it can be installed by name.

- -

  • <folder>: -A folder containing a package.json file

  • <tarball>: +

      +

    • <folder>: +A folder containing a package.json file

      +
      • +

    • <tarball>: A url or file path to a gzipped tar archive containing a single folder -with a package.json file inside.

    • [--tag <tag>] +with a package.json file inside.

      +
      • +

    • [--tag <tag>] Registers the published package with the given tag, such that npm install <name>@<tag> will install this version. By default, npm publish updates -and npm install installs the latest tag.

    - +and npm install installs the latest tag.

    +
    • +

Fails if the package name and version combination already exists in the registry.

-

Once a package is published with a given name and version, that specific name and version combination can never be used again, even if it is removed with npm-unpublish(1).

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -49,5 +54,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-rebuild.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-rebuild.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-rebuild.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-rebuild.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,24 +10,23 @@

npm-rebuild

Rebuild a package

- -

SYNOPSIS

- +

SYNOPSIS

npm rebuild [<name> [<name> ...]]
-npm rb [<name> [<name> ...]]
- -
  • <name>: -The package to rebuild
- -

DESCRIPTION

- +npm rb [<name> [<name> ...]] +
    +
  • <name>: +The package to rebuild
    • +
+

DESCRIPTION

This command runs the npm build command on the matched folders. This is useful when you install a new version of node, and must recompile all your C++ addons with the new binary.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -39,5 +38,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-repo.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-repo.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-repo.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-repo.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,30 +10,27 @@

npm-repo

Open package repository page in the browser

- -

SYNOPSIS

- +

SYNOPSIS

npm repo <pkgname>
-npm repo (with no args in a package dir)
- -

DESCRIPTION

- +npm repo (with no args in a package dir) +

DESCRIPTION

This command tries to guess at the likely location of a package's repository URL, and then tries to open it using the --browser config param. If no package name is provided, it will search for a package.json in the current folder and use the name property.

- -

CONFIGURATION

- +

CONFIGURATION

browser

- -
  • Default: OS X: "open", Windows: "start", Others: "xdg-open"
  • Type: String
- +
    +
  • Default: OS X: "open", Windows: "start", Others: "xdg-open"
    • +
  • Type: String
    • +

The browser that is called by the npm repo command to open websites.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -45,5 +42,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-restart.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-restart.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-restart.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-restart.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,22 +10,22 @@

npm-restart

Start a package

- -

SYNOPSIS

- -
npm restart <name>
- -

DESCRIPTION

- +

SYNOPSIS

+
npm restart <name>
+

DESCRIPTION

This runs a package's "restart" script, if one was provided. Otherwise it runs package's "stop" script, if one was provided, and then the "start" script.

-

If no version is specified, then it restarts the "active" version.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -37,5 +37,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-rm.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-rm.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-rm.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-rm.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,22 +10,24 @@

npm-rm

Remove a package

- -

SYNOPSIS

- +

SYNOPSIS

npm rm <name>
 npm r <name>
 npm uninstall <name>
-npm un <name>
- -

DESCRIPTION

- +npm un <name> +

DESCRIPTION

This uninstalls a package, completely removing everything npm installed on its behalf.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -37,5 +39,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-root.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-root.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-root.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-root.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,18 +10,20 @@

npm-root

Display npm root

- -

SYNOPSIS

- -
npm root
- -

DESCRIPTION

- +

SYNOPSIS

+
npm root
+

DESCRIPTION

Print the effective node_modules folder to standard out.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -33,5 +35,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-run-script.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-run-script.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-run-script.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-run-script.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,23 +10,25 @@

npm-run-script

Run arbitrary package scripts

- -

SYNOPSIS

- -
npm run-script [<pkg>] <command>
- -

DESCRIPTION

- +

SYNOPSIS

+
npm run-script [<pkg>] [command]
+npm run [<pkg>] [command]
+

DESCRIPTION

This runs an arbitrary command from a package's "scripts" object. If no package name is provided, it will search for a package.json -in the current folder and use its "scripts" object.

- +in the current folder and use its "scripts" object. If no "command" +is provided, it will list the available top level scripts.

It is used by the test, start, restart, and stop commands, but can be called directly, as well.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -38,5 +40,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-search.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-search.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-search.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-search.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,35 +10,34 @@

npm-search

Search for packages

- -

SYNOPSIS

- +

SYNOPSIS

npm search [--long] [search terms ...]
 npm s [search terms ...]
-npm se [search terms ...]
- -

DESCRIPTION

- +npm se [search terms ...] +

DESCRIPTION

Search the registry for packages matching the search terms.

-

If a term starts with /, then it's interpreted as a regular expression. A trailing / will be ignored in this case. (Note that many regular expression characters must be escaped or quoted in most shells.)

- -

CONFIGURATION

- +

CONFIGURATION

long

- -
  • Default: false
  • Type: Boolean
- +
    +
  • Default: false
    • +
  • Type: Boolean
    • +

Display full package descriptions and other long text across multiple lines. When disabled (default) search results are truncated to fit neatly on a single line. Modules with extremely long names will fall on multiple lines.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -50,5 +49,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-shrinkwrap.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-shrinkwrap.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-shrinkwrap.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-shrinkwrap.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,18 +10,13 @@

npm-shrinkwrap

Lock down dependency versions

- -

SYNOPSIS

- -
npm shrinkwrap
- -

DESCRIPTION

- +

SYNOPSIS

+
npm shrinkwrap
+

DESCRIPTION

This command locks down the versions of a package's dependencies so that you can control exactly which versions of each dependency will be used when your package is installed. The "package.json" file is still required if you want to use "npm install".

-

By default, "npm install" recursively installs the target's dependencies (as specified in package.json), choosing the latest available version that satisfies the dependency's semver pattern. In @@ -34,62 +29,47 @@ possible or desirable, as when another author owns the npm package. It's also possible to check dependencies directly into source control, but that may be undesirable for other reasons.

-

As an example, consider package A:

- 
{
   "name": "A",
   "version": "0.1.0",
   "dependencies": {
     "B": "<0.1.0"
   }
-}
- -

package B:

- +} +

package B:

{
   "name": "B",
   "version": "0.0.1",
   "dependencies": {
     "C": "<0.1.0"
   }
-}
- -

and package C:

- +} +

and package C:

{
   "name": "C,
   "version": "0.0.1"
-}
- -

If these are the only versions of A, B, and C available in the +} +

If these are the only versions of A, B, and C available in the registry, then a normal "npm install A" will install:

- 
A@0.1.0
 `-- B@0.0.1
-    `-- C@0.0.1
- -

However, if B@0.0.2 is published, then a fresh "npm install A" will + `-- C@0.0.1 +

However, if B@0.0.2 is published, then a fresh "npm install A" will install:

- 
A@0.1.0
 `-- B@0.0.2
-    `-- C@0.0.1
- -

assuming the new version did not modify B's dependencies. Of course, + `-- C@0.0.1 +

assuming the new version did not modify B's dependencies. Of course, the new version of B could include a new version of C and any number of new dependencies. If such changes are undesirable, the author of A could specify a dependency on B@0.0.1. However, if A's author and B's author are not the same person, there's no way for A's author to say that he or she does not want to pull in newly published versions of C when B hasn't changed at all.

-

In this case, A's author can run

- -
npm shrinkwrap
- -

This generates npm-shrinkwrap.json, which will look something like this:

- +
npm shrinkwrap
+

This generates npm-shrinkwrap.json, which will look something like this:

{
   "name": "A",
   "version": "0.1.0",
@@ -103,9 +83,8 @@
       }
     }
   }
-}
- -

The shrinkwrap command has locked down the dependencies based on +} +

The shrinkwrap command has locked down the dependencies based on what's currently installed in node_modules. When "npm install" installs a package with a npm-shrinkwrap.json file in the package root, the shrinkwrap file (rather than package.json files) completely @@ -114,59 +93,54 @@ installs of this package will use B@0.0.1 and C@0.1.0, regardless the dependencies and versions listed in A's, B's, and C's package.json files.

- -

Using shrinkwrapped packages

- +

Using shrinkwrapped packages

Using a shrinkwrapped package is no different than using any other package: you can "npm install" it by hand, or add a dependency to your package.json file and "npm install" it.

- -

Building shrinkwrapped packages

- +

Building shrinkwrapped packages

To shrinkwrap an existing package:

- -
  1. Run "npm install" in the package root to install the current -versions of all dependencies.
  2. Validate that the package works as expected with these versions.
  3. Run "npm shrinkwrap", add npm-shrinkwrap.json to git, and publish -your package.
- +
    +
  1. Run "npm install" in the package root to install the current +versions of all dependencies.
    2. +
  2. Validate that the package works as expected with these versions.
    3. +
  3. Run "npm shrinkwrap", add npm-shrinkwrap.json to git, and publish +your package.
    4. +

To add or update a dependency in a shrinkwrapped package:

- -
  1. Run "npm install" in the package root to install the current -versions of all dependencies.
  2. Add or update dependencies. "npm install" each new or updated +
      +
    1. Run "npm install" in the package root to install the current +versions of all dependencies.
      2. +
    2. Add or update dependencies. "npm install" each new or updated package individually and then update package.json. Note that they must be explicitly named in order to be installed: running npm install with no arguments will merely reproduce the existing -shrinkwrap.
    3. Validate that the package works as expected with the new -dependencies.
    4. Run "npm shrinkwrap", commit the new npm-shrinkwrap.json, and -publish your package.
    - +shrinkwrap.
    3. +
  3. Validate that the package works as expected with the new +dependencies.
    4. +
  4. Run "npm shrinkwrap", commit the new npm-shrinkwrap.json, and +publish your package.
    5. +

You can use npm-outdated(1) to view dependencies with newer versions available.

- -

Other Notes

- +

Other Notes

A shrinkwrap file must be consistent with the package's package.json file. "npm shrinkwrap" will fail if required dependencies are not already installed, since that would result in a shrinkwrap that wouldn't actually work. Similarly, the command will fail if there are extraneous packages (not referenced by package.json), since that would indicate that package.json is not correct.

-

Since "npm shrinkwrap" is intended to lock down your dependencies for production use, devDependencies will not be included unless you explicitly set the --dev flag when you run npm shrinkwrap. If installed devDependencies are excluded, then npm will print a warning. If you want them to be installed with your module by default, please consider adding them to dependencies instead.

-

If shrinkwrapped package A depends on shrinkwrapped package B, B's shrinkwrap will not be used as part of the installation of A. However, because A's shrinkwrap is constructed from a valid installation of B and recursively specifies all dependencies, the contents of B's shrinkwrap will implicitly be included in A's shrinkwrap.

- -

Caveats

- +

Caveats

Shrinkwrap files only lock down package versions, not actual package contents. While discouraged, a package author can republish an existing version of a package, causing shrinkwrapped packages using @@ -175,16 +149,18 @@ you're using with code that breaks your application, you could modify the shrinkwrap file to use git URL references rather than version numbers so that npm always fetches all packages from git.

-

If you wish to lock down the specific bytes included in a package, for example to have 100% confidence in being able to reproduce a deployment or build, then you ought to check your dependencies into source control, or pursue some other mechanism that can verify contents rather than versions.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -196,5 +172,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-star.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-star.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-star.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-star.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,24 +10,21 @@

npm-star

Mark your favorite packages

- -

SYNOPSIS

- +

SYNOPSIS

npm star <pkgname> [<pkg>, ...]
-npm unstar <pkgname> [<pkg>, ...]
- -

DESCRIPTION

- +npm unstar <pkgname> [<pkg>, ...] +

DESCRIPTION

"Starring" a package means that you have some interest in it. It's a vaguely positive way to show that you care.

-

"Unstarring" is the same thing, but in reverse.

-

It's a boolean thing. Starring repeatedly has no additional effect.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -39,5 +36,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-stars.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-stars.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-stars.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-stars.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,23 +10,22 @@

npm-stars

View packages marked as favorites

- -

SYNOPSIS

- +

SYNOPSIS

npm stars
-npm stars [username]
- -

DESCRIPTION

- +npm stars [username] +

DESCRIPTION

If you have starred a lot of neat things and want to find them again quickly this command lets you do just that.

-

You may also want to see your friend's favorite packages, in this case you will most certainly enjoy this command.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -38,5 +37,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-start.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-start.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-start.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-start.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,18 +10,19 @@

npm-start

Start a package

- -

SYNOPSIS

- -
npm start <name>
- -

DESCRIPTION

- +

SYNOPSIS

+
npm start <name>
+

DESCRIPTION

This runs a package's "start" script, if one was provided.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -33,5 +34,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-stop.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-stop.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-stop.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-stop.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,18 +10,19 @@

npm-stop

Stop a package

- -

SYNOPSIS

- -
npm stop <name>
- -

DESCRIPTION

- +

SYNOPSIS

+
npm stop <name>
+

DESCRIPTION

This runs a package's "stop" script, if one was provided.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -33,5 +34,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-submodule.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-submodule.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-submodule.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-submodule.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,31 +10,27 @@

npm-submodule

Add a package as a git submodule

- -

SYNOPSIS

- -
npm submodule <pkg>
- -

DESCRIPTION

- +

SYNOPSIS

+
npm submodule <pkg>
+

DESCRIPTION

If the specified package has a git repository url in its package.json description, then this command will add it as a git submodule at node_modules/<pkg name>.

-

This is a convenience only. From then on, it's up to you to manage updates by using the appropriate git commands. npm will stubbornly refuse to update, modify, or remove anything with a .git subfolder in it.

-

This command also does not install missing dependencies, if the package does not include them in its git repository. If npm ls reports that things are missing, you can either install, link, or submodule them yourself, or you can do npm explore <pkgname> -- npm install to install the dependencies into the submodule folder.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -46,5 +42,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-tag.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-tag.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-tag.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-tag.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,32 +10,29 @@

npm-tag

Tag a published version

- -

SYNOPSIS

- -
npm tag <name>@<version> [<tag>]
- -

DESCRIPTION

- +

SYNOPSIS

+
npm tag <name>@<version> [<tag>]
+

DESCRIPTION

Tags the specified version of the package with the specified tag, or the --tag config if not specified.

-

A tag can be used when installing packages as a reference to a version instead of using a specific version number:

- -
npm install <name>@<tag>
- -

When installing dependencies, a preferred tagged version may be specified:

- -
npm install --tag <tag>
- -

This also applies to npm dedupe.

- +
npm install <name>@<tag>
+

When installing dependencies, a preferred tagged version may be specified:

+
npm install --tag <tag>
+

This also applies to npm dedupe.

Publishing a package always sets the "latest" tag to the published version.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -47,5 +44,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-test.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-test.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-test.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-test.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,22 +10,22 @@

npm-test

Test a package

- -

SYNOPSIS

- +

SYNOPSIS

  npm test <name>
-  npm tst <name>
- -

DESCRIPTION

- + npm tst <name> +

DESCRIPTION

This runs a package's "test" script, if one was provided.

-

To run tests as a condition of installation, set the npat config to true.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -37,5 +37,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-uninstall.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-uninstall.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-uninstall.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-uninstall.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,38 +10,40 @@

npm-rm

Remove a package

- -

SYNOPSIS

- +

SYNOPSIS

npm uninstall <name> [--save|--save-dev|--save-optional]
-npm rm (with any of the previous argument usage)
- -

DESCRIPTION

- +npm rm (with any of the previous argument usage) +

DESCRIPTION

This uninstalls a package, completely removing everything npm installed on its behalf.

-

Example:

- -
npm uninstall sax
- -

In global mode (ie, with -g or --global appended to the command), +

npm uninstall sax
+

In global mode (ie, with -g or --global appended to the command), it uninstalls the current package context as a global package.

-

npm uninstall takes 3 exclusive, optional flags which save or update the package version in your main package.json:

- -

  • --save: Package will be removed from your dependencies.

  • --save-dev: Package will be removed from your devDependencies.

  • --save-optional: Package will be removed from your optionalDependencies.

- +
    +

  • --save: Package will be removed from your dependencies.

    +
    • +

  • --save-dev: Package will be removed from your devDependencies.

    +
    • +

  • --save-optional: Package will be removed from your optionalDependencies.

    +
    • +

Examples:

- 
npm uninstall sax --save
 npm uninstall node-tap --save-dev
-npm uninstall dtrace-provider --save-optional
- -

SEE ALSO

+npm uninstall dtrace-provider --save-optional +

SEE ALSO

+ -
@@ -53,5 +55,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-unpublish.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-unpublish.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-unpublish.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-unpublish.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,36 +10,31 @@

npm-unpublish

Remove a package from the registry

- -

SYNOPSIS

- -
npm unpublish <name>[@<version>]
- -

WARNING

- +

SYNOPSIS

+
npm unpublish <name>[@<version>]
+

WARNING

It is generally considered bad behavior to remove versions of a library that others are depending on!

-

Consider using the deprecate command instead, if your intent is to encourage users to upgrade.

-

There is plenty of room on the registry.

- -

DESCRIPTION

- +

DESCRIPTION

This removes a package version from the registry, deleting its entry and removing the tarball.

-

If no version is specified, or if all versions are removed then the root package entry is removed from the registry entirely.

-

Even if a package version is unpublished, that specific name and version combination can never be reused. In order to publish the package again, a new version number must be used.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -51,5 +46,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-update.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-update.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-update.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-update.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,24 +10,23 @@

npm-update

Update a package

- -

SYNOPSIS

- -
npm update [-g] [<name> [<name> ...]]
- -

DESCRIPTION

- +

SYNOPSIS

+
npm update [-g] [<name> [<name> ...]]
+

DESCRIPTION

This command will update all the packages listed to the latest version (specified by the tag config).

-

It will also install missing packages.

-

If the -g flag is specified, this command will update globally installed packages. If no package name is specified, all packages in the specified location (global or local) will be updated.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -39,5 +38,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-version.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-version.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-version.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-version.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,35 +10,25 @@

npm-version

Bump a package version

- -

SYNOPSIS

- -
npm version [<newversion> | major | minor | patch]
- -

DESCRIPTION

- +

SYNOPSIS

+
npm version [<newversion> | major | minor | patch]
+

DESCRIPTION

Run this in a package directory to bump the version and write the new data back to the package.json file.

-

The newversion argument should be a valid semver string, or a valid second argument to semver.inc (one of "patch", "minor", or "major"). In the second case, the existing version will be incremented by 1 in the specified field.

-

If run in a git repo, it will also create a version commit and tag, and fail if the repo is not clean.

-

If supplied with --message (shorthand: -m) config option, npm will use it as a commit message when creating a version commit. If the message config contains %s then that will be replaced with the resulting version number. For example:

- -
npm version patch -m "Upgrade to %s for reasons"
- -

If the sign-git-tag config is set, then the tag will be signed using +

npm version patch -m "Upgrade to %s for reasons"
+

If the sign-git-tag config is set, then the tag will be signed using the -s flag to git. Note that you must have a default GPG key set up in your git config for this to work properly. For example:

- 
$ npm config set sign-git-tag true
 $ npm version patch
 
@@ -46,11 +36,14 @@
 user: "isaacs (http://blog.izs.me/) <i@izs.me>"
 2048-bit RSA key, ID 6C481CF6, created 2010-08-31
 
-Enter passphrase:
- -

SEE ALSO

+Enter passphrase: +

SEE ALSO

+ -
@@ -62,5 +55,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-view.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-view.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-view.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-view.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,89 +10,67 @@

npm-view

View registry info

- -

SYNOPSIS

- +

SYNOPSIS

npm view <name>[@<version>] [<field>[.<subfield>]...]
-npm v <name>[@<version>] [<field>[.<subfield>]...]
- -

DESCRIPTION

- +npm v <name>[@<version>] [<field>[.<subfield>]...] +

DESCRIPTION

This command shows data about a package and prints it to the stream referenced by the outfd config, which defaults to stdout.

-

To show the package registry entry for the connect package, you can do this:

- -
npm view connect
- -

The default version is "latest" if unspecified.

- +
npm view connect
+

The default version is "latest" if unspecified.

Field names can be specified after the package descriptor. For example, to show the dependencies of the ronn package at version 0.3.5, you could do the following:

- -
npm view ronn@0.3.5 dependencies
- -

You can view child field by separating them with a period. +

npm view ronn@0.3.5 dependencies
+

You can view child field by separating them with a period. To view the git repository URL for the latest version of npm, you could do this:

- -
npm view npm repository.url
- -

This makes it easy to view information about a dependency with a bit of +

npm view npm repository.url
+

This makes it easy to view information about a dependency with a bit of shell scripting. For example, to view all the data about the version of opts that ronn depends on, you can do this:

- -
npm view opts@$(npm view ronn dependencies.opts)
- -

For fields that are arrays, requesting a non-numeric field will return +

npm view opts@$(npm view ronn dependencies.opts)
+

For fields that are arrays, requesting a non-numeric field will return all of the values from the objects in the list. For example, to get all the contributor names for the "express" project, you can do this:

- -
npm view express contributors.email
- -

You may also use numeric indices in square braces to specifically select +

npm view express contributors.email
+

You may also use numeric indices in square braces to specifically select an item in an array field. To just get the email address of the first contributor in the list, you can do this:

- -
npm view express contributors[0].email
- -

Multiple fields may be specified, and will be printed one after another. +

npm view express contributors[0].email
+

Multiple fields may be specified, and will be printed one after another. For exampls, to get all the contributor names and email addresses, you can do this:

- -
npm view express contributors.name contributors.email
- -

"Person" fields are shown as a string if they would be shown as an +

npm view express contributors.name contributors.email
+

"Person" fields are shown as a string if they would be shown as an object. So, for example, this will show the list of npm contributors in the shortened string format. (See package.json(5) for more on this.)

- -
npm view npm contributors
- -

If a version range is provided, then data will be printed for every +

npm view npm contributors
+

If a version range is provided, then data will be printed for every matching version of the package. This will show which version of jsdom was required by each matching version of yui3:

- -
npm view yui3@'>0.5.4' dependencies.jsdom
- -

OUTPUT

- +
npm view yui3@'>0.5.4' dependencies.jsdom
+

OUTPUT

If only a single string field for a single version is output, then it will not be colorized or quoted, so as to enable piping the output to another command. If the field is an object, it will be output as a JavaScript object literal.

-

If the --json flag is given, the outputted fields will be JSON.

-

If the version range matches multiple versions, than each printed value will be prefixed with the version it applies to.

-

If multiple fields are requested, than each of them are prefixed with the field name.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -104,5 +82,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/cli/npm-whoami.html nodejs-0.10.29/deps/npm/html/doc/cli/npm-whoami.html --- nodejs-0.10.28/deps/npm/html/doc/cli/npm-whoami.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/cli/npm-whoami.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,18 +10,18 @@

npm-whoami

Display npm username

- -

SYNOPSIS

- -
npm whoami
- -

DESCRIPTION

- +

SYNOPSIS

+
npm whoami
+

DESCRIPTION

Print the username config to standard output.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -33,5 +33,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/files/npm-folders.html nodejs-0.10.29/deps/npm/html/doc/files/npm-folders.html --- nodejs-0.10.28/deps/npm/html/doc/files/npm-folders.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/files/npm-folders.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,119 +10,87 @@

npm-folders

Folder Structures Used by npm

- -

DESCRIPTION

- +

DESCRIPTION

npm puts various things on your computer. That's its job.

-

This document will tell you what it puts where.

-

tl;dr

- -
  • Local install (default): puts stuff in ./node_modules of the current -package root.
  • Global install (with -g): puts stuff in /usr/local or wherever node -is installed.
  • Install it locally if you're going to require() it.
  • Install it globally if you're going to run it on the command line.
  • If you need both, then install it in both places, or use npm link.
- -

prefix Configuration

- +
    +
  • Local install (default): puts stuff in ./node_modules of the current +package root.
    • +
  • Global install (with -g): puts stuff in /usr/local or wherever node +is installed.
    • +
  • Install it locally if you're going to require() it.
    • +
  • Install it globally if you're going to run it on the command line.
    • +
  • If you need both, then install it in both places, or use npm link.
    • +
+

prefix Configuration

The prefix config defaults to the location where node is installed. On most systems, this is /usr/local, and most of the time is the same as node's process.installPrefix.

-

On windows, this is the exact location of the node.exe binary. On Unix systems, it's one level up, since node is typically installed at {prefix}/bin/node rather than {prefix}/node.exe.

-

When the global flag is set, npm installs things into this prefix. When it is not set, it uses the root of the current package, or the current working directory if not in a package already.

- -

Node Modules

- +

Node Modules

Packages are dropped into the node_modules folder under the prefix. When installing locally, this means that you can require("packagename") to load its main module, or require("packagename/lib/path/to/sub/module") to load other modules.

-

Global installs on Unix systems go to {prefix}/lib/node_modules. Global installs on Windows go to {prefix}/node_modules (that is, no lib folder.)

-

If you wish to require() a package, then install it locally.

- -

Executables

- +

Executables

When in global mode, executables are linked into {prefix}/bin on Unix, or directly into {prefix} on Windows.

-

When in local mode, executables are linked into ./node_modules/.bin so that they can be made available to scripts run through npm. (For example, so that a test runner will be in the path when you run npm test.)

- -

Man Pages

- +

Man Pages

When in global mode, man pages are linked into {prefix}/share/man.

-

When in local mode, man pages are not installed.

-

Man pages are not installed on Windows systems.

- -

Cache

- +

Cache

See npm-cache(1). Cache files are stored in ~/.npm on Posix, or ~/npm-cache on Windows.

-

This is controlled by the cache configuration param.

- -

Temp Files

- +

Temp Files

Temporary files are stored by default in the folder specified by the tmp config, which defaults to the TMPDIR, TMP, or TEMP environment variables, or /tmp on Unix and c:\windows\temp on Windows.

-

Temp files are given a unique folder under this root for each run of the program, and are deleted upon successful exit.

- -

More Information

- +

More Information

When installing locally, npm first tries to find an appropriate prefix folder. This is so that npm install foo@1.2.3 will install to the sensible root of your package, even if you happen to have cded into some other folder.

-

Starting at the $PWD, npm will walk up the folder tree checking for a folder that contains either a package.json file, or a node_modules folder. If such a thing is found, then that is treated as the effective "current directory" for the purpose of running npm commands. (This behavior is inspired by and similar to git's .git-folder seeking logic when running git commands in a working dir.)

-

If no package root is found, then the current folder is used.

-

When you run npm install foo@1.2.3, then the package is loaded into the cache, and then unpacked into ./node_modules/foo. Then, any of foo's dependencies are similarly unpacked into ./node_modules/foo/node_modules/....

-

Any bin files are symlinked to ./node_modules/.bin/, so that they may be found by npm scripts when necessary.

- -

Global Installation

- +

Global Installation

If the global configuration is set to true, then npm will install packages "globally".

-

For global installation, packages are installed roughly the same way, but using the folders described above.

- -

Cycles, Conflicts, and Folder Parsimony

- +

Cycles, Conflicts, and Folder Parsimony

Cycles are handled using the property of node's module system that it walks up the directories looking for node_modules folders. So, at every stage, if a package is already installed in an ancestor node_modules folder, then it is not installed at the current location.

-

Consider the case above, where foo -> bar -> baz. Imagine if, in addition to that, baz depended on bar, so you'd have: foo -> bar -> baz -> bar -> baz .... However, since the folder @@ -130,21 +98,16 @@ put another copy of bar into .../baz/node_modules, since when it calls require("bar"), it will get the copy that is installed in foo/node_modules/bar.

-

This shortcut is only used if the exact same version would be installed in multiple nested node_modules folders. It is still possible to have a/node_modules/b/node_modules/a if the two "a" packages are different versions. However, without repeating the exact same package multiple times, an infinite regress will always be prevented.

-

Another optimization can be made by installing dependencies at the highest level possible, below the localized "target" folder.

- -

Example

- +

Example

Consider this dependency graph:

- 
foo
 +-- blerg@1.2.5
 +-- bar@1.2.3
@@ -155,10 +118,8 @@
 |   `-- asdf@*
 `-- baz@1.2.3
     `-- quux@3.x
-        `-- bar
- -

In this case, we might expect a folder structure like this:

- + `-- bar +

In this case, we might expect a folder structure like this:

foo
 +-- node_modules
     +-- blerg (1.2.5) <---[A]
@@ -170,43 +131,43 @@
     |       `-- asdf (2.3.4)
     `-- baz (1.2.3) <---[D]
         `-- node_modules
-            `-- quux (3.2.0) <---[E]
- -

Since foo depends directly on bar@1.2.3 and baz@1.2.3, those are + `-- quux (3.2.0) <---[E] +

Since foo depends directly on bar@1.2.3 and baz@1.2.3, those are installed in foo's node_modules folder.

-

Even though the latest copy of blerg is 1.3.7, foo has a specific dependency on version 1.2.5. So, that gets installed at [A]. Since the parent installation of blerg satisfies bar's dependency on blerg@1.x, it does not install another copy under [B].

-

Bar [B] also has dependencies on baz and asdf, so those are installed in bar's node_modules folder. Because it depends on baz@2.x, it cannot re-use the baz@1.2.3 installed in the parent node_modules folder [D], and must install its own copy [C].

-

Underneath bar, the baz -> quux -> bar dependency creates a cycle. However, because bar is already in quux's ancestry [B], it does not unpack another copy of bar into that folder.

-

Underneath foo -> baz [D], quux's [E] folder tree is empty, because its dependency on bar is satisfied by the parent folder copy installed at [B].

-

For a graphical breakdown of what is installed where, use npm ls.

- -

Publishing

- +

Publishing

Upon publishing, npm will look in the node_modules folder. If any of the items there are not in the bundledDependencies array, then they will not be included in the package tarball.

-

This allows a package maintainer to install all of their dependencies (and dev dependencies) locally, but only re-publish those items that cannot be found elsewhere. See package.json(5) for more information.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -218,5 +179,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/files/npm-global.html nodejs-0.10.29/deps/npm/html/doc/files/npm-global.html --- nodejs-0.10.28/deps/npm/html/doc/files/npm-global.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/files/npm-global.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,119 +10,87 @@

npm-folders

Folder Structures Used by npm

- -

DESCRIPTION

- +

DESCRIPTION

npm puts various things on your computer. That's its job.

-

This document will tell you what it puts where.

-

tl;dr

- -
  • Local install (default): puts stuff in ./node_modules of the current -package root.
  • Global install (with -g): puts stuff in /usr/local or wherever node -is installed.
  • Install it locally if you're going to require() it.
  • Install it globally if you're going to run it on the command line.
  • If you need both, then install it in both places, or use npm link.
- -

prefix Configuration

- +
    +
  • Local install (default): puts stuff in ./node_modules of the current +package root.
    • +
  • Global install (with -g): puts stuff in /usr/local or wherever node +is installed.
    • +
  • Install it locally if you're going to require() it.
    • +
  • Install it globally if you're going to run it on the command line.
    • +
  • If you need both, then install it in both places, or use npm link.
    • +
+

prefix Configuration

The prefix config defaults to the location where node is installed. On most systems, this is /usr/local, and most of the time is the same as node's process.installPrefix.

-

On windows, this is the exact location of the node.exe binary. On Unix systems, it's one level up, since node is typically installed at {prefix}/bin/node rather than {prefix}/node.exe.

-

When the global flag is set, npm installs things into this prefix. When it is not set, it uses the root of the current package, or the current working directory if not in a package already.

- -

Node Modules

- +

Node Modules

Packages are dropped into the node_modules folder under the prefix. When installing locally, this means that you can require("packagename") to load its main module, or require("packagename/lib/path/to/sub/module") to load other modules.

-

Global installs on Unix systems go to {prefix}/lib/node_modules. Global installs on Windows go to {prefix}/node_modules (that is, no lib folder.)

-

If you wish to require() a package, then install it locally.

- -

Executables

- +

Executables

When in global mode, executables are linked into {prefix}/bin on Unix, or directly into {prefix} on Windows.

-

When in local mode, executables are linked into ./node_modules/.bin so that they can be made available to scripts run through npm. (For example, so that a test runner will be in the path when you run npm test.)

- -

Man Pages

- +

Man Pages

When in global mode, man pages are linked into {prefix}/share/man.

-

When in local mode, man pages are not installed.

-

Man pages are not installed on Windows systems.

- -

Cache

- +

Cache

See npm-cache(1). Cache files are stored in ~/.npm on Posix, or ~/npm-cache on Windows.

-

This is controlled by the cache configuration param.

- -

Temp Files

- +

Temp Files

Temporary files are stored by default in the folder specified by the tmp config, which defaults to the TMPDIR, TMP, or TEMP environment variables, or /tmp on Unix and c:\windows\temp on Windows.

-

Temp files are given a unique folder under this root for each run of the program, and are deleted upon successful exit.

- -

More Information

- +

More Information

When installing locally, npm first tries to find an appropriate prefix folder. This is so that npm install foo@1.2.3 will install to the sensible root of your package, even if you happen to have cded into some other folder.

-

Starting at the $PWD, npm will walk up the folder tree checking for a folder that contains either a package.json file, or a node_modules folder. If such a thing is found, then that is treated as the effective "current directory" for the purpose of running npm commands. (This behavior is inspired by and similar to git's .git-folder seeking logic when running git commands in a working dir.)

-

If no package root is found, then the current folder is used.

-

When you run npm install foo@1.2.3, then the package is loaded into the cache, and then unpacked into ./node_modules/foo. Then, any of foo's dependencies are similarly unpacked into ./node_modules/foo/node_modules/....

-

Any bin files are symlinked to ./node_modules/.bin/, so that they may be found by npm scripts when necessary.

- -

Global Installation

- +

Global Installation

If the global configuration is set to true, then npm will install packages "globally".

-

For global installation, packages are installed roughly the same way, but using the folders described above.

- -

Cycles, Conflicts, and Folder Parsimony

- +

Cycles, Conflicts, and Folder Parsimony

Cycles are handled using the property of node's module system that it walks up the directories looking for node_modules folders. So, at every stage, if a package is already installed in an ancestor node_modules folder, then it is not installed at the current location.

-

Consider the case above, where foo -> bar -> baz. Imagine if, in addition to that, baz depended on bar, so you'd have: foo -> bar -> baz -> bar -> baz .... However, since the folder @@ -130,21 +98,16 @@ put another copy of bar into .../baz/node_modules, since when it calls require("bar"), it will get the copy that is installed in foo/node_modules/bar.

-

This shortcut is only used if the exact same version would be installed in multiple nested node_modules folders. It is still possible to have a/node_modules/b/node_modules/a if the two "a" packages are different versions. However, without repeating the exact same package multiple times, an infinite regress will always be prevented.

-

Another optimization can be made by installing dependencies at the highest level possible, below the localized "target" folder.

- -

Example

- +

Example

Consider this dependency graph:

- 
foo
 +-- blerg@1.2.5
 +-- bar@1.2.3
@@ -155,10 +118,8 @@
 |   `-- asdf@*
 `-- baz@1.2.3
     `-- quux@3.x
-        `-- bar
- -

In this case, we might expect a folder structure like this:

- + `-- bar +

In this case, we might expect a folder structure like this:

foo
 +-- node_modules
     +-- blerg (1.2.5) <---[A]
@@ -170,43 +131,43 @@
     |       `-- asdf (2.3.4)
     `-- baz (1.2.3) <---[D]
         `-- node_modules
-            `-- quux (3.2.0) <---[E]
- -

Since foo depends directly on bar@1.2.3 and baz@1.2.3, those are + `-- quux (3.2.0) <---[E] +

Since foo depends directly on bar@1.2.3 and baz@1.2.3, those are installed in foo's node_modules folder.

-

Even though the latest copy of blerg is 1.3.7, foo has a specific dependency on version 1.2.5. So, that gets installed at [A]. Since the parent installation of blerg satisfies bar's dependency on blerg@1.x, it does not install another copy under [B].

-

Bar [B] also has dependencies on baz and asdf, so those are installed in bar's node_modules folder. Because it depends on baz@2.x, it cannot re-use the baz@1.2.3 installed in the parent node_modules folder [D], and must install its own copy [C].

-

Underneath bar, the baz -> quux -> bar dependency creates a cycle. However, because bar is already in quux's ancestry [B], it does not unpack another copy of bar into that folder.

-

Underneath foo -> baz [D], quux's [E] folder tree is empty, because its dependency on bar is satisfied by the parent folder copy installed at [B].

-

For a graphical breakdown of what is installed where, use npm ls.

- -

Publishing

- +

Publishing

Upon publishing, npm will look in the node_modules folder. If any of the items there are not in the bundledDependencies array, then they will not be included in the package tarball.

-

This allows a package maintainer to install all of their dependencies (and dev dependencies) locally, but only re-publish those items that cannot be found elsewhere. See package.json(5) for more information.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -218,5 +179,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/files/npm-json.html nodejs-0.10.29/deps/npm/html/doc/files/npm-json.html --- nodejs-0.10.28/deps/npm/html/doc/files/npm-json.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/files/npm-json.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,257 +10,178 @@

package.json

Specifics of npm's package.json handling

- -

DESCRIPTION

- +

DESCRIPTION

This document is all you need to know about what's required in your package.json file. It must be actual JSON, not just a JavaScript object literal.

-

A lot of the behavior described in this document is affected by the config settings described in npm-config(7).

-

name

-

The most important things in your package.json are the name and version fields. Those are actually required, and your package won't install without them. The name and version together form an identifier that is assumed to be completely unique. Changes to the package should come along with changes to the version.

-

The name is what your thing is called. Some tips:

- -
  • Don't put "js" or "node" in the name. It's assumed that it's js, since you're +
      +
    • Don't put "js" or "node" in the name. It's assumed that it's js, since you're writing a package.json file, and you can specify the engine using the "engines" -field. (See below.)
    • The name ends up being part of a URL, an argument on the command line, and a +field. (See below.)
      • +
    • The name ends up being part of a URL, an argument on the command line, and a folder name. Any name with non-url-safe characters will be rejected. -Also, it can't start with a dot or an underscore.
    • The name will probably be passed as an argument to require(), so it should -be something short, but also reasonably descriptive.
    • You may want to check the npm registry to see if there's something by that name -already, before you get too attached to it. http://registry.npmjs.org/
    - +Also, it can't start with a dot or an underscore.
    • +
  • The name will probably be passed as an argument to require(), so it should +be something short, but also reasonably descriptive.
    • +
  • You may want to check the npm registry to see if there's something by that name +already, before you get too attached to it. http://registry.npmjs.org/
    • +

version

-

The most important things in your package.json are the name and version fields. Those are actually required, and your package won't install without them. The name and version together form an identifier that is assumed to be completely unique. Changes to the package should come along with changes to the version.

-

Version must be parseable by node-semver, which is bundled with npm as a dependency. (npm install semver to use it yourself.)

-

More on version numbers and ranges at semver(7).

-

description

-

Put a description in it. It's a string. This helps people discover your package, as it's listed in npm search.

-

keywords

-

Put keywords in it. It's an array of strings. This helps people discover your package as it's listed in npm search.

-

homepage

-

The url to the project homepage.

-

NOTE: This is not the same as "url". If you put a "url" field, then the registry will think it's a redirection to your package that has been published somewhere else, and spit at you.

-

Literally. Spit. I'm so not kidding.

-

bugs

-

The url to your project's issue tracker and / or the email address to which issues should be reported. These are helpful for people who encounter issues with your package.

-

It should look like this:

- 
{ "url" : "http://github.com/owner/project/issues"
 , "email" : "project@hostname.com"
-}
- -

You can specify either one or both values. If you want to provide only a url, +} +

You can specify either one or both values. If you want to provide only a url, you can specify the value for "bugs" as a simple string instead of an object.

-

If a url is provided, it will be used by the npm bugs command.

-

license

-

You should specify a license for your package so that people know how they are permitted to use it, and any restrictions you're placing on it.

-

The simplest way, assuming you're using a common license such as BSD-3-Clause or MIT, is to just specify the standard SPDX ID of the license you're using, like this:

- -
{ "license" : "BSD-3-Clause" }
- -

You can check the full list of SPDX license IDs. +

{ "license" : "BSD-3-Clause" }
+

You can check the full list of SPDX license IDs. Ideally you should pick one that is OSI approved.

-

It's also a good idea to include a LICENSE file at the top level in your package.

-

people fields: author, contributors

-

The "author" is one person. "contributors" is an array of people. A "person" is an object with a "name" field and optionally "url" and "email", like this:

- 
{ "name" : "Barney Rubble"
 , "email" : "b@rubble.com"
 , "url" : "http://barnyrubble.tumblr.com/"
-}
- -

Or you can shorten that all into a single string, and npm will parse it for you:

- -
"Barney Rubble <b@rubble.com> (http://barnyrubble.tumblr.com/)
- -

Both email and url are optional either way.

- +} +

Or you can shorten that all into a single string, and npm will parse it for you:

+
"Barney Rubble <b@rubble.com> (http://barnyrubble.tumblr.com/)
+

Both email and url are optional either way.

npm also sets a top-level "maintainers" field with your npm user info.

-

files

-

The "files" field is an array of files to include in your project. If you name a folder in the array, then it will also include the files inside that folder. (Unless they would be ignored by another rule.)

-

You can also provide a ".npmignore" file in the root of your package, which will keep files from being included, even if they would be picked up by the files array. The ".npmignore" file works just like a ".gitignore".

-

main

-

The main field is a module ID that is the primary entry point to your program. That is, if your package is named foo, and a user installs it, and then does require("foo"), then your main module's exports object will be returned.

-

This should be a module ID relative to the root of your package folder.

-

For most modules, it makes the most sense to have a main script and often not much else.

-

bin

-

A lot of packages have one or more executable files that they'd like to install into the PATH. npm makes this pretty easy (in fact, it uses this feature to install the "npm" executable.)

-

To use this, supply a bin field in your package.json which is a map of command name to local file name. On install, npm will symlink that file into prefix/bin for global installs, or ./node_modules/.bin/ for local installs.

-

For example, npm has this:

- -
{ "bin" : { "npm" : "./cli.js" } }
- -

So, when you install npm, it'll create a symlink from the cli.js script to +

{ "bin" : { "npm" : "./cli.js" } }
+

So, when you install npm, it'll create a symlink from the cli.js script to /usr/local/bin/npm.

-

If you have a single executable, and its name should be the name of the package, then you can just supply it as a string. For example:

- 
{ "name": "my-program"
 , "version": "1.2.5"
-, "bin": "./path/to/program" }
- -

would be the same as this:

- +, "bin": "./path/to/program" } +

would be the same as this:

{ "name": "my-program"
 , "version": "1.2.5"
-, "bin" : { "my-program" : "./path/to/program" } }
- -

man

- +, "bin" : { "my-program" : "./path/to/program" } } +

man

Specify either a single file or an array of filenames to put in place for the man program to find.

-

If only a single file is provided, then it's installed such that it is the result from man <pkgname>, regardless of its actual filename. For example:

- 
{ "name" : "foo"
 , "version" : "1.2.3"
 , "description" : "A packaged foo fooer for fooing foos"
 , "main" : "foo.js"
 , "man" : "./man/doc.1"
-}
- -

would link the ./man/doc.1 file in such that it is the target for man foo

- +} +

would link the ./man/doc.1 file in such that it is the target for man foo

If the filename doesn't start with the package name, then it's prefixed. So, this:

- 
{ "name" : "foo"
 , "version" : "1.2.3"
 , "description" : "A packaged foo fooer for fooing foos"
 , "main" : "foo.js"
 , "man" : [ "./man/foo.1", "./man/bar.1" ]
-}
- -

will create files to do man foo and man foo-bar.

- +} +

will create files to do man foo and man foo-bar.

Man files must end with a number, and optionally a .gz suffix if they are compressed. The number dictates which man section the file is installed into.

- 
{ "name" : "foo"
 , "version" : "1.2.3"
 , "description" : "A packaged foo fooer for fooing foos"
 , "main" : "foo.js"
 , "man" : [ "./man/foo.1", "./man/foo.2" ]
-}
- -

will create entries for man foo and man 2 foo

- +} +

will create entries for man foo and man 2 foo

directories

-

The CommonJS Packages spec details a few ways that you can indicate the structure of your package using a directories hash. If you look at npm's package.json, you'll see that it has directories for doc, lib, and man.

-

In the future, this information may be used in other creative ways.

-

directories.lib

-

Tell people where the bulk of your library is. Nothing special is done with the lib folder in any way, but it's useful meta info.

-

directories.bin

-

If you specify a "bin" directory, then all the files in that folder will be used as the "bin" hash.

-

If you have a "bin" hash already, then this has no effect.

-

directories.man

-

A folder that is full of man pages. Sugar to generate a "man" array by walking the folder.

-

directories.doc

-

Put markdown files in here. Eventually, these will be displayed nicely, maybe, someday.

-

directories.example

-

Put example scripts in here. Someday, it might be exposed in some clever way.

-

repository

-

Specify the place where your code lives. This is helpful for people who want to contribute. If the git repo is on github, then the npm docs command will be able to find you.

-

Do it like this:

- 
"repository" :
   { "type" : "git"
   , "url" : "http://github.com/npm/npm.git"
@@ -269,52 +190,52 @@
 "repository" :
   { "type" : "svn"
   , "url" : "http://v8.googlecode.com/svn/trunk/"
-  }
- -

The URL should be a publicly available (perhaps read-only) url that can be handed + } +

The URL should be a publicly available (perhaps read-only) url that can be handed directly to a VCS program without any modification. It should not be a url to an html project page that you put in your browser. It's for computers.

-

scripts

-

The "scripts" member is an object hash of script commands that are run at various times in the lifecycle of your package. The key is the lifecycle event, and the value is the command to run at that point.

-

See npm-scripts(7) to find out more about writing package scripts.

-

config

-

A "config" hash can be used to set configuration parameters used in package scripts that persist across upgrades. For instance, if a package had the following:

- 
{ "name" : "foo"
-, "config" : { "port" : "8080" } }
- -

and then had a "start" command that then referenced the +, "config" : { "port" : "8080" } } +

and then had a "start" command that then referenced the npm_package_config_port environment variable, then the user could override that by doing npm config set foo:port 8001.

-

See npm-config(7) and npm-scripts(7) for more on package configs.

-

dependencies

-

Dependencies are specified with a simple hash of package name to version range. The version range is a string which has one or more space-separated descriptors. Dependencies can also be identified with a tarball or git URL.

-

Please do not put test harnesses or transpilers in your dependencies hash. See devDependencies, below.

-

See semver(7) for more details about specifying version ranges.

- -
  • version Must match version exactly
  • >version Must be greater than version
  • >=version etc
  • <version
  • <=version
  • ~version "Approximately equivalent to version" See semver(7)
  • ^version "Compatible with version" See semver(7)
  • 1.2.x 1.2.0, 1.2.1, etc., but not 1.3.0
  • http://... See 'URLs as Dependencies' below
  • * Matches any version
  • "" (just an empty string) Same as *
  • version1 - version2 Same as >=version1 <=version2.
  • range1 || range2 Passes if either range1 or range2 are satisfied.
  • git... See 'Git URLs as Dependencies' below
  • user/repo See 'GitHub URLs' below
- +
    +
  • version Must match version exactly
    • +
  • >version Must be greater than version
    • +
  • >=version etc
    • +
  • <version
    • +
  • <=version
    • +
  • ~version "Approximately equivalent to version" See semver(7)
    • +
  • ^version "Compatible with version" See semver(7)
    • +
  • 1.2.x 1.2.0, 1.2.1, etc., but not 1.3.0
    • +
  • http://... See 'URLs as Dependencies' below
    • +
  • * Matches any version
    • +
  • "" (just an empty string) Same as *
    • +
  • version1 - version2 Same as >=version1 <=version2.
    • +
  • range1 || range2 Passes if either range1 or range2 are satisfied.
    • +
  • git... See 'Git URLs as Dependencies' below
    • +
  • user/repo See 'GitHub URLs' below
    • +

For example, these are all valid:

- 
{ "dependencies" :
   { "foo" : "1.0.0 - 2.9999.9999"
   , "bar" : ">=1.0.2 <2.1.2"
@@ -327,59 +248,42 @@
   , "two" : "2.x"
   , "thr" : "3.3.x"
   }
-}
- -

URLs as Dependencies

- +} +

URLs as Dependencies

You may specify a tarball URL in place of a version range.

-

This tarball will be downloaded and installed locally to your package at install time.

- -

Git URLs as Dependencies

- +

Git URLs as Dependencies

Git urls can be of the form:

- 
git://github.com/user/project.git#commit-ish
 git+ssh://user@hostname:project.git#commit-ish
 git+ssh://user@hostname/project.git#commit-ish
 git+http://user@hostname/project/blah.git#commit-ish
-git+https://user@hostname/project/blah.git#commit-ish
- -

The commit-ish can be any tag, sha, or branch which can be supplied as +git+https://user@hostname/project/blah.git#commit-ish +

The commit-ish can be any tag, sha, or branch which can be supplied as an argument to git checkout. The default is master.

- -

GitHub URLs

- +

GitHub URLs

As of version 1.1.65, you can refer to GitHub urls as just "foo": "user/foo-project". For example:

- 
{
   "name": "foo",
   "version": "0.0.0",
   "dependencies": {
     "express": "visionmedia/express"
   }
-}
- -

devDependencies

- +} +

devDependencies

If someone is planning on downloading and using your module in their program, then they probably don't want or need to download and build the external test or documentation framework that you use.

-

In this case, it's best to list these additional items in a devDependencies hash.

-

These things will be installed when doing npm link or npm install from the root of a package, and can be managed like any other npm configuration param. See npm-config(7) for more on the topic.

-

For build steps that are not platform-specific, such as compiling CoffeeScript or other languages to JavaScript, use the prepublish script to do this, and make the required package a devDependency.

-

For example:

- 
{ "name": "ethopia-waza",
   "description": "a delightfully fruity coffee varietal",
   "version": "1.2.3",
@@ -390,64 +294,48 @@
     "prepublish": "coffee -o lib/ -c src/waza.coffee"
   },
   "main": "lib/waza.js"
-}
- -

The prepublish script will be run before publishing, so that users +} +

The prepublish script will be run before publishing, so that users can consume the functionality without requiring them to compile it themselves. In dev mode (ie, locally running npm install), it'll run this script as well, so that you can test it easily.

- -

peerDependencies

- +

peerDependencies

In some cases, you want to express the compatibility of your package with an host tool or library, while not necessarily doing a require of this host. This is usually refered to as a plugin. Notably, your module may be exposing a specific interface, expected and specified by the host documentation.

-

For example:

- 
{
   "name": "tea-latte",
   "version": "1.3.5"
   "peerDependencies": {
     "tea": "2.x"
   }
-}
- -

This ensures your package tea-latte can be installed along with the second +} +

This ensures your package tea-latte can be installed along with the second major version of the host package tea only. The host package is automatically installed if needed. npm install tea-latte could possibly yield the following dependency graph:

- 
├── tea-latte@1.3.5
-└── tea@2.2.0
- -

Trying to install another plugin with a conflicting requirement will cause an +└── tea@2.2.0 +

Trying to install another plugin with a conflicting requirement will cause an error. For this reason, make sure your plugin requirement is as broad as possible, and not to lock it down to specific patch versions.

-

Assuming the host complies with semver, only changes in the host package's major version will break your plugin. Thus, if you've worked with every 1.x version of the host package, use "^1.0" or "1.x" to express this. If you depend on features introduced in 1.5.2, use ">= 1.5.2 < 2".

- -

bundledDependencies

- +

bundledDependencies

Array of package names that will be bundled when publishing the package.

-

If this is spelled "bundleDependencies", then that is also honorable.

- -

optionalDependencies

- +

optionalDependencies

If a dependency can be used, but you would like npm to proceed if it cannot be found or fails to install, then you may put it in the optionalDependencies hash. This is a map of package name to version or url, just like the dependencies hash. The difference is that failure is tolerated.

-

It is still your program's responsibility to handle the lack of the dependency. For example, something like this:

- 
try {
   var foo = require('foo')
   var fooVersion = require('foo/package.json').version
@@ -462,122 +350,104 @@
 
 if (foo) {
   foo.doFooThings()
-}
- -

Entries in optionalDependencies will override entries of the same name in +} +

Entries in optionalDependencies will override entries of the same name in dependencies, so it's usually best to only put in one place.

-

engines

-

You can specify the version of node that your stuff works on:

- -
{ "engines" : { "node" : ">=0.10.3 <0.12" } }
- -

And, like with dependencies, if you don't specify the version (or if you +

{ "engines" : { "node" : ">=0.10.3 <0.12" } }
+

And, like with dependencies, if you don't specify the version (or if you specify "*" as the version), then any version of node will do.

-

If you specify an "engines" field, then npm will require that "node" be somewhere on that list. If "engines" is omitted, then npm will just assume that it works on node.

-

You can also use the "engines" field to specify which versions of npm are capable of properly installing your program. For example:

- -
{ "engines" : { "npm" : "~1.0.20" } }
- -

Note that, unless the user has set the engine-strict config flag, this +

{ "engines" : { "npm" : "~1.0.20" } }
+

Note that, unless the user has set the engine-strict config flag, this field is advisory only.

- -

engineStrict

- +

engineStrict

If you are sure that your module will definitely not run properly on versions of Node/npm other than those specified in the engines hash, then you can set "engineStrict": true in your package.json file. This will override the user's engine-strict config setting.

-

Please do not do this unless you are really very very sure. If your engines hash is something overly restrictive, you can quite easily and inadvertently lock yourself into obscurity and prevent your users from updating to new versions of Node. Consider this choice carefully. If people abuse it, it will be removed in a future version of npm.

-

os

-

You can specify which operating systems your module will run on:

- -
"os" : [ "darwin", "linux" ]
- -

You can also blacklist instead of whitelist operating systems, +

"os" : [ "darwin", "linux" ]
+

You can also blacklist instead of whitelist operating systems, just prepend the blacklisted os with a '!':

- -
"os" : [ "!win32" ]
- -

The host operating system is determined by process.platform

- +
"os" : [ "!win32" ]
+

The host operating system is determined by process.platform

It is allowed to both blacklist, and whitelist, although there isn't any good reason to do this.

-

cpu

-

If your code only runs on certain cpu architectures, you can specify which ones.

- -
"cpu" : [ "x64", "ia32" ]
- -

Like the os option, you can also blacklist architectures:

- -
"cpu" : [ "!arm", "!mips" ]
- -

The host architecture is determined by process.arch

- -

preferGlobal

- +
"cpu" : [ "x64", "ia32" ]
+

Like the os option, you can also blacklist architectures:

+
"cpu" : [ "!arm", "!mips" ]
+

The host architecture is determined by process.arch

+

preferGlobal

If your package is primarily a command-line application that should be installed globally, then set this value to true to provide a warning if it is installed locally.

-

It doesn't actually prevent users from installing it locally, but it does help prevent some confusion if it doesn't work as expected.

-

private

-

If you set "private": true in your package.json, then npm will refuse to publish it.

-

This is a way to prevent accidental publication of private repositories. If you would like to ensure that a given package is only ever published to a specific registry (for example, an internal registry), then use the publishConfig hash described below to override the registry config param at publish-time.

- -

publishConfig

- +

publishConfig

This is a set of config values that will be used at publish-time. It's especially handy if you want to set the tag or registry, so that you can ensure that a given package is not tagged with "latest" or published to the global public registry by default.

-

Any config values can be overridden, but of course only "tag" and "registry" probably matter for the purposes of publishing.

-

See npm-config(7) to see the list of config options that can be overridden.

- -

DEFAULT VALUES

- +

DEFAULT VALUES

npm will default some values based on package contents.

- -

  • "scripts": {"start": "node server.js"}

    If there is a server.js file in the root of your package, then npm -will default the start command to node server.js.

  • "scripts":{"preinstall": "node-gyp rebuild"}

    If there is a binding.gyp file in the root of your package, npm will -default the preinstall command to compile using node-gyp.

  • "contributors": [...]

    If there is an AUTHORS file in the root of your package, npm will +

      +

    • "scripts": {"start": "node server.js"}

      +

      If there is a server.js file in the root of your package, then npm +will default the start command to node server.js.

      +
      • +

    • "scripts":{"preinstall": "node-gyp rebuild"}

      +

      If there is a binding.gyp file in the root of your package, npm will +default the preinstall command to compile using node-gyp.

      +
      • +

    • "contributors": [...]

      +

      If there is an AUTHORS file in the root of your package, npm will treat each line as a Name <email> (url) format, where email and url are optional. Lines which start with a # or are blank, will be -ignored.

    - -

    SEE ALSO

    +ignored.

    +
    • +
+

SEE ALSO

+ -
@@ -589,5 +459,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/files/npmrc.html nodejs-0.10.29/deps/npm/html/doc/files/npmrc.html --- nodejs-0.10.28/deps/npm/html/doc/files/npmrc.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/files/npmrc.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,57 +10,58 @@

npmrc

The npm config files

- -

DESCRIPTION

- +

DESCRIPTION

npm gets its config settings from the command line, environment variables, and npmrc files.

-

The npm config command can be used to update and edit the contents of the user and global npmrc files.

-

For a list of available configuration options, see npm-config(7).

- -

FILES

- -

The three relevant files are:

- -
  • per-user config file (~/.npmrc)
  • global config file ($PREFIX/npmrc)
  • npm builtin config file (/path/to/npm/npmrc)
- +

FILES

+

The four relevant files are:

+
    +
  • per-project config file (/path/to/my/project/.npmrc)
    • +
  • per-user config file (~/.npmrc)
    • +
  • global config file ($PREFIX/npmrc)
    • +
  • npm builtin config file (/path/to/npm/npmrc)
    • +

All npm config files are an ini-formatted list of key = value parameters. Environment variables can be replaced using ${VARIABLE_NAME}. For example:

- -
prefix = ${HOME}/.npm-packages
- -

Each of these files is loaded, and config options are resolved in +

prefix = ${HOME}/.npm-packages
+

Each of these files is loaded, and config options are resolved in priority order. For example, a setting in the userconfig file would override the setting in the globalconfig file.

- -

Per-user config file

- +

Per-project config file

+

When working locally in a project, a .npmrc file in the root of the +project (ie, a sibling of node_modules and package.json) will set +config values specific to this project.

+

Note that this only applies to the root of the project that you're +running npm in. It has no effect when your module is published. For +example, you can't publish a module that forces itself to install +globally, or in a different location.

+

Per-user config file

$HOME/.npmrc (or the userconfig param, if set in the environment or on the command line)

- -

Global config file

- +

Global config file

$PREFIX/etc/npmrc (or the globalconfig param, if set above): This file is an ini-file formatted list of key = value parameters. Environment variables can be replaced as above.

- -

Built-in config file

- +

Built-in config file

path/to/npm/itself/npmrc

-

This is an unchangeable "builtin" configuration file that npm keeps consistent across updates. Set fields in here using the ./configure script that comes with npm. This is primarily for distribution maintainers to override default configs in a standard and consistent manner.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -72,5 +73,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/files/package.json.html nodejs-0.10.29/deps/npm/html/doc/files/package.json.html --- nodejs-0.10.28/deps/npm/html/doc/files/package.json.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/files/package.json.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,257 +10,178 @@

package.json

Specifics of npm's package.json handling

- -

DESCRIPTION

- +

DESCRIPTION

This document is all you need to know about what's required in your package.json file. It must be actual JSON, not just a JavaScript object literal.

-

A lot of the behavior described in this document is affected by the config settings described in npm-config(7).

-

name

-

The most important things in your package.json are the name and version fields. Those are actually required, and your package won't install without them. The name and version together form an identifier that is assumed to be completely unique. Changes to the package should come along with changes to the version.

-

The name is what your thing is called. Some tips:

- -
  • Don't put "js" or "node" in the name. It's assumed that it's js, since you're +
      +
    • Don't put "js" or "node" in the name. It's assumed that it's js, since you're writing a package.json file, and you can specify the engine using the "engines" -field. (See below.)
    • The name ends up being part of a URL, an argument on the command line, and a +field. (See below.)
      • +
    • The name ends up being part of a URL, an argument on the command line, and a folder name. Any name with non-url-safe characters will be rejected. -Also, it can't start with a dot or an underscore.
    • The name will probably be passed as an argument to require(), so it should -be something short, but also reasonably descriptive.
    • You may want to check the npm registry to see if there's something by that name -already, before you get too attached to it. http://registry.npmjs.org/
    - +Also, it can't start with a dot or an underscore.
    • +
  • The name will probably be passed as an argument to require(), so it should +be something short, but also reasonably descriptive.
    • +
  • You may want to check the npm registry to see if there's something by that name +already, before you get too attached to it. http://registry.npmjs.org/
    • +

version

-

The most important things in your package.json are the name and version fields. Those are actually required, and your package won't install without them. The name and version together form an identifier that is assumed to be completely unique. Changes to the package should come along with changes to the version.

-

Version must be parseable by node-semver, which is bundled with npm as a dependency. (npm install semver to use it yourself.)

-

More on version numbers and ranges at semver(7).

-

description

-

Put a description in it. It's a string. This helps people discover your package, as it's listed in npm search.

-

keywords

-

Put keywords in it. It's an array of strings. This helps people discover your package as it's listed in npm search.

-

homepage

-

The url to the project homepage.

-

NOTE: This is not the same as "url". If you put a "url" field, then the registry will think it's a redirection to your package that has been published somewhere else, and spit at you.

-

Literally. Spit. I'm so not kidding.

-

bugs

-

The url to your project's issue tracker and / or the email address to which issues should be reported. These are helpful for people who encounter issues with your package.

-

It should look like this:

- 
{ "url" : "http://github.com/owner/project/issues"
 , "email" : "project@hostname.com"
-}
- -

You can specify either one or both values. If you want to provide only a url, +} +

You can specify either one or both values. If you want to provide only a url, you can specify the value for "bugs" as a simple string instead of an object.

-

If a url is provided, it will be used by the npm bugs command.

-

license

-

You should specify a license for your package so that people know how they are permitted to use it, and any restrictions you're placing on it.

-

The simplest way, assuming you're using a common license such as BSD-3-Clause or MIT, is to just specify the standard SPDX ID of the license you're using, like this:

- -
{ "license" : "BSD-3-Clause" }
- -

You can check the full list of SPDX license IDs. +

{ "license" : "BSD-3-Clause" }
+

You can check the full list of SPDX license IDs. Ideally you should pick one that is OSI approved.

-

It's also a good idea to include a LICENSE file at the top level in your package.

-

people fields: author, contributors

-

The "author" is one person. "contributors" is an array of people. A "person" is an object with a "name" field and optionally "url" and "email", like this:

- 
{ "name" : "Barney Rubble"
 , "email" : "b@rubble.com"
 , "url" : "http://barnyrubble.tumblr.com/"
-}
- -

Or you can shorten that all into a single string, and npm will parse it for you:

- -
"Barney Rubble <b@rubble.com> (http://barnyrubble.tumblr.com/)
- -

Both email and url are optional either way.

- +} +

Or you can shorten that all into a single string, and npm will parse it for you:

+
"Barney Rubble <b@rubble.com> (http://barnyrubble.tumblr.com/)
+

Both email and url are optional either way.

npm also sets a top-level "maintainers" field with your npm user info.

-

files

-

The "files" field is an array of files to include in your project. If you name a folder in the array, then it will also include the files inside that folder. (Unless they would be ignored by another rule.)

-

You can also provide a ".npmignore" file in the root of your package, which will keep files from being included, even if they would be picked up by the files array. The ".npmignore" file works just like a ".gitignore".

-

main

-

The main field is a module ID that is the primary entry point to your program. That is, if your package is named foo, and a user installs it, and then does require("foo"), then your main module's exports object will be returned.

-

This should be a module ID relative to the root of your package folder.

-

For most modules, it makes the most sense to have a main script and often not much else.

-

bin

-

A lot of packages have one or more executable files that they'd like to install into the PATH. npm makes this pretty easy (in fact, it uses this feature to install the "npm" executable.)

-

To use this, supply a bin field in your package.json which is a map of command name to local file name. On install, npm will symlink that file into prefix/bin for global installs, or ./node_modules/.bin/ for local installs.

-

For example, npm has this:

- -
{ "bin" : { "npm" : "./cli.js" } }
- -

So, when you install npm, it'll create a symlink from the cli.js script to +

{ "bin" : { "npm" : "./cli.js" } }
+

So, when you install npm, it'll create a symlink from the cli.js script to /usr/local/bin/npm.

-

If you have a single executable, and its name should be the name of the package, then you can just supply it as a string. For example:

- 
{ "name": "my-program"
 , "version": "1.2.5"
-, "bin": "./path/to/program" }
- -

would be the same as this:

- +, "bin": "./path/to/program" } +

would be the same as this:

{ "name": "my-program"
 , "version": "1.2.5"
-, "bin" : { "my-program" : "./path/to/program" } }
- -

man

- +, "bin" : { "my-program" : "./path/to/program" } } +

man

Specify either a single file or an array of filenames to put in place for the man program to find.

-

If only a single file is provided, then it's installed such that it is the result from man <pkgname>, regardless of its actual filename. For example:

- 
{ "name" : "foo"
 , "version" : "1.2.3"
 , "description" : "A packaged foo fooer for fooing foos"
 , "main" : "foo.js"
 , "man" : "./man/doc.1"
-}
- -

would link the ./man/doc.1 file in such that it is the target for man foo

- +} +

would link the ./man/doc.1 file in such that it is the target for man foo

If the filename doesn't start with the package name, then it's prefixed. So, this:

- 
{ "name" : "foo"
 , "version" : "1.2.3"
 , "description" : "A packaged foo fooer for fooing foos"
 , "main" : "foo.js"
 , "man" : [ "./man/foo.1", "./man/bar.1" ]
-}
- -

will create files to do man foo and man foo-bar.

- +} +

will create files to do man foo and man foo-bar.

Man files must end with a number, and optionally a .gz suffix if they are compressed. The number dictates which man section the file is installed into.

- 
{ "name" : "foo"
 , "version" : "1.2.3"
 , "description" : "A packaged foo fooer for fooing foos"
 , "main" : "foo.js"
 , "man" : [ "./man/foo.1", "./man/foo.2" ]
-}
- -

will create entries for man foo and man 2 foo

- +} +

will create entries for man foo and man 2 foo

directories

-

The CommonJS Packages spec details a few ways that you can indicate the structure of your package using a directories hash. If you look at npm's package.json, you'll see that it has directories for doc, lib, and man.

-

In the future, this information may be used in other creative ways.

-

directories.lib

-

Tell people where the bulk of your library is. Nothing special is done with the lib folder in any way, but it's useful meta info.

-

directories.bin

-

If you specify a "bin" directory, then all the files in that folder will be used as the "bin" hash.

-

If you have a "bin" hash already, then this has no effect.

-

directories.man

-

A folder that is full of man pages. Sugar to generate a "man" array by walking the folder.

-

directories.doc

-

Put markdown files in here. Eventually, these will be displayed nicely, maybe, someday.

-

directories.example

-

Put example scripts in here. Someday, it might be exposed in some clever way.

-

repository

-

Specify the place where your code lives. This is helpful for people who want to contribute. If the git repo is on github, then the npm docs command will be able to find you.

-

Do it like this:

- 
"repository" :
   { "type" : "git"
   , "url" : "http://github.com/npm/npm.git"
@@ -269,52 +190,52 @@
 "repository" :
   { "type" : "svn"
   , "url" : "http://v8.googlecode.com/svn/trunk/"
-  }
- -

The URL should be a publicly available (perhaps read-only) url that can be handed + } +

The URL should be a publicly available (perhaps read-only) url that can be handed directly to a VCS program without any modification. It should not be a url to an html project page that you put in your browser. It's for computers.

-

scripts

-

The "scripts" member is an object hash of script commands that are run at various times in the lifecycle of your package. The key is the lifecycle event, and the value is the command to run at that point.

-

See npm-scripts(7) to find out more about writing package scripts.

-

config

-

A "config" hash can be used to set configuration parameters used in package scripts that persist across upgrades. For instance, if a package had the following:

- 
{ "name" : "foo"
-, "config" : { "port" : "8080" } }
- -

and then had a "start" command that then referenced the +, "config" : { "port" : "8080" } } +

and then had a "start" command that then referenced the npm_package_config_port environment variable, then the user could override that by doing npm config set foo:port 8001.

-

See npm-config(7) and npm-scripts(7) for more on package configs.

-

dependencies

-

Dependencies are specified with a simple hash of package name to version range. The version range is a string which has one or more space-separated descriptors. Dependencies can also be identified with a tarball or git URL.

-

Please do not put test harnesses or transpilers in your dependencies hash. See devDependencies, below.

-

See semver(7) for more details about specifying version ranges.

- -
  • version Must match version exactly
  • >version Must be greater than version
  • >=version etc
  • <version
  • <=version
  • ~version "Approximately equivalent to version" See semver(7)
  • ^version "Compatible with version" See semver(7)
  • 1.2.x 1.2.0, 1.2.1, etc., but not 1.3.0
  • http://... See 'URLs as Dependencies' below
  • * Matches any version
  • "" (just an empty string) Same as *
  • version1 - version2 Same as >=version1 <=version2.
  • range1 || range2 Passes if either range1 or range2 are satisfied.
  • git... See 'Git URLs as Dependencies' below
  • user/repo See 'GitHub URLs' below
- +
    +
  • version Must match version exactly
    • +
  • >version Must be greater than version
    • +
  • >=version etc
    • +
  • <version
    • +
  • <=version
    • +
  • ~version "Approximately equivalent to version" See semver(7)
    • +
  • ^version "Compatible with version" See semver(7)
    • +
  • 1.2.x 1.2.0, 1.2.1, etc., but not 1.3.0
    • +
  • http://... See 'URLs as Dependencies' below
    • +
  • * Matches any version
    • +
  • "" (just an empty string) Same as *
    • +
  • version1 - version2 Same as >=version1 <=version2.
    • +
  • range1 || range2 Passes if either range1 or range2 are satisfied.
    • +
  • git... See 'Git URLs as Dependencies' below
    • +
  • user/repo See 'GitHub URLs' below
    • +

For example, these are all valid:

- 
{ "dependencies" :
   { "foo" : "1.0.0 - 2.9999.9999"
   , "bar" : ">=1.0.2 <2.1.2"
@@ -327,59 +248,42 @@
   , "two" : "2.x"
   , "thr" : "3.3.x"
   }
-}
- -

URLs as Dependencies

- +} +

URLs as Dependencies

You may specify a tarball URL in place of a version range.

-

This tarball will be downloaded and installed locally to your package at install time.

- -

Git URLs as Dependencies

- +

Git URLs as Dependencies

Git urls can be of the form:

- 
git://github.com/user/project.git#commit-ish
 git+ssh://user@hostname:project.git#commit-ish
 git+ssh://user@hostname/project.git#commit-ish
 git+http://user@hostname/project/blah.git#commit-ish
-git+https://user@hostname/project/blah.git#commit-ish
- -

The commit-ish can be any tag, sha, or branch which can be supplied as +git+https://user@hostname/project/blah.git#commit-ish +

The commit-ish can be any tag, sha, or branch which can be supplied as an argument to git checkout. The default is master.

- -

GitHub URLs

- +

GitHub URLs

As of version 1.1.65, you can refer to GitHub urls as just "foo": "user/foo-project". For example:

- 
{
   "name": "foo",
   "version": "0.0.0",
   "dependencies": {
     "express": "visionmedia/express"
   }
-}
- -

devDependencies

- +} +

devDependencies

If someone is planning on downloading and using your module in their program, then they probably don't want or need to download and build the external test or documentation framework that you use.

-

In this case, it's best to list these additional items in a devDependencies hash.

-

These things will be installed when doing npm link or npm install from the root of a package, and can be managed like any other npm configuration param. See npm-config(7) for more on the topic.

-

For build steps that are not platform-specific, such as compiling CoffeeScript or other languages to JavaScript, use the prepublish script to do this, and make the required package a devDependency.

-

For example:

- 
{ "name": "ethopia-waza",
   "description": "a delightfully fruity coffee varietal",
   "version": "1.2.3",
@@ -390,64 +294,48 @@
     "prepublish": "coffee -o lib/ -c src/waza.coffee"
   },
   "main": "lib/waza.js"
-}
- -

The prepublish script will be run before publishing, so that users +} +

The prepublish script will be run before publishing, so that users can consume the functionality without requiring them to compile it themselves. In dev mode (ie, locally running npm install), it'll run this script as well, so that you can test it easily.

- -

peerDependencies

- +

peerDependencies

In some cases, you want to express the compatibility of your package with an host tool or library, while not necessarily doing a require of this host. This is usually refered to as a plugin. Notably, your module may be exposing a specific interface, expected and specified by the host documentation.

-

For example:

- 
{
   "name": "tea-latte",
   "version": "1.3.5"
   "peerDependencies": {
     "tea": "2.x"
   }
-}
- -

This ensures your package tea-latte can be installed along with the second +} +

This ensures your package tea-latte can be installed along with the second major version of the host package tea only. The host package is automatically installed if needed. npm install tea-latte could possibly yield the following dependency graph:

- 
├── tea-latte@1.3.5
-└── tea@2.2.0
- -

Trying to install another plugin with a conflicting requirement will cause an +└── tea@2.2.0 +

Trying to install another plugin with a conflicting requirement will cause an error. For this reason, make sure your plugin requirement is as broad as possible, and not to lock it down to specific patch versions.

-

Assuming the host complies with semver, only changes in the host package's major version will break your plugin. Thus, if you've worked with every 1.x version of the host package, use "^1.0" or "1.x" to express this. If you depend on features introduced in 1.5.2, use ">= 1.5.2 < 2".

- -

bundledDependencies

- +

bundledDependencies

Array of package names that will be bundled when publishing the package.

-

If this is spelled "bundleDependencies", then that is also honorable.

- -

optionalDependencies

- +

optionalDependencies

If a dependency can be used, but you would like npm to proceed if it cannot be found or fails to install, then you may put it in the optionalDependencies hash. This is a map of package name to version or url, just like the dependencies hash. The difference is that failure is tolerated.

-

It is still your program's responsibility to handle the lack of the dependency. For example, something like this:

- 
try {
   var foo = require('foo')
   var fooVersion = require('foo/package.json').version
@@ -462,122 +350,104 @@
 
 if (foo) {
   foo.doFooThings()
-}
- -

Entries in optionalDependencies will override entries of the same name in +} +

Entries in optionalDependencies will override entries of the same name in dependencies, so it's usually best to only put in one place.

-

engines

-

You can specify the version of node that your stuff works on:

- -
{ "engines" : { "node" : ">=0.10.3 <0.12" } }
- -

And, like with dependencies, if you don't specify the version (or if you +

{ "engines" : { "node" : ">=0.10.3 <0.12" } }
+

And, like with dependencies, if you don't specify the version (or if you specify "*" as the version), then any version of node will do.

-

If you specify an "engines" field, then npm will require that "node" be somewhere on that list. If "engines" is omitted, then npm will just assume that it works on node.

-

You can also use the "engines" field to specify which versions of npm are capable of properly installing your program. For example:

- -
{ "engines" : { "npm" : "~1.0.20" } }
- -

Note that, unless the user has set the engine-strict config flag, this +

{ "engines" : { "npm" : "~1.0.20" } }
+

Note that, unless the user has set the engine-strict config flag, this field is advisory only.

- -

engineStrict

- +

engineStrict

If you are sure that your module will definitely not run properly on versions of Node/npm other than those specified in the engines hash, then you can set "engineStrict": true in your package.json file. This will override the user's engine-strict config setting.

-

Please do not do this unless you are really very very sure. If your engines hash is something overly restrictive, you can quite easily and inadvertently lock yourself into obscurity and prevent your users from updating to new versions of Node. Consider this choice carefully. If people abuse it, it will be removed in a future version of npm.

-

os

-

You can specify which operating systems your module will run on:

- -
"os" : [ "darwin", "linux" ]
- -

You can also blacklist instead of whitelist operating systems, +

"os" : [ "darwin", "linux" ]
+

You can also blacklist instead of whitelist operating systems, just prepend the blacklisted os with a '!':

- -
"os" : [ "!win32" ]
- -

The host operating system is determined by process.platform

- +
"os" : [ "!win32" ]
+

The host operating system is determined by process.platform

It is allowed to both blacklist, and whitelist, although there isn't any good reason to do this.

-

cpu

-

If your code only runs on certain cpu architectures, you can specify which ones.

- -
"cpu" : [ "x64", "ia32" ]
- -

Like the os option, you can also blacklist architectures:

- -
"cpu" : [ "!arm", "!mips" ]
- -

The host architecture is determined by process.arch

- -

preferGlobal

- +
"cpu" : [ "x64", "ia32" ]
+

Like the os option, you can also blacklist architectures:

+
"cpu" : [ "!arm", "!mips" ]
+

The host architecture is determined by process.arch

+

preferGlobal

If your package is primarily a command-line application that should be installed globally, then set this value to true to provide a warning if it is installed locally.

-

It doesn't actually prevent users from installing it locally, but it does help prevent some confusion if it doesn't work as expected.

-

private

-

If you set "private": true in your package.json, then npm will refuse to publish it.

-

This is a way to prevent accidental publication of private repositories. If you would like to ensure that a given package is only ever published to a specific registry (for example, an internal registry), then use the publishConfig hash described below to override the registry config param at publish-time.

- -

publishConfig

- +

publishConfig

This is a set of config values that will be used at publish-time. It's especially handy if you want to set the tag or registry, so that you can ensure that a given package is not tagged with "latest" or published to the global public registry by default.

-

Any config values can be overridden, but of course only "tag" and "registry" probably matter for the purposes of publishing.

-

See npm-config(7) to see the list of config options that can be overridden.

- -

DEFAULT VALUES

- +

DEFAULT VALUES

npm will default some values based on package contents.

- -

  • "scripts": {"start": "node server.js"}

    If there is a server.js file in the root of your package, then npm -will default the start command to node server.js.

  • "scripts":{"preinstall": "node-gyp rebuild"}

    If there is a binding.gyp file in the root of your package, npm will -default the preinstall command to compile using node-gyp.

  • "contributors": [...]

    If there is an AUTHORS file in the root of your package, npm will +

      +

    • "scripts": {"start": "node server.js"}

      +

      If there is a server.js file in the root of your package, then npm +will default the start command to node server.js.

      +
      • +

    • "scripts":{"preinstall": "node-gyp rebuild"}

      +

      If there is a binding.gyp file in the root of your package, npm will +default the preinstall command to compile using node-gyp.

      +
      • +

    • "contributors": [...]

      +

      If there is an AUTHORS file in the root of your package, npm will treat each line as a Name <email> (url) format, where email and url are optional. Lines which start with a # or are blank, will be -ignored.

    - -

    SEE ALSO

    +ignored.

    +
    • +
+

SEE ALSO

+ -
@@ -589,5 +459,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/index.html nodejs-0.10.29/deps/npm/html/doc/index.html --- nodejs-0.10.28/deps/npm/html/doc/index.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/index.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,414 +10,213 @@

npm-index

Index of all npm documentation

- -

README

- +

README

node package manager

- -

Command Line Documentation

- -

npm(1)

- +

Command Line Documentation

+

npm(1)

node package manager

- -

npm-adduser(1)

- +

npm-adduser(1)

Add a registry user account

- -

npm-bin(1)

- +

npm-bin(1)

Display npm bin folder

- -

npm-bugs(1)

- +

npm-bugs(1)

Bugs for a package in a web browser maybe

- -

npm-build(1)

- +

npm-build(1)

Build a package

- -

npm-bundle(1)

- +

npm-bundle(1)

REMOVED

- -

npm-cache(1)

- +

npm-cache(1)

Manipulates packages cache

- -

npm-completion(1)

- +

npm-completion(1)

Tab Completion for npm

- -

npm-config(1)

- +

npm-config(1)

Manage the npm configuration files

- -

npm-dedupe(1)

- +

npm-dedupe(1)

Reduce duplication

- -

npm-deprecate(1)

- +

npm-deprecate(1)

Deprecate a version of a package

- -

npm-docs(1)

- +

npm-docs(1)

Docs for a package in a web browser maybe

- -

npm-edit(1)

- +

npm-edit(1)

Edit an installed package

- -

npm-explore(1)

- +

npm-explore(1)

Browse an installed package

- -

npm-help-search(1)

- +

npm-help-search(1)

Search npm help documentation

- -

npm-help(1)

- +

npm-help(1)

Get help on npm

- -

npm-init(1)

- +

npm-init(1)

Interactively create a package.json file

- -

npm-install(1)

- +

npm-install(1)

Install a package

- - - +

npm-link(1)

Symlink a package folder

- -

npm-ls(1)

- +

npm-ls(1)

List installed packages

- -

npm-outdated(1)

- +

npm-outdated(1)

Check for outdated packages

- -

npm-owner(1)

- +

npm-owner(1)

Manage package owners

- -

npm-pack(1)

- +

npm-pack(1)

Create a tarball from a package

- -

npm-prefix(1)

- +

npm-prefix(1)

Display prefix

- -

npm-prune(1)

- +

npm-prune(1)

Remove extraneous packages

- -

npm-publish(1)

- +

npm-publish(1)

Publish a package

- -

npm-rebuild(1)

- +

npm-rebuild(1)

Rebuild a package

- -

npm-repo(1)

- +

npm-repo(1)

Open package repository page in the browser

- -

npm-restart(1)

- +

npm-restart(1)

Start a package

- -

npm-rm(1)

- +

npm-rm(1)

Remove a package

- -

npm-root(1)

- +

npm-root(1)

Display npm root

- -

npm-run-script(1)

- +

npm-run-script(1)

Run arbitrary package scripts

- -

npm-search(1)

- +

npm-search(1)

Search for packages

- -

npm-shrinkwrap(1)

- +

npm-shrinkwrap(1)

Lock down dependency versions

- -

npm-star(1)

- +

npm-star(1)

Mark your favorite packages

- -

npm-stars(1)

- +

npm-stars(1)

View packages marked as favorites

- -

npm-start(1)

- +

npm-start(1)

Start a package

- -

npm-stop(1)

- +

npm-stop(1)

Stop a package

- -

npm-submodule(1)

- +

npm-submodule(1)

Add a package as a git submodule

- -

npm-tag(1)

- +

npm-tag(1)

Tag a published version

- -

npm-test(1)

- +

npm-test(1)

Test a package

- -

npm-uninstall(1)

- +

npm-uninstall(1)

Remove a package

- -

npm-unpublish(1)

- +

npm-unpublish(1)

Remove a package from the registry

- -

npm-update(1)

- +

npm-update(1)

Update a package

- -

npm-version(1)

- +

npm-version(1)

Bump a package version

- -

npm-view(1)

- +

npm-view(1)

View registry info

- -

npm-whoami(1)

- +

npm-whoami(1)

Display npm username

- -

API Documentation

- -

npm(3)

- +

API Documentation

+

npm(3)

node package manager

- -

npm-bin(3)

- +

npm-bin(3)

Display npm bin folder

- -

npm-bugs(3)

- +

npm-bugs(3)

Bugs for a package in a web browser maybe

- -

npm-commands(3)

- +

npm-cache(3)

+

manage the npm cache programmatically

+

npm-commands(3)

npm commands

- -

npm-config(3)

- +

npm-config(3)

Manage the npm configuration files

- -

npm-deprecate(3)

- +

npm-deprecate(3)

Deprecate a version of a package

- -

npm-docs(3)

- +

npm-docs(3)

Docs for a package in a web browser maybe

- -

npm-edit(3)

- +

npm-edit(3)

Edit an installed package

- -

npm-explore(3)

- +

npm-explore(3)

Browse an installed package

- -

npm-help-search(3)

- +

npm-help-search(3)

Search the help pages

- -

npm-init(3)

- +

npm-init(3)

Interactively create a package.json file

- -

npm-install(3)

- +

npm-install(3)

install a package programmatically

- - - +

npm-link(3)

Symlink a package folder

- -

npm-load(3)

- +

npm-load(3)

Load config settings

- -

npm-ls(3)

- +

npm-ls(3)

List installed packages

- -

npm-outdated(3)

- +

npm-outdated(3)

Check for outdated packages

- -

npm-owner(3)

- +

npm-owner(3)

Manage package owners

- -

npm-pack(3)

- +

npm-pack(3)

Create a tarball from a package

- -

npm-prefix(3)

- +

npm-prefix(3)

Display prefix

- -

npm-prune(3)

- +

npm-prune(3)

Remove extraneous packages

- -

npm-publish(3)

- +

npm-publish(3)

Publish a package

- -

npm-rebuild(3)

- +

npm-rebuild(3)

Rebuild a package

- -

npm-repo(3)

- +

npm-repo(3)

Open package repository page in the browser

- -

npm-restart(3)

- +

npm-restart(3)

Start a package

- -

npm-root(3)

- +

npm-root(3)

Display npm root

- -

npm-run-script(3)

- +

npm-run-script(3)

Run arbitrary package scripts

- -

npm-search(3)

- +

npm-search(3)

Search for packages

- -

npm-shrinkwrap(3)

- +

npm-shrinkwrap(3)

programmatically generate package shrinkwrap file

- -

npm-start(3)

- +

npm-start(3)

Start a package

- -

npm-stop(3)

- +

npm-stop(3)

Stop a package

- -

npm-submodule(3)

- +

npm-submodule(3)

Add a package as a git submodule

- -

npm-tag(3)

- +

npm-tag(3)

Tag a published version

- -

npm-test(3)

- +

npm-test(3)

Test a package

- -

npm-uninstall(3)

- +

npm-uninstall(3)

uninstall a package programmatically

- -

npm-unpublish(3)

- +

npm-unpublish(3)

Remove a package from the registry

- -

npm-update(3)

- +

npm-update(3)

Update a package

- -

npm-version(3)

- +

npm-version(3)

Bump a package version

- -

npm-view(3)

- +

npm-view(3)

View registry info

- -

npm-whoami(3)

- +

npm-whoami(3)

Display npm username

- -

Files

- -

npm-folders(5)

- +

Files

+

npm-folders(5)

Folder Structures Used by npm

- -

npmrc(5)

- +

npmrc(5)

The npm config files

- -

package.json(5)

- +

package.json(5)

Specifics of npm's package.json handling

- -

Misc

- -

npm-coding-style(7)

- +

Misc

+

npm-coding-style(7)

npm's "funny" coding style

- -

npm-config(7)

- +

npm-config(7)

More than you probably want to know about npm configuration

- -

npm-developers(7)

- +

npm-developers(7)

Developer Guide

- -

npm-disputes(7)

- +

npm-disputes(7)

Handling Module Name Disputes

- -

npm-faq(7)

- +

npm-faq(7)

Frequently Asked Questions

- -

npm-index(7)

- +

npm-index(7)

Index of all npm documentation

- -

npm-registry(7)

- +

npm-registry(7)

The JavaScript Package Registry

- -

npm-scripts(7)

- +

npm-scripts(7)

How npm handles the "scripts" field

- -

removing-npm(7)

- +

removing-npm(7)

Cleaning the Slate

- -

semver(7)

- +

semver(7)

The semantic versioner for npm

+
@@ -429,5 +228,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/misc/npm-coding-style.html nodejs-0.10.29/deps/npm/html/doc/misc/npm-coding-style.html --- nodejs-0.10.28/deps/npm/html/doc/misc/npm-coding-style.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/misc/npm-coding-style.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,71 +10,51 @@

npm-coding-style

npm's "funny" coding style

- -

DESCRIPTION

- +

DESCRIPTION

npm's coding style is a bit unconventional. It is not different for difference's sake, but rather a carefully crafted style that is designed to reduce visual clutter and make bugs more apparent.

-

If you want to contribute to npm (which is very encouraged), you should make your code conform to npm's style.

-

Note: this concerns npm's code not the specific packages at npmjs.org

- -

Line Length

- +

Line Length

Keep lines shorter than 80 characters. It's better for lines to be too short than to be too long. Break up long lists, objects, and other statements onto multiple lines.

- -

Indentation

- +

Indentation

Two-spaces. Tabs are better, but they look like hell in web browsers (and on github), and node uses 2 spaces, so that's that.

-

Configure your editor appropriately.

- -

Curly braces

- +

Curly braces

Curly braces belong on the same line as the thing that necessitates them.

-

Bad:

- 
function ()
-{
- -

Good:

- -
function () {
- -

If a block needs to wrap to the next line, use a curly brace. Don't +{ +

Good:

+
function () {
+

If a block needs to wrap to the next line, use a curly brace. Don't use it if it doesn't.

-

Bad:

- 
if (foo) { bar() }
 while (foo)
-  bar()
- -

Good:

- + bar() +

Good:

if (foo) bar()
 while (foo) {
   bar()
-}
- -

Semicolons

- +} +

Semicolons

Don't use them except in four situations:

- -
  • for (;;) loops. They're actually required.
  • null loops like: while (something) ; (But you'd better have a good -reason for doing that.)
  • case "foo": doSomething(); break
  • In front of a leading ( or [ at the start of the line. +
      +
    • for (;;) loops. They're actually required.
      • +
    • null loops like: while (something) ; (But you'd better have a good +reason for doing that.)
      • +
    • case "foo": doSomething(); break
      • +
    • In front of a leading ( or [ at the start of the line. This prevents the expression from being interpreted -as a function call or property access, respectively.
    - +as a function call or property access, respectively.
    • +

Some examples of good semicolon usage:

- 
;(x || y).doSomething()
 ;[a, b, c].forEach(doSomething)
 for (var i = 0; i < 10; i ++) {
@@ -84,18 +64,14 @@
     default: throw new Error("unknown state")
   }
   end()
-}
- -

Note that starting lines with - and + also should be prefixed +} +

Note that starting lines with - and + also should be prefixed with a semicolon, but this is much less common.

- -

Comma First

- +

Comma First

If there is a list of things separated by commas, and it wraps across multiple lines, put the comma at the start of the next line, directly below the token that starts the list. Put the final token in the list on a line by itself. For example:

- 
var magicWords = [ "abracadabra"
                  , "gesundheit"
                  , "ventrilo"
@@ -106,84 +82,60 @@
   , a = 1
   , b = "abc"
   , etc
-  , somethingElse
- -

Whitespace

- + , somethingElse +

Whitespace

Put a single space in front of ( for anything other than a function call. Also use a single space wherever it makes things more readable.

-

Don't leave trailing whitespace at the end of lines. Don't indent empty lines. Don't use more spaces than are helpful.

- -

Functions

- +

Functions

Use named functions. They make stack traces a lot easier to read.

- -

Callbacks, Sync/async Style

- +

Callbacks, Sync/async Style

Use the asynchronous/non-blocking versions of things as much as possible. It might make more sense for npm to use the synchronous fs APIs, but this way, the fs and http and child process stuff all uses the same callback-passing methodology.

-

The callback should always be the last argument in the list. Its first argument is the Error or null.

-

Be very careful never to ever ever throw anything. It's worse than useless. Just send the error message back as the first argument to the callback.

- -

Errors

- +

Errors

Always create a new Error object with your message. Don't just return a string message to the callback. Stack traces are handy.

- -

Logging

- +

Logging

Logging is done using the npmlog utility.

-

Please clean up logs when they are no longer helpful. In particular, logging the same object over and over again is not helpful. Logs should report what's happening so that it's easier to track down where a fault occurs.

-

Use appropriate log levels. See npm-config(7) and search for "loglevel".

- -

Case, naming, etc.

- +

Case, naming, etc.

Use lowerCamelCase for multiword identifiers when they refer to objects, functions, methods, members, or anything not specified in this section.

-

Use UpperCamelCase for class names (things that you'd pass to "new").

-

Use all-lower-hyphen-css-case for multiword filenames and config keys.

-

Use named functions. They make stack traces easier to follow.

-

Use CAPS_SNAKE_CASE for constants, things that should never change and are rarely used.

-

Use a single uppercase letter for function names where the function would normally be anonymous, but needs to call itself recursively. It makes it clear that it's a "throwaway" function.

-

null, undefined, false, 0

-

Boolean variables and functions should always be either true or false. Don't set it to 0 unless it's supposed to be a number.

-

When something is intentionally missing or removed, set it to null.

-

Don't set things to undefined. Reserve that value to mean "not yet set to anything."

-

Boolean objects are verboten.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -195,5 +147,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/misc/npm-config.html nodejs-0.10.29/deps/npm/html/doc/misc/npm-config.html --- nodejs-0.10.28/deps/npm/html/doc/misc/npm-config.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/misc/npm-config.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,20 +10,14 @@

npm-config

More than you probably want to know about npm configuration

- -

DESCRIPTION

- +

DESCRIPTION

npm gets its configuration values from 6 sources, in this priority:

- -

Command Line Flags

- +

Command Line Flags

Putting --foo bar on the command line sets the foo configuration parameter to "bar". A -- argument tells the cli parser to stop reading flags. A --flag parameter that is at the end of the command will be given the value of true.

- -

Environment Variables

- +

Environment Variables

Any environment variables that start with npm_config_ will be interpreted as a configuration parameter. For example, putting npm_config_foo=bar in your environment will set the foo @@ -31,707 +25,711 @@ are not given a value will be given the value of true. Config values are case-insensitive, so NPM_CONFIG_FOO=bar will work the same.

- -

npmrc Files

- -

The three relevant files are:

- -
  • per-user config file (~/.npmrc)
  • global config file ($PREFIX/npmrc)
  • npm builtin config file (/path/to/npm/npmrc)
- +

npmrc Files

+

The four relevant files are:

+
    +
  • per-project config file (/path/to/my/project/.npmrc)
    • +
  • per-user config file (~/.npmrc)
    • +
  • global config file ($PREFIX/npmrc)
    • +
  • npm builtin config file (/path/to/npm/npmrc)
    • +

See npmrc(5) for more details.

- -

Default Configs

- +

Default Configs

A set of configuration parameters that are internal to npm, and are defaults if nothing else is specified.

- -

Shorthands and Other CLI Niceties

- +

Shorthands and Other CLI Niceties

The following shorthands are parsed on the command-line:

- -
  • -v: --version
  • -h, -?, --help, -H: --usage
  • -s, --silent: --loglevel silent
  • -q, --quiet: --loglevel warn
  • -d: --loglevel info
  • -dd, --verbose: --loglevel verbose
  • -ddd: --loglevel silly
  • -g: --global
  • -l: --long
  • -m: --message
  • -p, --porcelain: --parseable
  • -reg: --registry
  • -v: --version
  • -f: --force
  • -desc: --description
  • -S: --save
  • -D: --save-dev
  • -O: --save-optional
  • -B: --save-bundle
  • -E: --save-exact
  • -y: --yes
  • -n: --yes false
  • ll and la commands: ls --long
- +
    +
  • -v: --version
    • +
  • -h, -?, --help, -H: --usage
    • +
  • -s, --silent: --loglevel silent
    • +
  • -q, --quiet: --loglevel warn
    • +
  • -d: --loglevel info
    • +
  • -dd, --verbose: --loglevel verbose
    • +
  • -ddd: --loglevel silly
    • +
  • -g: --global
    • +
  • -l: --long
    • +
  • -m: --message
    • +
  • -p, --porcelain: --parseable
    • +
  • -reg: --registry
    • +
  • -v: --version
    • +
  • -f: --force
    • +
  • -desc: --description
    • +
  • -S: --save
    • +
  • -D: --save-dev
    • +
  • -O: --save-optional
    • +
  • -B: --save-bundle
    • +
  • -E: --save-exact
    • +
  • -y: --yes
    • +
  • -n: --yes false
    • +
  • ll and la commands: ls --long
    • +

If the specified configuration param resolves unambiguously to a known configuration parameter, then it is expanded to that configuration parameter. For example:

- 
npm ls --par
 # same as:
-npm ls --parseable
- -

If multiple single-character shorthands are strung together, and the +npm ls --parseable +

If multiple single-character shorthands are strung together, and the resulting combination is unambiguously not some other configuration param, then it is expanded to its various component pieces. For example:

- 
npm ls -gpld
 # same as:
-npm ls --global --parseable --long --loglevel info
- -

Per-Package Config Settings

- +npm ls --global --parseable --long --loglevel info +

Per-Package Config Settings

When running scripts (see npm-scripts(7)) the package.json "config" keys are overwritten in the environment if there is a config param of <name>[@<version>]:<key>. For example, if the package.json has this:

- 
{ "name" : "foo"
 , "config" : { "port" : "8080" }
-, "scripts" : { "start" : "node server.js" } }
- -

and the server.js is this:

- -
http.createServer(...).listen(process.env.npm_package_config_port)
- -

then the user could change the behavior by doing:

- -
npm config set foo:port 80
- -

See package.json(5) for more information.

- -

Config Settings

- +, "scripts" : { "start" : "node server.js" } } +

and the server.js is this:

+
http.createServer(...).listen(process.env.npm_package_config_port)
+

then the user could change the behavior by doing:

+
npm config set foo:port 80
+

See package.json(5) for more information.

+

Config Settings

always-auth

- -
  • Default: false
  • Type: Boolean
- +
    +
  • Default: false
    • +
  • Type: Boolean
    • +

Force npm to always require authentication when accessing the registry, even for GET requests.

- - -
  • Default: true
  • Type: Boolean
- +
    +
  • Default: true
    • +
  • Type: Boolean
    • +

Tells npm to create symlinks (or .cmd shims on Windows) for package executables.

-

Set to false to have it not do this. This can be used to work around the fact that some file systems don't support symlinks, even on ostensibly Unix systems.

-

browser

- -
  • Default: OS X: "open", Windows: "start", Others: "xdg-open"
  • Type: String
- +
    +
  • Default: OS X: "open", Windows: "start", Others: "xdg-open"
    • +
  • Type: String
    • +

The browser that is called by the npm docs command to open websites.

-

ca

- -
  • Default: The npm CA certificate
  • Type: String or null
- +
    +
  • Default: The npm CA certificate
    • +
  • Type: String or null
    • +

The Certificate Authority signing certificate that is trusted for SSL connections to the registry.

-

Set to null to only allow "known" registrars, or to a specific CA cert to trust only that specific signing authority.

-

See also the strict-ssl config.

-

cache

- -
  • Default: Windows: %AppData%\npm-cache, Posix: ~/.npm
  • Type: path
- +
    +
  • Default: Windows: %AppData%\npm-cache, Posix: ~/.npm
    • +
  • Type: path
    • +

The location of npm's cache directory. See npm-cache(1)

-

cache-lock-stale

- -
  • Default: 60000 (1 minute)
  • Type: Number
- +
    +
  • Default: 60000 (1 minute)
    • +
  • Type: Number
    • +

The number of ms before cache folder lockfiles are considered stale.

-

cache-lock-retries

- -
  • Default: 10
  • Type: Number
- +
    +
  • Default: 10
    • +
  • Type: Number
    • +

Number of times to retry to acquire a lock on cache folder lockfiles.

-

cache-lock-wait

- -
  • Default: 10000 (10 seconds)
  • Type: Number
- +
    +
  • Default: 10000 (10 seconds)
    • +
  • Type: Number
    • +

Number of ms to wait for cache lock files to expire.

-

cache-max

- -
  • Default: Infinity
  • Type: Number
- +
    +
  • Default: Infinity
    • +
  • Type: Number
    • +

The maximum time (in seconds) to keep items in the registry cache before re-checking against the registry.

-

Note that no purging is done unless the npm cache clean command is explicitly used, and that only GET requests use the cache.

-

cache-min

- -
  • Default: 10
  • Type: Number
- +
    +
  • Default: 10
    • +
  • Type: Number
    • +

The minimum time (in seconds) to keep items in the registry cache before re-checking against the registry.

-

Note that no purging is done unless the npm cache clean command is explicitly used, and that only GET requests use the cache.

-

cert

- -
  • Default: null
  • Type: String
- +
    +
  • Default: null
    • +
  • Type: String
    • +

A client certificate to pass when accessing the registry.

-

color

- -
  • Default: true on Posix, false on Windows
  • Type: Boolean or "always"
- +
    +
  • Default: true on Posix, false on Windows
    • +
  • Type: Boolean or "always"
    • +

If false, never shows colors. If "always" then always shows colors. If true, then only prints color codes for tty file descriptors.

-

depth

- -
  • Default: Infinity
  • Type: Number
- +
    +
  • Default: Infinity
    • +
  • Type: Number
    • +

The depth to go when recursing directories for npm ls and npm cache ls.

-

description

- -
  • Default: true
  • Type: Boolean
- +
    +
  • Default: true
    • +
  • Type: Boolean
    • +

Show the description in npm search

-

dev

- -
  • Default: false
  • Type: Boolean
- +
    +
  • Default: false
    • +
  • Type: Boolean
    • +

Install dev-dependencies along with packages.

-

Note that dev-dependencies are also installed if the npat flag is set.

-

editor

- -
  • Default: EDITOR environment variable if set, or "vi" on Posix, -or "notepad" on Windows.
  • Type: path
- +
    +
  • Default: EDITOR environment variable if set, or "vi" on Posix, +or "notepad" on Windows.
    • +
  • Type: path
    • +

The command to run for npm edit or npm config edit.

-

email

-

The email of the logged-in user.

-

Set by the npm adduser command. Should not be set explicitly.

-

engine-strict

- -
  • Default: false
  • Type: Boolean
- +
    +
  • Default: false
    • +
  • Type: Boolean
    • +

If set to true, then npm will stubbornly refuse to install (or even consider installing) any package that claims to not be compatible with the current Node.js version.

-

force

- -
  • Default: false
  • Type: Boolean
- +
    +
  • Default: false
    • +
  • Type: Boolean
    • +

Makes various commands more forceful.

- -
  • lifecycle script failure does not block progress.
  • publishing clobbers previously published versions.
  • skips cache when requesting from the registry.
  • prevents checks against clobbering non-npm files.
- +
    +
  • lifecycle script failure does not block progress.
    • +
  • publishing clobbers previously published versions.
    • +
  • skips cache when requesting from the registry.
    • +
  • prevents checks against clobbering non-npm files.
    • +

fetch-retries

- -
  • Default: 2
  • Type: Number
- +
    +
  • Default: 2
    • +
  • Type: Number
    • +

The "retries" config for the retry module to use when fetching packages from the registry.

-

fetch-retry-factor

- -
  • Default: 10
  • Type: Number
- +
    +
  • Default: 10
    • +
  • Type: Number
    • +

The "factor" config for the retry module to use when fetching packages.

-

fetch-retry-mintimeout

- -
  • Default: 10000 (10 seconds)
  • Type: Number
- +
    +
  • Default: 10000 (10 seconds)
    • +
  • Type: Number
    • +

The "minTimeout" config for the retry module to use when fetching packages.

-

fetch-retry-maxtimeout

- -
  • Default: 60000 (1 minute)
  • Type: Number
- +
    +
  • Default: 60000 (1 minute)
    • +
  • Type: Number
    • +

The "maxTimeout" config for the retry module to use when fetching packages.

-

git

- -
  • Default: "git"
  • Type: String
- +
    +
  • Default: "git"
    • +
  • Type: String
    • +

The command to use for git commands. If git is installed on the computer, but is not in the PATH, then set this to the full path to the git binary.

-

git-tag-version

- -
  • Default: true
  • Type: Boolean
- +
    +
  • Default: true
    • +
  • Type: Boolean
    • +

Tag the commit when using the npm version command.

-

global

- -
  • Default: false
  • Type: Boolean
- +
    +
  • Default: false
    • +
  • Type: Boolean
    • +

Operates in "global" mode, so that packages are installed into the prefix folder instead of the current working directory. See npm-folders(5) for more on the differences in behavior.

- -
  • packages are installed into the {prefix}/lib/node_modules folder, instead of the -current working directory.
  • bin files are linked to {prefix}/bin
  • man pages are linked to {prefix}/share/man
- +
    +
  • packages are installed into the {prefix}/lib/node_modules folder, instead of the +current working directory.
    • +
  • bin files are linked to {prefix}/bin
    • +
  • man pages are linked to {prefix}/share/man
    • +

globalconfig

- -
  • Default: {prefix}/etc/npmrc
  • Type: path
- +
    +
  • Default: {prefix}/etc/npmrc
    • +
  • Type: path
    • +

The config file to read for global config options.

-

group

- -
  • Default: GID of the current process
  • Type: String or Number
- +
    +
  • Default: GID of the current process
    • +
  • Type: String or Number
    • +

The group to use when running package scripts in global mode as the root user.

-

heading

- -
  • Default: "npm"
  • Type: String
- +
    +
  • Default: "npm"
    • +
  • Type: String
    • +

The string that starts all the debugging log output.

-

https-proxy

- -
  • Default: the HTTPS_PROXY or https_proxy or HTTP_PROXY or -http_proxy environment variables.
  • Type: url
- +
    +
  • Default: the HTTPS_PROXY or https_proxy or HTTP_PROXY or +http_proxy environment variables.
    • +
  • Type: url
    • +

A proxy to use for outgoing https requests.

-

ignore-scripts

- -
  • Default: false
  • Type: Boolean
- +
    +
  • Default: false
    • +
  • Type: Boolean
    • +

If true, npm does not run scripts specified in package.json files.

-

init-module

- -
  • Default: ~/.npm-init.js
  • Type: path
- +
    +
  • Default: ~/.npm-init.js
    • +
  • Type: path
    • +

A module that will be loaded by the npm init command. See the documentation for the init-package-json module for more information, or npm-init(1).

-

init.author.name

- -
  • Default: ""
  • Type: String
- +
    +
  • Default: ""
    • +
  • Type: String
    • +

The value npm init should use by default for the package author's name.

-

init.author.email

- -
  • Default: ""
  • Type: String
- +
    +
  • Default: ""
    • +
  • Type: String
    • +

The value npm init should use by default for the package author's email.

-

init.author.url

- -
  • Default: ""
  • Type: String
- +
    +
  • Default: ""
    • +
  • Type: String
    • +

The value npm init should use by default for the package author's homepage.

-

init.license

- -
  • Default: "ISC"
  • Type: String
- +
    +
  • Default: "ISC"
    • +
  • Type: String
    • +

The value npm init should use by default for the package license.

-

json

- -
  • Default: false
  • Type: Boolean
- +
    +
  • Default: false
    • +
  • Type: Boolean
    • +

Whether or not to output JSON data, rather than the normal output.

-

This feature is currently experimental, and the output data structures for many commands is either not implemented in JSON yet, or subject to change. Only the output from npm ls --json is currently valid.

-

key

- -
  • Default: null
  • Type: String
- +
    +
  • Default: null
    • +
  • Type: String
    • +

A client key to pass when accessing the registry.

- - -
  • Default: false
  • Type: Boolean
- +
    +
  • Default: false
    • +
  • Type: Boolean
    • +

If true, then local installs will link if there is a suitable globally installed package.

-

Note that this means that local installs can cause things to be installed into the global space at the same time. The link is only done if one of the two conditions are met:

- -
  • The package is not already installed globally, or
  • the globally installed version is identical to the version that is -being installed locally.
- +
    +
  • The package is not already installed globally, or
    • +
  • the globally installed version is identical to the version that is +being installed locally.
    • +

local-address

- -
  • Default: undefined
  • Type: IP Address
- +
    +
  • Default: undefined
    • +
  • Type: IP Address
    • +

The IP address of the local interface to use when making connections to the npm registry. Must be IPv4 in versions of Node prior to 0.12.

-

loglevel

- -
  • Default: "http"
  • Type: String
  • Values: "silent", "win", "error", "warn", "http", "info", "verbose", "silly"
- +
    +
  • Default: "http"
    • +
  • Type: String
    • +
  • Values: "silent", "win", "error", "warn", "http", "info", "verbose", "silly"
    • +

What level of logs to report. On failure, all logs are written to npm-debug.log in the current working directory.

-

Any logs of a higher level than the setting are shown. The default is "http", which shows http, warn, and error output.

-

logstream

- -
  • Default: process.stderr
  • Type: Stream
- +
    +
  • Default: process.stderr
    • +
  • Type: Stream
    • +

This is the stream that is passed to the npmlog module at run time.

-

It cannot be set from the command line, but if you are using npm programmatically, you may wish to send logs to somewhere other than stderr.

-

If the color config is set to true, then this stream will receive colored output if it is a TTY.

-

long

- -
  • Default: false
  • Type: Boolean
- +
    +
  • Default: false
    • +
  • Type: Boolean
    • +

Show extended information in npm ls and npm search.

-

message

- -
  • Default: "%s"
  • Type: String
- +
    +
  • Default: "%s"
    • +
  • Type: String
    • +

Commit message which is used by npm version when creating version commit.

-

Any "%s" in the message will be replaced with the version number.

-

node-version

- -
  • Default: process.version
  • Type: semver or false
- +
    +
  • Default: process.version
    • +
  • Type: semver or false
    • +

The node version to use when checking package's "engines" hash.

-

npat

- -
  • Default: false
  • Type: Boolean
- +
    +
  • Default: false
    • +
  • Type: Boolean
    • +

Run tests on installation.

-

onload-script

- -
  • Default: false
  • Type: path
- +
    +
  • Default: false
    • +
  • Type: path
    • +

A node module to require() when npm loads. Useful for programmatic usage.

-

optional

- -
  • Default: true
  • Type: Boolean
- +
    +
  • Default: true
    • +
  • Type: Boolean
    • +

Attempt to install packages in the optionalDependencies hash. Note that if these packages fail to install, the overall installation process is not aborted.

-

parseable

- -
  • Default: false
  • Type: Boolean
- +
    +
  • Default: false
    • +
  • Type: Boolean
    • +

Output parseable results from commands that write to standard output.

-

prefix

- - - +

The location to install global items. If set on the command line, then it forces non-global commands to run in the specified folder.

-

production

- -
  • Default: false
  • Type: Boolean
- +
    +
  • Default: false
    • +
  • Type: Boolean
    • +

Set to true to run in "production" mode.

- -
  1. devDependencies are not installed at the topmost level when running -local npm install without any arguments.
  2. Set the NODE_ENV="production" for lifecycle scripts.
- +
    +
  1. devDependencies are not installed at the topmost level when running +local npm install without any arguments.
    2. +
  2. Set the NODE_ENV="production" for lifecycle scripts.
    3. +

proprietary-attribs

- -
  • Default: true
  • Type: Boolean
- +
    +
  • Default: true
    • +
  • Type: Boolean
    • +

Whether or not to include proprietary extended attributes in the tarballs created by npm.

-

Unless you are expecting to unpack package tarballs with something other than npm -- particularly a very outdated tar implementation -- leave this as true.

-

proxy

- -
  • Default: HTTP_PROXY or http_proxy environment variable, or null
  • Type: url
- +
    +
  • Default: HTTP_PROXY or http_proxy environment variable, or null
    • +
  • Type: url
    • +

A proxy to use for outgoing http requests.

-

rebuild-bundle

- -
  • Default: true
  • Type: Boolean
- +
    +
  • Default: true
    • +
  • Type: Boolean
    • +

Rebuild bundled dependencies after installation.

-

registry

- -
  • Default: https://registry.npmjs.org/
  • Type: url
- +

The base URL of the npm package registry.

-

rollback

- -
  • Default: true
  • Type: Boolean
- +
    +
  • Default: true
    • +
  • Type: Boolean
    • +

Remove failed installs.

-

save

- -
  • Default: false
  • Type: Boolean
- +
    +
  • Default: false
    • +
  • Type: Boolean
    • +

Save installed packages to a package.json file as dependencies.

-

When used with the npm rm command, it removes it from the dependencies hash.

-

Only works if there is already a package.json file present.

-

save-bundle

- -
  • Default: false
  • Type: Boolean
- +
    +
  • Default: false
    • +
  • Type: Boolean
    • +

If a package would be saved at install time by the use of --save, --save-dev, or --save-optional, then also put it in the bundleDependencies list.

-

When used with the npm rm command, it removes it from the bundledDependencies list.

-

save-dev

- -
  • Default: false
  • Type: Boolean
- +
    +
  • Default: false
    • +
  • Type: Boolean
    • +

Save installed packages to a package.json file as devDependencies.

-

When used with the npm rm command, it removes it from the devDependencies hash.

-

Only works if there is already a package.json file present.

-

save-exact

- -
  • Default: false
  • Type: Boolean
- +
    +
  • Default: false
    • +
  • Type: Boolean
    • +

Dependencies saved to package.json using --save, --save-dev or --save-optional will be configured with an exact version rather than using npm's default semver range operator.

-

save-optional

- -
  • Default: false
  • Type: Boolean
- +
    +
  • Default: false
    • +
  • Type: Boolean
    • +

Save installed packages to a package.json file as optionalDependencies.

-

When used with the npm rm command, it removes it from the devDependencies hash.

-

Only works if there is already a package.json file present.

-

save-prefix

- -
  • Default: '^'
  • Type: String
- +
    +
  • Default: '^'
    • +
  • Type: String
    • +

Configure how versions of packages installed to a package.json file via --save or --save-dev get prefixed.

-

For example if a package has version 1.2.3, by default it's version is -set to ^1.2.3 which allows minor upgrades for that package, but after
npm config set save-prefix='~' it would be set to ~1.2.3 which only allows +set to ^1.2.3 which allows minor upgrades for that package, but after
npm config set save-prefix='~' it would be set to ~1.2.3 which only allows patch upgrades.

-

searchopts

- -
  • Default: ""
  • Type: String
- +
    +
  • Default: ""
    • +
  • Type: String
    • +

Space-separated options that are always passed to search.

-

searchexclude

- -
  • Default: ""
  • Type: String
- +
    +
  • Default: ""
    • +
  • Type: String
    • +

Space-separated options that limit the results from search.

-

searchsort

- -
  • Default: "name"
  • Type: String
  • Values: "name", "-name", "date", "-date", "description", -"-description", "keywords", "-keywords"
- +
    +
  • Default: "name"
    • +
  • Type: String
    • +
  • Values: "name", "-name", "date", "-date", "description", +"-description", "keywords", "-keywords"
    • +

Indication of which field to sort search results by. Prefix with a - character to indicate reverse sort.

-

shell

- -
  • Default: SHELL environment variable, or "bash" on Posix, or "cmd" on -Windows
  • Type: path
- +
    +
  • Default: SHELL environment variable, or "bash" on Posix, or "cmd" on +Windows
    • +
  • Type: path
    • +

The shell to run for the npm explore command.

-

shrinkwrap

- -
  • Default: true
  • Type: Boolean
- +
    +
  • Default: true
    • +
  • Type: Boolean
    • +

If set to false, then ignore npm-shrinkwrap.json files when installing.

-

sign-git-tag

- -
  • Default: false
  • Type: Boolean
- +
    +
  • Default: false
    • +
  • Type: Boolean
    • +

If set to true, then the npm version command will tag the version using -s to add a signature.

-

Note that git requires you to have set up GPG keys in your git configs for this to work properly.

- +

spin

+
    +
  • Default: true
    • +
  • Type: Boolean or "always"
    • +
+

When set to true, npm will display an ascii spinner while it is doing +things, if process.stderr is a TTY.

+

Set to false to suppress the spinner, or set to always to output +the spinner even for non-TTY outputs.

strict-ssl

- -
  • Default: true
  • Type: Boolean
- +
    +
  • Default: true
    • +
  • Type: Boolean
    • +

Whether or not to do SSL key validation when making requests to the registry via https.

-

See also the ca config.

-

tag

- -
  • Default: latest
  • Type: String
- +
    +
  • Default: latest
    • +
  • Type: String
    • +

If you ask npm to install a package and don't tell it a specific version, then it will install the specified tag.

-

Also the tag that is added to the package@version specified by the npm tag command, if no explicit tag is given.

-

tmp

- -
  • Default: TMPDIR environment variable, or "/tmp"
  • Type: path
- +
    +
  • Default: TMPDIR environment variable, or "/tmp"
    • +
  • Type: path
    • +

Where to store temporary files and folders. All temp files are deleted on success, but left behind on failure for forensic purposes.

-

unicode

- -
  • Default: true
  • Type: Boolean
- +
    +
  • Default: true
    • +
  • Type: Boolean
    • +

When set to true, npm uses unicode characters in the tree output. When false, it uses ascii characters to draw trees.

-

unsafe-perm

- -
  • Default: false if running as root, true otherwise
  • Type: Boolean
- +
    +
  • Default: false if running as root, true otherwise
    • +
  • Type: Boolean
    • +

Set to true to suppress the UID/GID switching when running package scripts. If set explicitly to false, then installing as a non-root user will fail.

-

usage

- -
  • Default: false
  • Type: Boolean
- +
    +
  • Default: false
    • +
  • Type: Boolean
    • +

Set to show short usage output (like the -H output) instead of complete help when doing npm-help(1).

-

user

- -
  • Default: "nobody"
  • Type: String or Number
- +
    +
  • Default: "nobody"
    • +
  • Type: String or Number
    • +

The UID to set to when running package scripts as root.

-

username

- -
  • Default: null
  • Type: String
- +
    +
  • Default: null
    • +
  • Type: String
    • +

The username on the npm registry. Set with npm adduser

-

userconfig

- -
  • Default: ~/.npmrc
  • Type: path
- +
    +
  • Default: ~/.npmrc
    • +
  • Type: path
    • +

The location of user-level configuration settings.

-

umask

- -
  • Default: 022
  • Type: Octal numeric string
- +
    +
  • Default: 022
    • +
  • Type: Octal numeric string
    • +

The "umask" value to use when setting the file creation mode on files and folders.

-

Folders and executables are given a mode which is 0777 masked against this value. Other files are given a mode which is 0666 masked against this value. Thus, the defaults are 0755 and 0644 respectively.

-

user-agent

- -
  • Default: node/{process.version} {process.platform} {process.arch}
  • Type: String
- +
    +
  • Default: node/{process.version} {process.platform} {process.arch}
    • +
  • Type: String
    • +

Sets a User-Agent to the request header

-

version

- -
  • Default: false
  • Type: boolean
- +
    +
  • Default: false
    • +
  • Type: boolean
    • +

If true, output the npm version and exit successfully.

-

Only relevant when specified explicitly on the command line.

-

versions

- -
  • Default: false
  • Type: boolean
- +
    +
  • Default: false
    • +
  • Type: boolean
    • +

If true, output the npm version as well as node's process.versions hash, and exit successfully.

-

Only relevant when specified explicitly on the command line.

-

viewer

- -
  • Default: "man" on Posix, "browser" on Windows
  • Type: path
- +
    +
  • Default: "man" on Posix, "browser" on Windows
    • +
  • Type: path
    • +

The program to use to view help content.

-

Set to "browser" to view html help content in the default web browser.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -743,5 +741,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/misc/npm-developers.html nodejs-0.10.29/deps/npm/html/doc/misc/npm-developers.html --- nodejs-0.10.28/deps/npm/html/doc/misc/npm-developers.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/misc/npm-developers.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,172 +10,166 @@

npm-developers

Developer Guide

- -

DESCRIPTION

- +

DESCRIPTION

So, you've decided to use npm to develop (and maybe publish/deploy) your project.

-

Fantastic!

-

There are a few things that you need to do above the simple steps that your users will do to install your program.

- -

About These Documents

- +

About These Documents

These are man pages. If you install npm, you should be able to then do man npm-thing to get the documentation on a particular topic, or npm help thing to see the same information.

- -

What is a package

- +

What is a package

A package is:

- -
  • a) a folder containing a program described by a package.json file
  • b) a gzipped tarball containing (a)
  • c) a url that resolves to (b)
  • d) a <name>@<version> that is published on the registry with (c)
  • e) a <name>@<tag> that points to (d)
  • f) a <name> that has a "latest" tag satisfying (e)
  • g) a git url that, when cloned, results in (a).
- +
    +
  • a) a folder containing a program described by a package.json file
    • +
  • b) a gzipped tarball containing (a)
    • +
  • c) a url that resolves to (b)
    • +
  • d) a <name>@<version> that is published on the registry with (c)
    • +
  • e) a <name>@<tag> that points to (d)
    • +
  • f) a <name> that has a "latest" tag satisfying (e)
    • +
  • g) a git url that, when cloned, results in (a).
    • +

Even if you never publish your package, you can still get a lot of benefits of using npm if you just want to write a node program (a), and perhaps if you also want to be able to easily install it elsewhere after packing it up into a tarball (b).

-

Git urls can be of the form:

- 
git://github.com/user/project.git#commit-ish
 git+ssh://user@hostname:project.git#commit-ish
 git+http://user@hostname/project/blah.git#commit-ish
-git+https://user@hostname/project/blah.git#commit-ish
- -

The commit-ish can be any tag, sha, or branch which can be supplied as +git+https://user@hostname/project/blah.git#commit-ish +

The commit-ish can be any tag, sha, or branch which can be supplied as an argument to git checkout. The default is master.

- -

The package.json File

- +

The package.json File

You need to have a package.json file in the root of your project to do much of anything with npm. That is basically the whole interface.

-

See package.json(5) for details about what goes in that file. At the very least, you need:

- -

  • name: +

      +

    • name: This should be a string that identifies your project. Please do not use the name to specify that it runs on node, or is in JavaScript. You can use the "engines" field to explicitly state the versions of node (or whatever else) that your program requires, and it's pretty -well assumed that it's javascript.

      It does not necessarily need to match your github repository name.

      So, node-foo and bar-js are bad names. foo or bar are better.

    • version: -A semver-compatible version.

    • engines: +well assumed that it's javascript.

      +

      It does not necessarily need to match your github repository name.

      +

      So, node-foo and bar-js are bad names. foo or bar are better.

      +
      • +

    • version: +A semver-compatible version.

      +
      • +

    • engines: Specify the versions of node (or whatever else) that your program runs on. The node API changes a lot, and there may be bugs or new -functionality that you depend on. Be explicit.

    • author: -Take some credit.

    • scripts: +functionality that you depend on. Be explicit.

      +
      • +

    • author: +Take some credit.

      +
      • +

    • scripts: If you have a special compilation or installation script, then you should put it in the scripts hash. You should definitely have at least a basic smoke-test command as the "scripts.test" field. -See npm-scripts(7).

    • main: +See npm-scripts(7).

      +
      • +

    • main: If you have a single module that serves as the entry point to your program (like what the "foo" package gives you at require("foo")), -then you need to specify that in the "main" field.

    • directories: +then you need to specify that in the "main" field.

      +
      • +

    • directories: This is a hash of folders. The best ones to include are "lib" and "doc", but if you specify a folder full of man pages in "man", then -they'll get installed just like these ones.

    - +they'll get installed just like these ones.

    +
    • +

You can use npm init in the root of your package in order to get you started with a pretty basic package.json file. See npm-init(1) for more info.

- -

Keeping files out of your package

- +

Keeping files out of your package

Use a .npmignore file to keep stuff out of your package. If there's no .npmignore file, but there is a .gitignore file, then npm will ignore the stuff matched by the .gitignore file. If you want to include something that is excluded by your .gitignore file, you can create an empty .npmignore file to override it.

-

By default, the following paths and files are ignored, so there's no need to add them to .npmignore explicitly:

- -
  • .*.swp
  • ._*
  • .DS_Store
  • .git
  • .hg
  • .lock-wscript
  • .svn
  • .wafpickle-*
  • CVS
  • npm-debug.log
- +
    +
  • .*.swp
    • +
  • ._*
    • +
  • .DS_Store
    • +
  • .git
    • +
  • .hg
    • +
  • .lock-wscript
    • +
  • .svn
    • +
  • .wafpickle-*
    • +
  • CVS
    • +
  • npm-debug.log
    • +

Additionally, everything in node_modules is ignored, except for bundled dependencies. npm automatically handles this for you, so don't bother adding node_modules to .npmignore.

-

The following paths and files are never ignored, so adding them to .npmignore is pointless:

- - - - - + +

npm link is designed to install a development package and see the changes in real time without having to keep re-installing it. (You do need to either re-link or npm rebuild -g to update compiled packages, of course.)

-

More info at npm-link(1).

- -

Before Publishing: Make Sure Your Package Installs and Works

- +

Before Publishing: Make Sure Your Package Installs and Works

This is important.

-

If you can not install it locally, you'll have problems trying to publish it. Or, worse yet, you'll be able to publish it, but you'll be publishing a broken or pointless package. So don't do that.

-

In the root of your package, do this:

- -
npm install . -g
- -

That'll show you that it's working. If you'd rather just create a symlink +

npm install . -g
+

That'll show you that it's working. If you'd rather just create a symlink package that points to your working directory, then do this:

- -
npm link
- -

Use npm ls -g to see if it's there.

- +
npm link
+

Use npm ls -g to see if it's there.

To test a local install, go into some other folder, and then do:

- 
cd ../some-other-folder
-npm install ../my-package
- -

to install it locally into the node_modules folder in that other place.

- +npm install ../my-package +

to install it locally into the node_modules folder in that other place.

Then go into the node-repl, and try using require("my-thing") to bring in your module's main module.

- -

Create a User Account

- +

Create a User Account

Create a user with the adduser command. It works like this:

- -
npm adduser
- -

and then follow the prompts.

- +
npm adduser
+

and then follow the prompts.

This is documented better in npm-adduser(1).

- -

Publish your package

- +

Publish your package

This part's easy. IN the root of your folder, do this:

- -
npm publish
- -

You can give publish a url to a tarball, or a filename of a tarball, +

npm publish
+

You can give publish a url to a tarball, or a filename of a tarball, or a path to a folder.

-

Note that pretty much everything in that folder will be exposed by default. So, if you have secret stuff in there, use a .npmignore file to list out the globs to ignore, or publish from a fresh checkout.

- -

Brag about it

- +

Brag about it

Send emails, write blogs, blab in IRC.

-

Tell the world how easy it is to install your program!

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -187,5 +181,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/misc/npm-disputes.html nodejs-0.10.29/deps/npm/html/doc/misc/npm-disputes.html --- nodejs-0.10.28/deps/npm/html/doc/misc/npm-disputes.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/misc/npm-disputes.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,90 +10,97 @@

npm-disputes

Handling Module Name Disputes

- -

SYNOPSIS

- -
  1. Get the author email with npm owner ls <pkgname>
  2. Email the author, CC support@npmjs.com
  3. After a few weeks, if there's no resolution, we'll sort it out.
- +

SYNOPSIS

+
    +
  1. Get the author email with npm owner ls <pkgname>
    2. +
  2. Email the author, CC support@npmjs.com
    3. +
  3. After a few weeks, if there's no resolution, we'll sort it out.
    4. +

Don't squat on package names. Publish code or move out of the way.

- -

DESCRIPTION

- +

DESCRIPTION

There sometimes arise cases where a user publishes a module, and then later, some other user wants to use that name. Here are some common ways that happens (each of these is based on actual events.)

- -
  1. Joe writes a JavaScript module foo, which is not node-specific. +
      +
    1. Joe writes a JavaScript module foo, which is not node-specific. Joe doesn't use node at all. Bob wants to use foo in node, so he wraps it in an npm module. Some time later, Joe starts using node, -and wants to take over management of his program.
    2. Bob writes an npm module foo, and publishes it. Perhaps much +and wants to take over management of his program.
      3. +
    3. Bob writes an npm module foo, and publishes it. Perhaps much later, Joe finds a bug in foo, and fixes it. He sends a pull request to Bob, but Bob doesn't have the time to deal with it, because he has a new job and a new baby and is focused on his new erlang project, and kind of not involved with node any more. Joe would like to publish a new foo, but can't, because the name is -taken.
    4. Bob writes a 10-line flow-control library, and calls it foo, and +taken.
      5. +
    5. Bob writes a 10-line flow-control library, and calls it foo, and publishes it to the npm registry. Being a simple little thing, it never really has to be updated. Joe works for Foo Inc, the makers of the critically acclaimed and widely-marketed foo JavaScript toolkit framework. They publish it to npm as foojs, but people are -routinely confused when npm install foo is some different thing.
    6. Bob writes a parser for the widely-known foo file format, because +routinely confused when npm install foo is some different thing.
      7. +
    7. Bob writes a parser for the widely-known foo file format, because he needs it for work. Then, he gets a new job, and never updates the prototype. Later on, Joe writes a much more complete foo parser, -but can't publish, because Bob's foo is in the way.
    - +but can't publish, because Bob's foo is in the way.
    2. +

The validity of Joe's claim in each situation can be debated. However, Joe's appropriate course of action in each case is the same.

- -
  1. npm owner ls foo. This will tell Joe the email address of the -owner (Bob).
  2. Joe emails Bob, explaining the situation as respectfully as +
      +
    1. npm owner ls foo. This will tell Joe the email address of the +owner (Bob).
      2. +
    2. Joe emails Bob, explaining the situation as respectfully as possible, and what he would like to do with the module name. He -adds the npm support staff support@npmjs.com to the CC list of +adds the npm support staff support@npmjs.com to the CC list of the email. Mention in the email that Bob can run npm owner add -joe foo to add Joe as an owner of the foo package.
    3. After a reasonable amount of time, if Bob has not responded, or if +joe foo to add Joe as an owner of the foo package.
      4. +
    4. After a reasonable amount of time, if Bob has not responded, or if Bob and Joe can't come to any sort of resolution, email support -support@npmjs.com and we'll sort it out. ("Reasonable" is +support@npmjs.com and we'll sort it out. ("Reasonable" is usually at least 4 weeks, but extra time is allowed around common -holidays.)
    - -

    REASONING

    - +holidays.)
    3. +
+

REASONING

In almost every case so far, the parties involved have been able to reach an amicable resolution without any major intervention. Most people really do want to be reasonable, and are probably not even aware that they're in your way.

-

Module ecosystems are most vibrant and powerful when they are as self-directed as possible. If an admin one day deletes something you had worked on, then that is going to make most people quite upset, regardless of the justification. When humans solve their problems by talking to other humans with respect, everyone has the chance to end up feeling good about the interaction.

- -

EXCEPTIONS

- +

EXCEPTIONS

Some things are not allowed, and will be removed without discussion if they are brought to the attention of the npm registry admins, including but not limited to:

- -
  1. Malware (that is, a package designed to exploit or harm the machine on -which it is installed).
  2. Violations of copyright or licenses (for example, cloning an +
      +
    1. Malware (that is, a package designed to exploit or harm the machine on +which it is installed).
      2. +
    2. Violations of copyright or licenses (for example, cloning an MIT-licensed program, and then removing or changing the copyright and -license statement).
    3. Illegal content.
    4. "Squatting" on a package name that you plan to use, but aren't +license statement).
      5. +
    5. Illegal content.
      6. +
    6. "Squatting" on a package name that you plan to use, but aren't actually using. Sorry, I don't care how great the name is, or how perfect a fit it is for the thing that someday might happen. If someone wants to use it today, and you're just taking up space with -an empty tarball, you're going to be evicted.
    7. Putting empty packages in the registry. Packages must have SOME +an empty tarball, you're going to be evicted.
      8. +
    8. Putting empty packages in the registry. Packages must have SOME functionality. It can be silly, but it can't be nothing. (See -also: squatting.)
    9. Doing weird things with the registry, like using it as your own +also: squatting.)
      10. +
    10. Doing weird things with the registry, like using it as your own personal application database or otherwise putting non-packagey -things into it.
    - +things into it.
    3. +

If you see bad behavior like this, please report it right away.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -105,5 +112,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/misc/npm-faq.html nodejs-0.10.29/deps/npm/html/doc/misc/npm-faq.html --- nodejs-0.10.28/deps/npm/html/doc/misc/npm-faq.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/misc/npm-faq.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,238 +10,181 @@

npm-faq

Frequently Asked Questions

- -

Where can I find these docs in HTML?

- +

Where can I find these docs in HTML?

https://www.npmjs.org/doc/, or run:

- -
npm config set viewer browser
- -

to open these documents in your default web browser rather than man.

- -

It didn't work.

- +
npm config set viewer browser
+

to open these documents in your default web browser rather than man.

+

It didn't work.

That's not really a question.

- -

Why didn't it work?

- +

Why didn't it work?

I don't know yet.

-

Read the error output, and if you can't figure out what it means, do what it says and post a bug with all the information it asks for.

- -

Where does npm put stuff?

- +

Where does npm put stuff?

See npm-folders(5)

-

tl;dr:

- -
  • Use the npm root command to see where modules go, and the npm bin -command to see where executables go
  • Global installs are different from local installs. If you install +
      +
    • Use the npm root command to see where modules go, and the npm bin +command to see where executables go
      • +
    • Global installs are different from local installs. If you install something with the -g flag, then its executables go in npm bin -g -and its modules go in npm root -g.
    - -

    How do I install something on my computer in a central location?

    - +and its modules go in npm root -g.
    • +
+

How do I install something on my computer in a central location?

Install it globally by tacking -g or --global to the command. (This is especially important for command line utilities that need to add their bins to the global system PATH.)

- -

I installed something globally, but I can't require() it

- +

I installed something globally, but I can't require() it

Install it locally.

-

The global install location is a place for command-line utilities to put their bins in the system PATH. It's not for use with require().

-

If you require() a module in your code, then that means it's a dependency, and a part of your program. You need to install it locally in your program.

- -

Why can't npm just put everything in one place, like other package managers?

- +

Why can't npm just put everything in one place, like other package managers?

Not every change is an improvement, but every improvement is a change. This would be like asking git to do network IO for every commit. It's not going to happen, because it's a terrible idea that causes more problems than it solves.

-

It is much harder to avoid dependency conflicts without nesting dependencies. This is fundamental to the way that npm works, and has proven to be an extremely successful approach. See npm-folders(5) for more details.

-

If you want a package to be installed in one place, and have all your programs reference the same copy of it, then use the npm link command. That's what it's for. Install it globally, then link it into each program that uses it.

- -

Whatever, I really want the old style 'everything global' style.

- +

Whatever, I really want the old style 'everything global' style.

Write your own package manager. You could probably even wrap up npm in a shell script if you really wanted to.

-

npm will not help you do something that is known to be a bad idea.

- -

Should I check my node_modules folder into git?

- +

Should I check my node_modules folder into git?

Mikeal Rogers answered this question very well:

-

http://www.futurealoof.com/posts/nodemodules-in-git.html

-

tl;dr

- -
  • Check node_modules into git for things you deploy, such as -websites and apps.
  • Do not check node_modules into git for libraries and modules -intended to be reused.
  • Use npm to manage dependencies in your dev environment, but not in -your deployment scripts.
- -

Is it 'npm' or 'NPM' or 'Npm'?

- +
    +
  • Check node_modules into git for things you deploy, such as +websites and apps.
    • +
  • Do not check node_modules into git for libraries and modules +intended to be reused.
    • +
  • Use npm to manage dependencies in your dev environment, but not in +your deployment scripts.
    • +
+

Is it 'npm' or 'NPM' or 'Npm'?

npm should never be capitalized unless it is being displayed in a location that is customarily all-caps (such as the title of man pages.)

- -

If 'npm' is an acronym, why is it never capitalized?

- +

If 'npm' is an acronym, why is it never capitalized?

Contrary to the belief of many, "npm" is not in fact an abbreviation for "Node Package Manager". It is a recursive bacronymic abbreviation for "npm is not an acronym". (If it was "ninaa", then it would be an acronym, and thus incorrectly named.)

-

"NPM", however, is an acronym (more precisely, a capitonym) for the National Association of Pastoral Musicians. You can learn more about them at http://npm.org/.

-

In software, "NPM" is a Non-Parametric Mapping utility written by Chris Rorden. You can analyze pictures of brains with it. Learn more about the (capitalized) NPM program at http://www.cabiatl.com/mricro/npm/.

-

The first seed that eventually grew into this flower was a bash utility named "pm", which was a shortened descendent of "pkgmakeinst", a bash function that was used to install various different things on different platforms, most often using Yahoo's yinst. If npm was ever an acronym for anything, it was node pm or maybe new pm.

-

So, in all seriousness, the "npm" project is named after its command-line utility, which was organically selected to be easily typed by a right-handed programmer using a US QWERTY keyboard layout, ending with the right-ring-finger in a postition to type the - key for flags and other command-line arguments. That command-line utility is always lower-case, though it starts most sentences it is a part of.

- -

How do I list installed packages?

- +

How do I list installed packages?

npm ls

- -

How do I search for packages?

- +

How do I search for packages?

npm search

-

Arguments are greps. npm search jsdom shows jsdom packages.

- -

How do I update npm?

- -
npm update npm -g
- -

You can also update all outdated local packages by doing npm update without +

How do I update npm?

+
npm update npm -g
+

You can also update all outdated local packages by doing npm update without any arguments, or global packages by doing npm update -g.

-

Occasionally, the version of npm will progress such that the current version cannot be properly installed with the version that you have installed already. (Consider, if there is ever a bug in the update command.)

-

In those cases, you can do this:

- -
curl https://www.npmjs.org/install.sh | sh
- -

What is a package?

- +
curl https://www.npmjs.org/install.sh | sh
+

What is a package?

A package is:

- -
  • a) a folder containing a program described by a package.json file
  • b) a gzipped tarball containing (a)
  • c) a url that resolves to (b)
  • d) a <name>@<version> that is published on the registry with (c)
  • e) a <name>@<tag> that points to (d)
  • f) a <name> that has a "latest" tag satisfying (e)
  • g) a git url that, when cloned, results in (a).
- +
    +
  • a) a folder containing a program described by a package.json file
    • +
  • b) a gzipped tarball containing (a)
    • +
  • c) a url that resolves to (b)
    • +
  • d) a <name>@<version> that is published on the registry with (c)
    • +
  • e) a <name>@<tag> that points to (d)
    • +
  • f) a <name> that has a "latest" tag satisfying (e)
    • +
  • g) a git url that, when cloned, results in (a).
    • +

Even if you never publish your package, you can still get a lot of benefits of using npm if you just want to write a node program (a), and perhaps if you also want to be able to easily install it elsewhere after packing it up into a tarball (b).

-

Git urls can be of the form:

- 
git://github.com/user/project.git#commit-ish
 git+ssh://user@hostname:project.git#commit-ish
 git+http://user@hostname/project/blah.git#commit-ish
-git+https://user@hostname/project/blah.git#commit-ish
- -

The commit-ish can be any tag, sha, or branch which can be supplied as +git+https://user@hostname/project/blah.git#commit-ish +

The commit-ish can be any tag, sha, or branch which can be supplied as an argument to git checkout. The default is master.

- -

What is a module?

- +

What is a module?

A module is anything that can be loaded with require() in a Node.js program. The following things are all examples of things that can be loaded as modules:

- -
  • A folder with a package.json file containing a main field.
  • A folder with an index.js file in it.
  • A JavaScript file.
- +
    +
  • A folder with a package.json file containing a main field.
    • +
  • A folder with an index.js file in it.
    • +
  • A JavaScript file.
    • +

Most npm packages are modules, because they are libraries that you load with require. However, there's no requirement that an npm package be a module! Some only contain an executable command-line interface, and don't provide a main field for use in Node programs.

-

Almost all npm packages (at least, those that are Node programs) contain many modules within them (because every file they load with require() is a module).

-

In the context of a Node program, the module is also the thing that was loaded from a file. For example, in the following program:

- -
var req = require('request')
- -

we might say that "The variable req refers to the request module".

- -

So, why is it the "node_modules" folder, but "package.json" file? Why not node_packages or module.json?

- +
var req = require('request')
+

we might say that "The variable req refers to the request module".

+

So, why is it the "node_modules" folder, but "package.json" file? Why not node_packages or module.json?

The package.json file defines the package. (See "What is a package?" above.)

-

The node_modules folder is the place Node.js looks for modules. (See "What is a module?" above.)

-

For example, if you create a file at node_modules/foo.js and then had a program that did var f = require('foo.js') then it would load the module. However, foo.js is not a "package" in this case, because it does not have a package.json.

-

Alternatively, if you create a package which does not have an index.js or a "main" field in the package.json file, then it is not a module. Even if it's installed in node_modules, it can't be an argument to require().

- -

"node_modules" is the name of my deity's arch-rival, and a Forbidden Word in my religion. Can I configure npm to use a different folder?

- +

"node_modules" is the name of my deity's arch-rival, and a Forbidden Word in my religion. Can I configure npm to use a different folder?

No. This will never happen. This question comes up sometimes, because it seems silly from the outside that npm couldn't just be configured to put stuff somewhere else, and then npm could load them from there. It's an arbitrary spelling choice, right? What's the big deal?

-

At the time of this writing, the string 'node_modules' appears 151 times in 53 separate files in npm and node core (excluding tests and documentation).

-

Some of these references are in node's built-in module loader. Since npm is not involved at all at run-time, node itself would have to be configured to know where you've decided to stick stuff. Complexity hurdle #1. Since the Node module system is locked, this cannot be changed, and is enough to kill this request. But I'll continue, in deference to your deity's delicate feelings regarding spelling.

-

Many of the others are in dependencies that npm uses, which are not necessarily tightly coupled to npm (in the sense that they do not read npm's configuration files, etc.) Each of these would have to be configured to take the name of the node_modules folder as a parameter. Complexity hurdle #2.

-

Furthermore, npm has the ability to "bundle" dependencies by adding the dep names to the "bundledDependencies" list in package.json, which causes the folder to be included in the package tarball. What @@ -249,7 +192,6 @@ different spelling for node_modules? npm would have to rename the folder at publish time, and then be smart enough to unpack it using your locally configured name. Complexity hurdle #3.

-

Furthermore, what happens when you change this name? Fine, it's easy enough the first time, just rename the node_modules folders to ./blergyblerp/ or whatever name you choose. But what about when you @@ -257,99 +199,81 @@ configuration settings, so this would be rather difficult to do properly. It would have to track every previous value for this config, and always accept any of them, or else yesterday's install may -be broken tomorrow. Complexity hurdle #5.

- +be broken tomorrow. Complexity hurdle #4.

Never going to happen. The folder is named node_modules. It is written indelibly in the Node Way, handed down from the ancient times of Node 0.3.

- -

How do I install node with npm?

- +

How do I install node with npm?

You don't. Try one of these node version managers:

-

Unix:

- - - +

Windows:

- - - -

How can I use npm for development?

- + +

How can I use npm for development?

See npm-developers(7) and package.json(5).

-

You'll most likely want to npm link your development folder. That's awesomely handy.

-

To set up your own private registry, check out npm-registry(7).

- -

Can I list a url as a dependency?

- +

Can I list a url as a dependency?

Yes. It should be a url to a gzipped tarball containing a single folder that has a package.json in its root, or a git url. (See "what is a package?" above.)

- - - +

How do I symlink to a dev folder so I don't have to keep re-installing?

See npm-link(1)

- -

The package registry website. What is that exactly?

- +

The package registry website. What is that exactly?

See npm-registry(7).

- -

I forgot my password, and can't publish. How do I reset it?

- +

I forgot my password, and can't publish. How do I reset it?

Go to https://npmjs.org/forgot.

- -

I get ECONNREFUSED a lot. What's up?

- +

I get ECONNREFUSED a lot. What's up?

Either the registry is down, or node's DNS isn't able to reach out.

-

To check if the registry is down, open up https://registry.npmjs.org/ in a web browser. This will also tell you if you are just unable to access the internet for some reason.

- -

If the registry IS down, let us know by emailing support@npmjs.com +

If the registry IS down, let us know by emailing support@npmjs.com or posting an issue at https://github.com/npm/npm/issues. If it's down for the world (and not just on your local network) then we're probably already being pinged about it.

-

You can also often get a faster response by visiting the #npm channel on Freenode IRC.

- -

Why no namespaces?

- +

Why no namespaces?

Please see this discussion: https://github.com/npm/npm/issues/798

-

tl;dr - It doesn't actually make things better, and can make them worse.

-

If you want to namespace your own packages, you may: simply use the - character to separate the names. npm is a mostly anarchic system. There is not sufficient need to impose namespace rules on everyone.

- -

Who does npm?

- +

Who does npm?

npm was originally written by Isaac Z. Schlueter, and many others have contributed to it, some of them quite substantially.

-

The npm open source project, The npm Registry, and the community website are maintained and operated by the -good folks at npm, Inc.

- -

I have a question or request not addressed here. Where should I put it?

- +good folks at npm, Inc.

+

I have a question or request not addressed here. Where should I put it?

Post an issue on the github project:

- - - -

Why does npm hate me?

- + +

Why does npm hate me?

npm is not capable of hatred. It loves everyone, especially you.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -361,5 +285,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/misc/npm-index.html nodejs-0.10.29/deps/npm/html/doc/misc/npm-index.html --- nodejs-0.10.28/deps/npm/html/doc/misc/npm-index.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/misc/npm-index.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,414 +10,213 @@

npm-index

Index of all npm documentation

- -

README

- +

README

node package manager

- -

Command Line Documentation

- -

npm(1)

- +

Command Line Documentation

+

npm(1)

node package manager

- -

npm-adduser(1)

- +

npm-adduser(1)

Add a registry user account

- -

npm-bin(1)

- +

npm-bin(1)

Display npm bin folder

- -

npm-bugs(1)

- +

npm-bugs(1)

Bugs for a package in a web browser maybe

- -

npm-build(1)

- +

npm-build(1)

Build a package

- -

npm-bundle(1)

- +

npm-bundle(1)

REMOVED

- -

npm-cache(1)

- +

npm-cache(1)

Manipulates packages cache

- -

npm-completion(1)

- +

npm-completion(1)

Tab Completion for npm

- -

npm-config(1)

- +

npm-config(1)

Manage the npm configuration files

- -

npm-dedupe(1)

- +

npm-dedupe(1)

Reduce duplication

- -

npm-deprecate(1)

- +

npm-deprecate(1)

Deprecate a version of a package

- -

npm-docs(1)

- +

npm-docs(1)

Docs for a package in a web browser maybe

- -

npm-edit(1)

- +

npm-edit(1)

Edit an installed package

- -

npm-explore(1)

- +

npm-explore(1)

Browse an installed package

- -

npm-help-search(1)

- +

npm-help-search(1)

Search npm help documentation

- -

npm-help(1)

- +

npm-help(1)

Get help on npm

- -

npm-init(1)

- +

npm-init(1)

Interactively create a package.json file

- -

npm-install(1)

- +

npm-install(1)

Install a package

- - - +

npm-link(1)

Symlink a package folder

- -

npm-ls(1)

- +

npm-ls(1)

List installed packages

- -

npm-outdated(1)

- +

npm-outdated(1)

Check for outdated packages

- -

npm-owner(1)

- +

npm-owner(1)

Manage package owners

- -

npm-pack(1)

- +

npm-pack(1)

Create a tarball from a package

- -

npm-prefix(1)

- +

npm-prefix(1)

Display prefix

- -

npm-prune(1)

- +

npm-prune(1)

Remove extraneous packages

- -

npm-publish(1)

- +

npm-publish(1)

Publish a package

- -

npm-rebuild(1)

- +

npm-rebuild(1)

Rebuild a package

- -

npm-repo(1)

- +

npm-repo(1)

Open package repository page in the browser

- -

npm-restart(1)

- +

npm-restart(1)

Start a package

- -

npm-rm(1)

- +

npm-rm(1)

Remove a package

- -

npm-root(1)

- +

npm-root(1)

Display npm root

- -

npm-run-script(1)

- +

npm-run-script(1)

Run arbitrary package scripts

- -

npm-search(1)

- +

npm-search(1)

Search for packages

- -

npm-shrinkwrap(1)

- +

npm-shrinkwrap(1)

Lock down dependency versions

- -

npm-star(1)

- +

npm-star(1)

Mark your favorite packages

- -

npm-stars(1)

- +

npm-stars(1)

View packages marked as favorites

- -

npm-start(1)

- +

npm-start(1)

Start a package

- -

npm-stop(1)

- +

npm-stop(1)

Stop a package

- -

npm-submodule(1)

- +

npm-submodule(1)

Add a package as a git submodule

- -

npm-tag(1)

- +

npm-tag(1)

Tag a published version

- -

npm-test(1)

- +

npm-test(1)

Test a package

- -

npm-uninstall(1)

- +

npm-uninstall(1)

Remove a package

- -

npm-unpublish(1)

- +

npm-unpublish(1)

Remove a package from the registry

- -

npm-update(1)

- +

npm-update(1)

Update a package

- -

npm-version(1)

- +

npm-version(1)

Bump a package version

- -

npm-view(1)

- +

npm-view(1)

View registry info

- -

npm-whoami(1)

- +

npm-whoami(1)

Display npm username

- -

API Documentation

- -

npm(3)

- +

API Documentation

+

npm(3)

node package manager

- -

npm-bin(3)

- +

npm-bin(3)

Display npm bin folder

- -

npm-bugs(3)

- +

npm-bugs(3)

Bugs for a package in a web browser maybe

- -

npm-commands(3)

- +

npm-cache(3)

+

manage the npm cache programmatically

+

npm-commands(3)

npm commands

- -

npm-config(3)

- +

npm-config(3)

Manage the npm configuration files

- -

npm-deprecate(3)

- +

npm-deprecate(3)

Deprecate a version of a package

- -

npm-docs(3)

- +

npm-docs(3)

Docs for a package in a web browser maybe

- -

npm-edit(3)

- +

npm-edit(3)

Edit an installed package

- -

npm-explore(3)

- +

npm-explore(3)

Browse an installed package

- -

npm-help-search(3)

- +

npm-help-search(3)

Search the help pages

- -

npm-init(3)

- +

npm-init(3)

Interactively create a package.json file

- -

npm-install(3)

- +

npm-install(3)

install a package programmatically

- - - +

npm-link(3)

Symlink a package folder

- -

npm-load(3)

- +

npm-load(3)

Load config settings

- -

npm-ls(3)

- +

npm-ls(3)

List installed packages

- -

npm-outdated(3)

- +

npm-outdated(3)

Check for outdated packages

- -

npm-owner(3)

- +

npm-owner(3)

Manage package owners

- -

npm-pack(3)

- +

npm-pack(3)

Create a tarball from a package

- -

npm-prefix(3)

- +

npm-prefix(3)

Display prefix

- -

npm-prune(3)

- +

npm-prune(3)

Remove extraneous packages

- -

npm-publish(3)

- +

npm-publish(3)

Publish a package

- -

npm-rebuild(3)

- +

npm-rebuild(3)

Rebuild a package

- -

npm-repo(3)

- +

npm-repo(3)

Open package repository page in the browser

- -

npm-restart(3)

- +

npm-restart(3)

Start a package

- -

npm-root(3)

- +

npm-root(3)

Display npm root

- -

npm-run-script(3)

- +

npm-run-script(3)

Run arbitrary package scripts

- -

npm-search(3)

- +

npm-search(3)

Search for packages

- -

npm-shrinkwrap(3)

- +

npm-shrinkwrap(3)

programmatically generate package shrinkwrap file

- -

npm-start(3)

- +

npm-start(3)

Start a package

- -

npm-stop(3)

- +

npm-stop(3)

Stop a package

- -

npm-submodule(3)

- +

npm-submodule(3)

Add a package as a git submodule

- -

npm-tag(3)

- +

npm-tag(3)

Tag a published version

- -

npm-test(3)

- +

npm-test(3)

Test a package

- -

npm-uninstall(3)

- +

npm-uninstall(3)

uninstall a package programmatically

- -

npm-unpublish(3)

- +

npm-unpublish(3)

Remove a package from the registry

- -

npm-update(3)

- +

npm-update(3)

Update a package

- -

npm-version(3)

- +

npm-version(3)

Bump a package version

- -

npm-view(3)

- +

npm-view(3)

View registry info

- -

npm-whoami(3)

- +

npm-whoami(3)

Display npm username

- -

Files

- -

npm-folders(5)

- +

Files

+

npm-folders(5)

Folder Structures Used by npm

- -

npmrc(5)

- +

npmrc(5)

The npm config files

- -

package.json(5)

- +

package.json(5)

Specifics of npm's package.json handling

- -

Misc

- -

npm-coding-style(7)

- +

Misc

+

npm-coding-style(7)

npm's "funny" coding style

- -

npm-config(7)

- +

npm-config(7)

More than you probably want to know about npm configuration

- -

npm-developers(7)

- +

npm-developers(7)

Developer Guide

- -

npm-disputes(7)

- +

npm-disputes(7)

Handling Module Name Disputes

- -

npm-faq(7)

- +

npm-faq(7)

Frequently Asked Questions

- -

npm-index(7)

- +

npm-index(7)

Index of all npm documentation

- -

npm-registry(7)

- +

npm-registry(7)

The JavaScript Package Registry

- -

npm-scripts(7)

- +

npm-scripts(7)

How npm handles the "scripts" field

- -

removing-npm(7)

- +

removing-npm(7)

Cleaning the Slate

- -

semver(7)

- +

semver(7)

The semantic versioner for npm

+
@@ -429,5 +228,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/misc/npm-registry.html nodejs-0.10.29/deps/npm/html/doc/misc/npm-registry.html --- nodejs-0.10.28/deps/npm/html/doc/misc/npm-registry.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/misc/npm-registry.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,69 +10,56 @@

npm-registry

The JavaScript Package Registry

- -

DESCRIPTION

- +

DESCRIPTION

To resolve packages by name and version, npm talks to a registry website that implements the CommonJS Package Registry specification for reading package info.

-

Additionally, npm's package registry implementation supports several write APIs as well, to allow for publishing packages and managing user account information.

-

The official public npm registry is at http://registry.npmjs.org/. It is powered by a CouchDB database at http://isaacs.iriscouch.com/registry. The code for the couchapp is available at http://github.com/npm/npmjs.org. npm user accounts are CouchDB users, stored in the http://isaacs.iriscouch.com/_users database.

-

The registry URL is supplied by the registry config parameter. See npm-config(1), npmrc(5), and npm-config(7) for more on managing npm's configuration.

- -

Can I run my own private registry?

- +

Can I run my own private registry?

Yes!

-

The easiest way is to replicate the couch database, and use the same (or similar) design doc to implement the APIs.

-

If you set up continuous replication from the official CouchDB, and then set your internal CouchDB as the registry config, then you'll be able to read any published packages, in addition to your private ones, and by default will only publish internally. If you then want to publish a package for the whole world to see, you can simply override the --registry config for that command.

- -

I don't want my package published in the official registry. It's private.

- +

I don't want my package published in the official registry. It's private.

Set "private": true in your package.json to prevent it from being published at all, or "publishConfig":{"registry":"http://my-internal-registry.local"} to force it to be published only to your internal registry.

-

See package.json(5) for more info on what goes in the package.json file.

- -

Will you replicate from my registry into the public one?

- +

Will you replicate from my registry into the public one?

No. If you want things to be public, then publish them into the public registry using npm. What little security there is would be for nought otherwise.

- -

Do I have to use couchdb to build a registry that npm can talk to?

- +

Do I have to use couchdb to build a registry that npm can talk to?

No, but it's way easier. Basically, yes, you do, or you have to effectively implement the entire CouchDB API anyway.

- -

Is there a website or something to see package docs and such?

- +

Is there a website or something to see package docs and such?

Yes, head over to https://npmjs.org/

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -84,5 +71,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/misc/npm-scripts.html nodejs-0.10.29/deps/npm/html/doc/misc/npm-scripts.html --- nodejs-0.10.28/deps/npm/html/doc/misc/npm-scripts.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/misc/npm-scripts.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,221 +10,203 @@

npm-scripts

How npm handles the "scripts" field

- -

DESCRIPTION

- +

DESCRIPTION

npm supports the "scripts" member of the package.json script, for the following scripts:

- -
  • prepublish: +
      +
    • prepublish: Run BEFORE the package is published. (Also run on local npm -install without any arguments.)
    • publish, postpublish: -Run AFTER the package is published.
    • preinstall: -Run BEFORE the package is installed
    • install, postinstall: -Run AFTER the package is installed.
    • preuninstall, uninstall: -Run BEFORE the package is uninstalled.
    • postuninstall: -Run AFTER the package is uninstalled.
    • preupdate: -Run BEFORE the package is updated with the update command.
    • update, postupdate: -Run AFTER the package is updated with the update command.
    • pretest, test, posttest: -Run by the npm test command.
    • prestop, stop, poststop: -Run by the npm stop command.
    • prestart, start, poststart: -Run by the npm start command.
    • prerestart, restart, postrestart: +install without any arguments.)
      • +
    • publish, postpublish: +Run AFTER the package is published.
      • +
    • preinstall: +Run BEFORE the package is installed
      • +
    • install, postinstall: +Run AFTER the package is installed.
      • +
    • preuninstall, uninstall: +Run BEFORE the package is uninstalled.
      • +
    • postuninstall: +Run AFTER the package is uninstalled.
      • +
    • preupdate: +Run BEFORE the package is updated with the update command.
      • +
    • update, postupdate: +Run AFTER the package is updated with the update command.
      • +
    • pretest, test, posttest: +Run by the npm test command.
      • +
    • prestop, stop, poststop: +Run by the npm stop command.
      • +
    • prestart, start, poststart: +Run by the npm start command.
      • +
    • prerestart, restart, postrestart: Run by the npm restart command. Note: npm restart will run the -stop and start scripts if no restart script is provided.
    - +stop and start scripts if no restart script is provided.
    • +

Additionally, arbitrary scripts can be run by doing -npm run-script <stage> <pkg>.

- -

NOTE: INSTALL SCRIPTS ARE AN ANTIPATTERN

- +npm run-script <pkg> <stage>.

+

NOTE: INSTALL SCRIPTS ARE AN ANTIPATTERN

tl;dr Don't use install. Use a .gyp file for compilation, and prepublish for anything else.

-

You should almost never have to explicitly set a preinstall or install script. If you are doing this, please consider if there is another option.

-

The only valid use of install or preinstall scripts is for compilation which must be done on the target architecture. In early versions of node, this was often done using the node-waf scripts, or a standalone Makefile, and early versions of npm required that it be explicitly set in package.json. This was not portable, and harder to do properly.

-

In the current version of node, the standard way to do this is using a .gyp file. If you have a file with a .gyp extension in the root of your package, then npm will run the appropriate node-gyp commands automatically at install time. This is the only officially supported method for compiling binary addons, and does not require that you add anything to your package.json file.

-

If you have to do other things before your package is used, in a way that is not dependent on the operating system or architecture of the target system, then use a prepublish script instead. This includes tasks such as:

- -
  • Compile CoffeeScript source code into JavaScript.
  • Create minified versions of JavaScript source code.
  • Fetching remote resources that your package will use.
- +
    +
  • Compile CoffeeScript source code into JavaScript.
    • +
  • Create minified versions of JavaScript source code.
    • +
  • Fetching remote resources that your package will use.
    • +

The advantage of doing these things at prepublish time instead of preinstall or install time is that they can be done once, in a single place, and thus greatly reduce complexity and variability. Additionally, this means that:

- -
  • You can depend on coffee-script as a devDependency, and thus -your users don't need to have it installed.
  • You don't need to include the minifiers in your package, reducing -the size for your users.
  • You don't need to rely on your users having curl or wget or -other system tools on the target machines.
- -

DEFAULT VALUES

- +
    +
  • You can depend on coffee-script as a devDependency, and thus +your users don't need to have it installed.
    • +
  • You don't need to include the minifiers in your package, reducing +the size for your users.
    • +
  • You don't need to rely on your users having curl or wget or +other system tools on the target machines.
    • +
+

DEFAULT VALUES

npm will default some script values based on package contents.

- -

  • "start": "node server.js":

    If there is a server.js file in the root of your package, then npm -will default the start command to node server.js.

  • "preinstall": "node-waf clean || true; node-waf configure build":

    If there is a wscript file in the root of your package, npm will -default the preinstall command to compile using node-waf.

- -

USER

- +
    +

  • "start": "node server.js":

    +

    If there is a server.js file in the root of your package, then npm +will default the start command to node server.js.

    +
    • +

  • "preinstall": "node-waf clean || true; node-waf configure build":

    +

    If there is a wscript file in the root of your package, npm will +default the preinstall command to compile using node-waf.

    +
    • +
+

USER

If npm was invoked with root privileges, then it will change the uid to the user account or uid specified by the user config, which defaults to nobody. Set the unsafe-perm flag to run scripts with root privileges.

- -

ENVIRONMENT

- +

ENVIRONMENT

Package scripts run in an environment where many pieces of information are made available regarding the setup of npm and the current state of the process.

-

path

-

If you depend on modules that define executable scripts, like test suites, then those executables will be added to the PATH for executing the scripts. So, if your package.json has this:

- 
{ "name" : "foo"
 , "dependencies" : { "bar" : "0.1.x" }
-, "scripts": { "start" : "bar ./test" } }
- -

then you could run npm start to execute the bar script, which is +, "scripts": { "start" : "bar ./test" } } +

then you could run npm start to execute the bar script, which is exported into the node_modules/.bin directory on npm install.

-

package.json vars

-

The package.json fields are tacked onto the npm_package_ prefix. So, for instance, if you had {"name":"foo", "version":"1.2.5"} in your package.json file, then your package scripts would have the npm_package_name environment variable set to "foo", and the npm_package_version set to "1.2.5"

-

configuration

-

Configuration parameters are put in the environment with the npm_config_ prefix. For instance, you can view the effective root config by checking the npm_config_root environment variable.

- -

Special: package.json "config" hash

- +

Special: package.json "config" hash

The package.json "config" keys are overwritten in the environment if there is a config param of <name>[@<version>]:<key>. For example, if the package.json has this:

- 
{ "name" : "foo"
 , "config" : { "port" : "8080" }
-, "scripts" : { "start" : "node server.js" } }
- -

and the server.js is this:

- -
http.createServer(...).listen(process.env.npm_package_config_port)
- -

then the user could change the behavior by doing:

- -
npm config set foo:port 80
- -

current lifecycle event

- +, "scripts" : { "start" : "node server.js" } } +

and the server.js is this:

+
http.createServer(...).listen(process.env.npm_package_config_port)
+

then the user could change the behavior by doing:

+
npm config set foo:port 80
+

current lifecycle event

Lastly, the npm_lifecycle_event environment variable is set to whichever stage of the cycle is being executed. So, you could have a single script used for different parts of the process which switches based on what's currently happening.

-

Objects are flattened following this format, so if you had {"scripts":{"install":"foo.js"}} in your package.json, then you'd see this in the script:

- -
process.env.npm_package_scripts_install === "foo.js"
- -

EXAMPLES

- +
process.env.npm_package_scripts_install === "foo.js"
+

EXAMPLES

For example, if your package.json contains this:

- 
{ "scripts" :
   { "install" : "scripts/install.js"
   , "postinstall" : "scripts/install.js"
   , "uninstall" : "scripts/uninstall.js"
   }
-}
- -

then the scripts/install.js will be called for the install, +} +

then the scripts/install.js will be called for the install, post-install, stages of the lifecycle, and the scripts/uninstall.js would be called when the package is uninstalled. Since scripts/install.js is running for three different phases, it would be wise in this case to look at the npm_lifecycle_event environment variable.

-

If you want to run a make command, you can do so. This works just fine:

- 
{ "scripts" :
   { "preinstall" : "./configure"
   , "install" : "make && make install"
   , "test" : "make test"
   }
-}
- -

EXITING

- +} +

EXITING

Scripts are run by passing the line as a script argument to sh.

-

If the script exits with a code other than 0, then this will abort the process.

-

Note that these script files don't have to be nodejs or even javascript programs. They just have to be some kind of executable file.

- -

HOOK SCRIPTS

- +

HOOK SCRIPTS

If you want to run a specific script at a specific lifecycle event for ALL packages, then you can use a hook script.

-

Place an executable file at node_modules/.hooks/{eventname}, and it'll get run for all packages when they are going through that point in the package lifecycle for any packages installed in that root.

-

Hook scripts are run exactly the same way as package.json scripts. That is, they are in a separate child process, with the env described above.

- -

BEST PRACTICES

- -
  • Don't exit with a non-zero error code unless you really mean it. +

    BEST PRACTICES

    +
      +
    • Don't exit with a non-zero error code unless you really mean it. Except for uninstall scripts, this will cause the npm action to fail, and potentially be rolled back. If the failure is minor or only will prevent some optional features, then it's better to just -print a warning and exit successfully.
    • Try not to use scripts to do what npm can do for you. Read through +print a warning and exit successfully.
      • +
    • Try not to use scripts to do what npm can do for you. Read through package.json(5) to see all the things that you can specify and enable by simply describing your package appropriately. In general, this -will lead to a more robust and consistent state.
    • Inspect the env to determine where to put things. For instance, if +will lead to a more robust and consistent state.
      • +
    • Inspect the env to determine where to put things. For instance, if the npm_config_binroot environ is set to /home/user/bin, then don't try to install executables into /usr/local/bin. The user -probably set it up that way for a reason.
    • Don't prefix your script commands with "sudo". If root permissions +probably set it up that way for a reason.
      • +
    • Don't prefix your script commands with "sudo". If root permissions are required for some reason, then it'll fail with that error, and -the user will sudo the npm command in question.
    - -

    SEE ALSO

    +the user will sudo the npm command in question.
    • +
+

SEE ALSO

+ -
@@ -236,5 +218,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/misc/removing-npm.html nodejs-0.10.29/deps/npm/html/doc/misc/removing-npm.html --- nodejs-0.10.28/deps/npm/html/doc/misc/removing-npm.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/misc/removing-npm.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,56 +10,42 @@

npm-removal

Cleaning the Slate

- -

SYNOPSIS

- +

SYNOPSIS

So sad to see you go.

- -
sudo npm uninstall npm -g
- -

Or, if that fails, get the npm source code, and do:

- -
sudo make uninstall
- -

More Severe Uninstalling

- +
sudo npm uninstall npm -g
+

Or, if that fails, get the npm source code, and do:

+
sudo make uninstall
+

More Severe Uninstalling

Usually, the above instructions are sufficient. That will remove npm, but leave behind anything you've installed.

-

If that doesn't work, or if you require more drastic measures, continue reading.

-

Note that this is only necessary for globally-installed packages. Local installs are completely contained within a project's node_modules folder. Delete that folder, and everything is gone (unless a package's install script is particularly ill-behaved).

-

This assumes that you installed node and npm in the default place. If you configured node with a different --prefix, or installed npm with a different prefix setting, then adjust the paths accordingly, replacing /usr/local with your install prefix.

-

To remove everything npm-related manually:

- -
rm -rf /usr/local/{lib/node{,/.npm,_modules},bin,share/man}/npm*
- -

If you installed things with npm, then your best bet is to uninstall +

rm -rf /usr/local/{lib/node{,/.npm,_modules},bin,share/man}/npm*
+

If you installed things with npm, then your best bet is to uninstall them with npm first, and then install them again once you have a proper install. This can help find any symlinks that are lying around:

- -
ls -laF /usr/local/{lib/node{,/.npm},bin,share/man} | grep npm
- -

Prior to version 0.3, npm used shim files for executables and node +

ls -laF /usr/local/{lib/node{,/.npm},bin,share/man} | grep npm
+

Prior to version 0.3, npm used shim files for executables and node modules. To track those down, you can do the following:

+
find /usr/local/{lib/node,bin} -exec grep -l npm \{\} \; ;
+

(This is also in the README file.)

+

SEE ALSO

+ -
find /usr/local/{lib/node,bin} -exec grep -l npm \{\} \; ;
- -

(This is also in the README file.)

- -

SEE ALSO

- -
@@ -71,5 +57,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/misc/semver.html nodejs-0.10.29/deps/npm/html/doc/misc/semver.html --- nodejs-0.10.28/deps/npm/html/doc/misc/semver.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/misc/semver.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,9 +10,7 @@

semver

The semantic versioner for npm

- -

Usage

- +

Usage

$ npm install semver
 
 semver.valid('1.2.3') // '1.2.3'
@@ -20,10 +18,8 @@
 semver.clean('  =v1.2.3   ') // '1.2.3'
 semver.satisfies('1.2.3', '1.x || >=2.5.0 || 5.0.0 - 7.2.3') // true
 semver.gt('1.2.3', '9.8.7') // false
-semver.lt('1.2.3', '9.8.7') // true
- -

As a command-line utility:

- +semver.lt('1.2.3', '9.8.7') // true +

As a command-line utility:

$ semver -h
 
 Usage: semver <version> [<version> [...]] [-r <range> | -i <inc> | -d <dec>]
@@ -40,85 +36,124 @@
 then exits failure.
 
 Versions are printed in ascending order, so supplying
-multiple versions to the utility will just sort them.
- -

Versions

- -

A "version" is described by the v2.0.0 specification found at +multiple versions to the utility will just sort them. +

Versions

+

A "version" is described by the v2.0.0 specification found at http://semver.org/.

-

A leading "=" or "v" character is stripped off and ignored.

- -

Ranges

- +

Ranges

The following range styles are supported:

- -
  • 1.2.3 A specific version. When nothing else will do. Note that -build metadata is still ignored, so 1.2.3+build2012 will satisfy -this range.
  • >1.2.3 Greater than a specific version.
  • <1.2.3 Less than a specific version. If there is no prerelease +
      +
    • 1.2.3 A specific version. When nothing else will do. Must be a full +version number, with major, minor, and patch versions specified. +Note that build metadata is still ignored, so 1.2.3+build2012 will +satisfy this range.
      • +
    • >1.2.3 Greater than a specific version.
      • +
    • <1.2.3 Less than a specific version. If there is no prerelease tag on the version range, then no prerelease version will be allowed -either, even though these are technically "less than".
    • >=1.2.3 Greater than or equal to. Note that prerelease versions +either, even though these are technically "less than".
      • +
    • >=1.2.3 Greater than or equal to. Note that prerelease versions are NOT equal to their "normal" equivalents, so 1.2.3-beta will -not satisfy this range, but 2.3.0-beta will.
    • <=1.2.3 Less than or equal to. In this case, prerelease versions -ARE allowed, so 1.2.3-beta would satisfy.
    • 1.2.3 - 2.3.4 := >=1.2.3 <=2.3.4
    • ~1.2.3 := >=1.2.3-0 <1.3.0-0 "Reasonably close to 1.2.3". When +not satisfy this range, but 2.3.0-beta will.
      • +
    • <=1.2.3 Less than or equal to. In this case, prerelease versions +ARE allowed, so 1.2.3-beta would satisfy.
      • +
    • 1.2.3 - 2.3.4 := >=1.2.3 <=2.3.4
      • +
    • ~1.2.3 := >=1.2.3-0 <1.3.0-0 "Reasonably close to 1.2.3". When using tilde operators, prerelease versions are supported as well, but a prerelease of the next significant digit will NOT be -satisfactory, so 1.3.0-beta will not satisfy ~1.2.3.
    • ^1.2.3 := >=1.2.3-0 <2.0.0-0 "Compatible with 1.2.3". When +satisfactory, so 1.3.0-beta will not satisfy ~1.2.3.
      • +
    • ^1.2.3 := >=1.2.3-0 <2.0.0-0 "Compatible with 1.2.3". When using caret operators, anything from the specified version (including prerelease) will be supported up to, but not including, the next major version (or its prereleases). 1.5.1 will satisfy ^1.2.3, -while 1.2.2 and 2.0.0-beta will not.
    • ^0.1.3 := >=0.1.3-0 <0.2.0-0 "Compatible with 0.1.3". 0.x.x versions are +while 1.2.2 and 2.0.0-beta will not.
      • +
    • ^0.1.3 := >=0.1.3-0 <0.2.0-0 "Compatible with 0.1.3". 0.x.x versions are special: the first non-zero component indicates potentially breaking changes, meaning the caret operator matches any version with the same first non-zero -component starting at the specified version.
    • ^0.0.2 := =0.0.2 "Only the version 0.0.2 is considered compatible"
    • ~1.2 := >=1.2.0-0 <1.3.0-0 "Any version starting with 1.2"
    • ^1.2 := >=1.2.0-0 <2.0.0-0 "Any version compatible with 1.2"
    • 1.2.x := >=1.2.0-0 <1.3.0-0 "Any version starting with 1.2"
    • ~1 := >=1.0.0-0 <2.0.0-0 "Any version starting with 1"
    • ^1 := >=1.0.0-0 <2.0.0-0 "Any version compatible with 1"
    • 1.x := >=1.0.0-0 <2.0.0-0 "Any version starting with 1"
    - +component starting at the specified version.
    • +
  • ^0.0.2 := =0.0.2 "Only the version 0.0.2 is considered compatible"
    • +
  • ~1.2 := >=1.2.0-0 <1.3.0-0 "Any version starting with 1.2"
    • +
  • ^1.2 := >=1.2.0-0 <2.0.0-0 "Any version compatible with 1.2"
    • +
  • 1.2.x := >=1.2.0-0 <1.3.0-0 "Any version starting with 1.2"
    • +
  • 1.2.* Same as 1.2.x.
    • +
  • 1.2 Same as 1.2.x.
    • +
  • ~1 := >=1.0.0-0 <2.0.0-0 "Any version starting with 1"
    • +
  • ^1 := >=1.0.0-0 <2.0.0-0 "Any version compatible with 1"
    • +
  • 1.x := >=1.0.0-0 <2.0.0-0 "Any version starting with 1"
    • +
  • 1.* Same as 1.x.
    • +
  • 1 Same as 1.x.
    • +
  • * Any version whatsoever.
    • +
  • x Same as *.
    • +
  • "" (just an empty string) Same as *.
    • +

Ranges can be joined with either a space (which implies "and") or a || (which implies "or").

- -

Functions

- +

Functions

All methods and classes take a final loose boolean argument that, if true, will be more forgiving about not-quite-valid semver strings. The resulting output will always be 100% strict, of course.

-

Strict-mode Comparators and Ranges will be strict about the SemVer strings that they parse.

- -
  • valid(v): Return the parsed version, or null if it's not valid.
  • inc(v, release): Return the version incremented by the release type -(major, minor, patch, or prerelease), or null if it's not valid.
- -

Comparison

- -
  • gt(v1, v2): v1 > v2
  • gte(v1, v2): v1 >= v2
  • lt(v1, v2): v1 < v2
  • lte(v1, v2): v1 <= v2
  • eq(v1, v2): v1 == v2 This is true if they're logically equivalent, +
      +
    • valid(v): Return the parsed version, or null if it's not valid.
      • +
    • inc(v, release): Return the version incremented by the release +type (major, premajor, minor, preminor, patch, +prepatch, or prerelease), or null if it's not valid
        +
      • premajor in one call will bump the version up to the next major +version and down to a prerelease of that major version. +preminor, and prepatch work the same way.
        • +
      • If called from a non-prerelease version, the prerelease will work the +same as prepatch. It increments the patch version, then makes a +prerelease. If the input version is already a prerelease it simply +increments it.
        • +
      +
      • +
    +

    Comparison

    +
      +
    • gt(v1, v2): v1 > v2
      • +
    • gte(v1, v2): v1 >= v2
      • +
    • lt(v1, v2): v1 < v2
      • +
    • lte(v1, v2): v1 <= v2
      • +
    • eq(v1, v2): v1 == v2 This is true if they're logically equivalent, even if they're not the exact same string. You already know how to -compare strings.
    • neq(v1, v2): v1 != v2 The opposite of eq.
    • cmp(v1, comparator, v2): Pass in a comparison string, and it'll call +compare strings.
      • +
    • neq(v1, v2): v1 != v2 The opposite of eq.
      • +
    • cmp(v1, comparator, v2): Pass in a comparison string, and it'll call the corresponding function above. "===" and "!==" do simple string comparison, but are included for completeness. Throws if an -invalid comparison string is provided.
    • compare(v1, v2): Return 0 if v1 == v2, or 1 if v1 is greater, or -1 if -v2 is greater. Sorts in ascending order if passed to Array.sort().
    • rcompare(v1, v2): The reverse of compare. Sorts an array of versions -in descending order when passed to Array.sort().
    - -

    Ranges

    - -
    • validRange(range): Return the valid range or null if it's not valid
    • satisfies(version, range): Return true if the version satisfies the -range.
    • maxSatisfying(versions, range): Return the highest version in the list -that satisfies the range, or null if none of them do.
    • gtr(version, range): Return true if version is greater than all the -versions possible in the range.
    • ltr(version, range): Return true if version is less than all the -versions possible in the range.
    • outside(version, range, hilo): Return true if the version is outside +invalid comparison string is provided.
      • +
    • compare(v1, v2): Return 0 if v1 == v2, or 1 if v1 is greater, or -1 if +v2 is greater. Sorts in ascending order if passed to Array.sort().
      • +
    • rcompare(v1, v2): The reverse of compare. Sorts an array of versions +in descending order when passed to Array.sort().
      • +
    +

    Ranges

    +
      +
    • validRange(range): Return the valid range or null if it's not valid
      • +
    • satisfies(version, range): Return true if the version satisfies the +range.
      • +
    • maxSatisfying(versions, range): Return the highest version in the list +that satisfies the range, or null if none of them do.
      • +
    • gtr(version, range): Return true if version is greater than all the +versions possible in the range.
      • +
    • ltr(version, range): Return true if version is less than all the +versions possible in the range.
      • +
    • outside(version, range, hilo): Return true if the version is outside the bounds of the range in either the high or low direction. The hilo argument must be either the string '>' or '<'. (This is -the function called by gtr and ltr.)
    - +the function called by gtr and ltr.)
    • +

Note that, since ranges may be non-contiguous, a version might not be greater than a range, less than a range, or satisfy a range! For example, the range 1.2 <1.2.9 || >2.0.0 would have a hole from 1.2.9 until 2.0.0, so the version 1.2.10 would not be greater than the -range (because 2.0.1 satisfies, which is higher), nor less than the -range (since 1.2.8 satisfies, which is lower), and it also does not +range (because 2.0.1 satisfies, which is higher), nor less than the +range (since 1.2.8 satisfies, which is lower), and it also does not satisfy the range.

-

If you want to know if a version satisfies or does not satisfy a range, use the satisfies(version, range) function.

+
@@ -130,5 +165,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/html/doc/README.html nodejs-0.10.29/deps/npm/html/doc/README.html --- nodejs-0.10.28/deps/npm/html/doc/README.html 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/html/doc/README.html 2014-06-09 17:04:36.000000000 +0000 @@ -10,153 +10,97 @@

npm

node package manager

- -

![Build Status -## SYNOPSIS

- +

Build Status

+

SYNOPSIS

This is just enough info to get you up and running.

-

Much more info available via npm help once it's installed.

- -

IMPORTANT

- +

IMPORTANT

You need node v0.8 or higher to run this program.

-

To install an old and unsupported version of npm that works on node 0.3 and prior, clone the git repo and dig through the old tags and branches.

- -

Super Easy Install

- +

Super Easy Install

npm comes with node now.

- -

Windows Computers

- +

Windows Computers

Get the MSI. npm is in it.

- -

Apple Macintosh Computers

- +

Apple Macintosh Computers

Get the pkg. npm is in it.

- -

Other Sorts of Unices

- +

Other Sorts of Unices

Run make install. npm will be installed with node.

-

If you want a more fancy pants install (a different version, customized paths, etc.) then read on.

- -

Fancy Install (Unix)

- +

Fancy Install (Unix)

There's a pretty robust install script at https://www.npmjs.org/install.sh. You can download that and run it.

-

Here's an example using curl:

- -
curl -L https://npmjs.org/install.sh | sh
- -

Slightly Fancier

- +
curl -L https://npmjs.org/install.sh | sh
+

Slightly Fancier

You can set any npm configuration params with that script:

- -
npm_config_prefix=/some/path sh install.sh
- -

Or, you can run it in uber-debuggery mode:

- -
npm_debug=1 sh install.sh
- -

Even Fancier

- +
npm_config_prefix=/some/path sh install.sh
+

Or, you can run it in uber-debuggery mode:

+
npm_debug=1 sh install.sh
+

Even Fancier

Get the code with git. Use make to build the docs and do other stuff. If you plan on hacking on npm, make link is your friend.

-

If you've got the npm source code, you can also semi-permanently set arbitrary config keys using the ./configure --key=val ..., and then run npm commands by doing node cli.js <cmd> <args>. (This is helpful for testing, or running stuff without actually installing npm itself.)

- -

Fancy Windows Install

- +

Fancy Windows Install

You can download a zip file from https://npmjs.org/dist/, and unpack it in the same folder where node.exe lives.

-

If that's not fancy enough for you, then you can fetch the code with git, and mess with it directly.

- -

Installing on Cygwin

- +

Installing on Cygwin

No.

- -

Permissions when Using npm to Install Other Stuff

- +

Permissions when Using npm to Install Other Stuff

tl;dr

- -
  • Use sudo for greater safety. Or don't, if you prefer not to.
  • npm will downgrade permissions if it's root before running any build -scripts that package authors specified.
- -

More details...

- +
    +
  • Use sudo for greater safety. Or don't, if you prefer not to.
    • +
  • npm will downgrade permissions if it's root before running any build +scripts that package authors specified.
    • +
+

More details...

As of version 0.3, it is recommended to run npm as root. This allows npm to change the user identifier to the nobody user prior to running any package build or test commands.

-

If you are not the root user, or if you are on a platform that does not support uid switching, then npm will not attempt to change the userid.

-

If you would like to ensure that npm always runs scripts as the "nobody" user, and have it fail if it cannot downgrade permissions, then set the following configuration param:

- -
npm config set unsafe-perm false
- -

This will prevent running in unsafe mode, even as non-root users.

- -

Uninstalling

- +
npm config set unsafe-perm false
+

This will prevent running in unsafe mode, even as non-root users.

+

Uninstalling

So sad to see you go.

- -
sudo npm uninstall npm -g
- -

Or, if that fails,

- -
sudo make uninstall
- -

More Severe Uninstalling

- +
sudo npm uninstall npm -g
+

Or, if that fails,

+
sudo make uninstall
+

More Severe Uninstalling

Usually, the above instructions are sufficient. That will remove npm, but leave behind anything you've installed.

-

If you would like to remove all the packages that you have installed, then you can use the npm ls command to find them, and then npm rm to remove them.

-

To remove cruft left behind by npm 0.x, you can use the included clean-old.sh script file. You can run it conveniently like this:

- -
npm explore npm -g -- sh scripts/clean-old.sh
- -

npm uses two configuration files, one for per-user configs, and another +

npm explore npm -g -- sh scripts/clean-old.sh
+

npm uses two configuration files, one for per-user configs, and another for global (every-user) configs. You can view them by doing:

- 
npm config get userconfig   # defaults to ~/.npmrc
-npm config get globalconfig # defaults to /usr/local/etc/npmrc
- -

Uninstalling npm does not remove configuration files by default. You +npm config get globalconfig # defaults to /usr/local/etc/npmrc +

Uninstalling npm does not remove configuration files by default. You must remove them yourself manually if you want them gone. Note that this means that future npm installs will not remember the settings that you have chosen.

- -

Using npm Programmatically

- +

Using npm Programmatically

If you would like to use npm programmatically, you can do that. It's not very well documented, but it is rather simple.

-

Most of the time, unless you actually want to do all the things that npm does, you should try using one of npm's dependencies rather than using npm itself, if possible.

-

Eventually, npm will be just a thin cli wrapper around the modules that it depends on, but for now, there are some things that you must use npm itself to do.

- 
var npm = require("npm")
 npm.load(myConfigObject, function (er) {
   if (er) return handlError(er)
@@ -165,90 +109,72 @@
     // command succeeded, and data might have some info
   })
   npm.on("log", function (message) { .... })
-})
- -

The load function takes an object hash of the command-line configs. +}) +

The load function takes an object hash of the command-line configs. The various npm.commands.<cmd> functions take an array of positional argument strings. The last argument to any npm.commands.<cmd> function is a callback. Some commands take other optional arguments. Read the source.

-

You cannot set configs individually for any single npm function at this time. Since npm is a singleton, any call to npm.config.set will change the value for all npm commands in that process.

-

See ./bin/npm-cli.js for an example of pulling config values off of the command line arguments using nopt. You may also want to check out npm help config to learn about all the options you can set there.

- -

More Docs

- +

More Docs

Check out the docs, especially the faq.

-

You can use the npm help command to read any of them.

-

If you're a developer, and you want to use npm to publish your program, you should read this

- - - +

"npm" and "The npm Registry" are owned by npm, Inc. All rights reserved. See the included LICENSE file for more details.

-

"Node.js" and "node" are trademarks owned by Joyent, Inc.

-

Modules published on the npm registry are not officially endorsed by npm, Inc. or the Node.js project.

-

Data published to the npm registry is not part of npm itself, and is the sole property of the publisher. While every effort is made to ensure accountability, there is absolutely no guarantee, warrantee, or assertion expressed or implied as to the quality, fitness for a specific purpose, or lack of malice in any given npm package.

-

If you have a complaint about a package in the public npm registry, and cannot resolve it with the package owner, please email -support@npmjs.com and explain the situation.

- +support@npmjs.com and explain the situation.

Any data published to The npm Registry (including user account information) may be removed or modified at the sole discretion of the npm server administrators.

- -

In plainer english

- +

In plainer english

npm is the property of npm, Inc.

-

If you publish something, it's yours, and you are solely accountable for it.

-

If other people publish something, it's theirs.

-

Users can publish Bad Stuff. It will be removed promptly if reported. But there is no vetting process for published modules, and you use them at your own risk. Please inspect the source.

-

If you publish Bad Stuff, we may delete it from the registry, or even ban your account in extreme cases. So don't do that.

- -

BUGS

- +

BUGS

When you find issues, please report them:

- - - +

Be sure to include all of the output from the npm command that didn't work as expected. The npm-debug.log file is also helpful to provide.

-

You can also look for isaacs in #node.js on irc://irc.freenode.net. He will no doubt tell you to put the output in a gist or email.

+

SEE ALSO

+ -

SEE ALSO

- -
@@ -260,5 +186,5 @@ - + diff -Nru nodejs-0.10.28/deps/npm/lib/adduser.js nodejs-0.10.29/deps/npm/lib/adduser.js --- nodejs-0.10.28/deps/npm/lib/adduser.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/lib/adduser.js 2014-06-09 17:04:36.000000000 +0000 @@ -15,6 +15,7 @@ adduser.usage = "npm adduser\nThen enter stuff at the prompts" function adduser (args, cb) { + npm.spinner.stop() if (!crypto) return cb(new Error( "You must compile node with ssl support to use the adduser feature")) @@ -131,9 +132,10 @@ registry.username = u.u registry.password = u.p } - + npm.spinner.start() // save existing configs, but yank off for this PUT registry.adduser(u.u, u.p, u.e, function (er) { + npm.spinner.stop() if (er) return cb(er) registry.username = u.u registry.password = u.p diff -Nru nodejs-0.10.28/deps/npm/lib/cache/add-local.js nodejs-0.10.29/deps/npm/lib/cache/add-local.js --- nodejs-0.10.28/deps/npm/lib/cache/add-local.js 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/lib/cache/add-local.js 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,146 @@ +var fs = require("graceful-fs") + , assert = require("assert") + , path = require("path") + , mkdir = require("mkdirp") + , chownr = require("chownr") + , pathIsInside = require("path-is-inside") + , readJson = require("read-package-json") + , log = require("npmlog") + , npm = require("../npm.js") + , tar = require("../utils/tar.js") + , deprCheck = require("../utils/depr-check.js") + , locker = require("../utils/locker.js") + , lock = locker.lock + , unlock = locker.unlock + , getCacheStat = require("./get-stat.js") + , addNamed = require("./add-named.js") + , addLocalTarball = require("./add-local-tarball.js") + , maybeGithub = require("./maybe-github.js") + , sha = require("sha") + +module.exports = addLocal + +function addLocal (p, pkgData, cb_) { + assert(typeof p === "string", "must have path") + assert(typeof cb === "function", "must have callback") + + pkgData = pkgData || {} + + function cb (er, data) { + unlock(p, function () { + if (er) { + // if it doesn't have a / in it, it might be a + // remote thing. + if (p.indexOf("/") === -1 && p.charAt(0) !== "." + && (process.platform !== "win32" || p.indexOf("\\") === -1)) { + return addNamed(p, "", null, cb_) + } + log.error("addLocal", "Could not install %s", p) + return cb_(er) + } + if (data && !data._fromGithub) data._from = p + return cb_(er, data) + }) + } + + lock(p, function (er) { + if (er) return cb(er) + // figure out if this is a folder or file. + fs.stat(p, function (er, s) { + if (er) { + // might be username/project + // in that case, try it as a github url. + if (p.split("/").length === 2) { + return maybeGithub(p, er, cb) + } + return cb(er) + } + if (s.isDirectory()) addLocalDirectory(p, pkgData, null, cb) + else addLocalTarball(p, pkgData, null, cb) + }) + }) +} + +// At this point, if shasum is set, it's something that we've already +// read and checked. Just stashing it in the data at this point. +function addLocalDirectory (p, pkgData, shasum, cb) { + assert(pkgData, "must pass package data") + assert(typeof cb === "function", "must have callback") + + // if it's a folder, then read the package.json, + // tar it to the proper place, and add the cache tar + if (pathIsInside(p, npm.cache)) return cb(new Error( + "Adding a cache directory to the cache will make the world implode.")) + + readJson(path.join(p, "package.json"), false, function (er, data) { + er = needName(er, data) + er = needVersion(er, data) + + // check that this is what we expected. + if (!er && pkgData.name && pkgData.name !== data.name) { + er = new Error( "Invalid Package: expected " + + pkgData.name + " but found " + + data.name ) + } + + if (!er && pkgData.version && pkgData.version !== data.version) { + er = new Error( "Invalid Package: expected " + + pkgData.name + "@" + pkgData.version + + " but found " + + data.name + "@" + data.version ) + } + + if (er) return cb(er) + deprCheck(data) + + // pack to {cache}/name/ver/package.tgz + var croot = path.resolve(npm.cache, data.name, data.version) + var tgz = path.resolve(croot, "package.tgz") + var pj = path.resolve(croot, "package/package.json") + getCacheStat(function (er, cs) { + mkdir(path.dirname(pj), function (er, made) { + if (er) return cb(er) + var fancy = !pathIsInside(p, npm.tmp) + tar.pack(tgz, p, data, fancy, function (er) { + if (er) { + log.error( "addLocalDirectory", "Could not pack %j to %j" + , p, tgz ) + return cb(er) + } + + if (!cs || isNaN(cs.uid) || isNaN(cs.gid)) next() + + chownr(made || tgz, cs.uid, cs.gid, next) + }) + }) + }) + + function next (er) { + if (er) return cb(er) + // if we have the shasum already, just add it + if (shasum) { + return addLocalTarball(tgz, data, shasum, cb) + } else { + sha.get(tgz, function (er, shasum) { + if (er) { + return cb(er) + } + data._shasum = shasum + return addLocalTarball(tgz, data, shasum, cb) + }) + } + } + }) +} + +function needName(er, data) { + return er ? er + : (data && !data.name) ? new Error("No name provided") + : null +} + +function needVersion(er, data) { + return er ? er + : (data && !data.version) ? new Error("No version provided") + : null +} diff -Nru nodejs-0.10.28/deps/npm/lib/cache/add-local-tarball.js nodejs-0.10.29/deps/npm/lib/cache/add-local-tarball.js --- nodejs-0.10.28/deps/npm/lib/cache/add-local-tarball.js 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/lib/cache/add-local-tarball.js 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,223 @@ +var mkdir = require("mkdirp") + , assert = require("assert") + , fs = require("graceful-fs") + , readJson = require("read-package-json") + , log = require("npmlog") + , path = require("path") + , sha = require("sha") + , npm = require("../npm.js") + , tar = require("../utils/tar.js") + , pathIsInside = require("path-is-inside") + , locker = require("../utils/locker.js") + , lock = locker.lock + , unlock = locker.unlock + , getCacheStat = require("./get-stat.js") + , chownr = require("chownr") + , inflight = require("inflight") + , once = require("once") + +module.exports = addLocalTarball + +function addLocalTarball (p, pkgData, shasum, cb_) { + assert(typeof p === "string", "must have path") + assert(typeof cb_ === "function", "must have callback") + + if (!pkgData) pkgData = {} + var name = pkgData.name || "" + + // If we don't have a shasum yet, then get the shasum now. + if (!shasum) { + return sha.get(p, function (er, shasum) { + if (er) return cb_(er) + addLocalTarball(p, pkgData, shasum, cb_) + }) + } + + // if it's a tar, and not in place, + // then unzip to .tmp, add the tmp folder, and clean up tmp + if (pathIsInside(p, npm.tmp)) + return addTmpTarball(p, pkgData, shasum, cb_) + + if (pathIsInside(p, npm.cache)) { + if (path.basename(p) !== "package.tgz") return cb_(new Error( + "Not a valid cache tarball name: "+p)) + return addPlacedTarball(p, pkgData, shasum, cb_) + } + + function cb (er, data) { + if (data) { + data._resolved = p + data._shasum = data._shasum || shasum + } + return cb_(er, data) + } + + // just copy it over and then add the temp tarball file. + var tmp = path.join(npm.tmp, name + Date.now() + + "-" + Math.random(), "tmp.tgz") + mkdir(path.dirname(tmp), function (er) { + if (er) return cb(er) + var from = fs.createReadStream(p) + , to = fs.createWriteStream(tmp) + , errState = null + function errHandler (er) { + if (errState) return + return cb(errState = er) + } + from.on("error", errHandler) + to.on("error", errHandler) + to.on("close", function () { + if (errState) return + log.verbose("chmod", tmp, npm.modes.file.toString(8)) + fs.chmod(tmp, npm.modes.file, function (er) { + if (er) return cb(er) + addTmpTarball(tmp, pkgData, shasum, cb) + }) + }) + from.pipe(to) + }) +} + +function addPlacedTarball (p, pkgData, shasum, cb) { + assert(pkgData, "should have package data by now") + assert(typeof cb === "function", "cb function required") + + getCacheStat(function (er, cs) { + if (er) return cb(er) + return addPlacedTarball_(p, pkgData, cs.uid, cs.gid, shasum, cb) + }) +} + +function addPlacedTarball_ (p, pkgData, uid, gid, resolvedSum, cb) { + // now we know it's in place already as .cache/name/ver/package.tgz + var name = pkgData.name + , version = pkgData.version + , folder = path.join(npm.cache, name, version, "package") + + // First, make sure we have the shasum, if we don't already. + if (!resolvedSum) { + sha.get(p, function (er, shasum) { + if (er) return cb(er) + addPlacedTarball_(p, pkgData, uid, gid, shasum, cb) + }) + return + } + + lock(folder, function (er) { + if (er) return cb(er) + + // async try/finally + var originalCb = cb + cb = function (er, data) { + unlock(folder, function (er2) { + return originalCb(er || er2, data) + }) + } + + mkdir(folder, function (er) { + if (er) return cb(er) + var pj = path.join(folder, "package.json") + var json = JSON.stringify(pkgData, null, 2) + fs.writeFile(pj, json, "utf8", function (er) { + cb(er, pkgData) + }) + }) + }) +} + +function addTmpTarball (tgz, pkgData, shasum, cb) { + assert(typeof cb === "function", "must have callback function") + assert(shasum, "should have shasum by now") + + cb = inflight("addTmpTarball:" + tgz, cb) + if (!cb) return + + // we already have the package info, so just move into place + if (pkgData && pkgData.name && pkgData.version) { + return addTmpTarball_(tgz, pkgData, shasum, cb) + } + + // This is a tarball we probably downloaded from the internet. + // The shasum's already been checked, but we haven't ever had + // a peek inside, so we unpack it here just to make sure it is + // what it says it is. + // Note: we might not have any clue what we think it is, for + // example if the user just did `npm install ./foo.tgz` + + var target = tgz + "-unpack" + getCacheStat(function (er, cs) { + tar.unpack(tgz, target, null, null, cs.uid, cs.gid, next) + }) + + function next (er) { + if (er) return cb(er) + var pj = path.join(target, "package.json") + readJson(pj, function (er, data) { + // XXX dry with similar stanza in add-local.js + er = needName(er, data) + er = needVersion(er, data) + // check that this is what we expected. + if (!er && pkgData.name && pkgData.name !== data.name) { + er = new Error( "Invalid Package: expected " + + pkgData.name + " but found " + + data.name ) + } + + if (!er && pkgData.version && pkgData.version !== data.version) { + er = new Error( "Invalid Package: expected " + + pkgData.name + "@" + pkgData.version + + " but found " + + data.name + "@" + data.version ) + } + + if (er) return cb(er) + + addTmpTarball_(tgz, data, shasum, cb) + }) + } +} + +function addTmpTarball_ (tgz, data, shasum, cb) { + assert(typeof cb === "function", "must have callback function") + cb = once(cb) + + var name = data.name + var version = data.version + assert(name, "should have package name by now") + assert(version, "should have package version by now") + + var root = path.resolve(npm.cache, name, version) + var pkg = path.resolve(root, "package") + var target = path.resolve(root, "package.tgz") + getCacheStat(function (er, cs) { + if (er) return cb(er) + mkdir(pkg, function (er) { + if (er) return cb(er) + var read = fs.createReadStream(tgz) + var write = fs.createWriteStream(target) + var fin = cs.uid && cs.gid ? chown : done + read.on("error", cb).pipe(write).on("error", cb).on("close", fin) + }) + + function chown () { + chownr(root, cs.uid, cs.gid, done) + } + }) + + function done() { + data._shasum = data._shasum || shasum + cb(null, data) + } +} + +function needName(er, data) { + return er ? er + : (data && !data.name) ? new Error("No name provided") + : null +} + +function needVersion(er, data) { + return er ? er + : (data && !data.version) ? new Error("No version provided") + : null +} diff -Nru nodejs-0.10.28/deps/npm/lib/cache/add-named.js nodejs-0.10.29/deps/npm/lib/cache/add-named.js --- nodejs-0.10.28/deps/npm/lib/cache/add-named.js 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/lib/cache/add-named.js 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,275 @@ +var path = require("path") + , assert = require("assert") + , fs = require("graceful-fs") + , http = require("http") + , log = require("npmlog") + , semver = require("semver") + , readJson = require("read-package-json") + , url = require("url") + , npm = require("../npm.js") + , registry = npm.registry + , deprCheck = require("../utils/depr-check.js") + , inflight = require("inflight") + , locker = require("../utils/locker.js") + , lock = locker.lock + , unlock = locker.unlock + , maybeGithub = require("./maybe-github.js") + , addRemoteTarball = require("./add-remote-tarball.js") + + +module.exports = addNamed + +var NAME_PREFIX = "addName:" +function addNamed (name, version, data, cb_) { + assert(typeof name === "string", "must have module name") + assert(typeof cb_ === "function", "must have callback") + + log.verbose("addNamed", [name, version]) + + var key = name + "@" + version + function cb (er, data) { + if (data && !data._fromGithub) data._from = key + unlock(key, function () { cb_(er, data) }) + } + + cb_ = inflight(NAME_PREFIX + key, cb_) + + if (!cb_) return + + log.verbose("addNamed", [semver.valid(version), semver.validRange(version)]) + lock(key, function (er) { + if (er) return cb(er) + + var fn = ( semver.valid(version, true) ? addNameVersion + : semver.validRange(version, true) ? addNameRange + : addNameTag + ) + fn(name, version, data, cb) + }) +} + +function addNameTag (name, tag, data, cb_) { + log.info("addNameTag", [name, tag]) + var explicit = true + if (!tag) { + explicit = false + tag = npm.config.get("tag") + } + + function cb(er, data) { + // might be username/project + // in that case, try it as a github url. + if (er && tag.split("/").length === 2) { + return maybeGithub(tag, er, cb_) + } + return cb_(er, data) + } + + registry.get(name, function (er, data, json, resp) { + if (!er) { + er = errorResponse(name, resp) + } + if (er) return cb(er) + engineFilter(data) + if (data["dist-tags"] && data["dist-tags"][tag] + && data.versions[data["dist-tags"][tag]]) { + var ver = data["dist-tags"][tag] + return addNamed(name, ver, data.versions[ver], cb) + } + if (!explicit && Object.keys(data.versions).length) { + return addNamed(name, "*", data, cb) + } + + er = installTargetsError(tag, data) + return cb(er) + }) +} + +function engineFilter (data) { + var npmv = npm.version + , nodev = npm.config.get("node-version") + , strict = npm.config.get("engine-strict") + + if (!nodev || npm.config.get("force")) return data + + Object.keys(data.versions || {}).forEach(function (v) { + var eng = data.versions[v].engines + if (!eng) return + if (!strict && !data.versions[v].engineStrict) return + if (eng.node && !semver.satisfies(nodev, eng.node, true) + || eng.npm && !semver.satisfies(npmv, eng.npm, true)) { + delete data.versions[v] + } + }) +} + +function addNameVersion (name, v, data, cb) { + var ver = semver.valid(v, true) + if (!ver) return cb(new Error("Invalid version: "+v)) + + var response + + if (data) { + response = null + return next() + } + registry.get(name, function (er, d, json, resp) { + if (!er) { + er = errorResponse(name, resp) + } + if (er) return cb(er) + data = d && d.versions[ver] + if (!data) { + er = new Error('version not found: ' + name + '@' + ver) + er.package = name + er.statusCode = 404 + return cb(er) + } + response = resp + next() + }) + + function next () { + deprCheck(data) + var dist = data.dist + + if (!dist) return cb(new Error("No dist in "+data._id+" package")) + + if (!dist.tarball) return cb(new Error( + "No dist.tarball in " + data._id + " package")) + + if ((response && response.statusCode !== 304) || npm.config.get("force")) { + return fetchit() + } + + // we got cached data, so let's see if we have a tarball. + var pkgroot = path.join(npm.cache, name, ver) + var pkgtgz = path.join(pkgroot, "package.tgz") + var pkgjson = path.join(pkgroot, "package", "package.json") + fs.stat(pkgtgz, function (er) { + if (!er) { + readJson(pkgjson, function (er, data) { + er = needName(er, data) + er = needVersion(er, data) + if (er && er.code !== "ENOENT" && er.code !== "ENOTDIR") + return cb(er) + if (er) return fetchit() + return cb(null, data) + }) + } else return fetchit() + }) + + function fetchit () { + if (!npm.config.get("registry")) { + return cb(new Error("Cannot fetch: "+dist.tarball)) + } + + // use the same protocol as the registry. + // https registry --> https tarballs, but + // only if they're the same hostname, or else + // detached tarballs may not work. + var tb = url.parse(dist.tarball) + var rp = url.parse(npm.config.get("registry")) + if (tb.hostname === rp.hostname + && tb.protocol !== rp.protocol) { + tb.protocol = url.parse(npm.config.get("registry")).protocol + delete tb.href + } + tb = url.format(tb) + + // only add non-shasum'ed packages if --forced. + // only ancient things would lack this for good reasons nowadays. + if (!dist.shasum && !npm.config.get("force")) { + return cb(new Error("package lacks shasum: " + data._id)) + } + return addRemoteTarball(tb, data, dist.shasum, cb) + } + } +} + +function addNameRange (name, range, data, cb) { + range = semver.validRange(range, true) + if (range === null) return cb(new Error( + "Invalid version range: "+range)) + + log.silly("addNameRange", {name:name, range:range, hasData:!!data}) + + if (data) return next() + registry.get(name, function (er, d, json, resp) { + if (!er) { + er = errorResponse(name, resp) + } + if (er) return cb(er) + data = d + next() + }) + + function next () { + log.silly( "addNameRange", "number 2" + , {name:name, range:range, hasData:!!data}) + engineFilter(data) + + log.silly("addNameRange", "versions" + , [data.name, Object.keys(data.versions || {})]) + + // if the tagged version satisfies, then use that. + var tagged = data["dist-tags"][npm.config.get("tag")] + if (tagged + && data.versions[tagged] + && semver.satisfies(tagged, range, true)) { + return addNamed(name, tagged, data.versions[tagged], cb) + } + + // find the max satisfying version. + var versions = Object.keys(data.versions || {}) + var ms = semver.maxSatisfying(versions, range, true) + if (!ms) { + return cb(installTargetsError(range, data)) + } + + // if we don't have a registry connection, try to see if + // there's a cached copy that will be ok. + addNamed(name, ms, data.versions[ms], cb) + } +} + +function installTargetsError (requested, data) { + var targets = Object.keys(data["dist-tags"]).filter(function (f) { + return (data.versions || {}).hasOwnProperty(f) + }).concat(Object.keys(data.versions || {})) + + requested = data.name + (requested ? "@'" + requested + "'" : "") + + targets = targets.length + ? "Valid install targets:\n" + JSON.stringify(targets) + "\n" + : "No valid targets found.\n" + + "Perhaps not compatible with your version of node?" + + var er = new Error( "No compatible version found: " + + requested + "\n" + targets) + er.code = "ETARGET" + return er +} + +function errorResponse (name, response) { + var er + if (response.statusCode >= 400) { + er = new Error(http.STATUS_CODES[response.statusCode]) + er.statusCode = response.statusCode + er.code = "E" + er.statusCode + er.pkgid = name + } + return er +} + +function needName(er, data) { + return er ? er + : (data && !data.name) ? new Error("No name provided") + : null +} + +function needVersion(er, data) { + return er ? er + : (data && !data.version) ? new Error("No version provided") + : null +} diff -Nru nodejs-0.10.28/deps/npm/lib/cache/add-remote-git.js nodejs-0.10.29/deps/npm/lib/cache/add-remote-git.js --- nodejs-0.10.28/deps/npm/lib/cache/add-remote-git.js 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/lib/cache/add-remote-git.js 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,285 @@ +var mkdir = require("mkdirp") + , assert = require("assert") + , spawn = require("child_process").spawn + , exec = require("child_process").execFile + , once = require("once") + , fs = require("graceful-fs") + , log = require("npmlog") + , path = require("path") + , url = require("url") + , chownr = require("chownr") + , zlib = require("zlib") + , which = require("which") + , crypto = require("crypto") + , chmodr = require("chmodr") + , npm = require("../npm.js") + , rm = require("../utils/gently-rm.js") + , inflight = require("inflight") + , locker = require("../utils/locker.js") + , lock = locker.lock + , unlock = locker.unlock + , getCacheStat = require("./get-stat.js") + , addLocalTarball = require("./add-local-tarball.js") + + +// 1. cacheDir = path.join(cache,'_git-remotes',sha1(u)) +// 2. checkGitDir(cacheDir) ? 4. : 3. (rm cacheDir if necessary) +// 3. git clone --mirror u cacheDir +// 4. cd cacheDir && git fetch -a origin +// 5. git archive /tmp/random.tgz +// 6. addLocalTarball(/tmp/random.tgz) --format=tar --prefix=package/ +// silent flag is used if this should error quietly +module.exports = function addRemoteGit (u, parsed, silent, cb_) { + assert(typeof u === "string", "must have git URL") + assert(typeof parsed === "object", "must have parsed query") + assert(typeof cb_ === "function", "must have callback") + + function cb (er, data) { + unlock(u, function () { cb_(er, data) }) + } + + cb_ = inflight(u, cb_) + + if (!cb_) return + + // git is so tricky! + // if the path is like ssh://foo:22/some/path then it works, but + // it needs the ssh:// + // If the path is like ssh://foo:some/path then it works, but + // only if you remove the ssh:// + var origUrl = u + u = u.replace(/^git\+/, "") + .replace(/#.*$/, "") + + // ssh paths that are scp-style urls don't need the ssh:// + if (parsed.pathname.match(/^\/?:/)) { + u = u.replace(/^ssh:\/\//, "") + } + + lock(u, function (er) { + if (er) return cb(er) + + // figure out what we should check out. + var co = parsed.hash && parsed.hash.substr(1) || "master" + + var v = crypto.createHash("sha1").update(u).digest("hex").slice(0, 8) + v = u.replace(/[^a-zA-Z0-9]+/g, '-') + '-' + v + + log.verbose("addRemoteGit", [u, co]) + + var p = path.join(npm.config.get("cache"), "_git-remotes", v) + + checkGitDir(p, u, co, origUrl, silent, function(er, data) { + chmodr(p, npm.modes.file, function(erChmod) { + if (er) return cb(er, data) + return cb(erChmod, data) + }) + }) + }) +} + +function checkGitDir (p, u, co, origUrl, silent, cb) { + fs.stat(p, function (er, s) { + if (er) return cloneGitRemote(p, u, co, origUrl, silent, cb) + if (!s.isDirectory()) return rm(p, function (er){ + if (er) return cb(er) + cloneGitRemote(p, u, co, origUrl, silent, cb) + }) + + var git = npm.config.get("git") + var args = [ "config", "--get", "remote.origin.url" ] + var env = gitEnv() + + // check for git + which(git, function (err) { + if (err) { + err.code = "ENOGIT" + return cb(err) + } + exec(git, args, {cwd: p, env: env}, function (er, stdout, stderr) { + var stdoutTrimmed = (stdout + "\n" + stderr).trim() + if (er || u !== stdout.trim()) { + log.warn( "`git config --get remote.origin.url` returned " + + "wrong result ("+u+")", stdoutTrimmed ) + return rm(p, function (er){ + if (er) return cb(er) + cloneGitRemote(p, u, co, origUrl, silent, cb) + }) + } + log.verbose("git remote.origin.url", stdoutTrimmed) + archiveGitRemote(p, u, co, origUrl, cb) + }) + }) + }) +} + +function checkGitDir (p, u, co, origUrl, silent, cb) { + fs.stat(p, function (er, s) { + if (er) return cloneGitRemote(p, u, co, origUrl, silent, cb) + if (!s.isDirectory()) return rm(p, function (er){ + if (er) return cb(er) + cloneGitRemote(p, u, co, origUrl, silent, cb) + }) + + var git = npm.config.get("git") + var args = [ "config", "--get", "remote.origin.url" ] + var env = gitEnv() + + // check for git + which(git, function (err) { + if (err) { + err.code = "ENOGIT" + return cb(err) + } + exec(git, args, {cwd: p, env: env}, function (er, stdout, stderr) { + var stdoutTrimmed = (stdout + "\n" + stderr).trim() + if (er || u !== stdout.trim()) { + log.warn( "`git config --get remote.origin.url` returned " + + "wrong result ("+u+")", stdoutTrimmed ) + return rm(p, function (er){ + if (er) return cb(er) + cloneGitRemote(p, u, co, origUrl, silent, cb) + }) + } + log.verbose("git remote.origin.url", stdoutTrimmed) + archiveGitRemote(p, u, co, origUrl, cb) + }) + }) + }) +} + +function cloneGitRemote (p, u, co, origUrl, silent, cb) { + mkdir(p, function (er) { + if (er) return cb(er) + + var git = npm.config.get("git") + var args = [ "clone", "--mirror", u, p ] + var env = gitEnv() + + // check for git + which(git, function (err) { + if (err) { + err.code = "ENOGIT" + return cb(err) + } + exec(git, args, {cwd: p, env: env}, function (er, stdout, stderr) { + stdout = (stdout + "\n" + stderr).trim() + if (er) { + if (silent) { + log.verbose("git clone " + u, stdout) + } else { + log.error("git clone " + u, stdout) + } + return cb(er) + } + log.verbose("git clone " + u, stdout) + archiveGitRemote(p, u, co, origUrl, cb) + }) + }) + }) +} + +function archiveGitRemote (p, u, co, origUrl, cb) { + var git = npm.config.get("git") + var archive = [ "fetch", "-a", "origin" ] + var resolve = [ "rev-list", "-n1", co ] + var env = gitEnv() + + var resolved = null + var tmp + + exec(git, archive, {cwd: p, env: env}, function (er, stdout, stderr) { + stdout = (stdout + "\n" + stderr).trim() + if (er) { + log.error("git fetch -a origin ("+u+")", stdout) + return cb(er) + } + log.verbose("git fetch -a origin ("+u+")", stdout) + tmp = path.join(npm.tmp, Date.now()+"-"+Math.random(), "tmp.tgz") + verifyOwnership() + }) + + function verifyOwnership() { + if (process.platform === "win32") { + log.silly("verifyOwnership", "skipping for windows") + resolveHead() + } else { + getCacheStat(function(er, cs) { + if (er) { + log.error("Could not get cache stat") + return cb(er) + } + chownr(p, cs.uid, cs.gid, function(er) { + if (er) { + log.error("Failed to change folder ownership under npm cache for %s", p) + return cb(er) + } + resolveHead() + }) + }) + } + } + + function resolveHead () { + exec(git, resolve, {cwd: p, env: env}, function (er, stdout, stderr) { + stdout = (stdout + "\n" + stderr).trim() + if (er) { + log.error("Failed resolving git HEAD (" + u + ")", stderr) + return cb(er) + } + log.verbose("git rev-list -n1 " + co, stdout) + var parsed = url.parse(origUrl) + parsed.hash = stdout + resolved = url.format(parsed) + + // https://github.com/npm/npm/issues/3224 + // node incorrectly sticks a / at the start of the path + // We know that the host won't change, so split and detect this + var spo = origUrl.split(parsed.host) + var spr = resolved.split(parsed.host) + if (spo[1].charAt(0) === ':' && spr[1].charAt(0) === '/') + spr[1] = spr[1].slice(1) + resolved = spr.join(parsed.host) + + log.verbose('resolved git url', resolved) + next() + }) + } + + function next () { + mkdir(path.dirname(tmp), function (er) { + if (er) return cb(er) + var gzip = zlib.createGzip({ level: 9 }) + var git = npm.config.get("git") + var args = ["archive", co, "--format=tar", "--prefix=package/"] + var out = fs.createWriteStream(tmp) + var env = gitEnv() + cb = once(cb) + var cp = spawn(git, args, { env: env, cwd: p }) + cp.on("error", cb) + cp.stderr.on("data", function(chunk) { + log.silly(chunk.toString(), "git archive") + }) + + cp.stdout.pipe(gzip).pipe(out).on("close", function() { + addLocalTarball(tmp, null, null, function(er, data) { + if (data) data._resolved = resolved + cb(er, data) + }) + }) + }) + } +} + +var gitEnv_ +function gitEnv () { + // git responds to env vars in some weird ways in post-receive hooks + // so don't carry those along. + if (gitEnv_) return gitEnv_ + gitEnv_ = {} + for (var k in process.env) { + if (!~['GIT_PROXY_COMMAND','GIT_SSH','GIT_SSL_NO_VERIFY'].indexOf(k) && k.match(/^GIT/)) continue + gitEnv_[k] = process.env[k] + } + return gitEnv_ +} diff -Nru nodejs-0.10.28/deps/npm/lib/cache/add-remote-tarball.js nodejs-0.10.29/deps/npm/lib/cache/add-remote-tarball.js --- nodejs-0.10.28/deps/npm/lib/cache/add-remote-tarball.js 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/lib/cache/add-remote-tarball.js 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,106 @@ +var mkdir = require("mkdirp") + , assert = require("assert") + , log = require("npmlog") + , path = require("path") + , sha = require("sha") + , retry = require("retry") + , npm = require("../npm.js") + , fetch = require("../utils/fetch.js") + , inflight = require("inflight") + , locker = require("../utils/locker.js") + , lock = locker.lock + , unlock = locker.unlock + , addLocalTarball = require("./add-local-tarball.js") + , cacheFile = require("npm-cache-filename") + +module.exports = addRemoteTarball + +function addRemoteTarball (u, pkgData, shasum, cb_) { + assert(typeof u === "string", "must have module URL") + assert(typeof cb_ === "function", "must have callback") + + function cb (er, data) { + if (data) { + data._from = u + data._shasum = data._shasum || shasum + data._resolved = u + } + unlock(u, function () { + cb_(er, data) + }) + } + + cb_ = inflight(u, cb_) + + if (!cb_) return + + // XXX Fetch direct to cache location, store tarballs under + // ${cache}/registry.npmjs.org/pkg/-/pkg-1.2.3.tgz + var tmp = cacheFile(npm.tmp, u) + + function next (er, resp, shasum) { + if (er) return cb(er) + addLocalTarball(tmp, pkgData, shasum, cb) + } + + lock(u, function (er) { + if (er) return cb(er) + + log.verbose("addRemoteTarball", [u, shasum]) + mkdir(path.dirname(tmp), function (er) { + if (er) return cb(er) + addRemoteTarball_(u, tmp, shasum, next) + }) + }) +} + +function addRemoteTarball_(u, tmp, shasum, cb) { + // Tuned to spread 3 attempts over about a minute. + // See formula at . + var operation = retry.operation + ( { retries: npm.config.get("fetch-retries") + , factor: npm.config.get("fetch-retry-factor") + , minTimeout: npm.config.get("fetch-retry-mintimeout") + , maxTimeout: npm.config.get("fetch-retry-maxtimeout") }) + + operation.attempt(function (currentAttempt) { + log.info("retry", "fetch attempt " + currentAttempt + + " at " + (new Date()).toLocaleTimeString()) + fetchAndShaCheck(u, tmp, shasum, function (er, response, shasum) { + // Only retry on 408, 5xx or no `response`. + var sc = response && response.statusCode + var statusRetry = !sc || (sc === 408 || sc >= 500) + if (er && statusRetry && operation.retry(er)) { + log.info("retry", "will retry, error on last attempt: " + er) + return + } + cb(er, response, shasum) + }) + }) +} + +function fetchAndShaCheck (u, tmp, shasum, cb) { + fetch(u, tmp, function (er, response) { + if (er) { + log.error("fetch failed", u) + return cb(er, response) + } + + if (!shasum) { + // Well, we weren't given a shasum, so at least sha what we have + // in case we want to compare it to something else later + return sha.get(tmp, function (er, shasum) { + cb(er, response, shasum) + }) + } + + // validate that the url we just downloaded matches the expected shasum. + sha.check(tmp, shasum, function (er) { + if (er && er.message) { + // add original filename for better debuggability + er.message = er.message + '\n' + 'From: ' + u + } + return cb(er, response, shasum) + }) + }) +} diff -Nru nodejs-0.10.28/deps/npm/lib/cache/get-stat.js nodejs-0.10.29/deps/npm/lib/cache/get-stat.js --- nodejs-0.10.28/deps/npm/lib/cache/get-stat.js 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/lib/cache/get-stat.js 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,63 @@ +var mkdir = require("mkdirp") + , fs = require("graceful-fs") + , log = require("npmlog") + , chownr = require("chownr") + , npm = require("../npm.js") + , inflight = require("inflight") + +// to maintain the cache dir's permissions consistently. +var cacheStat = null +module.exports = function getCacheStat (cb) { + if (cacheStat) return cb(null, cacheStat) + + cb = inflight("getCacheStat", cb) + if (!cb) return + + fs.stat(npm.cache, function (er, st) { + if (er) return makeCacheDir(cb) + if (!st.isDirectory()) { + log.error("getCacheStat", "invalid cache dir %j", npm.cache) + return cb(er) + } + return cb(null, cacheStat = st) + }) +} + +function makeCacheDir (cb) { + if (!process.getuid) return mkdir(npm.cache, cb) + + var uid = +process.getuid() + , gid = +process.getgid() + + if (uid === 0) { + if (process.env.SUDO_UID) uid = +process.env.SUDO_UID + if (process.env.SUDO_GID) gid = +process.env.SUDO_GID + } + if (uid !== 0 || !process.env.HOME) { + cacheStat = {uid: uid, gid: gid} + return mkdir(npm.cache, afterMkdir) + } + + fs.stat(process.env.HOME, function (er, st) { + if (er) { + log.error("makeCacheDir", "homeless?") + return cb(er) + } + cacheStat = st + log.silly("makeCacheDir", "cache dir uid, gid", [st.uid, st.gid]) + return mkdir(npm.cache, afterMkdir) + }) + + function afterMkdir (er, made) { + if (er || !cacheStat || isNaN(cacheStat.uid) || isNaN(cacheStat.gid)) { + return cb(er, cacheStat) + } + + if (!made) return cb(er, cacheStat) + + // ensure that the ownership is correct. + chownr(made, cacheStat.uid, cacheStat.gid, function (er) { + return cb(er, cacheStat) + }) + } +} diff -Nru nodejs-0.10.28/deps/npm/lib/cache/maybe-github.js nodejs-0.10.29/deps/npm/lib/cache/maybe-github.js --- nodejs-0.10.28/deps/npm/lib/cache/maybe-github.js 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/lib/cache/maybe-github.js 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,35 @@ +var url = require("url") + , assert = require("assert") + , log = require("npmlog") + , addRemoteGit = require("./add-remote-git.js") + +module.exports = function maybeGithub (p, er, cb) { + assert(typeof p === "string", "must pass package name") + assert(er instanceof Error, "must include error") + assert(typeof cb === "function", "must pass callback") + + var u = "git://github.com/" + p + , up = url.parse(u) + log.info("maybeGithub", "Attempting %s from %s", p, u) + + return addRemoteGit(u, up, true, function (er2, data) { + if (er2) { + var upriv = "git+ssh://git@github.com:" + p + , uppriv = url.parse(upriv) + + log.info("maybeGithub", "Attempting %s from %s", p, upriv) + + return addRemoteGit(upriv, uppriv, false, function (er3, data) { + if (er3) return cb(er) + success(upriv, data) + }) + } + success(u, data) + }) + + function success (u, data) { + data._from = u + data._fromGithub = true + return cb(null, data) + } +} diff -Nru nodejs-0.10.28/deps/npm/lib/cache.js nodejs-0.10.29/deps/npm/lib/cache.js --- nodejs-0.10.28/deps/npm/lib/cache.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/lib/cache.js 2014-06-09 17:04:36.000000000 +0000 @@ -7,15 +7,14 @@ // /* -fetching a url: -1. Check for url in inFlightUrls. If present, add cb, and return. -2. create inFlightURL list -3. Acquire lock at {cache}/{sha(url)}.lock +fetching a URL: +1. Check for URL in inflight URLs. If present, add cb, and return. +2. Acquire lock at {cache}/{sha(url)}.lock retries = {cache-lock-retries, def=3} stale = {cache-lock-stale, def=30000} wait = {cache-lock-wait, def=100} -4. if lock can't be acquired, then fail -5. fetch url, clear lock, call cbs +3. if lock can't be acquired, then fail +4. fetch url, clear lock, call cbs cache folders: 1. urls: http!/server.com/path/to/thing @@ -51,40 +50,27 @@ */ exports = module.exports = cache -cache.read = read -cache.clean = clean cache.unpack = unpack -cache.lock = lock -cache.unlock = unlock +cache.clean = clean +cache.read = read -var mkdir = require("mkdirp") - , spawn = require("child_process").spawn - , exec = require("child_process").execFile - , once = require("once") - , fetch = require("./utils/fetch.js") - , npm = require("./npm.js") +var npm = require("./npm.js") , fs = require("graceful-fs") + , assert = require("assert") , rm = require("./utils/gently-rm.js") , readJson = require("read-package-json") - , registry = npm.registry , log = require("npmlog") , path = require("path") - , sha = require("sha") + , url = require("url") , asyncMap = require("slide").asyncMap - , semver = require("semver") , tar = require("./utils/tar.js") , fileCompletion = require("./utils/completion/file-completion.js") - , url = require("url") - , chownr = require("chownr") - , lockFile = require("lockfile") - , crypto = require("crypto") - , retry = require("retry") - , zlib = require("zlib") - , chmodr = require("chmodr") - , which = require("which") , isGitUrl = require("./utils/is-git-url.js") - , pathIsInside = require("path-is-inside") - , http = require("http") + , deprCheck = require("./utils/depr-check.js") + , addNamed = require("./cache/add-named.js") + , addLocal = require("./cache/add-local.js") + , addRemoteTarball = require("./cache/add-remote-tarball.js") + , addRemoteGit = require("./cache/add-remote-git.js") cache.usage = "npm cache add " + "\nnpm cache add " @@ -131,24 +117,31 @@ // just do a readJson and return. // if they're not, then fetch them from the registry. function read (name, ver, forceBypass, cb) { - if (typeof cb !== "function") cb = forceBypass, forceBypass = true + assert(typeof name === "string", "must include name of module to install") + assert(typeof cb === "function", "must include callback") + + if (forceBypass === undefined || forceBypass === null) forceBypass = true + var jsonFile = path.join(npm.cache, name, ver, "package", "package.json") function c (er, data) { if (data) deprCheck(data) + return cb(er, data) } if (forceBypass && npm.config.get("force")) { log.verbose("using force", "skipping cache") - return addNamed(name, ver, c) + return addNamed(name, ver, null, c) } readJson(jsonFile, function (er, data) { er = needName(er, data) er = needVersion(er, data) if (er && er.code !== "ENOENT" && er.code !== "ENOTDIR") return cb(er) - if (er) return addNamed(name, ver, c) + if (er) return addNamed(name, ver, null, c) + deprCheck(data) + c(er, data) }) } @@ -176,8 +169,10 @@ // npm cache clean [] function clean (args, cb) { - if (!cb) cb = args, args = [] + assert(typeof cb === "function", "must include callback") + if (!args) args = [] + args = args.join("/").split("@").join("/") if (args.substr(-1) === "/") args = args.substr(0, args.length - 1) var f = path.join(npm.cache, path.normalize(args)) @@ -199,8 +194,9 @@ // npm cache add // npm cache add cache.add = function (pkg, ver, scrub, cb) { - if (typeof cb !== "function") cb = scrub, scrub = false - if (typeof cb !== "function") cb = ver, ver = null + assert(typeof pkg === "string", "must include name of package to install") + assert(typeof cb === "function", "must include callback") + if (scrub) { return clean([], function (er) { if (er) return cb(er) @@ -256,1109 +252,26 @@ // in that case, we will not have a protocol now, but if we // split and check, we will. if (!name && !p.protocol) { - if (spec.indexOf("/") !== -1 || - process.platform === "win32" && spec.indexOf("\\") !== -1) { - return maybeFile(spec, p, cb) - } else if (spec.indexOf("@") !== -1) { - return maybeAt(spec, cb) - } - } - - add_(name, spec, p, cb) -} - -function afterAdd (arg, cb) { return function (er, data) { - if (er || !data || !data.name || !data.version) { - return cb(er, data) - } - - // Save the resolved, shasum, etc. into the data so that the next - // time we load from this cached data, we have all the same info. - var name = data.name - var ver = data.version - var pj = path.join(npm.cache, name, ver, "package", "package.json") - fs.writeFile(pj, JSON.stringify(data), "utf8", function (er) { - cb(er, data) - }) -}} - - - -function maybeFile (spec, p, cb) { - fs.stat(spec, function (er, stat) { - if (!er) { - // definitely a local thing - addLocal(spec, cb) - } else if (er && spec.indexOf("@") !== -1) { - // bar@baz/loofa - maybeAt(spec, cb) - } else { - // Already know it's not a url, so must be local - addLocal(spec, cb) - } - }) -} - -function maybeAt (spec, cb) { - var tmp = spec.split("@") - - // split name@2.3.4 only if name is a valid package name, - // don't split in case of "./test@example.com/" (local path) - var name = tmp.shift() - spec = tmp.join("@") - return add([name, spec], cb) -} - -function add_ (name, spec, p, cb) { - switch (p.protocol) { - case "http:": - case "https:": - return addRemoteTarball(spec, null, name, cb) - - default: - if (isGitUrl(p)) - return addRemoteGit(spec, p, name, false, cb) - - // if we have a name and a spec, then try name@spec - // if not, then try just spec (which may try name@"" if not found) - if (name) { - addNamed(name, spec, cb) - } else { - addLocal(spec, cb) - } - } -} - -function fetchAndShaCheck (u, tmp, shasum, cb) { - fetch(u, tmp, function (er, response) { - if (er) { - log.error("fetch failed", u) - return cb(er, response) - } - - if (!shasum) { - // Well, we weren't given a shasum, so at least sha what we have - // in case we want to compare it to something else later - return sha.get(tmp, function (er, shasum) { - cb(er, response, shasum) - }) - } - - // validate that the url we just downloaded matches the expected shasum. - sha.check(tmp, shasum, function (er) { - if (er != null && er.message) { - // add original filename for better debuggability - er.message = er.message + '\n' + 'From: ' + u - } - return cb(er, response, shasum) - }) - }) -} - -// Only have a single download action at once for a given url -// additional calls stack the callbacks. -var inFlightURLs = {} -function addRemoteTarball (u, shasum, name, version, cb_) { - if (typeof cb_ !== "function") cb_ = version, version = "" - if (typeof cb_ !== "function") cb_ = name, name = "" - if (typeof cb_ !== "function") cb_ = shasum, shasum = null - - if (!inFlightURLs[u]) inFlightURLs[u] = [] - var iF = inFlightURLs[u] - iF.push(cb_) - if (iF.length > 1) return - - function cb (er, data) { - if (data) { - data._from = u - data._shasum = data._shasum || shasum - data._resolved = u - } - unlock(u, function () { - var c - while (c = iF.shift()) c(er, data) - delete inFlightURLs[u] - }) - } - - var tmp = path.join(npm.tmp, Date.now()+"-"+Math.random(), "tmp.tgz") - - lock(u, function (er) { - if (er) return cb(er) - - log.verbose("addRemoteTarball", [u, shasum]) - mkdir(path.dirname(tmp), function (er) { - if (er) return cb(er) - addRemoteTarball_(u, tmp, shasum, done) - }) - }) - - function done (er, resp, shasum) { - if (er) return cb(er) - addLocalTarball(tmp, name, version, shasum, cb) - } -} - -function addRemoteTarball_(u, tmp, shasum, cb) { - // Tuned to spread 3 attempts over about a minute. - // See formula at . - var operation = retry.operation - ( { retries: npm.config.get("fetch-retries") - , factor: npm.config.get("fetch-retry-factor") - , minTimeout: npm.config.get("fetch-retry-mintimeout") - , maxTimeout: npm.config.get("fetch-retry-maxtimeout") }) - - operation.attempt(function (currentAttempt) { - log.info("retry", "fetch attempt " + currentAttempt - + " at " + (new Date()).toLocaleTimeString()) - fetchAndShaCheck(u, tmp, shasum, function (er, response, shasum) { - // Only retry on 408, 5xx or no `response`. - var sc = response && response.statusCode - var statusRetry = !sc || (sc === 408 || sc >= 500) - if (er && statusRetry && operation.retry(er)) { - log.info("retry", "will retry, error on last attempt: " + er) - return - } - cb(er, response, shasum) - }) - }) -} - -// 1. cacheDir = path.join(cache,'_git-remotes',sha1(u)) -// 2. checkGitDir(cacheDir) ? 4. : 3. (rm cacheDir if necessary) -// 3. git clone --mirror u cacheDir -// 4. cd cacheDir && git fetch -a origin -// 5. git archive /tmp/random.tgz -// 6. addLocalTarball(/tmp/random.tgz) --format=tar --prefix=package/ -// silent flag is used if this should error quietly -function addRemoteGit (u, parsed, name, silent, cb_) { - if (typeof cb_ !== "function") cb_ = name, name = null - - if (!inFlightURLs[u]) inFlightURLs[u] = [] - var iF = inFlightURLs[u] - iF.push(cb_) - if (iF.length > 1) return - - // git is so tricky! - // if the path is like ssh://foo:22/some/path then it works, but - // it needs the ssh:// - // If the path is like ssh://foo:some/path then it works, but - // only if you remove the ssh:// - var origUrl = u - u = u.replace(/^git\+/, "") - .replace(/#.*$/, "") - - // ssh paths that are scp-style urls don't need the ssh:// - if (parsed.pathname.match(/^\/?:/)) { - u = u.replace(/^ssh:\/\//, "") + return maybeFile(spec, cb) } - - function cb (er, data) { - unlock(u, function () { - var c - while (c = iF.shift()) c(er, data) - delete inFlightURLs[origUrl] - }) - } - - lock(u, function (er) { - if (er) return cb(er) - - // figure out what we should check out. - var co = parsed.hash && parsed.hash.substr(1) || "master" - - var v = crypto.createHash("sha1").update(u).digest("hex").slice(0, 8) - v = u.replace(/[^a-zA-Z0-9]+/g, '-') + '-' + v - - log.verbose("addRemoteGit", [u, co]) - - var p = path.join(npm.config.get("cache"), "_git-remotes", v) - - checkGitDir(p, u, co, origUrl, silent, function(er, data) { - chmodr(p, npm.modes.file, function(erChmod) { - if (er) return cb(er, data) - return cb(erChmod, data) - }) - }) - }) -} - -function checkGitDir (p, u, co, origUrl, silent, cb) { - fs.stat(p, function (er, s) { - if (er) return cloneGitRemote(p, u, co, origUrl, silent, cb) - if (!s.isDirectory()) return rm(p, function (er){ - if (er) return cb(er) - cloneGitRemote(p, u, co, origUrl, silent, cb) - }) - - var git = npm.config.get("git") - var args = [ "config", "--get", "remote.origin.url" ] - var env = gitEnv() - - // check for git - which(git, function (err) { - if (err) { - err.code = "ENOGIT" - return cb(err) - } - exec(git, args, {cwd: p, env: env}, function (er, stdout, stderr) { - stdoutTrimmed = (stdout + "\n" + stderr).trim() - if (er || u !== stdout.trim()) { - log.warn( "`git config --get remote.origin.url` returned " - + "wrong result ("+u+")", stdoutTrimmed ) - return rm(p, function (er){ - if (er) return cb(er) - cloneGitRemote(p, u, co, origUrl, silent, cb) - }) - } - log.verbose("git remote.origin.url", stdoutTrimmed) - archiveGitRemote(p, u, co, origUrl, cb) - }) - }) - }) -} - -function cloneGitRemote (p, u, co, origUrl, silent, cb) { - mkdir(p, function (er) { - if (er) return cb(er) - - var git = npm.config.get("git") - var args = [ "clone", "--mirror", u, p ] - var env = gitEnv() - - // check for git - which(git, function (err) { - if (err) { - err.code = "ENOGIT" - return cb(err) - } - exec(git, args, {cwd: p, env: env}, function (er, stdout, stderr) { - stdout = (stdout + "\n" + stderr).trim() - if (er) { - if (silent) { - log.verbose("git clone " + u, stdout) - } else { - log.error("git clone " + u, stdout) - } - return cb(er) + else { + switch (p.protocol) { + case "http:": + case "https:": + return addRemoteTarball(spec, { name: name }, null, cb) + + default: + if (isGitUrl(p)) return addRemoteGit(spec, p, false, cb) + + // if we have a name and a spec, then try name@spec + if (name) { + addNamed(name, spec, null, cb) } - log.verbose("git clone " + u, stdout) - archiveGitRemote(p, u, co, origUrl, cb) - }) - }) - }) -} - -function archiveGitRemote (p, u, co, origUrl, cb) { - var git = npm.config.get("git") - var archive = [ "fetch", "-a", "origin" ] - var resolve = [ "rev-list", "-n1", co ] - var env = gitEnv() - - var errState = null - var n = 0 - var resolved = null - var tmp - - exec(git, archive, {cwd: p, env: env}, function (er, stdout, stderr) { - stdout = (stdout + "\n" + stderr).trim() - if (er) { - log.error("git fetch -a origin ("+u+")", stdout) - return cb(er) - } - log.verbose("git fetch -a origin ("+u+")", stdout) - tmp = path.join(npm.tmp, Date.now()+"-"+Math.random(), "tmp.tgz") - verifyOwnership() - }) - - function verifyOwnership() { - if (process.platform === "win32") { - log.silly("verifyOwnership", "skipping for windows") - resolveHead() - } else { - getCacheStat(function(er, cs) { - if (er) { - log.error("Could not get cache stat") - return cb(er) + // if not, then try just spec (which may try name@"" if not found) + else { + addLocal(spec, {}, cb) } - chownr(p, cs.uid, cs.gid, function(er) { - if (er) { - log.error("Failed to change folder ownership under npm cache for %s", p) - return cb(er) - } - resolveHead() - }) - }) - } - } - - function resolveHead () { - exec(git, resolve, {cwd: p, env: env}, function (er, stdout, stderr) { - stdout = (stdout + "\n" + stderr).trim() - if (er) { - log.error("Failed resolving git HEAD (" + u + ")", stderr) - return cb(er) - } - log.verbose("git rev-list -n1 " + co, stdout) - var parsed = url.parse(origUrl) - parsed.hash = stdout - resolved = url.format(parsed) - - // https://github.com/npm/npm/issues/3224 - // node incorrectly sticks a / at the start of the path - // We know that the host won't change, so split and detect this - var spo = origUrl.split(parsed.host) - var spr = resolved.split(parsed.host) - if (spo[1].charAt(0) === ':' && spr[1].charAt(0) === '/') - spr[1] = spr[1].slice(1) - resolved = spr.join(parsed.host) - - log.verbose('resolved git url', resolved) - next() - }) - } - - function next () { - mkdir(path.dirname(tmp), function (er) { - if (er) return cb(er) - var gzip = zlib.createGzip({ level: 9 }) - var git = npm.config.get("git") - var args = ["archive", co, "--format=tar", "--prefix=package/"] - var out = fs.createWriteStream(tmp) - var env = gitEnv() - cb = once(cb) - var cp = spawn(git, args, { env: env, cwd: p }) - cp.on("error", cb) - cp.stderr.on("data", function(chunk) { - log.silly(chunk.toString(), "git archive") - }) - - cp.stdout.pipe(gzip).pipe(out).on("close", function() { - addLocalTarball(tmp, function(er, data) { - if (data) data._resolved = resolved - cb(er, data) - }) - }) - }) - } -} - -var gitEnv_ -function gitEnv () { - // git responds to env vars in some weird ways in post-receive hooks - // so don't carry those along. - if (gitEnv_) return gitEnv_ - gitEnv_ = {} - for (var k in process.env) { - if (!~['GIT_PROXY_COMMAND','GIT_SSH','GIT_SSL_NO_VERIFY'].indexOf(k) && k.match(/^GIT/)) continue - gitEnv_[k] = process.env[k] - } - return gitEnv_ -} - - -// only have one request in flight for a given -// name@blah thing. -var inFlightNames = {} -function addNamed (name, x, data, cb_) { - if (typeof cb_ !== "function") cb_ = data, data = null - log.verbose("addNamed", [name, x]) - - var k = name + "@" + x - if (!inFlightNames[k]) inFlightNames[k] = [] - var iF = inFlightNames[k] - iF.push(cb_) - if (iF.length > 1) return - - function cb (er, data) { - if (data && !data._fromGithub) data._from = k - unlock(k, function () { - var c - while (c = iF.shift()) c(er, data) - delete inFlightNames[k] - }) - } - - log.verbose("addNamed", [semver.valid(x), semver.validRange(x)]) - lock(k, function (er, fd) { - if (er) return cb(er) - - var fn = ( semver.valid(x, true) ? addNameVersion - : semver.validRange(x, true) ? addNameRange - : addNameTag - ) - fn(name, x, data, cb) - }) -} - -function addNameTag (name, tag, data, cb_) { - if (typeof cb_ !== "function") cb_ = data, data = null - log.info("addNameTag", [name, tag]) - var explicit = true - if (!tag) { - explicit = false - tag = npm.config.get("tag") - } - - function cb(er, data) { - // might be username/project - // in that case, try it as a github url. - if (er && tag.split("/").length === 2) { - return maybeGithub(tag, name, er, cb_) - } - return cb_(er, data) - } - - registry.get(name, function (er, data, json, response) { - if (!er) { - er = errorResponse(name, response) - } - if (er) return cb(er) - engineFilter(data) - if (data["dist-tags"] && data["dist-tags"][tag] - && data.versions[data["dist-tags"][tag]]) { - var ver = data["dist-tags"][tag] - return addNamed(name, ver, data.versions[ver], cb) - } - if (!explicit && Object.keys(data.versions).length) { - return addNamed(name, "*", data, cb) - } - - er = installTargetsError(tag, data) - return cb(er) - }) -} - - -function engineFilter (data) { - var npmv = npm.version - , nodev = npm.config.get("node-version") - , strict = npm.config.get("engine-strict") - - if (!nodev || npm.config.get("force")) return data - - Object.keys(data.versions || {}).forEach(function (v) { - var eng = data.versions[v].engines - if (!eng) return - if (!strict && !data.versions[v].engineStrict) return - if (eng.node && !semver.satisfies(nodev, eng.node, true) - || eng.npm && !semver.satisfies(npmv, eng.npm, true)) { - delete data.versions[v] } - }) -} - -function errorResponse (name, response) { - if (response.statusCode >= 400) { - var er = new Error(http.STATUS_CODES[response.statusCode]) - er.statusCode = response.statusCode - er.code = "E" + er.statusCode - er.pkgid = name - } - return er -} - -function addNameRange (name, range, data, cb) { - if (typeof cb !== "function") cb = data, data = null - - range = semver.validRange(range, true) - if (range === null) return cb(new Error( - "Invalid version range: "+range)) - - log.silly("addNameRange", {name:name, range:range, hasData:!!data}) - - if (data) return next() - registry.get(name, function (er, d, json, response) { - if (!er) { - er = errorResponse(name, response) - } - if (er) return cb(er) - data = d - next() - }) - - function next () { - log.silly( "addNameRange", "number 2" - , {name:name, range:range, hasData:!!data}) - engineFilter(data) - - log.silly("addNameRange", "versions" - , [data.name, Object.keys(data.versions || {})]) - - // if the tagged version satisfies, then use that. - var tagged = data["dist-tags"][npm.config.get("tag")] - if (tagged - && data.versions[tagged] - && semver.satisfies(tagged, range, true)) { - return addNamed(name, tagged, data.versions[tagged], cb) - } - - // find the max satisfying version. - var versions = Object.keys(data.versions || {}) - var ms = semver.maxSatisfying(versions, range, true) - if (!ms) { - return cb(installTargetsError(range, data)) - } - - // if we don't have a registry connection, try to see if - // there's a cached copy that will be ok. - addNamed(name, ms, data.versions[ms], cb) - } -} - -function installTargetsError (requested, data) { - var targets = Object.keys(data["dist-tags"]).filter(function (f) { - return (data.versions || {}).hasOwnProperty(f) - }).concat(Object.keys(data.versions || {})) - - requested = data.name + (requested ? "@'" + requested + "'" : "") - - targets = targets.length - ? "Valid install targets:\n" + JSON.stringify(targets) + "\n" - : "No valid targets found.\n" - + "Perhaps not compatible with your version of node?" - - var er = new Error( "No compatible version found: " - + requested + "\n" + targets) - er.code = "ETARGET" - return er -} - -function addNameVersion (name, v, data, cb) { - if (typeof cb !== "function") cb = data, data = null - - var ver = semver.valid(v, true) - if (!ver) return cb(new Error("Invalid version: "+v)) - - var response - - if (data) { - response = null - return next() - } - registry.get(name, function (er, d, json, resp) { - if (!er) { - er = errorResponse(name, resp) - } - if (er) return cb(er) - data = d && d.versions[ver] - if (!data) { - er = new Error('version not found: ' + name + '@' + ver) - er.package = name - er.statusCode = 404 - return cb(er) - } - response = resp - next() - }) - - function next () { - deprCheck(data) - var dist = data.dist - - if (!dist) return cb(new Error("No dist in "+data._id+" package")) - - if (!dist.tarball) return cb(new Error( - "No dist.tarball in " + data._id + " package")) - - if ((response && response.statusCode !== 304) || npm.config.get("force")) { - return fetchit() - } - - // we got cached data, so let's see if we have a tarball. - var pkgroot = path.join(npm.cache, name, ver) - var pkgtgz = path.join(pkgroot, "package.tgz") - var pkgjson = path.join(pkgroot, "package", "package.json") - fs.stat(pkgtgz, function (er, s) { - if (!er) { - readJson(pkgjson, function (er, data) { - er = needName(er, data) - er = needVersion(er, data) - if (er && er.code !== "ENOENT" && er.code !== "ENOTDIR") - return cb(er) - if (er) return fetchit() - // check the SHA of the package we have, to ensure it wasn't installed - // from somewhere other than the registry (eg, a fork) - if (data._shasum && dist.shasum && data._shasum !== dist.shasum) - return fetchit() - return cb(null, data) - }) - } else return fetchit() - }) - - function fetchit () { - if (!npm.config.get("registry")) { - return cb(new Error("Cannot fetch: "+dist.tarball)) - } - - // use the same protocol as the registry. - // https registry --> https tarballs, but - // only if they're the same hostname, or else - // detached tarballs may not work. - var tb = url.parse(dist.tarball) - var rp = url.parse(npm.config.get("registry")) - if (tb.hostname === rp.hostname - && tb.protocol !== rp.protocol) { - tb.protocol = url.parse(npm.config.get("registry")).protocol - delete tb.href - } - tb = url.format(tb) - - // only add non-shasum'ed packages if --forced. - // only ancient things would lack this for good reasons nowadays. - if (!dist.shasum && !npm.config.get("force")) { - return cb(new Error("package lacks shasum: " + data._id)) - } - return addRemoteTarball( tb - , dist.shasum - , name - , ver - , cb ) - } - } -} - -function addLocal (p, name, cb_) { - if (typeof cb_ !== "function") cb_ = name, name = "" - - function cb (er, data) { - unlock(p, function () { - if (er) { - // if it doesn't have a / in it, it might be a - // remote thing. - if (p.indexOf("/") === -1 && p.charAt(0) !== "." - && (process.platform !== "win32" || p.indexOf("\\") === -1)) { - return addNamed(p, "", cb_) - } - log.error("addLocal", "Could not install %s", p) - return cb_(er) - } - if (data && !data._fromGithub) data._from = p - return cb_(er, data) - }) - } - - lock(p, function (er) { - if (er) return cb(er) - // figure out if this is a folder or file. - fs.stat(p, function (er, s) { - if (er) { - // might be username/project - // in that case, try it as a github url. - if (p.split("/").length === 2) { - return maybeGithub(p, name, er, cb) - } - return cb(er) - } - if (s.isDirectory()) addLocalDirectory(p, name, cb) - else addLocalTarball(p, name, cb) - }) - }) -} - -function maybeGithub (p, name, er, cb) { - var u = "git://github.com/" + p - , up = url.parse(u) - log.info("maybeGithub", "Attempting %s from %s", p, u) - - return addRemoteGit(u, up, name, true, function (er2, data) { - if (er2) { - var upriv = "git+ssh://git@github.com:" + p - , uppriv = url.parse(upriv) - - log.info("maybeGithub", "Attempting %s from %s", p, upriv) - - return addRemoteGit(upriv, uppriv, false, name, function (er3, data) { - if (er3) return cb(er) - success(upriv, data) - }) - } - success(u, data) - }) - - function success (u, data) { - data._from = u - data._fromGithub = true - return cb(null, data) - } -} - -function addLocalTarball (p, name, version, shasum, cb_) { - if (typeof cb_ !== "function") cb_ = shasum, shasum = null - if (typeof cb_ !== "function") cb_ = version, version = "" - if (typeof cb_ !== "function") cb_ = name, name = "" - - // If we don't have a shasum yet, then get the shasum now. - if (!shasum) { - return sha.get(p, function (er, shasum) { - if (er) return cb_(er) - addLocalTarball(p, name, version, shasum, cb_) - }) - } - - // if it's a tar, and not in place, - // then unzip to .tmp, add the tmp folder, and clean up tmp - if (pathIsInside(p, npm.tmp)) - return addTmpTarball(p, name, version, shasum, cb_) - - if (pathIsInside(p, npm.cache)) { - if (path.basename(p) !== "package.tgz") return cb_(new Error( - "Not a valid cache tarball name: "+p)) - return addPlacedTarball(p, name, shasum, cb_) - } - - function cb (er, data) { - if (data) { - data._resolved = p - data._shasum = data._shasum || shasum - } - return cb_(er, data) - } - - // just copy it over and then add the temp tarball file. - var tmp = path.join(npm.tmp, name + Date.now() - + "-" + Math.random(), "tmp.tgz") - mkdir(path.dirname(tmp), function (er) { - if (er) return cb(er) - var from = fs.createReadStream(p) - , to = fs.createWriteStream(tmp) - , errState = null - function errHandler (er) { - if (errState) return - return cb(errState = er) - } - from.on("error", errHandler) - to.on("error", errHandler) - to.on("close", function () { - if (errState) return - log.verbose("chmod", tmp, npm.modes.file.toString(8)) - fs.chmod(tmp, npm.modes.file, function (er) { - if (er) return cb(er) - addTmpTarball(tmp, name, null, shasum, cb) - }) - }) - from.pipe(to) - }) -} - -// to maintain the cache dir's permissions consistently. -var cacheStat = null -function getCacheStat (cb) { - if (cacheStat) return cb(null, cacheStat) - fs.stat(npm.cache, function (er, st) { - if (er) return makeCacheDir(cb) - if (!st.isDirectory()) { - log.error("getCacheStat", "invalid cache dir %j", npm.cache) - return cb(er) - } - return cb(null, cacheStat = st) - }) -} - -function makeCacheDir (cb) { - if (!process.getuid) return mkdir(npm.cache, cb) - - var uid = +process.getuid() - , gid = +process.getgid() - - if (uid === 0) { - if (process.env.SUDO_UID) uid = +process.env.SUDO_UID - if (process.env.SUDO_GID) gid = +process.env.SUDO_GID - } - if (uid !== 0 || !process.env.HOME) { - cacheStat = {uid: uid, gid: gid} - return mkdir(npm.cache, afterMkdir) - } - - fs.stat(process.env.HOME, function (er, st) { - if (er) { - log.error("makeCacheDir", "homeless?") - return cb(er) - } - cacheStat = st - log.silly("makeCacheDir", "cache dir uid, gid", [st.uid, st.gid]) - return mkdir(npm.cache, afterMkdir) - }) - - function afterMkdir (er, made) { - if (er || !cacheStat || isNaN(cacheStat.uid) || isNaN(cacheStat.gid)) { - return cb(er, cacheStat) - } - - if (!made) return cb(er, cacheStat) - - // ensure that the ownership is correct. - chownr(made, cacheStat.uid, cacheStat.gid, function (er) { - return cb(er, cacheStat) - }) - } -} - - - - -function addPlacedTarball (p, name, shasum, cb) { - if (!cb) cb = name, name = "" - getCacheStat(function (er, cs) { - if (er) return cb(er) - return addPlacedTarball_(p, name, cs.uid, cs.gid, shasum, cb) - }) -} - -// Resolved sum is the shasum from the registry dist object, but -// *not* necessarily the shasum of this tarball, because for stupid -// historical reasons, npm re-packs each package an extra time through -// a temp directory, so all installed packages are actually built with -// *this* version of npm, on this machine. -// -// Once upon a time, this meant that we could change package formats -// around and fix junk that might be added by incompatible tar -// implementations. Then, for a while, it was a way to correct bs -// added by bugs in our own tar implementation. Now, it's just -// garbage, but cleaning it up is a pain, and likely to cause issues -// if anything is overlooked, so it's not high priority. -// -// If you're bored, and looking to make npm go faster, and you've -// already made it this far in this file, here's a better methodology: -// -// cache.add should really be cache.place. That is, it should take -// a set of arguments like it does now, but then also a destination -// folder. -// -// cache.add('foo@bar', '/path/node_modules/foo', cb) -// -// 1. Resolve 'foo@bar' to some specific: -// - git url -// - local folder -// - local tarball -// - tarball url -// 2. If resolved through the registry, then pick up the dist.shasum -// along the way. -// 3. Acquire request() stream fetching bytes: FETCH -// 4. FETCH.pipe(tar unpack stream to dest) -// 5. FETCH.pipe(shasum generator) -// When the tar and shasum streams both finish, make sure that the -// shasum matches dist.shasum, and if not, clean up and bail. -// -// publish(cb) -// -// 1. read package.json -// 2. get root package object (for rev, and versions) -// 3. update root package doc with version info -// 4. remove _attachments object -// 5. remove versions object -// 5. jsonify, remove last } -// 6. get stream: registry.put(/package) -// 7. write trailing-}-less JSON -// 8. write "_attachments": -// 9. JSON.stringify(attachments), remove trailing } -// 10. Write start of attachments (stubs) -// 11. JSON(filename)+':{"type":"application/octet-stream","data":"' -// 12. acquire tar packing stream, PACK -// 13. PACK.pipe(PUT) -// 14. PACK.pipe(shasum generator) -// 15. when PACK finishes, get shasum -// 16. PUT.write('"}},') (finish _attachments -// 17. update "versions" object with current package version -// (including dist.shasum and dist.tarball) -// 18. write '"versions":' + JSON(versions) -// 19. write '}}' (versions, close main doc) - -function addPlacedTarball_ (p, name, uid, gid, resolvedSum, cb) { - // now we know it's in place already as .cache/name/ver/package.tgz - // unpack to .cache/name/ver/package/, read the package.json, - // and fire cb with the json data. - var target = path.dirname(p) - , folder = path.join(target, "package") - - lock(folder, function (er) { - if (er) return cb(er) - rmUnpack() - }) - - function rmUnpack () { - rm(folder, function (er) { - unlock(folder, function () { - if (er) { - log.error("addPlacedTarball", "Could not remove %j", folder) - return cb(er) - } - thenUnpack() - }) - }) - } - - function thenUnpack () { - tar.unpack(p, folder, null, null, uid, gid, function (er) { - if (er) { - log.error("addPlacedTarball", "Could not unpack %j to %j", p, target) - return cb(er) - } - // calculate the sha of the file that we just unpacked. - // this is so that the data is available when publishing. - sha.get(p, function (er, shasum) { - if (er) { - log.error("addPlacedTarball", "shasum fail", p) - return cb(er) - } - readJson(path.join(folder, "package.json"), function (er, data) { - er = needName(er, data) - er = needVersion(er, data) - if (er) { - log.error("addPlacedTarball", "Couldn't read json in %j" - , folder) - return cb(er) - } - - data.dist = data.dist || {} - data.dist.shasum = shasum - deprCheck(data) - asyncMap([p], function (f, cb) { - log.verbose("chmod", f, npm.modes.file.toString(8)) - fs.chmod(f, npm.modes.file, cb) - }, function (f, cb) { - if (process.platform === "win32") { - log.silly("chown", "skipping for windows", f) - cb() - } else if (typeof uid === "number" - && typeof gid === "number" - && parseInt(uid, 10) === uid - && parseInt(gid, 10) === gid) { - log.verbose("chown", f, [uid, gid]) - fs.chown(f, uid, gid, cb) - } else { - log.verbose("chown", "skip for invalid uid/gid", [f, uid, gid]) - cb() - } - }, function (er) { - cb(er, data) - }) - }) - }) - }) - } -} - -// At this point, if shasum is set, it's something that we've already -// read and checked. Just stashing it in the data at this point. -function addLocalDirectory (p, name, shasum, cb) { - if (typeof cb !== "function") cb = shasum, shasum = "" - if (typeof cb !== "function") cb = name, name = "" - // if it's a folder, then read the package.json, - // tar it to the proper place, and add the cache tar - if (pathIsInside(p, npm.cache)) return cb(new Error( - "Adding a cache directory to the cache will make the world implode.")) - readJson(path.join(p, "package.json"), false, function (er, data) { - er = needName(er, data) - er = needVersion(er, data) - if (er) return cb(er) - deprCheck(data) - var random = Date.now() + "-" + Math.random() - , tmp = path.join(npm.tmp, random) - , tmptgz = path.resolve(tmp, "tmp.tgz") - , placed = path.resolve( npm.cache, data.name - , data.version, "package.tgz" ) - , placeDirect = path.basename(p) === "package" - , tgz = placeDirect ? placed : tmptgz - , version = data.version - - name = data.name - - getCacheStat(function (er, cs) { - mkdir(path.dirname(tgz), function (er, made) { - if (er) return cb(er) - - var fancy = !pathIsInside(p, npm.tmp) - && !pathIsInside(p, npm.cache) - tar.pack(tgz, p, data, fancy, function (er) { - if (er) { - log.error( "addLocalDirectory", "Could not pack %j to %j" - , p, tgz ) - return cb(er) - } - - // if we don't get a cache stat, or if the gid/uid is not - // a number, then just move on. chown would fail anyway. - if (!cs || isNaN(cs.uid) || isNaN(cs.gid)) return cb() - - chownr(made || tgz, cs.uid, cs.gid, function (er) { - if (er) return cb(er) - addLocalTarball(tgz, name, version, shasum, cb) - }) - }) - }) - }) - }) -} - -// XXX This is where it should be fixed -// Right now it's unpacking to a "package" folder, and then -// adding that local folder, for historical reasons. -// Instead, unpack to the *cache* folder, and then copy the -// tgz into place in the cache, so the shasum doesn't change. -function addTmpTarball (tgz, name, version, shasum, cb) { - // Just have a placeholder here so we can move it into place after. - var tmp = false - if (!version) { - tmp = true - version = 'tmp_' + crypto.randomBytes(6).toString('hex') - } - if (!name) { - tmp = true - name = 'tmp_' + crypto.randomBytes(6).toString('hex') - } - if (!tmp) { - var pdir = path.resolve(npm.cache, name, version, "package") - } else { - var pdir = path.resolve(npm.cache, name + version + "package") - } - - getCacheStat(function (er, cs) { - if (er) return cb(er) - tar.unpack(tgz, pdir, null, null, cs.uid, cs.gid, next) - }) - - function next (er) { - if (er) return cb(er) - // it MUST be able to get a version now! - var pj = path.resolve(pdir, "package.json") - readJson(pj, function (er, data) { - if (er) return cb(er) - if (version === data.version && name === data.name && !tmp) { - addTmpTarball_(tgz, data, name, version, shasum, cb) - } else { - var old = pdir - name = data.name - version = data.version - pdir = path.resolve(npm.cache, name, version, "package") - mkdir(path.dirname(pdir), function(er) { - if (er) return cb(er) - rm(pdir, function(er) { - if (er) return cb(er) - fs.rename(old, pdir, function(er) { - if (er) return cb(er) - rm(old, function(er) { - if (er) return cb(er) - addTmpTarball_(tgz, data, name, version, shasum, cb) - }) - }) - }) - }) - } - }) - } -} - -function addTmpTarball_ (tgz, data, name, version, shasum, cb) { - cb = once(cb) - var target = path.resolve(npm.cache, name, version, "package.tgz") - var read = fs.createReadStream(tgz) - var write = fs.createWriteStream(target) - read.on("error", cb).pipe(write).on("error", cb).on("close", done) - - function done() { - data._shasum = data._shasum || shasum - cb(null, data) } } @@ -1368,7 +281,7 @@ if (typeof cb !== "function") cb = fMode, fMode = null if (typeof cb !== "function") cb = dMode, dMode = null - read(pkg, ver, false, function (er, data) { + read(pkg, ver, false, function (er) { if (er) { log.error("unpack", "Could not read data for %s", pkg + "@" + ver) return cb(er) @@ -1384,54 +297,44 @@ }) } -var deprecated = {} - , deprWarned = {} -function deprCheck (data) { - if (deprecated[data._id]) data.deprecated = deprecated[data._id] - if (data.deprecated) deprecated[data._id] = data.deprecated - else return - if (!deprWarned[data._id]) { - deprWarned[data._id] = true - log.warn("deprecated", "%s: %s", data._id, data.deprecated) +function afterAdd (arg, cb) { return function (er, data) { + if (er || !data || !data.name || !data.version) { + return cb(er, data) } -} -function lockFileName (u) { - var c = u.replace(/[^a-zA-Z0-9]+/g, "-").replace(/^-+|-+$/g, "") - , h = crypto.createHash("sha1").update(u).digest("hex") - h = h.substr(0, 8) - c = c.substr(-32) - log.silly("lockFile", h + "-" + c, u) - return path.resolve(npm.config.get("cache"), h + "-" + c + ".lock") -} + // Save the resolved, shasum, etc. into the data so that the next + // time we load from this cached data, we have all the same info. + var name = data.name + var ver = data.version + var pj = path.join(npm.cache, name, ver, "package", "package.json") + fs.writeFile(pj, JSON.stringify(data), "utf8", function (er) { + cb(er, data) + }) +}} -var myLocks = {} -function lock (u, cb) { - // the cache dir needs to exist already for this. - getCacheStat(function (er, cs) { - if (er) return cb(er) - var opts = { stale: npm.config.get("cache-lock-stale") - , retries: npm.config.get("cache-lock-retries") - , wait: npm.config.get("cache-lock-wait") } - var lf = lockFileName(u) - log.verbose("lock", u, lf) - lockFile.lock(lf, opts, function(er) { - if (!er) myLocks[lf] = true - cb(er) - }) +function maybeFile (spec, cb) { + // split name@2.3.4 only if name is a valid package name, + // don't split in case of "./test@example.com/" (local path) + fs.stat(spec, function (er) { + if (!er) { + // definitely a local thing + return addLocal(spec, {}, cb) + } + + maybeAt(spec, cb) }) } -function unlock (u, cb) { - var lf = lockFileName(u) - , locked = myLocks[lf] - if (locked === false) { - return process.nextTick(cb) - } else if (locked === true) { - myLocks[lf] = false - lockFile.unlock(lockFileName(u), cb) +function maybeAt (spec, cb) { + if (spec.indexOf("@") !== -1) { + var tmp = spec.split("@") + + var name = tmp.shift() + spec = tmp.join("@") + add([name, spec], cb) } else { - throw new Error("Attempt to unlock " + u + ", which hasn't been locked") + // already know it's not a url, so must be local + addLocal(spec, {}, cb) } } diff -Nru nodejs-0.10.28/deps/npm/lib/explore.js nodejs-0.10.29/deps/npm/lib/explore.js --- nodejs-0.10.28/deps/npm/lib/explore.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/lib/explore.js 2014-06-09 17:04:36.000000000 +0000 @@ -26,6 +26,7 @@ "\nExploring "+cwd+"\n"+ "Type 'exit' or ^D when finished\n") + npm.spinner.stop() var shell = spawn(sh, args, { cwd: cwd, customFds: [0, 1, 2] }) shell.on("close", function (er) { // only fail if non-interactive. diff -Nru nodejs-0.10.28/deps/npm/lib/help.js nodejs-0.10.29/deps/npm/lib/help.js --- nodejs-0.10.28/deps/npm/lib/help.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/lib/help.js 2014-06-09 17:04:36.000000000 +0000 @@ -15,6 +15,7 @@ , glob = require("glob") function help (args, cb) { + npm.spinner.stop() var argv = npm.config.get("argv").cooked var argnum = 0 diff -Nru nodejs-0.10.28/deps/npm/lib/init.js nodejs-0.10.29/deps/npm/lib/init.js --- nodejs-0.10.28/deps/npm/lib/init.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/lib/init.js 2014-06-09 17:04:36.000000000 +0000 @@ -12,6 +12,7 @@ function init (args, cb) { var dir = process.cwd() log.pause() + npm.spinner.stop() var initFile = npm.config.get('init-module') console.log( @@ -31,6 +32,10 @@ log.resume() log.silly('package data', data) log.info('init', 'written successfully') + if (er && er.message === 'canceled') { + log.warn('init', 'canceled') + return cb(null, data) + } cb(er, data) }) } diff -Nru nodejs-0.10.28/deps/npm/lib/install.js nodejs-0.10.29/deps/npm/lib/install.js --- nodejs-0.10.28/deps/npm/lib/install.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/lib/install.js 2014-06-09 17:04:36.000000000 +0000 @@ -391,6 +391,7 @@ if (saveBundle) { var i = bundle.indexOf(t) if (i === -1) bundle.push(t) + data.bundleDependencies = bundle.sort() } }) @@ -709,7 +710,7 @@ // already has a matching copy. // If it's not a git repo, and the parent already has that pkg, then // we can skip installing it again. - cache.add(what, function (er, data) { + cache.add(what, null, false, function (er, data) { if (er && parent && parent.optionalDependencies && parent.optionalDependencies.hasOwnProperty(what.split("@")[0])) { log.warn("optional dep failed, continuing", what) diff -Nru nodejs-0.10.28/deps/npm/lib/ls.js nodejs-0.10.29/deps/npm/lib/ls.js --- nodejs-0.10.28/deps/npm/lib/ls.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/lib/ls.js 2014-06-09 17:04:36.000000000 +0000 @@ -128,8 +128,7 @@ var dep = data.dependencies[d] if (typeof dep === "string") { lite.problems = lite.problems || [] - var p - if (data.depth >= maxDepth) { + if (data.depth > maxDepth) { p = "max depth reached: " } else { p = "missing: " @@ -223,14 +222,14 @@ function makeArchy_ (data, long, dir, depth, parent, d) { var color = npm.color if (typeof data === "string") { - if (depth < npm.config.get("depth")) { + if (depth -1 <= npm.config.get("depth")) { // just missing var p = parent.link || parent.path var unmet = "UNMET DEPENDENCY" if (color) { unmet = "\033[31;40m" + unmet + "\033[0m" } - data = unmet + " " + d + " " + data + data = unmet + " " + d + "@" + data } else { data = d+"@"+ data } diff -Nru nodejs-0.10.28/deps/npm/lib/npm.js nodejs-0.10.29/deps/npm/lib/npm.js --- nodejs-0.10.28/deps/npm/lib/npm.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/lib/npm.js 2014-06-09 17:04:36.000000000 +0000 @@ -24,12 +24,8 @@ , abbrev = require("abbrev") , which = require("which") , semver = require("semver") - , findPrefix = require("./utils/find-prefix.js") - , getUid = require("uid-number") - , mkdirp = require("mkdirp") - , slide = require("slide") - , chain = slide.chain , RegClient = require("npm-registry-client") + , charSpin = require("char-spinner") npm.config = { loaded: false, @@ -41,23 +37,6 @@ } } -// /usr/local is often a read-only fs, which is not -// well handled by node or mkdirp. Just double-check -// in the case of errors when making the prefix dirs. -function mkdir (p, cb) { - mkdirp(p, function (er, made) { - // it could be that we couldn't create it, because it - // already exists, and is on a read-only fs. - if (er) { - return fs.stat(p, function (er2, st) { - if (er2 || !st.isDirectory()) return cb(er) - return cb(null, made) - }) - } - return cb(er, made) - }) -} - npm.commands = {} try { @@ -182,6 +161,22 @@ }) , abbrevs = abbrev(fullList) +npm.spinner = + { int: null + , start: function () { + if (npm.spinner.int) return + var c = npm.config.get("spin") + if (!c) return + var stream = npm.config.get("logstream") + var opt = { tty: c !== "always", stream: stream } + npm.spinner.int = charSpin(opt) + } + , stop: function () { + clearInterval(npm.spinner.int) + npm.spinner.int = null + } + } + Object.keys(abbrevs).concat(plumbing).forEach(function addCommand (c) { Object.defineProperty(npm.commands, c, { get : function () { if (!loaded) throw new Error( @@ -204,17 +199,22 @@ } if (args.length === 1) args.unshift([]) - npm.registry.refer = [a].concat(args[0]).map(function (arg) { - // exclude anything that might be a URL, path, or private module - // Those things will always have a slash in them somewhere - if (arg && arg.match && arg.match(/\/|\\/)) { - return "[REDACTED]" - } else { - return arg - } - }).filter(function (arg) { - return arg && arg.match - }).join(" ") + npm.spinner.start() + + npm.registry.version = npm.version + if (!npm.registry.refer) { + npm.registry.refer = [a].concat(args[0]).map(function (arg) { + // exclude anything that might be a URL, path, or private module + // Those things will always have a slash in them somewhere + if (arg && arg.match && arg.match(/\/|\\/)) { + return "[REDACTED]" + } else { + return arg + } + }).filter(function (arg) { + return arg && arg.match + }).join(" ") + } cmd.apply(npm, args) } @@ -348,118 +348,24 @@ // at this point the configs are all set. // go ahead and spin up the registry client. - var token = config.get("_token") - if (typeof token === "string") { - try { - token = JSON.parse(token) - config.set("_token", token, "user") - config.save("user") - } catch (e) { token = null } - } - npm.registry = new RegClient(npm.config) - // save the token cookie in the config file - if (npm.registry.couchLogin) { - npm.registry.couchLogin.tokenSet = function (tok) { - npm.config.set("_token", tok, "user") - // ignore save error. best effort. - npm.config.save("user") - } - } - var umask = npm.config.get("umask") npm.modes = { exec: 0777 & (~umask) , file: 0666 & (~umask) , umask: umask } - chain([ [ loadPrefix, npm, cli ] - , [ setUser, config, config.root ] - , [ loadUid, npm ] - ], cb) - }) - }) -} + var gp = Object.getOwnPropertyDescriptor(config, "globalPrefix") + Object.defineProperty(npm, "globalPrefix", gp) -function loadPrefix (npm, config, cb) { - // try to guess at a good node_modules location. - var p - , gp - if (!Object.prototype.hasOwnProperty.call(config, "prefix")) { - p = process.cwd() - } else { - p = npm.config.get("prefix") - } - gp = npm.config.get("prefix") + var lp = Object.getOwnPropertyDescriptor(config, "localPrefix") + Object.defineProperty(npm, "localPrefix", lp) - findPrefix(p, function (er, p) { - Object.defineProperty(npm, "localPrefix", - { get : function () { return p } - , set : function (r) { return p = r } - , enumerable : true - }) - // the prefix MUST exist, or else nothing works. - if (!npm.config.get("global")) { - mkdir(p, next) - } else { - next(er) - } - }) - - gp = path.resolve(gp) - Object.defineProperty(npm, "globalPrefix", - { get : function () { return gp } - , set : function (r) { return gp = r } - , enumerable : true - }) - // the prefix MUST exist, or else nothing works. - mkdir(gp, next) - - - var i = 2 - , errState = null - function next (er) { - if (errState) return - if (er) return cb(errState = er) - if (--i === 0) return cb() - } -} - - -function loadUid (npm, cb) { - // if we're not in unsafe-perm mode, then figure out who - // to run stuff as. Do this first, to support `npm update npm -g` - if (!npm.config.get("unsafe-perm")) { - getUid(npm.config.get("user"), npm.config.get("group"), cb) - } else { - process.nextTick(cb) - } -} - -function setUser (cl, dc, cb) { - // If global, leave it as-is. - // If not global, then set the user to the owner of the prefix folder. - // Just set the default, so it can be overridden. - if (cl.get("global")) return cb() - if (process.env.SUDO_UID) { - dc.user = +(process.env.SUDO_UID) - return cb() - } - - var prefix = path.resolve(cl.get("prefix")) - mkdir(prefix, function (er) { - if (er) { - log.error("could not create prefix dir", prefix) - return cb(er) - } - fs.stat(prefix, function (er, st) { - dc.user = st && st.uid - return cb(er) + return cb() }) }) } - Object.defineProperty(npm, "prefix", { get : function () { return npm.config.get("global") ? npm.globalPrefix : npm.localPrefix diff -Nru nodejs-0.10.28/deps/npm/lib/outdated.js nodejs-0.10.29/deps/npm/lib/outdated.js --- nodejs-0.10.28/deps/npm/lib/outdated.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/lib/outdated.js 2014-06-09 17:04:36.000000000 +0000 @@ -155,12 +155,33 @@ } var deps = null readJson(path.resolve(dir, "package.json"), function (er, d) { + d = d || {} if (er && er.code !== "ENOENT" && er.code !== "ENOTDIR") return cb(er) deps = (er) ? true : (d.dependencies || {}) + + if (npm.config.get("save-dev")) { + deps = d.devDependencies || {} + return next() + } + + if (npm.config.get("save")) { + // remove optional dependencies from dependencies during --save. + Object.keys(d.optionalDependencies || {}).forEach(function (k) { + delete deps[k] + }) + return next() + } + + if (npm.config.get("save-optional")) { + deps = d.optionalDependencies || {} + return next() + } + var doUpdate = npm.config.get("dev") || (!npm.config.get("production") && !Object.keys(parentHas).length && !npm.config.get("global")) + if (!er && d && doUpdate) { Object.keys(d.devDependencies || {}).forEach(function (k) { if (!(k in parentHas)) { @@ -273,7 +294,7 @@ } // We didn't find the version in the doc. See if cache can find it. - cache.add(dep, req, onCacheAdd) + cache.add(dep, req, false, onCacheAdd) function onCacheAdd(er, d) { // if this fails, then it means we can't update this thing. diff -Nru nodejs-0.10.28/deps/npm/lib/pack.js nodejs-0.10.29/deps/npm/lib/pack.js --- nodejs-0.10.28/deps/npm/lib/pack.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/lib/pack.js 2014-06-09 17:04:36.000000000 +0000 @@ -40,7 +40,7 @@ // add to cache, then cp to the cwd function pack_ (pkg, cb) { - cache.add(pkg, function (er, data) { + cache.add(pkg, null, false, function (er, data) { if (er) return cb(er) var fname = path.resolve(data._id.replace(/@/g, "-") + ".tgz") , cached = path.resolve( npm.cache diff -Nru nodejs-0.10.28/deps/npm/lib/publish.js nodejs-0.10.29/deps/npm/lib/publish.js --- nodejs-0.10.28/deps/npm/lib/publish.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/lib/publish.js 2014-06-09 17:04:36.000000000 +0000 @@ -49,7 +49,7 @@ // That means that we can run publish/postpublish in the dir, rather than // in the cache dir. function cacheAddPublish (dir, didPre, isRetry, cb) { - npm.commands.cache.add(dir, function (er, data) { + npm.commands.cache.add(dir, null, false, function (er, data) { if (er) return cb(er) log.silly("publish", data) var cachedir = path.resolve( npm.cache diff -Nru nodejs-0.10.28/deps/npm/lib/repo.js nodejs-0.10.29/deps/npm/lib/repo.js --- nodejs-0.10.28/deps/npm/lib/repo.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/lib/repo.js 2014-06-09 17:04:36.000000000 +0000 @@ -19,6 +19,7 @@ , path = require("path") , readJson = require("read-package-json") , fs = require("fs") + , url_ = require('url') function repo (args, cb) { var n = args.length && args[0].split("@").shift() || '.' @@ -40,7 +41,11 @@ // from https://github.com/npm/npm-www/issues/418 if (githubUserRepo(r.url)) r.url = githubUserRepo(r.url) - var url = github(r.url) + + var url = (r.url && ~r.url.indexOf('github')) + ? github(r.url) + : nonGithubUrl(r.url) + if (!url) return cb(new Error('no repository: could not get url')) opener(url, { command: npm.config.get("browser") }, cb) @@ -52,3 +57,19 @@ getUrlAndOpen(d, cb) }) } + +function nonGithubUrl (url) { + try { + var idx = url.indexOf('@') + if (idx !== -1) { + url = url.slice(idx+1).replace(/:([^\d]+)/, '/$1') + } + url = url_.parse(url) + var protocol = url.protocol === 'https:' + ? 'https:' + : 'http:' + return protocol + '//' + (url.host || '') + + url.path.replace(/\.git$/, '') + } + catch(e) {} +} diff -Nru nodejs-0.10.28/deps/npm/lib/run-script.js nodejs-0.10.29/deps/npm/lib/run-script.js --- nodejs-0.10.28/deps/npm/lib/run-script.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/lib/run-script.js 2014-06-09 17:04:36.000000000 +0000 @@ -70,7 +70,7 @@ } function runScript (args, cb) { - if (!args.length) return cb(runScript.usage) + if (!args.length) return list(cb) var pkgdir = args.length === 1 ? process.cwd() : path.resolve(npm.dir, args[0]) , cmd = args.pop() @@ -81,6 +81,36 @@ }) } +function list(cb) { + var json = path.join(npm.prefix, 'package.json') + return readJson(json, function(er, d) { + if (er && er.code !== 'ENOENT' && er.code !== 'ENOTDIR') return cb(er) + if (er) d = {} + var scripts = Object.keys(d.scripts || {}) + + if (log.level === "silent") { + return cb(null, scripts) + } + + if (npm.config.get("json")) { + console.log(JSON.stringify(d.scripts || {}, null, 2)) + return cb(null, scripts) + } + + var s = ":" + var prefix = "" + if (!npm.config.get("parseable")) { + s = "\n " + prefix = " " + console.log("Available scripts in the %s package:", d.name) + } + scripts.forEach(function(script) { + console.log(prefix + script + s + d.scripts[script]) + }) + return cb(null, scripts) + }) +} + function run (pkg, wd, cmd, cb) { var cmds = [] if (!pkg.scripts) pkg.scripts = {} diff -Nru nodejs-0.10.28/deps/npm/lib/submodule.js nodejs-0.10.29/deps/npm/lib/submodule.js --- nodejs-0.10.28/deps/npm/lib/submodule.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/lib/submodule.js 2014-06-09 17:04:36.000000000 +0000 @@ -23,7 +23,7 @@ if (args.length === 0) return cb(submodule.usage) asyncMap(args, function (arg, cb) { - cache.add(arg, cb) + cache.add(arg, null, false, cb) }, function (er, pkgs) { if (er) return cb(er) chain(pkgs.map(function (pkg) { return function (cb) { @@ -99,9 +99,9 @@ err.code = "ENOGIT" return cb(err) } - exec(git, args, function (er, stdout, stderr) { + exec(git, args, function (er, stdout) { if (er) return cb(er) - res = stdout.trim().split(/\n/).map(function (line) { + var res = stdout.trim().split(/\n/).map(function (line) { return line.trim().split(/\s+/)[1] }).filter(function (line) { // only care about submodules in the node_modules folder. diff -Nru nodejs-0.10.28/deps/npm/lib/utils/depr-check.js nodejs-0.10.29/deps/npm/lib/utils/depr-check.js --- nodejs-0.10.28/deps/npm/lib/utils/depr-check.js 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/lib/utils/depr-check.js 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,13 @@ +var log = require("npmlog") + +var deprecated = {} + , deprWarned = {} +module.exports = function deprCheck (data) { + if (deprecated[data._id]) data.deprecated = deprecated[data._id] + if (data.deprecated) deprecated[data._id] = data.deprecated + else return + if (!deprWarned[data._id]) { + deprWarned[data._id] = true + log.warn("deprecated", "%s: %s", data._id, data.deprecated) + } +} diff -Nru nodejs-0.10.28/deps/npm/lib/utils/error-handler.js nodejs-0.10.29/deps/npm/lib/utils/error-handler.js --- nodejs-0.10.28/deps/npm/lib/utils/error-handler.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/lib/utils/error-handler.js 2014-06-09 17:04:36.000000000 +0000 @@ -63,6 +63,7 @@ // if we're really exiting, then let it exit on its own, so that // in-process stuff can finish or clean up first. if (!doExit) process.emit("exit", code) + npm.spinner.stop() } } diff -Nru nodejs-0.10.28/deps/npm/lib/utils/fetch.js nodejs-0.10.29/deps/npm/lib/utils/fetch.js --- nodejs-0.10.28/deps/npm/lib/utils/fetch.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/lib/utils/fetch.js 2014-06-09 17:04:36.000000000 +0000 @@ -12,6 +12,7 @@ , chownr = require("chownr") , regHost , once = require("once") + , crypto = require("crypto") module.exports = fetch @@ -78,12 +79,24 @@ proxy = npm.config.get("proxy") } + var sessionToken = npm.registry.sessionToken + if (!sessionToken) { + sessionToken = crypto.randomBytes(8).toString("hex") + npm.registry.sessionToken = sessionToken + } + + var ca = remote.host === regHost ? npm.config.get("ca") : undefined var opts = { url: remote , proxy: proxy , strictSSL: npm.config.get("strict-ssl") , rejectUnauthorized: npm.config.get("strict-ssl") - , ca: remote.host === regHost ? npm.config.get("ca") : undefined - , headers: { "user-agent": npm.config.get("user-agent") }} + , ca: ca + , headers: + { "user-agent": npm.config.get("user-agent") + , "npm-session": sessionToken + , referer: npm.registry.refer + } + } var req = request(opts) req.on("error", function (er) { fstr.emit("error", er) diff -Nru nodejs-0.10.28/deps/npm/lib/utils/find-prefix.js nodejs-0.10.29/deps/npm/lib/utils/find-prefix.js --- nodejs-0.10.28/deps/npm/lib/utils/find-prefix.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/lib/utils/find-prefix.js 1970-01-01 00:00:00.000000000 +0000 @@ -1,57 +0,0 @@ -// try to find the most reasonable prefix to use - -module.exports = findPrefix - -var fs = require("graceful-fs") - , path = require("path") - , npm = require("../npm.js") - -function findPrefix (p, cb_) { - function cb (er, p) { - process.nextTick(function () { - cb_(er, p) - }) - } - - p = path.resolve(p) - // if there's no node_modules folder, then - // walk up until we hopefully find one. - // if none anywhere, then use cwd. - var walkedUp = false - while (path.basename(p) === "node_modules") { - p = path.dirname(p) - walkedUp = true - } - if (walkedUp) return cb(null, p) - - findPrefix_(p, p, cb) -} - -function findPrefix_ (p, original, cb) { - if (p === "/" - || (process.platform === "win32" && p.match(/^[a-zA-Z]:(\\|\/)?$/))) { - return cb(null, original) - } - fs.readdir(p, function (er, files) { - // an error right away is a bad sign. - // unless the prefix was simply a non - // existent directory. - if (er && p === original) { - if (er.code === "ENOENT") return cb(null, original); - return cb(er) - } - - // walked up too high or something. - if (er) return cb(null, original) - - if (files.indexOf("node_modules") !== -1 - || files.indexOf("package.json") !== -1) { - return cb(null, p) - } - - var d = path.dirname(p) - if (d === p) return cb(null, original) - - return findPrefix_(d, original, cb) - }) -} diff -Nru nodejs-0.10.28/deps/npm/lib/utils/lifecycle.js nodejs-0.10.29/deps/npm/lib/utils/lifecycle.js --- nodejs-0.10.28/deps/npm/lib/utils/lifecycle.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/lib/utils/lifecycle.js 2014-06-09 17:04:36.000000000 +0000 @@ -162,6 +162,9 @@ , group = unsafe ? null : npm.config.get("group") if (log.level !== 'silent') { + if (npm.spinner.int) { + npm.config.get("logstream").write("\r \r") + } console.log(note) } log.verbose("unsafe-perm in lifecycle", unsafe) diff -Nru nodejs-0.10.28/deps/npm/lib/utils/locker.js nodejs-0.10.29/deps/npm/lib/utils/locker.js --- nodejs-0.10.28/deps/npm/lib/utils/locker.js 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/lib/utils/locker.js 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,52 @@ +var crypto = require("crypto") +var path = require("path") + +var npm = require("../npm.js") +var lockFile = require("lockfile") +var log = require("npmlog") +var getCacheStat = require("../cache/get-stat.js") + +function lockFileName (u) { + var c = u.replace(/[^a-zA-Z0-9]+/g, "-").replace(/^-+|-+$/g, "") + , h = crypto.createHash("sha1").update(u).digest("hex") + h = h.substr(0, 8) + c = c.substr(-32) + log.silly("lockFile", h + "-" + c, u) + return path.resolve(npm.config.get("cache"), h + "-" + c + ".lock") +} + +var myLocks = {} +function lock (u, cb) { + // the cache dir needs to exist already for this. + getCacheStat(function (er, cs) { + if (er) return cb(er) + var opts = { stale: npm.config.get("cache-lock-stale") + , retries: npm.config.get("cache-lock-retries") + , wait: npm.config.get("cache-lock-wait") } + var lf = lockFileName(u) + log.verbose("lock", u, lf) + lockFile.lock(lf, opts, function(er) { + if (!er) myLocks[lf] = true + cb(er) + }) + }) +} + +function unlock (u, cb) { + var lf = lockFileName(u) + , locked = myLocks[lf] + if (locked === false) { + return process.nextTick(cb) + } else if (locked === true) { + myLocks[lf] = false + lockFile.unlock(lockFileName(u), cb) + } else { + throw new Error("Attempt to unlock " + u + ", which hasn't been locked") + } +} + +module.exports = { + lock: lock, + unlock: unlock, + _lockFileName: lockFileName +} diff -Nru nodejs-0.10.28/deps/npm/lib/utils/tar.js nodejs-0.10.29/deps/npm/lib/utils/tar.js --- nodejs-0.10.28/deps/npm/lib/utils/tar.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/lib/utils/tar.js 2014-06-09 17:04:36.000000000 +0000 @@ -8,7 +8,6 @@ , uidNumber = require("uid-number") , rm = require("./gently-rm.js") , readJson = require("read-package-json") - , cache = require("../cache.js") , myUid = process.getuid && process.getuid() , myGid = process.getgid && process.getgid() , tar = require("tar") @@ -16,13 +15,14 @@ , fstream = require("fstream") , Packer = require("fstream-npm") , lifecycle = require("./lifecycle.js") + , locker = require("./locker.js") function lock(path, cb) { - return cache.lock('tar://' + path, cb) + return locker.lock('tar://' + path, cb) } function unlock(path, cb) { - return cache.unlock('tar://' + path, cb) + return locker.unlock('tar://' + path, cb) } if (process.env.SUDO_UID && myUid === 0) { diff -Nru nodejs-0.10.28/deps/npm/lib/version.js nodejs-0.10.29/deps/npm/lib/version.js --- nodejs-0.10.28/deps/npm/lib/version.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/lib/version.js 2014-06-09 17:04:36.000000000 +0000 @@ -11,7 +11,7 @@ , which = require("which") , npm = require("./npm.js") -version.usage = "npm version [ | major | minor | patch]\n" +version.usage = "npm version [ | major | minor | patch | prerelease | preminor | premajor ]\n" + "\n(run in package dir)\n" + "'npm -v' or 'npm --version' to print npm version " + "("+npm.version+")\n" @@ -105,6 +105,11 @@ chain ( [ [ exec, git, [ "add", "package.json" ], {env: process.env} ] , [ exec, git, [ "commit", "-m", message ], {env: process.env} ] + , sign && function (cb) { + npm.spinner.stop() + cb() + } + , [ exec, git, [ "tag", "v" + data.version, flag, message ] , {env: process.env} ] ] , cb ) diff -Nru nodejs-0.10.28/deps/npm/lib/view.js nodejs-0.10.29/deps/npm/lib/view.js --- nodejs-0.10.28/deps/npm/lib/view.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/lib/view.js 2014-06-09 17:04:36.000000000 +0000 @@ -208,7 +208,7 @@ d = JSON.stringify(d) } if (f && showFields) f += " = " - if (d.indexOf("\n") !== -1) d = "\n" + d + if (d.indexOf("\n") !== -1) d = " \n" + d msg += (showVersions ? name + "@" + v + " " : "") + (showFields ? f : "") + d + "\n" }) diff -Nru nodejs-0.10.28/deps/npm/LICENSE nodejs-0.10.29/deps/npm/LICENSE --- nodejs-0.10.28/deps/npm/LICENSE 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/LICENSE 2014-06-09 17:04:36.000000000 +0000 @@ -214,9 +214,8 @@ -------- -"Node.js" and "node" trademark Joyent, Inc. npm is not officially -part of the Node.js project, and is neither owned by nor -officially affiliated with Joyent, Inc. +"Node.js" trademark Joyent, Inc. npm is not officially part of the Node.js +project, and is neither owned by nor affiliated with Joyent, Inc. Packages published in the npm registry (other than the Software and its included dependencies) are not part of npm itself, are the sole diff -Nru nodejs-0.10.28/deps/npm/Makefile nodejs-0.10.29/deps/npm/Makefile --- nodejs-0.10.28/deps/npm/Makefile 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/Makefile 2014-06-09 17:04:36.000000000 +0000 @@ -169,8 +169,7 @@ git push origin &&\ git push origin --tags &&\ npm publish &&\ - make doc-publish &&\ - make zip-publish + make doc-publish docpublish: doc-publish doc-publish: doc @@ -202,13 +201,10 @@ esac; \ done -zip-publish: release - scp release/* node@nodejs.org:dist/npm/ - release: @bash scripts/release.sh sandwich: @[ $$(whoami) = "root" ] && (echo "ok"; echo "ham" > sandwich) || (echo "make it yourself" && exit 13) -.PHONY: all latest install dev link doc clean uninstall test man doc-publish doc-clean docclean docpublish release zip-publish +.PHONY: all latest install dev link doc clean uninstall test man doc-publish doc-clean docclean docpublish release diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm.1 nodejs-0.10.29/deps/npm/man/man1/npm.1 --- nodejs-0.10.28/deps/npm/man/man1/npm.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM" "1" "May 2014" "" "" +.TH "NPM" "1" "June 2014" "" "" . .SH "NAME" \fBnpm\fR \-\- node package manager @@ -14,7 +14,7 @@ .fi . .SH "VERSION" -1.4.9 +1.4.14 . .SH "DESCRIPTION" npm is the package manager for the Node JavaScript platform\. It puts @@ -39,6 +39,20 @@ Use the \fBnpm search\fR command to show everything that\'s available\. Use \fBnpm ls\fR to show everything you\'ve installed\. . +.SH "DEPENDENCIES" +If a package references to another package with a git URL, npm depends +on a preinstalled git\. +. +.P +If one of the packages npm tries to install is a native node module and +requires compiling of C++ Code, npm will use node\-gyp \fIhttps://github\.com/TooTallNate/node\-gyp\fR for that task\. +For a Unix system, node\-gyp \fIhttps://github\.com/TooTallNate/node\-gyp\fR +needs Python, make and a buildchain like GCC\. On Windows, +Python and Microsoft Visual Studio C++ is needed\. Python 3 is +not supported by node\-gyp \fIhttps://github\.com/TooTallNate/node\-gyp\fR\|\. +For more information visit the node\-gyp repository \fIhttps://github\.com/TooTallNate/node\-gyp\fR and +the node\-gyp Wiki \fIhttps://github\.com/TooTallNate/node\-gyp/wiki\fR\|\. +. .SH "DIRECTORIES" npm help See \fBnpm\-folders\fR to learn about where npm puts stuff\. . diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-adduser.1 nodejs-0.10.29/deps/npm/man/man1/npm-adduser.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-adduser.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-adduser.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-ADDUSER" "1" "May 2014" "" "" +.TH "NPM\-ADDUSER" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-adduser\fR \-\- Add a registry user account diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-bin.1 nodejs-0.10.29/deps/npm/man/man1/npm-bin.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-bin.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-bin.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-BIN" "1" "May 2014" "" "" +.TH "NPM\-BIN" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-bin\fR \-\- Display npm bin folder diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-bugs.1 nodejs-0.10.29/deps/npm/man/man1/npm-bugs.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-bugs.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-bugs.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-BUGS" "1" "May 2014" "" "" +.TH "NPM\-BUGS" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-bugs\fR \-\- Bugs for a package in a web browser maybe diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-build.1 nodejs-0.10.29/deps/npm/man/man1/npm-build.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-build.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-build.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-BUILD" "1" "May 2014" "" "" +.TH "NPM\-BUILD" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-build\fR \-\- Build a package diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-bundle.1 nodejs-0.10.29/deps/npm/man/man1/npm-bundle.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-bundle.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-bundle.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-BUNDLE" "1" "May 2014" "" "" +.TH "NPM\-BUNDLE" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-bundle\fR \-\- REMOVED diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-cache.1 nodejs-0.10.29/deps/npm/man/man1/npm-cache.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-cache.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-cache.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-CACHE" "1" "May 2014" "" "" +.TH "NPM\-CACHE" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-cache\fR \-\- Manipulates packages cache @@ -46,12 +46,8 @@ stored in \fB{cache}/{name}/{version}\fR: . .IP "\(bu" 4 -\|\.\.\./package/: -A folder containing the package contents as they appear in the tarball\. -. -.IP "\(bu" 4 -\|\.\.\./package\.json: -The package\.json file, as npm sees it, with overlays applied and a _id attribute\. +\|\.\.\./package/package\.json: +The package\.json file, as npm sees it\. . .IP "\(bu" 4 \|\.\.\./package\.tgz: @@ -62,7 +58,7 @@ .P Additionally, whenever a registry request is made, a \fB\|\.cache\.json\fR file is placed at the corresponding URI, to store the ETag and the requested -data\. +data\. This is stored in \fB{cache}/{hostname}/{path}/\.cache\.json\fR\|\. . .P Commands that make non\-essential registry requests (such as \fBsearch\fR and \fBview\fR, or the completion scripts) generally specify a minimum timeout\. diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-completion.1 nodejs-0.10.29/deps/npm/man/man1/npm-completion.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-completion.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-completion.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-COMPLETION" "1" "May 2014" "" "" +.TH "NPM\-COMPLETION" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-completion\fR \-\- Tab Completion for npm diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-config.1 nodejs-0.10.29/deps/npm/man/man1/npm-config.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-config.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-config.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-CONFIG" "1" "May 2014" "" "" +.TH "NPM\-CONFIG" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-config\fR \-\- Manage the npm configuration files diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-dedupe.1 nodejs-0.10.29/deps/npm/man/man1/npm-dedupe.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-dedupe.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-dedupe.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-DEDUPE" "1" "May 2014" "" "" +.TH "NPM\-DEDUPE" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-dedupe\fR \-\- Reduce duplication diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-deprecate.1 nodejs-0.10.29/deps/npm/man/man1/npm-deprecate.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-deprecate.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-deprecate.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-DEPRECATE" "1" "May 2014" "" "" +.TH "NPM\-DEPRECATE" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-deprecate\fR \-\- Deprecate a version of a package diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-docs.1 nodejs-0.10.29/deps/npm/man/man1/npm-docs.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-docs.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-docs.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-DOCS" "1" "May 2014" "" "" +.TH "NPM\-DOCS" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-docs\fR \-\- Docs for a package in a web browser maybe diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-edit.1 nodejs-0.10.29/deps/npm/man/man1/npm-edit.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-edit.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-edit.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-EDIT" "1" "May 2014" "" "" +.TH "NPM\-EDIT" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-edit\fR \-\- Edit an installed package diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-explore.1 nodejs-0.10.29/deps/npm/man/man1/npm-explore.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-explore.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-explore.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-EXPLORE" "1" "May 2014" "" "" +.TH "NPM\-EXPLORE" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-explore\fR \-\- Browse an installed package diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-help.1 nodejs-0.10.29/deps/npm/man/man1/npm-help.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-help.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-help.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-HELP" "1" "May 2014" "" "" +.TH "NPM\-HELP" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-help\fR \-\- Get help on npm diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-help-search.1 nodejs-0.10.29/deps/npm/man/man1/npm-help-search.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-help-search.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-help-search.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-HELP\-SEARCH" "1" "May 2014" "" "" +.TH "NPM\-HELP\-SEARCH" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-help-search\fR \-\- Search npm help documentation diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-init.1 nodejs-0.10.29/deps/npm/man/man1/npm-init.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-init.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-init.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-INIT" "1" "May 2014" "" "" +.TH "NPM\-INIT" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-init\fR \-\- Interactively create a package\.json file diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-install.1 nodejs-0.10.29/deps/npm/man/man1/npm-install.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-install.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-install.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-INSTALL" "1" "May 2014" "" "" +.TH "NPM\-INSTALL" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-install\fR \-\- Install a package diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-link.1 nodejs-0.10.29/deps/npm/man/man1/npm-link.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-link.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-link.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-LINK" "1" "May 2014" "" "" +.TH "NPM\-LINK" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-link\fR \-\- Symlink a package folder diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-ls.1 nodejs-0.10.29/deps/npm/man/man1/npm-ls.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-ls.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-ls.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-LS" "1" "May 2014" "" "" +.TH "NPM\-LS" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-ls\fR \-\- List installed packages @@ -29,7 +29,7 @@ .IP "" 4 . .nf -npm@1.4.9 /path/to/npm +npm@1.4.14 /path/to/npm └─┬ init\-package\-json@0\.0\.4 └── promzard@0\.1\.5 . diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-outdated.1 nodejs-0.10.29/deps/npm/man/man1/npm-outdated.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-outdated.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-outdated.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-OUTDATED" "1" "May 2014" "" "" +.TH "NPM\-OUTDATED" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-outdated\fR \-\- Check for outdated packages diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-owner.1 nodejs-0.10.29/deps/npm/man/man1/npm-owner.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-owner.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-owner.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-OWNER" "1" "May 2014" "" "" +.TH "NPM\-OWNER" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-owner\fR \-\- Manage package owners diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-pack.1 nodejs-0.10.29/deps/npm/man/man1/npm-pack.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-pack.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-pack.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-PACK" "1" "May 2014" "" "" +.TH "NPM\-PACK" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-pack\fR \-\- Create a tarball from a package diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-prefix.1 nodejs-0.10.29/deps/npm/man/man1/npm-prefix.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-prefix.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-prefix.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-PREFIX" "1" "May 2014" "" "" +.TH "NPM\-PREFIX" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-prefix\fR \-\- Display prefix diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-prune.1 nodejs-0.10.29/deps/npm/man/man1/npm-prune.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-prune.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-prune.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-PRUNE" "1" "May 2014" "" "" +.TH "NPM\-PRUNE" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-prune\fR \-\- Remove extraneous packages diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-publish.1 nodejs-0.10.29/deps/npm/man/man1/npm-publish.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-publish.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-publish.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-PUBLISH" "1" "May 2014" "" "" +.TH "NPM\-PUBLISH" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-publish\fR \-\- Publish a package diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-README.1 nodejs-0.10.29/deps/npm/man/man1/npm-README.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-README.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-README.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM" "1" "May 2014" "" "" +.TH "NPM" "1" "June 2014" "" "" . .SH "NAME" \fBnpm\fR \-\- node package manager![Build Status \fIhttps://img\.shields\.io/travis/npm/npm/master\.svg)](https://travis\-ci\.org/npm/npm\fR diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-rebuild.1 nodejs-0.10.29/deps/npm/man/man1/npm-rebuild.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-rebuild.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-rebuild.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-REBUILD" "1" "May 2014" "" "" +.TH "NPM\-REBUILD" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-rebuild\fR \-\- Rebuild a package diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-repo.1 nodejs-0.10.29/deps/npm/man/man1/npm-repo.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-repo.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-repo.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-REPO" "1" "May 2014" "" "" +.TH "NPM\-REPO" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-repo\fR \-\- Open package repository page in the browser diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-restart.1 nodejs-0.10.29/deps/npm/man/man1/npm-restart.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-restart.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-restart.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-RESTART" "1" "May 2014" "" "" +.TH "NPM\-RESTART" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-restart\fR \-\- Start a package diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-rm.1 nodejs-0.10.29/deps/npm/man/man1/npm-rm.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-rm.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-rm.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-RM" "1" "May 2014" "" "" +.TH "NPM\-RM" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-rm\fR \-\- Remove a package diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-root.1 nodejs-0.10.29/deps/npm/man/man1/npm-root.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-root.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-root.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-ROOT" "1" "May 2014" "" "" +.TH "NPM\-ROOT" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-root\fR \-\- Display npm root diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-run-script.1 nodejs-0.10.29/deps/npm/man/man1/npm-run-script.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-run-script.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-run-script.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-RUN\-SCRIPT" "1" "May 2014" "" "" +.TH "NPM\-RUN\-SCRIPT" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-run-script\fR \-\- Run arbitrary package scripts @@ -9,14 +9,16 @@ .SH "SYNOPSIS" . .nf -npm run\-script [] +npm run\-script [] [command] +npm run [] [command] . .fi . .SH "DESCRIPTION" This runs an arbitrary command from a package\'s \fB"scripts"\fR object\. If no package name is provided, it will search for a \fBpackage\.json\fR -in the current folder and use its \fB"scripts"\fR object\. +in the current folder and use its \fB"scripts"\fR object\. If no \fB"command"\fR +is provided, it will list the available top level scripts\. . .P It is used by the test, start, restart, and stop commands, but can be diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-search.1 nodejs-0.10.29/deps/npm/man/man1/npm-search.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-search.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-search.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-SEARCH" "1" "May 2014" "" "" +.TH "NPM\-SEARCH" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-search\fR \-\- Search for packages diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-shrinkwrap.1 nodejs-0.10.29/deps/npm/man/man1/npm-shrinkwrap.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-shrinkwrap.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-shrinkwrap.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-SHRINKWRAP" "1" "May 2014" "" "" +.TH "NPM\-SHRINKWRAP" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-shrinkwrap\fR \-\- Lock down dependency versions diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-star.1 nodejs-0.10.29/deps/npm/man/man1/npm-star.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-star.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-star.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-STAR" "1" "May 2014" "" "" +.TH "NPM\-STAR" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-star\fR \-\- Mark your favorite packages diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-stars.1 nodejs-0.10.29/deps/npm/man/man1/npm-stars.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-stars.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-stars.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-STARS" "1" "May 2014" "" "" +.TH "NPM\-STARS" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-stars\fR \-\- View packages marked as favorites diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-start.1 nodejs-0.10.29/deps/npm/man/man1/npm-start.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-start.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-start.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-START" "1" "May 2014" "" "" +.TH "NPM\-START" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-start\fR \-\- Start a package diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-stop.1 nodejs-0.10.29/deps/npm/man/man1/npm-stop.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-stop.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-stop.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-STOP" "1" "May 2014" "" "" +.TH "NPM\-STOP" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-stop\fR \-\- Stop a package diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-submodule.1 nodejs-0.10.29/deps/npm/man/man1/npm-submodule.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-submodule.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-submodule.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-SUBMODULE" "1" "May 2014" "" "" +.TH "NPM\-SUBMODULE" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-submodule\fR \-\- Add a package as a git submodule diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-tag.1 nodejs-0.10.29/deps/npm/man/man1/npm-tag.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-tag.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-tag.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-TAG" "1" "May 2014" "" "" +.TH "NPM\-TAG" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-tag\fR \-\- Tag a published version diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-test.1 nodejs-0.10.29/deps/npm/man/man1/npm-test.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-test.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-test.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-TEST" "1" "May 2014" "" "" +.TH "NPM\-TEST" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-test\fR \-\- Test a package diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-uninstall.1 nodejs-0.10.29/deps/npm/man/man1/npm-uninstall.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-uninstall.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-uninstall.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-RM" "1" "May 2014" "" "" +.TH "NPM\-RM" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-rm\fR \-\- Remove a package diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-unpublish.1 nodejs-0.10.29/deps/npm/man/man1/npm-unpublish.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-unpublish.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-unpublish.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-UNPUBLISH" "1" "May 2014" "" "" +.TH "NPM\-UNPUBLISH" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-unpublish\fR \-\- Remove a package from the registry diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-update.1 nodejs-0.10.29/deps/npm/man/man1/npm-update.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-update.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-update.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-UPDATE" "1" "May 2014" "" "" +.TH "NPM\-UPDATE" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-update\fR \-\- Update a package diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-version.1 nodejs-0.10.29/deps/npm/man/man1/npm-version.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-version.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-version.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-VERSION" "1" "May 2014" "" "" +.TH "NPM\-VERSION" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-version\fR \-\- Bump a package version diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-view.1 nodejs-0.10.29/deps/npm/man/man1/npm-view.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-view.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-view.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-VIEW" "1" "May 2014" "" "" +.TH "NPM\-VIEW" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-view\fR \-\- View registry info diff -Nru nodejs-0.10.28/deps/npm/man/man1/npm-whoami.1 nodejs-0.10.29/deps/npm/man/man1/npm-whoami.1 --- nodejs-0.10.28/deps/npm/man/man1/npm-whoami.1 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man1/npm-whoami.1 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-WHOAMI" "1" "May 2014" "" "" +.TH "NPM\-WHOAMI" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-whoami\fR \-\- Display npm username diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm.3 nodejs-0.10.29/deps/npm/man/man3/npm.3 --- nodejs-0.10.28/deps/npm/man/man3/npm.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM" "3" "May 2014" "" "" +.TH "NPM" "3" "June 2014" "" "" . .SH "NAME" \fBnpm\fR \-\- node package manager @@ -21,7 +21,7 @@ .fi . .SH "VERSION" -1.4.9 +1.4.14 . .SH "DESCRIPTION" This is the API documentation for npm\. diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-bin.3 nodejs-0.10.29/deps/npm/man/man3/npm-bin.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-bin.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-bin.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-BIN" "3" "May 2014" "" "" +.TH "NPM\-BIN" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-bin\fR \-\- Display npm bin folder diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-bugs.3 nodejs-0.10.29/deps/npm/man/man3/npm-bugs.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-bugs.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-bugs.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-BUGS" "3" "May 2014" "" "" +.TH "NPM\-BUGS" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-bugs\fR \-\- Bugs for a package in a web browser maybe diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-cache.3 nodejs-0.10.29/deps/npm/man/man3/npm-cache.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-cache.3 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-cache.3 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,40 @@ +.\" Generated with Ronnjs 0.3.8 +.\" http://github.com/kapouer/ronnjs/ +. +.TH "NPM\-CACHE" "3" "June 2014" "" "" +. +.SH "NAME" +\fBnpm-cache\fR \-\- manage the npm cache programmatically +. +.SH "SYNOPSIS" +. +.nf +npm\.commands\.cache([args], callback) +// helpers +npm\.commands\.cache\.clean([args], callback) +npm\.commands\.cache\.add([args], callback) +npm\.commands\.cache\.read(name, version, forceBypass, callback) +. +.fi +. +.SH "DESCRIPTION" +npm help This acts much the same ways as the npm\-cache command line +functionality\. +. +.P +The callback is called with the package\.json data of the thing that is +eventually added to or read from the cache\. +. +.P +The top level \fBnpm\.commands\.cache(\.\.\.)\fR functionality is a public +interface, and like all commands on the \fBnpm\.commands\fR object, it will +match the command line behavior exactly\. +. +.P +However, the cache folder structure and the cache helper functions are +considered \fBinternal\fR API surface, and as such, may change in future +releases of npm, potentially without warning or significant version +incrementation\. +. +.P +Use at your own risk\. diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-commands.3 nodejs-0.10.29/deps/npm/man/man3/npm-commands.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-commands.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-commands.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-COMMANDS" "3" "May 2014" "" "" +.TH "NPM\-COMMANDS" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-commands\fR \-\- npm commands diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-config.3 nodejs-0.10.29/deps/npm/man/man3/npm-config.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-config.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-config.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-CONFIG" "3" "May 2014" "" "" +.TH "NPM\-CONFIG" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-config\fR \-\- Manage the npm configuration files diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-deprecate.3 nodejs-0.10.29/deps/npm/man/man3/npm-deprecate.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-deprecate.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-deprecate.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-DEPRECATE" "3" "May 2014" "" "" +.TH "NPM\-DEPRECATE" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-deprecate\fR \-\- Deprecate a version of a package diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-docs.3 nodejs-0.10.29/deps/npm/man/man3/npm-docs.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-docs.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-docs.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-DOCS" "3" "May 2014" "" "" +.TH "NPM\-DOCS" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-docs\fR \-\- Docs for a package in a web browser maybe diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-edit.3 nodejs-0.10.29/deps/npm/man/man3/npm-edit.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-edit.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-edit.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-EDIT" "3" "May 2014" "" "" +.TH "NPM\-EDIT" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-edit\fR \-\- Edit an installed package diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-explore.3 nodejs-0.10.29/deps/npm/man/man3/npm-explore.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-explore.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-explore.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-EXPLORE" "3" "May 2014" "" "" +.TH "NPM\-EXPLORE" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-explore\fR \-\- Browse an installed package diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-help-search.3 nodejs-0.10.29/deps/npm/man/man3/npm-help-search.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-help-search.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-help-search.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-HELP\-SEARCH" "3" "May 2014" "" "" +.TH "NPM\-HELP\-SEARCH" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-help-search\fR \-\- Search the help pages diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-init.3 nodejs-0.10.29/deps/npm/man/man3/npm-init.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-init.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-init.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "INIT" "3" "May 2014" "" "" +.TH "INIT" "3" "June 2014" "" "" . .SH "NAME" \fBinit\fR \-\- Interactively create a package\.json file diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-install.3 nodejs-0.10.29/deps/npm/man/man3/npm-install.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-install.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-install.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-INSTALL" "3" "May 2014" "" "" +.TH "NPM\-INSTALL" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-install\fR \-\- install a package programmatically diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-link.3 nodejs-0.10.29/deps/npm/man/man3/npm-link.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-link.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-link.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-LINK" "3" "May 2014" "" "" +.TH "NPM\-LINK" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-link\fR \-\- Symlink a package folder diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-load.3 nodejs-0.10.29/deps/npm/man/man3/npm-load.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-load.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-load.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-LOAD" "3" "May 2014" "" "" +.TH "NPM\-LOAD" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-load\fR \-\- Load config settings diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-ls.3 nodejs-0.10.29/deps/npm/man/man3/npm-ls.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-ls.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-ls.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-LS" "3" "May 2014" "" "" +.TH "NPM\-LS" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-ls\fR \-\- List installed packages diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-outdated.3 nodejs-0.10.29/deps/npm/man/man3/npm-outdated.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-outdated.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-outdated.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-OUTDATED" "3" "May 2014" "" "" +.TH "NPM\-OUTDATED" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-outdated\fR \-\- Check for outdated packages diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-owner.3 nodejs-0.10.29/deps/npm/man/man3/npm-owner.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-owner.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-owner.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-OWNER" "3" "May 2014" "" "" +.TH "NPM\-OWNER" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-owner\fR \-\- Manage package owners diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-pack.3 nodejs-0.10.29/deps/npm/man/man3/npm-pack.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-pack.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-pack.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-PACK" "3" "May 2014" "" "" +.TH "NPM\-PACK" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-pack\fR \-\- Create a tarball from a package diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-prefix.3 nodejs-0.10.29/deps/npm/man/man3/npm-prefix.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-prefix.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-prefix.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-PREFIX" "3" "May 2014" "" "" +.TH "NPM\-PREFIX" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-prefix\fR \-\- Display prefix diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-prune.3 nodejs-0.10.29/deps/npm/man/man3/npm-prune.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-prune.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-prune.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-PRUNE" "3" "May 2014" "" "" +.TH "NPM\-PRUNE" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-prune\fR \-\- Remove extraneous packages diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-publish.3 nodejs-0.10.29/deps/npm/man/man3/npm-publish.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-publish.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-publish.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-PUBLISH" "3" "May 2014" "" "" +.TH "NPM\-PUBLISH" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-publish\fR \-\- Publish a package diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-rebuild.3 nodejs-0.10.29/deps/npm/man/man3/npm-rebuild.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-rebuild.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-rebuild.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-REBUILD" "3" "May 2014" "" "" +.TH "NPM\-REBUILD" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-rebuild\fR \-\- Rebuild a package diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-repo.3 nodejs-0.10.29/deps/npm/man/man3/npm-repo.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-repo.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-repo.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-REPO" "3" "May 2014" "" "" +.TH "NPM\-REPO" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-repo\fR \-\- Open package repository page in the browser diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-restart.3 nodejs-0.10.29/deps/npm/man/man3/npm-restart.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-restart.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-restart.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-RESTART" "3" "May 2014" "" "" +.TH "NPM\-RESTART" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-restart\fR \-\- Start a package diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-root.3 nodejs-0.10.29/deps/npm/man/man3/npm-root.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-root.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-root.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-ROOT" "3" "May 2014" "" "" +.TH "NPM\-ROOT" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-root\fR \-\- Display npm root diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-run-script.3 nodejs-0.10.29/deps/npm/man/man3/npm-run-script.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-run-script.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-run-script.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-RUN\-SCRIPT" "3" "May 2014" "" "" +.TH "NPM\-RUN\-SCRIPT" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-run-script\fR \-\- Run arbitrary package scripts diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-search.3 nodejs-0.10.29/deps/npm/man/man3/npm-search.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-search.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-search.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-SEARCH" "3" "May 2014" "" "" +.TH "NPM\-SEARCH" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-search\fR \-\- Search for packages diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-shrinkwrap.3 nodejs-0.10.29/deps/npm/man/man3/npm-shrinkwrap.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-shrinkwrap.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-shrinkwrap.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-SHRINKWRAP" "3" "May 2014" "" "" +.TH "NPM\-SHRINKWRAP" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-shrinkwrap\fR \-\- programmatically generate package shrinkwrap file diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-start.3 nodejs-0.10.29/deps/npm/man/man3/npm-start.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-start.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-start.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-START" "3" "May 2014" "" "" +.TH "NPM\-START" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-start\fR \-\- Start a package diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-stop.3 nodejs-0.10.29/deps/npm/man/man3/npm-stop.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-stop.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-stop.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-STOP" "3" "May 2014" "" "" +.TH "NPM\-STOP" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-stop\fR \-\- Stop a package diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-submodule.3 nodejs-0.10.29/deps/npm/man/man3/npm-submodule.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-submodule.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-submodule.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-SUBMODULE" "3" "May 2014" "" "" +.TH "NPM\-SUBMODULE" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-submodule\fR \-\- Add a package as a git submodule diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-tag.3 nodejs-0.10.29/deps/npm/man/man3/npm-tag.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-tag.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-tag.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-TAG" "3" "May 2014" "" "" +.TH "NPM\-TAG" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-tag\fR \-\- Tag a published version diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-test.3 nodejs-0.10.29/deps/npm/man/man3/npm-test.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-test.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-test.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-TEST" "3" "May 2014" "" "" +.TH "NPM\-TEST" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-test\fR \-\- Test a package diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-uninstall.3 nodejs-0.10.29/deps/npm/man/man3/npm-uninstall.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-uninstall.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-uninstall.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-UNINSTALL" "3" "May 2014" "" "" +.TH "NPM\-UNINSTALL" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-uninstall\fR \-\- uninstall a package programmatically diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-unpublish.3 nodejs-0.10.29/deps/npm/man/man3/npm-unpublish.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-unpublish.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-unpublish.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-UNPUBLISH" "3" "May 2014" "" "" +.TH "NPM\-UNPUBLISH" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-unpublish\fR \-\- Remove a package from the registry diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-update.3 nodejs-0.10.29/deps/npm/man/man3/npm-update.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-update.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-update.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-UPDATE" "3" "May 2014" "" "" +.TH "NPM\-UPDATE" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-update\fR \-\- Update a package diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-version.3 nodejs-0.10.29/deps/npm/man/man3/npm-version.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-version.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-version.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-VERSION" "3" "May 2014" "" "" +.TH "NPM\-VERSION" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-version\fR \-\- Bump a package version diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-view.3 nodejs-0.10.29/deps/npm/man/man3/npm-view.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-view.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-view.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-VIEW" "3" "May 2014" "" "" +.TH "NPM\-VIEW" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-view\fR \-\- View registry info diff -Nru nodejs-0.10.28/deps/npm/man/man3/npm-whoami.3 nodejs-0.10.29/deps/npm/man/man3/npm-whoami.3 --- nodejs-0.10.28/deps/npm/man/man3/npm-whoami.3 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man3/npm-whoami.3 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-WHOAMI" "3" "May 2014" "" "" +.TH "NPM\-WHOAMI" "3" "June 2014" "" "" . .SH "NAME" \fBnpm-whoami\fR \-\- Display npm username diff -Nru nodejs-0.10.28/deps/npm/man/man5/npm-folders.5 nodejs-0.10.29/deps/npm/man/man5/npm-folders.5 --- nodejs-0.10.28/deps/npm/man/man5/npm-folders.5 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man5/npm-folders.5 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-FOLDERS" "5" "May 2014" "" "" +.TH "NPM\-FOLDERS" "5" "June 2014" "" "" . .SH "NAME" \fBnpm-folders\fR \-\- Folder Structures Used by npm diff -Nru nodejs-0.10.28/deps/npm/man/man5/npm-global.5 nodejs-0.10.29/deps/npm/man/man5/npm-global.5 --- nodejs-0.10.28/deps/npm/man/man5/npm-global.5 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man5/npm-global.5 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-FOLDERS" "5" "May 2014" "" "" +.TH "NPM\-FOLDERS" "5" "June 2014" "" "" . .SH "NAME" \fBnpm-folders\fR \-\- Folder Structures Used by npm diff -Nru nodejs-0.10.28/deps/npm/man/man5/npm-json.5 nodejs-0.10.29/deps/npm/man/man5/npm-json.5 --- nodejs-0.10.28/deps/npm/man/man5/npm-json.5 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man5/npm-json.5 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "PACKAGE\.JSON" "5" "May 2014" "" "" +.TH "PACKAGE\.JSON" "5" "June 2014" "" "" . .SH "NAME" \fBpackage.json\fR \-\- Specifics of npm\'s package\.json handling diff -Nru nodejs-0.10.28/deps/npm/man/man5/npmrc.5 nodejs-0.10.29/deps/npm/man/man5/npmrc.5 --- nodejs-0.10.28/deps/npm/man/man5/npmrc.5 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man5/npmrc.5 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPMRC" "5" "May 2014" "" "" +.TH "NPMRC" "5" "June 2014" "" "" . .SH "NAME" \fBnpmrc\fR \-\- The npm config files @@ -18,7 +18,10 @@ npm help For a list of available configuration options, see npm\-config\. . .SH "FILES" -The three relevant files are: +The four relevant files are: +. +.IP "\(bu" 4 +per\-project config file (/path/to/my/project/\.npmrc) . .IP "\(bu" 4 per\-user config file (~/\.npmrc) @@ -49,6 +52,17 @@ priority order\. For example, a setting in the userconfig file would override the setting in the globalconfig file\. . +.SS "Per\-project config file" +When working locally in a project, a \fB\|\.npmrc\fR file in the root of the +project (ie, a sibling of \fBnode_modules\fR and \fBpackage\.json\fR) will set +config values specific to this project\. +. +.P +Note that this only applies to the root of the project that you\'re +running npm in\. It has no effect when your module is published\. For +example, you can\'t publish a module that forces itself to install +globally, or in a different location\. +. .SS "Per\-user config file" \fB$HOME/\.npmrc\fR (or the \fBuserconfig\fR param, if set in the environment or on the command line) diff -Nru nodejs-0.10.28/deps/npm/man/man5/package.json.5 nodejs-0.10.29/deps/npm/man/man5/package.json.5 --- nodejs-0.10.28/deps/npm/man/man5/package.json.5 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man5/package.json.5 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "PACKAGE\.JSON" "5" "May 2014" "" "" +.TH "PACKAGE\.JSON" "5" "June 2014" "" "" . .SH "NAME" \fBpackage.json\fR \-\- Specifics of npm\'s package\.json handling diff -Nru nodejs-0.10.28/deps/npm/man/man7/npm-coding-style.7 nodejs-0.10.29/deps/npm/man/man7/npm-coding-style.7 --- nodejs-0.10.28/deps/npm/man/man7/npm-coding-style.7 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man7/npm-coding-style.7 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-CODING\-STYLE" "7" "May 2014" "" "" +.TH "NPM\-CODING\-STYLE" "7" "June 2014" "" "" . .SH "NAME" \fBnpm-coding-style\fR \-\- npm\'s "funny" coding style diff -Nru nodejs-0.10.28/deps/npm/man/man7/npm-config.7 nodejs-0.10.29/deps/npm/man/man7/npm-config.7 --- nodejs-0.10.28/deps/npm/man/man7/npm-config.7 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man7/npm-config.7 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-CONFIG" "7" "May 2014" "" "" +.TH "NPM\-CONFIG" "7" "June 2014" "" "" . .SH "NAME" \fBnpm-config\fR \-\- More than you probably want to know about npm configuration @@ -24,7 +24,10 @@ same\. . .SS "npmrc Files" -The three relevant files are: +The four relevant files are: +. +.IP "\(bu" 4 +per\-project config file (/path/to/my/project/\.npmrc) . .IP "\(bu" 4 per\-user config file (~/\.npmrc) @@ -1248,6 +1251,24 @@ Note that git requires you to have set up GPG keys in your git configs for this to work properly\. . +.SS "spin" +. +.IP "\(bu" 4 +Default: true +. +.IP "\(bu" 4 +Type: Boolean or \fB"always"\fR +. +.IP "" 0 +. +.P +When set to \fBtrue\fR, npm will display an ascii spinner while it is doing +things, if \fBprocess\.stderr\fR is a TTY\. +. +.P +Set to \fBfalse\fR to suppress the spinner, or set to \fBalways\fR to output +the spinner even for non\-TTY outputs\. +. .SS "strict\-ssl" . .IP "\(bu" 4 diff -Nru nodejs-0.10.28/deps/npm/man/man7/npm-developers.7 nodejs-0.10.29/deps/npm/man/man7/npm-developers.7 --- nodejs-0.10.28/deps/npm/man/man7/npm-developers.7 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man7/npm-developers.7 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-DEVELOPERS" "7" "May 2014" "" "" +.TH "NPM\-DEVELOPERS" "7" "June 2014" "" "" . .SH "NAME" \fBnpm-developers\fR \-\- Developer Guide diff -Nru nodejs-0.10.28/deps/npm/man/man7/npm-disputes.7 nodejs-0.10.29/deps/npm/man/man7/npm-disputes.7 --- nodejs-0.10.28/deps/npm/man/man7/npm-disputes.7 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man7/npm-disputes.7 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-DISPUTES" "7" "May 2014" "" "" +.TH "NPM\-DISPUTES" "7" "June 2014" "" "" . .SH "NAME" \fBnpm-disputes\fR \-\- Handling Module Name Disputes diff -Nru nodejs-0.10.28/deps/npm/man/man7/npm-faq.7 nodejs-0.10.29/deps/npm/man/man7/npm-faq.7 --- nodejs-0.10.28/deps/npm/man/man7/npm-faq.7 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man7/npm-faq.7 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-FAQ" "7" "May 2014" "" "" +.TH "NPM\-FAQ" "7" "June 2014" "" "" . .SH "NAME" \fBnpm-faq\fR \-\- Frequently Asked Questions @@ -340,7 +340,7 @@ configuration settings, so this would be rather difficult to do properly\. It would have to track every previous value for this config, and always accept any of them, or else yesterday\'s install may -be broken tomorrow\. Complexity hurdle #5\. +be broken tomorrow\. Complexity hurdle #4\. . .P Never going to happen\. The folder is named \fBnode_modules\fR\|\. It is @@ -436,7 +436,7 @@ .P The npm open source project, The npm Registry, and the community website \fIhttps://www\.npmjs\.org\fR are maintained and operated by the -good folks at npm, Inc\. \fIhttps://www\.npmjs\.com\fR +good folks at npm, Inc\. \fIhttp://www\.npmjs\.com\fR . .SH "I have a question or request not addressed here\. Where should I put it?" Post an issue on the github project: diff -Nru nodejs-0.10.28/deps/npm/man/man7/npm-index.7 nodejs-0.10.29/deps/npm/man/man7/npm-index.7 --- nodejs-0.10.28/deps/npm/man/man7/npm-index.7 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man7/npm-index.7 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-INDEX" "7" "May 2014" "" "" +.TH "NPM\-INDEX" "7" "June 2014" "" "" . .SH "NAME" \fBnpm-index\fR \-\- Index of all npm documentation @@ -159,6 +159,9 @@ npm apihelp .SH "npm\-bugs" Bugs for a package in a web browser maybe . +npm apihelp .SH "npm\-cache" +manage the npm cache programmatically +. npm apihelp .SH "npm\-commands" npm commands . diff -Nru nodejs-0.10.28/deps/npm/man/man7/npm-registry.7 nodejs-0.10.29/deps/npm/man/man7/npm-registry.7 --- nodejs-0.10.28/deps/npm/man/man7/npm-registry.7 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man7/npm-registry.7 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-REGISTRY" "7" "May 2014" "" "" +.TH "NPM\-REGISTRY" "7" "June 2014" "" "" . .SH "NAME" \fBnpm-registry\fR \-\- The JavaScript Package Registry diff -Nru nodejs-0.10.28/deps/npm/man/man7/npm-scripts.7 nodejs-0.10.29/deps/npm/man/man7/npm-scripts.7 --- nodejs-0.10.28/deps/npm/man/man7/npm-scripts.7 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man7/npm-scripts.7 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-SCRIPTS" "7" "May 2014" "" "" +.TH "NPM\-SCRIPTS" "7" "June 2014" "" "" . .SH "NAME" \fBnpm-scripts\fR \-\- How npm handles the "scripts" field @@ -63,7 +63,7 @@ .IP "" 0 . .P -Additionally, arbitrary scripts can be run by doing \fBnpm run\-script \fR\|\. +Additionally, arbitrary scripts can be run by doing \fBnpm run\-script \fR\|\. . .SH "NOTE: INSTALL SCRIPTS ARE AN ANTIPATTERN" \fBtl;dr\fR Don\'t use \fBinstall\fR\|\. Use a \fB\|\.gyp\fR file for compilation, and \fBprepublish\fR for anything else\. diff -Nru nodejs-0.10.28/deps/npm/man/man7/removing-npm.7 nodejs-0.10.29/deps/npm/man/man7/removing-npm.7 --- nodejs-0.10.28/deps/npm/man/man7/removing-npm.7 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man7/removing-npm.7 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-REMOVAL" "1" "May 2014" "" "" +.TH "NPM\-REMOVAL" "1" "June 2014" "" "" . .SH "NAME" \fBnpm-removal\fR \-\- Cleaning the Slate diff -Nru nodejs-0.10.28/deps/npm/man/man7/semver.7 nodejs-0.10.29/deps/npm/man/man7/semver.7 --- nodejs-0.10.28/deps/npm/man/man7/semver.7 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/man/man7/semver.7 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "SEMVER" "7" "May 2014" "" "" +.TH "SEMVER" "7" "June 2014" "" "" . .SH "NAME" \fBsemver\fR \-\- The semantic versioner for npm @@ -43,7 +43,7 @@ .IP "" 0 . .SH "Versions" -A "version" is described by the v2\.0\.0 specification found at \fIhttp://semver\.org/\fR\|\. +A "version" is described by the \fBv2\.0\.0\fR specification found at \fIhttp://semver\.org/\fR\|\. . .P A leading \fB"="\fR or \fB"v"\fR character is stripped off and ignored\. @@ -52,9 +52,10 @@ The following range styles are supported: . .IP "\(bu" 4 -\fB1\.2\.3\fR A specific version\. When nothing else will do\. Note that -build metadata is still ignored, so \fB1\.2\.3+build2012\fR will satisfy -this range\. +\fB1\.2\.3\fR A specific version\. When nothing else will do\. Must be a full +version number, with major, minor, and patch versions specified\. +Note that build metadata is still ignored, so \fB1\.2\.3+build2012\fR will +satisfy this range\. . .IP "\(bu" 4 \fB>1\.2\.3\fR Greater than a specific version\. @@ -77,44 +78,65 @@ \fB1\.2\.3 \- 2\.3\.4\fR := \fB>=1\.2\.3 <=2\.3\.4\fR . .IP "\(bu" 4 -\fB~1\.2\.3\fR := \fB>=1\.2\.3\-0 <1\.3\.0\-0\fR "Reasonably close to 1\.2\.3"\. When +\fB~1\.2\.3\fR := \fB>=1\.2\.3\-0 <1\.3\.0\-0\fR "Reasonably close to \fB1\.2\.3\fR"\. When using tilde operators, prerelease versions are supported as well, but a prerelease of the next significant digit will NOT be satisfactory, so \fB1\.3\.0\-beta\fR will not satisfy \fB~1\.2\.3\fR\|\. . .IP "\(bu" 4 -\fB^1\.2\.3\fR := \fB>=1\.2\.3\-0 <2\.0\.0\-0\fR "Compatible with 1\.2\.3"\. When +\fB^1\.2\.3\fR := \fB>=1\.2\.3\-0 <2\.0\.0\-0\fR "Compatible with \fB1\.2\.3\fR"\. When using caret operators, anything from the specified version (including prerelease) will be supported up to, but not including, the next major version (or its prereleases)\. \fB1\.5\.1\fR will satisfy \fB^1\.2\.3\fR, while \fB1\.2\.2\fR and \fB2\.0\.0\-beta\fR will not\. . .IP "\(bu" 4 -\fB^0\.1\.3\fR := \fB>=0\.1\.3\-0 <0\.2\.0\-0\fR "Compatible with 0\.1\.3"\. 0\.x\.x versions are +\fB^0\.1\.3\fR := \fB>=0\.1\.3\-0 <0\.2\.0\-0\fR "Compatible with \fB0\.1\.3\fR"\. \fB0\.x\.x\fR versions are special: the first non\-zero component indicates potentially breaking changes, meaning the caret operator matches any version with the same first non\-zero component starting at the specified version\. . .IP "\(bu" 4 -\fB^0\.0\.2\fR := \fB=0\.0\.2\fR "Only the version 0\.0\.2 is considered compatible" +\fB^0\.0\.2\fR := \fB=0\.0\.2\fR "Only the version \fB0\.0\.2\fR is considered compatible" . .IP "\(bu" 4 -\fB~1\.2\fR := \fB>=1\.2\.0\-0 <1\.3\.0\-0\fR "Any version starting with 1\.2" +\fB~1\.2\fR := \fB>=1\.2\.0\-0 <1\.3\.0\-0\fR "Any version starting with \fB1\.2\fR" . .IP "\(bu" 4 -\fB^1\.2\fR := \fB>=1\.2\.0\-0 <2\.0\.0\-0\fR "Any version compatible with 1\.2" +\fB^1\.2\fR := \fB>=1\.2\.0\-0 <2\.0\.0\-0\fR "Any version compatible with \fB1\.2\fR" . .IP "\(bu" 4 -\fB1\.2\.x\fR := \fB>=1\.2\.0\-0 <1\.3\.0\-0\fR "Any version starting with 1\.2" +\fB1\.2\.x\fR := \fB>=1\.2\.0\-0 <1\.3\.0\-0\fR "Any version starting with \fB1\.2\fR" . .IP "\(bu" 4 -\fB~1\fR := \fB>=1\.0\.0\-0 <2\.0\.0\-0\fR "Any version starting with 1" +\fB1\.2\.*\fR Same as \fB1\.2\.x\fR\|\. . .IP "\(bu" 4 -\fB^1\fR := \fB>=1\.0\.0\-0 <2\.0\.0\-0\fR "Any version compatible with 1" +\fB1\.2\fR Same as \fB1\.2\.x\fR\|\. . .IP "\(bu" 4 -\fB1\.x\fR := \fB>=1\.0\.0\-0 <2\.0\.0\-0\fR "Any version starting with 1" +\fB~1\fR := \fB>=1\.0\.0\-0 <2\.0\.0\-0\fR "Any version starting with \fB1\fR" +. +.IP "\(bu" 4 +\fB^1\fR := \fB>=1\.0\.0\-0 <2\.0\.0\-0\fR "Any version compatible with \fB1\fR" +. +.IP "\(bu" 4 +\fB1\.x\fR := \fB>=1\.0\.0\-0 <2\.0\.0\-0\fR "Any version starting with \fB1\fR" +. +.IP "\(bu" 4 +\fB1\.*\fR Same as \fB1\.x\fR\|\. +. +.IP "\(bu" 4 +\fB1\fR Same as \fB1\.x\fR\|\. +. +.IP "\(bu" 4 +\fB*\fR Any version whatsoever\. +. +.IP "\(bu" 4 +\fBx\fR Same as \fB*\fR\|\. +. +.IP "\(bu" 4 +\fB""\fR (just an empty string) Same as \fB*\fR\|\. . .IP "" 0 . @@ -131,75 +153,86 @@ strings that they parse\. . .IP "\(bu" 4 -valid(v): Return the parsed version, or null if it\'s not valid\. +\fBvalid(v)\fR: Return the parsed version, or null if it\'s not valid\. +. +.IP "\(bu" 4 +\fBinc(v, release)\fR\fBmajor\fR\fBpremajor\fR\fBminor\fR\fBpreminor\fR\fBpatch\fR\fBprepatch\fR\fBprerelease\fR +. +.IP "\(bu" 4 +\fBpremajor\fR in one call will bump the version up to the next major +version and down to a prerelease of that major version\. \fBpreminor\fR, and \fBprepatch\fR work the same way\. . .IP "\(bu" 4 -inc(v, release): Return the version incremented by the release type -(major, minor, patch, or prerelease), or null if it\'s not valid\. +If called from a non\-prerelease version, the \fBprerelease\fR will work the +same as \fBprepatch\fR\|\. It increments the patch version, then makes a +prerelease\. If the input version is already a prerelease it simply +increments it\. +. +.IP "" 0 + . .IP "" 0 . .SS "Comparison" . .IP "\(bu" 4 -gt(v1, v2): \fBv1 > v2\fR +\fBgt(v1, v2)\fR: \fBv1 > v2\fR . .IP "\(bu" 4 -gte(v1, v2): \fBv1 >= v2\fR +\fBgte(v1, v2)\fR: \fBv1 >= v2\fR . .IP "\(bu" 4 -lt(v1, v2): \fBv1 < v2\fR +\fBlt(v1, v2)\fR: \fBv1 < v2\fR . .IP "\(bu" 4 -lte(v1, v2): \fBv1 <= v2\fR +\fBlte(v1, v2)\fR: \fBv1 <= v2\fR . .IP "\(bu" 4 -eq(v1, v2): \fBv1 == v2\fR This is true if they\'re logically equivalent, +\fBeq(v1, v2)\fR: \fBv1 == v2\fR This is true if they\'re logically equivalent, even if they\'re not the exact same string\. You already know how to compare strings\. . .IP "\(bu" 4 -neq(v1, v2): \fBv1 != v2\fR The opposite of eq\. +\fBneq(v1, v2)\fR: \fBv1 != v2\fR The opposite of \fBeq\fR\|\. . .IP "\(bu" 4 -cmp(v1, comparator, v2): Pass in a comparison string, and it\'ll call +\fBcmp(v1, comparator, v2)\fR: Pass in a comparison string, and it\'ll call the corresponding function above\. \fB"==="\fR and \fB"!=="\fR do simple string comparison, but are included for completeness\. Throws if an invalid comparison string is provided\. . .IP "\(bu" 4 -compare(v1, v2): Return 0 if v1 == v2, or 1 if v1 is greater, or \-1 if -v2 is greater\. Sorts in ascending order if passed to Array\.sort()\. +\fBcompare(v1, v2)\fR: Return \fB0\fR if \fBv1 == v2\fR, or \fB1\fR if \fBv1\fR is greater, or \fB\-1\fR if \fBv2\fR is greater\. Sorts in ascending order if passed to \fBArray\.sort()\fR\|\. . .IP "\(bu" 4 -rcompare(v1, v2): The reverse of compare\. Sorts an array of versions -in descending order when passed to Array\.sort()\. +\fBrcompare(v1, v2)\fR: The reverse of compare\. Sorts an array of versions +in descending order when passed to \fBArray\.sort()\fR\|\. . .IP "" 0 . .SS "Ranges" . .IP "\(bu" 4 -validRange(range): Return the valid range or null if it\'s not valid +\fBvalidRange(range)\fR: Return the valid range or null if it\'s not valid . .IP "\(bu" 4 -satisfies(version, range): Return true if the version satisfies the +\fBsatisfies(version, range)\fR: Return true if the version satisfies the range\. . .IP "\(bu" 4 -maxSatisfying(versions, range): Return the highest version in the list -that satisfies the range, or null if none of them do\. +\fBmaxSatisfying(versions, range)\fR: Return the highest version in the list +that satisfies the range, or \fBnull\fR if none of them do\. . .IP "\(bu" 4 -gtr(version, range): Return true if version is greater than all the +\fBgtr(version, range)\fR: Return \fBtrue\fR if version is greater than all the versions possible in the range\. . .IP "\(bu" 4 -ltr(version, range): Return true if version is less than all the +\fBltr(version, range)\fR: Return \fBtrue\fR if version is less than all the versions possible in the range\. . .IP "\(bu" 4 -outside(version, range, hilo): Return true if the version is outside +\fBoutside(version, range, hilo)\fR: Return true if the version is outside the bounds of the range in either the high or low direction\. The \fBhilo\fR argument must be either the string \fB\'>\'\fR or \fB\'<\'\fR\|\. (This is the function called by \fBgtr\fR and \fBltr\fR\|\.) . @@ -210,8 +243,8 @@ greater than a range, less than a range, \fIor\fR satisfy a range! For example, the range \fB1\.2 <1\.2\.9 || >2\.0\.0\fR would have a hole from \fB1\.2\.9\fR until \fB2\.0\.0\fR, so the version \fB1\.2\.10\fR would not be greater than the -range (because 2\.0\.1 satisfies, which is higher), nor less than the -range (since 1\.2\.8 satisfies, which is lower), and it also does not +range (because \fB2\.0\.1\fR satisfies, which is higher), nor less than the +range (since \fB1\.2\.8\fR satisfies, which is lower), and it also does not satisfy the range\. . .P diff -Nru nodejs-0.10.28/deps/npm/node_modules/abbrev/abbrev.js nodejs-0.10.29/deps/npm/node_modules/abbrev/abbrev.js --- nodejs-0.10.28/deps/npm/node_modules/abbrev/abbrev.js 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/abbrev/abbrev.js 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,62 @@ + +module.exports = exports = abbrev.abbrev = abbrev + +abbrev.monkeyPatch = monkeyPatch + +function monkeyPatch () { + Object.defineProperty(Array.prototype, 'abbrev', { + value: function () { return abbrev(this) }, + enumerable: false, configurable: true, writable: true + }) + + Object.defineProperty(Object.prototype, 'abbrev', { + value: function () { return abbrev(Object.keys(this)) }, + enumerable: false, configurable: true, writable: true + }) +} + +function abbrev (list) { + if (arguments.length !== 1 || !Array.isArray(list)) { + list = Array.prototype.slice.call(arguments, 0) + } + for (var i = 0, l = list.length, args = [] ; i < l ; i ++) { + args[i] = typeof list[i] === "string" ? list[i] : String(list[i]) + } + + // sort them lexicographically, so that they're next to their nearest kin + args = args.sort(lexSort) + + // walk through each, seeing how much it has in common with the next and previous + var abbrevs = {} + , prev = "" + for (var i = 0, l = args.length ; i < l ; i ++) { + var current = args[i] + , next = args[i + 1] || "" + , nextMatches = true + , prevMatches = true + if (current === next) continue + for (var j = 0, cl = current.length ; j < cl ; j ++) { + var curChar = current.charAt(j) + nextMatches = nextMatches && curChar === next.charAt(j) + prevMatches = prevMatches && curChar === prev.charAt(j) + if (!nextMatches && !prevMatches) { + j ++ + break + } + } + prev = current + if (j === cl) { + abbrevs[current] = current + continue + } + for (var a = current.substr(0, j) ; j <= cl ; j ++) { + abbrevs[a] = current + a += current.charAt(j) + } + } + return abbrevs +} + +function lexSort (a, b) { + return a === b ? 0 : a > b ? 1 : -1 +} diff -Nru nodejs-0.10.28/deps/npm/node_modules/abbrev/CONTRIBUTING.md nodejs-0.10.29/deps/npm/node_modules/abbrev/CONTRIBUTING.md --- nodejs-0.10.28/deps/npm/node_modules/abbrev/CONTRIBUTING.md 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/abbrev/CONTRIBUTING.md 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,3 @@ + To get started, sign the + Contributor License Agreement. diff -Nru nodejs-0.10.28/deps/npm/node_modules/abbrev/lib/abbrev.js nodejs-0.10.29/deps/npm/node_modules/abbrev/lib/abbrev.js --- nodejs-0.10.28/deps/npm/node_modules/abbrev/lib/abbrev.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/abbrev/lib/abbrev.js 1970-01-01 00:00:00.000000000 +0000 @@ -1,111 +0,0 @@ - -module.exports = exports = abbrev.abbrev = abbrev - -abbrev.monkeyPatch = monkeyPatch - -function monkeyPatch () { - Object.defineProperty(Array.prototype, 'abbrev', { - value: function () { return abbrev(this) }, - enumerable: false, configurable: true, writable: true - }) - - Object.defineProperty(Object.prototype, 'abbrev', { - value: function () { return abbrev(Object.keys(this)) }, - enumerable: false, configurable: true, writable: true - }) -} - -function abbrev (list) { - if (arguments.length !== 1 || !Array.isArray(list)) { - list = Array.prototype.slice.call(arguments, 0) - } - for (var i = 0, l = list.length, args = [] ; i < l ; i ++) { - args[i] = typeof list[i] === "string" ? list[i] : String(list[i]) - } - - // sort them lexicographically, so that they're next to their nearest kin - args = args.sort(lexSort) - - // walk through each, seeing how much it has in common with the next and previous - var abbrevs = {} - , prev = "" - for (var i = 0, l = args.length ; i < l ; i ++) { - var current = args[i] - , next = args[i + 1] || "" - , nextMatches = true - , prevMatches = true - if (current === next) continue - for (var j = 0, cl = current.length ; j < cl ; j ++) { - var curChar = current.charAt(j) - nextMatches = nextMatches && curChar === next.charAt(j) - prevMatches = prevMatches && curChar === prev.charAt(j) - if (!nextMatches && !prevMatches) { - j ++ - break - } - } - prev = current - if (j === cl) { - abbrevs[current] = current - continue - } - for (var a = current.substr(0, j) ; j <= cl ; j ++) { - abbrevs[a] = current - a += current.charAt(j) - } - } - return abbrevs -} - -function lexSort (a, b) { - return a === b ? 0 : a > b ? 1 : -1 -} - - -// tests -if (module === require.main) { - -var assert = require("assert") -var util = require("util") - -console.log("running tests") -function test (list, expect) { - var actual = abbrev(list) - assert.deepEqual(actual, expect, - "abbrev("+util.inspect(list)+") === " + util.inspect(expect) + "\n"+ - "actual: "+util.inspect(actual)) - actual = abbrev.apply(exports, list) - assert.deepEqual(abbrev.apply(exports, list), expect, - "abbrev("+list.map(JSON.stringify).join(",")+") === " + util.inspect(expect) + "\n"+ - "actual: "+util.inspect(actual)) -} - -test([ "ruby", "ruby", "rules", "rules", "rules" ], -{ rub: 'ruby' -, ruby: 'ruby' -, rul: 'rules' -, rule: 'rules' -, rules: 'rules' -}) -test(["fool", "foom", "pool", "pope"], -{ fool: 'fool' -, foom: 'foom' -, poo: 'pool' -, pool: 'pool' -, pop: 'pope' -, pope: 'pope' -}) -test(["a", "ab", "abc", "abcd", "abcde", "acde"], -{ a: 'a' -, ab: 'ab' -, abc: 'abc' -, abcd: 'abcd' -, abcde: 'abcde' -, ac: 'acde' -, acd: 'acde' -, acde: 'acde' -}) - -console.log("pass") - -} diff -Nru nodejs-0.10.28/deps/npm/node_modules/abbrev/package.json nodejs-0.10.29/deps/npm/node_modules/abbrev/package.json --- nodejs-0.10.28/deps/npm/node_modules/abbrev/package.json 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/abbrev/package.json 2014-06-09 17:04:36.000000000 +0000 @@ -1,14 +1,14 @@ { "name": "abbrev", - "version": "1.0.4", + "version": "1.0.5", "description": "Like ruby's abbrev module, but in js", "author": { "name": "Isaac Z. Schlueter", "email": "i@izs.me" }, - "main": "./lib/abbrev.js", + "main": "abbrev.js", "scripts": { - "test": "node lib/abbrev.js" + "test": "node test.js" }, "repository": { "type": "git", @@ -18,8 +18,28 @@ "type": "MIT", "url": "https://github.com/isaacs/abbrev-js/raw/master/LICENSE" }, - "readme": "# abbrev-js\n\nJust like [ruby's Abbrev](http://apidock.com/ruby/Abbrev).\n\nUsage:\n\n var abbrev = require(\"abbrev\");\n abbrev(\"foo\", \"fool\", \"folding\", \"flop\");\n \n // returns:\n { fl: 'flop'\n , flo: 'flop'\n , flop: 'flop'\n , fol: 'folding'\n , fold: 'folding'\n , foldi: 'folding'\n , foldin: 'folding'\n , folding: 'folding'\n , foo: 'foo'\n , fool: 'fool'\n }\n\nThis is handy for command-line scripts, or other cases where you want to be able to accept shorthands.\n", - "readmeFilename": "README.md", - "_id": "abbrev@1.0.4", - "_from": "abbrev@latest" + "bugs": { + "url": "https://github.com/isaacs/abbrev-js/issues" + }, + "homepage": "https://github.com/isaacs/abbrev-js", + "_id": "abbrev@1.0.5", + "_shasum": "5d8257bd9ebe435e698b2fa431afde4fe7b10b03", + "_from": "abbrev@latest", + "_npmVersion": "1.4.7", + "_npmUser": { + "name": "isaacs", + "email": "i@izs.me" + }, + "maintainers": [ + { + "name": "isaacs", + "email": "i@izs.me" + } + ], + "dist": { + "shasum": "5d8257bd9ebe435e698b2fa431afde4fe7b10b03", + "tarball": "http://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz" + }, + "directories": {}, + "_resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz" } diff -Nru nodejs-0.10.28/deps/npm/node_modules/abbrev/test.js nodejs-0.10.29/deps/npm/node_modules/abbrev/test.js --- nodejs-0.10.28/deps/npm/node_modules/abbrev/test.js 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/abbrev/test.js 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,47 @@ +var abbrev = require('./abbrev.js') +var assert = require("assert") +var util = require("util") + +console.log("TAP Version 13") +var count = 0 + +function test (list, expect) { + count++ + var actual = abbrev(list) + assert.deepEqual(actual, expect, + "abbrev("+util.inspect(list)+") === " + util.inspect(expect) + "\n"+ + "actual: "+util.inspect(actual)) + actual = abbrev.apply(exports, list) + assert.deepEqual(abbrev.apply(exports, list), expect, + "abbrev("+list.map(JSON.stringify).join(",")+") === " + util.inspect(expect) + "\n"+ + "actual: "+util.inspect(actual)) + console.log('ok - ' + list.join(' ')) +} + +test([ "ruby", "ruby", "rules", "rules", "rules" ], +{ rub: 'ruby' +, ruby: 'ruby' +, rul: 'rules' +, rule: 'rules' +, rules: 'rules' +}) +test(["fool", "foom", "pool", "pope"], +{ fool: 'fool' +, foom: 'foom' +, poo: 'pool' +, pool: 'pool' +, pop: 'pope' +, pope: 'pope' +}) +test(["a", "ab", "abc", "abcd", "abcde", "acde"], +{ a: 'a' +, ab: 'ab' +, abc: 'abc' +, abcd: 'abcd' +, abcde: 'abcde' +, ac: 'acde' +, acd: 'acde' +, acde: 'acde' +}) + +console.log("0..%d", count) diff -Nru nodejs-0.10.28/deps/npm/node_modules/char-spinner/LICENSE nodejs-0.10.29/deps/npm/node_modules/char-spinner/LICENSE --- nodejs-0.10.28/deps/npm/node_modules/char-spinner/LICENSE 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/char-spinner/LICENSE 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,15 @@ +The ISC License + +Copyright (c) Isaac Z. Schlueter + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR +IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff -Nru nodejs-0.10.28/deps/npm/node_modules/char-spinner/package.json nodejs-0.10.29/deps/npm/node_modules/char-spinner/package.json --- nodejs-0.10.28/deps/npm/node_modules/char-spinner/package.json 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/char-spinner/package.json 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,54 @@ +{ + "name": "char-spinner", + "version": "1.0.1", + "description": "Put a little spinner on process.stderr, as unobtrusively as possible.", + "main": "spin.js", + "directories": { + "test": "test" + }, + "dependencies": {}, + "devDependencies": { + "tap": "^0.4.10" + }, + "scripts": { + "test": "tap test/*.js" + }, + "repository": { + "type": "git", + "url": "git://github.com/isaacs/char-spinner" + }, + "keywords": [ + "char", + "spinner" + ], + "author": { + "name": "Isaac Z. Schlueter", + "email": "i@izs.me", + "url": "http://blog.izs.me/" + }, + "license": "ISC", + "bugs": { + "url": "https://github.com/isaacs/char-spinner/issues" + }, + "homepage": "https://github.com/isaacs/char-spinner", + "gitHead": "091b2ff5960aa083f68a5619fa93999d072aa152", + "_id": "char-spinner@1.0.1", + "_shasum": "e6ea67bd247e107112983b7ab0479ed362800081", + "_from": "char-spinner@latest", + "_npmVersion": "1.4.13", + "_npmUser": { + "name": "isaacs", + "email": "i@izs.me" + }, + "maintainers": [ + { + "name": "isaacs", + "email": "i@izs.me" + } + ], + "dist": { + "shasum": "e6ea67bd247e107112983b7ab0479ed362800081", + "tarball": "http://registry.npmjs.org/char-spinner/-/char-spinner-1.0.1.tgz" + }, + "_resolved": "https://registry.npmjs.org/char-spinner/-/char-spinner-1.0.1.tgz" +} diff -Nru nodejs-0.10.28/deps/npm/node_modules/char-spinner/README.md nodejs-0.10.29/deps/npm/node_modules/char-spinner/README.md --- nodejs-0.10.28/deps/npm/node_modules/char-spinner/README.md 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/char-spinner/README.md 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,31 @@ +# char-spinner + +Put a little spinner on process.stderr, as unobtrusively as possible. + +## USAGE + +```javascript +var spinner = require("char-spinner") + +// All options are optional +// even the options argument itself is optional +spinner(options) +``` + +## OPTIONS + +Usually the defaults are what you want. Mostly they're just +configurable for testing purposes. + +* `stream` Output stream. Default=`process.stderr` +* `tty` Only show spinner if output stream has a truish `.isTTY`. Default=`true` +* `string` String of chars to spin. Default=`'/-\\|'` +* `interval` Number of ms between frames, bigger = slower. Default=`50` +* `cleanup` Print `'\r \r'` to stream on process exit. Default=`true` +* `unref` Unreference the spinner interval so that the process can + exit normally. Default=`true` +* `delay` Number of frames to "skip over" before printing the spinner. + Useful if you want to avoid showing the spinner for very fast + actions. Default=`2` + +Returns the generated interval, if one was created. diff -Nru nodejs-0.10.28/deps/npm/node_modules/char-spinner/spin.js nodejs-0.10.29/deps/npm/node_modules/char-spinner/spin.js --- nodejs-0.10.28/deps/npm/node_modules/char-spinner/spin.js 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/char-spinner/spin.js 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,51 @@ +module.exports = spinner + +function spinner(opt) { + opt = opt || {} + var str = opt.stream || process.stderr + var tty = typeof opt.tty === 'boolean' ? opt.tty : true + var string = opt.string || '/-\\|' + var ms = typeof opt.interval === 'number' ? opt.interval : 50 + if (ms < 0) ms = 0 + if (tty && !str.isTTY) return false + var CR = str.isTTY ? '\u001b[0G' : '\u000d'; + var CLEAR = str.isTTY ? '\u001b[2K' : '\u000d \u000d'; + + var s = 0 + var sprite = string.split('') + var wrote = false + + var delay = typeof opt.delay === 'number' ? opt.delay : 2 + + var interval = setInterval(function() { + if (--delay >= 0) return + s = ++s % sprite.length + var c = sprite[s] + str.write(c + CR) + wrote = true + }, ms) + + var unref = typeof opt.unref === 'boolean' ? opt.unref : true + if (unref && typeof interval.unref === 'function') { + interval.unref() + } + + var cleanup = typeof opt.cleanup === 'boolean' ? opt.cleanup : true + if (cleanup) { + process.on('exit', function() { + if (wrote) { + str.write(CLEAR); + } + }) + } + + module.exports.clear = function () { + str.write(CLEAR); + }; + + return interval +} + +module.exports.clear = function () {}; + + diff -Nru nodejs-0.10.28/deps/npm/node_modules/char-spinner/test/basic.js nodejs-0.10.29/deps/npm/node_modules/char-spinner/test/basic.js --- nodejs-0.10.28/deps/npm/node_modules/char-spinner/test/basic.js 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/char-spinner/test/basic.js 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,35 @@ +var test = require('tap').test +var spinner = require('../spin.js') + +test('does nothing when not a tty', function(t) { + var int = spinner({ + stream: { write: function(c) { + throw new Error('wrote something: ' + JSON.stringify(c)) + }, isTTY: false }, + }) + t.notOk(int) + t.end() +}) + +test('write spinny stuff', function(t) { + var output = '' + var written = 0 + var expect = "b\u001b[0Gc\u001b[0Gd\u001b[0Ge\u001b[0Gf\u001b[0Gg\u001b[0Gh\u001b[0Gi\u001b[0Gj\u001b[0Gk\u001b[0Gl\u001b[0Gm\u001b[0Gn\u001b[0Go\u001b[0Gp\u001b[0Ga\u001b[0Gb\u001b[0Gc\u001b[0Gd\u001b[0Ge\u001b[0Gf\u001b[0Gg\u001b[0Gh\u001b[0Gi\u001b[0Gj\u001b[0Gk\u001b[0Gl\u001b[0Gm\u001b[0Gn\u001b[0Go\u001b[0Gp\u001b[0Ga\u001b[0Gb\u001b[0Gc\u001b[0Gd\u001b[0Ge\u001b[0Gf\u001b[0Gg\u001b[0Gh\u001b[0Gi\u001b[0Gj\u001b[0Gk\u001b[0Gl\u001b[0Gm\u001b[0Gn\u001b[0Go\u001b[0Gp\u001b[0Ga\u001b[0Gb\u001b[0Gc\u001b[0G" + + var int = spinner({ + interval: 0, + string: 'abcdefghijklmnop', + stream: { + write: function(c) { + output += c + if (++written == 50) { + t.equal(output, expect) + clearInterval(int) + t.end() + } + }, + isTTY: true + }, + cleanup: false + }) +}) diff -Nru nodejs-0.10.28/deps/npm/node_modules/columnify/package.json nodejs-0.10.29/deps/npm/node_modules/columnify/package.json --- nodejs-0.10.28/deps/npm/node_modules/columnify/package.json 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/columnify/package.json 2014-06-09 17:04:36.000000000 +0000 @@ -31,12 +31,24 @@ "url": "https://github.com/timoxley/columnify/issues" }, "homepage": "https://github.com/timoxley/columnify", - "readme": "# columnify\n\n[![Build Status](https://travis-ci.org/timoxley/columnify.png?branch=master)](https://travis-ci.org/timoxley/columnify)\n\nCreate text-based columns suitable for console output. \nSupports minimum and maximum column widths via truncation and text wrapping.\n\nDesigned to [handle sensible wrapping in npm search results](https://github.com/isaacs/npm/pull/2328).\n\n`npm search` before & after integrating columnify:\n\n![npm-tidy-search](https://f.cloud.github.com/assets/43438/1848959/ae02ad04-76a1-11e3-8255-4781debffc26.gif)\n\n## Installation & Update\n\n```\n$ npm install --save columnify@latest\n```\n\n## Usage\n\n```js\nvar columnify = require('columnify')\nvar columns = columnify(data, options)\nconsole.log(columns)\n```\n\n## Examples\n\n### Simple Columns\n\nText is aligned under column headings. Columns are automatically resized\nto fit the content of the largest cell. Each cell will be padded with\nspaces to fill the available space and ensure column contents are\nleft-aligned.\n\n```js\nvar columnify = require('columnify')\n\nvar columns = columnify([{\n name: 'mod1',\n version: '0.0.1'\n}, {\n name: 'module2',\n version: '0.2.0'\n}])\n\nconsole.log(columns)\n```\n```\nNAME VERSION\nmod1 0.0.1 \nmodule2 0.2.0 \n```\n\n### Wrapping Column Cells\n\nYou can define the maximum width before wrapping for individual cells in\ncolumns. Minimum width is also supported. Wrapping will happen at word\nboundaries. Empty cells or those which do not fill the max/min width\nwill be padded with spaces.\n\n```js\nvar columnify = require('columnify')\n\nvar columns = columnify([{\n name: 'mod1',\n description: 'some description which happens to be far larger than the max',\n version: '0.0.1',\n}, {\n name: 'module-two',\n description: 'another description larger than the max',\n version: '0.2.0',\n})\n\nconsole.log(columns)\n```\n```\nNAME DESCRIPTION VERSION\nmod1 some description which happens 0.0.1\n to be far larger than the max\nmodule-two another description larger 0.2.0\n than the max\n```\n\n### Truncated Columns\n\nYou can disable wrapping and instead truncate content at the maximum\ncolumn width. Truncation respects word boundaries. A truncation marker,\n`…` will appear next to the last word in any truncated line.\n\n```js\nvar columns = columnify(data, {\n truncate: true,\n config: {\n description: {\n maxWidth: 20\n }\n }\n})\n\nconsole.log(columns)\n```\n\n```\nNAME DESCRIPTION VERSION\nmod1 some description… 0.0.1 \nmodule-two another description… 0.2.0 \n```\n\n\n### Custom Truncation Marker\n\nYou can change the truncation marker to something other than the default\n`…`.\n\n```js\nvar columns = columnify(data, {\n truncate: true,\n truncateMarker: '>',\n widths: {\n description: {\n maxWidth: 20\n }\n }\n})\n\nconsole.log(columns)\n```\n\n```\nNAME DESCRIPTION VERSION\nmod1 some description> 0.0.1 \nmodule-two another description> 0.2.0 \n```\n\n### Custom Column Splitter\n\nIf your columns need some bling, you can split columns with custom\ncharacters.\n\n```js\n\nvar columns = columnify(data, {\n columnSplitter: ' | '\n})\n\nconsole.log(columns)\n```\n```\nNAME | DESCRIPTION | VERSION\nmod1 | some description which happens to be far larger than the max | 0.0.1\nmodule-two | another description larger than the max | 0.2.0\n```\n\n### Filtering & Ordering Columns\n\nBy default, all properties are converted into columns, whether or not\nthey exist on every object or not.\n\nTo explicitly specify which columns to include, and in which order,\nsupply an \"include\" array:\n\n```js\nvar data = [{\n name: 'module1',\n description: 'some description',\n version: '0.0.1',\n}, {\n name: 'module2',\n description: 'another description',\n version: '0.2.0',\n}]\n\nvar columns = columnify(data, {\n include: ['name', 'version'] // note description not included\n})\n\nconsole.log(columns)\n```\n\n```\nNAME VERSION\nmodule1 0.0.1\nmodule2 0.2.0\n```\n## License\n\nMIT\n", - "readmeFilename": "Readme.md", "_id": "columnify@0.1.2", "dist": { - "shasum": "ab1a1f1e37b26ba4b87c6920fb717fe51c827042" + "shasum": "ab1a1f1e37b26ba4b87c6920fb717fe51c827042", + "tarball": "http://registry.npmjs.org/columnify/-/columnify-0.1.2.tgz" }, "_from": "columnify@0.1.2", + "_npmVersion": "1.3.23", + "_npmUser": { + "name": "timoxley", + "email": "secoif@gmail.com" + }, + "maintainers": [ + { + "name": "timoxley", + "email": "secoif@gmail.com" + } + ], + "directories": {}, + "_shasum": "ab1a1f1e37b26ba4b87c6920fb717fe51c827042", "_resolved": "https://registry.npmjs.org/columnify/-/columnify-0.1.2.tgz" } diff -Nru nodejs-0.10.28/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/package.json nodejs-0.10.29/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/package.json --- nodejs-0.10.28/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/package.json 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/package.json 2014-06-09 17:04:36.000000000 +0000 @@ -6,7 +6,7 @@ }, "name": "fstream-ignore", "description": "A thing for ignoring files based on globs", - "version": "0.0.7", + "version": "0.0.8", "repository": { "type": "git", "url": "git://github.com/isaacs/fstream-ignore.git" @@ -16,9 +16,9 @@ "test": "tap test/*.js" }, "dependencies": { - "minimatch": "~0.2.0", "fstream": "~0.1.17", - "inherits": "2" + "inherits": "2", + "minimatch": "^0.3.0" }, "devDependencies": { "tap": "", @@ -26,15 +26,30 @@ "mkdirp": "" }, "license": "BSD", - "readme": "# fstream-ignore\n\nA fstream DirReader that filters out files that match globs in `.ignore`\nfiles throughout the tree, like how git ignores files based on a\n`.gitignore` file.\n\nHere's an example:\n\n```javascript\nvar Ignore = require(\"fstream-ignore\")\nIgnore({ path: __dirname\n , ignoreFiles: [\".ignore\", \".gitignore\"]\n })\n .on(\"child\", function (c) {\n console.error(c.path.substr(c.root.path.length + 1))\n })\n .pipe(tar.Pack())\n .pipe(fs.createWriteStream(\"foo.tar\"))\n```\n\nThis will tar up the files in __dirname into `foo.tar`, ignoring\nanything matched by the globs in any .iginore or .gitignore file.\n", - "readmeFilename": "README.md", + "gitHead": "8dfc936e8b2d25c0d82042b73a22c659e6e69a1e", "bugs": { "url": "https://github.com/isaacs/fstream-ignore/issues" }, - "_id": "fstream-ignore@0.0.7", + "homepage": "https://github.com/isaacs/fstream-ignore", + "_id": "fstream-ignore@0.0.8", + "_shasum": "cc4830fb9963178be5d9eb37569a4a0785cf9e53", + "_from": "fstream-ignore@~0.0", + "_npmVersion": "1.4.10", + "_npmUser": { + "name": "isaacs", + "email": "i@izs.me" + }, + "maintainers": [ + { + "name": "isaacs", + "email": "i@izs.me" + } + ], "dist": { - "shasum": "eea3033f0c3728139de7b57ab1b0d6d89c353c63" + "shasum": "cc4830fb9963178be5d9eb37569a4a0785cf9e53", + "tarball": "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.8.tgz" }, - "_from": "fstream-ignore@~0.0.5", - "_resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz" + "directories": {}, + "_resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.8.tgz", + "readme": "ERROR: No README data found!" } diff -Nru nodejs-0.10.28/deps/npm/node_modules/fstream-npm/package.json nodejs-0.10.29/deps/npm/node_modules/fstream-npm/package.json --- nodejs-0.10.28/deps/npm/node_modules/fstream-npm/package.json 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/fstream-npm/package.json 2014-06-09 17:04:36.000000000 +0000 @@ -6,22 +6,26 @@ }, "name": "fstream-npm", "description": "fstream class for creating npm packages", - "version": "0.1.6", + "version": "0.1.7", "repository": { "type": "git", "url": "git://github.com/isaacs/fstream-npm.git" }, "main": "./fstream-npm.js", "dependencies": { - "fstream-ignore": "~0.0.5", + "fstream-ignore": "~0.0", "inherits": "2" }, "license": "BSD", "readme": "# fstream-npm\n\nThis is an fstream DirReader class that will read a directory and filter\nthings according to the semantics of what goes in an npm package.\n\nFor example:\n\n```javascript\n// This will print out all the files that would be included\n// by 'npm publish' or 'npm install' of this directory.\n\nvar FN = require(\"fstream-npm\")\nFN({ path: \"./\" })\n .on(\"child\", function (e) {\n console.error(e.path.substr(e.root.path.length + 1))\n })\n```\n\n", "readmeFilename": "README.md", + "gitHead": "13839c9be784f2addc9352d525b35835fba01151", "bugs": { "url": "https://github.com/isaacs/fstream-npm/issues" }, - "_id": "fstream-npm@0.1.6", + "homepage": "https://github.com/isaacs/fstream-npm", + "_id": "fstream-npm@0.1.7", + "scripts": {}, + "_shasum": "423dc5d1d1fcb7d878501f43c7e11a33292bd55f", "_from": "fstream-npm@latest" } diff -Nru nodejs-0.10.28/deps/npm/node_modules/github-url-from-username-repo/package.json nodejs-0.10.29/deps/npm/node_modules/github-url-from-username-repo/package.json --- nodejs-0.10.28/deps/npm/node_modules/github-url-from-username-repo/package.json 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/github-url-from-username-repo/package.json 2014-06-09 17:04:36.000000000 +0000 @@ -26,13 +26,26 @@ "github", "repo" ], - "readme": "[![Build Status](https://travis-ci.org/robertkowalski/github-url-from-username-repo.png?branch=master)](https://travis-ci.org/robertkowalski/github-url-from-username-repo)\n[![Dependency Status](https://gemnasium.com/robertkowalski/github-url-from-username-repo.png)](https://gemnasium.com/robertkowalski/github-url-from-username-repo)\n\n\n# github-url-from-username-repo\n\n## Usage\n\n```javascript\n\nvar getUrl = require(\"github-url-from-username-repo\")\ngetUrl(\"visionmedia/express\") // git://github.com/visionmedia/express\n\n```", - "readmeFilename": "README.md", "homepage": "https://github.com/robertkowalski/github-url-from-username-repo", "_id": "github-url-from-username-repo@0.1.0", "dist": { - "shasum": "fe398af670692e91af7bcfc5ae1d99ff97b1df89" + "shasum": "fe398af670692e91af7bcfc5ae1d99ff97b1df89", + "tarball": "http://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-0.1.0.tgz" }, - "_from": "github-url-from-username-repo@0.1.0", - "_resolved": "https://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-0.1.0.tgz" + "_from": "github-url-from-username-repo@~0.1.0", + "_npmVersion": "1.4.6", + "_npmUser": { + "name": "robertkowalski", + "email": "rok@kowalski.gd" + }, + "maintainers": [ + { + "name": "robertkowalski", + "email": "rok@kowalski.gd" + } + ], + "directories": {}, + "_shasum": "fe398af670692e91af7bcfc5ae1d99ff97b1df89", + "_resolved": "https://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-0.1.0.tgz", + "readme": "ERROR: No README data found!" } diff -Nru nodejs-0.10.28/deps/npm/node_modules/glob/package.json nodejs-0.10.29/deps/npm/node_modules/glob/package.json --- nodejs-0.10.28/deps/npm/node_modules/glob/package.json 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/glob/package.json 2014-06-09 17:04:36.000000000 +0000 @@ -6,7 +6,7 @@ }, "name": "glob", "description": "a little globber", - "version": "3.2.9", + "version": "3.2.10", "repository": { "type": "git", "url": "git://github.com/isaacs/node-glob.git" @@ -16,8 +16,8 @@ "node": "*" }, "dependencies": { - "minimatch": "~0.2.11", - "inherits": "2" + "inherits": "2", + "minimatch": "^0.3.0" }, "devDependencies": { "tap": "~0.4.0", @@ -31,10 +31,12 @@ "license": "BSD", "readme": "# Glob\n\nMatch files using the patterns the shell uses, like stars and stuff.\n\nThis is a glob implementation in JavaScript. It uses the `minimatch`\nlibrary to do its matching.\n\n## Attention: node-glob users!\n\nThe API has changed dramatically between 2.x and 3.x. This library is\nnow 100% JavaScript, and the integer flags have been replaced with an\noptions object.\n\nAlso, there's an event emitter class, proper tests, and all the other\nthings you've come to expect from node modules.\n\nAnd best of all, no compilation!\n\n## Usage\n\n```javascript\nvar glob = require(\"glob\")\n\n// options is optional\nglob(\"**/*.js\", options, function (er, files) {\n // files is an array of filenames.\n // If the `nonull` option is set, and nothing\n // was found, then files is [\"**/*.js\"]\n // er is an error object or null.\n})\n```\n\n## Features\n\nPlease see the [minimatch\ndocumentation](https://github.com/isaacs/minimatch) for more details.\n\nSupports these glob features:\n\n* Brace Expansion\n* Extended glob matching\n* \"Globstar\" `**` matching\n\nSee:\n\n* `man sh`\n* `man bash`\n* `man 3 fnmatch`\n* `man 5 gitignore`\n* [minimatch documentation](https://github.com/isaacs/minimatch)\n\n## glob(pattern, [options], cb)\n\n* `pattern` {String} Pattern to be matched\n* `options` {Object}\n* `cb` {Function}\n * `err` {Error | null}\n * `matches` {Array} filenames found matching the pattern\n\nPerform an asynchronous glob search.\n\n## glob.sync(pattern, [options])\n\n* `pattern` {String} Pattern to be matched\n* `options` {Object}\n* return: {Array} filenames found matching the pattern\n\nPerform a synchronous glob search.\n\n## Class: glob.Glob\n\nCreate a Glob object by instanting the `glob.Glob` class.\n\n```javascript\nvar Glob = require(\"glob\").Glob\nvar mg = new Glob(pattern, options, cb)\n```\n\nIt's an EventEmitter, and starts walking the filesystem to find matches\nimmediately.\n\n### new glob.Glob(pattern, [options], [cb])\n\n* `pattern` {String} pattern to search for\n* `options` {Object}\n* `cb` {Function} Called when an error occurs, or matches are found\n * `err` {Error | null}\n * `matches` {Array} filenames found matching the pattern\n\nNote that if the `sync` flag is set in the options, then matches will\nbe immediately available on the `g.found` member.\n\n### Properties\n\n* `minimatch` The minimatch object that the glob uses.\n* `options` The options object passed in.\n* `error` The error encountered. When an error is encountered, the\n glob object is in an undefined state, and should be discarded.\n* `aborted` Boolean which is set to true when calling `abort()`. There\n is no way at this time to continue a glob search after aborting, but\n you can re-use the statCache to avoid having to duplicate syscalls.\n* `statCache` Collection of all the stat results the glob search\n performed.\n* `cache` Convenience object. Each field has the following possible\n values:\n * `false` - Path does not exist\n * `true` - Path exists\n * `1` - Path exists, and is not a directory\n * `2` - Path exists, and is a directory\n * `[file, entries, ...]` - Path exists, is a directory, and the\n array value is the results of `fs.readdir`\n\n### Events\n\n* `end` When the matching is finished, this is emitted with all the\n matches found. If the `nonull` option is set, and no match was found,\n then the `matches` list contains the original pattern. The matches\n are sorted, unless the `nosort` flag is set.\n* `match` Every time a match is found, this is emitted with the matched.\n* `error` Emitted when an unexpected error is encountered, or whenever\n any fs error occurs if `options.strict` is set.\n* `abort` When `abort()` is called, this event is raised.\n\n### Methods\n\n* `abort` Stop the search.\n\n### Options\n\nAll the options that can be passed to Minimatch can also be passed to\nGlob to change pattern matching behavior. Also, some have been added,\nor have glob-specific ramifications.\n\nAll options are false by default, unless otherwise noted.\n\nAll options are added to the glob object, as well.\n\n* `cwd` The current working directory in which to search. Defaults\n to `process.cwd()`.\n* `root` The place where patterns starting with `/` will be mounted\n onto. Defaults to `path.resolve(options.cwd, \"/\")` (`/` on Unix\n systems, and `C:\\` or some such on Windows.)\n* `dot` Include `.dot` files in normal matches and `globstar` matches.\n Note that an explicit dot in a portion of the pattern will always\n match dot files.\n* `nomount` By default, a pattern starting with a forward-slash will be\n \"mounted\" onto the root setting, so that a valid filesystem path is\n returned. Set this flag to disable that behavior.\n* `mark` Add a `/` character to directory matches. Note that this\n requires additional stat calls.\n* `nosort` Don't sort the results.\n* `stat` Set to true to stat *all* results. This reduces performance\n somewhat, and is completely unnecessary, unless `readdir` is presumed\n to be an untrustworthy indicator of file existence. It will cause\n ELOOP to be triggered one level sooner in the case of cyclical\n symbolic links.\n* `silent` When an unusual error is encountered\n when attempting to read a directory, a warning will be printed to\n stderr. Set the `silent` option to true to suppress these warnings.\n* `strict` When an unusual error is encountered\n when attempting to read a directory, the process will just continue on\n in search of other matches. Set the `strict` option to raise an error\n in these cases.\n* `cache` See `cache` property above. Pass in a previously generated\n cache object to save some fs calls.\n* `statCache` A cache of results of filesystem information, to prevent\n unnecessary stat calls. While it should not normally be necessary to\n set this, you may pass the statCache from one glob() call to the\n options object of another, if you know that the filesystem will not\n change between calls. (See \"Race Conditions\" below.)\n* `sync` Perform a synchronous glob search.\n* `nounique` In some cases, brace-expanded patterns can result in the\n same file showing up multiple times in the result set. By default,\n this implementation prevents duplicates in the result set.\n Set this flag to disable that behavior.\n* `nonull` Set to never return an empty set, instead returning a set\n containing the pattern itself. This is the default in glob(3).\n* `nocase` Perform a case-insensitive match. Note that case-insensitive\n filesystems will sometimes result in glob returning results that are\n case-insensitively matched anyway, since readdir and stat will not\n raise an error.\n* `debug` Set to enable debug logging in minimatch and glob.\n* `globDebug` Set to enable debug logging in glob, but not minimatch.\n\n## Comparisons to other fnmatch/glob implementations\n\nWhile strict compliance with the existing standards is a worthwhile\ngoal, some discrepancies exist between node-glob and other\nimplementations, and are intentional.\n\nIf the pattern starts with a `!` character, then it is negated. Set the\n`nonegate` flag to suppress this behavior, and treat leading `!`\ncharacters normally. This is perhaps relevant if you wish to start the\npattern with a negative extglob pattern like `!(a|B)`. Multiple `!`\ncharacters at the start of a pattern will negate the pattern multiple\ntimes.\n\nIf a pattern starts with `#`, then it is treated as a comment, and\nwill not match anything. Use `\\#` to match a literal `#` at the\nstart of a line, or set the `nocomment` flag to suppress this behavior.\n\nThe double-star character `**` is supported by default, unless the\n`noglobstar` flag is set. This is supported in the manner of bsdglob\nand bash 4.1, where `**` only has special significance if it is the only\nthing in a path part. That is, `a/**/b` will match `a/x/y/b`, but\n`a/**b` will not.\n\nIf an escaped pattern has no matches, and the `nonull` flag is set,\nthen glob returns the pattern as-provided, rather than\ninterpreting the character escapes. For example,\n`glob.match([], \"\\\\*a\\\\?\")` will return `\"\\\\*a\\\\?\"` rather than\n`\"*a?\"`. This is akin to setting the `nullglob` option in bash, except\nthat it does not resolve escaped pattern characters.\n\nIf brace expansion is not disabled, then it is performed before any\nother interpretation of the glob pattern. Thus, a pattern like\n`+(a|{b),c)}`, which would not be valid in bash or zsh, is expanded\n**first** into the set of `+(a|b)` and `+(a|c)`, and those patterns are\nchecked for validity. Since those two are valid, matching proceeds.\n\n## Windows\n\n**Please only use forward-slashes in glob expressions.**\n\nThough windows uses either `/` or `\\` as its path separator, only `/`\ncharacters are used by this glob implementation. You must use\nforward-slashes **only** in glob expressions. Back-slashes will always\nbe interpreted as escape characters, not path separators.\n\nResults from absolute patterns such as `/foo/*` are mounted onto the\nroot setting using `path.join`. On windows, this will by default result\nin `/foo/*` matching `C:\\foo\\bar.txt`.\n\n## Race Conditions\n\nGlob searching, by its very nature, is susceptible to race conditions,\nsince it relies on directory walking and such.\n\nAs a result, it is possible that a file that exists when glob looks for\nit may have been deleted or modified by the time it returns the result.\n\nAs part of its internal implementation, this program caches all stat\nand readdir calls that it makes, in order to cut down on system\noverhead. However, this also makes it even more susceptible to races,\nespecially if the cache or statCache objects are reused between glob\ncalls.\n\nUsers are thus advised not to use a glob result as a guarantee of\nfilesystem state in the face of rapid changes. For the vast majority\nof operations, this is never a problem.\n", "readmeFilename": "README.md", + "gitHead": "4e00805b5529af626bf0512d6810c27a96ca2a12", "bugs": { "url": "https://github.com/isaacs/node-glob/issues" }, "homepage": "https://github.com/isaacs/node-glob", - "_id": "glob@3.2.9", + "_id": "glob@3.2.10", + "_shasum": "e229a4d843fdabca3dd8cdc96c456e29c6e79f13", "_from": "glob@latest" } diff -Nru nodejs-0.10.28/deps/npm/node_modules/inflight/inflight.js nodejs-0.10.29/deps/npm/node_modules/inflight/inflight.js --- nodejs-0.10.28/deps/npm/node_modules/inflight/inflight.js 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/inflight/inflight.js 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,25 @@ +module.exports = inflight + +var reqs = Object.create(null) +var once = require('once') + +function inflight (key, cb) { + if (reqs[key]) { + reqs[key].push(cb) + return null + } else { + reqs[key] = [cb] + return makeres(key) + } +} + +function makeres(key) { + return once(res) + function res(error, data) { + var cbs = reqs[key] + delete reqs[key] + cbs.forEach(function(cb) { + cb(error, data) + }) + } +} diff -Nru nodejs-0.10.28/deps/npm/node_modules/inflight/LICENSE nodejs-0.10.29/deps/npm/node_modules/inflight/LICENSE --- nodejs-0.10.28/deps/npm/node_modules/inflight/LICENSE 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/inflight/LICENSE 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,15 @@ +The ISC License + +Copyright (c) Isaac Z. Schlueter + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR +IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff -Nru nodejs-0.10.28/deps/npm/node_modules/inflight/package.json nodejs-0.10.29/deps/npm/node_modules/inflight/package.json --- nodejs-0.10.28/deps/npm/node_modules/inflight/package.json 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/inflight/package.json 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,50 @@ +{ + "name": "inflight", + "version": "1.0.1", + "description": "Add callbacks to requests in flight to avoid async duplication", + "main": "inflight.js", + "dependencies": { + "once": "^1.3.0" + }, + "devDependencies": { + "tap": "^0.4.10" + }, + "scripts": { + "test": "tap test.js" + }, + "repository": { + "type": "git", + "url": "git://github.com/isaacs/inflight" + }, + "author": { + "name": "Isaac Z. Schlueter", + "email": "i@izs.me", + "url": "http://blog.izs.me/" + }, + "bugs": { + "url": "https://github.com/isaacs/inflight/issues" + }, + "homepage": "https://github.com/isaacs/inflight", + "license": "ISC", + "_id": "inflight@1.0.1", + "_shasum": "01f6911821535243c790ac0f998f54e9023ffb6f", + "_from": "inflight@~1.0.1", + "_npmVersion": "1.4.9", + "_npmUser": { + "name": "isaacs", + "email": "i@izs.me" + }, + "maintainers": [ + { + "name": "isaacs", + "email": "i@izs.me" + } + ], + "dist": { + "shasum": "01f6911821535243c790ac0f998f54e9023ffb6f", + "tarball": "http://registry.npmjs.org/inflight/-/inflight-1.0.1.tgz" + }, + "directories": {}, + "_resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.1.tgz", + "readme": "ERROR: No README data found!" +} diff -Nru nodejs-0.10.28/deps/npm/node_modules/inflight/README.md nodejs-0.10.29/deps/npm/node_modules/inflight/README.md --- nodejs-0.10.28/deps/npm/node_modules/inflight/README.md 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/inflight/README.md 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,37 @@ +# inflight + +Add callbacks to requests in flight to avoid async duplication + +## USAGE + +```javascript +var inflight = require('inflight') + +// some request that does some stuff +function req(key, callback) { + // key is any random string. like a url or filename or whatever. + // + // will return either a falsey value, indicating that the + // request for this key is already in flight, or a new callback + // which when called will call all callbacks passed to inflightk + // with the same key + callback = inflight(key, callback) + + // If we got a falsey value back, then there's already a req going + if (!callback) return + + // this is where you'd fetch the url or whatever + // callback is also once()-ified, so it can safely be assigned + // to multiple events etc. First call wins. + setTimeout(function() { + callback(null, key) + }, 100) +} + +// only assigns a single setTimeout +// when it dings, all cbs get called +req('foo', cb1) +req('foo', cb2) +req('foo', cb3) +req('foo', cb4) +``` diff -Nru nodejs-0.10.28/deps/npm/node_modules/inflight/test.js nodejs-0.10.29/deps/npm/node_modules/inflight/test.js --- nodejs-0.10.28/deps/npm/node_modules/inflight/test.js 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/inflight/test.js 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,33 @@ +var test = require('tap').test +var inf = require('./inflight.js') + + +function req (key, cb) { + cb = inf(key, cb) + if (cb) setTimeout(function () { + cb(key) + cb(key) + }) + return cb +} + +test('basic', function (t) { + var calleda = false + var a = req('key', function (k) { + t.notOk(calleda) + calleda = true + t.equal(k, 'key') + if (calledb) t.end() + }) + t.ok(a, 'first returned cb function') + + var calledb = false + var b = req('key', function (k) { + t.notOk(calledb) + calledb = true + t.equal(k, 'key') + if (calleda) t.end() + }) + + t.notOk(b, 'second should get falsey inflight response') +}) diff -Nru nodejs-0.10.28/deps/npm/node_modules/ini/ini.js nodejs-0.10.29/deps/npm/node_modules/ini/ini.js --- nodejs-0.10.28/deps/npm/node_modules/ini/ini.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/ini/ini.js 2014-06-09 17:04:36.000000000 +0000 @@ -42,12 +42,12 @@ } function dotSplit (str) { - return str.replace(/\1/g, '\2LITERAL\\1LITERAL\2') - .replace(/\\\./g, '\1') + return str.replace(/\1/g, '\u0002LITERAL\\1LITERAL\u0002') + .replace(/\\\./g, '\u0001') .split(/\./).map(function (part) { return part.replace(/\1/g, '\\.') - .replace(/\2LITERAL\\1LITERAL\2/g, '\1') - }) + .replace(/\2LITERAL\\1LITERAL\2/g, '\u0001') + }) } function decode (str) { @@ -61,7 +61,7 @@ , section = null lines.forEach(function (line, _, __) { - if (!line || line.match(/^\s*;/)) return + if (!line || line.match(/^\s*[;#]/)) return var match = line.match(re) if (!match) return if (match[1] !== undefined) { @@ -122,21 +122,29 @@ return out } +function isQuoted (val) { + return (val.charAt(0) === "\"" && val.slice(-1) === "\"") + || (val.charAt(0) === "'" && val.slice(-1) === "'") +} + function safe (val) { return ( typeof val !== "string" || val.match(/[\r\n]/) || val.match(/^\[/) || (val.length > 1 - && val.charAt(0) === "\"" - && val.slice(-1) === "\"") + && isQuoted(val)) || val !== val.trim() ) ? JSON.stringify(val) - : val.replace(/;/g, '\\;') + : val.replace(/;/g, '\\;').replace(/#/g, "\\#") } function unsafe (val, doUnesc) { val = (val || "").trim() - if (val.charAt(0) === "\"" && val.slice(-1) === "\"") { + if (isQuoted(val)) { + // remove the single quotes before calling JSON.parse + if (val.charAt(0) === "'") { + val = val.substr(1, val.length - 2); + } try { val = JSON.parse(val) } catch (_) {} } else { // walk the val to find the first not-escaped ; character @@ -145,12 +153,12 @@ for (var i = 0, l = val.length; i < l; i++) { var c = val.charAt(i) if (esc) { - if (c === "\\" || c === ";") + if ("\\;#".indexOf(c) !== -1) unesc += c else unesc += "\\" + c esc = false - } else if (c === ";") { + } else if (";#".indexOf(c) !== -1) { break } else if (c === "\\") { esc = true diff -Nru nodejs-0.10.28/deps/npm/node_modules/ini/.npmignore nodejs-0.10.29/deps/npm/node_modules/ini/.npmignore --- nodejs-0.10.28/deps/npm/node_modules/ini/.npmignore 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/ini/.npmignore 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1 @@ +node_modules diff -Nru nodejs-0.10.28/deps/npm/node_modules/ini/package.json nodejs-0.10.29/deps/npm/node_modules/ini/package.json --- nodejs-0.10.28/deps/npm/node_modules/ini/package.json 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/ini/package.json 2014-06-09 17:04:36.000000000 +0000 @@ -6,7 +6,7 @@ }, "name": "ini", "description": "An ini encoder/decoder for node", - "version": "1.1.0", + "version": "1.2.0", "repository": { "type": "git", "url": "git://github.com/isaacs/ini.git" @@ -20,10 +20,30 @@ }, "dependencies": {}, "devDependencies": { - "tap": "~0.0.9" + "tap": "~0.4.0" }, - "readme": "An ini format parser and serializer for node.\n\nSections are treated as nested objects. Items before the first heading\nare saved on the object directly.\n\n## Usage\n\nConsider an ini-file `config.ini` that looks like this:\n\n ; this comment is being ignored\n scope = global\n\n [database]\n user = dbuser\n password = dbpassword\n database = use_this_database\n\n [paths.default]\n datadir = /var/lib/data\n array[] = first value\n array[] = second value\n array[] = third value\n\nYou can read, manipulate and write the ini-file like so:\n\n var fs = require('fs')\n , ini = require('ini')\n\n var config = ini.parse(fs.readFileSync('./config.ini', 'utf-8'))\n\n config.scope = 'local'\n config.database.database = 'use_another_database'\n config.paths.default.tmpdir = '/tmp'\n delete config.paths.default.datadir\n config.paths.default.array.push('fourth value')\n\n fs.writeFileSync('./config_modified.ini', ini.stringify(config, 'section'))\n\nThis will result in a file called `config_modified.ini` being written to the filesystem with the following content:\n\n [section]\n scope = local\n [section.database]\n user = dbuser\n password = dbpassword\n database = use_another_database\n [section.paths.default]\n tmpdir = /tmp\n array[] = first value\n array[] = second value\n array[] = third value\n array[] = fourth value\n\n\n## API\n\n### decode(inistring)\nDecode the ini-style formatted `inistring` into a nested object.\n\n### parse(inistring)\nAlias for `decode(inistring)`\n\n### encode(object, [section])\nEncode the object `object` into an ini-style formatted string. If the optional parameter `section` is given, then all top-level properties of the object are put into this section and the `section`-string is prepended to all sub-sections, see the usage example above.\n\n### stringify(object, [section])\nAlias for `encode(object, [section])`\n\n### safe(val)\nEscapes the string `val` such that it is safe to be used as a key or value in an ini-file. Basically escapes quotes. For example\n\n ini.safe('\"unsafe string\"')\n\nwould result in\n\n \"\\\"unsafe string\\\"\"\n\n### unsafe(val)\nUnescapes the string `val`\n", - "readmeFilename": "README.md", - "_id": "ini@1.1.0", - "_from": "ini@latest" + "bugs": { + "url": "https://github.com/isaacs/ini/issues" + }, + "homepage": "https://github.com/isaacs/ini", + "_id": "ini@1.2.0", + "_shasum": "2cc36789605809930722e793ae13ac835e623ac6", + "_from": "ini@latest", + "_npmVersion": "1.4.10", + "_npmUser": { + "name": "isaacs", + "email": "i@izs.me" + }, + "maintainers": [ + { + "name": "isaacs", + "email": "i@izs.me" + } + ], + "dist": { + "shasum": "2cc36789605809930722e793ae13ac835e623ac6", + "tarball": "http://registry.npmjs.org/ini/-/ini-1.2.0.tgz" + }, + "directories": {}, + "_resolved": "https://registry.npmjs.org/ini/-/ini-1.2.0.tgz" } diff -Nru nodejs-0.10.28/deps/npm/node_modules/ini/test/fixtures/foo.ini nodejs-0.10.29/deps/npm/node_modules/ini/test/fixtures/foo.ini --- nodejs-0.10.28/deps/npm/node_modules/ini/test/fixtures/foo.ini 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/ini/test/fixtures/foo.ini 2014-06-09 17:04:36.000000000 +0000 @@ -8,6 +8,16 @@ ; wrap in quotes to get a key with a bracket, not a section. "[disturbing]" = hey you never know +; Test single quotes +s = 'something' + +; Test mixing quotes + +s1 = "something' + +; Test double quotes +s2 = "something else" + ; Test arrays zr[] = deedee ar[] = one @@ -45,3 +55,9 @@ ; this next one is not a comment! it's escaped! nocomment = this\; this is not a comment + +# Support the use of the number sign (#) as an alternative to the semicolon for indicating comments. +# http://en.wikipedia.org/wiki/INI_file#Comments + +# this next one is not a comment! it's escaped! +noHashComment = this\# this is not a comment diff -Nru nodejs-0.10.28/deps/npm/node_modules/ini/test/foo.js nodejs-0.10.29/deps/npm/node_modules/ini/test/foo.js --- nodejs-0.10.28/deps/npm/node_modules/ini/test/foo.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/ini/test/foo.js 2014-06-09 17:04:36.000000000 +0000 @@ -10,6 +10,9 @@ + 'a with spaces = b c\n' + '" xa n p " = "\\"\\r\\nyoyoyo\\r\\r\\n"\n' + '"[disturbing]" = hey you never know\n' + + 's = something\n' + + 's1 = \"something\'\n' + + 's2 = something else\n' + 'zr[] = deedee\n' + 'ar[] = one\n' + 'ar[] = three\n' @@ -28,11 +31,15 @@ + 'j = 2\n\n[x\\.y\\.z]\nx.y.z = xyz\n\n' + '[x\\.y\\.z.a\\.b\\.c]\na.b.c = abc\n' + 'nocomment = this\\; this is not a comment\n' + + 'noHashComment = this\\# this is not a comment\n' , expectD = { o: 'p', 'a with spaces': 'b c', " xa n p ":'"\r\nyoyoyo\r\r\n', '[disturbing]': 'hey you never know', + 's': 'something', + 's1' : '\"something\'', + 's2': 'something else', 'zr': ['deedee'], 'ar': ['one', 'three', 'this is included'], 'br': 'warm', @@ -47,7 +54,8 @@ 'x.y.z': 'xyz', 'a.b.c': { 'a.b.c': 'abc', - 'nocomment': 'this\; this is not a comment' + 'nocomment': 'this\; this is not a comment', + noHashComment: 'this\# this is not a comment' } } } diff -Nru nodejs-0.10.28/deps/npm/node_modules/init-package-json/default-input.js nodejs-0.10.29/deps/npm/node_modules/init-package-json/default-input.js --- nodejs-0.10.28/deps/npm/node_modules/init-package-json/default-input.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/init-package-json/default-input.js 2014-06-09 17:04:36.000000000 +0000 @@ -150,7 +150,7 @@ else u = u.replace(/^\s*url = /, '') } if (u && u.match(/^git@github.com:/)) - u = u.replace(/^git@github.com:/, 'git://github.com/') + u = u.replace(/^git@github.com:/, 'https://github.com/') return cb(null, prompt('git repository', u)) }) diff -Nru nodejs-0.10.28/deps/npm/node_modules/init-package-json/node_modules/promzard/package.json nodejs-0.10.29/deps/npm/node_modules/init-package-json/node_modules/promzard/package.json --- nodejs-0.10.28/deps/npm/node_modules/init-package-json/node_modules/promzard/package.json 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/init-package-json/node_modules/promzard/package.json 2014-06-09 17:04:36.000000000 +0000 @@ -6,7 +6,7 @@ }, "name": "promzard", "description": "prompting wizardly", - "version": "0.2.1", + "version": "0.2.2", "repository": { "url": "git://github.com/isaacs/promzard" }, @@ -21,14 +21,28 @@ "test": "tap test/*.js" }, "license": "ISC", - "readme": "# promzard\n\nA prompting wizard for building files from specialized PromZard modules.\nUsed by `npm init`.\n\nA reimplementation of @SubStack's\n[prompter](https://github.com/substack/node-prompter), which does not\nuse AST traversal.\n\nFrom another point of view, it's a reimplementation of\n[@Marak](https://github.com/marak)'s\n[wizard](https://github.com/Marak/wizard) which doesn't use schemas.\n\nThe goal is a nice drop-in enhancement for `npm init`.\n\n## Usage\n\n```javascript\nvar promzard = require('promzard')\npromzard(inputFile, optionalContextAdditions, function (er, data) {\n // .. you know what you doing ..\n})\n```\n\nIn the `inputFile` you can have something like this:\n\n```javascript\nvar fs = require('fs')\nmodule.exports = {\n \"greeting\": prompt(\"Who shall you greet?\", \"world\", function (who) {\n return \"Hello, \" + who\n }),\n \"filename\": __filename,\n \"directory\": function (cb) {\n fs.readdir(__dirname, cb)\n }\n}\n```\n\nWhen run, promzard will display the prompts and resolve the async\nfunctions in order, and then either give you an error, or the resolved\ndata, ready to be dropped into a JSON file or some other place.\n\n\n### promzard(inputFile, ctx, callback)\n\nThe inputFile is just a node module. You can require() things, set\nmodule.exports, etc. Whatever that module exports is the result, and it\nis walked over to call any functions as described below.\n\nThe only caveat is that you must give PromZard the full absolute path\nto the module (you can get this via Node's `require.resolve`.) Also,\nthe `prompt` function is injected into the context object, so watch out.\n\nWhatever you put in that `ctx` will of course also be available in the\nmodule. You can get quite fancy with this, passing in existing configs\nand so on.\n\n### Class: promzard.PromZard(file, ctx)\n\nJust like the `promzard` function, but the EventEmitter that makes it\nall happen. Emits either a `data` event with the data, or a `error`\nevent if it blows up.\n\nIf `error` is emitted, then `data` never will be.\n\n### prompt(...)\n\nIn the promzard input module, you can call the `prompt` function.\nThis prompts the user to input some data. The arguments are interpreted\nbased on type:\n\n1. `string` The first string encountered is the prompt. The second is\n the default value.\n2. `function` A transformer function which receives the data and returns\n something else. More than meets the eye.\n3. `object` The `prompt` member is the prompt, the `default` member is\n the default value, and the `transform` is the transformer.\n\nWhatever the final value is, that's what will be put on the resulting\nobject.\n\n### Functions\n\nIf there are any functions on the promzard input module's exports, then\npromzard will call each of them with a callback. This way, your module\ncan do asynchronous actions if necessary to validate or ascertain\nwhatever needs verification.\n\nThe functions are called in the context of the ctx object, and are given\na single argument, which is a callback that should be called with either\nan error, or the result to assign to that spot.\n\nIn the async function, you can also call prompt() and return the result\nof the prompt in the callback.\n\nFor example, this works fine in a promzard module:\n\n```\nexports.asyncPrompt = function (cb) {\n fs.stat(someFile, function (er, st) {\n // if there's an error, no prompt, just error\n // otherwise prompt and use the actual file size as the default\n cb(er, prompt('file size', st.size))\n })\n}\n```\n\nYou can also return other async functions in the async function\ncallback. Though that's a bit silly, it could be a handy way to reuse\nfunctionality in some cases.\n\n### Sync vs Async\n\nThe `prompt()` function is not synchronous, though it appears that way.\nIt just returns a token that is swapped out when the data object is\nwalked over asynchronously later, and returns a token.\n\nFor that reason, prompt() calls whose results don't end up on the data\nobject are never shown to the user. For example, this will only prompt\nonce:\n\n```\nexports.promptThreeTimes = prompt('prompt me once', 'shame on you')\nexports.promptThreeTimes = prompt('prompt me twice', 'um....')\nexports.promptThreeTimes = prompt('you cant prompt me again')\n```\n\n### Isn't this exactly the sort of 'looks sync' that you said was bad about other libraries?\n\nYeah, sorta. I wouldn't use promzard for anything more complicated than\na wizard that spits out prompts to set up a config file or something.\nMaybe there are other use cases I haven't considered.\n", - "readmeFilename": "README.md", "bugs": { "url": "https://github.com/isaacs/promzard/issues" }, "homepage": "https://github.com/isaacs/promzard", - "_id": "promzard@0.2.1", - "_shasum": "c4c7cbe5182465c13b43540be9daf47098b4e75b", + "_id": "promzard@0.2.2", + "_shasum": "918b9f2b29458cb001781a8856502e4a79b016e0", "_from": "promzard@~0.2.0", - "_resolved": "https://registry.npmjs.org/promzard/-/promzard-0.2.1.tgz" + "_npmVersion": "1.4.10", + "_npmUser": { + "name": "isaacs", + "email": "i@izs.me" + }, + "maintainers": [ + { + "name": "isaacs", + "email": "i@izs.me" + } + ], + "dist": { + "shasum": "918b9f2b29458cb001781a8856502e4a79b016e0", + "tarball": "http://registry.npmjs.org/promzard/-/promzard-0.2.2.tgz" + }, + "directories": {}, + "_resolved": "https://registry.npmjs.org/promzard/-/promzard-0.2.2.tgz" } diff -Nru nodejs-0.10.28/deps/npm/node_modules/init-package-json/node_modules/promzard/promzard.js nodejs-0.10.29/deps/npm/node_modules/init-package-json/node_modules/promzard/promzard.js --- nodejs-0.10.28/deps/npm/node_modules/init-package-json/node_modules/promzard/promzard.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/init-package-json/node_modules/promzard/promzard.js 2014-06-09 17:04:36.000000000 +0000 @@ -121,7 +121,7 @@ else if (a && typeof a === 'object') { p = a.prompt || p d = a.default || d - t = a.tranform || t + t = a.transform || t } } diff -Nru nodejs-0.10.28/deps/npm/node_modules/init-package-json/node_modules/promzard/test/basic.js nodejs-0.10.29/deps/npm/node_modules/init-package-json/node_modules/promzard/test/basic.js --- nodejs-0.10.28/deps/npm/node_modules/init-package-json/node_modules/promzard/test/basic.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/init-package-json/node_modules/promzard/test/basic.js 2014-06-09 17:04:36.000000000 +0000 @@ -70,10 +70,18 @@ } if (output.match(/keywords: $/)) { c.stdin.write('fugazi function waiting room\n') + // "read" module is weird on node >= 0.10 when not a TTY + // requires explicit ending for reasons. + // could dig in, but really just wanna make tests pass, whatever. + c.stdin.end() return } } + c.on('exit', function () { + console.error('exit event') + }) + c.on('close', function () { console.error('actual', actual) actual = JSON.parse(actual) diff -Nru nodejs-0.10.28/deps/npm/node_modules/init-package-json/node_modules/promzard/test/exports.js nodejs-0.10.29/deps/npm/node_modules/init-package-json/node_modules/promzard/test/exports.js --- nodejs-0.10.28/deps/npm/node_modules/init-package-json/node_modules/promzard/test/exports.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/init-package-json/node_modules/promzard/test/exports.js 2014-06-09 17:04:36.000000000 +0000 @@ -20,7 +20,7 @@ child.stdin.write('\n'); }, 100) setTimeout(function () { - child.stdin.write('55\n'); + child.stdin.end('55\n'); }, 200) child.on('close', function () { diff -Nru nodejs-0.10.28/deps/npm/node_modules/init-package-json/node_modules/promzard/test/fn.js nodejs-0.10.29/deps/npm/node_modules/init-package-json/node_modules/promzard/test/fn.js --- nodejs-0.10.28/deps/npm/node_modules/init-package-json/node_modules/promzard/test/fn.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/init-package-json/node_modules/promzard/test/fn.js 2014-06-09 17:04:36.000000000 +0000 @@ -43,7 +43,7 @@ child.stdin.write('55\n') }, 150) setTimeout(function () { - child.stdin.write('async prompt\n') + child.stdin.end('async prompt\n') }, 200) }) diff -Nru nodejs-0.10.28/deps/npm/node_modules/init-package-json/package.json nodejs-0.10.29/deps/npm/node_modules/init-package-json/package.json --- nodejs-0.10.28/deps/npm/node_modules/init-package-json/package.json 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/init-package-json/package.json 2014-06-09 17:04:36.000000000 +0000 @@ -1,6 +1,6 @@ { "name": "init-package-json", - "version": "0.0.16", + "version": "0.0.17", "main": "init-package-json.js", "scripts": { "test": "tap test/*.js" @@ -37,13 +37,29 @@ "prompt", "start" ], - "readme": "# init-package-json\n\nA node module to get your node module started.\n\n## Usage\n\n```javascript\nvar init = require('init-package-json')\nvar path = require('path')\n\n// a path to a promzard module. In the event that this file is\n// not found, one will be provided for you.\nvar initFile = path.resolve(process.env.HOME, '.npm-init')\n\n// the dir where we're doin stuff.\nvar dir = process.cwd()\n\n// extra stuff that gets put into the PromZard module's context.\n// In npm, this is the resolved config object. Exposed as 'config'\n// Optional.\nvar configData = { some: 'extra stuff' }\n\n// Any existing stuff from the package.json file is also exposed in the\n// PromZard module as the `package` object. There will also be free\n// vars for:\n// * `filename` path to the package.json file\n// * `basename` the tip of the package dir\n// * `dirname` the parent of the package dir\n\ninit(dir, initFile, configData, function (er, data) {\n // the data's already been written to {dir}/package.json\n // now you can do stuff with it\n})\n```\n\nOr from the command line:\n\n```\n$ npm-init\n```\n\nSee [PromZard](https://github.com/isaacs/promzard) for details about\nwhat can go in the config file.\n", - "readmeFilename": "README.md", + "gitHead": "cbc53fbedd4246d62ec99ea3a61a113a07d21629", "bugs": { "url": "https://github.com/isaacs/init-package-json/issues" }, "homepage": "https://github.com/isaacs/init-package-json", - "_id": "init-package-json@0.0.16", - "_shasum": "f7bb96fcb0a2c8061d15a2c3180323b17a65aa16", - "_from": "init-package-json@latest" + "_id": "init-package-json@0.0.17", + "_shasum": "395f2cb8d1c5af93ba6ec19dafa64717047f90c3", + "_from": "init-package-json@latest", + "_npmVersion": "1.4.10", + "_npmUser": { + "name": "isaacs", + "email": "i@izs.me" + }, + "maintainers": [ + { + "name": "isaacs", + "email": "i@izs.me" + } + ], + "dist": { + "shasum": "395f2cb8d1c5af93ba6ec19dafa64717047f90c3", + "tarball": "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.17.tgz" + }, + "directories": {}, + "_resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-0.0.17.tgz" } diff -Nru nodejs-0.10.28/deps/npm/node_modules/minimatch/minimatch.js nodejs-0.10.29/deps/npm/node_modules/minimatch/minimatch.js --- nodejs-0.10.28/deps/npm/node_modules/minimatch/minimatch.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/minimatch/minimatch.js 2014-06-09 17:04:36.000000000 +0000 @@ -813,11 +813,12 @@ } minimatch.match = function (list, pattern, options) { + options = options || {} var mm = new Minimatch(pattern, options) list = list.filter(function (f) { return mm.match(f) }) - if (options.nonull && !list.length) { + if (mm.options.nonull && !list.length) { list.push(pattern) } return list @@ -853,12 +854,17 @@ var set = this.set this.debug(this.pattern, "set", set) - var splitFile = path.basename(f.join("/")).split("/") + // Find the basename of the path by looking for the last non-empty segment + var filename; + for (var i = f.length - 1; i >= 0; i--) { + filename = f[i] + if (filename) break + } for (var i = 0, l = set.length; i < l; i ++) { var pattern = set[i], file = f if (options.matchBase && pattern.length === 1) { - file = splitFile + file = [filename] } var hit = this.matchOne(file, pattern, partial) if (hit) { @@ -975,7 +981,7 @@ } // no match was found. // However, in partial mode, we can't say this is necessarily over. - // If there's more *pattern* left, then + // If there's more *pattern* left, then if (partial) { // ran out of file this.debug("\n>>> no match, partial?", file, fr, pattern, pr) diff -Nru nodejs-0.10.28/deps/npm/node_modules/minimatch/node_modules/sigmund/package.json nodejs-0.10.29/deps/npm/node_modules/minimatch/node_modules/sigmund/package.json --- nodejs-0.10.28/deps/npm/node_modules/minimatch/node_modules/sigmund/package.json 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/minimatch/node_modules/sigmund/package.json 2014-06-09 17:04:36.000000000 +0000 @@ -32,11 +32,23 @@ }, "license": "BSD", "readme": "# sigmund\n\nQuick and dirty signatures for Objects.\n\nThis is like a much faster `deepEquals` comparison, which returns a\nstring key suitable for caches and the like.\n\n## Usage\n\n```javascript\nfunction doSomething (someObj) {\n var key = sigmund(someObj, maxDepth) // max depth defaults to 10\n var cached = cache.get(key)\n if (cached) return cached)\n\n var result = expensiveCalculation(someObj)\n cache.set(key, result)\n return result\n}\n```\n\nThe resulting key will be as unique and reproducible as calling\n`JSON.stringify` or `util.inspect` on the object, but is much faster.\nIn order to achieve this speed, some differences are glossed over.\nFor example, the object `{0:'foo'}` will be treated identically to the\narray `['foo']`.\n\nAlso, just as there is no way to summon the soul from the scribblings\nof a cocain-addled psychoanalyst, there is no way to revive the object\nfrom the signature string that sigmund gives you. In fact, it's\nbarely even readable.\n\nAs with `sys.inspect` and `JSON.stringify`, larger objects will\nproduce larger signature strings.\n\nBecause sigmund is a bit less strict than the more thorough\nalternatives, the strings will be shorter, and also there is a\nslightly higher chance for collisions. For example, these objects\nhave the same signature:\n\n var obj1 = {a:'b',c:/def/,g:['h','i',{j:'',k:'l'}]}\n var obj2 = {a:'b',c:'/def/',g:['h','i','{jkl']}\n\nLike a good Freudian, sigmund is most effective when you already have\nsome understanding of what you're looking for. It can help you help\nyourself, but you must be willing to do some work as well.\n\nCycles are handled, and cyclical objects are silently omitted (though\nthe key is included in the signature output.)\n\nThe second argument is the maximum depth, which defaults to 10,\nbecause that is the maximum object traversal depth covered by most\ninsurance carriers.\n", - "readmeFilename": "README.md", - "bugs": { - "url": "https://github.com/isaacs/sigmund/issues" - }, - "homepage": "https://github.com/isaacs/sigmund", "_id": "sigmund@1.0.0", - "_from": "sigmund@~1.0.0" + "dist": { + "shasum": "66a2b3a749ae8b5fb89efd4fcc01dc94fbe02296", + "tarball": "http://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz" + }, + "_npmVersion": "1.1.48", + "_npmUser": { + "name": "isaacs", + "email": "i@izs.me" + }, + "maintainers": [ + { + "name": "isaacs", + "email": "i@izs.me" + } + ], + "_shasum": "66a2b3a749ae8b5fb89efd4fcc01dc94fbe02296", + "_from": "sigmund@~1.0.0", + "_resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz" } diff -Nru nodejs-0.10.28/deps/npm/node_modules/minimatch/package.json nodejs-0.10.29/deps/npm/node_modules/minimatch/package.json --- nodejs-0.10.28/deps/npm/node_modules/minimatch/package.json 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/minimatch/package.json 2014-06-09 17:04:36.000000000 +0000 @@ -6,7 +6,7 @@ }, "name": "minimatch", "description": "a glob matcher in javascript", - "version": "0.2.14", + "version": "0.3.0", "repository": { "type": "git", "url": "git://github.com/isaacs/minimatch.git" @@ -29,12 +29,28 @@ "type": "MIT", "url": "http://github.com/isaacs/minimatch/raw/master/LICENSE" }, - "readme": "# minimatch\n\nA minimal matching utility.\n\n[![Build Status](https://secure.travis-ci.org/isaacs/minimatch.png)](http://travis-ci.org/isaacs/minimatch)\n\n\nThis is the matching library used internally by npm.\n\nEventually, it will replace the C binding in node-glob.\n\nIt works by converting glob expressions into JavaScript `RegExp`\nobjects.\n\n## Usage\n\n```javascript\nvar minimatch = require(\"minimatch\")\n\nminimatch(\"bar.foo\", \"*.foo\") // true!\nminimatch(\"bar.foo\", \"*.bar\") // false!\nminimatch(\"bar.foo\", \"*.+(bar|foo)\", { debug: true }) // true, and noisy!\n```\n\n## Features\n\nSupports these glob features:\n\n* Brace Expansion\n* Extended glob matching\n* \"Globstar\" `**` matching\n\nSee:\n\n* `man sh`\n* `man bash`\n* `man 3 fnmatch`\n* `man 5 gitignore`\n\n## Minimatch Class\n\nCreate a minimatch object by instanting the `minimatch.Minimatch` class.\n\n```javascript\nvar Minimatch = require(\"minimatch\").Minimatch\nvar mm = new Minimatch(pattern, options)\n```\n\n### Properties\n\n* `pattern` The original pattern the minimatch object represents.\n* `options` The options supplied to the constructor.\n* `set` A 2-dimensional array of regexp or string expressions.\n Each row in the\n array corresponds to a brace-expanded pattern. Each item in the row\n corresponds to a single path-part. For example, the pattern\n `{a,b/c}/d` would expand to a set of patterns like:\n\n [ [ a, d ]\n , [ b, c, d ] ]\n\n If a portion of the pattern doesn't have any \"magic\" in it\n (that is, it's something like `\"foo\"` rather than `fo*o?`), then it\n will be left as a string rather than converted to a regular\n expression.\n\n* `regexp` Created by the `makeRe` method. A single regular expression\n expressing the entire pattern. This is useful in cases where you wish\n to use the pattern somewhat like `fnmatch(3)` with `FNM_PATH` enabled.\n* `negate` True if the pattern is negated.\n* `comment` True if the pattern is a comment.\n* `empty` True if the pattern is `\"\"`.\n\n### Methods\n\n* `makeRe` Generate the `regexp` member if necessary, and return it.\n Will return `false` if the pattern is invalid.\n* `match(fname)` Return true if the filename matches the pattern, or\n false otherwise.\n* `matchOne(fileArray, patternArray, partial)` Take a `/`-split\n filename, and match it against a single row in the `regExpSet`. This\n method is mainly for internal use, but is exposed so that it can be\n used by a glob-walker that needs to avoid excessive filesystem calls.\n\nAll other methods are internal, and will be called as necessary.\n\n## Functions\n\nThe top-level exported function has a `cache` property, which is an LRU\ncache set to store 100 items. So, calling these methods repeatedly\nwith the same pattern and options will use the same Minimatch object,\nsaving the cost of parsing it multiple times.\n\n### minimatch(path, pattern, options)\n\nMain export. Tests a path against the pattern using the options.\n\n```javascript\nvar isJS = minimatch(file, \"*.js\", { matchBase: true })\n```\n\n### minimatch.filter(pattern, options)\n\nReturns a function that tests its\nsupplied argument, suitable for use with `Array.filter`. Example:\n\n```javascript\nvar javascripts = fileList.filter(minimatch.filter(\"*.js\", {matchBase: true}))\n```\n\n### minimatch.match(list, pattern, options)\n\nMatch against the list of\nfiles, in the style of fnmatch or glob. If nothing is matched, and\noptions.nonull is set, then return a list containing the pattern itself.\n\n```javascript\nvar javascripts = minimatch.match(fileList, \"*.js\", {matchBase: true}))\n```\n\n### minimatch.makeRe(pattern, options)\n\nMake a regular expression object from the pattern.\n\n## Options\n\nAll options are `false` by default.\n\n### debug\n\nDump a ton of stuff to stderr.\n\n### nobrace\n\nDo not expand `{a,b}` and `{1..3}` brace sets.\n\n### noglobstar\n\nDisable `**` matching against multiple folder names.\n\n### dot\n\nAllow patterns to match filenames starting with a period, even if\nthe pattern does not explicitly have a period in that spot.\n\nNote that by default, `a/**/b` will **not** match `a/.d/b`, unless `dot`\nis set.\n\n### noext\n\nDisable \"extglob\" style patterns like `+(a|b)`.\n\n### nocase\n\nPerform a case-insensitive match.\n\n### nonull\n\nWhen a match is not found by `minimatch.match`, return a list containing\nthe pattern itself. When set, an empty list is returned if there are\nno matches.\n\n### matchBase\n\nIf set, then patterns without slashes will be matched\nagainst the basename of the path if it contains slashes. For example,\n`a?b` would match the path `/xyz/123/acb`, but not `/xyz/acb/123`.\n\n### nocomment\n\nSuppress the behavior of treating `#` at the start of a pattern as a\ncomment.\n\n### nonegate\n\nSuppress the behavior of treating a leading `!` character as negation.\n\n### flipNegate\n\nReturns from negate expressions the same as if they were not negated.\n(Ie, true on a hit, false on a miss.)\n\n\n## Comparisons to other fnmatch/glob implementations\n\nWhile strict compliance with the existing standards is a worthwhile\ngoal, some discrepancies exist between minimatch and other\nimplementations, and are intentional.\n\nIf the pattern starts with a `!` character, then it is negated. Set the\n`nonegate` flag to suppress this behavior, and treat leading `!`\ncharacters normally. This is perhaps relevant if you wish to start the\npattern with a negative extglob pattern like `!(a|B)`. Multiple `!`\ncharacters at the start of a pattern will negate the pattern multiple\ntimes.\n\nIf a pattern starts with `#`, then it is treated as a comment, and\nwill not match anything. Use `\\#` to match a literal `#` at the\nstart of a line, or set the `nocomment` flag to suppress this behavior.\n\nThe double-star character `**` is supported by default, unless the\n`noglobstar` flag is set. This is supported in the manner of bsdglob\nand bash 4.1, where `**` only has special significance if it is the only\nthing in a path part. That is, `a/**/b` will match `a/x/y/b`, but\n`a/**b` will not.\n\nIf an escaped pattern has no matches, and the `nonull` flag is set,\nthen minimatch.match returns the pattern as-provided, rather than\ninterpreting the character escapes. For example,\n`minimatch.match([], \"\\\\*a\\\\?\")` will return `\"\\\\*a\\\\?\"` rather than\n`\"*a?\"`. This is akin to setting the `nullglob` option in bash, except\nthat it does not resolve escaped pattern characters.\n\nIf brace expansion is not disabled, then it is performed before any\nother interpretation of the glob pattern. Thus, a pattern like\n`+(a|{b),c)}`, which would not be valid in bash or zsh, is expanded\n**first** into the set of `+(a|b)` and `+(a|c)`, and those patterns are\nchecked for validity. Since those two are valid, matching proceeds.\n", - "readmeFilename": "README.md", "bugs": { "url": "https://github.com/isaacs/minimatch/issues" }, "homepage": "https://github.com/isaacs/minimatch", - "_id": "minimatch@0.2.14", - "_from": "minimatch@latest" + "_id": "minimatch@0.3.0", + "_shasum": "275d8edaac4f1bb3326472089e7949c8394699dd", + "_from": "minimatch@latest", + "_npmVersion": "1.4.10", + "_npmUser": { + "name": "isaacs", + "email": "i@izs.me" + }, + "maintainers": [ + { + "name": "isaacs", + "email": "i@izs.me" + } + ], + "dist": { + "shasum": "275d8edaac4f1bb3326472089e7949c8394699dd", + "tarball": "http://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz" + }, + "directories": {}, + "_resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz" } diff -Nru nodejs-0.10.28/deps/npm/node_modules/minimatch/README.md nodejs-0.10.29/deps/npm/node_modules/minimatch/README.md --- nodejs-0.10.28/deps/npm/node_modules/minimatch/README.md 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/minimatch/README.md 2014-06-09 17:04:36.000000000 +0000 @@ -157,8 +157,8 @@ ### nonull When a match is not found by `minimatch.match`, return a list containing -the pattern itself. When set, an empty list is returned if there are -no matches. +the pattern itself if this option is set. When not set, an empty list +is returned if there are no matches. ### matchBase diff -Nru nodejs-0.10.28/deps/npm/node_modules/minimatch/test/defaults.js nodejs-0.10.29/deps/npm/node_modules/minimatch/test/defaults.js --- nodejs-0.10.28/deps/npm/node_modules/minimatch/test/defaults.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/minimatch/test/defaults.js 2014-06-09 17:04:36.000000000 +0000 @@ -237,7 +237,7 @@ var pattern = c[0] , expect = c[1].sort(alpha) - , options = c[2] || {} + , options = c[2] , f = c[3] || files , tapOpts = c[4] || {} diff -Nru nodejs-0.10.28/deps/npm/node_modules/node-gyp/lib/configure.js nodejs-0.10.29/deps/npm/node_modules/node-gyp/lib/configure.js --- nodejs-0.10.28/deps/npm/node_modules/node-gyp/lib/configure.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/node-gyp/lib/configure.js 2014-06-09 17:04:36.000000000 +0000 @@ -327,6 +327,9 @@ // execute `gyp` from the current target nodedir argv.unshift(gyp_script) + // make sure python uses files that came with this particular node package + process.env.PYTHONPATH = path.resolve(__dirname, '..', 'gyp', 'pylib') + var cp = gyp.spawn(python, argv) cp.on('exit', onCpExit) } diff -Nru nodejs-0.10.28/deps/npm/node_modules/node-gyp/lib/node-gyp.js nodejs-0.10.29/deps/npm/node_modules/node-gyp/lib/node-gyp.js --- nodejs-0.10.28/deps/npm/node_modules/node-gyp/lib/node-gyp.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/node-gyp/lib/node-gyp.js 2014-06-09 17:04:36.000000000 +0000 @@ -203,9 +203,6 @@ return ' - ' + c + ' - ' + require('./' + c).usage }).join('\n') , '' - , ' for specific command usage and options try:' - , ' $ node-gyp --help' - , '' , 'node-gyp@' + this.version + ' ' + path.resolve(__dirname, '..') , 'node@' + process.versions.node ].join('\n') diff -Nru nodejs-0.10.28/deps/npm/node_modules/node-gyp/package.json nodejs-0.10.29/deps/npm/node_modules/node-gyp/package.json --- nodejs-0.10.28/deps/npm/node_modules/node-gyp/package.json 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/node-gyp/package.json 2014-06-09 17:04:36.000000000 +0000 @@ -10,7 +10,7 @@ "bindings", "gyp" ], - "version": "0.13.0", + "version": "0.13.1", "installVersion": 9, "author": { "name": "Nathan Rajlich", @@ -37,23 +37,40 @@ "osenv": "0", "request": "2", "rimraf": "2", - "semver": "~2.2.1", + "semver": "2", "tar": "0", "which": "1" }, "engines": { "node": ">= 0.8.0" }, - "readme": "node-gyp\n=========\n### Node.js native addon build tool\n\n`node-gyp` is a cross-platform command-line tool written in Node.js for compiling\nnative addon modules for Node.js, which takes away the pain of dealing with the\nvarious differences in build platforms. It is the replacement to the `node-waf`\nprogram which is removed for node `v0.8`. If you have a native addon for node that\nstill has a `wscript` file, then you should definitely add a `binding.gyp` file\nto support the latest versions of node.\n\nMultiple target versions of node are supported (i.e. `0.8`, `0.9`, `0.10`, ..., `1.0`,\netc.), regardless of what version of node is actually installed on your system\n(`node-gyp` downloads the necessary development files for the target version).\n\n#### Features:\n\n * Easy to use, consistent interface\n * Same commands to build your module on every platform\n * Supports multiple target versions of Node\n\n\nInstallation\n------------\n\nYou can install with `npm`:\n\n``` bash\n$ npm install -g node-gyp\n```\n\nYou will also need to install:\n\n * On Unix:\n * `python` (`v2.7` recommended, `v3.x.x` is __*not*__ supported)\n * `make`\n * A proper C/C++ compiler toolchain, like GCC\n * On Windows:\n * [Python][windows-python] ([`v2.7.3`][windows-python-v2.7.3] recommended, `v3.x.x` is __*not*__ supported)\n * Windows XP/Vista/7:\n * Microsoft Visual Studio C++ 2010 ([Express][msvc2010] version works well)\n * For 64-bit builds of node and native modules you will _**also**_ need the [Windows 7 64-bit SDK][win7sdk]\n * If the install fails, try uninstalling any C++ 2010 x64&x86 Redistributable that you have installed first.\n * If you get errors that the 64-bit compilers are not installed you may also need the [compiler update for the Windows SDK 7.1]\n * Windows 7/8:\n * Microsoft Visual Studio C++ 2012 for Windows Desktop ([Express][msvc2012] version works well)\n\nNote that OS X is just a flavour of Unix and so needs `python`, `make`, and C/C++.\nAn easy way to obtain these is to install XCode from Apple,\nand then use it to install the command line tools (under Preferences -> Downloads).\n\nHow to Use\n----------\n\nTo compile your native addon, first go to its root directory:\n\n``` bash\n$ cd my_node_addon\n```\n\nThe next step is to generate the appropriate project build files for the current\nplatform. Use `configure` for that:\n\n``` bash\n$ node-gyp configure\n```\n\n__Note__: The `configure` step looks for the `binding.gyp` file in the current\ndirectory to processs. See below for instructions on creating the `binding.gyp` file.\n\nNow you will have either a `Makefile` (on Unix platforms) or a `vcxproj` file\n(on Windows) in the `build/` directory. Next invoke the `build` command:\n\n``` bash\n$ node-gyp build\n```\n\nNow you have your compiled `.node` bindings file! The compiled bindings end up\nin `build/Debug/` or `build/Release/`, depending on the build mode. At this point\nyou can require the `.node` file with Node and run your tests!\n\n__Note:__ To create a _Debug_ build of the bindings file, pass the `--debug` (or\n`-d`) switch when running the either `configure` or `build` command.\n\n\nThe \"binding.gyp\" file\n----------------------\n\nPreviously when node had `node-waf` you had to write a `wscript` file. The\nreplacement for that is the `binding.gyp` file, which describes the configuration\nto build your module in a JSON-like format. This file gets placed in the root of\nyour package, alongside the `package.json` file.\n\nA barebones `gyp` file appropriate for building a node addon looks like:\n\n``` python\n{\n \"targets\": [\n {\n \"target_name\": \"binding\",\n \"sources\": [ \"src/binding.cc\" ]\n }\n ]\n}\n```\n\nSome additional resources for writing `gyp` files:\n\n * [\"Hello World\" node addon example](https://github.com/joyent/node/tree/master/test/addons/hello-world)\n * [gyp user documentation](http://code.google.com/p/gyp/wiki/GypUserDocumentation)\n * [gyp input format reference](http://code.google.com/p/gyp/wiki/InputFormatReference)\n * [*\"binding.gyp\" files out in the wild* wiki page](https://github.com/TooTallNate/node-gyp/wiki/%22binding.gyp%22-files-out-in-the-wild)\n\n\nCommands\n--------\n\n`node-gyp` responds to the following commands:\n\n| **Command** | **Description**\n|:--------------|:---------------------------------------------------------------\n| `build` | Invokes `make`/`msbuild.exe` and builds the native addon\n| `clean` | Removes any the `build` dir if it exists\n| `configure` | Generates project build files for the current platform\n| `rebuild` | Runs \"clean\", \"configure\" and \"build\" all in a row\n| `install` | Installs node development header files for the given version\n| `list` | Lists the currently installed node development file versions\n| `remove` | Removes the node development header files for the given version\n\n\nLicense\n-------\n\n(The MIT License)\n\nCopyright (c) 2012 Nathan Rajlich <nathan@tootallnate.net>\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n'Software'), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\n\n[windows-python]: http://www.python.org/getit/windows\n[windows-python-v2.7.3]: http://www.python.org/download/releases/2.7.3#download\n[msvc2010]: http://go.microsoft.com/?linkid=9709949\n[msvc2012]: http://go.microsoft.com/?linkid=9816758\n[win7sdk]: http://www.microsoft.com/en-us/download/details.aspx?id=8279\n[compiler update for the Windows SDK 7.1]: http://www.microsoft.com/en-us/download/details.aspx?id=4422\n", - "readmeFilename": "README.md", "bugs": { "url": "https://github.com/TooTallNate/node-gyp/issues" }, "homepage": "https://github.com/TooTallNate/node-gyp", - "_id": "node-gyp@0.13.0", + "_id": "node-gyp@0.13.1", + "_shasum": "5a484dd2dc13d5b894a8fe781a250c07eae7bffa", + "_from": "node-gyp@~0.13.0", + "_npmVersion": "1.4.9", + "_npmUser": { + "name": "tootallnate", + "email": "nathan@tootallnate.net" + }, + "maintainers": [ + { + "name": "TooTallNate", + "email": "nathan@tootallnate.net" + }, + { + "name": "tootallnate", + "email": "nathan@tootallnate.net" + } + ], "dist": { - "shasum": "97765303203579f1445358d4d25d03645811d87d" + "shasum": "5a484dd2dc13d5b894a8fe781a250c07eae7bffa", + "tarball": "http://registry.npmjs.org/node-gyp/-/node-gyp-0.13.1.tgz" }, - "_from": "node-gyp@latest", - "_resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-0.13.0.tgz" + "directories": {}, + "_resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-0.13.1.tgz", + "readme": "ERROR: No README data found!" } diff -Nru nodejs-0.10.28/deps/npm/node_modules/node-gyp/README.md nodejs-0.10.29/deps/npm/node_modules/node-gyp/README.md --- nodejs-0.10.28/deps/npm/node_modules/node-gyp/README.md 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/node-gyp/README.md 2014-06-09 17:04:36.000000000 +0000 @@ -45,6 +45,21 @@ * Windows 7/8: * Microsoft Visual Studio C++ 2012 for Windows Desktop ([Express][msvc2012] version works well) +If you have multiple Python versions installed, you can identify which Python +version `node-gyp` uses by setting the '--python' variable: + +``` bash +$ node-gyp --python /path/to/python2.7 +``` + +If `node-gyp` is called by way of `npm` *and* you have multiple versions of +Python installed, then you can set `npm`'s 'python' config key to the appropriate +value: + +``` bash +$ npm config set python /path/to/executable/python2.7 +``` + Note that OS X is just a flavour of Unix and so needs `python`, `make`, and C/C++. An easy way to obtain these is to install XCode from Apple, and then use it to install the command line tools (under Preferences -> Downloads). diff -Nru nodejs-0.10.28/deps/npm/node_modules/npm-cache-filename/index.js nodejs-0.10.29/deps/npm/node_modules/npm-cache-filename/index.js --- nodejs-0.10.28/deps/npm/node_modules/npm-cache-filename/index.js 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npm-cache-filename/index.js 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,20 @@ +var url = require('url');; +var path = require('path');; + +module.exports = cf;; + +function cf(root, u) { + if (!u) + return cf.bind(null, root);; + + u = url.parse(u);; + var h = u.host.replace(/:/g, '_');; + // Strip off any /-rev/... or ?rev=... bits + var revre = /(\?rev=|\?.*?&rev=|\/-rev\/).*$/ + var parts = u.path.replace(revre, '').split('/').slice(1) + var p = [root, h].concat(parts.map(function(part) { + return encodeURIComponent(part).replace(/%/g, '_');; + }));; + + return path.join.apply(path, p);; +} diff -Nru nodejs-0.10.28/deps/npm/node_modules/npm-cache-filename/LICENSE nodejs-0.10.29/deps/npm/node_modules/npm-cache-filename/LICENSE --- nodejs-0.10.28/deps/npm/node_modules/npm-cache-filename/LICENSE 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npm-cache-filename/LICENSE 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,15 @@ +The ISC License + +Copyright (c) npm, Inc. and Contributors + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR +IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff -Nru nodejs-0.10.28/deps/npm/node_modules/npm-cache-filename/package.json nodejs-0.10.29/deps/npm/node_modules/npm-cache-filename/package.json --- nodejs-0.10.28/deps/npm/node_modules/npm-cache-filename/package.json 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npm-cache-filename/package.json 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,33 @@ +{ + "name": "npm-cache-filename", + "version": "1.0.1", + "description": "Given a cache folder and url, return the appropriate cache folder.", + "main": "index.js", + "dependencies": {}, + "devDependencies": { + "tap": "^0.4.10" + }, + "scripts": { + "test": "tap test.js" + }, + "repository": { + "type": "git", + "url": "git://github.com/npm/npm-cache-filename" + }, + "author": { + "name": "Isaac Z. Schlueter", + "email": "i@izs.me", + "url": "http://blog.izs.me/" + }, + "license": "ISC", + "bugs": { + "url": "https://github.com/npm/npm-cache-filename/issues" + }, + "homepage": "https://github.com/npm/npm-cache-filename", + "readme": "# npm-cache-filename\n\nGiven a cache folder and url, return the appropriate cache folder.\n\n## USAGE\n\n```javascript\nvar cf = require('npm-cache-filename');\nconsole.log(cf('/tmp/cache', 'https://registry.npmjs.org:1234/foo/bar'));\n// outputs: /tmp/cache/registry.npmjs.org_1234/foo/bar\n```\n\nAs a bonus, you can also bind it to a specific root path:\n\n```javascript\nvar cf = require('npm-cache-filename');\nvar getFile = cf('/tmp/cache');\n\nconsole.log(getFile('https://registry.npmjs.org:1234/foo/bar'));\n// outputs: /tmp/cache/registry.npmjs.org_1234/foo/bar\n```\n", + "readmeFilename": "README.md", + "_id": "npm-cache-filename@1.0.1", + "_shasum": "9b640f0c1a5ba1145659685372a9ff71f70c4323", + "_from": "npm-cache-filename@latest", + "_resolved": "https://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.1.tgz" +} diff -Nru nodejs-0.10.28/deps/npm/node_modules/npm-cache-filename/README.md nodejs-0.10.29/deps/npm/node_modules/npm-cache-filename/README.md --- nodejs-0.10.28/deps/npm/node_modules/npm-cache-filename/README.md 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npm-cache-filename/README.md 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,21 @@ +# npm-cache-filename + +Given a cache folder and url, return the appropriate cache folder. + +## USAGE + +```javascript +var cf = require('npm-cache-filename'); +console.log(cf('/tmp/cache', 'https://registry.npmjs.org:1234/foo/bar')); +// outputs: /tmp/cache/registry.npmjs.org_1234/foo/bar +``` + +As a bonus, you can also bind it to a specific root path: + +```javascript +var cf = require('npm-cache-filename'); +var getFile = cf('/tmp/cache'); + +console.log(getFile('https://registry.npmjs.org:1234/foo/bar')); +// outputs: /tmp/cache/registry.npmjs.org_1234/foo/bar +``` diff -Nru nodejs-0.10.28/deps/npm/node_modules/npm-cache-filename/test.js nodejs-0.10.29/deps/npm/node_modules/npm-cache-filename/test.js --- nodejs-0.10.28/deps/npm/node_modules/npm-cache-filename/test.js 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npm-cache-filename/test.js 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,21 @@ +var test = require('tap').test;; +test('it does the thing it says it does', function(t) { + var cf = require('./');; + + t.equal(cf('/tmp/cache', 'https://foo:134/xyz?adf=foo:bar/baz'), + '/tmp/cache/foo_134/xyz_3Fadf_3Dfoo_3Abar/baz');; + + var getFile = cf('/tmp/cache');; + t.equal(getFile('https://foo:134/xyz?adf=foo:bar/baz'), + '/tmp/cache/foo_134/xyz_3Fadf_3Dfoo_3Abar/baz');; + + t.equal(cf("/tmp", "https://foo:134/xyz/-rev/baz"), + '/tmp/foo_134/xyz') + t.equal(cf("/tmp", "https://foo:134/xyz/?rev=baz"), + '/tmp/foo_134/xyz') + t.equal(cf("/tmp", "https://foo:134/xyz/?foo&rev=baz"), + '/tmp/foo_134/xyz') + t.equal(cf("/tmp", "https://foo:134/xyz-rev/baz"), + '/tmp/foo_134/xyz-rev/baz') + t.end(); +});; diff -Nru nodejs-0.10.28/deps/npm/node_modules/npmconf/config-defs.js nodejs-0.10.29/deps/npm/node_modules/npmconf/config-defs.js --- nodejs-0.10.28/deps/npm/node_modules/npmconf/config-defs.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npmconf/config-defs.js 2014-06-09 17:04:36.000000000 +0000 @@ -162,7 +162,7 @@ , key: null , link: false , "local-address" : undefined - , loglevel : "http" + , loglevel : "warn" , logstream : process.stderr , long : false , message : "%s" @@ -196,6 +196,7 @@ , shell : osenv.shell() , shrinkwrap: true , "sign-git-tag": false + , spin: true , "strict-ssl": true , tag : "latest" , tmp : temp @@ -303,6 +304,7 @@ , shell : String , shrinkwrap: Boolean , "sign-git-tag": Boolean + , spin: ["always", Boolean] , "strict-ssl": Boolean , tag : String , tmp : path diff -Nru nodejs-0.10.28/deps/npm/node_modules/npmconf/lib/find-prefix.js nodejs-0.10.29/deps/npm/node_modules/npmconf/lib/find-prefix.js --- nodejs-0.10.28/deps/npm/node_modules/npmconf/lib/find-prefix.js 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npmconf/lib/find-prefix.js 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,56 @@ +// try to find the most reasonable prefix to use + +module.exports = findPrefix + +var fs = require("fs") +var path = require("path") + +function findPrefix (p, cb_) { + function cb (er, p) { + process.nextTick(function () { + cb_(er, p) + }) + } + + p = path.resolve(p) + // if there's no node_modules folder, then + // walk up until we hopefully find one. + // if none anywhere, then use cwd. + var walkedUp = false + while (path.basename(p) === "node_modules") { + p = path.dirname(p) + walkedUp = true + } + if (walkedUp) return cb(null, p) + + findPrefix_(p, p, cb) +} + +function findPrefix_ (p, original, cb) { + if (p === "/" + || (process.platform === "win32" && p.match(/^[a-zA-Z]:(\\|\/)?$/))) { + return cb(null, original) + } + fs.readdir(p, function (er, files) { + // an error right away is a bad sign. + // unless the prefix was simply a non + // existent directory. + if (er && p === original) { + if (er.code === "ENOENT") return cb(null, original); + return cb(er) + } + + // walked up too high or something. + if (er) return cb(null, original) + + if (files.indexOf("node_modules") !== -1 + || files.indexOf("package.json") !== -1) { + return cb(null, p) + } + + var d = path.dirname(p) + if (d === p) return cb(null, original) + + return findPrefix_(d, original, cb) + }) +} diff -Nru nodejs-0.10.28/deps/npm/node_modules/npmconf/lib/load-prefix.js nodejs-0.10.29/deps/npm/node_modules/npmconf/lib/load-prefix.js --- nodejs-0.10.28/deps/npm/node_modules/npmconf/lib/load-prefix.js 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npmconf/lib/load-prefix.js 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,51 @@ +module.exports = loadPrefix + +var findPrefix = require("./find-prefix.js") +var mkdirp = require("mkdirp") +var path = require('path') + +function loadPrefix (cb) { + var cli = this.list[0] + + // try to guess at a good node_modules location. + var p + , gp + + if (!Object.prototype.hasOwnProperty.call(cli, "prefix")) { + p = process.cwd() + } else { + p = this.get("prefix") + } + gp = this.get("prefix") + + findPrefix(p, function (er, p) { + Object.defineProperty(this, "localPrefix", + { get : function () { return p } + , set : function (r) { return p = r } + , enumerable : true + }) + // the prefix MUST exist, or else nothing works. + if (!this.get("global")) { + mkdirp(p, next.bind(this)) + } else { + next.bind(this)(er) + } + }.bind(this)) + + gp = path.resolve(gp) + Object.defineProperty(this, "globalPrefix", + { get : function () { return gp } + , set : function (r) { return gp = r } + , enumerable : true + }) + // the prefix MUST exist, or else nothing works. + mkdirp(gp, next.bind(this)) + + var i = 2 + var errState = null + function next (er) { + if (errState) return + if (er) return cb(errState = er) + if (--i === 0) return cb() + } +} diff -Nru nodejs-0.10.28/deps/npm/node_modules/npmconf/lib/load-uid.js nodejs-0.10.29/deps/npm/node_modules/npmconf/lib/load-uid.js --- nodejs-0.10.28/deps/npm/node_modules/npmconf/lib/load-uid.js 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npmconf/lib/load-uid.js 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,15 @@ +module.exports = loadUid + +var getUid = require("uid-number") + +// Call in the context of a npmconf object + +function loadUid (cb) { + // if we're not in unsafe-perm mode, then figure out who + // to run stuff as. Do this first, to support `npm update npm -g` + if (!this.get("unsafe-perm")) { + getUid(this.get("user"), this.get("group"), cb) + } else { + process.nextTick(cb) + } +} diff -Nru nodejs-0.10.28/deps/npm/node_modules/npmconf/lib/set-user.js nodejs-0.10.29/deps/npm/node_modules/npmconf/lib/set-user.js --- nodejs-0.10.28/deps/npm/node_modules/npmconf/lib/set-user.js 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npmconf/lib/set-user.js 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,23 @@ +module.exports = setUser + +var path = require('path') +var fs = require('fs') + +function setUser (cb) { + var defaultConf = Object.getPrototypeOf(this.root) + + // If global, leave it as-is. + // If not global, then set the user to the owner of the prefix folder. + // Just set the default, so it can be overridden. + if (this.get("global")) return cb() + if (process.env.SUDO_UID) { + defaultConf.user = +(process.env.SUDO_UID) + return cb() + } + + var prefix = path.resolve(this.get("prefix")) + fs.stat(prefix, function (er, st) { + defaultConf.user = st && st.uid + return cb(er) + }) +} diff -Nru nodejs-0.10.28/deps/npm/node_modules/npmconf/node_modules/config-chain/node_modules/proto-list/package.json nodejs-0.10.29/deps/npm/node_modules/npmconf/node_modules/config-chain/node_modules/proto-list/package.json --- nodejs-0.10.28/deps/npm/node_modules/npmconf/node_modules/config-chain/node_modules/proto-list/package.json 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npmconf/node_modules/config-chain/node_modules/proto-list/package.json 2014-06-09 17:04:36.000000000 +0000 @@ -23,12 +23,22 @@ "tap": "0" }, "readme": "A list of objects, bound by their prototype chain.\n\nUsed in npm's config stuff.\n", - "readmeFilename": "README.md", - "bugs": { - "url": "https://github.com/isaacs/proto-list/issues" - }, - "homepage": "https://github.com/isaacs/proto-list", "_id": "proto-list@1.2.2", + "dist": { + "shasum": "48b88798261ec2c4a785720cdfec6200d57d3326", + "tarball": "http://registry.npmjs.org/proto-list/-/proto-list-1.2.2.tgz" + }, + "maintainers": [ + { + "name": "isaacs", + "email": "i@izs.me" + }, + { + "name": "substack", + "email": "mail@substack.net" + } + ], + "directories": {}, "_shasum": "48b88798261ec2c4a785720cdfec6200d57d3326", "_from": "proto-list@~1.2.1", "_resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.2.tgz" diff -Nru nodejs-0.10.28/deps/npm/node_modules/npmconf/node_modules/config-chain/package.json nodejs-0.10.29/deps/npm/node_modules/npmconf/node_modules/config-chain/package.json --- nodejs-0.10.28/deps/npm/node_modules/npmconf/node_modules/config-chain/package.json 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npmconf/node_modules/config-chain/package.json 2014-06-09 17:04:36.000000000 +0000 @@ -28,7 +28,27 @@ "url": "https://github.com/dominictarr/config-chain/issues" }, "_id": "config-chain@1.1.8", - "_shasum": "0943d0b7227213a20d4eaff4434f4a1c0a052cad", + "dist": { + "shasum": "0943d0b7227213a20d4eaff4434f4a1c0a052cad", + "tarball": "http://registry.npmjs.org/config-chain/-/config-chain-1.1.8.tgz" + }, "_from": "config-chain@~1.1.8", + "_npmVersion": "1.3.6", + "_npmUser": { + "name": "dominictarr", + "email": "dominic.tarr@gmail.com" + }, + "maintainers": [ + { + "name": "dominictarr", + "email": "dominic.tarr@gmail.com" + }, + { + "name": "isaacs", + "email": "i@izs.me" + } + ], + "directories": {}, + "_shasum": "0943d0b7227213a20d4eaff4434f4a1c0a052cad", "_resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.8.tgz" } diff -Nru nodejs-0.10.28/deps/npm/node_modules/npmconf/npmconf.js nodejs-0.10.29/deps/npm/node_modules/npmconf/npmconf.js --- nodejs-0.10.28/deps/npm/node_modules/npmconf/npmconf.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npmconf/npmconf.js 2014-06-09 17:04:36.000000000 +0000 @@ -10,6 +10,7 @@ var ini = require('ini') var Octal = configDefs.Octal var mkdirp = require('mkdirp') +var path = require('path') exports.load = load exports.Conf = Conf @@ -17,9 +18,11 @@ exports.rootConf = null exports.usingBuiltin = false exports.defs = configDefs + Object.defineProperty(exports, 'defaults', { get: function () { return configDefs.defaults }, enumerable: true }) + Object.defineProperty(exports, 'types', { get: function () { return configDefs.types }, enumerable: true }) @@ -67,6 +70,7 @@ loadCbs.push(cb) if (loading) return + loading = true cb = once(function (er, conf) { @@ -81,46 +85,68 @@ // check for a builtin if provided. exports.usingBuiltin = !!builtin var rc = exports.rootConf = new Conf() - var defaults = configDefs.defaults if (builtin) rc.addFile(builtin, 'builtin') else rc.add({}, 'builtin') rc.on('load', function () { - var conf = new Conf(rc) - conf.usingBuiltin = !!builtin - conf.add(cli, 'cli') - conf.addEnv() + load_(builtin, rc, cli, cb) + }) +} + +function load_(builtin, rc, cli, cb) { + var defaults = configDefs.defaults + var conf = new Conf(rc) + + conf.usingBuiltin = !!builtin + conf.add(cli, 'cli') + conf.addEnv() + + conf.loadExtras(function(er) { + if (er) + return cb(er) + + if (!conf.get('global')) { + var projectConf = path.resolve(conf.localPrefix, '.npmrc') + conf.addFile(projectConf, 'project') + conf.once('load', afterPrefix) + } + else return afterPrefix() + }) + + function afterPrefix() { conf.addFile(conf.get('userconfig'), 'user') conf.once('error', cb) + conf.once('load', afterUser) + } + + function afterUser () { + // globalconfig and globalignorefile defaults + // need to respond to the 'prefix' setting up to this point. + // Eg, `npm config get globalconfig --prefix ~/local` should + // return `~/local/etc/npmrc` + // annoying humans and their expectations! + if (conf.get('prefix')) { + var etc = path.resolve(conf.get('prefix'), 'etc') + defaults.globalconfig = path.resolve(etc, 'npmrc') + defaults.globalignorefile = path.resolve(etc, 'npmignore') + } + + conf.addFile(conf.get('globalconfig'), 'global') + + // move the builtin into the conf stack now. + conf.root = defaults + conf.add(rc.shift(), 'builtin') conf.once('load', function () { - // globalconfig and globalignorefile defaults - // need to respond to the "prefix" setting up to this point. - // Eg, `npm config get globalconfig --prefix ~/local` should - // return `~/local/etc/npmrc` - // annoying humans and their expectations! - if (conf.get('prefix')) { - var etc = path.resolve(conf.get("prefix"), "etc") - defaults.globalconfig = path.resolve(etc, "npmrc") - defaults.globalignorefile = path.resolve(etc, "npmignore") - } - conf.addFile(conf.get('globalconfig'), 'global') - - // move the builtin into the conf stack now. - conf.root = defaults - conf.add(rc.shift(), 'builtin') - conf.once('load', function () { - // warn about invalid bits. - validate(conf) - exports.loaded = conf - cb(null, conf) - }) + // warn about invalid bits. + validate(conf) + exports.loaded = conf + cb(null, conf) }) - }) + } } - // Basically the same as CC, but: // 1. Always ini // 2. Parses environment variable names in field values @@ -142,6 +168,23 @@ this.root = configDefs.defaults } +Conf.prototype.loadPrefix = require('./lib/load-prefix.js') +Conf.prototype.loadUid = require('./lib/load-uid.js') +Conf.prototype.setUser = require('./lib/set-user.js') +Conf.prototype.findPrefix = require('./lib/find-prefix.js') + +Conf.prototype.loadExtras = function(cb) { + this.loadPrefix(function(er) { + if (er) + return cb(er) + this.setUser(function(er) { + if (er) + return cb(er) + this.loadUid(cb) + }.bind(this)) + }.bind(this)) +} + Conf.prototype.save = function (where, cb) { var target = this.sources[where] if (!target || !(target.path || target.source) || !target.data) { @@ -316,7 +359,7 @@ } function envReplace (f) { - if (typeof f !== "string" || !f) return f + if (typeof f !== 'string' || !f) return f // replace any ${ENV} values with the appropriate environ. var envExpr = /(\\*)\$\{([^}]+)\}/g @@ -325,7 +368,7 @@ if (esc) return orig if (undefined === process.env[name]) - throw new Error("Failed to replace env in config: "+orig) + throw new Error('Failed to replace env in config: '+orig) return process.env[name] }) } diff -Nru nodejs-0.10.28/deps/npm/node_modules/npmconf/package.json nodejs-0.10.29/deps/npm/node_modules/npmconf/package.json --- nodejs-0.10.28/deps/npm/node_modules/npmconf/package.json 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npmconf/package.json 2014-06-09 17:04:36.000000000 +0000 @@ -1,6 +1,6 @@ { "name": "npmconf", - "version": "0.1.15", + "version": "1.0.1", "description": "The config thing npm uses", "main": "npmconf.js", "directories": { @@ -9,12 +9,13 @@ "dependencies": { "config-chain": "~1.1.8", "inherits": "~2.0.0", - "once": "~1.3.0", + "ini": "^1.2.0", "mkdirp": "~0.3.3", - "osenv": "0.0.3", "nopt": "2", + "once": "~1.3.0", + "osenv": "0.0.3", "semver": "2", - "ini": "~1.1.0" + "uid-number": "0.0.5" }, "devDependencies": { "tap": "~0.4.0" @@ -41,11 +42,12 @@ "license": "BSD", "readme": "# npmconf\n\nThe config thing npm uses\n\nIf you are interested in interacting with the config settings that npm\nuses, then use this module.\n\nHowever, if you are writing a new Node.js program, and want\nconfiguration functionality similar to what npm has, but for your\nown thing, then I'd recommend using [rc](https://github.com/dominictarr/rc),\nwhich is probably what you want.\n\nIf I were to do it all over again, that's what I'd do for npm. But,\nalas, there are many systems depending on many of the particulars of\nnpm's configuration setup, so it's not worth the cost of changing.\n\n## USAGE\n\n```javascript\nvar npmconf = require('npmconf')\n\n// pass in the cli options that you read from the cli\n// or whatever top-level configs you want npm to use for now.\nnpmconf.load({some:'configs'}, function (er, conf) {\n // do stuff with conf\n conf.get('some', 'cli') // 'configs'\n conf.get('username') // 'joebobwhatevers'\n conf.set('foo', 'bar', 'user')\n conf.save('user', function (er) {\n // foo = bar is now saved to ~/.npmrc or wherever\n })\n})\n```\n", "readmeFilename": "README.md", + "gitHead": "7da0322e33d6116378f6a2206d8b8fa113c06e4b", "bugs": { "url": "https://github.com/isaacs/npmconf/issues" }, "homepage": "https://github.com/isaacs/npmconf", - "_id": "npmconf@0.1.15", - "_shasum": "9df0f0545d04d121330c32a5be9d351b4a8df029", + "_id": "npmconf@1.0.1", + "_shasum": "3503d12c6585395b0d8378d76e2d4a2453a23328", "_from": "npmconf@latest" } diff -Nru nodejs-0.10.28/deps/npm/node_modules/npmconf/test/basic.js nodejs-0.10.29/deps/npm/node_modules/npmconf/test/basic.js --- nodejs-0.10.28/deps/npm/node_modules/npmconf/test/basic.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npmconf/test/basic.js 2014-06-09 17:04:36.000000000 +0000 @@ -1,6 +1,9 @@ var test = require('tap').test var npmconf = require('../npmconf.js') var common = require('./00-setup.js') +var path = require('path') + +var projectData = {} var ucData = { globalconfig: common.globalconfig, @@ -29,6 +32,7 @@ httponly: true } } var envData = { userconfig: common.userconfig, 'other-env-thing': '1000' } +var envDataFix = { userconfig: common.userconfig, 'other-env-thing': 1000 } var gcData = { 'package-config:foo': 'boo' } @@ -38,7 +42,8 @@ var expectList = [ cli, - envData, + envDataFix, + projectData, ucData, gcData, biData ] @@ -46,9 +51,13 @@ var expectSources = { cli: { data: cli }, env: - { data: envData, + { data: envDataFix, source: envData, prefix: '' }, + project: + { path: path.resolve(__dirname, '..', '.npmrc'), + type: 'ini', + data: projectData }, user: { path: common.userconfig, type: 'ini', diff -Nru nodejs-0.10.28/deps/npm/node_modules/npmconf/test/builtin.js nodejs-0.10.29/deps/npm/node_modules/npmconf/test/builtin.js --- nodejs-0.10.28/deps/npm/node_modules/npmconf/test/builtin.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npmconf/test/builtin.js 2014-06-09 17:04:36.000000000 +0000 @@ -1,6 +1,7 @@ var test = require('tap').test var npmconf = require('../npmconf.js') var common = require('./00-setup.js') +var path = require('path') var ucData = { globalconfig: common.globalconfig, @@ -29,6 +30,7 @@ httponly: true } } var envData = { userconfig: common.userconfig, 'other-env-thing': '1000' } +var envDataFix = { userconfig: common.userconfig, 'other-env-thing': 1000 } var gcData = { 'package-config:foo': 'boo' } @@ -36,9 +38,12 @@ var cli = { foo: 'bar', heading: 'foo', 'git-tag-version': false } +var projectData = {} + var expectList = [ cli, - envData, + envDataFix, + projectData, ucData, gcData, biData ] @@ -46,9 +51,13 @@ var expectSources = { cli: { data: cli }, env: - { data: envData, + { data: envDataFix, source: envData, prefix: '' }, + project: + { path: path.resolve(__dirname, '..', '.npmrc'), + type: 'ini', + data: projectData }, user: { path: common.userconfig, type: 'ini', diff -Nru nodejs-0.10.28/deps/npm/node_modules/npmconf/test/fixtures/.npmrc nodejs-0.10.29/deps/npm/node_modules/npmconf/test/fixtures/.npmrc --- nodejs-0.10.28/deps/npm/node_modules/npmconf/test/fixtures/.npmrc 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npmconf/test/fixtures/.npmrc 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1 @@ +just = testing diff -Nru nodejs-0.10.28/deps/npm/node_modules/npmconf/test/project.js nodejs-0.10.29/deps/npm/node_modules/npmconf/test/project.js --- nodejs-0.10.28/deps/npm/node_modules/npmconf/test/project.js 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npmconf/test/project.js 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,85 @@ +var test = require('tap').test +var npmconf = require('../npmconf.js') +var common = require('./00-setup.js') +var path = require('path') +var fix = path.resolve(__dirname, 'fixtures') +var projectRc = path.resolve(fix, '.npmrc') + +var projectData = { just: 'testing' } + +var ucData = + { globalconfig: common.globalconfig, + email: 'i@izs.me', + 'env-thing': 'asdf', + 'init.author.name': 'Isaac Z. Schlueter', + 'init.author.email': 'i@izs.me', + 'init.author.url': 'http://blog.izs.me/', + 'proprietary-attribs': false, + 'npm:publishtest': true, + '_npmjs.org:couch': 'https://admin:password@localhost:5984/registry', + _auth: 'dXNlcm5hbWU6cGFzc3dvcmQ=', + 'npm-www:nocache': '1', + nodedir: '/Users/isaacs/dev/js/node-v0.8', + 'sign-git-tag': true, + message: 'v%s', + 'strict-ssl': false, + 'tmp': process.env.HOME + '/.tmp', + username : "username", + _password : "password", + _token: + { AuthSession: 'yabba-dabba-doodle', + version: '1', + expires: '1345001053415', + path: '/', + httponly: true } } + +var envData = { userconfig: common.userconfig, 'other-env-thing': '1000' } +var envDataFix = { userconfig: common.userconfig, 'other-env-thing': 1000 } + +var gcData = { 'package-config:foo': 'boo' } + +var biData = {} + +var cli = { foo: 'bar', umask: 022, prefix: fix } + +var expectList = +[ cli, + envDataFix, + projectData, + ucData, + gcData, + biData ] + +var expectSources = +{ cli: { data: cli }, + env: + { data: envDataFix, + source: envData, + prefix: '' }, + project: + { path: projectRc, + type: 'ini', + data: projectData }, + user: + { path: common.userconfig, + type: 'ini', + data: ucData }, + global: + { path: common.globalconfig, + type: 'ini', + data: gcData }, + builtin: { data: biData } } + +test('no builtin', function (t) { + npmconf.load(cli, function (er, conf) { + if (er) throw er + t.same(conf.list, expectList) + t.same(conf.sources, expectSources) + t.same(npmconf.rootConf.list, []) + t.equal(npmconf.rootConf.root, npmconf.defs.defaults) + t.equal(conf.root, npmconf.defs.defaults) + t.equal(conf.get('umask'), 022) + t.equal(conf.get('heading'), 'npm') + t.end() + }) +}) diff -Nru nodejs-0.10.28/deps/npm/node_modules/npm-install-checks/LICENSE nodejs-0.10.29/deps/npm/node_modules/npm-install-checks/LICENSE --- nodejs-0.10.28/deps/npm/node_modules/npm-install-checks/LICENSE 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npm-install-checks/LICENSE 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,6 @@ -Copyright (c) Robert Kowalski ("Author") +Copyright (c) Robert Kowalski and Isaac Z. Schlueter ("Authors") All rights reserved. - The BSD License Redistribution and use in source and binary forms, with or without @@ -15,10 +14,10 @@ notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS +PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR @@ -26,209 +25,3 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -This uses parts of npm, (c) Isaac Z. Schlueter, under the following license: - - -The Artistic License 2.0 - -Copyright (c) 2000-2006, The Perl Foundation. - -Everyone is permitted to copy and distribute verbatim copies -of this license document, but changing it is not allowed. - -Preamble - -This license establishes the terms under which a given free software -Package may be copied, modified, distributed, and/or redistributed. -The intent is that the Copyright Holder maintains some artistic -control over the development of that Package while still keeping the -Package available as open source and free software. - -You are always permitted to make arrangements wholly outside of this -license directly with the Copyright Holder of a given Package. If the -terms of this license do not permit the full use that you propose to -make of the Package, you should contact the Copyright Holder and seek -a different licensing arrangement. - -Definitions - - "Copyright Holder" means the individual(s) or organization(s) - named in the copyright notice for the entire Package. - - "Contributor" means any party that has contributed code or other - material to the Package, in accordance with the Copyright Holder's - procedures. - - "You" and "your" means any person who would like to copy, - distribute, or modify the Package. - - "Package" means the collection of files distributed by the - Copyright Holder, and derivatives of that collection and/or of - those files. A given Package may consist of either the Standard - Version, or a Modified Version. - - "Distribute" means providing a copy of the Package or making it - accessible to anyone else, or in the case of a company or - organization, to others outside of your company or organization. - - "Distributor Fee" means any fee that you charge for Distributing - this Package or providing support for this Package to another - party. It does not mean licensing fees. - - "Standard Version" refers to the Package if it has not been - modified, or has been modified only in ways explicitly requested - by the Copyright Holder. - - "Modified Version" means the Package, if it has been changed, and - such changes were not explicitly requested by the Copyright - Holder. - - "Original License" means this Artistic License as Distributed with - the Standard Version of the Package, in its current version or as - it may be modified by The Perl Foundation in the future. - - "Source" form means the source code, documentation source, and - configuration files for the Package. - - "Compiled" form means the compiled bytecode, object code, binary, - or any other form resulting from mechanical transformation or - translation of the Source form. - - -Permission for Use and Modification Without Distribution - -(1) You are permitted to use the Standard Version and create and use -Modified Versions for any purpose without restriction, provided that -you do not Distribute the Modified Version. - - -Permissions for Redistribution of the Standard Version - -(2) You may Distribute verbatim copies of the Source form of the -Standard Version of this Package in any medium without restriction, -either gratis or for a Distributor Fee, provided that you duplicate -all of the original copyright notices and associated disclaimers. At -your discretion, such verbatim copies may or may not include a -Compiled form of the Package. - -(3) You may apply any bug fixes, portability changes, and other -modifications made available from the Copyright Holder. The resulting -Package will still be considered the Standard Version, and as such -will be subject to the Original License. - - -Distribution of Modified Versions of the Package as Source - -(4) You may Distribute your Modified Version as Source (either gratis -or for a Distributor Fee, and with or without a Compiled form of the -Modified Version) provided that you clearly document how it differs -from the Standard Version, including, but not limited to, documenting -any non-standard features, executables, or modules, and provided that -you do at least ONE of the following: - - (a) make the Modified Version available to the Copyright Holder - of the Standard Version, under the Original License, so that the - Copyright Holder may include your modifications in the Standard - Version. - - (b) ensure that installation of your Modified Version does not - prevent the user installing or running the Standard Version. In - addition, the Modified Version must bear a name that is different - from the name of the Standard Version. - - (c) allow anyone who receives a copy of the Modified Version to - make the Source form of the Modified Version available to others - under - - (i) the Original License or - - (ii) a license that permits the licensee to freely copy, - modify and redistribute the Modified Version using the same - licensing terms that apply to the copy that the licensee - received, and requires that the Source form of the Modified - Version, and of any works derived from it, be made freely - available in that license fees are prohibited but Distributor - Fees are allowed. - - -Distribution of Compiled Forms of the Standard Version -or Modified Versions without the Source - -(5) You may Distribute Compiled forms of the Standard Version without -the Source, provided that you include complete instructions on how to -get the Source of the Standard Version. Such instructions must be -valid at the time of your distribution. If these instructions, at any -time while you are carrying out such distribution, become invalid, you -must provide new instructions on demand or cease further distribution. -If you provide valid instructions or cease distribution within thirty -days after you become aware that the instructions are invalid, then -you do not forfeit any of your rights under this license. - -(6) You may Distribute a Modified Version in Compiled form without -the Source, provided that you comply with Section 4 with respect to -the Source of the Modified Version. - - -Aggregating or Linking the Package - -(7) You may aggregate the Package (either the Standard Version or -Modified Version) with other packages and Distribute the resulting -aggregation provided that you do not charge a licensing fee for the -Package. Distributor Fees are permitted, and licensing fees for other -components in the aggregation are permitted. The terms of this license -apply to the use and Distribution of the Standard or Modified Versions -as included in the aggregation. - -(8) You are permitted to link Modified and Standard Versions with -other works, to embed the Package in a larger work of your own, or to -build stand-alone binary or bytecode versions of applications that -include the Package, and Distribute the result without restriction, -provided the result does not expose a direct interface to the Package. - - -Items That are Not Considered Part of a Modified Version - -(9) Works (including, but not limited to, modules and scripts) that -merely extend or make use of the Package, do not, by themselves, cause -the Package to be a Modified Version. In addition, such works are not -considered parts of the Package itself, and are not subject to the -terms of this license. - - -General Provisions - -(10) Any use, modification, and distribution of the Standard or -Modified Versions is governed by this Artistic License. By using, -modifying or distributing the Package, you accept this license. Do not -use, modify, or distribute the Package, if you do not accept this -license. - -(11) If your Modified Version has been derived from a Modified -Version made by someone other than you, you are nevertheless required -to ensure that your Modified Version complies with the requirements of -this license. - -(12) This license does not grant you the right to use any trademark, -service mark, tradename, or logo of the Copyright Holder. - -(13) This license includes the non-exclusive, worldwide, -free-of-charge patent license to make, have made, use, offer to sell, -sell, import and otherwise transfer the Package with respect to any -patent claims licensable by the Copyright Holder that are necessarily -infringed by the Package. If you institute patent litigation -(including a cross-claim or counterclaim) against any party alleging -that the Package constitutes direct or contributory patent -infringement, then this Artistic License to you shall terminate on the -date that such litigation is filed. - -(14) Disclaimer of Warranty: -THE PACKAGE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS -IS' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. THE IMPLIED -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR -NON-INFRINGEMENT ARE DISCLAIMED TO THE EXTENT PERMITTED BY YOUR LOCAL -LAW. UNLESS REQUIRED BY LAW, NO COPYRIGHT HOLDER OR CONTRIBUTOR WILL -BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THE PACKAGE, EVEN IF -ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff -Nru nodejs-0.10.28/deps/npm/node_modules/npm-install-checks/package.json nodejs-0.10.29/deps/npm/node_modules/npm-install-checks/package.json --- nodejs-0.10.28/deps/npm/node_modules/npm-install-checks/package.json 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npm-install-checks/package.json 2014-06-09 17:04:36.000000000 +0000 @@ -1,11 +1,11 @@ { "name": "npm-install-checks", - "version": "1.0.0", + "version": "1.0.1", "description": "checks that npm runs during the installation of a module", "main": "index.js", "dependencies": { "npmlog": "0.0.6", - "semver": "~2.2.1" + "semver": "^2.3.0" }, "devDependencies": { "tap": "~0.4.8", @@ -17,9 +17,9 @@ }, "repository": { "type": "git", - "url": "git://github.com/robertkowalski/npm-install-checks.git" + "url": "git://github.com/npm/npm-install-checks.git" }, - "homepage": "https://github.com/robertkowalski/npm-install-checks", + "homepage": "https://github.com/npm/npm-install-checks", "keywords": [ "npm,", "install" @@ -30,14 +30,11 @@ }, "license": "BSD-2-Clause", "bugs": { - "url": "https://github.com/robertkowalski/npm-install-checks/issues" + "url": "https://github.com/npm/npm-install-checks/issues" }, "readme": "# npm-install-checks\n\nA package that contains checks that npm runs during the installation.\n\n## API\n\n### .checkEngine(target, npmVer, nodeVer, force, strict, cb)\nCheck if node/npm version is supported by the package.\n\nError type: `ENOTSUP`\n\n### .checkPlatform(target, force, cb)\nCheck if OS/Arch is supported by the package.\n\nError type: `EBADPLATFORM`\n\n### .checkCycle(target, ancestors, cb)\nCheck for cyclic dependencies.\n\nError type: `ECYCLE`\n\n### .checkGit(folder, cb)\nCheck if a folder is a .git folder.\n\nError type: `EISGIT`\n", "readmeFilename": "README.md", - "_id": "npm-install-checks@1.0.0", - "dist": { - "shasum": "7e1469b5e0c693b2ae2a8830b5fc4e7bf76c88fd" - }, - "_from": "npm-install-checks@1.0.0", - "_resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.0.tgz" + "_id": "npm-install-checks@1.0.1", + "_shasum": "547a73dec58acfd52365012e60de9418b6405101", + "_from": "npm-install-checks@~1.0.0" } diff -Nru nodejs-0.10.28/deps/npm/node_modules/npmlog/package.json nodejs-0.10.29/deps/npm/node_modules/npmlog/package.json --- nodejs-0.10.28/deps/npm/node_modules/npmlog/package.json 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npmlog/package.json 2014-06-09 17:04:36.000000000 +0000 @@ -28,5 +28,23 @@ "url": "https://github.com/isaacs/npmlog/issues" }, "_id": "npmlog@0.0.6", - "_from": "npmlog@latest" + "dist": { + "shasum": "685043fe71aa1665d6e3b2acef180640caf40873", + "tarball": "http://registry.npmjs.org/npmlog/-/npmlog-0.0.6.tgz" + }, + "_from": "npmlog@latest", + "_npmVersion": "1.3.11", + "_npmUser": { + "name": "isaacs", + "email": "i@izs.me" + }, + "maintainers": [ + { + "name": "isaacs", + "email": "i@izs.me" + } + ], + "directories": {}, + "_shasum": "685043fe71aa1665d6e3b2acef180640caf40873", + "_resolved": "https://registry.npmjs.org/npmlog/-/npmlog-0.0.6.tgz" } diff -Nru nodejs-0.10.28/deps/npm/node_modules/npm-registry-client/index.js nodejs-0.10.29/deps/npm/node_modules/npm-registry-client/index.js --- nodejs-0.10.28/deps/npm/node_modules/npm-registry-client/index.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npm-registry-client/index.js 2014-06-09 17:04:36.000000000 +0000 @@ -6,6 +6,7 @@ , url = require('url') , path = require('path') , npmlog +, cacheFile = require('npm-cache-filename') try { npmlog = require("npmlog") @@ -45,7 +46,10 @@ registry = null } + this.registry = registry + if (!conf.get('cache')) throw new Error("Cache dir is required") + this.cacheFile = cacheFile(this.conf.get('cache')) this.log = conf.log || conf.get('log') || npmlog } diff -Nru nodejs-0.10.28/deps/npm/node_modules/npm-registry-client/lib/adduser.js nodejs-0.10.29/deps/npm/node_modules/npm-registry-client/lib/adduser.js --- nodejs-0.10.28/deps/npm/node_modules/npm-registry-client/lib/adduser.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npm-registry-client/lib/adduser.js 2014-06-09 17:04:36.000000000 +0000 @@ -1,11 +1,5 @@ module.exports = adduser -var crypto = require('crypto') - -function sha (s) { - return crypto.createHash("sha1").update(s).digest("hex") -} - function adduser (username, password, email, cb) { password = ("" + (password || "")).trim() @@ -17,12 +11,7 @@ return cb(new Error("Please use a real email address.")) } - if (password.indexOf(":") !== -1) return cb(new Error( - "Sorry, ':' chars are not allowed in passwords.\n"+ - "See for why.")) - - var salt = crypto.randomBytes(30).toString('hex') - , userobj = + var userobj = { name : username , password : password , email : email diff -Nru nodejs-0.10.28/deps/npm/node_modules/npm-registry-client/lib/deprecate.js nodejs-0.10.29/deps/npm/node_modules/npm-registry-client/lib/deprecate.js --- nodejs-0.10.28/deps/npm/node_modules/npm-registry-client/lib/deprecate.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npm-registry-client/lib/deprecate.js 2014-06-09 17:04:36.000000000 +0000 @@ -12,8 +12,6 @@ return cb(new Error("invalid version range: "+ver)) } - var users = {} - this.get(name + '?write=true', function (er, data) { if (er) return cb(er) // filter all the versions that match diff -Nru nodejs-0.10.28/deps/npm/node_modules/npm-registry-client/lib/get.js nodejs-0.10.29/deps/npm/node_modules/npm-registry-client/lib/get.js --- nodejs-0.10.28/deps/npm/node_modules/npm-registry-client/lib/get.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npm-registry-client/lib/get.js 2014-06-09 17:04:36.000000000 +0000 @@ -10,7 +10,6 @@ if (typeof cb !== "function") cb = staleOk, staleOk = false if (typeof cb !== "function") cb = nofollow, nofollow = false if (typeof cb !== "function") cb = timeout, timeout = -1 - if (typeof cb !== "function") cb = version, version = null timeout = Math.min(timeout, this.conf.get('cache-max') || 0) timeout = Math.max(timeout, this.conf.get('cache-min') || -Infinity) @@ -22,18 +21,15 @@ && process.env.COMP_POINT !== undefined ) timeout = Math.max(timeout, 60000) + var cache = this.cacheFile(this.registry + uri) + "/.cache.json" + // /-/all is special. // It uses timestamp-based caching and partial updates, // because it is a monster. if (uri === "/-/all") { - return requestAll.call(this, cb) + return requestAll.call(this, cache, cb) } - var cacheUri = uri - // on windows ":" is not an allowed character in a foldername - cacheUri = cacheUri.replace(/:/g, '_').replace(/\?write=true$/, '') - var cache = path.join(this.conf.get('cache'), cacheUri, ".cache.json") - // If the GET is part of a write operation (PUT or DELETE), then // skip past the cache entirely, but still save the results. if (uri.match(/\?write=true$/)) @@ -50,27 +46,25 @@ }.bind(this)) } -function requestAll (cb) { - var cache = path.join(this.conf.get('cache'), "/-/all", ".cache.json") - - mkdir(path.join(this.conf.get('cache'), "-", "all"), function (er) { +function requestAll (cache, cb) { + mkdir(path.dirname(cache), function (er) { fs.readFile(cache, function (er, data) { - if (er) return requestAll_.call(this, 0, {}, cb) + if (er) return requestAll_.call(this, 0, {}, cache, cb) try { data = JSON.parse(data) } catch (ex) { fs.writeFile(cache, "{}", function (er) { if (er) return cb(new Error("Broken cache.")) - return requestAll_.call(this, 0, {}, cb) + return requestAll_.call(this, 0, {}, cache, cb) }.bind(this)) } var t = +data._updated || 0 - requestAll_.call(this, t, data, cb) + requestAll_.call(this, t, data, cache, cb) }.bind(this)) }.bind(this)) } -function requestAll_ (c, data, cb) { +function requestAll_ (c, data, cache, cb) { // use the cache and update in the background if it's not too old if (Date.now() - c < 60000) { cb(null, data) @@ -84,7 +78,6 @@ uri = "/-/all" } - var cache = path.join(this.conf.get('cache'), "-/all", ".cache.json") this.request('GET', uri, function (er, updates, _, res) { if (er) return cb(er, data) var headers = res.headers diff -Nru nodejs-0.10.28/deps/npm/node_modules/npm-registry-client/lib/publish.js nodejs-0.10.29/deps/npm/node_modules/npm-registry-client/lib/publish.js --- nodejs-0.10.28/deps/npm/node_modules/npm-registry-client/lib/publish.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npm-registry-client/lib/publish.js 2014-06-09 17:04:36.000000000 +0000 @@ -1,8 +1,7 @@ module.exports = publish -var path = require("path") - , url = require("url") +var url = require("url") , semver = require("semver") , crypto = require("crypto") , fs = require("fs") @@ -29,14 +28,14 @@ var self = this fs.stat(tarball, function(er, s) { if (er) return cb(er) - fs.readFile(tarball, 'base64', function(er, tardata) { + fs.readFile(tarball, function(er, tarbuffer) { if (er) return cb(er) - putFirst.call(self, data, tardata, s, username, email, cb) + putFirst.call(self, data, tarbuffer, s, username, email, cb) }) }) } -function putFirst (data, tardata, stat, username, email, cb) { +function putFirst (data, tarbuffer, stat, username, email, cb) { // optimistically try to PUT all in one single atomic thing. // If 409, then GET and merge, try again. // If other error, then fail. @@ -66,14 +65,14 @@ data._id = data.name+"@"+data.version data.dist = data.dist || {} - data.dist.shasum = crypto.createHash("sha1").update(tardata, 'base64').digest("hex") + data.dist.shasum = crypto.createHash("sha1").update(tarbuffer).digest("hex") data.dist.tarball = url.resolve(registry, tbURI) .replace(/^https:\/\//, "http://") root._attachments = {} root._attachments[ tbName ] = { content_type: 'application/octet-stream', - data: tardata, + data: tarbuffer.toString('base64'), length: stat.size }; diff -Nru nodejs-0.10.28/deps/npm/node_modules/npm-registry-client/lib/request.js nodejs-0.10.29/deps/npm/node_modules/npm-registry-client/lib/request.js --- nodejs-0.10.28/deps/npm/node_modules/npm-registry-client/lib/request.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npm-registry-client/lib/request.js 2014-06-09 17:04:36.000000000 +0000 @@ -2,13 +2,13 @@ var url = require("url") , zlib = require("zlib") - , fs = require("graceful-fs") , rm = require("rimraf") , asyncMap = require("slide").asyncMap , Stream = require("stream").Stream , request = require("request") , retry = require("retry") , crypto = require("crypto") + , pkg = require("../package.json") function regRequest (method, where, what, etag, nofollow, cb_) { if (typeof cb_ !== "function") cb_ = nofollow, nofollow = false @@ -79,7 +79,7 @@ if (authRequired && !auth) { return cb(new Error( - "Cannot insert data into the registry without auth")) + "This request requires auth credentials. Run `npm login` and repeat the request.")) } if (auth && authRequired) { @@ -101,7 +101,7 @@ + " at " + (new Date()).toLocaleTimeString()) makeRequest.call(self, method, remote, where, what, etag, nofollow , function (er, parsed, raw, response) { - if (!er || er.message.match(/^SSL Error/)) { + if (!er || (er.message && er.message.match(/^SSL Error/))) { if (er) er.code = 'ESSL' return cb(er, parsed, raw, response) @@ -149,6 +149,7 @@ } headers['npm-session'] = this.sessionToken + headers.version = this.version || pkg.version if (this.refer) { headers.referer = this.refer @@ -255,7 +256,7 @@ , null, data, response ) } - var er = null + er = null if (parsed && response.headers.etag) { parsed._etag = response.headers.etag } @@ -280,26 +281,7 @@ // from thinking that it didn't work when it did. // Note that failure is an acceptable option here, since the // only result will be a stale cache for some helper commands. - var path = require("path") - , p = url.parse(where).pathname.split("/") - , _ = "/" - , caches = p.map(function (part) { - part = part.replace(/:/g, "_") - return _ = path.join(_, part) - }).map(function (cache) { - return path.join(this.conf.get('cache'), cache, ".cache.json") - }, this) - - // if the method is DELETE, then also remove the thing itself. - // Note that the search index is probably invalid. Whatever. - // That's what you get for deleting stuff. Don't do that. - if (method === "DELETE") { - p = p.slice(0, p.indexOf("-rev")) - p = p.join("/").replace(/:/g, "_") - caches.push(path.join(this.conf.get('cache'), p)) - } - - asyncMap(caches, rm, function () {}) + rm(this.cacheFile(where), function() {}) } return cb(er, parsed, data, response) }.bind(this) diff -Nru nodejs-0.10.28/deps/npm/node_modules/npm-registry-client/lib/star.js nodejs-0.10.29/deps/npm/node_modules/npm-registry-client/lib/star.js --- nodejs-0.10.28/deps/npm/node_modules/npm-registry-client/lib/star.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npm-registry-client/lib/star.js 2014-06-09 17:04:36.000000000 +0000 @@ -5,8 +5,6 @@ if (!this.conf.get('username')) return cb(new Error( "Must be logged in to star/unstar packages")) - var users = {} - this.request("GET", package + '?write=true', function (er, fullData) { if (er) return cb(er) diff -Nru nodejs-0.10.28/deps/npm/node_modules/npm-registry-client/lib/stars.js nodejs-0.10.29/deps/npm/node_modules/npm-registry-client/lib/stars.js --- nodejs-0.10.28/deps/npm/node_modules/npm-registry-client/lib/stars.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npm-registry-client/lib/stars.js 2014-06-09 17:04:36.000000000 +0000 @@ -1,5 +1,3 @@ -var qs = require('querystring') - module.exports = stars function stars (name, cb) { diff -Nru nodejs-0.10.28/deps/npm/node_modules/npm-registry-client/lib/tag.js nodejs-0.10.29/deps/npm/node_modules/npm-registry-client/lib/tag.js --- nodejs-0.10.28/deps/npm/node_modules/npm-registry-client/lib/tag.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npm-registry-client/lib/tag.js 2014-06-09 17:04:36.000000000 +0000 @@ -1,6 +1,6 @@ module.exports = tag -function tag (project, version, tag, cb) { - this.request("PUT", project+"/"+tag, JSON.stringify(version), cb) +function tag (project, version, tagName, cb) { + this.request("PUT", project+"/"+tagName, JSON.stringify(version), cb) } diff -Nru nodejs-0.10.28/deps/npm/node_modules/npm-registry-client/lib/unpublish.js nodejs-0.10.29/deps/npm/node_modules/npm-registry-client/lib/unpublish.js --- nodejs-0.10.28/deps/npm/node_modules/npm-registry-client/lib/unpublish.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npm-registry-client/lib/unpublish.js 2014-06-09 17:04:36.000000000 +0000 @@ -29,10 +29,11 @@ var versions = data.versions || {} , versionPublic = versions.hasOwnProperty(ver) + var dist if (!versionPublic) { this.log.info("unpublish", name+"@"+ver+" not published") } else { - var dist = versions[ver].dist + dist = versions[ver].dist this.log.verbose("unpublish", "removing attachments", dist) } diff -Nru nodejs-0.10.28/deps/npm/node_modules/npm-registry-client/package.json nodejs-0.10.29/deps/npm/node_modules/npm-registry-client/package.json --- nodejs-0.10.28/deps/npm/node_modules/npm-registry-client/package.json 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npm-registry-client/package.json 2014-06-09 17:04:36.000000000 +0000 @@ -6,7 +6,7 @@ }, "name": "npm-registry-client", "description": "Client for the npm registry", - "version": "0.4.8", + "version": "1.0.0", "repository": { "url": "git://github.com/isaacs/npm-registry-client" }, @@ -15,14 +15,15 @@ "test": "tap test/*.js" }, "dependencies": { - "request": "2 >=2.25.0", - "graceful-fs": "~2.0.0", - "semver": "^2.2.1", - "slide": "~1.1.3", "chownr": "0", + "graceful-fs": "~2.0.0", "mkdirp": "~0.3.3", - "rimraf": "~2", + "npm-cache-filename": "^1.0.0", + "request": "2 >=2.25.0", "retry": "0.6.0", + "rimraf": "~2", + "semver": "2 >=2.2.1", + "slide": "~1.1.3", "npmlog": "" }, "devDependencies": { @@ -32,13 +33,13 @@ "npmlog": "" }, "license": "BSD", - "readme": "# npm-registry-client\n\nThe code that npm uses to talk to the registry.\n\nIt handles all the caching and HTTP calls.\n\n## Usage\n\n```javascript\nvar RegClient = require('npm-registry-client')\nvar client = new RegClient(config)\n\nclient.get(\"npm\", \"latest\", 1000, function (er, data, raw, res) {\n // error is an error if there was a problem.\n // data is the parsed data object\n // raw is the json string\n // res is the response from couch\n})\n```\n\n# Configuration\n\nThis program is designed to work with\n[npmconf](https://npmjs.org/package/npmconf), but you can also pass in\na plain-jane object with the appropriate configs, and it'll shim it\nfor you. Any configuration thingie that has get/set/del methods will\nalso be accepted.\n\n* `registry` **Required** {String} URL to the registry\n* `cache` **Required** {String} Path to the cache folder\n* `always-auth` {Boolean} Auth even for GET requests.\n* `auth` {String} A base64-encoded `username:password`\n* `email` {String} User's email address\n* `tag` {String} The default tag to use when publishing new packages.\n Default = `\"latest\"`\n* `ca` {String} Cerficate signing authority certificates to trust.\n* `cert` {String} Client certificate (PEM encoded). Enable access\n to servers that require client certificates\n* `key` {String} Private key (PEM encoded) for client certificate 'cert'\n* `strict-ssl` {Boolean} Whether or not to be strict with SSL\n certificates. Default = `true`\n* `user-agent` {String} User agent header to send. Default =\n `\"node/{process.version} {process.platform} {process.arch}\"`\n* `log` {Object} The logger to use. Defaults to `require(\"npmlog\")` if\n that works, otherwise logs are disabled.\n* `fetch-retries` {Number} Number of times to retry on GET failures.\n Default=2\n* `fetch-retry-factor` {Number} `factor` setting for `node-retry`. Default=10\n* `fetch-retry-mintimeout` {Number} `minTimeout` setting for `node-retry`.\n Default=10000 (10 seconds)\n* `fetch-retry-maxtimeout` {Number} `maxTimeout` setting for `node-retry`.\n Default=60000 (60 seconds)\n* `proxy` {URL} The url to proxy requests through.\n* `https-proxy` {URL} The url to proxy https requests through.\n Defaults to be the same as `proxy` if unset.\n* `_auth` {String} The base64-encoded authorization header.\n* `username` `_password` {String} Username/password to use to generate\n `_auth` if not supplied.\n* `_token` {Object} A token for use with\n [couch-login](https://npmjs.org/package/couch-login)\n\n# client.request(method, where, [what], [etag], [nofollow], cb)\n\n* `method` {String} HTTP method\n* `where` {String} Path to request on the server\n* `what` {Stream | Buffer | String | Object} The request body. Objects\n that are not Buffers or Streams are encoded as JSON.\n* `etag` {String} The cached ETag\n* `nofollow` {Boolean} Prevent following 302/301 responses\n* `cb` {Function}\n * `error` {Error | null}\n * `data` {Object} the parsed data object\n * `raw` {String} the json\n * `res` {Response Object} response from couch\n\nMake a request to the registry. All the other methods are wrappers\naround this. one.\n\n# client.adduser(username, password, email, cb)\n\n* `username` {String}\n* `password` {String}\n* `email` {String}\n* `cb` {Function}\n\nAdd a user account to the registry, or verify the credentials.\n\n# client.deprecate(name, version, message, cb)\n\n* `name` {String} The package name\n* `version` {String} Semver version range\n* `message` {String} The message to use as a deprecation warning\n* `cb` {Function}\n\nDeprecate a version of a package in the registry.\n\n# client.bugs(name, cb)\n\n* `name` {String} the name of the package\n* `cb` {Function}\n\nGet the url for bugs of a package\n\n# client.get(url, [timeout], [nofollow], [staleOk], cb)\n\n* `url` {String} The url path to fetch\n* `timeout` {Number} Number of seconds old that a cached copy must be\n before a new request will be made.\n* `nofollow` {Boolean} Do not follow 301/302 responses\n* `staleOk` {Boolean} If there's cached data available, then return that\n to the callback quickly, and update the cache the background.\n\nFetches data from the registry via a GET request, saving it in\nthe cache folder with the ETag.\n\n# client.publish(data, tarball, [readme], cb)\n\n* `data` {Object} Package data\n* `tarball` {String | Stream} Filename or stream of the package tarball\n* `readme` {String} Contents of the README markdown file\n* `cb` {Function}\n\nPublish a package to the registry.\n\nNote that this does not create the tarball from a folder. However, it\ncan accept a gzipped tar stream or a filename to a tarball.\n\n# client.star(package, starred, cb)\n\n* `package` {String} Name of the package to star\n* `starred` {Boolean} True to star the package, false to unstar it.\n* `cb` {Function}\n\nStar or unstar a package.\n\nNote that the user does not have to be the package owner to star or\nunstar a package, though other writes do require that the user be the\npackage owner.\n\n# client.stars(username, cb)\n\n* `username` {String} Name of user to fetch starred packages for.\n* `cb` {Function}\n\nView your own or another user's starred packages.\n\n# client.tag(project, version, tag, cb)\n\n* `project` {String} Project name\n* `version` {String} Version to tag\n* `tag` {String} Tag name to apply\n* `cb` {Function}\n\nMark a version in the `dist-tags` hash, so that `pkg@tag`\nwill fetch the specified version.\n\n# client.unpublish(name, [ver], cb)\n\n* `name` {String} package name\n* `ver` {String} version to unpublish. Leave blank to unpublish all\n versions.\n* `cb` {Function}\n\nRemove a version of a package (or all versions) from the registry. When\nthe last version us unpublished, the entire document is removed from the\ndatabase.\n\n# client.upload(where, file, [etag], [nofollow], cb)\n\n* `where` {String} URL path to upload to\n* `file` {String | Stream} Either the filename or a readable stream\n* `etag` {String} Cache ETag\n* `nofollow` {Boolean} Do not follow 301/302 responses\n* `cb` {Function}\n\nUpload an attachment. Mostly used by `client.publish()`.\n", + "readme": "# npm-registry-client\n\nThe code that npm uses to talk to the registry.\n\nIt handles all the caching and HTTP calls.\n\n## Usage\n\n```javascript\nvar RegClient = require('npm-registry-client')\nvar client = new RegClient(config)\n\nclient.get(\"npm\", \"latest\", 1000, function (er, data, raw, res) {\n // error is an error if there was a problem.\n // data is the parsed data object\n // raw is the json string\n // res is the response from couch\n})\n```\n\n# Configuration\n\nThis program is designed to work with\n[npmconf](https://npmjs.org/package/npmconf), but you can also pass in\na plain-jane object with the appropriate configs, and it'll shim it\nfor you. Any configuration thingie that has get/set/del methods will\nalso be accepted.\n\n* `registry` **Required** {String} URL to the registry\n* `cache` **Required** {String} Path to the cache folder\n* `always-auth` {Boolean} Auth even for GET requests.\n* `auth` {String} A base64-encoded `username:password`\n* `email` {String} User's email address\n* `tag` {String} The default tag to use when publishing new packages.\n Default = `\"latest\"`\n* `ca` {String} Cerficate signing authority certificates to trust.\n* `cert` {String} Client certificate (PEM encoded). Enable access\n to servers that require client certificates\n* `key` {String} Private key (PEM encoded) for client certificate 'cert'\n* `strict-ssl` {Boolean} Whether or not to be strict with SSL\n certificates. Default = `true`\n* `user-agent` {String} User agent header to send. Default =\n `\"node/{process.version} {process.platform} {process.arch}\"`\n* `log` {Object} The logger to use. Defaults to `require(\"npmlog\")` if\n that works, otherwise logs are disabled.\n* `fetch-retries` {Number} Number of times to retry on GET failures.\n Default=2\n* `fetch-retry-factor` {Number} `factor` setting for `node-retry`. Default=10\n* `fetch-retry-mintimeout` {Number} `minTimeout` setting for `node-retry`.\n Default=10000 (10 seconds)\n* `fetch-retry-maxtimeout` {Number} `maxTimeout` setting for `node-retry`.\n Default=60000 (60 seconds)\n* `proxy` {URL} The url to proxy requests through.\n* `https-proxy` {URL} The url to proxy https requests through.\n Defaults to be the same as `proxy` if unset.\n* `_auth` {String} The base64-encoded authorization header.\n* `username` `_password` {String} Username/password to use to generate\n `_auth` if not supplied.\n* `_token` {Object} A token for use with\n [couch-login](https://npmjs.org/package/couch-login)\n\n# client.request(method, where, [what], [etag], [nofollow], cb)\n\n* `method` {String} HTTP method\n* `where` {String} Path to request on the server\n* `what` {Stream | Buffer | String | Object} The request body. Objects\n that are not Buffers or Streams are encoded as JSON.\n* `etag` {String} The cached ETag\n* `nofollow` {Boolean} Prevent following 302/301 responses\n* `cb` {Function}\n * `error` {Error | null}\n * `data` {Object} the parsed data object\n * `raw` {String} the json\n * `res` {Response Object} response from couch\n\nMake a request to the registry. All the other methods are wrappers\naround this. one.\n\n# client.adduser(username, password, email, cb)\n\n* `username` {String}\n* `password` {String}\n* `email` {String}\n* `cb` {Function}\n\nAdd a user account to the registry, or verify the credentials.\n\n# client.deprecate(name, version, message, cb)\n\n* `name` {String} The package name\n* `version` {String} Semver version range\n* `message` {String} The message to use as a deprecation warning\n* `cb` {Function}\n\nDeprecate a version of a package in the registry.\n\n# client.bugs(name, cb)\n\n* `name` {String} the name of the package\n* `cb` {Function}\n\nGet the url for bugs of a package\n\n# client.get(url, [timeout], [nofollow], [staleOk], cb)\n\n* `url` {String} The url path to fetch\n* `timeout` {Number} Number of seconds old that a cached copy must be\n before a new request will be made.\n* `nofollow` {Boolean} Do not follow 301/302 responses\n* `staleOk` {Boolean} If there's cached data available, then return that\n to the callback quickly, and update the cache the background.\n\nFetches data from the registry via a GET request, saving it in\nthe cache folder with the ETag.\n\n# client.publish(data, tarball, cb)\n\n* `data` {Object} Package data\n* `tarball` {String | Stream} Filename or stream of the package tarball\n* `cb` {Function}\n\nPublish a package to the registry.\n\nNote that this does not create the tarball from a folder. However, it\ncan accept a gzipped tar stream or a filename to a tarball.\n\n# client.star(package, starred, cb)\n\n* `package` {String} Name of the package to star\n* `starred` {Boolean} True to star the package, false to unstar it.\n* `cb` {Function}\n\nStar or unstar a package.\n\nNote that the user does not have to be the package owner to star or\nunstar a package, though other writes do require that the user be the\npackage owner.\n\n# client.stars(username, cb)\n\n* `username` {String} Name of user to fetch starred packages for.\n* `cb` {Function}\n\nView your own or another user's starred packages.\n\n# client.tag(project, version, tag, cb)\n\n* `project` {String} Project name\n* `version` {String} Version to tag\n* `tag` {String} Tag name to apply\n* `cb` {Function}\n\nMark a version in the `dist-tags` hash, so that `pkg@tag`\nwill fetch the specified version.\n\n# client.unpublish(name, [ver], cb)\n\n* `name` {String} package name\n* `ver` {String} version to unpublish. Leave blank to unpublish all\n versions.\n* `cb` {Function}\n\nRemove a version of a package (or all versions) from the registry. When\nthe last version us unpublished, the entire document is removed from the\ndatabase.\n\n# client.upload(where, file, [etag], [nofollow], cb)\n\n* `where` {String} URL path to upload to\n* `file` {String | Stream} Either the filename or a readable stream\n* `etag` {String} Cache ETag\n* `nofollow` {Boolean} Do not follow 301/302 responses\n* `cb` {Function}\n\nUpload an attachment. Mostly used by `client.publish()`.\n", "readmeFilename": "README.md", "bugs": { "url": "https://github.com/isaacs/npm-registry-client/issues" }, "homepage": "https://github.com/isaacs/npm-registry-client", - "_id": "npm-registry-client@0.4.8", - "_shasum": "a6685a161033101be6064b7af887ab440e8695d0", - "_from": "npm-registry-client@~0.4.7" + "_id": "npm-registry-client@1.0.0", + "_shasum": "2a6f9dfdce5f8ebf4b9af4dbfd738384d25014e5", + "_from": "npm-registry-client@1" } diff -Nru nodejs-0.10.28/deps/npm/node_modules/npm-registry-client/README.md nodejs-0.10.29/deps/npm/node_modules/npm-registry-client/README.md --- nodejs-0.10.28/deps/npm/node_modules/npm-registry-client/README.md 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npm-registry-client/README.md 2014-06-09 17:04:36.000000000 +0000 @@ -113,11 +113,10 @@ Fetches data from the registry via a GET request, saving it in the cache folder with the ETag. -# client.publish(data, tarball, [readme], cb) +# client.publish(data, tarball, cb) * `data` {Object} Package data * `tarball` {String | Stream} Filename or stream of the package tarball -* `readme` {String} Contents of the README markdown file * `cb` {Function} Publish a package to the registry. diff -Nru nodejs-0.10.28/deps/npm/node_modules/npm-user-validate/npm-user-validate.js nodejs-0.10.29/deps/npm/node_modules/npm-user-validate/npm-user-validate.js --- nodejs-0.10.28/deps/npm/node_modules/npm-user-validate/npm-user-validate.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npm-user-validate/npm-user-validate.js 2014-06-09 17:04:36.000000000 +0000 @@ -8,9 +8,7 @@ urlSafe: 'Username may not contain non-url-safe chars', dot: 'Username may not start with "."' }, - password: { - badchars: 'Password passwords cannot contain these characters: \'!:@"' - }, + password: {}, email: { valid: 'Email must be an email address' } @@ -41,9 +39,5 @@ } function pw (pw) { - if (pw.match(/['!:@"]/)) { - return new Error(requirements.password.badchars) - } - return null } diff -Nru nodejs-0.10.28/deps/npm/node_modules/npm-user-validate/package.json nodejs-0.10.29/deps/npm/node_modules/npm-user-validate/package.json --- nodejs-0.10.28/deps/npm/node_modules/npm-user-validate/package.json 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npm-user-validate/package.json 2014-06-09 17:04:36.000000000 +0000 @@ -1,6 +1,6 @@ { "name": "npm-user-validate", - "version": "0.0.3", + "version": "0.1.0", "description": "User validations for npm", "main": "npm-user-validate.js", "devDependencies": { @@ -11,7 +11,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/robertkowalski/npm-user-validate" + "url": "git://github.com/npm/npm-registry-mock.git" }, "keywords": [ "npm", @@ -23,15 +23,13 @@ "email": "rok@kowalski.gd" }, "license": "BSD", - "readme": "[![Build Status](https://travis-ci.org/robertkowalski/npm-user-validate.png?branch=master)](https://travis-ci.org/robertkowalski/npm-user-validate)\n[![devDependency Status](https://david-dm.org/robertkowalski/npm-user-validate/dev-status.png)](https://david-dm.org/robertkowalski/npm-user-validate#info=devDependencies)\n\n# npm-user-validate\n\nValidation for the npm client and npm-www (and probably other npm projects)", + "readme": "[![Build Status](https://travis-ci.org/npm/npm-user-validate.png?branch=master)](https://travis-ci.org/npm/npm-user-validate)\n[![devDependency Status](https://david-dm.org/npm/npm-user-validate/dev-status.png)](https://david-dm.org/npm/npm-user-validate#info=devDependencies)\n\n# npm-user-validate\n\nValidation for the npm client and npm-www (and probably other npm projects)\n", "readmeFilename": "README.md", "bugs": { - "url": "https://github.com/robertkowalski/npm-user-validate/issues" + "url": "https://github.com/npm/npm-registry-mock/issues" }, - "_id": "npm-user-validate@0.0.3", - "dist": { - "shasum": "7b147d11038083fb0ba2d60ff851dc20322aa9f6" - }, - "_from": "npm-user-validate@0.0.3", - "_resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.0.3.tgz" + "homepage": "https://github.com/npm/npm-registry-mock", + "_id": "npm-user-validate@0.1.0", + "_shasum": "358a5b5148ed3f79771d980388c6e34c4a61f638", + "_from": "npm-user-validate@latest" } diff -Nru nodejs-0.10.28/deps/npm/node_modules/npm-user-validate/README.md nodejs-0.10.29/deps/npm/node_modules/npm-user-validate/README.md --- nodejs-0.10.28/deps/npm/node_modules/npm-user-validate/README.md 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npm-user-validate/README.md 2014-06-09 17:04:36.000000000 +0000 @@ -1,6 +1,6 @@ -[![Build Status](https://travis-ci.org/robertkowalski/npm-user-validate.png?branch=master)](https://travis-ci.org/robertkowalski/npm-user-validate) -[![devDependency Status](https://david-dm.org/robertkowalski/npm-user-validate/dev-status.png)](https://david-dm.org/robertkowalski/npm-user-validate#info=devDependencies) +[![Build Status](https://travis-ci.org/npm/npm-user-validate.png?branch=master)](https://travis-ci.org/npm/npm-user-validate) +[![devDependency Status](https://david-dm.org/npm/npm-user-validate/dev-status.png)](https://david-dm.org/npm/npm-user-validate#info=devDependencies) # npm-user-validate -Validation for the npm client and npm-www (and probably other npm projects) \ No newline at end of file +Validation for the npm client and npm-www (and probably other npm projects) diff -Nru nodejs-0.10.28/deps/npm/node_modules/npm-user-validate/test/pw.test.js nodejs-0.10.29/deps/npm/node_modules/npm-user-validate/test/pw.test.js --- nodejs-0.10.28/deps/npm/node_modules/npm-user-validate/test/pw.test.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/npm-user-validate/test/pw.test.js 2014-06-09 17:04:36.000000000 +0000 @@ -3,25 +3,25 @@ test('pw contains a \'', function (t) { err = v('\'') - t.type(err, 'object') + t.type(err, 'null') t.end() }) test('pw contains a :', function (t) { err = v(':') - t.type(err, 'object') + t.type(err, 'null') t.end() }) test('pw contains a @', function (t) { err = v('@') - t.type(err, 'object') + t.notOk(err, 'null') t.end() }) test('pw contains a "', function (t) { err = v('"') - t.type(err, 'object') + t.type(err, 'null') t.end() }) @@ -29,4 +29,4 @@ err = v('duck') t.type(err, 'null') t.end() -}) \ No newline at end of file +}) diff -Nru nodejs-0.10.28/deps/npm/node_modules/read-installed/node_modules/util-extend/package.json nodejs-0.10.29/deps/npm/node_modules/read-installed/node_modules/util-extend/package.json --- nodejs-0.10.28/deps/npm/node_modules/read-installed/node_modules/util-extend/package.json 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/read-installed/node_modules/util-extend/package.json 2014-06-09 17:04:36.000000000 +0000 @@ -17,7 +17,25 @@ "bugs": { "url": "https://github.com/isaacs/util-extend/issues" }, - "homepage": "https://github.com/isaacs/util-extend", "_id": "util-extend@1.0.1", - "_from": "util-extend@^1.0.1" + "dist": { + "shasum": "bb703b79480293ddcdcfb3c6a9fea20f483415bc", + "tarball": "http://registry.npmjs.org/util-extend/-/util-extend-1.0.1.tgz" + }, + "_from": "util-extend@^1.0.1", + "_npmVersion": "1.3.4", + "_npmUser": { + "name": "isaacs", + "email": "i@izs.me" + }, + "maintainers": [ + { + "name": "isaacs", + "email": "i@izs.me" + } + ], + "directories": {}, + "_shasum": "bb703b79480293ddcdcfb3c6a9fea20f483415bc", + "_resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.1.tgz", + "homepage": "https://github.com/isaacs/util-extend" } diff -Nru nodejs-0.10.28/deps/npm/node_modules/read-installed/package.json nodejs-0.10.29/deps/npm/node_modules/read-installed/package.json --- nodejs-0.10.28/deps/npm/node_modules/read-installed/package.json 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/read-installed/package.json 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,7 @@ { "name": "read-installed", "description": "Read all the installed packages in a folder, and return a tree structure with all the data.", - "version": "2.0.2", + "version": "2.0.4", "repository": { "type": "git", "url": "git://github.com/isaacs/read-installed" @@ -31,10 +31,12 @@ }, "readme": "# read-installed\n\nRead all the installed packages in a folder, and return a tree\nstructure with all the data.\n\nnpm uses this.\n\n## 2.0.0\n\nBreaking changes in `2.0.0`:\n\nThe second argument is now an `Object` that contains the following keys:\n\n * `depth` optional, defaults to Infinity\n * `log` optional log Function\n * `dev` optional, default false, set to true to include devDependencies\n\n## Usage\n\n```javascript\nvar readInstalled = require(\"read-installed\")\n// optional options\nvar options = { dev: false, log: fn, depth: 2 }\nreadInstalled(folder, options, function (er, data) {\n ...\n})\n```\n", "readmeFilename": "README.md", + "gitHead": "86c1d4444724b82855a6879d443b6fa184f2f9dd", "bugs": { "url": "https://github.com/isaacs/read-installed/issues" }, "homepage": "https://github.com/isaacs/read-installed", - "_id": "read-installed@2.0.2", + "_id": "read-installed@2.0.4", + "_shasum": "3a1e12b977a93132b93c5a6a8663fbd62c812671", "_from": "read-installed@latest" } diff -Nru nodejs-0.10.28/deps/npm/node_modules/read-installed/read-installed.js nodejs-0.10.29/deps/npm/node_modules/read-installed/read-installed.js --- nodejs-0.10.28/deps/npm/node_modules/read-installed/read-installed.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/read-installed/read-installed.js 2014-06-09 17:04:36.000000000 +0000 @@ -217,23 +217,9 @@ if (!rv && obj.devDependencies && opts.dev) rv = obj.devDependencies[pkg] - if (depth >= opts.depth) { - // just try to get the version number - var pkgfolder = path.resolve(folder, "node_modules", pkg) - , jsonFile = path.resolve(pkgfolder, "package.json") - return readJson(jsonFile, function (er, depData) { - // already out of our depth, ignore errors - if (er || !depData || !depData.version) return cb(null, obj) - if (depth === opts.depth) { - // edge case, ignore dependencies - depData.dependencies = {} - depData.peerDependencies = {} - obj.dependencies[pkg] = depData - } else { - obj.dependencies[pkg] = depData.version - } - cb(null, obj) - }) + if (depth > opts.depth) { + obj.dependencies = {} + return cb(null, obj) } readInstalled_( path.resolve(folder, "node_modules/"+pkg) @@ -331,7 +317,11 @@ obj.dependencies[d] = peerDeps[d] } } else { - dependency = obj.parent.dependencies && obj.parent.dependencies[d] + var r = obj.parent + while (r && !dependency) { + dependency = r.dependencies && r.dependencies[d] + r = r.link ? null : r.parent + } } if (!dependency) { diff -Nru nodejs-0.10.28/deps/npm/node_modules/read-installed/test/depth-0.js nodejs-0.10.29/deps/npm/node_modules/read-installed/test/depth-0.js --- nodejs-0.10.28/deps/npm/node_modules/read-installed/test/depth-0.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/read-installed/test/depth-0.js 2014-06-09 17:04:36.000000000 +0000 @@ -16,6 +16,8 @@ // Exclude self from dependencies when depth = 0 delete map.dependencies[json.name] var subdeps = Object.keys(map.dependencies).reduce(function(acc, dep) { + // Exclude self from dependencies when depth = current depth + delete map.dependencies[dep].dependencies[dep] acc += Object.keys(map.dependencies[dep].dependencies).length; return acc; }, 0); diff -Nru nodejs-0.10.28/deps/npm/node_modules/read-installed/test/fixtures/grandparent-peer/package.json nodejs-0.10.29/deps/npm/node_modules/read-installed/test/fixtures/grandparent-peer/package.json --- nodejs-0.10.28/deps/npm/node_modules/read-installed/test/fixtures/grandparent-peer/package.json 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/read-installed/test/fixtures/grandparent-peer/package.json 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,8 @@ +{ + "name": "example", + "version": "0.0.0", + "dependencies": { + "plugin-wrapper": "0.0.0", + "framework": "0.0.0" + } +} diff -Nru nodejs-0.10.28/deps/npm/node_modules/read-installed/test/grandparent-peer.js nodejs-0.10.29/deps/npm/node_modules/read-installed/test/grandparent-peer.js --- nodejs-0.10.28/deps/npm/node_modules/read-installed/test/grandparent-peer.js 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/read-installed/test/grandparent-peer.js 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,24 @@ +var readInstalled = require('../read-installed.js') +var test = require('tap').test +var path = require('path'); + +function allValid(t, map) { + var deps = Object.keys(map.dependencies || {}) + deps.forEach(function (dep) { + t.notOk(map.dependencies[dep].invalid, 'dependency ' + dep + ' of ' + map.name + ' is not invalid') + t.notOk(typeof map.dependencies[dep] === 'string', 'dependency ' + dep + ' of ' + map.name + ' is not missing') + }) + deps.forEach(function (dep) { + allValid(t, map.dependencies[dep]) + }) +} + +test('grandparent can satisfy peer dependencies', function(t) { + readInstalled( + path.join(__dirname, 'fixtures/grandparent-peer'), + { log: console.error }, + function(err, map) { + allValid(t, map) + t.end() + }) +}) diff -Nru nodejs-0.10.28/deps/npm/node_modules/semver/bin/semver nodejs-0.10.29/deps/npm/node_modules/semver/bin/semver --- nodejs-0.10.28/deps/npm/node_modules/semver/bin/semver 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/semver/bin/semver 2014-06-09 17:04:36.000000000 +0000 @@ -39,6 +39,7 @@ case "-i": case "--inc": case "--increment": switch (argv[0]) { case "major": case "minor": case "patch": case "prerelease": + case "premajor": case "preminor": case "prepatch": inc = argv.shift() break default: diff -Nru nodejs-0.10.28/deps/npm/node_modules/semver/package.json nodejs-0.10.29/deps/npm/node_modules/semver/package.json --- nodejs-0.10.28/deps/npm/node_modules/semver/package.json 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/semver/package.json 2014-06-09 17:04:36.000000000 +0000 @@ -1,6 +1,6 @@ { "name": "semver", - "version": "2.2.1", + "version": "2.3.0", "description": "The semantic version parser used by npm.", "main": "semver.js", "browser": "semver.browser.js", @@ -21,12 +21,13 @@ "bin": { "semver": "./bin/semver" }, - "readme": "semver(1) -- The semantic versioner for npm\n===========================================\n\n## Usage\n\n $ npm install semver\n\n semver.valid('1.2.3') // '1.2.3'\n semver.valid('a.b.c') // null\n semver.clean(' =v1.2.3 ') // '1.2.3'\n semver.satisfies('1.2.3', '1.x || >=2.5.0 || 5.0.0 - 7.2.3') // true\n semver.gt('1.2.3', '9.8.7') // false\n semver.lt('1.2.3', '9.8.7') // true\n\nAs a command-line utility:\n\n $ semver -h\n\n Usage: semver [ [...]] [-r | -i | -d ]\n Test if version(s) satisfy the supplied range(s), and sort them.\n\n Multiple versions or ranges may be supplied, unless increment\n or decrement options are specified. In that case, only a single\n version may be used, and it is incremented by the specified level\n\n Program exits successfully if any valid version satisfies\n all supplied ranges, and prints all satisfying versions.\n\n If no versions are valid, or ranges are not satisfied,\n then exits failure.\n\n Versions are printed in ascending order, so supplying\n multiple versions to the utility will just sort them.\n\n## Versions\n\nA \"version\" is described by the v2.0.0 specification found at\n.\n\nA leading `\"=\"` or `\"v\"` character is stripped off and ignored.\n\n## Ranges\n\nThe following range styles are supported:\n\n* `1.2.3` A specific version. When nothing else will do. Note that\n build metadata is still ignored, so `1.2.3+build2012` will satisfy\n this range.\n* `>1.2.3` Greater than a specific version.\n* `<1.2.3` Less than a specific version. If there is no prerelease\n tag on the version range, then no prerelease version will be allowed\n either, even though these are technically \"less than\".\n* `>=1.2.3` Greater than or equal to. Note that prerelease versions\n are NOT equal to their \"normal\" equivalents, so `1.2.3-beta` will\n not satisfy this range, but `2.3.0-beta` will.\n* `<=1.2.3` Less than or equal to. In this case, prerelease versions\n ARE allowed, so `1.2.3-beta` would satisfy.\n* `1.2.3 - 2.3.4` := `>=1.2.3 <=2.3.4`\n* `~1.2.3` := `>=1.2.3-0 <1.3.0-0` \"Reasonably close to 1.2.3\". When\n using tilde operators, prerelease versions are supported as well,\n but a prerelease of the next significant digit will NOT be\n satisfactory, so `1.3.0-beta` will not satisfy `~1.2.3`.\n* `^1.2.3` := `>=1.2.3-0 <2.0.0-0` \"Compatible with 1.2.3\". When\n using caret operators, anything from the specified version (including\n prerelease) will be supported up to, but not including, the next\n major version (or its prereleases). `1.5.1` will satisfy `^1.2.3`,\n while `1.2.2` and `2.0.0-beta` will not.\n* `^0.1.3` := `>=0.1.3-0 <0.2.0-0` \"Compatible with 0.1.3\". 0.x.x versions are\n special: the first non-zero component indicates potentially breaking changes,\n meaning the caret operator matches any version with the same first non-zero\n component starting at the specified version.\n* `^0.0.2` := `=0.0.2` \"Only the version 0.0.2 is considered compatible\"\n* `~1.2` := `>=1.2.0-0 <1.3.0-0` \"Any version starting with 1.2\"\n* `^1.2` := `>=1.2.0-0 <2.0.0-0` \"Any version compatible with 1.2\"\n* `1.2.x` := `>=1.2.0-0 <1.3.0-0` \"Any version starting with 1.2\"\n* `~1` := `>=1.0.0-0 <2.0.0-0` \"Any version starting with 1\"\n* `^1` := `>=1.0.0-0 <2.0.0-0` \"Any version compatible with 1\"\n* `1.x` := `>=1.0.0-0 <2.0.0-0` \"Any version starting with 1\"\n\n\nRanges can be joined with either a space (which implies \"and\") or a\n`||` (which implies \"or\").\n\n## Functions\n\nAll methods and classes take a final `loose` boolean argument that, if\ntrue, will be more forgiving about not-quite-valid semver strings.\nThe resulting output will always be 100% strict, of course.\n\nStrict-mode Comparators and Ranges will be strict about the SemVer\nstrings that they parse.\n\n* valid(v): Return the parsed version, or null if it's not valid.\n* inc(v, release): Return the version incremented by the release type\n (major, minor, patch, or prerelease), or null if it's not valid.\n\n### Comparison\n\n* gt(v1, v2): `v1 > v2`\n* gte(v1, v2): `v1 >= v2`\n* lt(v1, v2): `v1 < v2`\n* lte(v1, v2): `v1 <= v2`\n* eq(v1, v2): `v1 == v2` This is true if they're logically equivalent,\n even if they're not the exact same string. You already know how to\n compare strings.\n* neq(v1, v2): `v1 != v2` The opposite of eq.\n* cmp(v1, comparator, v2): Pass in a comparison string, and it'll call\n the corresponding function above. `\"===\"` and `\"!==\"` do simple\n string comparison, but are included for completeness. Throws if an\n invalid comparison string is provided.\n* compare(v1, v2): Return 0 if v1 == v2, or 1 if v1 is greater, or -1 if\n v2 is greater. Sorts in ascending order if passed to Array.sort().\n* rcompare(v1, v2): The reverse of compare. Sorts an array of versions\n in descending order when passed to Array.sort().\n\n\n### Ranges\n\n* validRange(range): Return the valid range or null if it's not valid\n* satisfies(version, range): Return true if the version satisfies the\n range.\n* maxSatisfying(versions, range): Return the highest version in the list\n that satisfies the range, or null if none of them do.\n* gtr(version, range): Return true if version is greater than all the\n versions possible in the range.\n* ltr(version, range): Return true if version is less than all the\n versions possible in the range.\n* outside(version, range, hilo): Return true if the version is outside\n the bounds of the range in either the high or low direction. The\n `hilo` argument must be either the string `'>'` or `'<'`. (This is\n the function called by `gtr` and `ltr`.)\n\nNote that, since ranges may be non-contiguous, a version might not be\ngreater than a range, less than a range, *or* satisfy a range! For\nexample, the range `1.2 <1.2.9 || >2.0.0` would have a hole from `1.2.9`\nuntil `2.0.0`, so the version `1.2.10` would not be greater than the\nrange (because 2.0.1 satisfies, which is higher), nor less than the\nrange (since 1.2.8 satisfies, which is lower), and it also does not\nsatisfy the range.\n\nIf you want to know if a version satisfies or does not satisfy a\nrange, use the `satisfies(version, range)` function.\n", + "readme": "semver(1) -- The semantic versioner for npm\n===========================================\n\n## Usage\n\n $ npm install semver\n\n semver.valid('1.2.3') // '1.2.3'\n semver.valid('a.b.c') // null\n semver.clean(' =v1.2.3 ') // '1.2.3'\n semver.satisfies('1.2.3', '1.x || >=2.5.0 || 5.0.0 - 7.2.3') // true\n semver.gt('1.2.3', '9.8.7') // false\n semver.lt('1.2.3', '9.8.7') // true\n\nAs a command-line utility:\n\n $ semver -h\n\n Usage: semver [ [...]] [-r | -i | -d ]\n Test if version(s) satisfy the supplied range(s), and sort them.\n\n Multiple versions or ranges may be supplied, unless increment\n or decrement options are specified. In that case, only a single\n version may be used, and it is incremented by the specified level\n\n Program exits successfully if any valid version satisfies\n all supplied ranges, and prints all satisfying versions.\n\n If no versions are valid, or ranges are not satisfied,\n then exits failure.\n\n Versions are printed in ascending order, so supplying\n multiple versions to the utility will just sort them.\n\n## Versions\n\nA \"version\" is described by the `v2.0.0` specification found at\n.\n\nA leading `\"=\"` or `\"v\"` character is stripped off and ignored.\n\n## Ranges\n\nThe following range styles are supported:\n\n* `1.2.3` A specific version. When nothing else will do. Must be a full\n version number, with major, minor, and patch versions specified.\n Note that build metadata is still ignored, so `1.2.3+build2012` will\n satisfy this range.\n* `>1.2.3` Greater than a specific version.\n* `<1.2.3` Less than a specific version. If there is no prerelease\n tag on the version range, then no prerelease version will be allowed\n either, even though these are technically \"less than\".\n* `>=1.2.3` Greater than or equal to. Note that prerelease versions\n are NOT equal to their \"normal\" equivalents, so `1.2.3-beta` will\n not satisfy this range, but `2.3.0-beta` will.\n* `<=1.2.3` Less than or equal to. In this case, prerelease versions\n ARE allowed, so `1.2.3-beta` would satisfy.\n* `1.2.3 - 2.3.4` := `>=1.2.3 <=2.3.4`\n* `~1.2.3` := `>=1.2.3-0 <1.3.0-0` \"Reasonably close to `1.2.3`\". When\n using tilde operators, prerelease versions are supported as well,\n but a prerelease of the next significant digit will NOT be\n satisfactory, so `1.3.0-beta` will not satisfy `~1.2.3`.\n* `^1.2.3` := `>=1.2.3-0 <2.0.0-0` \"Compatible with `1.2.3`\". When\n using caret operators, anything from the specified version (including\n prerelease) will be supported up to, but not including, the next\n major version (or its prereleases). `1.5.1` will satisfy `^1.2.3`,\n while `1.2.2` and `2.0.0-beta` will not.\n* `^0.1.3` := `>=0.1.3-0 <0.2.0-0` \"Compatible with `0.1.3`\". `0.x.x` versions are\n special: the first non-zero component indicates potentially breaking changes,\n meaning the caret operator matches any version with the same first non-zero\n component starting at the specified version.\n* `^0.0.2` := `=0.0.2` \"Only the version `0.0.2` is considered compatible\"\n* `~1.2` := `>=1.2.0-0 <1.3.0-0` \"Any version starting with `1.2`\"\n* `^1.2` := `>=1.2.0-0 <2.0.0-0` \"Any version compatible with `1.2`\"\n* `1.2.x` := `>=1.2.0-0 <1.3.0-0` \"Any version starting with `1.2`\"\n* `1.2.*` Same as `1.2.x`.\n* `1.2` Same as `1.2.x`.\n* `~1` := `>=1.0.0-0 <2.0.0-0` \"Any version starting with `1`\"\n* `^1` := `>=1.0.0-0 <2.0.0-0` \"Any version compatible with `1`\"\n* `1.x` := `>=1.0.0-0 <2.0.0-0` \"Any version starting with `1`\"\n* `1.*` Same as `1.x`.\n* `1` Same as `1.x`.\n* `*` Any version whatsoever.\n* `x` Same as `*`.\n* `\"\"` (just an empty string) Same as `*`.\n\n\nRanges can be joined with either a space (which implies \"and\") or a\n`||` (which implies \"or\").\n\n## Functions\n\nAll methods and classes take a final `loose` boolean argument that, if\ntrue, will be more forgiving about not-quite-valid semver strings.\nThe resulting output will always be 100% strict, of course.\n\nStrict-mode Comparators and Ranges will be strict about the SemVer\nstrings that they parse.\n\n* `valid(v)`: Return the parsed version, or null if it's not valid.\n* `inc(v, release)`: Return the version incremented by the release\n type (`major`, `premajor`, `minor`, `preminor`, `patch`,\n `prepatch`, or `prerelease`), or null if it's not valid\n * `premajor` in one call will bump the version up to the next major\n version and down to a prerelease of that major version.\n `preminor`, and `prepatch` work the same way.\n * If called from a non-prerelease version, the `prerelease` will work the\n same as `prepatch`. It increments the patch version, then makes a\n prerelease. If the input version is already a prerelease it simply\n increments it.\n\n### Comparison\n\n* `gt(v1, v2)`: `v1 > v2`\n* `gte(v1, v2)`: `v1 >= v2`\n* `lt(v1, v2)`: `v1 < v2`\n* `lte(v1, v2)`: `v1 <= v2`\n* `eq(v1, v2)`: `v1 == v2` This is true if they're logically equivalent,\n even if they're not the exact same string. You already know how to\n compare strings.\n* `neq(v1, v2)`: `v1 != v2` The opposite of `eq`.\n* `cmp(v1, comparator, v2)`: Pass in a comparison string, and it'll call\n the corresponding function above. `\"===\"` and `\"!==\"` do simple\n string comparison, but are included for completeness. Throws if an\n invalid comparison string is provided.\n* `compare(v1, v2)`: Return `0` if `v1 == v2`, or `1` if `v1` is greater, or `-1` if\n `v2` is greater. Sorts in ascending order if passed to `Array.sort()`.\n* `rcompare(v1, v2)`: The reverse of compare. Sorts an array of versions\n in descending order when passed to `Array.sort()`.\n\n\n### Ranges\n\n* `validRange(range)`: Return the valid range or null if it's not valid\n* `satisfies(version, range)`: Return true if the version satisfies the\n range.\n* `maxSatisfying(versions, range)`: Return the highest version in the list\n that satisfies the range, or `null` if none of them do.\n* `gtr(version, range)`: Return `true` if version is greater than all the\n versions possible in the range.\n* `ltr(version, range)`: Return `true` if version is less than all the\n versions possible in the range.\n* `outside(version, range, hilo)`: Return true if the version is outside\n the bounds of the range in either the high or low direction. The\n `hilo` argument must be either the string `'>'` or `'<'`. (This is\n the function called by `gtr` and `ltr`.)\n\nNote that, since ranges may be non-contiguous, a version might not be\ngreater than a range, less than a range, *or* satisfy a range! For\nexample, the range `1.2 <1.2.9 || >2.0.0` would have a hole from `1.2.9`\nuntil `2.0.0`, so the version `1.2.10` would not be greater than the\nrange (because `2.0.1` satisfies, which is higher), nor less than the\nrange (since `1.2.8` satisfies, which is lower), and it also does not\nsatisfy the range.\n\nIf you want to know if a version satisfies or does not satisfy a\nrange, use the `satisfies(version, range)` function.\n", "readmeFilename": "README.md", "bugs": { "url": "https://github.com/isaacs/node-semver/issues" }, "homepage": "https://github.com/isaacs/node-semver", - "_id": "semver@2.2.1", + "_id": "semver@2.3.0", + "_shasum": "d31b2903ebe2a1806c05b8e763916a7183108a15", "_from": "semver@latest" } diff -Nru nodejs-0.10.28/deps/npm/node_modules/semver/README.md nodejs-0.10.29/deps/npm/node_modules/semver/README.md --- nodejs-0.10.28/deps/npm/node_modules/semver/README.md 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/semver/README.md 2014-06-09 17:04:36.000000000 +0000 @@ -34,7 +34,7 @@ ## Versions -A "version" is described by the v2.0.0 specification found at +A "version" is described by the `v2.0.0` specification found at . A leading `"="` or `"v"` character is stripped off and ignored. @@ -43,9 +43,10 @@ The following range styles are supported: -* `1.2.3` A specific version. When nothing else will do. Note that - build metadata is still ignored, so `1.2.3+build2012` will satisfy - this range. +* `1.2.3` A specific version. When nothing else will do. Must be a full + version number, with major, minor, and patch versions specified. + Note that build metadata is still ignored, so `1.2.3+build2012` will + satisfy this range. * `>1.2.3` Greater than a specific version. * `<1.2.3` Less than a specific version. If there is no prerelease tag on the version range, then no prerelease version will be allowed @@ -56,26 +57,33 @@ * `<=1.2.3` Less than or equal to. In this case, prerelease versions ARE allowed, so `1.2.3-beta` would satisfy. * `1.2.3 - 2.3.4` := `>=1.2.3 <=2.3.4` -* `~1.2.3` := `>=1.2.3-0 <1.3.0-0` "Reasonably close to 1.2.3". When +* `~1.2.3` := `>=1.2.3-0 <1.3.0-0` "Reasonably close to `1.2.3`". When using tilde operators, prerelease versions are supported as well, but a prerelease of the next significant digit will NOT be satisfactory, so `1.3.0-beta` will not satisfy `~1.2.3`. -* `^1.2.3` := `>=1.2.3-0 <2.0.0-0` "Compatible with 1.2.3". When +* `^1.2.3` := `>=1.2.3-0 <2.0.0-0` "Compatible with `1.2.3`". When using caret operators, anything from the specified version (including prerelease) will be supported up to, but not including, the next major version (or its prereleases). `1.5.1` will satisfy `^1.2.3`, while `1.2.2` and `2.0.0-beta` will not. -* `^0.1.3` := `>=0.1.3-0 <0.2.0-0` "Compatible with 0.1.3". 0.x.x versions are +* `^0.1.3` := `>=0.1.3-0 <0.2.0-0` "Compatible with `0.1.3`". `0.x.x` versions are special: the first non-zero component indicates potentially breaking changes, meaning the caret operator matches any version with the same first non-zero component starting at the specified version. -* `^0.0.2` := `=0.0.2` "Only the version 0.0.2 is considered compatible" -* `~1.2` := `>=1.2.0-0 <1.3.0-0` "Any version starting with 1.2" -* `^1.2` := `>=1.2.0-0 <2.0.0-0` "Any version compatible with 1.2" -* `1.2.x` := `>=1.2.0-0 <1.3.0-0` "Any version starting with 1.2" -* `~1` := `>=1.0.0-0 <2.0.0-0` "Any version starting with 1" -* `^1` := `>=1.0.0-0 <2.0.0-0` "Any version compatible with 1" -* `1.x` := `>=1.0.0-0 <2.0.0-0` "Any version starting with 1" +* `^0.0.2` := `=0.0.2` "Only the version `0.0.2` is considered compatible" +* `~1.2` := `>=1.2.0-0 <1.3.0-0` "Any version starting with `1.2`" +* `^1.2` := `>=1.2.0-0 <2.0.0-0` "Any version compatible with `1.2`" +* `1.2.x` := `>=1.2.0-0 <1.3.0-0` "Any version starting with `1.2`" +* `1.2.*` Same as `1.2.x`. +* `1.2` Same as `1.2.x`. +* `~1` := `>=1.0.0-0 <2.0.0-0` "Any version starting with `1`" +* `^1` := `>=1.0.0-0 <2.0.0-0` "Any version compatible with `1`" +* `1.x` := `>=1.0.0-0 <2.0.0-0` "Any version starting with `1`" +* `1.*` Same as `1.x`. +* `1` Same as `1.x`. +* `*` Any version whatsoever. +* `x` Same as `*`. +* `""` (just an empty string) Same as `*`. Ranges can be joined with either a space (which implies "and") or a @@ -90,42 +98,50 @@ Strict-mode Comparators and Ranges will be strict about the SemVer strings that they parse. -* valid(v): Return the parsed version, or null if it's not valid. -* inc(v, release): Return the version incremented by the release type - (major, minor, patch, or prerelease), or null if it's not valid. +* `valid(v)`: Return the parsed version, or null if it's not valid. +* `inc(v, release)`: Return the version incremented by the release + type (`major`, `premajor`, `minor`, `preminor`, `patch`, + `prepatch`, or `prerelease`), or null if it's not valid + * `premajor` in one call will bump the version up to the next major + version and down to a prerelease of that major version. + `preminor`, and `prepatch` work the same way. + * If called from a non-prerelease version, the `prerelease` will work the + same as `prepatch`. It increments the patch version, then makes a + prerelease. If the input version is already a prerelease it simply + increments it. ### Comparison -* gt(v1, v2): `v1 > v2` -* gte(v1, v2): `v1 >= v2` -* lt(v1, v2): `v1 < v2` -* lte(v1, v2): `v1 <= v2` -* eq(v1, v2): `v1 == v2` This is true if they're logically equivalent, +* `gt(v1, v2)`: `v1 > v2` +* `gte(v1, v2)`: `v1 >= v2` +* `lt(v1, v2)`: `v1 < v2` +* `lte(v1, v2)`: `v1 <= v2` +* `eq(v1, v2)`: `v1 == v2` This is true if they're logically equivalent, even if they're not the exact same string. You already know how to compare strings. -* neq(v1, v2): `v1 != v2` The opposite of eq. -* cmp(v1, comparator, v2): Pass in a comparison string, and it'll call +* `neq(v1, v2)`: `v1 != v2` The opposite of `eq`. +* `cmp(v1, comparator, v2)`: Pass in a comparison string, and it'll call the corresponding function above. `"==="` and `"!=="` do simple string comparison, but are included for completeness. Throws if an invalid comparison string is provided. -* compare(v1, v2): Return 0 if v1 == v2, or 1 if v1 is greater, or -1 if - v2 is greater. Sorts in ascending order if passed to Array.sort(). -* rcompare(v1, v2): The reverse of compare. Sorts an array of versions - in descending order when passed to Array.sort(). +* `compare(v1, v2)`: Return `0` if `v1 == v2`, or `1` if `v1` is greater, or `-1` if + `v2` is greater. Sorts in ascending order if passed to `Array.sort()`. +* `rcompare(v1, v2)`: The reverse of compare. Sorts an array of versions + in descending order when passed to `Array.sort()`. ### Ranges -* validRange(range): Return the valid range or null if it's not valid -* satisfies(version, range): Return true if the version satisfies the +* `validRange(range)`: Return the valid range or null if it's not valid +* `satisfies(version, range)`: Return true if the version satisfies the range. -* maxSatisfying(versions, range): Return the highest version in the list - that satisfies the range, or null if none of them do. -* gtr(version, range): Return true if version is greater than all the +* `maxSatisfying(versions, range)`: Return the highest version in the list + that satisfies the range, or `null` if none of them do. +* `gtr(version, range)`: Return `true` if version is greater than all the versions possible in the range. -* ltr(version, range): Return true if version is less than all the +* `ltr(version, range)`: Return `true` if version is less than all the versions possible in the range. -* outside(version, range, hilo): Return true if the version is outside +* `outside(version, range, hilo)`: Return true if the version is outside the bounds of the range in either the high or low direction. The `hilo` argument must be either the string `'>'` or `'<'`. (This is the function called by `gtr` and `ltr`.) @@ -134,8 +150,8 @@ greater than a range, less than a range, *or* satisfy a range! For example, the range `1.2 <1.2.9 || >2.0.0` would have a hole from `1.2.9` until `2.0.0`, so the version `1.2.10` would not be greater than the -range (because 2.0.1 satisfies, which is higher), nor less than the -range (since 1.2.8 satisfies, which is lower), and it also does not +range (because `2.0.1` satisfies, which is higher), nor less than the +range (since `1.2.8` satisfies, which is lower), and it also does not satisfy the range. If you want to know if a version satisfies or does not satisfy a diff -Nru nodejs-0.10.28/deps/npm/node_modules/semver/semver.browser.js nodejs-0.10.29/deps/npm/node_modules/semver/semver.browser.js --- nodejs-0.10.28/deps/npm/node_modules/semver/semver.browser.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/semver/semver.browser.js 2014-06-09 17:04:36.000000000 +0000 @@ -248,6 +248,8 @@ return version; else version = version.version; + } else if (typeof version !== 'string') { + throw new TypeError('Invalid Version: ' + version); } if (!(this instanceof SemVer)) @@ -320,7 +322,7 @@ return -1; else if (!this.prerelease.length && other.prerelease.length) return 1; - else if (!this.prerelease.lenth && !other.prerelease.length) + else if (!this.prerelease.length && !other.prerelease.length) return 0; var i = 0; @@ -341,19 +343,49 @@ } while (++i); }; +// preminor will bump the version up to the next minor release, and immediately +// down to pre-release. premajor and prepatch work the same way. SemVer.prototype.inc = function(release) { switch (release) { + case 'premajor': + this.inc('major'); + this.inc('pre'); + break; + case 'preminor': + this.inc('minor'); + this.inc('pre'); + break; + case 'prepatch': + this.inc('patch'); + this.inc('pre'); + break; + // If the input is a non-prerelease version, this acts the same as + // prepatch. + case 'prerelease': + if (this.prerelease.length === 0) + this.inc('patch'); + this.inc('pre'); + break; case 'major': this.major++; this.minor = -1; case 'minor': this.minor++; - this.patch = -1; + this.patch = 0; + this.prerelease = []; + break; case 'patch': - this.patch++; + // If this is not a pre-release version, it will increment the patch. + // If it is a pre-release it will bump up to the same patch version. + // 1.2.0-5 patches to 1.2.0 + // 1.2.0 patches to 1.2.1 + if (this.prerelease.length === 0) + this.patch++; this.prerelease = []; break; - case 'prerelease': + // This probably shouldn't be used publically. + // 1.0.0 "pre" would become 1.0.0-0 which is the wrong direction. + case 'pre': if (this.prerelease.length === 0) this.prerelease = [0]; else { Binary files /tmp/RMfkHkiLvq/nodejs-0.10.28/deps/npm/node_modules/semver/semver.browser.js.gz and /tmp/CtvWUrg3CO/nodejs-0.10.29/deps/npm/node_modules/semver/semver.browser.js.gz differ diff -Nru nodejs-0.10.28/deps/npm/node_modules/semver/semver.js nodejs-0.10.29/deps/npm/node_modules/semver/semver.js --- nodejs-0.10.28/deps/npm/node_modules/semver/semver.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/semver/semver.js 2014-06-09 17:04:36.000000000 +0000 @@ -258,6 +258,8 @@ return version; else version = version.version; + } else if (typeof version !== 'string') { + throw new TypeError('Invalid Version: ' + version); } if (!(this instanceof SemVer)) @@ -330,7 +332,7 @@ return -1; else if (!this.prerelease.length && other.prerelease.length) return 1; - else if (!this.prerelease.lenth && !other.prerelease.length) + else if (!this.prerelease.length && !other.prerelease.length) return 0; var i = 0; @@ -351,19 +353,49 @@ } while (++i); }; +// preminor will bump the version up to the next minor release, and immediately +// down to pre-release. premajor and prepatch work the same way. SemVer.prototype.inc = function(release) { switch (release) { + case 'premajor': + this.inc('major'); + this.inc('pre'); + break; + case 'preminor': + this.inc('minor'); + this.inc('pre'); + break; + case 'prepatch': + this.inc('patch'); + this.inc('pre'); + break; + // If the input is a non-prerelease version, this acts the same as + // prepatch. + case 'prerelease': + if (this.prerelease.length === 0) + this.inc('patch'); + this.inc('pre'); + break; case 'major': this.major++; this.minor = -1; case 'minor': this.minor++; - this.patch = -1; + this.patch = 0; + this.prerelease = []; + break; case 'patch': - this.patch++; + // If this is not a pre-release version, it will increment the patch. + // If it is a pre-release it will bump up to the same patch version. + // 1.2.0-5 patches to 1.2.0 + // 1.2.0 patches to 1.2.1 + if (this.prerelease.length === 0) + this.patch++; this.prerelease = []; break; - case 'prerelease': + // This probably shouldn't be used publically. + // 1.0.0 "pre" would become 1.0.0-0 which is the wrong direction. + case 'pre': if (this.prerelease.length === 0) this.prerelease = [0]; else { diff -Nru nodejs-0.10.28/deps/npm/node_modules/semver/semver.min.js nodejs-0.10.29/deps/npm/node_modules/semver/semver.min.js --- nodejs-0.10.28/deps/npm/node_modules/semver/semver.min.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/node_modules/semver/semver.min.js 2014-06-09 17:04:36.000000000 +0000 @@ -1 +1 @@ -(function(e){if(typeof module==="object"&&module.exports===e)e=module.exports=H;e.SEMVER_SPEC_VERSION="2.0.0";var r=e.re=[];var t=e.src=[];var n=0;var i=n++;t[i]="0|[1-9]\\d*";var s=n++;t[s]="[0-9]+";var o=n++;t[o]="\\d*[a-zA-Z-][a-zA-Z0-9-]*";var a=n++;t[a]="("+t[i]+")\\."+"("+t[i]+")\\."+"("+t[i]+")";var f=n++;t[f]="("+t[s]+")\\."+"("+t[s]+")\\."+"("+t[s]+")";var u=n++;t[u]="(?:"+t[i]+"|"+t[o]+")";var l=n++;t[l]="(?:"+t[s]+"|"+t[o]+")";var c=n++;t[c]="(?:-("+t[u]+"(?:\\."+t[u]+")*))";var p=n++;t[p]="(?:-?("+t[l]+"(?:\\."+t[l]+")*))";var h=n++;t[h]="[0-9A-Za-z-]+";var v=n++;t[v]="(?:\\+("+t[h]+"(?:\\."+t[h]+")*))";var m=n++;var g="v?"+t[a]+t[c]+"?"+t[v]+"?";t[m]="^"+g+"$";var w="[v=\\s]*"+t[f]+t[p]+"?"+t[v]+"?";var d=n++;t[d]="^"+w+"$";var y=n++;t[y]="((?:<|>)?=?)";var $=n++;t[$]=t[s]+"|x|X|\\*";var j=n++;t[j]=t[i]+"|x|X|\\*";var b=n++;t[b]="[v=\\s]*("+t[j]+")"+"(?:\\.("+t[j]+")"+"(?:\\.("+t[j]+")"+"(?:("+t[c]+")"+")?)?)?";var E=n++;t[E]="[v=\\s]*("+t[$]+")"+"(?:\\.("+t[$]+")"+"(?:\\.("+t[$]+")"+"(?:("+t[p]+")"+")?)?)?";var k=n++;t[k]="^"+t[y]+"\\s*"+t[b]+"$";var x=n++;t[x]="^"+t[y]+"\\s*"+t[E]+"$";var R=n++;t[R]="(?:~>?)";var S=n++;t[S]="(\\s*)"+t[R]+"\\s+";r[S]=new RegExp(t[S],"g");var V="$1~";var I=n++;t[I]="^"+t[R]+t[b]+"$";var A=n++;t[A]="^"+t[R]+t[E]+"$";var C=n++;t[C]="(?:\\^)";var T=n++;t[T]="(\\s*)"+t[C]+"\\s+";r[T]=new RegExp(t[T],"g");var M="$1^";var z=n++;t[z]="^"+t[C]+t[b]+"$";var P=n++;t[P]="^"+t[C]+t[E]+"$";var Z=n++;t[Z]="^"+t[y]+"\\s*("+w+")$|^$";var q=n++;t[q]="^"+t[y]+"\\s*("+g+")$|^$";var L=n++;t[L]="(\\s*)"+t[y]+"\\s*("+w+"|"+t[b]+")";r[L]=new RegExp(t[L],"g");var X="$1$2$3";var _=n++;t[_]="^\\s*("+t[b]+")"+"\\s+-\\s+"+"("+t[b]+")"+"\\s*$";var N=n++;t[N]="^\\s*("+t[E]+")"+"\\s+-\\s+"+"("+t[E]+")"+"\\s*$";var O=n++;t[O]="(<|>)?=?\\s*\\*";for(var B=0;B'};H.prototype.toString=function(){return this.version};H.prototype.compare=function(e){if(!(e instanceof H))e=new H(e,this.loose);return this.compareMain(e)||this.comparePre(e)};H.prototype.compareMain=function(e){if(!(e instanceof H))e=new H(e,this.loose);return Q(this.major,e.major)||Q(this.minor,e.minor)||Q(this.patch,e.patch)};H.prototype.comparePre=function(e){if(!(e instanceof H))e=new H(e,this.loose);if(this.prerelease.length&&!e.prerelease.length)return-1;else if(!this.prerelease.length&&e.prerelease.length)return 1;else if(!this.prerelease.lenth&&!e.prerelease.length)return 0;var r=0;do{var t=this.prerelease[r];var n=e.prerelease[r];if(t===undefined&&n===undefined)return 0;else if(n===undefined)return 1;else if(t===undefined)return-1;else if(t===n)continue;else return Q(t,n)}while(++r)};H.prototype.inc=function(e){switch(e){case"major":this.major++;this.minor=-1;case"minor":this.minor++;this.patch=-1;case"patch":this.patch++;this.prerelease=[];break;case"prerelease":if(this.prerelease.length===0)this.prerelease=[0];else{var r=this.prerelease.length;while(--r>=0){if(typeof this.prerelease[r]==="number"){this.prerelease[r]++;r=-2}}if(r===-1)this.prerelease.push(0)}break;default:throw new Error("invalid increment argument: "+e)}this.format();return this};e.inc=J;function J(e,r,t){try{return new H(e,t).inc(r).version}catch(n){return null}}e.compareIdentifiers=Q;var K=/^[0-9]+$/;function Q(e,r){var t=K.test(e);var n=K.test(r);if(t&&n){e=+e;r=+r}return t&&!n?-1:n&&!t?1:er?1:0}e.rcompareIdentifiers=U;function U(e,r){return Q(r,e)}e.compare=W;function W(e,r,t){return new H(e,t).compare(r)}e.compareLoose=Y;function Y(e,r){return W(e,r,true)}e.rcompare=er;function er(e,r,t){return W(r,e,t)}e.sort=rr;function rr(r,t){return r.sort(function(r,n){return e.compare(r,n,t)})}e.rsort=tr;function tr(r,t){return r.sort(function(r,n){return e.rcompare(r,n,t)})}e.gt=nr;function nr(e,r,t){return W(e,r,t)>0}e.lt=ir;function ir(e,r,t){return W(e,r,t)<0}e.eq=sr;function sr(e,r,t){return W(e,r,t)===0}e.neq=or;function or(e,r,t){return W(e,r,t)!==0}e.gte=ar;function ar(e,r,t){return W(e,r,t)>=0}e.lte=fr;function fr(e,r,t){return W(e,r,t)<=0}e.cmp=ur;function ur(e,r,t,n){var i;switch(r){case"===":i=e===t;break;case"!==":i=e!==t;break;case"":case"=":case"==":i=sr(e,t,n);break;case"!=":i=or(e,t,n);break;case">":i=nr(e,t,n);break;case">=":i=ar(e,t,n);break;case"<":i=ir(e,t,n);break;case"<=":i=fr(e,t,n);break;default:throw new TypeError("Invalid operator: "+r)}return i}e.Comparator=lr;function lr(e,r){if(e instanceof lr){if(e.loose===r)return e;else e=e.value}if(!(this instanceof lr))return new lr(e,r);this.loose=r;this.parse(e);if(this.semver===cr)this.value="";else this.value=this.operator+this.semver.version}var cr={};lr.prototype.parse=function(e){var t=this.loose?r[Z]:r[q];var n=e.match(t);if(!n)throw new TypeError("Invalid comparator: "+e);this.operator=n[1];if(!n[2])this.semver=cr;else{this.semver=new H(n[2],this.loose);if(this.operator==="<"&&!this.semver.prerelease.length){this.semver.prerelease=["0"];this.semver.format()}}};lr.prototype.inspect=function(){return''};lr.prototype.toString=function(){return this.value};lr.prototype.test=function(e){return this.semver===cr?true:ur(e,this.operator,this.semver,this.loose)};e.Range=pr;function pr(e,r){if(e instanceof pr&&e.loose===r)return e;if(!(this instanceof pr))return new pr(e,r);this.loose=r;this.raw=e;this.set=e.split(/\s*\|\|\s*/).map(function(e){return this.parseRange(e.trim())},this).filter(function(e){return e.length});if(!this.set.length){throw new TypeError("Invalid SemVer Range: "+e)}this.format()}pr.prototype.inspect=function(){return''};pr.prototype.format=function(){this.range=this.set.map(function(e){return e.join(" ").trim()}).join("||").trim();return this.range};pr.prototype.toString=function(){return this.range};pr.prototype.parseRange=function(e){var t=this.loose;e=e.trim();var n=t?r[N]:r[_];e=e.replace(n,Er);e=e.replace(r[L],X);e=e.replace(r[S],V);e=e.replace(r[T],M);e=e.split(/\s+/).join(" ");var i=t?r[Z]:r[q];var s=e.split(" ").map(function(e){return vr(e,t)}).join(" ").split(/\s+/);if(this.loose){s=s.filter(function(e){return!!e.match(i)})}s=s.map(function(e){return new lr(e,t)});return s};e.toComparators=hr;function hr(e,r){return new pr(e,r).set.map(function(e){return e.map(function(e){return e.value}).join(" ").trim().split(" ")})}function vr(e,r){e=dr(e,r);e=gr(e,r);e=$r(e,r);e=br(e,r);return e}function mr(e){return!e||e.toLowerCase()==="x"||e==="*"}function gr(e,r){return e.trim().split(/\s+/).map(function(e){return wr(e,r)}).join(" ")}function wr(e,t){var n=t?r[A]:r[I];return e.replace(n,function(e,r,t,n,i){var s;if(mr(r))s="";else if(mr(t))s=">="+r+".0.0-0 <"+(+r+1)+".0.0-0";else if(mr(n))s=">="+r+"."+t+".0-0 <"+r+"."+(+t+1)+".0-0";else if(i){if(i.charAt(0)!=="-")i="-"+i;s=">="+r+"."+t+"."+n+i+" <"+r+"."+(+t+1)+".0-0"}else s=">="+r+"."+t+"."+n+"-0"+" <"+r+"."+(+t+1)+".0-0";return s})}function dr(e,r){return e.trim().split(/\s+/).map(function(e){return yr(e,r)}).join(" ")}function yr(e,t){var n=t?r[P]:r[z];return e.replace(n,function(e,r,t,n,i){var s;if(mr(r))s="";else if(mr(t))s=">="+r+".0.0-0 <"+(+r+1)+".0.0-0";else if(mr(n)){if(r==="0")s=">="+r+"."+t+".0-0 <"+r+"."+(+t+1)+".0-0";else s=">="+r+"."+t+".0-0 <"+(+r+1)+".0.0-0"}else if(i){if(i.charAt(0)!=="-")i="-"+i;if(r==="0"){if(t==="0")s="="+r+"."+t+"."+n+i;else s=">="+r+"."+t+"."+n+i+" <"+r+"."+(+t+1)+".0-0"}else s=">="+r+"."+t+"."+n+i+" <"+(+r+1)+".0.0-0"}else{if(r==="0"){if(t==="0")s="="+r+"."+t+"."+n;else s=">="+r+"."+t+"."+n+"-0"+" <"+r+"."+(+t+1)+".0-0"}else s=">="+r+"."+t+"."+n+"-0"+" <"+(+r+1)+".0.0-0"}return s})}function $r(e,r){return e.split(/\s+/).map(function(e){return jr(e,r)}).join(" ")}function jr(e,t){e=e.trim();var n=t?r[x]:r[k];return e.replace(n,function(e,r,t,n,i,s){var o=mr(t);var a=o||mr(n);var f=a||mr(i);var u=f;if(r==="="&&u)r="";if(r&&u){if(o)t=0;if(a)n=0;if(f)i=0;if(r===">"){r=">=";if(o){}else if(a){t=+t+1;n=0;i=0}else if(f){n=+n+1;i=0}}e=r+t+"."+n+"."+i+"-0"}else if(o){e="*"}else if(a){e=">="+t+".0.0-0 <"+(+t+1)+".0.0-0"}else if(f){e=">="+t+"."+n+".0-0 <"+t+"."+(+n+1)+".0-0"}return e})}function br(e,t){return e.trim().replace(r[O],"")}function Er(e,r,t,n,i,s,o,a,f,u,l,c,p){if(mr(t))r="";else if(mr(n))r=">="+t+".0.0-0";else if(mr(i))r=">="+t+"."+n+".0-0";else r=">="+r;if(mr(f))a="";else if(mr(u))a="<"+(+f+1)+".0.0-0";else if(mr(l))a="<"+f+"."+(+u+1)+".0-0";else if(c)a="<="+f+"."+u+"."+l+"-"+c;else a="<="+a;return(r+" "+a).trim()}pr.prototype.test=function(e){if(!e)return false;for(var r=0;r",t)}e.outside=Ar;function Ar(e,r,t,n){e=new H(e,n);r=new pr(r,n);var i,s,o,a,f;switch(t){case">":i=nr;s=fr;o=ir;a=">";f=">=";break;case"<":i=ir;s=ar;o=nr;a="<";f="<=";break;default:throw new TypeError('Must provide a hilo val of "<" or ">"')}if(xr(e,r,n)){return false}for(var u=0;u)?=?)";var b=n++;t[b]=t[s]+"|x|X|\\*";var $=n++;t[$]=t[i]+"|x|X|\\*";var j=n++;t[j]="[v=\\s]*("+t[$]+")"+"(?:\\.("+t[$]+")"+"(?:\\.("+t[$]+")"+"(?:("+t[l]+")"+")?)?)?";var k=n++;t[k]="[v=\\s]*("+t[b]+")"+"(?:\\.("+t[b]+")"+"(?:\\.("+t[b]+")"+"(?:("+t[p]+")"+")?)?)?";var E=n++;t[E]="^"+t[y]+"\\s*"+t[j]+"$";var x=n++;t[x]="^"+t[y]+"\\s*"+t[k]+"$";var R=n++;t[R]="(?:~>?)";var S=n++;t[S]="(\\s*)"+t[R]+"\\s+";r[S]=new RegExp(t[S],"g");var V="$1~";var I=n++;t[I]="^"+t[R]+t[j]+"$";var T=n++;t[T]="^"+t[R]+t[k]+"$";var A=n++;t[A]="(?:\\^)";var C=n++;t[C]="(\\s*)"+t[A]+"\\s+";r[C]=new RegExp(t[C],"g");var M="$1^";var z=n++;t[z]="^"+t[A]+t[j]+"$";var P=n++;t[P]="^"+t[A]+t[k]+"$";var Z=n++;t[Z]="^"+t[y]+"\\s*("+w+")$|^$";var q=n++;t[q]="^"+t[y]+"\\s*("+g+")$|^$";var L=n++;t[L]="(\\s*)"+t[y]+"\\s*("+w+"|"+t[j]+")";r[L]=new RegExp(t[L],"g");var X="$1$2$3";var _=n++;t[_]="^\\s*("+t[j]+")"+"\\s+-\\s+"+"("+t[j]+")"+"\\s*$";var N=n++;t[N]="^\\s*("+t[k]+")"+"\\s+-\\s+"+"("+t[k]+")"+"\\s*$";var O=n++;t[O]="(<|>)?=?\\s*\\*";for(var B=0;B'};H.prototype.toString=function(){return this.version};H.prototype.compare=function(e){if(!(e instanceof H))e=new H(e,this.loose);return this.compareMain(e)||this.comparePre(e)};H.prototype.compareMain=function(e){if(!(e instanceof H))e=new H(e,this.loose);return Q(this.major,e.major)||Q(this.minor,e.minor)||Q(this.patch,e.patch)};H.prototype.comparePre=function(e){if(!(e instanceof H))e=new H(e,this.loose);if(this.prerelease.length&&!e.prerelease.length)return-1;else if(!this.prerelease.length&&e.prerelease.length)return 1;else if(!this.prerelease.length&&!e.prerelease.length)return 0;var r=0;do{var t=this.prerelease[r];var n=e.prerelease[r];if(t===undefined&&n===undefined)return 0;else if(n===undefined)return 1;else if(t===undefined)return-1;else if(t===n)continue;else return Q(t,n)}while(++r)};H.prototype.inc=function(e){switch(e){case"premajor":this.inc("major");this.inc("pre");break;case"preminor":this.inc("minor");this.inc("pre");break;case"prepatch":this.inc("patch");this.inc("pre");break;case"prerelease":if(this.prerelease.length===0)this.inc("patch");this.inc("pre");break;case"major":this.major++;this.minor=-1;case"minor":this.minor++;this.patch=0;this.prerelease=[];break;case"patch":if(this.prerelease.length===0)this.patch++;this.prerelease=[];break;case"pre":if(this.prerelease.length===0)this.prerelease=[0];else{var r=this.prerelease.length;while(--r>=0){if(typeof this.prerelease[r]==="number"){this.prerelease[r]++;r=-2}}if(r===-1)this.prerelease.push(0)}break;default:throw new Error("invalid increment argument: "+e)}this.format();return this};e.inc=J;function J(e,r,t){try{return new H(e,t).inc(r).version}catch(n){return null}}e.compareIdentifiers=Q;var K=/^[0-9]+$/;function Q(e,r){var t=K.test(e);var n=K.test(r);if(t&&n){e=+e;r=+r}return t&&!n?-1:n&&!t?1:er?1:0}e.rcompareIdentifiers=U;function U(e,r){return Q(r,e)}e.compare=W;function W(e,r,t){return new H(e,t).compare(r)}e.compareLoose=Y;function Y(e,r){return W(e,r,true)}e.rcompare=er;function er(e,r,t){return W(r,e,t)}e.sort=rr;function rr(r,t){return r.sort(function(r,n){return e.compare(r,n,t)})}e.rsort=tr;function tr(r,t){return r.sort(function(r,n){return e.rcompare(r,n,t)})}e.gt=nr;function nr(e,r,t){return W(e,r,t)>0}e.lt=ir;function ir(e,r,t){return W(e,r,t)<0}e.eq=sr;function sr(e,r,t){return W(e,r,t)===0}e.neq=ar;function ar(e,r,t){return W(e,r,t)!==0}e.gte=or;function or(e,r,t){return W(e,r,t)>=0}e.lte=fr;function fr(e,r,t){return W(e,r,t)<=0}e.cmp=ur;function ur(e,r,t,n){var i;switch(r){case"===":i=e===t;break;case"!==":i=e!==t;break;case"":case"=":case"==":i=sr(e,t,n);break;case"!=":i=ar(e,t,n);break;case">":i=nr(e,t,n);break;case">=":i=or(e,t,n);break;case"<":i=ir(e,t,n);break;case"<=":i=fr(e,t,n);break;default:throw new TypeError("Invalid operator: "+r)}return i}e.Comparator=cr;function cr(e,r){if(e instanceof cr){if(e.loose===r)return e;else e=e.value}if(!(this instanceof cr))return new cr(e,r);this.loose=r;this.parse(e);if(this.semver===lr)this.value="";else this.value=this.operator+this.semver.version}var lr={};cr.prototype.parse=function(e){var t=this.loose?r[Z]:r[q];var n=e.match(t);if(!n)throw new TypeError("Invalid comparator: "+e);this.operator=n[1];if(!n[2])this.semver=lr;else{this.semver=new H(n[2],this.loose);if(this.operator==="<"&&!this.semver.prerelease.length){this.semver.prerelease=["0"];this.semver.format()}}};cr.prototype.inspect=function(){return''};cr.prototype.toString=function(){return this.value};cr.prototype.test=function(e){return this.semver===lr?true:ur(e,this.operator,this.semver,this.loose)};e.Range=pr;function pr(e,r){if(e instanceof pr&&e.loose===r)return e;if(!(this instanceof pr))return new pr(e,r);this.loose=r;this.raw=e;this.set=e.split(/\s*\|\|\s*/).map(function(e){return this.parseRange(e.trim())},this).filter(function(e){return e.length});if(!this.set.length){throw new TypeError("Invalid SemVer Range: "+e)}this.format()}pr.prototype.inspect=function(){return''};pr.prototype.format=function(){this.range=this.set.map(function(e){return e.join(" ").trim()}).join("||").trim();return this.range};pr.prototype.toString=function(){return this.range};pr.prototype.parseRange=function(e){var t=this.loose;e=e.trim();var n=t?r[N]:r[_];e=e.replace(n,kr);e=e.replace(r[L],X);e=e.replace(r[S],V);e=e.replace(r[C],M);e=e.split(/\s+/).join(" ");var i=t?r[Z]:r[q];var s=e.split(" ").map(function(e){return vr(e,t)}).join(" ").split(/\s+/);if(this.loose){s=s.filter(function(e){return!!e.match(i)})}s=s.map(function(e){return new cr(e,t)});return s};e.toComparators=hr;function hr(e,r){return new pr(e,r).set.map(function(e){return e.map(function(e){return e.value}).join(" ").trim().split(" ")})}function vr(e,r){e=dr(e,r);e=gr(e,r);e=br(e,r);e=jr(e,r);return e}function mr(e){return!e||e.toLowerCase()==="x"||e==="*"}function gr(e,r){return e.trim().split(/\s+/).map(function(e){return wr(e,r)}).join(" ")}function wr(e,t){var n=t?r[T]:r[I];return e.replace(n,function(e,r,t,n,i){var s;if(mr(r))s="";else if(mr(t))s=">="+r+".0.0-0 <"+(+r+1)+".0.0-0";else if(mr(n))s=">="+r+"."+t+".0-0 <"+r+"."+(+t+1)+".0-0";else if(i){if(i.charAt(0)!=="-")i="-"+i;s=">="+r+"."+t+"."+n+i+" <"+r+"."+(+t+1)+".0-0"}else s=">="+r+"."+t+"."+n+"-0"+" <"+r+"."+(+t+1)+".0-0";return s})}function dr(e,r){return e.trim().split(/\s+/).map(function(e){return yr(e,r)}).join(" ")}function yr(e,t){var n=t?r[P]:r[z];return e.replace(n,function(e,r,t,n,i){var s;if(mr(r))s="";else if(mr(t))s=">="+r+".0.0-0 <"+(+r+1)+".0.0-0";else if(mr(n)){if(r==="0")s=">="+r+"."+t+".0-0 <"+r+"."+(+t+1)+".0-0";else s=">="+r+"."+t+".0-0 <"+(+r+1)+".0.0-0"}else if(i){if(i.charAt(0)!=="-")i="-"+i;if(r==="0"){if(t==="0")s="="+r+"."+t+"."+n+i;else s=">="+r+"."+t+"."+n+i+" <"+r+"."+(+t+1)+".0-0"}else s=">="+r+"."+t+"."+n+i+" <"+(+r+1)+".0.0-0"}else{if(r==="0"){if(t==="0")s="="+r+"."+t+"."+n;else s=">="+r+"."+t+"."+n+"-0"+" <"+r+"."+(+t+1)+".0-0"}else s=">="+r+"."+t+"."+n+"-0"+" <"+(+r+1)+".0.0-0"}return s})}function br(e,r){return e.split(/\s+/).map(function(e){return $r(e,r)}).join(" ")}function $r(e,t){e=e.trim();var n=t?r[x]:r[E];return e.replace(n,function(e,r,t,n,i,s){var a=mr(t);var o=a||mr(n);var f=o||mr(i);var u=f;if(r==="="&&u)r="";if(r&&u){if(a)t=0;if(o)n=0;if(f)i=0;if(r===">"){r=">=";if(a){}else if(o){t=+t+1;n=0;i=0}else if(f){n=+n+1;i=0}}e=r+t+"."+n+"."+i+"-0"}else if(a){e="*"}else if(o){e=">="+t+".0.0-0 <"+(+t+1)+".0.0-0"}else if(f){e=">="+t+"."+n+".0-0 <"+t+"."+(+n+1)+".0-0"}return e})}function jr(e,t){return e.trim().replace(r[O],"")}function kr(e,r,t,n,i,s,a,o,f,u,c,l,p){if(mr(t))r="";else if(mr(n))r=">="+t+".0.0-0";else if(mr(i))r=">="+t+"."+n+".0-0";else r=">="+r;if(mr(f))o="";else if(mr(u))o="<"+(+f+1)+".0.0-0";else if(mr(c))o="<"+f+"."+(+u+1)+".0-0";else if(l)o="<="+f+"."+u+"."+c+"-"+l;else o="<="+o;return(r+" "+o).trim()}pr.prototype.test=function(e){if(!e)return false;for(var r=0;r",t)}e.outside=Tr;function Tr(e,r,t,n){e=new H(e,n);r=new pr(r,n);var i,s,a,o,f;switch(t){case">":i=nr;s=fr;a=ir;o=">";f=">=";break;case"<":i=ir;s=or;a=nr;o="<";f="<=";break;default:throw new TypeError('Must provide a hilo val of "<" or ">"')}if(xr(e,r,n)){return false}for(var u=0;u([^\(]*\([0-9]\)) -- (.*?)<\/h1>/

\1<\/h1>

\2<\/p>/g' \ + | perl -pi -e 's/]*)>([^\(]*\([0-9]\)) -- (.*?)<\/h1>/

\2<\/h1>

\3<\/p>/g' \ | perl -pi -e 's/npm-npm/npm/g' \ | perl -pi -e 's/([^"-])(npm-)?README(?!\.html)(\(1\))?/\1README<\/a>/g' \ | perl -pi -e 's/<a href="[^"]+README.html">README<\/a><\/title>/<title>README<\/title>/g' \ diff -Nru nodejs-0.10.28/deps/npm/test/tap/00-verify-bundle-deps.js nodejs-0.10.29/deps/npm/test/tap/00-verify-bundle-deps.js --- nodejs-0.10.28/deps/npm/test/tap/00-verify-bundle-deps.js 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/test/tap/00-verify-bundle-deps.js 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,27 @@ +var fs = require("fs") +var path = require("path") +var test = require("tap").test + +var manifest = require("../../package.json") +var deps = Object.keys(manifest.dependencies) +var dev = Object.keys(manifest.devDependencies) +var bundled = manifest.bundleDependencies + +test("all deps are bundled deps or dev deps", function (t) { + deps.forEach(function (name) { + t.assert( + bundled.indexOf(name) !== -1, + name + " is in bundledDependencies" + ) + }) + + t.same( + fs.readdirSync(path.resolve(__dirname, '../../node_modules')).filter(function (name) { + return (dev.indexOf(name) === -1) && (name !== ".bin") + }).sort(), + bundled.sort(), + "bundleDependencies matches what's in node_modules" + ) + + t.end() +}) diff -Nru nodejs-0.10.28/deps/npm/test/tap/cache-shasum.js nodejs-0.10.29/deps/npm/test/tap/cache-shasum.js --- nodejs-0.10.28/deps/npm/test/tap/cache-shasum.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/test/tap/cache-shasum.js 2014-06-09 17:04:36.000000000 +0000 @@ -43,7 +43,7 @@ test("compare", function(t) { var d = path.resolve(__dirname, "cache-shasum/request") var p = path.resolve(d, "2.27.0/package.tgz") - var r = require(path.resolve(d, ".cache.json")) + var r = require("./cache-shasum/localhost_1337/request/.cache.json") var rshasum = r.versions['2.27.0'].dist.shasum sha.get(p, function (er, pshasum) { if (er) diff -Nru nodejs-0.10.28/deps/npm/test/tap/config-meta.js nodejs-0.10.29/deps/npm/test/tap/config-meta.js --- nodejs-0.10.28/deps/npm/test/tap/config-meta.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/test/tap/config-meta.js 2014-06-09 17:04:36.000000000 +0000 @@ -31,7 +31,12 @@ return path.resolve(lib, f) }) files.forEach(function (f) { - if (fs.statSync(f).isDirectory()) + try { + var s = fs.statSync(f) + } catch (er) { + return + } + if (s.isDirectory()) walk(f) else if (f.match(/\.js$/)) FILES.push(f) diff -Nru nodejs-0.10.28/deps/npm/test/tap/install-save-prefix.js nodejs-0.10.29/deps/npm/test/tap/install-save-prefix.js --- nodejs-0.10.28/deps/npm/test/tap/install-save-prefix.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/test/tap/install-save-prefix.js 2014-06-09 17:04:36.000000000 +0000 @@ -22,6 +22,7 @@ npm.load({ cache: pkg + "/cache", loglevel: 'silent', + 'save-prefix': '^', registry: common.registry }, function(err) { t.ifError(err) npm.config.set('save', true) @@ -32,7 +33,7 @@ var pkgJson = JSON.parse(fs.readFileSync(pkg + '/package.json', 'utf8')) t.deepEqual(pkgJson.dependencies, { 'underscore': '^1.5.1' - }, 'Underscore dependency should specify ^1.3.1') + }, 'Underscore dependency should specify ^1.5.1') npm.config.set('save', undefined) s.close() t.end() @@ -47,6 +48,7 @@ npm.load({ cache: pkg + "/cache", loglevel: 'silent', + 'save-prefix': '^', registry: common.registry }, function(err) { t.ifError(err) npm.config.set('save-dev', true) diff -Nru nodejs-0.10.28/deps/npm/test/tap/ls-depth-unmet/package.json nodejs-0.10.29/deps/npm/test/tap/ls-depth-unmet/package.json --- nodejs-0.10.28/deps/npm/test/tap/ls-depth-unmet/package.json 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/test/tap/ls-depth-unmet/package.json 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,10 @@ +{ + "name": "ls-depth-umnet", + "author": "Evan You", + "version": "0.0.0", + "dependencies": { + "test-package-with-one-dep": "0.0.0", + "underscore": "1.5.1", + "optimist": "0.6.0" + } +} \ No newline at end of file diff -Nru nodejs-0.10.28/deps/npm/test/tap/ls-depth-unmet.js nodejs-0.10.29/deps/npm/test/tap/ls-depth-unmet.js --- nodejs-0.10.28/deps/npm/test/tap/ls-depth-unmet.js 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/test/tap/ls-depth-unmet.js 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,97 @@ +var common = require('../common-tap') + , test = require('tap').test + , path = require('path') + , rimraf = require('rimraf') + , osenv = require('osenv') + , mkdirp = require('mkdirp') + , pkg = __dirname + '/ls-depth-unmet' + , cache = pkg + '/cache' + , tmp = pkg + '/tmp' + , node = process.execPath + , npm = path.resolve(__dirname, '../../cli.js') + , mr = require('npm-registry-mock') + , opts = {cwd: pkg} + + +function cleanup () { + process.chdir(osenv.tmpdir()) + rimraf.sync(pkg + '/cache') + rimraf.sync(pkg + '/tmp') + rimraf.sync(pkg + '/node_modules') +} + +test('setup', function (t) { + cleanup() + mkdirp.sync(pkg + '/cache') + mkdirp.sync(pkg + '/tmp') + mr(common.port, function (s) { + var cmd = ['install', 'underscore@1.3.1', 'mkdirp', 'test-package-with-one-dep', '--registry=' + common.registry] + common.npm(cmd, opts, function (er, c) { + if (er) throw er + t.equal(c, 0) + s.close() + t.end() + }) + }) +}) + +test('npm ls --depth=0', function (t) { + common.npm(['ls', '--depth=0'], opts, function (er, c, out) { + if (er) throw er + t.equal(c, 1) + t.has(out, /UNMET DEPENDENCY optimist@0\.6\.0/ + , "output contains optimist@0.6.0 and labeled as unmet dependency") + t.has(out, /mkdirp@0\.3\.5 extraneous/ + , "output contains mkdirp@0.3.5 and labeled as extraneous") + t.has(out, /underscore@1\.3\.1 invalid/ + , "output contains underscore@1.3.1 and labeled as invalid") + t.has(out, /test-package-with-one-dep@0\.0\.0\n/ + , "output contains test-package-with-one-dep@0.0.0 and has no labels") + t.doesNotHave(out, /test-package@0\.0\.0/ + , "output does not contain test-package@0.0.0 which is at depth=1") + t.end() + }) +}) + +test('npm ls --depth=1', function (t) { + common.npm(['ls', '--depth=1'], opts, function (er, c, out) { + if (er) throw er + t.equal(c, 1) + t.has(out, /UNMET DEPENDENCY optimist@0\.6\.0/ + , "output contains optimist@0.6.0 and labeled as unmet dependency") + t.has(out, /mkdirp@0\.3\.5 extraneous/ + , "output contains mkdirp@0.3.5 and labeled as extraneous") + t.has(out, /underscore@1\.3\.1 invalid/ + , "output contains underscore@1.3.1 and labeled as invalid") + t.has(out, /test-package-with-one-dep@0\.0\.0\n/ + , "output contains test-package-with-one-dep@0.0.0 and has no labels") + t.has(out, /test-package@0\.0\.0/ + , "output contains test-package@0.0.0 which is at depth=1") + t.end() + }) +}) + +test('npm ls --depth=Infinity', function (t) { + // travis has a preconfigured depth=0, in general we can not depend + // on the default value in all environments, so explictly set it here + common.npm(['ls', '--depth=Infinity'], opts, function (er, c, out) { + if (er) throw er + t.equal(c, 1) + t.has(out, /UNMET DEPENDENCY optimist@0\.6\.0/ + , "output contains optimist@0.6.0 and labeled as unmet dependency") + t.has(out, /mkdirp@0\.3\.5 extraneous/ + , "output contains mkdirp@0.3.5 and labeled as extraneous") + t.has(out, /underscore@1\.3\.1 invalid/ + , "output contains underscore@1.3.1 and labeled as invalid") + t.has(out, /test-package-with-one-dep@0\.0\.0\n/ + , "output contains test-package-with-one-dep@0.0.0 and has no labels") + t.has(out, /test-package@0\.0\.0/ + , "output contains test-package@0.0.0 which is at depth=1") + t.end() + }) +}) + +test('cleanup', function (t) { + cleanup() + t.end() +}) diff -Nru nodejs-0.10.28/deps/npm/test/tap/maybe-github.js nodejs-0.10.29/deps/npm/test/tap/maybe-github.js --- nodejs-0.10.28/deps/npm/test/tap/maybe-github.js 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/test/tap/maybe-github.js 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,76 @@ +require("../common-tap.js") +var test = require("tap").test +var npm = require("../../lib/npm.js") + +// this is the narrowest way to replace a function in the module cache +var found = true +var remoteGitPath = require.resolve('../../lib/cache/add-remote-git.js') +require("module")._cache[remoteGitPath] = { + id: remoteGitPath, + exports: function stub(_, error, __, cb) { + if (found) { + cb(null, {}) + } + else { + cb(error) + } + } +} + +// only load maybeGithub now, so it gets the stub from cache +var maybeGithub = require("../../lib/cache/maybe-github.js") + +test("should throw with no parameters", function (t) { + t.plan(1) + + t.throws(function () { + maybeGithub(); + }, "throws when called without parameters") +}) + +test("should throw with wrong parameter types", function (t) { + t.plan(3) + + t.throws(function () { + maybeGithub({}, new Error(), function () {}) + }, "expects only a package name") + + t.throws(function () { + maybeGithub("npm/xxx-noexist", null, function () {}) + }, "expects to be called after a previous check already failed") + + t.throws(function () { + maybeGithub("npm/xxx-noexist", new Error(), "ham") + }, "is always async") +}) + +test("should find an existing package on Github", function (t) { + found = true + npm.load({}, function (error) { + t.notOk(error, "bootstrapping succeeds") + t.doesNotThrow(function () { + maybeGithub("npm/npm", new Error("not on filesystem"), function (error, data) { + t.notOk(error, "no issues in looking things up") + t.ok(data, "received metadata from Github") + t.end() + }) + }) + }) +}) + +test("shouldn't find a nonexistent package on Github", function (t) { + found = false + npm.load({}, function () { + t.doesNotThrow(function () { + maybeGithub("npm/xxx-noexist", new Error("not on filesystem"), function (error, data) { + t.equal( + error.message, + "not on filesystem", + "passed through original error message" + ) + t.notOk(data, "didn't pass any metadata") + t.end() + }) + }) + }) +}) diff -Nru nodejs-0.10.28/deps/npm/test/tap/noargs-install-config-save.js nodejs-0.10.29/deps/npm/test/tap/noargs-install-config-save.js --- nodejs-0.10.28/deps/npm/test/tap/noargs-install-config-save.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/test/tap/noargs-install-config-save.js 2014-06-09 17:04:36.000000000 +0000 @@ -1,7 +1,6 @@ var common = require("../common-tap.js") var test = require("tap").test var npm = require.resolve("../../bin/npm-cli.js") -var osenv = require("osenv") var path = require("path") var fs = require("fs") var rimraf = require("rimraf") @@ -9,7 +8,6 @@ var mr = require("npm-registry-mock") -var child var spawn = require("child_process").spawn var node = process.execPath @@ -56,7 +54,7 @@ mr(common.port, function (s) { var child = createChild([npm, "install"]) - child.on("close", function (m) { + child.on("close", function () { var text = JSON.stringify(fs.readFileSync(pkg + "/package.json", "utf8")) t.ok(text.indexOf('"dependencies') === -1) s.close() @@ -71,7 +69,7 @@ mr(common.port, function (s) { var child = createChild([npm, "install", "underscore"]) - child.on("close", function (m) { + child.on("close", function () { var text = JSON.stringify(fs.readFileSync(pkg + "/package.json", "utf8")) t.ok(text.indexOf('"dependencies') !== -1) s.close() diff -Nru nodejs-0.10.28/deps/npm/test/tap/repo.js nodejs-0.10.29/deps/npm/test/tap/repo.js --- nodejs-0.10.28/deps/npm/test/tap/repo.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/test/tap/repo.js 2014-06-09 17:04:36.000000000 +0000 @@ -12,6 +12,10 @@ var rimraf = require("rimraf") var spawn = require("child_process").spawn var fs = require("fs") +var path = require('path') +var outFile = path.join(__dirname, '/_output') + +var opts = { cwd: __dirname } test("setup", function (t) { var s = "#!/usr/bin/env bash\n" + @@ -24,21 +28,105 @@ test("npm repo underscore", function (t) { mr(common.port, function (s) { - var c = spawn(node, [ - npm, "repo", "underscore", - "--registry=" + common.registry, - "--loglevel=silent", - "--browser=" + __dirname + "/_script.sh", - ]) - c.stdout.on("data", function(d) { - t.fail("Should not get data on stdout: " + d) - }) - c.stderr.pipe(process.stderr) - c.on("close", function(code) { - t.equal(code, 0, "exit ok") - var res = fs.readFileSync(__dirname + "/_output", "ascii") + common.npm([ + 'repo', 'underscore', + '--registry=' + common.registry, + '--loglevel=silent', + '--browser=' + __dirname + '/_script.sh' + ], opts, function(err, code, stdout, stderr) { + t.equal(code, 0, 'exit ok') + var res = fs.readFileSync(outFile, 'ascii') s.close() t.equal(res, "https://github.com/jashkenas/underscore\n") + rimraf.sync(outFile) + t.end() + }) + }) +}) + + +test('npm repo optimist - github (https://)', function (t) { + mr(common.port, function (s) { + common.npm([ + 'repo', 'optimist', + '--registry=' + common.registry, + '--loglevel=silent', + '--browser=' + __dirname + '/_script.sh' + ], opts, function(err, code, stdout, stderr) { + t.equal(code, 0, 'exit ok') + var res = fs.readFileSync(outFile, 'ascii') + s.close() + t.equal(res, "https://github.com/substack/node-optimist\n") + rimraf.sync(outFile) + t.end() + }) + }) +}) + +test("npm repo npm-test-peer-deps - no repo", function (t) { + mr(common.port, function (s) { + common.npm([ + 'repo', 'npm-test-peer-deps', + '--registry=' + common.registry, + '--loglevel=silent', + '--browser=' + __dirname + '/_script.sh' + ], opts, function(err, code, stdout, stderr) { + t.equal(code, 1, 'exit not ok') + s.close() + t.end() + }) + }) +}) + +test("npm repo test-repo-url-http - non-github (http://)", function (t) { + mr(common.port, function (s) { + common.npm([ + 'repo', 'test-repo-url-http', + '--registry=' + common.registry, + '--loglevel=silent', + '--browser=' + __dirname + '/_script.sh' + ], opts, function(err, code, stdout, stderr) { + t.equal(code, 0, 'exit ok') + var res = fs.readFileSync(outFile, 'ascii') + s.close() + t.equal(res, "http://gitlab.com/evanlucas/test-repo-url-http\n") + rimraf.sync(outFile) + t.end() + }) + }) +}) + +test("npm repo test-repo-url-https - non-github (https://)", function (t) { + mr(common.port, function (s) { + common.npm([ + 'repo', 'test-repo-url-https', + '--registry=' + common.registry, + '--loglevel=silent', + '--browser=' + __dirname + '/_script.sh' + ], opts, function(err, code, stdout, stderr) { + t.equal(code, 0, 'exit ok') + var res = fs.readFileSync(outFile, 'ascii') + s.close() + t.equal(res, "https://gitlab.com/evanlucas/test-repo-url-https\n") + rimraf.sync(outFile) + t.end() + }) + }) +}) + +test("npm repo test-repo-url-ssh - non-github (ssh://)", function (t) { + mr(common.port, function (s) { + common.npm([ + 'repo', 'test-repo-url-ssh', + '--registry=' + common.registry, + '--loglevel=silent', + '--browser=' + __dirname + '/_script.sh' + ], opts, function(err, code, stdout, stderr) { + t.equal(code, 0, 'exit ok') + var res = fs.readFileSync(outFile, 'ascii') + s.close() + t.equal(res, "http://gitlab.com/evanlucas/test-repo-url-ssh\n") + rimraf.sync(outFile) t.end() }) }) @@ -46,7 +134,6 @@ test("cleanup", function (t) { fs.unlinkSync(__dirname + "/_script.sh") - fs.unlinkSync(__dirname + "/_output") t.pass("cleaned up") t.end() }) diff -Nru nodejs-0.10.28/deps/npm/test/tap/test-run-ls.js nodejs-0.10.29/deps/npm/test/tap/test-run-ls.js --- nodejs-0.10.28/deps/npm/test/tap/test-run-ls.js 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/test/tap/test-run-ls.js 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,33 @@ +var common = require("../common-tap.js") +var test = require("tap").test +var path = require("path") +var cwd = path.resolve(__dirname, "..", "..") +var testscript = require("../../package.json").scripts.test +var tsregexp = testscript.replace(/([\[\.\*\]])/g, "\\$1") + +test("default", function (t) { + common.npm(["run"], { cwd: cwd }, function (er, code, so, se) { + if (er) throw er + t.notOk(code) + t.similar(so, new RegExp("\\n test\\n " + tsregexp + "\\n")) + t.end() + }) +}) + +test("parseable", function (t) { + common.npm(["run", "-p"], { cwd: cwd }, function (er, code, so, se) { + if (er) throw er + t.notOk(code) + t.similar(so, new RegExp("\\ntest:" + tsregexp + "\\n")) + t.end() + }) +}) + +test("parseable", function (t) { + common.npm(["run", "--json"], { cwd: cwd }, function (er, code, so, se) { + if (er) throw er + t.notOk(code) + t.equal(JSON.parse(so).test, testscript) + t.end() + }) +}) diff -Nru nodejs-0.10.28/deps/npm/test/tap/update-save/index.js nodejs-0.10.29/deps/npm/test/tap/update-save/index.js --- nodejs-0.10.28/deps/npm/test/tap/update-save/index.js 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/test/tap/update-save/index.js 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1 @@ +module.exports = true diff -Nru nodejs-0.10.28/deps/npm/test/tap/update-save/package.json nodejs-0.10.29/deps/npm/test/tap/update-save/package.json --- nodejs-0.10.28/deps/npm/test/tap/update-save/package.json 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/test/tap/update-save/package.json 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,10 @@ +{ + "name": "update-save-example", + "version": "1.2.3", + "dependencies": { + "mkdirp": "~0.3.0" + }, + "devDependencies": { + "underscore": "~1.3.1" + } +} \ No newline at end of file diff -Nru nodejs-0.10.28/deps/npm/test/tap/update-save/README.md nodejs-0.10.29/deps/npm/test/tap/update-save/README.md --- nodejs-0.10.28/deps/npm/test/tap/update-save/README.md 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/test/tap/update-save/README.md 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1 @@ +# just a test diff -Nru nodejs-0.10.28/deps/npm/test/tap/update-save.js nodejs-0.10.29/deps/npm/test/tap/update-save.js --- nodejs-0.10.28/deps/npm/test/tap/update-save.js 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/npm/test/tap/update-save.js 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,160 @@ +var common = require("../common-tap.js") +var test = require("tap").test +var npm = require("../../") +var mkdirp = require("mkdirp") +var rimraf = require("rimraf") +var fs = require('fs') +var path = require('path') +var mr = require("npm-registry-mock") + +var PKG_DIR = path.resolve(__dirname, "update-save") +var PKG = path.resolve(PKG_DIR, "package.json") +var CACHE_DIR = path.resolve(PKG_DIR, "cache") +var MODULES_DIR = path.resolve(PKG_DIR, "node_modules") + +var EXEC_OPTS = { + cwd: PKG_DIR, + stdio: 'ignore', + env: { + npm_config_registry: common.registry, + npm_config_loglevel: 'verbose' + } +} + +var DEFAULT_PKG = { + "name": "update-save-example", + "version": "1.2.3", + "dependencies": { + "mkdirp": "~0.3.0" + }, + "devDependencies": { + "underscore": "~1.3.1" + } +} + +var s = undefined // mock server reference + +test('setup', function (t) { + resetPackage() + + mr(common.port, function (server) { + npm.load({cache: CACHE_DIR, registry: common.registry}, function (err) { + t.ifError(err) + s = server + t.end() + }) + }) +}) + +test("update regular dependencies only", function (t) { + resetPackage() + + common.npm(['update', '--save'], EXEC_OPTS, function (err, code) { + t.ifError(err) + t.equal(code, 0) + + var pkgdata = JSON.parse(fs.readFileSync(PKG, 'utf8')) + t.deepEqual(pkgdata.dependencies, {mkdirp: '^0.3.5'}, 'only dependencies updated') + t.deepEqual(pkgdata.devDependencies, DEFAULT_PKG.devDependencies, 'dev dependencies should be untouched') + t.deepEqual(pkgdata.optionalDependencies, DEFAULT_PKG.optionalDependencies, 'optional dependencies should be untouched') + t.end() + }) +}) + +test("update devDependencies only", function (t) { + resetPackage() + + common.npm(['update', '--save-dev'], EXEC_OPTS, function (err, code, stdout, stderr) { + t.ifError(err) + t.equal(code, 0) + + var pkgdata = JSON.parse(fs.readFileSync(PKG, 'utf8')) + t.deepEqual(pkgdata.dependencies, DEFAULT_PKG.dependencies, 'dependencies should be untouched') + t.deepEqual(pkgdata.devDependencies, {underscore: '^1.3.3'}, 'dev dependencies should be updated') + t.deepEqual(pkgdata.optionalDependencies, DEFAULT_PKG.optionalDependencies, 'optional dependencies should be untouched') + t.end() + }) +}) + +test("update optionalDependencies only", function (t) { + resetPackage({ + "optionalDependencies": { + "underscore": "~1.3.1" + } + }) + + common.npm(['update', '--save-optional'], EXEC_OPTS, function (err, code) { + t.ifError(err) + t.equal(code, 0) + + var pkgdata = JSON.parse(fs.readFileSync(PKG, 'utf8')) + t.deepEqual(pkgdata.dependencies, DEFAULT_PKG.dependencies, 'dependencies should be untouched') + t.deepEqual(pkgdata.devDependencies, DEFAULT_PKG.devDependencies, 'dev dependencies should be untouched') + t.deepEqual(pkgdata.optionalDependencies, {underscore: '^1.3.3'}, 'optional dependencies should be updated') + t.end() + }) +}) + +test("optionalDependencies are merged into dependencies during --save", function (t) { + var pkg = resetPackage({ + "optionalDependencies": { + "underscore": "~1.3.1" + } + }) + + common.npm(['update', '--save'], EXEC_OPTS, function (err, code) { + t.ifError(err) + t.equal(code, 0) + + var pkgdata = JSON.parse(fs.readFileSync(PKG, 'utf8')) + t.deepEqual(pkgdata.dependencies, {mkdirp: '^0.3.5'}, 'dependencies should not include optional dependencies') + t.deepEqual(pkgdata.devDependencies, pkg.devDependencies, 'dev dependencies should be untouched') + t.deepEqual(pkgdata.optionalDependencies, pkg.optionalDependencies, 'optional dependencies should be untouched') + t.end() + }) +}) + +test("semver prefix is replaced with configured save-prefix", function (t) { + resetPackage() + + common.npm(['update', '--save', '--save-prefix', '~'], EXEC_OPTS, function (err, code) { + t.ifError(err) + t.equal(code, 0) + + var pkgdata = JSON.parse(fs.readFileSync(PKG, 'utf8')) + t.deepEqual(pkgdata.dependencies, { + mkdirp: '~0.3.5' + }, 'dependencies should be updated') + t.deepEqual(pkgdata.devDependencies, DEFAULT_PKG.devDependencies, 'dev dependencies should be untouched') + t.deepEqual(pkgdata.optionalDependencies, DEFAULT_PKG.optionalDependencies, 'optional dependencies should be updated') + t.end() + }) +}) + +function resetPackage(extendWith) { + rimraf.sync(CACHE_DIR) + rimraf.sync(MODULES_DIR) + mkdirp.sync(CACHE_DIR) + var pkg = clone(DEFAULT_PKG) + extend(pkg, extendWith) + for (key in extend) { pkg[key] = extend[key]} + fs.writeFileSync(PKG, JSON.stringify(pkg, null, 2), 'ascii') + return pkg +} + +test("cleanup", function (t) { + s.close() + resetPackage() // restore package.json + rimraf.sync(CACHE_DIR) + rimraf.sync(MODULES_DIR) + t.end() +}) + +function clone(a) { + return extend({}, a) +} + +function extend(a, b) { + for (key in b) { a[key] = b[key]} + return a +} diff -Nru nodejs-0.10.28/deps/npm/test/tap/url-dependencies.js nodejs-0.10.29/deps/npm/test/tap/url-dependencies.js --- nodejs-0.10.28/deps/npm/test/tap/url-dependencies.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/npm/test/tap/url-dependencies.js 2014-06-09 17:04:36.000000000 +0000 @@ -56,6 +56,7 @@ npm_config_registry: common.registry, npm_config_cache_lock_stale: 1000, npm_config_cache_lock_wait: 1000, + npm_config_loglevel: "http", HOME: process.env.HOME, Path: process.env.PATH, PATH: process.env.PATH diff -Nru nodejs-0.10.28/deps/openssl/openssl/ACKNOWLEDGMENTS nodejs-0.10.29/deps/openssl/openssl/ACKNOWLEDGMENTS --- nodejs-0.10.28/deps/openssl/openssl/ACKNOWLEDGMENTS 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/ACKNOWLEDGMENTS 2014-06-09 17:04:36.000000000 +0000 @@ -10,13 +10,18 @@ We would like to identify and thank the following such sponsors for their past or current significant support of the OpenSSL project: +Major support: + + Qualys http://www.qualys.com/ + Very significant support: - OpenGear: www.opengear.com + OpenGear: http://www.opengear.com/ Significant support: - PSW Group: www.psw.net + PSW Group: http://www.psw.net/ + Acano Ltd. http://acano.com/ Please note that we ask permission to identify sponsors and that some sponsors we consider eligible for inclusion here have requested to remain anonymous. diff -Nru nodejs-0.10.28/deps/openssl/openssl/apps/enc.c nodejs-0.10.29/deps/openssl/openssl/apps/enc.c --- nodejs-0.10.28/deps/openssl/openssl/apps/enc.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/apps/enc.c 2014-06-09 17:04:36.000000000 +0000 @@ -331,6 +331,12 @@ setup_engine(bio_err, engine, 0); #endif + if (cipher && EVP_CIPHER_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER) + { + BIO_printf(bio_err, "AEAD ciphers not supported by the enc utility\n"); + goto end; + } + if (md && (dgst=EVP_get_digestbyname(md)) == NULL) { BIO_printf(bio_err,"%s is an unsupported message digest type\n",md); diff -Nru nodejs-0.10.28/deps/openssl/openssl/apps/Makefile.save nodejs-0.10.29/deps/openssl/openssl/apps/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/apps/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/apps/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,1056 +0,0 @@ -# -# apps/Makefile -# - -DIR= apps -TOP= .. -CC= cc -INCLUDES= -I$(TOP) -I../include $(KRB5_INCLUDES) -CFLAG= -g -static -MAKEFILE= Makefile -PERL= perl -RM= rm -f -# KRB5 stuff -KRB5_INCLUDES= -LIBKRB5= - -PEX_LIBS= -EX_LIBS= -EXE_EXT= - -SHLIB_TARGET= - -CFLAGS= -DMONOLITH $(INCLUDES) $(CFLAG) - -GENERAL=Makefile makeapps.com install.com - -DLIBCRYPTO=../libcrypto.a -DLIBSSL=../libssl.a -LIBCRYPTO=-L.. -lcrypto -LIBSSL=-L.. -lssl - -PROGRAM= openssl - -SCRIPTS=CA.sh CA.pl tsget - -EXE= $(PROGRAM)$(EXE_EXT) - -E_EXE= verify asn1pars req dgst dh dhparam enc passwd gendh errstr \ - ca crl rsa rsautl dsa dsaparam ec ecparam \ - x509 genrsa gendsa genpkey s_server s_client speed \ - s_time version pkcs7 cms crl2pkcs7 sess_id ciphers nseq pkcs12 \ - pkcs8 pkey pkeyparam pkeyutl spkac smime rand engine ocsp prime ts srp - -PROGS= $(PROGRAM).c - -A_OBJ=apps.o -A_SRC=apps.c -S_OBJ= s_cb.o s_socket.o -S_SRC= s_cb.c s_socket.c -RAND_OBJ=app_rand.o -RAND_SRC=app_rand.c - -E_OBJ= verify.o asn1pars.o req.o dgst.o dh.o dhparam.o enc.o passwd.o gendh.o errstr.o \ - ca.o pkcs7.o crl2p7.o crl.o \ - rsa.o rsautl.o dsa.o dsaparam.o ec.o ecparam.o \ - x509.o genrsa.o gendsa.o genpkey.o s_server.o s_client.o speed.o \ - s_time.o $(A_OBJ) $(S_OBJ) $(RAND_OBJ) version.o sess_id.o \ - ciphers.o nseq.o pkcs12.o pkcs8.o pkey.o pkeyparam.o pkeyutl.o \ - spkac.o smime.o cms.o rand.o engine.o ocsp.o prime.o ts.o srp.o - -E_SRC= verify.c asn1pars.c req.c dgst.c dh.c enc.c passwd.c gendh.c errstr.c ca.c \ - pkcs7.c crl2p7.c crl.c \ - rsa.c rsautl.c dsa.c dsaparam.c ec.c ecparam.c \ - x509.c genrsa.c gendsa.c genpkey.c s_server.c s_client.c speed.c \ - s_time.c $(A_SRC) $(S_SRC) $(RAND_SRC) version.c sess_id.c \ - ciphers.c nseq.c pkcs12.c pkcs8.c pkey.c pkeyparam.c pkeyutl.c \ - spkac.c smime.c cms.c rand.c engine.c ocsp.c prime.c ts.c srp.c - -SRC=$(E_SRC) - -EXHEADER= -HEADER= apps.h progs.h s_apps.h \ - testdsa.h testrsa.h \ - $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - @(cd ..; $(MAKE) DIRS=$(DIR) all) - -all: exe - -exe: $(EXE) - -req: sreq.o $(A_OBJ) $(DLIBCRYPTO) - shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \ - shlib_target="$(SHLIB_TARGET)"; \ - fi; \ - $(MAKE) -f $(TOP)/Makefile.shared -e \ - APPNAME=req OBJECTS="sreq.o $(A_OBJ) $(RAND_OBJ)" \ - LIBDEPS="$(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)" \ - link_app.$${shlib_target} - -sreq.o: req.c - $(CC) -c $(INCLUDES) $(CFLAG) -o sreq.o req.c - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @set -e; for i in $(EXE); \ - do \ - (echo installing $$i; \ - cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \ - chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \ - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i ); \ - done; - @set -e; for i in $(SCRIPTS); \ - do \ - (echo installing $$i; \ - cp $$i $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new; \ - chmod 755 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new; \ - mv -f $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i ); \ - done - @cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \ - chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \ - mv -f $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf - -tags: - ctags $(SRC) - -tests: - -links: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @if [ -z "$(THIS)" ]; then \ - $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; \ - else \ - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(SRC); \ - fi - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - rm -f CA.pl - -clean: - rm -f *.o *.obj *.dll lib tags core .pure .nfs* *.old *.bak fluff $(EXE) - rm -f req - -$(DLIBSSL): - (cd ..; $(MAKE) DIRS=ssl all) - -$(DLIBCRYPTO): - (cd ..; $(MAKE) DIRS=crypto all) - -$(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL) - $(RM) $(EXE) - shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \ - shlib_target="$(SHLIB_TARGET)"; \ - elif [ -n "$(FIPSCANLIB)" ]; then \ - FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)/bin/fipsld; export CC FIPSLD_CC; \ - fi; \ - LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \ - $(MAKE) -f $(TOP)/Makefile.shared -e \ - APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \ - LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ - link_app.$${shlib_target} - @(cd ..; $(MAKE) rehash) - -progs.h: progs.pl - $(PERL) progs.pl $(E_EXE) >progs.h - $(RM) $(PROGRAM).o - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -app_rand.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -app_rand.o: ../include/openssl/buffer.h ../include/openssl/conf.h -app_rand.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -app_rand.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -app_rand.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -app_rand.o: ../include/openssl/evp.h ../include/openssl/lhash.h -app_rand.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -app_rand.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h -app_rand.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -app_rand.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h -app_rand.o: ../include/openssl/safestack.h ../include/openssl/sha.h -app_rand.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -app_rand.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -app_rand.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h -app_rand.o: app_rand.c apps.h -apps.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -apps.o: ../include/openssl/bn.h ../include/openssl/buffer.h -apps.o: ../include/openssl/conf.h ../include/openssl/crypto.h -apps.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -apps.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -apps.o: ../include/openssl/engine.h ../include/openssl/err.h -apps.o: ../include/openssl/evp.h ../include/openssl/lhash.h -apps.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -apps.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h -apps.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -apps.o: ../include/openssl/pem.h ../include/openssl/pem2.h -apps.o: ../include/openssl/pkcs12.h ../include/openssl/pkcs7.h -apps.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -apps.o: ../include/openssl/sha.h ../include/openssl/stack.h -apps.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h -apps.o: ../include/openssl/ui.h ../include/openssl/x509.h -apps.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.c apps.h -asn1pars.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -asn1pars.o: ../include/openssl/buffer.h ../include/openssl/conf.h -asn1pars.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -asn1pars.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -asn1pars.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -asn1pars.o: ../include/openssl/err.h ../include/openssl/evp.h -asn1pars.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -asn1pars.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -asn1pars.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -asn1pars.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -asn1pars.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -asn1pars.o: ../include/openssl/safestack.h ../include/openssl/sha.h -asn1pars.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -asn1pars.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -asn1pars.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h -asn1pars.o: asn1pars.c -ca.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -ca.o: ../include/openssl/bn.h ../include/openssl/buffer.h -ca.o: ../include/openssl/conf.h ../include/openssl/crypto.h -ca.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -ca.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -ca.o: ../include/openssl/engine.h ../include/openssl/err.h -ca.o: ../include/openssl/evp.h ../include/openssl/lhash.h -ca.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -ca.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h -ca.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -ca.o: ../include/openssl/pem.h ../include/openssl/pem2.h -ca.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h -ca.o: ../include/openssl/sha.h ../include/openssl/stack.h -ca.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h -ca.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -ca.o: ../include/openssl/x509v3.h apps.h ca.c -ciphers.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -ciphers.o: ../include/openssl/buffer.h ../include/openssl/comp.h -ciphers.o: ../include/openssl/conf.h ../include/openssl/crypto.h -ciphers.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -ciphers.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -ciphers.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -ciphers.o: ../include/openssl/err.h ../include/openssl/evp.h -ciphers.o: ../include/openssl/hmac.h ../include/openssl/kssl.h -ciphers.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -ciphers.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -ciphers.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -ciphers.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -ciphers.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -ciphers.o: ../include/openssl/pqueue.h ../include/openssl/safestack.h -ciphers.o: ../include/openssl/sha.h ../include/openssl/srtp.h -ciphers.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h -ciphers.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h -ciphers.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -ciphers.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h -ciphers.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -ciphers.o: ../include/openssl/x509v3.h apps.h ciphers.c -cms.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -cms.o: ../include/openssl/buffer.h ../include/openssl/cms.h -cms.o: ../include/openssl/conf.h ../include/openssl/crypto.h -cms.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -cms.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -cms.o: ../include/openssl/engine.h ../include/openssl/err.h -cms.o: ../include/openssl/evp.h ../include/openssl/lhash.h -cms.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -cms.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h -cms.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -cms.o: ../include/openssl/pem.h ../include/openssl/pem2.h -cms.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h -cms.o: ../include/openssl/sha.h ../include/openssl/stack.h -cms.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h -cms.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -cms.o: ../include/openssl/x509v3.h apps.h cms.c -crl.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -crl.o: ../include/openssl/buffer.h ../include/openssl/conf.h -crl.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -crl.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -crl.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -crl.o: ../include/openssl/err.h ../include/openssl/evp.h -crl.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -crl.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -crl.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -crl.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -crl.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -crl.o: ../include/openssl/safestack.h ../include/openssl/sha.h -crl.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -crl.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -crl.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h crl.c -crl2p7.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -crl2p7.o: ../include/openssl/buffer.h ../include/openssl/conf.h -crl2p7.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -crl2p7.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -crl2p7.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -crl2p7.o: ../include/openssl/err.h ../include/openssl/evp.h -crl2p7.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -crl2p7.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -crl2p7.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -crl2p7.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -crl2p7.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -crl2p7.o: ../include/openssl/safestack.h ../include/openssl/sha.h -crl2p7.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -crl2p7.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -crl2p7.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h -crl2p7.o: crl2p7.c -dgst.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -dgst.o: ../include/openssl/buffer.h ../include/openssl/conf.h -dgst.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -dgst.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -dgst.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -dgst.o: ../include/openssl/err.h ../include/openssl/evp.h -dgst.o: ../include/openssl/hmac.h ../include/openssl/lhash.h -dgst.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -dgst.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h -dgst.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -dgst.o: ../include/openssl/pem.h ../include/openssl/pem2.h -dgst.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h -dgst.o: ../include/openssl/sha.h ../include/openssl/stack.h -dgst.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h -dgst.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -dgst.o: ../include/openssl/x509v3.h apps.h dgst.c -dh.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -dh.o: ../include/openssl/bn.h ../include/openssl/buffer.h -dh.o: ../include/openssl/conf.h ../include/openssl/crypto.h -dh.o: ../include/openssl/dh.h ../include/openssl/e_os2.h -dh.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -dh.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -dh.o: ../include/openssl/err.h ../include/openssl/evp.h -dh.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -dh.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -dh.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -dh.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -dh.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -dh.o: ../include/openssl/safestack.h ../include/openssl/sha.h -dh.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -dh.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -dh.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h dh.c -dsa.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -dsa.o: ../include/openssl/bn.h ../include/openssl/buffer.h -dsa.o: ../include/openssl/conf.h ../include/openssl/crypto.h -dsa.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h -dsa.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -dsa.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -dsa.o: ../include/openssl/err.h ../include/openssl/evp.h -dsa.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -dsa.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -dsa.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -dsa.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -dsa.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -dsa.o: ../include/openssl/safestack.h ../include/openssl/sha.h -dsa.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -dsa.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -dsa.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h dsa.c -dsaparam.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -dsaparam.o: ../include/openssl/bn.h ../include/openssl/buffer.h -dsaparam.o: ../include/openssl/conf.h ../include/openssl/crypto.h -dsaparam.o: ../include/openssl/dh.h ../include/openssl/dsa.h -dsaparam.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -dsaparam.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -dsaparam.o: ../include/openssl/engine.h ../include/openssl/err.h -dsaparam.o: ../include/openssl/evp.h ../include/openssl/lhash.h -dsaparam.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -dsaparam.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h -dsaparam.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -dsaparam.o: ../include/openssl/pem.h ../include/openssl/pem2.h -dsaparam.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h -dsaparam.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -dsaparam.o: ../include/openssl/sha.h ../include/openssl/stack.h -dsaparam.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h -dsaparam.o: ../include/openssl/ui.h ../include/openssl/x509.h -dsaparam.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h -dsaparam.o: dsaparam.c -ec.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -ec.o: ../include/openssl/buffer.h ../include/openssl/conf.h -ec.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -ec.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -ec.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -ec.o: ../include/openssl/err.h ../include/openssl/evp.h -ec.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -ec.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -ec.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -ec.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -ec.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -ec.o: ../include/openssl/safestack.h ../include/openssl/sha.h -ec.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -ec.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -ec.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h ec.c -ecparam.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -ecparam.o: ../include/openssl/bn.h ../include/openssl/buffer.h -ecparam.o: ../include/openssl/conf.h ../include/openssl/crypto.h -ecparam.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -ecparam.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -ecparam.o: ../include/openssl/engine.h ../include/openssl/err.h -ecparam.o: ../include/openssl/evp.h ../include/openssl/lhash.h -ecparam.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -ecparam.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h -ecparam.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -ecparam.o: ../include/openssl/pem.h ../include/openssl/pem2.h -ecparam.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h -ecparam.o: ../include/openssl/sha.h ../include/openssl/stack.h -ecparam.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h -ecparam.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -ecparam.o: ../include/openssl/x509v3.h apps.h ecparam.c -enc.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -enc.o: ../include/openssl/buffer.h ../include/openssl/comp.h -enc.o: ../include/openssl/conf.h ../include/openssl/crypto.h -enc.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -enc.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -enc.o: ../include/openssl/engine.h ../include/openssl/err.h -enc.o: ../include/openssl/evp.h ../include/openssl/lhash.h -enc.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -enc.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h -enc.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -enc.o: ../include/openssl/pem.h ../include/openssl/pem2.h -enc.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h -enc.o: ../include/openssl/safestack.h ../include/openssl/sha.h -enc.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -enc.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -enc.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h enc.c -engine.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -engine.o: ../include/openssl/buffer.h ../include/openssl/comp.h -engine.o: ../include/openssl/conf.h ../include/openssl/crypto.h -engine.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -engine.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -engine.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -engine.o: ../include/openssl/err.h ../include/openssl/evp.h -engine.o: ../include/openssl/hmac.h ../include/openssl/kssl.h -engine.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -engine.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -engine.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -engine.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -engine.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -engine.o: ../include/openssl/pqueue.h ../include/openssl/safestack.h -engine.o: ../include/openssl/sha.h ../include/openssl/srtp.h -engine.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h -engine.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h -engine.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -engine.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h -engine.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -engine.o: ../include/openssl/x509v3.h apps.h engine.c -errstr.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -errstr.o: ../include/openssl/buffer.h ../include/openssl/comp.h -errstr.o: ../include/openssl/conf.h ../include/openssl/crypto.h -errstr.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -errstr.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -errstr.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -errstr.o: ../include/openssl/err.h ../include/openssl/evp.h -errstr.o: ../include/openssl/hmac.h ../include/openssl/kssl.h -errstr.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -errstr.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -errstr.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -errstr.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -errstr.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -errstr.o: ../include/openssl/pqueue.h ../include/openssl/safestack.h -errstr.o: ../include/openssl/sha.h ../include/openssl/srtp.h -errstr.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h -errstr.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h -errstr.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -errstr.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h -errstr.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -errstr.o: ../include/openssl/x509v3.h apps.h errstr.c -gendh.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -gendh.o: ../include/openssl/bn.h ../include/openssl/buffer.h -gendh.o: ../include/openssl/conf.h ../include/openssl/crypto.h -gendh.o: ../include/openssl/dh.h ../include/openssl/dsa.h -gendh.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -gendh.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -gendh.o: ../include/openssl/engine.h ../include/openssl/err.h -gendh.o: ../include/openssl/evp.h ../include/openssl/lhash.h -gendh.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -gendh.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h -gendh.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -gendh.o: ../include/openssl/pem.h ../include/openssl/pem2.h -gendh.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h -gendh.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -gendh.o: ../include/openssl/sha.h ../include/openssl/stack.h -gendh.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h -gendh.o: ../include/openssl/ui.h ../include/openssl/x509.h -gendh.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h -gendh.o: gendh.c -gendsa.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -gendsa.o: ../include/openssl/bn.h ../include/openssl/buffer.h -gendsa.o: ../include/openssl/conf.h ../include/openssl/crypto.h -gendsa.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h -gendsa.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -gendsa.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -gendsa.o: ../include/openssl/err.h ../include/openssl/evp.h -gendsa.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -gendsa.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -gendsa.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -gendsa.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -gendsa.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -gendsa.o: ../include/openssl/safestack.h ../include/openssl/sha.h -gendsa.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -gendsa.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -gendsa.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h -gendsa.o: gendsa.c -genpkey.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -genpkey.o: ../include/openssl/buffer.h ../include/openssl/conf.h -genpkey.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -genpkey.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -genpkey.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -genpkey.o: ../include/openssl/err.h ../include/openssl/evp.h -genpkey.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -genpkey.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -genpkey.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -genpkey.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -genpkey.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -genpkey.o: ../include/openssl/safestack.h ../include/openssl/sha.h -genpkey.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -genpkey.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -genpkey.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h -genpkey.o: genpkey.c -genrsa.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -genrsa.o: ../include/openssl/bn.h ../include/openssl/buffer.h -genrsa.o: ../include/openssl/conf.h ../include/openssl/crypto.h -genrsa.o: ../include/openssl/dh.h ../include/openssl/dsa.h -genrsa.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -genrsa.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -genrsa.o: ../include/openssl/engine.h ../include/openssl/err.h -genrsa.o: ../include/openssl/evp.h ../include/openssl/lhash.h -genrsa.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -genrsa.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h -genrsa.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -genrsa.o: ../include/openssl/pem.h ../include/openssl/pem2.h -genrsa.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h -genrsa.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -genrsa.o: ../include/openssl/sha.h ../include/openssl/stack.h -genrsa.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h -genrsa.o: ../include/openssl/ui.h ../include/openssl/x509.h -genrsa.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h -genrsa.o: genrsa.c -nseq.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -nseq.o: ../include/openssl/buffer.h ../include/openssl/conf.h -nseq.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -nseq.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -nseq.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -nseq.o: ../include/openssl/err.h ../include/openssl/evp.h -nseq.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -nseq.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -nseq.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -nseq.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -nseq.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -nseq.o: ../include/openssl/safestack.h ../include/openssl/sha.h -nseq.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -nseq.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -nseq.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h nseq.c -ocsp.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -ocsp.o: ../include/openssl/bn.h ../include/openssl/buffer.h -ocsp.o: ../include/openssl/comp.h ../include/openssl/conf.h -ocsp.o: ../include/openssl/crypto.h ../include/openssl/dtls1.h -ocsp.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -ocsp.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -ocsp.o: ../include/openssl/engine.h ../include/openssl/err.h -ocsp.o: ../include/openssl/evp.h ../include/openssl/hmac.h -ocsp.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -ocsp.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -ocsp.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h -ocsp.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -ocsp.o: ../include/openssl/pem.h ../include/openssl/pem2.h -ocsp.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h -ocsp.o: ../include/openssl/safestack.h ../include/openssl/sha.h -ocsp.o: ../include/openssl/srtp.h ../include/openssl/ssl.h -ocsp.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h -ocsp.o: ../include/openssl/ssl3.h ../include/openssl/stack.h -ocsp.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -ocsp.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -ocsp.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h ocsp.c -openssl.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -openssl.o: ../include/openssl/buffer.h ../include/openssl/comp.h -openssl.o: ../include/openssl/conf.h ../include/openssl/crypto.h -openssl.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -openssl.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -openssl.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -openssl.o: ../include/openssl/err.h ../include/openssl/evp.h -openssl.o: ../include/openssl/hmac.h ../include/openssl/kssl.h -openssl.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -openssl.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -openssl.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -openssl.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -openssl.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -openssl.o: ../include/openssl/pqueue.h ../include/openssl/rand.h -openssl.o: ../include/openssl/safestack.h ../include/openssl/sha.h -openssl.o: ../include/openssl/srtp.h ../include/openssl/ssl.h -openssl.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h -openssl.o: ../include/openssl/ssl3.h ../include/openssl/stack.h -openssl.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -openssl.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -openssl.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h -openssl.o: openssl.c progs.h s_apps.h -passwd.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -passwd.o: ../include/openssl/buffer.h ../include/openssl/conf.h -passwd.o: ../include/openssl/crypto.h ../include/openssl/des.h -passwd.o: ../include/openssl/des_old.h ../include/openssl/e_os2.h -passwd.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -passwd.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -passwd.o: ../include/openssl/err.h ../include/openssl/evp.h -passwd.o: ../include/openssl/lhash.h ../include/openssl/md5.h -passwd.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -passwd.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h -passwd.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -passwd.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h -passwd.o: ../include/openssl/safestack.h ../include/openssl/sha.h -passwd.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -passwd.o: ../include/openssl/txt_db.h ../include/openssl/ui.h -passwd.o: ../include/openssl/ui_compat.h ../include/openssl/x509.h -passwd.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h -passwd.o: passwd.c -pkcs12.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -pkcs12.o: ../include/openssl/buffer.h ../include/openssl/conf.h -pkcs12.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -pkcs12.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -pkcs12.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -pkcs12.o: ../include/openssl/err.h ../include/openssl/evp.h -pkcs12.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -pkcs12.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -pkcs12.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -pkcs12.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -pkcs12.o: ../include/openssl/pem2.h ../include/openssl/pkcs12.h -pkcs12.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h -pkcs12.o: ../include/openssl/sha.h ../include/openssl/stack.h -pkcs12.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h -pkcs12.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -pkcs12.o: ../include/openssl/x509v3.h apps.h pkcs12.c -pkcs7.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -pkcs7.o: ../include/openssl/buffer.h ../include/openssl/conf.h -pkcs7.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -pkcs7.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -pkcs7.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -pkcs7.o: ../include/openssl/err.h ../include/openssl/evp.h -pkcs7.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -pkcs7.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -pkcs7.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -pkcs7.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -pkcs7.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -pkcs7.o: ../include/openssl/safestack.h ../include/openssl/sha.h -pkcs7.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -pkcs7.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -pkcs7.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h -pkcs7.o: pkcs7.c -pkcs8.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -pkcs8.o: ../include/openssl/buffer.h ../include/openssl/conf.h -pkcs8.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -pkcs8.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -pkcs8.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -pkcs8.o: ../include/openssl/err.h ../include/openssl/evp.h -pkcs8.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -pkcs8.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -pkcs8.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -pkcs8.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -pkcs8.o: ../include/openssl/pem2.h ../include/openssl/pkcs12.h -pkcs8.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h -pkcs8.o: ../include/openssl/sha.h ../include/openssl/stack.h -pkcs8.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h -pkcs8.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -pkcs8.o: ../include/openssl/x509v3.h apps.h pkcs8.c -pkey.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -pkey.o: ../include/openssl/buffer.h ../include/openssl/conf.h -pkey.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -pkey.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -pkey.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -pkey.o: ../include/openssl/err.h ../include/openssl/evp.h -pkey.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -pkey.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -pkey.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -pkey.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -pkey.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -pkey.o: ../include/openssl/safestack.h ../include/openssl/sha.h -pkey.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -pkey.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -pkey.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h pkey.c -pkeyparam.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -pkeyparam.o: ../include/openssl/buffer.h ../include/openssl/conf.h -pkeyparam.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -pkeyparam.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -pkeyparam.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -pkeyparam.o: ../include/openssl/err.h ../include/openssl/evp.h -pkeyparam.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -pkeyparam.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -pkeyparam.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -pkeyparam.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -pkeyparam.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -pkeyparam.o: ../include/openssl/safestack.h ../include/openssl/sha.h -pkeyparam.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -pkeyparam.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -pkeyparam.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h -pkeyparam.o: pkeyparam.c -pkeyutl.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -pkeyutl.o: ../include/openssl/buffer.h ../include/openssl/conf.h -pkeyutl.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -pkeyutl.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -pkeyutl.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -pkeyutl.o: ../include/openssl/err.h ../include/openssl/evp.h -pkeyutl.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -pkeyutl.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -pkeyutl.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -pkeyutl.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -pkeyutl.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -pkeyutl.o: ../include/openssl/safestack.h ../include/openssl/sha.h -pkeyutl.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -pkeyutl.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -pkeyutl.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h -pkeyutl.o: pkeyutl.c -prime.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -prime.o: ../include/openssl/bn.h ../include/openssl/buffer.h -prime.o: ../include/openssl/conf.h ../include/openssl/crypto.h -prime.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -prime.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -prime.o: ../include/openssl/engine.h ../include/openssl/evp.h -prime.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -prime.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -prime.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -prime.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h -prime.o: ../include/openssl/safestack.h ../include/openssl/sha.h -prime.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -prime.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -prime.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h -prime.o: prime.c -rand.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -rand.o: ../include/openssl/buffer.h ../include/openssl/conf.h -rand.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -rand.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -rand.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -rand.o: ../include/openssl/err.h ../include/openssl/evp.h -rand.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -rand.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -rand.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -rand.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h -rand.o: ../include/openssl/rand.h ../include/openssl/safestack.h -rand.o: ../include/openssl/sha.h ../include/openssl/stack.h -rand.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h -rand.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -rand.o: ../include/openssl/x509v3.h apps.h rand.c -req.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -req.o: ../include/openssl/bn.h ../include/openssl/buffer.h -req.o: ../include/openssl/conf.h ../include/openssl/crypto.h -req.o: ../include/openssl/dh.h ../include/openssl/dsa.h -req.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -req.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -req.o: ../include/openssl/engine.h ../include/openssl/err.h -req.o: ../include/openssl/evp.h ../include/openssl/lhash.h -req.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -req.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h -req.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -req.o: ../include/openssl/pem.h ../include/openssl/pem2.h -req.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h -req.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -req.o: ../include/openssl/sha.h ../include/openssl/stack.h -req.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h -req.o: ../include/openssl/ui.h ../include/openssl/x509.h -req.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h req.c -rsa.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -rsa.o: ../include/openssl/bn.h ../include/openssl/buffer.h -rsa.o: ../include/openssl/conf.h ../include/openssl/crypto.h -rsa.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -rsa.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -rsa.o: ../include/openssl/engine.h ../include/openssl/err.h -rsa.o: ../include/openssl/evp.h ../include/openssl/lhash.h -rsa.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -rsa.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h -rsa.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -rsa.o: ../include/openssl/pem.h ../include/openssl/pem2.h -rsa.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h -rsa.o: ../include/openssl/safestack.h ../include/openssl/sha.h -rsa.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -rsa.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -rsa.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h rsa.c -rsautl.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -rsautl.o: ../include/openssl/buffer.h ../include/openssl/conf.h -rsautl.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -rsautl.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -rsautl.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -rsautl.o: ../include/openssl/err.h ../include/openssl/evp.h -rsautl.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -rsautl.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -rsautl.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -rsautl.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -rsautl.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -rsautl.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -rsautl.o: ../include/openssl/sha.h ../include/openssl/stack.h -rsautl.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h -rsautl.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -rsautl.o: ../include/openssl/x509v3.h apps.h rsautl.c -s_cb.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -s_cb.o: ../include/openssl/buffer.h ../include/openssl/comp.h -s_cb.o: ../include/openssl/conf.h ../include/openssl/crypto.h -s_cb.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -s_cb.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -s_cb.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -s_cb.o: ../include/openssl/err.h ../include/openssl/evp.h -s_cb.o: ../include/openssl/hmac.h ../include/openssl/kssl.h -s_cb.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -s_cb.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -s_cb.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -s_cb.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -s_cb.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -s_cb.o: ../include/openssl/pqueue.h ../include/openssl/rand.h -s_cb.o: ../include/openssl/safestack.h ../include/openssl/sha.h -s_cb.o: ../include/openssl/srtp.h ../include/openssl/ssl.h -s_cb.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h -s_cb.o: ../include/openssl/ssl3.h ../include/openssl/stack.h -s_cb.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -s_cb.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -s_cb.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h -s_cb.o: s_apps.h s_cb.c -s_client.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -s_client.o: ../include/openssl/bn.h ../include/openssl/buffer.h -s_client.o: ../include/openssl/comp.h ../include/openssl/conf.h -s_client.o: ../include/openssl/crypto.h ../include/openssl/dtls1.h -s_client.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -s_client.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -s_client.o: ../include/openssl/engine.h ../include/openssl/err.h -s_client.o: ../include/openssl/evp.h ../include/openssl/hmac.h -s_client.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -s_client.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -s_client.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h -s_client.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -s_client.o: ../include/openssl/pem.h ../include/openssl/pem2.h -s_client.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h -s_client.o: ../include/openssl/rand.h ../include/openssl/safestack.h -s_client.o: ../include/openssl/sha.h ../include/openssl/srp.h -s_client.o: ../include/openssl/srtp.h ../include/openssl/ssl.h -s_client.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h -s_client.o: ../include/openssl/ssl3.h ../include/openssl/stack.h -s_client.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -s_client.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -s_client.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h -s_client.o: s_apps.h s_client.c timeouts.h -s_server.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -s_server.o: ../include/openssl/bn.h ../include/openssl/buffer.h -s_server.o: ../include/openssl/comp.h ../include/openssl/conf.h -s_server.o: ../include/openssl/crypto.h ../include/openssl/dh.h -s_server.o: ../include/openssl/dsa.h ../include/openssl/dtls1.h -s_server.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -s_server.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -s_server.o: ../include/openssl/engine.h ../include/openssl/err.h -s_server.o: ../include/openssl/evp.h ../include/openssl/hmac.h -s_server.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -s_server.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -s_server.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h -s_server.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -s_server.o: ../include/openssl/pem.h ../include/openssl/pem2.h -s_server.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h -s_server.o: ../include/openssl/rand.h ../include/openssl/rsa.h -s_server.o: ../include/openssl/safestack.h ../include/openssl/sha.h -s_server.o: ../include/openssl/srp.h ../include/openssl/srtp.h -s_server.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h -s_server.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h -s_server.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -s_server.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h -s_server.o: ../include/openssl/ui.h ../include/openssl/x509.h -s_server.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h -s_server.o: s_apps.h s_server.c timeouts.h -s_socket.o: ../e_os.h ../e_os2.h ../include/openssl/asn1.h -s_socket.o: ../include/openssl/bio.h ../include/openssl/buffer.h -s_socket.o: ../include/openssl/comp.h ../include/openssl/conf.h -s_socket.o: ../include/openssl/crypto.h ../include/openssl/dtls1.h -s_socket.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -s_socket.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -s_socket.o: ../include/openssl/engine.h ../include/openssl/evp.h -s_socket.o: ../include/openssl/hmac.h ../include/openssl/kssl.h -s_socket.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -s_socket.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -s_socket.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -s_socket.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -s_socket.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -s_socket.o: ../include/openssl/pqueue.h ../include/openssl/safestack.h -s_socket.o: ../include/openssl/sha.h ../include/openssl/srtp.h -s_socket.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h -s_socket.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h -s_socket.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -s_socket.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h -s_socket.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -s_socket.o: ../include/openssl/x509v3.h apps.h s_apps.h s_socket.c -s_time.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -s_time.o: ../include/openssl/buffer.h ../include/openssl/comp.h -s_time.o: ../include/openssl/conf.h ../include/openssl/crypto.h -s_time.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -s_time.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -s_time.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -s_time.o: ../include/openssl/err.h ../include/openssl/evp.h -s_time.o: ../include/openssl/hmac.h ../include/openssl/kssl.h -s_time.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -s_time.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -s_time.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -s_time.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -s_time.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -s_time.o: ../include/openssl/pqueue.h ../include/openssl/safestack.h -s_time.o: ../include/openssl/sha.h ../include/openssl/srtp.h -s_time.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h -s_time.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h -s_time.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -s_time.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h -s_time.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -s_time.o: ../include/openssl/x509v3.h apps.h s_apps.h s_time.c -sess_id.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -sess_id.o: ../include/openssl/buffer.h ../include/openssl/comp.h -sess_id.o: ../include/openssl/conf.h ../include/openssl/crypto.h -sess_id.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -sess_id.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -sess_id.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -sess_id.o: ../include/openssl/err.h ../include/openssl/evp.h -sess_id.o: ../include/openssl/hmac.h ../include/openssl/kssl.h -sess_id.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -sess_id.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -sess_id.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -sess_id.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -sess_id.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -sess_id.o: ../include/openssl/pqueue.h ../include/openssl/safestack.h -sess_id.o: ../include/openssl/sha.h ../include/openssl/srtp.h -sess_id.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h -sess_id.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h -sess_id.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -sess_id.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h -sess_id.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -sess_id.o: ../include/openssl/x509v3.h apps.h sess_id.c -smime.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -smime.o: ../include/openssl/buffer.h ../include/openssl/conf.h -smime.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -smime.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -smime.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -smime.o: ../include/openssl/err.h ../include/openssl/evp.h -smime.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -smime.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -smime.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -smime.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -smime.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -smime.o: ../include/openssl/safestack.h ../include/openssl/sha.h -smime.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -smime.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -smime.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h -smime.o: smime.c -speed.o: ../e_os.h ../include/openssl/aes.h ../include/openssl/asn1.h -speed.o: ../include/openssl/bio.h ../include/openssl/blowfish.h -speed.o: ../include/openssl/bn.h ../include/openssl/buffer.h -speed.o: ../include/openssl/camellia.h ../include/openssl/cast.h -speed.o: ../include/openssl/conf.h ../include/openssl/crypto.h -speed.o: ../include/openssl/des.h ../include/openssl/des_old.h -speed.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h -speed.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -speed.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -speed.o: ../include/openssl/err.h ../include/openssl/evp.h -speed.o: ../include/openssl/hmac.h ../include/openssl/idea.h -speed.o: ../include/openssl/lhash.h ../include/openssl/md4.h -speed.o: ../include/openssl/md5.h ../include/openssl/mdc2.h -speed.o: ../include/openssl/modes.h ../include/openssl/obj_mac.h -speed.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -speed.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -speed.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h -speed.o: ../include/openssl/rand.h ../include/openssl/rc2.h -speed.o: ../include/openssl/rc4.h ../include/openssl/ripemd.h -speed.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -speed.o: ../include/openssl/seed.h ../include/openssl/sha.h -speed.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -speed.o: ../include/openssl/txt_db.h ../include/openssl/ui.h -speed.o: ../include/openssl/ui_compat.h ../include/openssl/whrlpool.h -speed.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -speed.o: ../include/openssl/x509v3.h apps.h speed.c testdsa.h testrsa.h -spkac.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -spkac.o: ../include/openssl/buffer.h ../include/openssl/conf.h -spkac.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -spkac.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -spkac.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -spkac.o: ../include/openssl/err.h ../include/openssl/evp.h -spkac.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -spkac.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -spkac.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -spkac.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -spkac.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -spkac.o: ../include/openssl/safestack.h ../include/openssl/sha.h -spkac.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -spkac.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -spkac.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h -spkac.o: spkac.c -srp.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -srp.o: ../include/openssl/bn.h ../include/openssl/buffer.h -srp.o: ../include/openssl/conf.h ../include/openssl/crypto.h -srp.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -srp.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -srp.o: ../include/openssl/engine.h ../include/openssl/err.h -srp.o: ../include/openssl/evp.h ../include/openssl/lhash.h -srp.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -srp.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h -srp.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -srp.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h -srp.o: ../include/openssl/sha.h ../include/openssl/srp.h -srp.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -srp.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -srp.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h srp.c -ts.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -ts.o: ../include/openssl/bn.h ../include/openssl/buffer.h -ts.o: ../include/openssl/conf.h ../include/openssl/crypto.h -ts.o: ../include/openssl/dh.h ../include/openssl/dsa.h -ts.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -ts.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -ts.o: ../include/openssl/engine.h ../include/openssl/err.h -ts.o: ../include/openssl/evp.h ../include/openssl/lhash.h -ts.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -ts.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h -ts.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -ts.o: ../include/openssl/pem.h ../include/openssl/pem2.h -ts.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h -ts.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -ts.o: ../include/openssl/sha.h ../include/openssl/stack.h -ts.o: ../include/openssl/symhacks.h ../include/openssl/ts.h -ts.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -ts.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h ts.c -verify.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -verify.o: ../include/openssl/buffer.h ../include/openssl/conf.h -verify.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -verify.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -verify.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -verify.o: ../include/openssl/err.h ../include/openssl/evp.h -verify.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -verify.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -verify.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -verify.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -verify.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -verify.o: ../include/openssl/safestack.h ../include/openssl/sha.h -verify.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -verify.o: ../include/openssl/txt_db.h ../include/openssl/x509.h -verify.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h -verify.o: verify.c -version.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -version.o: ../include/openssl/blowfish.h ../include/openssl/bn.h -version.o: ../include/openssl/buffer.h ../include/openssl/conf.h -version.o: ../include/openssl/crypto.h ../include/openssl/des.h -version.o: ../include/openssl/des_old.h ../include/openssl/e_os2.h -version.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -version.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -version.o: ../include/openssl/evp.h ../include/openssl/idea.h -version.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -version.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -version.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -version.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h -version.o: ../include/openssl/rc4.h ../include/openssl/safestack.h -version.o: ../include/openssl/sha.h ../include/openssl/stack.h -version.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h -version.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h -version.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -version.o: ../include/openssl/x509v3.h apps.h version.c -x509.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -x509.o: ../include/openssl/bn.h ../include/openssl/buffer.h -x509.o: ../include/openssl/conf.h ../include/openssl/crypto.h -x509.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h -x509.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -x509.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -x509.o: ../include/openssl/err.h ../include/openssl/evp.h -x509.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -x509.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -x509.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -x509.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -x509.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -x509.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -x509.o: ../include/openssl/sha.h ../include/openssl/stack.h -x509.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h -x509.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -x509.o: ../include/openssl/x509v3.h apps.h x509.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/apps/ocsp.c nodejs-0.10.29/deps/openssl/openssl/apps/ocsp.c --- nodejs-0.10.28/deps/openssl/openssl/apps/ocsp.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/apps/ocsp.c 2014-06-09 17:04:36.000000000 +0000 @@ -127,6 +127,7 @@ ENGINE *e = NULL; char **args; char *host = NULL, *port = NULL, *path = "/"; + char *thost = NULL, *tport = NULL, *tpath = NULL; char *reqin = NULL, *respin = NULL; char *reqout = NULL, *respout = NULL; char *signfile = NULL, *keyfile = NULL; @@ -204,6 +205,12 @@ } else if (!strcmp(*args, "-url")) { + if (thost) + OPENSSL_free(thost); + if (tport) + OPENSSL_free(tport); + if (tpath) + OPENSSL_free(tpath); if (args[1]) { args++; @@ -212,6 +219,9 @@ BIO_printf(bio_err, "Error parsing URL\n"); badarg = 1; } + thost = host; + tport = port; + tpath = path; } else badarg = 1; } @@ -920,12 +930,12 @@ sk_X509_pop_free(verify_other, X509_free); sk_CONF_VALUE_pop_free(headers, X509V3_conf_free); - if (use_ssl != -1) - { - OPENSSL_free(host); - OPENSSL_free(port); - OPENSSL_free(path); - } + if (thost) + OPENSSL_free(thost); + if (tport) + OPENSSL_free(tport); + if (tpath) + OPENSSL_free(tpath); OPENSSL_EXIT(ret); } diff -Nru nodejs-0.10.28/deps/openssl/openssl/apps/req.c nodejs-0.10.29/deps/openssl/openssl/apps/req.c --- nodejs-0.10.28/deps/openssl/openssl/apps/req.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/apps/req.c 2014-06-09 17:04:36.000000000 +0000 @@ -1489,7 +1489,13 @@ #ifdef CHARSET_EBCDIC ebcdic2ascii(buf, buf, i); #endif - if(!req_check_len(i, n_min, n_max)) goto start; + if(!req_check_len(i, n_min, n_max)) + { + if (batch || value) + return 0; + goto start; + } + if (!X509_NAME_add_entry_by_NID(n,nid, chtype, (unsigned char *) buf, -1,-1,mval)) goto err; ret=1; @@ -1548,7 +1554,12 @@ #ifdef CHARSET_EBCDIC ebcdic2ascii(buf, buf, i); #endif - if(!req_check_len(i, n_min, n_max)) goto start; + if(!req_check_len(i, n_min, n_max)) + { + if (batch || value) + return 0; + goto start; + } if(!X509_REQ_add1_attr_by_NID(req, nid, chtype, (unsigned char *)buf, -1)) { diff -Nru nodejs-0.10.28/deps/openssl/openssl/apps/s_cb.c nodejs-0.10.29/deps/openssl/openssl/apps/s_cb.c --- nodejs-0.10.28/deps/openssl/openssl/apps/s_cb.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/apps/s_cb.c 2014-06-09 17:04:36.000000000 +0000 @@ -747,6 +747,10 @@ break; #endif + case TLSEXT_TYPE_padding: + extname = "TLS padding"; + break; + default: extname = "unknown"; break; diff -Nru nodejs-0.10.28/deps/openssl/openssl/apps/smime.c nodejs-0.10.29/deps/openssl/openssl/apps/smime.c --- nodejs-0.10.28/deps/openssl/openssl/apps/smime.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/apps/smime.c 2014-06-09 17:04:36.000000000 +0000 @@ -541,8 +541,8 @@ { if (!cipher) { -#ifndef OPENSSL_NO_RC2 - cipher = EVP_rc2_40_cbc(); +#ifndef OPENSSL_NO_DES + cipher = EVP_des_ede3_cbc(); #else BIO_printf(bio_err, "No cipher selected\n"); goto end; diff -Nru nodejs-0.10.28/deps/openssl/openssl/apps/s_socket.c nodejs-0.10.29/deps/openssl/openssl/apps/s_socket.c --- nodejs-0.10.28/deps/openssl/openssl/apps/s_socket.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/apps/s_socket.c 2014-06-09 17:04:36.000000000 +0000 @@ -274,7 +274,7 @@ { i=0; i=setsockopt(s,SOL_SOCKET,SO_KEEPALIVE,(char *)&i,sizeof(i)); - if (i < 0) { perror("keepalive"); return(0); } + if (i < 0) { closesocket(s); perror("keepalive"); return(0); } } #endif @@ -450,6 +450,7 @@ if ((*host=(char *)OPENSSL_malloc(strlen(h1->h_name)+1)) == NULL) { perror("OPENSSL_malloc"); + closesocket(ret); return(0); } BUF_strlcpy(*host,h1->h_name,strlen(h1->h_name)+1); @@ -458,11 +459,13 @@ if (h2 == NULL) { BIO_printf(bio_err,"gethostbyname failure\n"); + closesocket(ret); return(0); } if (h2->h_addrtype != AF_INET) { BIO_printf(bio_err,"gethostbyname addr is not AF_INET\n"); + closesocket(ret); return(0); } } diff -Nru nodejs-0.10.28/deps/openssl/openssl/CHANGES nodejs-0.10.29/deps/openssl/openssl/CHANGES --- nodejs-0.10.28/deps/openssl/openssl/CHANGES 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/CHANGES 2014-06-09 17:04:36.000000000 +0000 @@ -2,6 +2,50 @@ OpenSSL CHANGES _______________ + Changes between 1.0.1g and 1.0.1h [5 Jun 2014] + + *) Fix for SSL/TLS MITM flaw. An attacker using a carefully crafted + handshake can force the use of weak keying material in OpenSSL + SSL/TLS clients and servers. + + Thanks to KIKUCHI Masashi (Lepidum Co. Ltd.) for discovering and + researching this issue. (CVE-2014-0224) + [KIKUCHI Masashi, Steve Henson] + + *) Fix DTLS recursion flaw. By sending an invalid DTLS handshake to an + OpenSSL DTLS client the code can be made to recurse eventually crashing + in a DoS attack. + + Thanks to Imre Rad (Search-Lab Ltd.) for discovering this issue. + (CVE-2014-0221) + [Imre Rad, Steve Henson] + + *) Fix DTLS invalid fragment vulnerability. A buffer overrun attack can + be triggered by sending invalid DTLS fragments to an OpenSSL DTLS + client or server. This is potentially exploitable to run arbitrary + code on a vulnerable client or server. + + Thanks to Jüri Aedla for reporting this issue. (CVE-2014-0195) + [Jüri Aedla, Steve Henson] + + *) Fix bug in TLS code where clients enable anonymous ECDH ciphersuites + are subject to a denial of service attack. + + Thanks to Felix Gröbert and Ivan Fratric at Google for discovering + this issue. (CVE-2014-3470) + [Felix Gröbert, Ivan Fratric, Steve Henson] + + *) Harmonize version and its documentation. -f flag is used to display + compilation flags. + [mancha <mancha1@zoho.com>] + + *) Fix eckey_priv_encode so it immediately returns an error upon a failure + in i2d_ECPrivateKey. + [mancha <mancha1@zoho.com>] + + *) Fix some double frees. These are not thought to be exploitable. + [mancha <mancha1@zoho.com>] + Changes between 1.0.1f and 1.0.1g [7 Apr 2014] *) A missing bounds check in the handling of the TLS heartbeat extension diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/aes/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/aes/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/aes/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/aes/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,153 +0,0 @@ -# -# crypto/aes/Makefile -# - -DIR= aes -TOP= ../.. -CC= cc -CPP= $(CC) -E -INCLUDES= -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -AES_ENC=aes_core.o aes_cbc.o - -CFLAGS= $(INCLUDES) $(CFLAG) -ASFLAGS= $(INCLUDES) $(ASFLAG) -AFLAGS= $(ASFLAGS) - -GENERAL=Makefile -#TEST=aestest.c -TEST= -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC=aes_core.c aes_misc.c aes_ecb.c aes_cbc.c aes_cfb.c aes_ofb.c \ - aes_ctr.c aes_ige.c aes_wrap.c -LIBOBJ=aes_misc.o aes_ecb.o aes_cfb.o aes_ofb.o aes_ctr.o aes_ige.o aes_wrap.o \ - $(AES_ENC) - -SRC= $(LIBSRC) - -EXHEADER= aes.h -HEADER= aes_locl.h $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -aes-ia64.s: asm/aes-ia64.S - $(CC) $(CFLAGS) -E asm/aes-ia64.S > $@ - -aes-586.s: asm/aes-586.pl ../perlasm/x86asm.pl - $(PERL) asm/aes-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@ -vpaes-x86.s: asm/vpaes-x86.pl ../perlasm/x86asm.pl - $(PERL) asm/vpaes-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@ -aesni-x86.s: asm/aesni-x86.pl ../perlasm/x86asm.pl - $(PERL) asm/aesni-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@ - -aes-x86_64.s: asm/aes-x86_64.pl - $(PERL) asm/aes-x86_64.pl $(PERLASM_SCHEME) > $@ -vpaes-x86_64.s: asm/vpaes-x86_64.pl - $(PERL) asm/vpaes-x86_64.pl $(PERLASM_SCHEME) > $@ -bsaes-x86_64.s: asm/bsaes-x86_64.pl - $(PERL) asm/bsaes-x86_64.pl $(PERLASM_SCHEME) > $@ -aesni-x86_64.s: asm/aesni-x86_64.pl - $(PERL) asm/aesni-x86_64.pl $(PERLASM_SCHEME) > $@ -aesni-sha1-x86_64.s: asm/aesni-sha1-x86_64.pl - $(PERL) asm/aesni-sha1-x86_64.pl $(PERLASM_SCHEME) > $@ - -aes-sparcv9.s: asm/aes-sparcv9.pl - $(PERL) asm/aes-sparcv9.pl $(CFLAGS) > $@ - -aes-ppc.s: asm/aes-ppc.pl - $(PERL) asm/aes-ppc.pl $(PERLASM_SCHEME) $@ - -aes-parisc.s: asm/aes-parisc.pl - $(PERL) asm/aes-parisc.pl $(PERLASM_SCHEME) $@ - -aes-mips.S: asm/aes-mips.pl - $(PERL) asm/aes-mips.pl $(PERLASM_SCHEME) $@ - -# GNU make "catch all" -aes-%.S: asm/aes-%.pl; $(PERL) $< $(PERLASM_SCHEME) > $@ -aes-armv4.o: aes-armv4.S - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -aes_cbc.o: ../../include/openssl/aes.h ../../include/openssl/modes.h -aes_cbc.o: ../../include/openssl/opensslconf.h aes_cbc.c -aes_cfb.o: ../../include/openssl/aes.h ../../include/openssl/modes.h -aes_cfb.o: ../../include/openssl/opensslconf.h aes_cfb.c -aes_core.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h -aes_core.o: ../../include/openssl/opensslconf.h aes_core.c aes_locl.h -aes_ctr.o: ../../include/openssl/aes.h ../../include/openssl/modes.h -aes_ctr.o: ../../include/openssl/opensslconf.h aes_ctr.c -aes_ecb.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h -aes_ecb.o: ../../include/openssl/opensslconf.h aes_ecb.c aes_locl.h -aes_ige.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/bio.h -aes_ige.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -aes_ige.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -aes_ige.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -aes_ige.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -aes_ige.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -aes_ige.o: ../../include/openssl/symhacks.h ../cryptlib.h aes_ige.c aes_locl.h -aes_misc.o: ../../include/openssl/aes.h ../../include/openssl/crypto.h -aes_misc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -aes_misc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -aes_misc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -aes_misc.o: ../../include/openssl/symhacks.h aes_locl.h aes_misc.c -aes_ofb.o: ../../include/openssl/aes.h ../../include/openssl/modes.h -aes_ofb.o: ../../include/openssl/opensslconf.h aes_ofb.c -aes_wrap.o: ../../e_os.h ../../include/openssl/aes.h -aes_wrap.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -aes_wrap.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -aes_wrap.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -aes_wrap.o: ../../include/openssl/opensslconf.h -aes_wrap.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -aes_wrap.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -aes_wrap.o: ../../include/openssl/symhacks.h ../cryptlib.h aes_wrap.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/asn1/a_strnid.c nodejs-0.10.29/deps/openssl/openssl/crypto/asn1/a_strnid.c --- nodejs-0.10.28/deps/openssl/openssl/crypto/asn1/a_strnid.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/asn1/a_strnid.c 2014-06-09 17:04:36.000000000 +0000 @@ -74,7 +74,7 @@ * certain software (e.g. Netscape) has problems with them. */ -static unsigned long global_mask = 0xFFFFFFFFL; +static unsigned long global_mask = B_ASN1_UTF8STRING; void ASN1_STRING_set_default_mask(unsigned long mask) { diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/asn1/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/asn1/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/asn1/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/asn1/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,930 +0,0 @@ -# -# OpenSSL/crypto/asn1/Makefile -# - -DIR= asn1 -TOP= ../.. -CC= cc -INCLUDES= -I.. -I$(TOP) -I../../include -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile README -TEST= -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC= a_object.c a_bitstr.c a_utctm.c a_gentm.c a_time.c a_int.c a_octet.c \ - a_print.c a_type.c a_set.c a_dup.c a_d2i_fp.c a_i2d_fp.c \ - a_enum.c a_utf8.c a_sign.c a_digest.c a_verify.c a_mbstr.c a_strex.c \ - x_algor.c x_val.c x_pubkey.c x_sig.c x_req.c x_attrib.c x_bignum.c \ - x_long.c x_name.c x_x509.c x_x509a.c x_crl.c x_info.c x_spki.c nsseq.c \ - x_nx509.c d2i_pu.c d2i_pr.c i2d_pu.c i2d_pr.c\ - t_req.c t_x509.c t_x509a.c t_crl.c t_pkey.c t_spki.c t_bitst.c \ - tasn_new.c tasn_fre.c tasn_enc.c tasn_dec.c tasn_utl.c tasn_typ.c \ - tasn_prn.c ameth_lib.c \ - f_int.c f_string.c n_pkey.c \ - f_enum.c x_pkey.c a_bool.c x_exten.c bio_asn1.c bio_ndef.c asn_mime.c \ - asn1_gen.c asn1_par.c asn1_lib.c asn1_err.c a_bytes.c a_strnid.c \ - evp_asn1.c asn_pack.c p5_pbe.c p5_pbev2.c p8_pkey.c asn_moid.c -LIBOBJ= a_object.o a_bitstr.o a_utctm.o a_gentm.o a_time.o a_int.o a_octet.o \ - a_print.o a_type.o a_set.o a_dup.o a_d2i_fp.o a_i2d_fp.o \ - a_enum.o a_utf8.o a_sign.o a_digest.o a_verify.o a_mbstr.o a_strex.o \ - x_algor.o x_val.o x_pubkey.o x_sig.o x_req.o x_attrib.o x_bignum.o \ - x_long.o x_name.o x_x509.o x_x509a.o x_crl.o x_info.o x_spki.o nsseq.o \ - x_nx509.o d2i_pu.o d2i_pr.o i2d_pu.o i2d_pr.o \ - t_req.o t_x509.o t_x509a.o t_crl.o t_pkey.o t_spki.o t_bitst.o \ - tasn_new.o tasn_fre.o tasn_enc.o tasn_dec.o tasn_utl.o tasn_typ.o \ - tasn_prn.o ameth_lib.o \ - f_int.o f_string.o n_pkey.o \ - f_enum.o x_pkey.o a_bool.o x_exten.o bio_asn1.o bio_ndef.o asn_mime.o \ - asn1_gen.o asn1_par.o asn1_lib.o asn1_err.o a_bytes.o a_strnid.o \ - evp_asn1.o asn_pack.o p5_pbe.o p5_pbev2.o p8_pkey.o asn_moid.o - -SRC= $(LIBSRC) - -EXHEADER= asn1.h asn1_mac.h asn1t.h -HEADER= $(EXHEADER) asn1_locl.h - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -test: test.c - cc -g -I../../include -c test.c - cc -g -I../../include -o test test.o -L../.. -lcrypto - -pk: pk.c - cc -g -I../../include -c pk.c - cc -g -I../../include -o pk pk.o -L../.. -lcrypto - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by top Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -a_bitstr.o: ../../e_os.h ../../include/openssl/asn1.h -a_bitstr.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -a_bitstr.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -a_bitstr.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -a_bitstr.o: ../../include/openssl/opensslconf.h -a_bitstr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -a_bitstr.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -a_bitstr.o: ../../include/openssl/symhacks.h ../cryptlib.h a_bitstr.c -a_bool.o: ../../e_os.h ../../include/openssl/asn1.h -a_bool.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -a_bool.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -a_bool.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -a_bool.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -a_bool.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -a_bool.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -a_bool.o: ../../include/openssl/symhacks.h ../cryptlib.h a_bool.c -a_bytes.o: ../../e_os.h ../../include/openssl/asn1.h -a_bytes.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -a_bytes.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -a_bytes.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -a_bytes.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -a_bytes.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -a_bytes.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -a_bytes.o: ../cryptlib.h a_bytes.c -a_d2i_fp.o: ../../e_os.h ../../include/openssl/asn1.h -a_d2i_fp.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h -a_d2i_fp.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -a_d2i_fp.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -a_d2i_fp.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -a_d2i_fp.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -a_d2i_fp.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -a_d2i_fp.o: ../../include/openssl/symhacks.h ../cryptlib.h a_d2i_fp.c -a_digest.o: ../../e_os.h ../../include/openssl/asn1.h -a_digest.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -a_digest.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -a_digest.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -a_digest.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -a_digest.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -a_digest.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -a_digest.o: ../../include/openssl/opensslconf.h -a_digest.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -a_digest.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -a_digest.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -a_digest.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -a_digest.o: ../../include/openssl/x509_vfy.h ../cryptlib.h a_digest.c -a_dup.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -a_dup.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -a_dup.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -a_dup.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -a_dup.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -a_dup.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -a_dup.o: ../../include/openssl/symhacks.h ../cryptlib.h a_dup.c -a_enum.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -a_enum.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -a_enum.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -a_enum.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -a_enum.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -a_enum.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -a_enum.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -a_enum.o: ../cryptlib.h a_enum.c -a_gentm.o: ../../e_os.h ../../include/openssl/asn1.h -a_gentm.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -a_gentm.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -a_gentm.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -a_gentm.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -a_gentm.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -a_gentm.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -a_gentm.o: ../cryptlib.h ../o_time.h a_gentm.c -a_i2d_fp.o: ../../e_os.h ../../include/openssl/asn1.h -a_i2d_fp.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -a_i2d_fp.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -a_i2d_fp.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -a_i2d_fp.o: ../../include/openssl/opensslconf.h -a_i2d_fp.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -a_i2d_fp.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -a_i2d_fp.o: ../../include/openssl/symhacks.h ../cryptlib.h a_i2d_fp.c -a_int.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -a_int.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -a_int.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -a_int.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -a_int.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -a_int.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -a_int.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -a_int.o: ../cryptlib.h a_int.c -a_mbstr.o: ../../e_os.h ../../include/openssl/asn1.h -a_mbstr.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -a_mbstr.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -a_mbstr.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -a_mbstr.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -a_mbstr.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -a_mbstr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -a_mbstr.o: ../cryptlib.h a_mbstr.c -a_object.o: ../../e_os.h ../../include/openssl/asn1.h -a_object.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -a_object.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -a_object.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -a_object.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -a_object.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -a_object.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -a_object.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -a_object.o: ../../include/openssl/symhacks.h ../cryptlib.h a_object.c -a_octet.o: ../../e_os.h ../../include/openssl/asn1.h -a_octet.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -a_octet.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -a_octet.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -a_octet.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -a_octet.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -a_octet.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -a_octet.o: ../cryptlib.h a_octet.c -a_print.o: ../../e_os.h ../../include/openssl/asn1.h -a_print.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -a_print.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -a_print.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -a_print.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -a_print.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -a_print.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -a_print.o: ../cryptlib.h a_print.c -a_set.o: ../../e_os.h ../../include/openssl/asn1.h -a_set.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h -a_set.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -a_set.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -a_set.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -a_set.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -a_set.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -a_set.o: ../../include/openssl/symhacks.h ../cryptlib.h a_set.c -a_sign.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -a_sign.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -a_sign.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -a_sign.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -a_sign.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -a_sign.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -a_sign.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -a_sign.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -a_sign.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -a_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -a_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -a_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -a_sign.o: ../cryptlib.h a_sign.c asn1_locl.h -a_strex.o: ../../e_os.h ../../include/openssl/asn1.h -a_strex.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -a_strex.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -a_strex.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -a_strex.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -a_strex.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -a_strex.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -a_strex.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -a_strex.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -a_strex.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -a_strex.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -a_strex.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -a_strex.o: ../cryptlib.h a_strex.c charmap.h -a_strnid.o: ../../e_os.h ../../include/openssl/asn1.h -a_strnid.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -a_strnid.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -a_strnid.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -a_strnid.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -a_strnid.o: ../../include/openssl/opensslconf.h -a_strnid.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -a_strnid.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -a_strnid.o: ../../include/openssl/symhacks.h ../cryptlib.h a_strnid.c -a_time.o: ../../e_os.h ../../include/openssl/asn1.h -a_time.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -a_time.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -a_time.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -a_time.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -a_time.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -a_time.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -a_time.o: ../../include/openssl/symhacks.h ../cryptlib.h ../o_time.h a_time.c -a_type.o: ../../e_os.h ../../include/openssl/asn1.h -a_type.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -a_type.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -a_type.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -a_type.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -a_type.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -a_type.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -a_type.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -a_type.o: ../../include/openssl/symhacks.h ../cryptlib.h a_type.c -a_utctm.o: ../../e_os.h ../../include/openssl/asn1.h -a_utctm.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -a_utctm.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -a_utctm.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -a_utctm.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -a_utctm.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -a_utctm.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -a_utctm.o: ../cryptlib.h ../o_time.h a_utctm.c -a_utf8.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -a_utf8.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -a_utf8.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -a_utf8.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -a_utf8.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -a_utf8.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -a_utf8.o: ../../include/openssl/symhacks.h ../cryptlib.h a_utf8.c -a_verify.o: ../../e_os.h ../../include/openssl/asn1.h -a_verify.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -a_verify.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -a_verify.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -a_verify.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -a_verify.o: ../../include/openssl/err.h ../../include/openssl/evp.h -a_verify.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -a_verify.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -a_verify.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -a_verify.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -a_verify.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -a_verify.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -a_verify.o: ../../include/openssl/x509_vfy.h ../cryptlib.h a_verify.c -a_verify.o: asn1_locl.h -ameth_lib.o: ../../e_os.h ../../include/openssl/asn1.h -ameth_lib.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -ameth_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -ameth_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ameth_lib.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -ameth_lib.o: ../../include/openssl/engine.h ../../include/openssl/err.h -ameth_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -ameth_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -ameth_lib.o: ../../include/openssl/opensslconf.h -ameth_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ameth_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -ameth_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -ameth_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -ameth_lib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h ameth_lib.c -ameth_lib.o: asn1_locl.h -asn1_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -asn1_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -asn1_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -asn1_err.o: ../../include/openssl/opensslconf.h -asn1_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -asn1_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -asn1_err.o: ../../include/openssl/symhacks.h asn1_err.c -asn1_gen.o: ../../e_os.h ../../include/openssl/asn1.h -asn1_gen.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -asn1_gen.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -asn1_gen.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -asn1_gen.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -asn1_gen.o: ../../include/openssl/err.h ../../include/openssl/evp.h -asn1_gen.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -asn1_gen.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -asn1_gen.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -asn1_gen.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -asn1_gen.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -asn1_gen.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -asn1_gen.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -asn1_gen.o: ../cryptlib.h asn1_gen.c -asn1_lib.o: ../../e_os.h ../../include/openssl/asn1.h -asn1_lib.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h -asn1_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -asn1_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -asn1_lib.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -asn1_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -asn1_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -asn1_lib.o: ../../include/openssl/symhacks.h ../cryptlib.h asn1_lib.c -asn1_par.o: ../../e_os.h ../../include/openssl/asn1.h -asn1_par.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -asn1_par.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -asn1_par.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -asn1_par.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -asn1_par.o: ../../include/openssl/opensslconf.h -asn1_par.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -asn1_par.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -asn1_par.o: ../../include/openssl/symhacks.h ../cryptlib.h asn1_par.c -asn_mime.o: ../../e_os.h ../../include/openssl/asn1.h -asn_mime.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -asn_mime.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -asn_mime.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -asn_mime.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -asn_mime.o: ../../include/openssl/err.h ../../include/openssl/evp.h -asn_mime.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -asn_mime.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -asn_mime.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -asn_mime.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -asn_mime.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -asn_mime.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -asn_mime.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -asn_mime.o: ../cryptlib.h asn1_locl.h asn_mime.c -asn_moid.o: ../../e_os.h ../../include/openssl/asn1.h -asn_moid.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -asn_moid.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -asn_moid.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h -asn_moid.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -asn_moid.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -asn_moid.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -asn_moid.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -asn_moid.o: ../../include/openssl/opensslconf.h -asn_moid.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -asn_moid.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -asn_moid.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -asn_moid.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -asn_moid.o: ../../include/openssl/x509_vfy.h ../cryptlib.h asn_moid.c -asn_pack.o: ../../e_os.h ../../include/openssl/asn1.h -asn_pack.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -asn_pack.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -asn_pack.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -asn_pack.o: ../../include/openssl/opensslconf.h -asn_pack.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -asn_pack.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -asn_pack.o: ../../include/openssl/symhacks.h ../cryptlib.h asn_pack.c -bio_asn1.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -bio_asn1.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -bio_asn1.o: ../../include/openssl/opensslconf.h -bio_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bio_asn1.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bio_asn1.o: ../../include/openssl/symhacks.h bio_asn1.c -bio_ndef.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h -bio_ndef.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h -bio_ndef.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bio_ndef.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bio_ndef.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bio_ndef.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bio_ndef.o: ../../include/openssl/symhacks.h bio_ndef.c -d2i_pr.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -d2i_pr.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -d2i_pr.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -d2i_pr.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -d2i_pr.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -d2i_pr.o: ../../include/openssl/err.h ../../include/openssl/evp.h -d2i_pr.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -d2i_pr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -d2i_pr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -d2i_pr.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -d2i_pr.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -d2i_pr.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -d2i_pr.o: ../../include/openssl/x509_vfy.h ../cryptlib.h asn1_locl.h d2i_pr.c -d2i_pu.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -d2i_pu.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -d2i_pu.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h -d2i_pu.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -d2i_pu.o: ../../include/openssl/err.h ../../include/openssl/evp.h -d2i_pu.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -d2i_pu.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -d2i_pu.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -d2i_pu.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -d2i_pu.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -d2i_pu.o: ../cryptlib.h d2i_pu.c -evp_asn1.o: ../../e_os.h ../../include/openssl/asn1.h -evp_asn1.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h -evp_asn1.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -evp_asn1.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -evp_asn1.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -evp_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -evp_asn1.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -evp_asn1.o: ../../include/openssl/symhacks.h ../cryptlib.h evp_asn1.c -f_enum.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -f_enum.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -f_enum.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -f_enum.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -f_enum.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -f_enum.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -f_enum.o: ../../include/openssl/symhacks.h ../cryptlib.h f_enum.c -f_int.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -f_int.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -f_int.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -f_int.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -f_int.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -f_int.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -f_int.o: ../../include/openssl/symhacks.h ../cryptlib.h f_int.c -f_string.o: ../../e_os.h ../../include/openssl/asn1.h -f_string.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -f_string.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -f_string.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -f_string.o: ../../include/openssl/opensslconf.h -f_string.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -f_string.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -f_string.o: ../../include/openssl/symhacks.h ../cryptlib.h f_string.c -i2d_pr.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -i2d_pr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -i2d_pr.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -i2d_pr.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -i2d_pr.o: ../../include/openssl/err.h ../../include/openssl/evp.h -i2d_pr.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -i2d_pr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -i2d_pr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -i2d_pr.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -i2d_pr.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -i2d_pr.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -i2d_pr.o: ../../include/openssl/x509_vfy.h ../cryptlib.h asn1_locl.h i2d_pr.c -i2d_pu.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -i2d_pu.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -i2d_pu.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h -i2d_pu.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -i2d_pu.o: ../../include/openssl/err.h ../../include/openssl/evp.h -i2d_pu.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -i2d_pu.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -i2d_pu.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -i2d_pu.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -i2d_pu.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -i2d_pu.o: ../cryptlib.h i2d_pu.c -n_pkey.o: ../../e_os.h ../../include/openssl/asn1.h -n_pkey.o: ../../include/openssl/asn1_mac.h ../../include/openssl/asn1t.h -n_pkey.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -n_pkey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -n_pkey.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -n_pkey.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -n_pkey.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -n_pkey.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -n_pkey.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -n_pkey.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -n_pkey.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -n_pkey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -n_pkey.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -n_pkey.o: ../../include/openssl/x509_vfy.h ../cryptlib.h n_pkey.c -nsseq.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h -nsseq.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -nsseq.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -nsseq.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -nsseq.o: ../../include/openssl/ecdsa.h ../../include/openssl/evp.h -nsseq.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -nsseq.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -nsseq.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -nsseq.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -nsseq.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -nsseq.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -nsseq.o: ../../include/openssl/x509_vfy.h nsseq.c -p5_pbe.o: ../../e_os.h ../../include/openssl/asn1.h -p5_pbe.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -p5_pbe.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -p5_pbe.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -p5_pbe.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -p5_pbe.o: ../../include/openssl/err.h ../../include/openssl/evp.h -p5_pbe.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -p5_pbe.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -p5_pbe.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -p5_pbe.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -p5_pbe.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -p5_pbe.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -p5_pbe.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -p5_pbe.o: ../cryptlib.h p5_pbe.c -p5_pbev2.o: ../../e_os.h ../../include/openssl/asn1.h -p5_pbev2.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -p5_pbev2.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -p5_pbev2.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -p5_pbev2.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -p5_pbev2.o: ../../include/openssl/err.h ../../include/openssl/evp.h -p5_pbev2.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -p5_pbev2.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -p5_pbev2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -p5_pbev2.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -p5_pbev2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -p5_pbev2.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -p5_pbev2.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -p5_pbev2.o: ../cryptlib.h p5_pbev2.c -p8_pkey.o: ../../e_os.h ../../include/openssl/asn1.h -p8_pkey.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -p8_pkey.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -p8_pkey.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -p8_pkey.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -p8_pkey.o: ../../include/openssl/err.h ../../include/openssl/evp.h -p8_pkey.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -p8_pkey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -p8_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -p8_pkey.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -p8_pkey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -p8_pkey.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -p8_pkey.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p8_pkey.c -t_bitst.o: ../../e_os.h ../../include/openssl/asn1.h -t_bitst.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -t_bitst.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -t_bitst.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -t_bitst.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -t_bitst.o: ../../include/openssl/err.h ../../include/openssl/evp.h -t_bitst.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -t_bitst.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -t_bitst.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -t_bitst.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -t_bitst.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -t_bitst.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -t_bitst.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -t_bitst.o: ../cryptlib.h t_bitst.c -t_crl.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -t_crl.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -t_crl.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -t_crl.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -t_crl.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -t_crl.o: ../../include/openssl/err.h ../../include/openssl/evp.h -t_crl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -t_crl.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -t_crl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -t_crl.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -t_crl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -t_crl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -t_crl.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -t_crl.o: ../cryptlib.h t_crl.c -t_pkey.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -t_pkey.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -t_pkey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -t_pkey.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -t_pkey.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -t_pkey.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -t_pkey.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -t_pkey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -t_pkey.o: ../cryptlib.h t_pkey.c -t_req.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -t_req.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -t_req.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -t_req.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h -t_req.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -t_req.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -t_req.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -t_req.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -t_req.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -t_req.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -t_req.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -t_req.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -t_req.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -t_req.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -t_req.o: ../cryptlib.h t_req.c -t_spki.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -t_spki.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -t_spki.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h -t_spki.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -t_spki.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -t_spki.o: ../../include/openssl/err.h ../../include/openssl/evp.h -t_spki.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -t_spki.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -t_spki.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -t_spki.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h -t_spki.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -t_spki.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -t_spki.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -t_spki.o: ../cryptlib.h t_spki.c -t_x509.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -t_x509.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -t_x509.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -t_x509.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h -t_x509.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -t_x509.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -t_x509.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -t_x509.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -t_x509.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -t_x509.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -t_x509.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -t_x509.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -t_x509.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -t_x509.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -t_x509.o: ../cryptlib.h asn1_locl.h t_x509.c -t_x509a.o: ../../e_os.h ../../include/openssl/asn1.h -t_x509a.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -t_x509a.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -t_x509a.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -t_x509a.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -t_x509a.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -t_x509a.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -t_x509a.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -t_x509a.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -t_x509a.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -t_x509a.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -t_x509a.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -t_x509a.o: ../cryptlib.h t_x509a.c -tasn_dec.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h -tasn_dec.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -tasn_dec.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -tasn_dec.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -tasn_dec.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -tasn_dec.o: ../../include/openssl/opensslconf.h -tasn_dec.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -tasn_dec.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -tasn_dec.o: ../../include/openssl/symhacks.h tasn_dec.c -tasn_enc.o: ../../e_os.h ../../include/openssl/asn1.h -tasn_enc.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -tasn_enc.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -tasn_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -tasn_enc.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -tasn_enc.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -tasn_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -tasn_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -tasn_enc.o: ../../include/openssl/symhacks.h ../cryptlib.h tasn_enc.c -tasn_fre.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h -tasn_fre.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h -tasn_fre.o: ../../include/openssl/e_os2.h ../../include/openssl/obj_mac.h -tasn_fre.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -tasn_fre.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -tasn_fre.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -tasn_fre.o: ../../include/openssl/symhacks.h tasn_fre.c -tasn_new.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h -tasn_new.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h -tasn_new.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -tasn_new.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -tasn_new.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -tasn_new.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -tasn_new.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -tasn_new.o: ../../include/openssl/symhacks.h tasn_new.c -tasn_prn.o: ../../e_os.h ../../include/openssl/asn1.h -tasn_prn.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -tasn_prn.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h -tasn_prn.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -tasn_prn.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -tasn_prn.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -tasn_prn.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -tasn_prn.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -tasn_prn.o: ../../include/openssl/opensslconf.h -tasn_prn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -tasn_prn.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -tasn_prn.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -tasn_prn.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -tasn_prn.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -tasn_prn.o: ../cryptlib.h asn1_locl.h tasn_prn.c -tasn_typ.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h -tasn_typ.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h -tasn_typ.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -tasn_typ.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -tasn_typ.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -tasn_typ.o: ../../include/openssl/symhacks.h tasn_typ.c -tasn_utl.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h -tasn_utl.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h -tasn_utl.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -tasn_utl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -tasn_utl.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -tasn_utl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -tasn_utl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -tasn_utl.o: ../../include/openssl/symhacks.h tasn_utl.c -x_algor.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h -x_algor.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -x_algor.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -x_algor.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -x_algor.o: ../../include/openssl/ecdsa.h ../../include/openssl/evp.h -x_algor.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x_algor.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -x_algor.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x_algor.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x_algor.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x_algor.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x_algor.o: ../../include/openssl/x509_vfy.h x_algor.c -x_attrib.o: ../../e_os.h ../../include/openssl/asn1.h -x_attrib.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -x_attrib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -x_attrib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -x_attrib.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -x_attrib.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x_attrib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x_attrib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -x_attrib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x_attrib.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x_attrib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x_attrib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x_attrib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_attrib.c -x_bignum.o: ../../e_os.h ../../include/openssl/asn1.h -x_bignum.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -x_bignum.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -x_bignum.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -x_bignum.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -x_bignum.o: ../../include/openssl/opensslconf.h -x_bignum.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x_bignum.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -x_bignum.o: ../../include/openssl/symhacks.h ../cryptlib.h x_bignum.c -x_crl.o: ../../e_os.h ../../include/openssl/asn1.h -x_crl.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -x_crl.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h -x_crl.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -x_crl.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -x_crl.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -x_crl.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -x_crl.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -x_crl.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -x_crl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -x_crl.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -x_crl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -x_crl.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -x_crl.o: ../../include/openssl/x509v3.h ../cryptlib.h asn1_locl.h x_crl.c -x_exten.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h -x_exten.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -x_exten.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -x_exten.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -x_exten.o: ../../include/openssl/ecdsa.h ../../include/openssl/evp.h -x_exten.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x_exten.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -x_exten.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x_exten.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x_exten.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x_exten.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x_exten.o: ../../include/openssl/x509_vfy.h x_exten.c -x_info.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -x_info.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -x_info.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -x_info.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -x_info.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x_info.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x_info.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -x_info.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x_info.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x_info.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x_info.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x_info.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_info.c -x_long.o: ../../e_os.h ../../include/openssl/asn1.h -x_long.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -x_long.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -x_long.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -x_long.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -x_long.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -x_long.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -x_long.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -x_long.o: ../cryptlib.h x_long.c -x_name.o: ../../e_os.h ../../include/openssl/asn1.h -x_name.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -x_name.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -x_name.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -x_name.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -x_name.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x_name.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x_name.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -x_name.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x_name.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x_name.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x_name.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x_name.o: ../../include/openssl/x509_vfy.h ../cryptlib.h asn1_locl.h x_name.c -x_nx509.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h -x_nx509.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -x_nx509.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -x_nx509.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -x_nx509.o: ../../include/openssl/ecdsa.h ../../include/openssl/evp.h -x_nx509.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x_nx509.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -x_nx509.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x_nx509.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x_nx509.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x_nx509.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x_nx509.o: ../../include/openssl/x509_vfy.h x_nx509.c -x_pkey.o: ../../e_os.h ../../include/openssl/asn1.h -x_pkey.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h -x_pkey.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -x_pkey.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -x_pkey.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -x_pkey.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x_pkey.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x_pkey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -x_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x_pkey.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x_pkey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x_pkey.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x_pkey.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_pkey.c -x_pubkey.o: ../../e_os.h ../../include/openssl/asn1.h -x_pubkey.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -x_pubkey.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -x_pubkey.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h -x_pubkey.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -x_pubkey.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -x_pubkey.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -x_pubkey.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -x_pubkey.o: ../../include/openssl/opensslconf.h -x_pubkey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x_pubkey.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h -x_pubkey.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -x_pubkey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -x_pubkey.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -x_pubkey.o: ../cryptlib.h asn1_locl.h x_pubkey.c -x_req.o: ../../e_os.h ../../include/openssl/asn1.h -x_req.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -x_req.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -x_req.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -x_req.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -x_req.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x_req.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x_req.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -x_req.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x_req.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x_req.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x_req.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x_req.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_req.c -x_sig.o: ../../e_os.h ../../include/openssl/asn1.h -x_sig.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -x_sig.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -x_sig.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -x_sig.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -x_sig.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x_sig.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x_sig.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -x_sig.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x_sig.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x_sig.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x_sig.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x_sig.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_sig.c -x_spki.o: ../../e_os.h ../../include/openssl/asn1.h -x_spki.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -x_spki.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -x_spki.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -x_spki.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -x_spki.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x_spki.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x_spki.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -x_spki.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x_spki.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x_spki.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x_spki.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x_spki.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_spki.c -x_val.o: ../../e_os.h ../../include/openssl/asn1.h -x_val.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -x_val.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -x_val.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -x_val.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -x_val.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x_val.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x_val.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -x_val.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x_val.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x_val.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x_val.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x_val.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_val.c -x_x509.o: ../../e_os.h ../../include/openssl/asn1.h -x_x509.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -x_x509.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h -x_x509.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -x_x509.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -x_x509.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -x_x509.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -x_x509.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -x_x509.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -x_x509.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -x_x509.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -x_x509.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -x_x509.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -x_x509.o: ../../include/openssl/x509v3.h ../cryptlib.h x_x509.c -x_x509a.o: ../../e_os.h ../../include/openssl/asn1.h -x_x509a.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -x_x509a.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -x_x509a.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -x_x509a.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -x_x509a.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x_x509a.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x_x509a.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -x_x509a.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x_x509a.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x_x509a.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x_x509a.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x_x509a.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_x509a.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/bf/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/bf/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/bf/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/bf/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,101 +0,0 @@ -# -# OpenSSL/crypto/blowfish/Makefile -# - -DIR= bf -TOP= ../.. -CC= cc -CPP= $(CC) -E -INCLUDES= -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -BF_ENC= bf_enc.o - -CFLAGS= $(INCLUDES) $(CFLAG) -ASFLAGS= $(INCLUDES) $(ASFLAG) -AFLAGS= $(ASFLAGS) - -GENERAL=Makefile -TEST=bftest.c -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC=bf_skey.c bf_ecb.c bf_enc.c bf_cfb64.c bf_ofb64.c -LIBOBJ=bf_skey.o bf_ecb.o $(BF_ENC) bf_cfb64.o bf_ofb64.o - -SRC= $(LIBSRC) - -EXHEADER= blowfish.h -HEADER= bf_pi.h bf_locl.h $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -bf-586.s: asm/bf-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl - $(PERL) asm/bf-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@ - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -# We need to use force because 'install' matches 'INSTALL' on case -# insensitive systems -FRC.install: -install: FRC.install - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -bf_cfb64.o: ../../include/openssl/blowfish.h ../../include/openssl/e_os2.h -bf_cfb64.o: ../../include/openssl/opensslconf.h bf_cfb64.c bf_locl.h -bf_ecb.o: ../../include/openssl/blowfish.h ../../include/openssl/e_os2.h -bf_ecb.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -bf_ecb.o: bf_ecb.c bf_locl.h -bf_enc.o: ../../include/openssl/blowfish.h ../../include/openssl/e_os2.h -bf_enc.o: ../../include/openssl/opensslconf.h bf_enc.c bf_locl.h -bf_ofb64.o: ../../include/openssl/blowfish.h ../../include/openssl/e_os2.h -bf_ofb64.o: ../../include/openssl/opensslconf.h bf_locl.h bf_ofb64.c -bf_skey.o: ../../include/openssl/blowfish.h ../../include/openssl/crypto.h -bf_skey.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -bf_skey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bf_skey.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bf_skey.o: ../../include/openssl/symhacks.h bf_locl.h bf_pi.h bf_skey.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/bio/bss_dgram.c nodejs-0.10.29/deps/openssl/openssl/crypto/bio/bss_dgram.c --- nodejs-0.10.28/deps/openssl/openssl/crypto/bio/bss_dgram.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/bio/bss_dgram.c 2014-06-09 17:04:36.000000000 +0000 @@ -1333,7 +1333,7 @@ bio_dgram_sctp_data *data = NULL; socklen_t sockopt_len = 0; struct sctp_authkeyid authkeyid; - struct sctp_authkey *authkey; + struct sctp_authkey *authkey = NULL; data = (bio_dgram_sctp_data *)b->ptr; @@ -1388,6 +1388,11 @@ /* Add new key */ sockopt_len = sizeof(struct sctp_authkey) + 64 * sizeof(uint8_t); authkey = OPENSSL_malloc(sockopt_len); + if (authkey == NULL) + { + ret = -1; + break; + } memset(authkey, 0x00, sockopt_len); authkey->sca_keynumber = authkeyid.scact_keynumber + 1; #ifndef __FreeBSD__ @@ -1399,6 +1404,8 @@ memcpy(&authkey->sca_key[0], ptr, 64 * sizeof(uint8_t)); ret = setsockopt(b->num, IPPROTO_SCTP, SCTP_AUTH_KEY, authkey, sockopt_len); + OPENSSL_free(authkey); + authkey = NULL; if (ret < 0) break; /* Reset active key */ diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/bio/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/bio/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/bio/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/bio/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,222 +0,0 @@ -# -# OpenSSL/crypto/bio/Makefile -# - -DIR= bio -TOP= ../.. -CC= cc -INCLUDES= -I.. -I$(TOP) -I../../include -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile -TEST= -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC= bio_lib.c bio_cb.c bio_err.c \ - bss_mem.c bss_null.c bss_fd.c \ - bss_file.c bss_sock.c bss_conn.c \ - bf_null.c bf_buff.c b_print.c b_dump.c \ - b_sock.c bss_acpt.c bf_nbio.c bss_log.c bss_bio.c \ - bss_dgram.c -# bf_lbuf.c -LIBOBJ= bio_lib.o bio_cb.o bio_err.o \ - bss_mem.o bss_null.o bss_fd.o \ - bss_file.o bss_sock.o bss_conn.o \ - bf_null.o bf_buff.o b_print.o b_dump.o \ - b_sock.o bss_acpt.o bf_nbio.o bss_log.o bss_bio.o \ - bss_dgram.o -# bf_lbuf.o - -SRC= $(LIBSRC) - -EXHEADER= bio.h -HEADER= bio_lcl.h $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -b_dump.o: ../../e_os.h ../../include/openssl/bio.h -b_dump.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -b_dump.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -b_dump.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -b_dump.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -b_dump.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -b_dump.o: ../../include/openssl/symhacks.h ../cryptlib.h b_dump.c bio_lcl.h -b_print.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h -b_print.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -b_print.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -b_print.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -b_print.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -b_print.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -b_print.o: ../../include/openssl/symhacks.h ../cryptlib.h b_print.c -b_sock.o: ../../e_os.h ../../include/openssl/bio.h -b_sock.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -b_sock.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h -b_sock.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -b_sock.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -b_sock.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -b_sock.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -b_sock.o: ../cryptlib.h b_sock.c -bf_buff.o: ../../e_os.h ../../include/openssl/bio.h -bf_buff.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bf_buff.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bf_buff.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bf_buff.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bf_buff.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bf_buff.o: ../../include/openssl/symhacks.h ../cryptlib.h bf_buff.c -bf_nbio.o: ../../e_os.h ../../include/openssl/bio.h -bf_nbio.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bf_nbio.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bf_nbio.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bf_nbio.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bf_nbio.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -bf_nbio.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -bf_nbio.o: ../cryptlib.h bf_nbio.c -bf_null.o: ../../e_os.h ../../include/openssl/bio.h -bf_null.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bf_null.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bf_null.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bf_null.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bf_null.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bf_null.o: ../../include/openssl/symhacks.h ../cryptlib.h bf_null.c -bio_cb.o: ../../e_os.h ../../include/openssl/bio.h -bio_cb.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bio_cb.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bio_cb.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bio_cb.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bio_cb.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bio_cb.o: ../../include/openssl/symhacks.h ../cryptlib.h bio_cb.c -bio_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h -bio_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bio_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bio_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bio_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bio_err.o: ../../include/openssl/symhacks.h bio_err.c -bio_lib.o: ../../e_os.h ../../include/openssl/bio.h -bio_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bio_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bio_lib.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bio_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bio_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bio_lib.o: ../../include/openssl/symhacks.h ../cryptlib.h bio_lib.c -bss_acpt.o: ../../e_os.h ../../include/openssl/bio.h -bss_acpt.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bss_acpt.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bss_acpt.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bss_acpt.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bss_acpt.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bss_acpt.o: ../../include/openssl/symhacks.h ../cryptlib.h bss_acpt.c -bss_bio.o: ../../e_os.h ../../include/openssl/bio.h -bss_bio.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -bss_bio.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -bss_bio.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -bss_bio.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -bss_bio.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -bss_bio.o: bss_bio.c -bss_conn.o: ../../e_os.h ../../include/openssl/bio.h -bss_conn.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bss_conn.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bss_conn.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bss_conn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bss_conn.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bss_conn.o: ../../include/openssl/symhacks.h ../cryptlib.h bss_conn.c -bss_dgram.o: ../../e_os.h ../../include/openssl/bio.h -bss_dgram.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bss_dgram.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bss_dgram.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bss_dgram.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bss_dgram.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bss_dgram.o: ../../include/openssl/symhacks.h ../cryptlib.h bss_dgram.c -bss_fd.o: ../../e_os.h ../../include/openssl/bio.h -bss_fd.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bss_fd.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bss_fd.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bss_fd.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bss_fd.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bss_fd.o: ../../include/openssl/symhacks.h ../cryptlib.h bio_lcl.h bss_fd.c -bss_file.o: ../../e_os.h ../../include/openssl/bio.h -bss_file.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bss_file.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bss_file.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bss_file.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bss_file.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bss_file.o: ../../include/openssl/symhacks.h ../cryptlib.h bio_lcl.h bss_file.c -bss_log.o: ../../e_os.h ../../include/openssl/bio.h -bss_log.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bss_log.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bss_log.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bss_log.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bss_log.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bss_log.o: ../../include/openssl/symhacks.h ../cryptlib.h bss_log.c -bss_mem.o: ../../e_os.h ../../include/openssl/bio.h -bss_mem.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bss_mem.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bss_mem.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bss_mem.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bss_mem.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bss_mem.o: ../../include/openssl/symhacks.h ../cryptlib.h bss_mem.c -bss_null.o: ../../e_os.h ../../include/openssl/bio.h -bss_null.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bss_null.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bss_null.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bss_null.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bss_null.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bss_null.o: ../../include/openssl/symhacks.h ../cryptlib.h bss_null.c -bss_sock.o: ../../e_os.h ../../include/openssl/bio.h -bss_sock.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bss_sock.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bss_sock.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bss_sock.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bss_sock.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bss_sock.o: ../../include/openssl/symhacks.h ../cryptlib.h bss_sock.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/bn/bn_mont.c nodejs-0.10.29/deps/openssl/openssl/crypto/bn/bn_mont.c --- nodejs-0.10.28/deps/openssl/openssl/crypto/bn/bn_mont.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/bn/bn_mont.c 2014-06-09 17:04:36.000000000 +0000 @@ -478,32 +478,38 @@ BN_MONT_CTX *BN_MONT_CTX_set_locked(BN_MONT_CTX **pmont, int lock, const BIGNUM *mod, BN_CTX *ctx) { - int got_write_lock = 0; BN_MONT_CTX *ret; CRYPTO_r_lock(lock); - if (!*pmont) + ret = *pmont; + CRYPTO_r_unlock(lock); + if (ret) + return ret; + + /* We don't want to serialise globally while doing our lazy-init math in + * BN_MONT_CTX_set. That punishes threads that are doing independent + * things. Instead, punish the case where more than one thread tries to + * lazy-init the same 'pmont', by having each do the lazy-init math work + * independently and only use the one from the thread that wins the race + * (the losers throw away the work they've done). */ + ret = BN_MONT_CTX_new(); + if (!ret) + return NULL; + if (!BN_MONT_CTX_set(ret, mod, ctx)) { - CRYPTO_r_unlock(lock); - CRYPTO_w_lock(lock); - got_write_lock = 1; + BN_MONT_CTX_free(ret); + return NULL; + } - if (!*pmont) - { - ret = BN_MONT_CTX_new(); - if (ret && !BN_MONT_CTX_set(ret, mod, ctx)) - BN_MONT_CTX_free(ret); - else - *pmont = ret; - } + /* The locked compare-and-set, after the local work is done. */ + CRYPTO_w_lock(lock); + if (*pmont) + { + BN_MONT_CTX_free(ret); + ret = *pmont; } - - ret = *pmont; - - if (got_write_lock) - CRYPTO_w_unlock(lock); else - CRYPTO_r_unlock(lock); - + *pmont = ret; + CRYPTO_w_unlock(lock); return ret; } diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/bn/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/bn/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/bn/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/bn/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,377 +0,0 @@ -# -# OpenSSL/crypto/bn/Makefile -# - -DIR= bn -TOP= ../.. -CC= cc -CPP= $(CC) -E -INCLUDES= -I.. -I$(TOP) -I../../include -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -BN_ASM= bn_asm.o - -CFLAGS= $(INCLUDES) $(CFLAG) -ASFLAGS= $(INCLUDES) $(ASFLAG) -AFLAGS= $(ASFLAGS) - -GENERAL=Makefile -TEST=bntest.c exptest.c -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC= bn_add.c bn_div.c bn_exp.c bn_lib.c bn_ctx.c bn_mul.c bn_mod.c \ - bn_print.c bn_rand.c bn_shift.c bn_word.c bn_blind.c \ - bn_kron.c bn_sqrt.c bn_gcd.c bn_prime.c bn_err.c bn_sqr.c bn_asm.c \ - bn_recp.c bn_mont.c bn_mpi.c bn_exp2.c bn_gf2m.c bn_nist.c \ - bn_depr.c bn_const.c bn_x931p.c - -LIBOBJ= bn_add.o bn_div.o bn_exp.o bn_lib.o bn_ctx.o bn_mul.o bn_mod.o \ - bn_print.o bn_rand.o bn_shift.o bn_word.o bn_blind.o \ - bn_kron.o bn_sqrt.o bn_gcd.o bn_prime.o bn_err.o bn_sqr.o $(BN_ASM) \ - bn_recp.o bn_mont.o bn_mpi.o bn_exp2.o bn_gf2m.o bn_nist.o \ - bn_depr.o bn_const.o bn_x931p.o - -SRC= $(LIBSRC) - -EXHEADER= bn.h -HEADER= bn_lcl.h bn_prime.h $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -bn_prime.h: bn_prime.pl - $(PERL) bn_prime.pl >bn_prime.h - -divtest: divtest.c ../../libcrypto.a - cc -I../../include divtest.c -o divtest ../../libcrypto.a - -bnbug: bnbug.c ../../libcrypto.a top - cc -g -I../../include bnbug.c -o bnbug ../../libcrypto.a - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -bn-586.s: asm/bn-586.pl ../perlasm/x86asm.pl - $(PERL) asm/bn-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@ -co-586.s: asm/co-586.pl ../perlasm/x86asm.pl - $(PERL) asm/co-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@ -x86-mont.s: asm/x86-mont.pl ../perlasm/x86asm.pl - $(PERL) asm/x86-mont.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@ -x86-gf2m.s: asm/x86-gf2m.pl ../perlasm/x86asm.pl - $(PERL) asm/x86-gf2m.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@ - -sparcv8.o: asm/sparcv8.S - $(CC) $(CFLAGS) -c asm/sparcv8.S -bn-sparcv9.o: asm/sparcv8plus.S - $(CC) $(CFLAGS) -c -o $@ asm/sparcv8plus.S -sparcv9a-mont.s: asm/sparcv9a-mont.pl - $(PERL) asm/sparcv9a-mont.pl $(CFLAGS) > $@ -sparcv9-mont.s: asm/sparcv9-mont.pl - $(PERL) asm/sparcv9-mont.pl $(CFLAGS) > $@ - -bn-mips3.o: asm/mips3.s - @if [ "$(CC)" = "gcc" ]; then \ - ABI=`expr "$(CFLAGS)" : ".*-mabi=\([n3264]*\)"` && \ - as -$$ABI -O -o $@ asm/mips3.s; \ - else $(CC) -c $(CFLAGS) -o $@ asm/mips3.s; fi - -bn-mips.s: asm/mips.pl - $(PERL) asm/mips.pl $(PERLASM_SCHEME) $@ -mips-mont.s: asm/mips-mont.pl - $(PERL) asm/mips-mont.pl $(PERLASM_SCHEME) $@ - -bn-s390x.o: asm/s390x.S - $(CC) $(CFLAGS) -c -o $@ asm/s390x.S -s390x-gf2m.s: asm/s390x-gf2m.pl - $(PERL) asm/s390x-gf2m.pl $(PERLASM_SCHEME) $@ - -x86_64-gcc.o: asm/x86_64-gcc.c - $(CC) $(CFLAGS) -c -o $@ asm/x86_64-gcc.c -x86_64-mont.s: asm/x86_64-mont.pl - $(PERL) asm/x86_64-mont.pl $(PERLASM_SCHEME) > $@ -x86_64-mont5.s: asm/x86_64-mont5.pl - $(PERL) asm/x86_64-mont5.pl $(PERLASM_SCHEME) > $@ -x86_64-gf2m.s: asm/x86_64-gf2m.pl - $(PERL) asm/x86_64-gf2m.pl $(PERLASM_SCHEME) > $@ -modexp512-x86_64.s: asm/modexp512-x86_64.pl - $(PERL) asm/modexp512-x86_64.pl $(PERLASM_SCHEME) > $@ - -bn-ia64.s: asm/ia64.S - $(CC) $(CFLAGS) -E asm/ia64.S > $@ -ia64-mont.s: asm/ia64-mont.pl - $(PERL) asm/ia64-mont.pl $@ $(CFLAGS) - -# GNU assembler fails to compile PA-RISC2 modules, insist on calling -# vendor assembler... -pa-risc2W.o: asm/pa-risc2W.s - /usr/ccs/bin/as -o pa-risc2W.o asm/pa-risc2W.s -pa-risc2.o: asm/pa-risc2.s - /usr/ccs/bin/as -o pa-risc2.o asm/pa-risc2.s -parisc-mont.s: asm/parisc-mont.pl - $(PERL) asm/parisc-mont.pl $(PERLASM_SCHEME) $@ - -# ppc - AIX, Linux, MacOS X... -bn-ppc.s: asm/ppc.pl; $(PERL) asm/ppc.pl $(PERLASM_SCHEME) $@ -ppc-mont.s: asm/ppc-mont.pl;$(PERL) asm/ppc-mont.pl $(PERLASM_SCHEME) $@ -ppc64-mont.s: asm/ppc64-mont.pl;$(PERL) asm/ppc64-mont.pl $(PERLASM_SCHEME) $@ - -alpha-mont.s: asm/alpha-mont.pl - (preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \ - $(PERL) asm/alpha-mont.pl > $$preproc && \ - $(CC) -E $$preproc > $@ && rm $$preproc) - -# GNU make "catch all" -%-mont.s: asm/%-mont.pl; $(PERL) $< $(PERLASM_SCHEME) $@ -%-gf2m.S: asm/%-gf2m.pl; $(PERL) $< $(PERLASM_SCHEME) $@ - -armv4-gf2m.o: armv4-gf2m.S - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -exptest: - rm -f exptest - gcc -I../../include -g2 -ggdb -o exptest exptest.c ../../libcrypto.a - -div: - rm -f a.out - gcc -I.. -g div.c ../../libcrypto.a - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -bn_add.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h -bn_add.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_add.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_add.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bn_add.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bn_add.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bn_add.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_add.c bn_lcl.h -bn_asm.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h -bn_asm.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_asm.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_asm.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bn_asm.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bn_asm.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bn_asm.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_asm.c bn_lcl.h -bn_blind.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h -bn_blind.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_blind.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_blind.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bn_blind.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bn_blind.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bn_blind.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_blind.c bn_lcl.h -bn_const.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -bn_const.o: ../../include/openssl/opensslconf.h -bn_const.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bn_const.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bn_const.o: ../../include/openssl/symhacks.h bn.h bn_const.c -bn_ctx.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h -bn_ctx.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_ctx.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_ctx.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bn_ctx.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bn_ctx.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bn_ctx.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_ctx.c bn_lcl.h -bn_depr.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h -bn_depr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_depr.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_depr.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bn_depr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bn_depr.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -bn_depr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -bn_depr.o: ../cryptlib.h bn_depr.c bn_lcl.h -bn_div.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h -bn_div.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_div.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_div.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bn_div.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bn_div.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bn_div.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_div.c bn_lcl.h -bn_err.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -bn_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -bn_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -bn_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -bn_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -bn_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -bn_err.o: bn_err.c -bn_exp.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h -bn_exp.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_exp.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_exp.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bn_exp.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bn_exp.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bn_exp.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_exp.c bn_lcl.h -bn_exp2.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h -bn_exp2.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_exp2.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_exp2.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bn_exp2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bn_exp2.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bn_exp2.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_exp2.c bn_lcl.h -bn_gcd.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h -bn_gcd.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_gcd.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_gcd.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bn_gcd.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bn_gcd.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bn_gcd.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_gcd.c bn_lcl.h -bn_gf2m.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h -bn_gf2m.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_gf2m.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_gf2m.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bn_gf2m.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bn_gf2m.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bn_gf2m.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_gf2m.c bn_lcl.h -bn_kron.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h -bn_kron.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_kron.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_kron.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bn_kron.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bn_kron.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bn_kron.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_kron.c bn_lcl.h -bn_lib.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h -bn_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_lib.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bn_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bn_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bn_lib.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_lcl.h bn_lib.c -bn_mod.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h -bn_mod.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_mod.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_mod.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bn_mod.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bn_mod.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bn_mod.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_lcl.h bn_mod.c -bn_mont.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h -bn_mont.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_mont.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_mont.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bn_mont.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bn_mont.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bn_mont.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_lcl.h bn_mont.c -bn_mpi.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h -bn_mpi.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_mpi.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_mpi.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bn_mpi.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bn_mpi.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bn_mpi.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_lcl.h bn_mpi.c -bn_mul.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h -bn_mul.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_mul.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_mul.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bn_mul.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bn_mul.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bn_mul.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_lcl.h bn_mul.c -bn_nist.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h -bn_nist.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_nist.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_nist.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bn_nist.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bn_nist.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bn_nist.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_lcl.h bn_nist.c -bn_prime.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h -bn_prime.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_prime.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_prime.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bn_prime.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bn_prime.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -bn_prime.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -bn_prime.o: ../cryptlib.h bn_lcl.h bn_prime.c bn_prime.h -bn_print.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h -bn_print.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_print.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_print.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bn_print.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bn_print.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bn_print.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_lcl.h bn_print.c -bn_rand.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h -bn_rand.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_rand.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_rand.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bn_rand.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bn_rand.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -bn_rand.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -bn_rand.o: ../cryptlib.h bn_lcl.h bn_rand.c -bn_recp.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h -bn_recp.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_recp.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_recp.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bn_recp.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bn_recp.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bn_recp.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_lcl.h bn_recp.c -bn_shift.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h -bn_shift.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_shift.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_shift.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bn_shift.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bn_shift.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bn_shift.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_lcl.h bn_shift.c -bn_sqr.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h -bn_sqr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_sqr.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_sqr.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bn_sqr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bn_sqr.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bn_sqr.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_lcl.h bn_sqr.c -bn_sqrt.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h -bn_sqrt.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_sqrt.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_sqrt.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bn_sqrt.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bn_sqrt.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bn_sqrt.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_lcl.h bn_sqrt.c -bn_word.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h -bn_word.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_word.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_word.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -bn_word.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bn_word.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bn_word.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_lcl.h bn_word.c -bn_x931p.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h -bn_x931p.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -bn_x931p.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bn_x931p.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bn_x931p.o: ../../include/openssl/symhacks.h bn_x931p.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/buffer/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/buffer/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/buffer/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/buffer/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,97 +0,0 @@ -# -# OpenSSL/crypto/buffer/Makefile -# - -DIR= buffer -TOP= ../.. -CC= cc -INCLUDES= -I.. -I$(TOP) -I../../include -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile -TEST= -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC= buffer.c buf_str.c buf_err.c -LIBOBJ= buffer.o buf_str.o buf_err.o - -SRC= $(LIBSRC) - -EXHEADER= buffer.h -HEADER= $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -buf_err.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -buf_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -buf_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -buf_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -buf_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -buf_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -buf_err.o: buf_err.c -buf_str.o: ../../e_os.h ../../include/openssl/bio.h -buf_str.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -buf_str.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -buf_str.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -buf_str.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -buf_str.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -buf_str.o: ../../include/openssl/symhacks.h ../cryptlib.h buf_str.c -buffer.o: ../../e_os.h ../../include/openssl/bio.h -buffer.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -buffer.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -buffer.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -buffer.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -buffer.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -buffer.o: ../../include/openssl/symhacks.h ../cryptlib.h buffer.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/camellia/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/camellia/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/camellia/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/camellia/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,110 +0,0 @@ -# -# crypto/camellia/Makefile -# - -DIR= camellia -TOP= ../.. -CC= cc -CPP= $(CC) -E -INCLUDES= -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -CMLL_ENC= camellia.o cmll_misc.o cmll_cbc.o - -CFLAGS= $(INCLUDES) $(CFLAG) -ASFLAGS= $(INCLUDES) $(ASFLAG) -AFLAGS= $(ASFLAGS) - -GENERAL=Makefile -#TEST=camelliatest.c -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC=camellia.c cmll_misc.c cmll_ecb.c cmll_cbc.c cmll_ofb.c \ - cmll_cfb.c cmll_ctr.c cmll_utl.c - -LIBOBJ= cmll_ecb.o cmll_ofb.o cmll_cfb.o cmll_ctr.o cmll_utl.o $(CMLL_ENC) - -SRC= $(LIBSRC) - -EXHEADER= camellia.h -HEADER= cmll_locl.h $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -cmll-x86.s: asm/cmll-x86.pl ../perlasm/x86asm.pl - $(PERL) asm/cmll-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@ -cmll-x86_64.s: asm/cmll-x86_64.pl - $(PERL) asm/cmll-x86_64.pl $(PERLASM_SCHEME) > $@ - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -camellia.o: ../../include/openssl/opensslconf.h camellia.c camellia.h -camellia.o: cmll_locl.h -cmll_cbc.o: ../../include/openssl/camellia.h ../../include/openssl/modes.h -cmll_cbc.o: ../../include/openssl/opensslconf.h cmll_cbc.c -cmll_cfb.o: ../../include/openssl/camellia.h ../../include/openssl/modes.h -cmll_cfb.o: ../../include/openssl/opensslconf.h cmll_cfb.c -cmll_ctr.o: ../../include/openssl/camellia.h ../../include/openssl/modes.h -cmll_ctr.o: ../../include/openssl/opensslconf.h cmll_ctr.c -cmll_ecb.o: ../../include/openssl/camellia.h -cmll_ecb.o: ../../include/openssl/opensslconf.h cmll_ecb.c cmll_locl.h -cmll_misc.o: ../../include/openssl/camellia.h ../../include/openssl/crypto.h -cmll_misc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -cmll_misc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -cmll_misc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -cmll_misc.o: ../../include/openssl/symhacks.h cmll_locl.h cmll_misc.c -cmll_ofb.o: ../../include/openssl/camellia.h ../../include/openssl/modes.h -cmll_ofb.o: ../../include/openssl/opensslconf.h cmll_ofb.c -cmll_utl.o: ../../include/openssl/camellia.h ../../include/openssl/crypto.h -cmll_utl.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -cmll_utl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -cmll_utl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -cmll_utl.o: ../../include/openssl/symhacks.h cmll_locl.h cmll_utl.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/cast/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/cast/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/cast/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/cast/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,102 +0,0 @@ -# -# OpenSSL/crypto/cast/Makefile -# - -DIR= cast -TOP= ../.. -CC= cc -CPP= $(CC) -E -INCLUDES= -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -CAST_ENC=c_enc.o - -CFLAGS= $(INCLUDES) $(CFLAG) -ASFLAGS= $(INCLUDES) $(ASFLAG) -AFLAGS= $(ASFLAGS) - -GENERAL=Makefile -TEST=casttest.c -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC=c_skey.c c_ecb.c c_enc.c c_cfb64.c c_ofb64.c -LIBOBJ=c_skey.o c_ecb.o $(CAST_ENC) c_cfb64.o c_ofb64.o - -SRC= $(LIBSRC) - -EXHEADER= cast.h -HEADER= cast_s.h cast_lcl.h $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -cast-586.s: asm/cast-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl - $(PERL) asm/cast-586.pl $(PERLASM_SCHEME) $(CLAGS) $(PROCESSOR) > $@ - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -c_cfb64.o: ../../e_os.h ../../include/openssl/cast.h -c_cfb64.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -c_cfb64.o: c_cfb64.c cast_lcl.h -c_ecb.o: ../../e_os.h ../../include/openssl/cast.h -c_ecb.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -c_ecb.o: ../../include/openssl/opensslv.h c_ecb.c cast_lcl.h -c_enc.o: ../../e_os.h ../../include/openssl/cast.h -c_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -c_enc.o: c_enc.c cast_lcl.h -c_ofb64.o: ../../e_os.h ../../include/openssl/cast.h -c_ofb64.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -c_ofb64.o: c_ofb64.c cast_lcl.h -c_skey.o: ../../e_os.h ../../include/openssl/cast.h -c_skey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -c_skey.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -c_skey.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -c_skey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -c_skey.o: c_skey.c cast_lcl.h cast_s.h diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/cmac/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/cmac/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/cmac/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/cmac/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,111 +0,0 @@ -# -# OpenSSL/crypto/cmac/Makefile -# - -DIR= cmac -TOP= ../.. -CC= cc -INCLUDES= -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile -TEST= -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC=cmac.c cm_ameth.c cm_pmeth.c -LIBOBJ=cmac.o cm_ameth.o cm_pmeth.o - -SRC= $(LIBSRC) - -EXHEADER= cmac.h -HEADER= $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -cm_ameth.o: ../../e_os.h ../../include/openssl/asn1.h -cm_ameth.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -cm_ameth.o: ../../include/openssl/cmac.h ../../include/openssl/crypto.h -cm_ameth.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -cm_ameth.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -cm_ameth.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -cm_ameth.o: ../../include/openssl/opensslconf.h -cm_ameth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -cm_ameth.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -cm_ameth.o: ../../include/openssl/symhacks.h ../asn1/asn1_locl.h ../cryptlib.h -cm_ameth.o: cm_ameth.c -cm_pmeth.o: ../../e_os.h ../../include/openssl/asn1.h -cm_pmeth.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -cm_pmeth.o: ../../include/openssl/cmac.h ../../include/openssl/conf.h -cm_pmeth.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -cm_pmeth.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -cm_pmeth.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -cm_pmeth.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -cm_pmeth.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -cm_pmeth.o: ../../include/openssl/opensslconf.h -cm_pmeth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -cm_pmeth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -cm_pmeth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -cm_pmeth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -cm_pmeth.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -cm_pmeth.o: ../cryptlib.h ../evp/evp_locl.h cm_pmeth.c -cmac.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -cmac.o: ../../include/openssl/buffer.h ../../include/openssl/cmac.h -cmac.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -cmac.o: ../../include/openssl/err.h ../../include/openssl/evp.h -cmac.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -cmac.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -cmac.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -cmac.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -cmac.o: ../../include/openssl/symhacks.h ../cryptlib.h cmac.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/cms/cms_env.c nodejs-0.10.29/deps/openssl/openssl/crypto/cms/cms_env.c --- nodejs-0.10.28/deps/openssl/openssl/crypto/cms/cms_env.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/cms/cms_env.c 2014-06-09 17:04:36.000000000 +0000 @@ -185,6 +185,8 @@ if (flags & CMS_USE_KEYID) { ktri->version = 2; + if (env->version < 2) + env->version = 2; type = CMS_RECIPINFO_KEYIDENTIFIER; } else diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/cms/cms_sd.c nodejs-0.10.29/deps/openssl/openssl/crypto/cms/cms_sd.c --- nodejs-0.10.28/deps/openssl/openssl/crypto/cms/cms_sd.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/cms/cms_sd.c 2014-06-09 17:04:36.000000000 +0000 @@ -158,8 +158,8 @@ if (sd->version < 3) sd->version = 3; } - else - sd->version = 1; + else if (si->version < 1) + si->version = 1; } if (sd->version < 1) diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/cms/cms_smime.c nodejs-0.10.29/deps/openssl/openssl/crypto/cms/cms_smime.c --- nodejs-0.10.28/deps/openssl/openssl/crypto/cms/cms_smime.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/cms/cms_smime.c 2014-06-09 17:04:36.000000000 +0000 @@ -611,7 +611,7 @@ STACK_OF(CMS_RecipientInfo) *ris; CMS_RecipientInfo *ri; int i, r; - int debug = 0; + int debug = 0, ri_match = 0; ris = CMS_get0_RecipientInfos(cms); if (ris) debug = cms->d.envelopedData->encryptedContentInfo->debug; @@ -620,6 +620,7 @@ ri = sk_CMS_RecipientInfo_value(ris, i); if (CMS_RecipientInfo_type(ri) != CMS_RECIPINFO_TRANS) continue; + ri_match = 1; /* If we have a cert try matching RecipientInfo * otherwise try them all. */ @@ -655,7 +656,7 @@ } } /* If no cert and not debugging always return success */ - if (!cert && !debug) + if (ri_match && !cert && !debug) { ERR_clear_error(); return 1; diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/cms/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/cms/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/cms/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/cms/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,284 +0,0 @@ -# -# OpenSSL/crypto/cms/Makefile -# - -DIR= cms -TOP= ../.. -CC= cc -INCLUDES= -I.. -I$(TOP) -I../../include -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile -TEST= -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC= cms_lib.c cms_asn1.c cms_att.c cms_io.c cms_smime.c cms_err.c \ - cms_sd.c cms_dd.c cms_cd.c cms_env.c cms_enc.c cms_ess.c \ - cms_pwri.c -LIBOBJ= cms_lib.o cms_asn1.o cms_att.o cms_io.o cms_smime.o cms_err.o \ - cms_sd.o cms_dd.o cms_cd.o cms_env.o cms_enc.o cms_ess.o \ - cms_pwri.o - -SRC= $(LIBSRC) - -EXHEADER= cms.h -HEADER= cms_lcl.h $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -test: - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -cms_asn1.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h -cms_asn1.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -cms_asn1.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -cms_asn1.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -cms_asn1.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -cms_asn1.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -cms_asn1.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -cms_asn1.o: ../../include/openssl/opensslconf.h -cms_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -cms_asn1.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h -cms_asn1.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -cms_asn1.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -cms_asn1.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -cms_asn1.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -cms_asn1.o: cms.h cms_asn1.c cms_lcl.h -cms_att.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h -cms_att.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -cms_att.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -cms_att.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -cms_att.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -cms_att.o: ../../include/openssl/err.h ../../include/openssl/evp.h -cms_att.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -cms_att.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -cms_att.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -cms_att.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h -cms_att.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -cms_att.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -cms_att.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -cms_att.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -cms_att.o: cms.h cms_att.c cms_lcl.h -cms_cd.o: ../../e_os.h ../../include/openssl/asn1.h -cms_cd.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -cms_cd.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h -cms_cd.o: ../../include/openssl/comp.h ../../include/openssl/conf.h -cms_cd.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -cms_cd.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -cms_cd.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -cms_cd.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -cms_cd.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -cms_cd.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -cms_cd.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h -cms_cd.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h -cms_cd.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -cms_cd.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -cms_cd.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -cms_cd.o: ../../include/openssl/x509v3.h ../cryptlib.h cms_cd.c cms_lcl.h -cms_dd.o: ../../e_os.h ../../include/openssl/asn1.h -cms_dd.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -cms_dd.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h -cms_dd.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -cms_dd.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -cms_dd.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -cms_dd.o: ../../include/openssl/err.h ../../include/openssl/evp.h -cms_dd.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -cms_dd.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -cms_dd.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -cms_dd.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h -cms_dd.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -cms_dd.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -cms_dd.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -cms_dd.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -cms_dd.o: ../cryptlib.h cms_dd.c cms_lcl.h -cms_enc.o: ../../e_os.h ../../include/openssl/asn1.h -cms_enc.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -cms_enc.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h -cms_enc.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -cms_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -cms_enc.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -cms_enc.o: ../../include/openssl/err.h ../../include/openssl/evp.h -cms_enc.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -cms_enc.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -cms_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -cms_enc.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h -cms_enc.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -cms_enc.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -cms_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -cms_enc.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -cms_enc.o: ../../include/openssl/x509v3.h ../cryptlib.h cms_enc.c cms_lcl.h -cms_env.o: ../../e_os.h ../../include/openssl/aes.h -cms_env.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h -cms_env.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -cms_env.o: ../../include/openssl/cms.h ../../include/openssl/conf.h -cms_env.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -cms_env.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -cms_env.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -cms_env.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -cms_env.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -cms_env.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -cms_env.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h -cms_env.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h -cms_env.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -cms_env.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -cms_env.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -cms_env.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -cms_env.o: ../asn1/asn1_locl.h ../cryptlib.h cms_env.c cms_lcl.h -cms_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -cms_err.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h -cms_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -cms_err.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -cms_err.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -cms_err.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -cms_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -cms_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -cms_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -cms_err.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -cms_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -cms_err.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -cms_err.o: cms_err.c -cms_ess.o: ../../e_os.h ../../include/openssl/asn1.h -cms_ess.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -cms_ess.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h -cms_ess.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -cms_ess.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -cms_ess.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -cms_ess.o: ../../include/openssl/err.h ../../include/openssl/evp.h -cms_ess.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -cms_ess.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -cms_ess.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -cms_ess.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h -cms_ess.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -cms_ess.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -cms_ess.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -cms_ess.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -cms_ess.o: ../../include/openssl/x509v3.h ../cryptlib.h cms_ess.c cms_lcl.h -cms_io.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h -cms_io.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -cms_io.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -cms_io.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -cms_io.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -cms_io.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -cms_io.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -cms_io.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -cms_io.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h -cms_io.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h -cms_io.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -cms_io.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -cms_io.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h cms.h -cms_io.o: cms_io.c cms_lcl.h -cms_lib.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h -cms_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -cms_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -cms_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -cms_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -cms_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -cms_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -cms_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -cms_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h -cms_lib.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h -cms_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -cms_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -cms_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h cms.h -cms_lib.o: cms_lcl.h cms_lib.c -cms_pwri.o: ../../e_os.h ../../include/openssl/aes.h -cms_pwri.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h -cms_pwri.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -cms_pwri.o: ../../include/openssl/cms.h ../../include/openssl/conf.h -cms_pwri.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -cms_pwri.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -cms_pwri.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -cms_pwri.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -cms_pwri.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -cms_pwri.o: ../../include/openssl/opensslconf.h -cms_pwri.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -cms_pwri.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h -cms_pwri.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -cms_pwri.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -cms_pwri.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -cms_pwri.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -cms_pwri.o: ../../include/openssl/x509v3.h ../asn1/asn1_locl.h ../cryptlib.h -cms_pwri.o: cms_lcl.h cms_pwri.c -cms_sd.o: ../../e_os.h ../../include/openssl/asn1.h -cms_sd.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -cms_sd.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h -cms_sd.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -cms_sd.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -cms_sd.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -cms_sd.o: ../../include/openssl/err.h ../../include/openssl/evp.h -cms_sd.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -cms_sd.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -cms_sd.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -cms_sd.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h -cms_sd.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -cms_sd.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -cms_sd.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -cms_sd.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -cms_sd.o: ../asn1/asn1_locl.h ../cryptlib.h cms_lcl.h cms_sd.c -cms_smime.o: ../../e_os.h ../../include/openssl/asn1.h -cms_smime.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -cms_smime.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h -cms_smime.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -cms_smime.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -cms_smime.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -cms_smime.o: ../../include/openssl/err.h ../../include/openssl/evp.h -cms_smime.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -cms_smime.o: ../../include/openssl/objects.h -cms_smime.o: ../../include/openssl/opensslconf.h -cms_smime.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -cms_smime.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -cms_smime.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -cms_smime.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -cms_smime.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -cms_smime.o: ../cryptlib.h cms_lcl.h cms_smime.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/comp/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/comp/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/comp/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/comp/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,108 +0,0 @@ -# -# OpenSSL/crypto/comp/Makefile -# - -DIR= comp -TOP= ../.. -CC= cc -INCLUDES= -I.. -I$(TOP) -I../../include -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile -TEST= -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC= comp_lib.c comp_err.c \ - c_rle.c c_zlib.c - -LIBOBJ= comp_lib.o comp_err.o \ - c_rle.o c_zlib.o - -SRC= $(LIBSRC) - -EXHEADER= comp.h -HEADER= $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -c_rle.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -c_rle.o: ../../include/openssl/comp.h ../../include/openssl/crypto.h -c_rle.o: ../../include/openssl/e_os2.h ../../include/openssl/obj_mac.h -c_rle.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -c_rle.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -c_rle.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -c_rle.o: ../../include/openssl/symhacks.h c_rle.c -c_zlib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -c_zlib.o: ../../include/openssl/comp.h ../../include/openssl/crypto.h -c_zlib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -c_zlib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -c_zlib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -c_zlib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -c_zlib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -c_zlib.o: ../../include/openssl/symhacks.h c_zlib.c -comp_err.o: ../../include/openssl/bio.h ../../include/openssl/comp.h -comp_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -comp_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -comp_err.o: ../../include/openssl/opensslconf.h -comp_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -comp_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -comp_err.o: ../../include/openssl/symhacks.h comp_err.c -comp_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -comp_lib.o: ../../include/openssl/comp.h ../../include/openssl/crypto.h -comp_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/obj_mac.h -comp_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -comp_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -comp_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -comp_lib.o: ../../include/openssl/symhacks.h comp_lib.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/conf/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/conf/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/conf/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/conf/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,152 +0,0 @@ -# -# OpenSSL/crypto/conf/Makefile -# - -DIR= conf -TOP= ../.. -CC= cc -INCLUDES= -I.. -I$(TOP) -I../../include -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile -TEST= -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC= conf_err.c conf_lib.c conf_api.c conf_def.c conf_mod.c \ - conf_mall.c conf_sap.c - -LIBOBJ= conf_err.o conf_lib.o conf_api.o conf_def.o conf_mod.o \ - conf_mall.o conf_sap.o - -SRC= $(LIBSRC) - -EXHEADER= conf.h conf_api.h -HEADER= conf_def.h $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -conf_api.o: ../../e_os.h ../../include/openssl/bio.h -conf_api.o: ../../include/openssl/conf.h ../../include/openssl/conf_api.h -conf_api.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -conf_api.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -conf_api.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -conf_api.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -conf_api.o: ../../include/openssl/symhacks.h conf_api.c -conf_def.o: ../../e_os.h ../../include/openssl/bio.h -conf_def.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h -conf_def.o: ../../include/openssl/conf_api.h ../../include/openssl/crypto.h -conf_def.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -conf_def.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -conf_def.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -conf_def.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -conf_def.o: ../../include/openssl/symhacks.h ../cryptlib.h conf_def.c -conf_def.o: conf_def.h -conf_err.o: ../../include/openssl/bio.h ../../include/openssl/conf.h -conf_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -conf_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -conf_err.o: ../../include/openssl/opensslconf.h -conf_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -conf_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -conf_err.o: ../../include/openssl/symhacks.h conf_err.c -conf_lib.o: ../../include/openssl/bio.h ../../include/openssl/conf.h -conf_lib.o: ../../include/openssl/conf_api.h ../../include/openssl/crypto.h -conf_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -conf_lib.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -conf_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -conf_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -conf_lib.o: ../../include/openssl/symhacks.h conf_lib.c -conf_mall.o: ../../e_os.h ../../include/openssl/asn1.h -conf_mall.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -conf_mall.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -conf_mall.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h -conf_mall.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -conf_mall.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -conf_mall.o: ../../include/openssl/err.h ../../include/openssl/evp.h -conf_mall.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -conf_mall.o: ../../include/openssl/objects.h -conf_mall.o: ../../include/openssl/opensslconf.h -conf_mall.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -conf_mall.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -conf_mall.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -conf_mall.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -conf_mall.o: ../../include/openssl/x509_vfy.h ../cryptlib.h conf_mall.c -conf_mod.o: ../../e_os.h ../../include/openssl/asn1.h -conf_mod.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -conf_mod.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -conf_mod.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h -conf_mod.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -conf_mod.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -conf_mod.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -conf_mod.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -conf_mod.o: ../../include/openssl/opensslconf.h -conf_mod.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -conf_mod.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -conf_mod.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -conf_mod.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -conf_mod.o: ../../include/openssl/x509_vfy.h ../cryptlib.h conf_mod.c -conf_sap.o: ../../e_os.h ../../include/openssl/asn1.h -conf_sap.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -conf_sap.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -conf_sap.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h -conf_sap.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -conf_sap.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -conf_sap.o: ../../include/openssl/err.h ../../include/openssl/evp.h -conf_sap.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -conf_sap.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -conf_sap.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -conf_sap.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -conf_sap.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -conf_sap.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -conf_sap.o: ../../include/openssl/x509_vfy.h ../cryptlib.h conf_sap.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/des/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/des/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/des/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/des/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,279 +0,0 @@ -# -# OpenSSL/crypto/des/Makefile -# - -DIR= des -TOP= ../.. -CC= cc -CPP= $(CC) -E -INCLUDES=-I$(TOP) -I../../include -CFLAG=-g -MAKEFILE= Makefile -AR= ar r -RANLIB= ranlib -DES_ENC= des_enc.o fcrypt_b.o - -CFLAGS= $(INCLUDES) $(CFLAG) -ASFLAGS= $(INCLUDES) $(ASFLAG) -AFLAGS= $(ASFLAGS) - -GENERAL=Makefile -TEST=destest.c -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC= cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c \ - ecb3_enc.c ecb_enc.c enc_read.c enc_writ.c \ - fcrypt.c ofb64enc.c ofb_enc.c pcbc_enc.c \ - qud_cksm.c rand_key.c rpc_enc.c set_key.c \ - des_enc.c fcrypt_b.c \ - xcbc_enc.c \ - str2key.c cfb64ede.c ofb64ede.c ede_cbcm_enc.c des_old.c des_old2.c \ - read2pwd.c - -LIBOBJ= set_key.o ecb_enc.o cbc_enc.o \ - ecb3_enc.o cfb64enc.o cfb64ede.o cfb_enc.o ofb64ede.o \ - enc_read.o enc_writ.o ofb64enc.o \ - ofb_enc.o str2key.o pcbc_enc.o qud_cksm.o rand_key.o \ - ${DES_ENC} \ - fcrypt.o xcbc_enc.o rpc_enc.o cbc_cksm.o \ - ede_cbcm_enc.o des_old.o des_old2.o read2pwd.o - -SRC= $(LIBSRC) - -EXHEADER= des.h des_old.h -HEADER= des_locl.h rpc_des.h spr.h des_ver.h $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -des: des.o cbc3_enc.o lib - $(CC) $(CFLAGS) -o des des.o cbc3_enc.o $(LIB) - -des_enc-sparc.S: asm/des_enc.m4 - m4 -B 8192 asm/des_enc.m4 > des_enc-sparc.S - -des-586.s: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl - $(PERL) asm/des-586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@ -crypt586.s: asm/crypt586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl - $(PERL) asm/crypt586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@ - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -# We need to use force because 'install' matches 'INSTALL' on case -# insensitive systems -FRC.install: -install: FRC.install - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.s *.o *.obj des lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -cbc_cksm.o: ../../include/openssl/des.h ../../include/openssl/des_old.h -cbc_cksm.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -cbc_cksm.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -cbc_cksm.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -cbc_cksm.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h -cbc_cksm.o: cbc_cksm.c des_locl.h -cbc_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h -cbc_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -cbc_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -cbc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -cbc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h -cbc_enc.o: cbc_enc.c des_locl.h ncbc_enc.c -cfb64ede.o: ../../e_os.h ../../include/openssl/des.h -cfb64ede.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h -cfb64ede.o: ../../include/openssl/opensslconf.h -cfb64ede.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -cfb64ede.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -cfb64ede.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h -cfb64ede.o: cfb64ede.c des_locl.h -cfb64enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h -cfb64enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -cfb64enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -cfb64enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -cfb64enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h -cfb64enc.o: cfb64enc.c des_locl.h -cfb_enc.o: ../../e_os.h ../../include/openssl/des.h -cfb_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h -cfb_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/ossl_typ.h -cfb_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -cfb_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h -cfb_enc.o: ../../include/openssl/ui_compat.h cfb_enc.c des_locl.h -des_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h -des_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -des_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -des_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -des_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h -des_enc.o: des_enc.c des_locl.h ncbc_enc.c spr.h -des_old.o: ../../include/openssl/des.h ../../include/openssl/des_old.h -des_old.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -des_old.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h -des_old.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -des_old.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h -des_old.o: ../../include/openssl/ui_compat.h des_old.c -des_old2.o: ../../include/openssl/des.h ../../include/openssl/des_old.h -des_old2.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -des_old2.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h -des_old2.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -des_old2.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h -des_old2.o: ../../include/openssl/ui_compat.h des_old2.c -ecb3_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h -ecb3_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -ecb3_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -ecb3_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -ecb3_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h -ecb3_enc.o: des_locl.h ecb3_enc.c -ecb_enc.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h -ecb_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h -ecb_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -ecb_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ecb_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -ecb_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h -ecb_enc.o: ../../include/openssl/ui_compat.h des_locl.h des_ver.h ecb_enc.c -ede_cbcm_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h -ede_cbcm_enc.o: ../../include/openssl/e_os2.h -ede_cbcm_enc.o: ../../include/openssl/opensslconf.h -ede_cbcm_enc.o: ../../include/openssl/ossl_typ.h -ede_cbcm_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -ede_cbcm_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h -ede_cbcm_enc.o: ../../include/openssl/ui_compat.h des_locl.h ede_cbcm_enc.c -enc_read.o: ../../e_os.h ../../include/openssl/bio.h -enc_read.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -enc_read.o: ../../include/openssl/des.h ../../include/openssl/des_old.h -enc_read.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -enc_read.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -enc_read.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -enc_read.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -enc_read.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h -enc_read.o: ../../include/openssl/ui_compat.h ../cryptlib.h des_locl.h -enc_read.o: enc_read.c -enc_writ.o: ../../e_os.h ../../include/openssl/bio.h -enc_writ.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -enc_writ.o: ../../include/openssl/des.h ../../include/openssl/des_old.h -enc_writ.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -enc_writ.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -enc_writ.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -enc_writ.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -enc_writ.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -enc_writ.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h -enc_writ.o: ../cryptlib.h des_locl.h enc_writ.c -fcrypt.o: ../../include/openssl/des.h ../../include/openssl/des_old.h -fcrypt.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -fcrypt.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -fcrypt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -fcrypt.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h -fcrypt.o: des_locl.h fcrypt.c -fcrypt_b.o: ../../include/openssl/des.h ../../include/openssl/des_old.h -fcrypt_b.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -fcrypt_b.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -fcrypt_b.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -fcrypt_b.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h -fcrypt_b.o: des_locl.h fcrypt_b.c -ofb64ede.o: ../../include/openssl/des.h ../../include/openssl/des_old.h -ofb64ede.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -ofb64ede.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -ofb64ede.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -ofb64ede.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h -ofb64ede.o: des_locl.h ofb64ede.c -ofb64enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h -ofb64enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -ofb64enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -ofb64enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -ofb64enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h -ofb64enc.o: des_locl.h ofb64enc.c -ofb_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h -ofb_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -ofb_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -ofb_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -ofb_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h -ofb_enc.o: des_locl.h ofb_enc.c -pcbc_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h -pcbc_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -pcbc_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -pcbc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -pcbc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h -pcbc_enc.o: des_locl.h pcbc_enc.c -qud_cksm.o: ../../include/openssl/des.h ../../include/openssl/des_old.h -qud_cksm.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -qud_cksm.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -qud_cksm.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -qud_cksm.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h -qud_cksm.o: des_locl.h qud_cksm.c -rand_key.o: ../../include/openssl/des.h ../../include/openssl/des_old.h -rand_key.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -rand_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h -rand_key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -rand_key.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h -rand_key.o: ../../include/openssl/ui_compat.h rand_key.c -read2pwd.o: ../../include/openssl/crypto.h ../../include/openssl/des.h -read2pwd.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h -read2pwd.o: ../../include/openssl/opensslconf.h -read2pwd.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -read2pwd.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -read2pwd.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h -read2pwd.o: ../../include/openssl/ui_compat.h read2pwd.c -rpc_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h -rpc_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -rpc_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -rpc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -rpc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h -rpc_enc.o: des_locl.h des_ver.h rpc_des.h rpc_enc.c -set_key.o: ../../include/openssl/crypto.h ../../include/openssl/des.h -set_key.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h -set_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -set_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -set_key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -set_key.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h -set_key.o: des_locl.h set_key.c -str2key.o: ../../include/openssl/crypto.h ../../include/openssl/des.h -str2key.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h -str2key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -str2key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -str2key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -str2key.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h -str2key.o: des_locl.h str2key.c -xcbc_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h -xcbc_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -xcbc_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -xcbc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -xcbc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h -xcbc_enc.o: des_locl.h xcbc_enc.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/dh/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/dh/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/dh/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/dh/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,180 +0,0 @@ -# -# OpenSSL/crypto/dh/Makefile -# - -DIR= dh -TOP= ../.. -CC= cc -INCLUDES= -I.. -I$(TOP) -I../../include -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile -TEST= dhtest.c -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC= dh_asn1.c dh_gen.c dh_key.c dh_lib.c dh_check.c dh_err.c dh_depr.c \ - dh_ameth.c dh_pmeth.c dh_prn.c -LIBOBJ= dh_asn1.o dh_gen.o dh_key.o dh_lib.o dh_check.o dh_err.o dh_depr.o \ - dh_ameth.o dh_pmeth.o dh_prn.o - -SRC= $(LIBSRC) - -EXHEADER= dh.h -HEADER= $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -dh_ameth.o: ../../e_os.h ../../include/openssl/asn1.h -dh_ameth.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -dh_ameth.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -dh_ameth.o: ../../include/openssl/dh.h ../../include/openssl/e_os2.h -dh_ameth.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -dh_ameth.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -dh_ameth.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -dh_ameth.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -dh_ameth.o: ../../include/openssl/opensslconf.h -dh_ameth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -dh_ameth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -dh_ameth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -dh_ameth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -dh_ameth.o: ../../include/openssl/x509_vfy.h ../asn1/asn1_locl.h ../cryptlib.h -dh_ameth.o: dh_ameth.c -dh_asn1.o: ../../e_os.h ../../include/openssl/asn1.h -dh_asn1.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -dh_asn1.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -dh_asn1.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h -dh_asn1.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -dh_asn1.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -dh_asn1.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -dh_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -dh_asn1.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -dh_asn1.o: ../../include/openssl/symhacks.h ../cryptlib.h dh_asn1.c -dh_check.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h -dh_check.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -dh_check.o: ../../include/openssl/dh.h ../../include/openssl/e_os2.h -dh_check.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -dh_check.o: ../../include/openssl/opensslconf.h -dh_check.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -dh_check.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -dh_check.o: ../../include/openssl/symhacks.h ../cryptlib.h dh_check.c -dh_depr.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h -dh_depr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -dh_depr.o: ../../include/openssl/dh.h ../../include/openssl/e_os2.h -dh_depr.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -dh_depr.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -dh_depr.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -dh_depr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -dh_depr.o: ../cryptlib.h dh_depr.c -dh_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h -dh_err.o: ../../include/openssl/dh.h ../../include/openssl/e_os2.h -dh_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -dh_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -dh_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -dh_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -dh_err.o: dh_err.c -dh_gen.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h -dh_gen.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -dh_gen.o: ../../include/openssl/dh.h ../../include/openssl/e_os2.h -dh_gen.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -dh_gen.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -dh_gen.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -dh_gen.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -dh_gen.o: ../cryptlib.h dh_gen.c -dh_key.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h -dh_key.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -dh_key.o: ../../include/openssl/dh.h ../../include/openssl/e_os2.h -dh_key.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -dh_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -dh_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h -dh_key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -dh_key.o: ../../include/openssl/symhacks.h ../cryptlib.h dh_key.c -dh_lib.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -dh_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -dh_lib.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h -dh_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -dh_lib.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -dh_lib.o: ../../include/openssl/engine.h ../../include/openssl/err.h -dh_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -dh_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -dh_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -dh_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -dh_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -dh_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -dh_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -dh_lib.o: ../cryptlib.h dh_lib.c -dh_pmeth.o: ../../e_os.h ../../include/openssl/asn1.h -dh_pmeth.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -dh_pmeth.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -dh_pmeth.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h -dh_pmeth.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -dh_pmeth.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -dh_pmeth.o: ../../include/openssl/err.h ../../include/openssl/evp.h -dh_pmeth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -dh_pmeth.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -dh_pmeth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -dh_pmeth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -dh_pmeth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -dh_pmeth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -dh_pmeth.o: ../../include/openssl/x509_vfy.h ../cryptlib.h ../evp/evp_locl.h -dh_pmeth.o: dh_pmeth.c -dh_prn.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -dh_prn.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -dh_prn.o: ../../include/openssl/dh.h ../../include/openssl/e_os2.h -dh_prn.o: ../../include/openssl/err.h ../../include/openssl/evp.h -dh_prn.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -dh_prn.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -dh_prn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -dh_prn.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -dh_prn.o: ../../include/openssl/symhacks.h ../cryptlib.h dh_prn.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/dsa/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/dsa/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/dsa/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/dsa/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,209 +0,0 @@ -# -# OpenSSL/crypto/dsa/Makefile -# - -DIR= dsa -TOP= ../.. -CC= cc -INCLUDES= -I.. -I$(TOP) -I../../include -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile -TEST=dsatest.c -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC= dsa_gen.c dsa_key.c dsa_lib.c dsa_asn1.c dsa_vrf.c dsa_sign.c \ - dsa_err.c dsa_ossl.c dsa_depr.c dsa_ameth.c dsa_pmeth.c dsa_prn.c -LIBOBJ= dsa_gen.o dsa_key.o dsa_lib.o dsa_asn1.o dsa_vrf.o dsa_sign.o \ - dsa_err.o dsa_ossl.o dsa_depr.o dsa_ameth.o dsa_pmeth.o dsa_prn.o - -SRC= $(LIBSRC) - -EXHEADER= dsa.h -HEADER= dsa_locl.h $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -dsa_ameth.o: ../../e_os.h ../../include/openssl/asn1.h -dsa_ameth.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -dsa_ameth.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h -dsa_ameth.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h -dsa_ameth.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -dsa_ameth.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -dsa_ameth.o: ../../include/openssl/err.h ../../include/openssl/evp.h -dsa_ameth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -dsa_ameth.o: ../../include/openssl/objects.h -dsa_ameth.o: ../../include/openssl/opensslconf.h -dsa_ameth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -dsa_ameth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -dsa_ameth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -dsa_ameth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -dsa_ameth.o: ../../include/openssl/x509_vfy.h ../asn1/asn1_locl.h ../cryptlib.h -dsa_ameth.o: dsa_ameth.c -dsa_asn1.o: ../../e_os.h ../../include/openssl/asn1.h -dsa_asn1.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -dsa_asn1.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -dsa_asn1.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h -dsa_asn1.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -dsa_asn1.o: ../../include/openssl/opensslconf.h -dsa_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -dsa_asn1.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -dsa_asn1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -dsa_asn1.o: ../cryptlib.h dsa_asn1.c -dsa_depr.o: ../../e_os.h ../../include/openssl/asn1.h -dsa_depr.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -dsa_depr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -dsa_depr.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h -dsa_depr.o: ../../include/openssl/err.h ../../include/openssl/evp.h -dsa_depr.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -dsa_depr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -dsa_depr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -dsa_depr.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -dsa_depr.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -dsa_depr.o: ../../include/openssl/symhacks.h ../cryptlib.h dsa_depr.c -dsa_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h -dsa_err.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h -dsa_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -dsa_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -dsa_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -dsa_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -dsa_err.o: dsa_err.c -dsa_gen.o: ../../e_os.h ../../include/openssl/asn1.h -dsa_gen.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -dsa_gen.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -dsa_gen.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h -dsa_gen.o: ../../include/openssl/err.h ../../include/openssl/evp.h -dsa_gen.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -dsa_gen.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -dsa_gen.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -dsa_gen.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -dsa_gen.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -dsa_gen.o: ../../include/openssl/symhacks.h ../cryptlib.h dsa_gen.c dsa_locl.h -dsa_key.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h -dsa_key.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -dsa_key.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h -dsa_key.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -dsa_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -dsa_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h -dsa_key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -dsa_key.o: ../../include/openssl/symhacks.h ../cryptlib.h dsa_key.c -dsa_lib.o: ../../e_os.h ../../include/openssl/asn1.h -dsa_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -dsa_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -dsa_lib.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h -dsa_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -dsa_lib.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -dsa_lib.o: ../../include/openssl/engine.h ../../include/openssl/err.h -dsa_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -dsa_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -dsa_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -dsa_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -dsa_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -dsa_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -dsa_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -dsa_lib.o: ../cryptlib.h dsa_lib.c -dsa_ossl.o: ../../e_os.h ../../include/openssl/asn1.h -dsa_ossl.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -dsa_ossl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -dsa_ossl.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h -dsa_ossl.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -dsa_ossl.o: ../../include/openssl/opensslconf.h -dsa_ossl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -dsa_ossl.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -dsa_ossl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -dsa_ossl.o: ../../include/openssl/symhacks.h ../cryptlib.h dsa_ossl.c -dsa_pmeth.o: ../../e_os.h ../../include/openssl/asn1.h -dsa_pmeth.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -dsa_pmeth.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -dsa_pmeth.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h -dsa_pmeth.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -dsa_pmeth.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -dsa_pmeth.o: ../../include/openssl/err.h ../../include/openssl/evp.h -dsa_pmeth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -dsa_pmeth.o: ../../include/openssl/objects.h -dsa_pmeth.o: ../../include/openssl/opensslconf.h -dsa_pmeth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -dsa_pmeth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -dsa_pmeth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -dsa_pmeth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -dsa_pmeth.o: ../../include/openssl/x509_vfy.h ../cryptlib.h ../evp/evp_locl.h -dsa_pmeth.o: dsa_locl.h dsa_pmeth.c -dsa_prn.o: ../../e_os.h ../../include/openssl/asn1.h -dsa_prn.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -dsa_prn.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h -dsa_prn.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -dsa_prn.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -dsa_prn.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -dsa_prn.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -dsa_prn.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -dsa_prn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -dsa_prn.o: ../cryptlib.h dsa_prn.c -dsa_sign.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h -dsa_sign.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -dsa_sign.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h -dsa_sign.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -dsa_sign.o: ../../include/openssl/opensslconf.h -dsa_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -dsa_sign.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -dsa_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -dsa_sign.o: ../cryptlib.h dsa_sign.c -dsa_vrf.o: ../../e_os.h ../../include/openssl/bio.h -dsa_vrf.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -dsa_vrf.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h -dsa_vrf.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -dsa_vrf.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -dsa_vrf.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -dsa_vrf.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -dsa_vrf.o: ../cryptlib.h dsa_vrf.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/dso/dso_dlfcn.c nodejs-0.10.29/deps/openssl/openssl/crypto/dso/dso_dlfcn.c --- nodejs-0.10.28/deps/openssl/openssl/crypto/dso/dso_dlfcn.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/dso/dso_dlfcn.c 2014-06-09 17:04:36.000000000 +0000 @@ -464,7 +464,7 @@ return len; } - ERR_add_error_data(4, "dlfcn_pathbyaddr(): ", dlerror()); + ERR_add_error_data(2, "dlfcn_pathbyaddr(): ", dlerror()); #endif return -1; } diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/dso/dso_vms.c nodejs-0.10.29/deps/openssl/openssl/crypto/dso/dso_vms.c --- nodejs-0.10.28/deps/openssl/openssl/crypto/dso/dso_vms.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/dso/dso_vms.c 2014-06-09 17:04:36.000000000 +0000 @@ -61,7 +61,14 @@ #include <errno.h> #include "cryptlib.h" #include <openssl/dso.h> -#ifdef OPENSSL_SYS_VMS + +#ifndef OPENSSL_SYS_VMS +DSO_METHOD *DSO_METHOD_vms(void) + { + return NULL; + } +#else + #pragma message disable DOLLARID #include <rms.h> #include <lib$routines.h> @@ -69,7 +76,6 @@ #include <descrip.h> #include <starlet.h> #include "vms_rms.h" -#endif /* Some compiler options may mask the declaration of "_malloc32". */ #if __INITIAL_POINTER_SIZE && defined _ANSI_C_SOURCE @@ -82,12 +88,6 @@ #endif /* __INITIAL_POINTER_SIZE && defined _ANSI_C_SOURCE */ -#ifndef OPENSSL_SYS_VMS -DSO_METHOD *DSO_METHOD_vms(void) - { - return NULL; - } -#else #pragma message disable DOLLARID static int vms_load(DSO *dso); diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/dso/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/dso/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/dso/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/dso/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,150 +0,0 @@ -# -# OpenSSL/crypto/dso/Makefile -# - -DIR= dso -TOP= ../.. -CC= cc -INCLUDES= -I.. -I$(TOP) -I../../include -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile -TEST= -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC= dso_dl.c dso_dlfcn.c dso_err.c dso_lib.c dso_null.c \ - dso_openssl.c dso_win32.c dso_vms.c dso_beos.c -LIBOBJ= dso_dl.o dso_dlfcn.o dso_err.o dso_lib.o dso_null.o \ - dso_openssl.o dso_win32.o dso_vms.o dso_beos.o - -SRC= $(LIBSRC) - -EXHEADER= dso.h -HEADER= $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -dso_beos.o: ../../e_os.h ../../include/openssl/bio.h -dso_beos.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -dso_beos.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h -dso_beos.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -dso_beos.o: ../../include/openssl/opensslconf.h -dso_beos.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -dso_beos.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -dso_beos.o: ../../include/openssl/symhacks.h ../cryptlib.h dso_beos.c -dso_dl.o: ../../e_os.h ../../include/openssl/bio.h -dso_dl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -dso_dl.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h -dso_dl.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -dso_dl.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -dso_dl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -dso_dl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -dso_dl.o: ../cryptlib.h dso_dl.c -dso_dlfcn.o: ../../e_os.h ../../include/openssl/bio.h -dso_dlfcn.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -dso_dlfcn.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h -dso_dlfcn.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -dso_dlfcn.o: ../../include/openssl/opensslconf.h -dso_dlfcn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -dso_dlfcn.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -dso_dlfcn.o: ../../include/openssl/symhacks.h ../cryptlib.h dso_dlfcn.c -dso_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h -dso_err.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h -dso_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -dso_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -dso_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -dso_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -dso_err.o: dso_err.c -dso_lib.o: ../../e_os.h ../../include/openssl/bio.h -dso_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -dso_lib.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h -dso_lib.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -dso_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -dso_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -dso_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -dso_lib.o: ../cryptlib.h dso_lib.c -dso_null.o: ../../e_os.h ../../include/openssl/bio.h -dso_null.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -dso_null.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h -dso_null.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -dso_null.o: ../../include/openssl/opensslconf.h -dso_null.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -dso_null.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -dso_null.o: ../../include/openssl/symhacks.h ../cryptlib.h dso_null.c -dso_openssl.o: ../../e_os.h ../../include/openssl/bio.h -dso_openssl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -dso_openssl.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h -dso_openssl.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -dso_openssl.o: ../../include/openssl/opensslconf.h -dso_openssl.o: ../../include/openssl/opensslv.h -dso_openssl.o: ../../include/openssl/ossl_typ.h -dso_openssl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -dso_openssl.o: ../../include/openssl/symhacks.h ../cryptlib.h dso_openssl.c -dso_vms.o: ../../e_os.h ../../include/openssl/bio.h -dso_vms.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -dso_vms.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h -dso_vms.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -dso_vms.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -dso_vms.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -dso_vms.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -dso_vms.o: ../cryptlib.h dso_vms.c -dso_win32.o: ../../e_os.h ../../include/openssl/bio.h -dso_win32.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -dso_win32.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h -dso_win32.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -dso_win32.o: ../../include/openssl/opensslconf.h -dso_win32.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -dso_win32.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -dso_win32.o: ../../include/openssl/symhacks.h ../cryptlib.h dso_win32.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/ec/ec_ameth.c nodejs-0.10.29/deps/openssl/openssl/crypto/ec/ec_ameth.c --- nodejs-0.10.28/deps/openssl/openssl/crypto/ec/ec_ameth.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/ec/ec_ameth.c 2014-06-09 17:04:36.000000000 +0000 @@ -352,6 +352,7 @@ EC_KEY_set_enc_flags(ec_key, old_flags); OPENSSL_free(ep); ECerr(EC_F_ECKEY_PRIV_ENCODE, ERR_R_EC_LIB); + return 0; } /* restore old encoding flags */ EC_KEY_set_enc_flags(ec_key, old_flags); diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/ec/ec_asn1.c nodejs-0.10.29/deps/openssl/openssl/crypto/ec/ec_asn1.c --- nodejs-0.10.28/deps/openssl/openssl/crypto/ec/ec_asn1.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/ec/ec_asn1.c 2014-06-09 17:04:36.000000000 +0000 @@ -1435,8 +1435,11 @@ *out, buf_len, NULL)) { ECerr(EC_F_I2O_ECPUBLICKEY, ERR_R_EC_LIB); - OPENSSL_free(*out); - *out = NULL; + if (new_buffer) + { + OPENSSL_free(*out); + *out = NULL; + } return 0; } if (!new_buffer) diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/ec/ec_lcl.h nodejs-0.10.29/deps/openssl/openssl/crypto/ec/ec_lcl.h --- nodejs-0.10.28/deps/openssl/openssl/crypto/ec/ec_lcl.h 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/ec/ec_lcl.h 2014-06-09 17:04:36.000000000 +0000 @@ -404,7 +404,7 @@ int ec_GF2m_precompute_mult(EC_GROUP *group, BN_CTX *ctx); int ec_GF2m_have_precompute_mult(const EC_GROUP *group); -#ifndef OPENSSL_EC_NISTP_64_GCC_128 +#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 /* method functions in ecp_nistp224.c */ int ec_GFp_nistp224_group_init(EC_GROUP *group); int ec_GFp_nistp224_group_set_curve(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a, const BIGNUM *n, BN_CTX *); diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/ec/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/ec/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/ec/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/ec/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,263 +0,0 @@ -# -# crypto/ec/Makefile -# - -DIR= ec -TOP= ../.. -CC= cc -INCLUDES= -I.. -I$(TOP) -I../../include -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile -TEST=ectest.c -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC= ec_lib.c ecp_smpl.c ecp_mont.c ecp_nist.c ec_cvt.c ec_mult.c\ - ec_err.c ec_curve.c ec_check.c ec_print.c ec_asn1.c ec_key.c\ - ec2_smpl.c ec2_mult.c ec_ameth.c ec_pmeth.c eck_prn.c \ - ecp_nistp224.c ecp_nistp256.c ecp_nistp521.c ecp_nistputil.c \ - ecp_oct.c ec2_oct.c ec_oct.c - -LIBOBJ= ec_lib.o ecp_smpl.o ecp_mont.o ecp_nist.o ec_cvt.o ec_mult.o\ - ec_err.o ec_curve.o ec_check.o ec_print.o ec_asn1.o ec_key.o\ - ec2_smpl.o ec2_mult.o ec_ameth.o ec_pmeth.o eck_prn.o \ - ecp_nistp224.o ecp_nistp256.o ecp_nistp521.o ecp_nistputil.o \ - ecp_oct.o ec2_oct.o ec_oct.o - -SRC= $(LIBSRC) - -EXHEADER= ec.h -HEADER= ec_lcl.h $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -ec2_mult.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -ec2_mult.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h -ec2_mult.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ec2_mult.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -ec2_mult.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h -ec2_mult.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ec2_mult.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -ec2_mult.o: ../../include/openssl/symhacks.h ec2_mult.c ec_lcl.h -ec2_oct.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -ec2_oct.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h -ec2_oct.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ec2_oct.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -ec2_oct.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h -ec2_oct.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ec2_oct.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -ec2_oct.o: ../../include/openssl/symhacks.h ec2_oct.c ec_lcl.h -ec2_smpl.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -ec2_smpl.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h -ec2_smpl.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ec2_smpl.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -ec2_smpl.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h -ec2_smpl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ec2_smpl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -ec2_smpl.o: ../../include/openssl/symhacks.h ec2_smpl.c ec_lcl.h -ec_ameth.o: ../../e_os.h ../../include/openssl/asn1.h -ec_ameth.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -ec_ameth.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h -ec_ameth.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -ec_ameth.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -ec_ameth.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -ec_ameth.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -ec_ameth.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -ec_ameth.o: ../../include/openssl/opensslconf.h -ec_ameth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ec_ameth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -ec_ameth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -ec_ameth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -ec_ameth.o: ../../include/openssl/x509_vfy.h ../asn1/asn1_locl.h ../cryptlib.h -ec_ameth.o: ec_ameth.c -ec_asn1.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h -ec_asn1.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -ec_asn1.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -ec_asn1.o: ../../include/openssl/ec.h ../../include/openssl/err.h -ec_asn1.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -ec_asn1.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -ec_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ec_asn1.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -ec_asn1.o: ../../include/openssl/symhacks.h ec_asn1.c ec_lcl.h -ec_check.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -ec_check.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h -ec_check.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ec_check.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -ec_check.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h -ec_check.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ec_check.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -ec_check.o: ../../include/openssl/symhacks.h ec_check.c ec_lcl.h -ec_curve.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -ec_curve.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h -ec_curve.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ec_curve.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -ec_curve.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h -ec_curve.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ec_curve.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -ec_curve.o: ../../include/openssl/symhacks.h ec_curve.c ec_lcl.h -ec_cvt.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -ec_cvt.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h -ec_cvt.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ec_cvt.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -ec_cvt.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h -ec_cvt.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ec_cvt.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -ec_cvt.o: ../../include/openssl/symhacks.h ec_cvt.c ec_lcl.h -ec_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -ec_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -ec_err.o: ../../include/openssl/ec.h ../../include/openssl/err.h -ec_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -ec_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ec_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -ec_err.o: ../../include/openssl/symhacks.h ec_err.c -ec_key.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -ec_key.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h -ec_key.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ec_key.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -ec_key.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h -ec_key.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ec_key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -ec_key.o: ../../include/openssl/symhacks.h ec_key.c ec_lcl.h -ec_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -ec_lib.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h -ec_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ec_lib.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -ec_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h -ec_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ec_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -ec_lib.o: ../../include/openssl/symhacks.h ec_lcl.h ec_lib.c -ec_mult.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -ec_mult.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h -ec_mult.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ec_mult.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -ec_mult.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h -ec_mult.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ec_mult.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -ec_mult.o: ../../include/openssl/symhacks.h ec_lcl.h ec_mult.c -ec_oct.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -ec_oct.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h -ec_oct.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ec_oct.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -ec_oct.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h -ec_oct.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ec_oct.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -ec_oct.o: ../../include/openssl/symhacks.h ec_lcl.h ec_oct.c -ec_pmeth.o: ../../e_os.h ../../include/openssl/asn1.h -ec_pmeth.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -ec_pmeth.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -ec_pmeth.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ec_pmeth.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -ec_pmeth.o: ../../include/openssl/err.h ../../include/openssl/evp.h -ec_pmeth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -ec_pmeth.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -ec_pmeth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ec_pmeth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -ec_pmeth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -ec_pmeth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -ec_pmeth.o: ../../include/openssl/x509_vfy.h ../cryptlib.h ../evp/evp_locl.h -ec_pmeth.o: ec_pmeth.c -ec_print.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -ec_print.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h -ec_print.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ec_print.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h -ec_print.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ec_print.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -ec_print.o: ../../include/openssl/symhacks.h ec_lcl.h ec_print.c -eck_prn.o: ../../e_os.h ../../include/openssl/asn1.h -eck_prn.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -eck_prn.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -eck_prn.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -eck_prn.o: ../../include/openssl/err.h ../../include/openssl/evp.h -eck_prn.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -eck_prn.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -eck_prn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -eck_prn.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -eck_prn.o: ../../include/openssl/symhacks.h ../cryptlib.h eck_prn.c -ecp_mont.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -ecp_mont.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h -ecp_mont.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ecp_mont.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -ecp_mont.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h -ecp_mont.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ecp_mont.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -ecp_mont.o: ../../include/openssl/symhacks.h ec_lcl.h ecp_mont.c -ecp_nist.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -ecp_nist.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h -ecp_nist.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ecp_nist.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -ecp_nist.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h -ecp_nist.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ecp_nist.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -ecp_nist.o: ../../include/openssl/symhacks.h ec_lcl.h ecp_nist.c -ecp_nistp224.o: ../../include/openssl/opensslconf.h ecp_nistp224.c -ecp_nistp256.o: ../../include/openssl/opensslconf.h ecp_nistp256.c -ecp_nistp521.o: ../../include/openssl/opensslconf.h ecp_nistp521.c -ecp_nistputil.o: ../../include/openssl/opensslconf.h ecp_nistputil.c -ecp_oct.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -ecp_oct.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h -ecp_oct.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ecp_oct.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -ecp_oct.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h -ecp_oct.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ecp_oct.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -ecp_oct.o: ../../include/openssl/symhacks.h ec_lcl.h ecp_oct.c -ecp_smpl.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -ecp_smpl.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h -ecp_smpl.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ecp_smpl.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -ecp_smpl.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h -ecp_smpl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ecp_smpl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -ecp_smpl.o: ../../include/openssl/symhacks.h ec_lcl.h ecp_smpl.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/ecdh/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/ecdh/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/ecdh/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/ecdh/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,116 +0,0 @@ -# -# crypto/ecdh/Makefile -# - -DIR= ecdh -TOP= ../.. -CC= cc -INCLUDES= -I.. -I$(TOP) -I../../include -CFLAG=-g -Wall -MAKEFILE= Makefile -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile -TEST=ecdhtest.c -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC= ech_lib.c ech_ossl.c ech_key.c ech_err.c - -LIBOBJ= ech_lib.o ech_ossl.o ech_key.o ech_err.o - -SRC= $(LIBSRC) - -EXHEADER= ecdh.h -HEADER= ech_locl.h $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -ech_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -ech_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -ech_err.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -ech_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -ech_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -ech_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -ech_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -ech_err.o: ech_err.c -ech_key.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -ech_key.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -ech_key.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -ech_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -ech_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -ech_key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -ech_key.o: ech_key.c ech_locl.h -ech_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -ech_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -ech_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ech_lib.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -ech_lib.o: ../../include/openssl/engine.h ../../include/openssl/err.h -ech_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -ech_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -ech_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -ech_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -ech_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -ech_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -ech_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -ech_lib.o: ech_lib.c ech_locl.h -ech_ossl.o: ../../e_os.h ../../include/openssl/asn1.h -ech_ossl.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -ech_ossl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -ech_ossl.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ech_ossl.o: ../../include/openssl/ecdh.h ../../include/openssl/err.h -ech_ossl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -ech_ossl.o: ../../include/openssl/opensslconf.h -ech_ossl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ech_ossl.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -ech_ossl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -ech_ossl.o: ../cryptlib.h ech_locl.h ech_ossl.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/ecdsa/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/ecdsa/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/ecdsa/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/ecdsa/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,140 +0,0 @@ -# -# crypto/ecdsa/Makefile -# - -DIR= ecdsa -TOP= ../.. -CC= cc -INCLUDES= -I.. -I$(TOP) -I../../include -CFLAG=-g -Wall -MAKEFILE= Makefile -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile -TEST=ecdsatest.c -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC= ecs_lib.c ecs_asn1.c ecs_ossl.c ecs_sign.c ecs_vrf.c ecs_err.c - -LIBOBJ= ecs_lib.o ecs_asn1.o ecs_ossl.o ecs_sign.o ecs_vrf.o ecs_err.o - -SRC= $(LIBSRC) - -EXHEADER= ecdsa.h -HEADER= ecs_locl.h $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -ecs_asn1.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h -ecs_asn1.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h -ecs_asn1.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ecs_asn1.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -ecs_asn1.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -ecs_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ecs_asn1.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -ecs_asn1.o: ../../include/openssl/symhacks.h ecs_asn1.c ecs_locl.h -ecs_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -ecs_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -ecs_err.o: ../../include/openssl/ec.h ../../include/openssl/ecdsa.h -ecs_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -ecs_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -ecs_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -ecs_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -ecs_err.o: ecs_err.c -ecs_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -ecs_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -ecs_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -ecs_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -ecs_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -ecs_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h -ecs_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -ecs_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -ecs_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ecs_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -ecs_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -ecs_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -ecs_lib.o: ../../include/openssl/x509_vfy.h ecs_lib.c ecs_locl.h -ecs_ossl.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -ecs_ossl.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h -ecs_ossl.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ecs_ossl.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -ecs_ossl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -ecs_ossl.o: ../../include/openssl/opensslconf.h -ecs_ossl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ecs_ossl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -ecs_ossl.o: ../../include/openssl/symhacks.h ecs_locl.h ecs_ossl.c -ecs_sign.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -ecs_sign.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -ecs_sign.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ecs_sign.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -ecs_sign.o: ../../include/openssl/engine.h ../../include/openssl/evp.h -ecs_sign.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -ecs_sign.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -ecs_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ecs_sign.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -ecs_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -ecs_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -ecs_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -ecs_sign.o: ecs_locl.h ecs_sign.c -ecs_vrf.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -ecs_vrf.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -ecs_vrf.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ecs_vrf.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -ecs_vrf.o: ../../include/openssl/engine.h ../../include/openssl/evp.h -ecs_vrf.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -ecs_vrf.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -ecs_vrf.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ecs_vrf.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -ecs_vrf.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -ecs_vrf.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -ecs_vrf.o: ../../include/openssl/x509_vfy.h ecs_locl.h ecs_vrf.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/engine/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/engine/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/engine/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/engine/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,447 +0,0 @@ -# -# OpenSSL/crypto/engine/Makefile -# - -DIR= engine -TOP= ../.. -CC= cc -INCLUDES= -I.. -I$(TOP) -I../../include -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile -TEST= enginetest.c -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC= eng_err.c eng_lib.c eng_list.c eng_init.c eng_ctrl.c \ - eng_table.c eng_pkey.c eng_fat.c eng_all.c \ - tb_rsa.c tb_dsa.c tb_ecdsa.c tb_dh.c tb_ecdh.c tb_rand.c tb_store.c \ - tb_cipher.c tb_digest.c tb_pkmeth.c tb_asnmth.c \ - eng_openssl.c eng_cnf.c eng_dyn.c eng_cryptodev.c \ - eng_rsax.c eng_rdrand.c -LIBOBJ= eng_err.o eng_lib.o eng_list.o eng_init.o eng_ctrl.o \ - eng_table.o eng_pkey.o eng_fat.o eng_all.o \ - tb_rsa.o tb_dsa.o tb_ecdsa.o tb_dh.o tb_ecdh.o tb_rand.o tb_store.o \ - tb_cipher.o tb_digest.o tb_pkmeth.o tb_asnmth.o \ - eng_openssl.o eng_cnf.o eng_dyn.o eng_cryptodev.o \ - eng_rsax.o eng_rdrand.o - -SRC= $(LIBSRC) - -EXHEADER= engine.h -HEADER= $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -eng_all.o: ../../e_os.h ../../include/openssl/asn1.h -eng_all.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -eng_all.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -eng_all.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -eng_all.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -eng_all.o: ../../include/openssl/err.h ../../include/openssl/evp.h -eng_all.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -eng_all.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -eng_all.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -eng_all.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -eng_all.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -eng_all.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -eng_all.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_all.c eng_int.h -eng_cnf.o: ../../e_os.h ../../include/openssl/asn1.h -eng_cnf.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -eng_cnf.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -eng_cnf.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -eng_cnf.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -eng_cnf.o: ../../include/openssl/engine.h ../../include/openssl/err.h -eng_cnf.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -eng_cnf.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -eng_cnf.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -eng_cnf.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -eng_cnf.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -eng_cnf.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -eng_cnf.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -eng_cnf.o: ../cryptlib.h eng_cnf.c eng_int.h -eng_cryptodev.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -eng_cryptodev.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -eng_cryptodev.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -eng_cryptodev.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -eng_cryptodev.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -eng_cryptodev.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -eng_cryptodev.o: ../../include/openssl/obj_mac.h -eng_cryptodev.o: ../../include/openssl/objects.h -eng_cryptodev.o: ../../include/openssl/opensslconf.h -eng_cryptodev.o: ../../include/openssl/opensslv.h -eng_cryptodev.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -eng_cryptodev.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -eng_cryptodev.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -eng_cryptodev.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -eng_cryptodev.o: eng_cryptodev.c -eng_ctrl.o: ../../e_os.h ../../include/openssl/asn1.h -eng_ctrl.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -eng_ctrl.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -eng_ctrl.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -eng_ctrl.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -eng_ctrl.o: ../../include/openssl/err.h ../../include/openssl/evp.h -eng_ctrl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -eng_ctrl.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -eng_ctrl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -eng_ctrl.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -eng_ctrl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -eng_ctrl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -eng_ctrl.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_ctrl.c eng_int.h -eng_dyn.o: ../../e_os.h ../../include/openssl/asn1.h -eng_dyn.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -eng_dyn.o: ../../include/openssl/crypto.h ../../include/openssl/dso.h -eng_dyn.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -eng_dyn.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -eng_dyn.o: ../../include/openssl/engine.h ../../include/openssl/err.h -eng_dyn.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -eng_dyn.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -eng_dyn.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -eng_dyn.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -eng_dyn.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -eng_dyn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -eng_dyn.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -eng_dyn.o: ../cryptlib.h eng_dyn.c eng_int.h -eng_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -eng_err.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -eng_err.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -eng_err.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -eng_err.o: ../../include/openssl/engine.h ../../include/openssl/err.h -eng_err.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -eng_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -eng_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -eng_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -eng_err.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -eng_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -eng_err.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -eng_err.o: eng_err.c -eng_fat.o: ../../e_os.h ../../include/openssl/asn1.h -eng_fat.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -eng_fat.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -eng_fat.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -eng_fat.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -eng_fat.o: ../../include/openssl/engine.h ../../include/openssl/err.h -eng_fat.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -eng_fat.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -eng_fat.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -eng_fat.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -eng_fat.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -eng_fat.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -eng_fat.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -eng_fat.o: ../cryptlib.h eng_fat.c eng_int.h -eng_init.o: ../../e_os.h ../../include/openssl/asn1.h -eng_init.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -eng_init.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -eng_init.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -eng_init.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -eng_init.o: ../../include/openssl/err.h ../../include/openssl/evp.h -eng_init.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -eng_init.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -eng_init.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -eng_init.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -eng_init.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -eng_init.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -eng_init.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_init.c eng_int.h -eng_lib.o: ../../e_os.h ../../include/openssl/asn1.h -eng_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -eng_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -eng_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -eng_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -eng_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h -eng_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -eng_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -eng_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -eng_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -eng_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -eng_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -eng_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -eng_lib.o: ../cryptlib.h eng_int.h eng_lib.c -eng_list.o: ../../e_os.h ../../include/openssl/asn1.h -eng_list.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -eng_list.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -eng_list.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -eng_list.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -eng_list.o: ../../include/openssl/err.h ../../include/openssl/evp.h -eng_list.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -eng_list.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -eng_list.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -eng_list.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -eng_list.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -eng_list.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -eng_list.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h eng_list.c -eng_openssl.o: ../../e_os.h ../../include/openssl/asn1.h -eng_openssl.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -eng_openssl.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h -eng_openssl.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h -eng_openssl.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -eng_openssl.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -eng_openssl.o: ../../include/openssl/engine.h ../../include/openssl/err.h -eng_openssl.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -eng_openssl.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -eng_openssl.o: ../../include/openssl/opensslconf.h -eng_openssl.o: ../../include/openssl/opensslv.h -eng_openssl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h -eng_openssl.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h -eng_openssl.o: ../../include/openssl/rand.h ../../include/openssl/rc4.h -eng_openssl.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -eng_openssl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -eng_openssl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -eng_openssl.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_openssl.c -eng_pkey.o: ../../e_os.h ../../include/openssl/asn1.h -eng_pkey.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -eng_pkey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -eng_pkey.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -eng_pkey.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -eng_pkey.o: ../../include/openssl/err.h ../../include/openssl/evp.h -eng_pkey.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -eng_pkey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -eng_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -eng_pkey.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -eng_pkey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -eng_pkey.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -eng_pkey.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h eng_pkey.c -eng_rdrand.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -eng_rdrand.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -eng_rdrand.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -eng_rdrand.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -eng_rdrand.o: ../../include/openssl/engine.h ../../include/openssl/err.h -eng_rdrand.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -eng_rdrand.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -eng_rdrand.o: ../../include/openssl/opensslconf.h -eng_rdrand.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -eng_rdrand.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -eng_rdrand.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -eng_rdrand.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -eng_rdrand.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -eng_rdrand.o: eng_rdrand.c -eng_rsax.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -eng_rsax.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -eng_rsax.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -eng_rsax.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -eng_rsax.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -eng_rsax.o: ../../include/openssl/err.h ../../include/openssl/evp.h -eng_rsax.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -eng_rsax.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -eng_rsax.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -eng_rsax.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h -eng_rsax.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -eng_rsax.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -eng_rsax.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -eng_rsax.o: eng_rsax.c -eng_table.o: ../../e_os.h ../../include/openssl/asn1.h -eng_table.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -eng_table.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -eng_table.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -eng_table.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -eng_table.o: ../../include/openssl/err.h ../../include/openssl/evp.h -eng_table.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -eng_table.o: ../../include/openssl/objects.h -eng_table.o: ../../include/openssl/opensslconf.h -eng_table.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -eng_table.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -eng_table.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -eng_table.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -eng_table.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h -eng_table.o: eng_table.c -tb_asnmth.o: ../../e_os.h ../../include/openssl/asn1.h -tb_asnmth.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -tb_asnmth.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -tb_asnmth.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -tb_asnmth.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -tb_asnmth.o: ../../include/openssl/err.h ../../include/openssl/evp.h -tb_asnmth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -tb_asnmth.o: ../../include/openssl/objects.h -tb_asnmth.o: ../../include/openssl/opensslconf.h -tb_asnmth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -tb_asnmth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -tb_asnmth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -tb_asnmth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -tb_asnmth.o: ../../include/openssl/x509_vfy.h ../asn1/asn1_locl.h ../cryptlib.h -tb_asnmth.o: eng_int.h tb_asnmth.c -tb_cipher.o: ../../e_os.h ../../include/openssl/asn1.h -tb_cipher.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -tb_cipher.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -tb_cipher.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -tb_cipher.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -tb_cipher.o: ../../include/openssl/err.h ../../include/openssl/evp.h -tb_cipher.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -tb_cipher.o: ../../include/openssl/objects.h -tb_cipher.o: ../../include/openssl/opensslconf.h -tb_cipher.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -tb_cipher.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -tb_cipher.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -tb_cipher.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -tb_cipher.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h -tb_cipher.o: tb_cipher.c -tb_dh.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -tb_dh.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -tb_dh.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -tb_dh.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -tb_dh.o: ../../include/openssl/engine.h ../../include/openssl/err.h -tb_dh.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -tb_dh.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -tb_dh.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -tb_dh.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -tb_dh.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -tb_dh.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -tb_dh.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -tb_dh.o: ../cryptlib.h eng_int.h tb_dh.c -tb_digest.o: ../../e_os.h ../../include/openssl/asn1.h -tb_digest.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -tb_digest.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -tb_digest.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -tb_digest.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -tb_digest.o: ../../include/openssl/err.h ../../include/openssl/evp.h -tb_digest.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -tb_digest.o: ../../include/openssl/objects.h -tb_digest.o: ../../include/openssl/opensslconf.h -tb_digest.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -tb_digest.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -tb_digest.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -tb_digest.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -tb_digest.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h -tb_digest.o: tb_digest.c -tb_dsa.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -tb_dsa.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -tb_dsa.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -tb_dsa.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -tb_dsa.o: ../../include/openssl/engine.h ../../include/openssl/err.h -tb_dsa.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -tb_dsa.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -tb_dsa.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -tb_dsa.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -tb_dsa.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -tb_dsa.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -tb_dsa.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -tb_dsa.o: ../cryptlib.h eng_int.h tb_dsa.c -tb_ecdh.o: ../../e_os.h ../../include/openssl/asn1.h -tb_ecdh.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -tb_ecdh.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -tb_ecdh.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -tb_ecdh.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -tb_ecdh.o: ../../include/openssl/err.h ../../include/openssl/evp.h -tb_ecdh.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -tb_ecdh.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -tb_ecdh.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -tb_ecdh.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -tb_ecdh.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -tb_ecdh.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -tb_ecdh.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h tb_ecdh.c -tb_ecdsa.o: ../../e_os.h ../../include/openssl/asn1.h -tb_ecdsa.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -tb_ecdsa.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -tb_ecdsa.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -tb_ecdsa.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -tb_ecdsa.o: ../../include/openssl/err.h ../../include/openssl/evp.h -tb_ecdsa.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -tb_ecdsa.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -tb_ecdsa.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -tb_ecdsa.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -tb_ecdsa.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -tb_ecdsa.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -tb_ecdsa.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h tb_ecdsa.c -tb_pkmeth.o: ../../e_os.h ../../include/openssl/asn1.h -tb_pkmeth.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -tb_pkmeth.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -tb_pkmeth.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -tb_pkmeth.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -tb_pkmeth.o: ../../include/openssl/err.h ../../include/openssl/evp.h -tb_pkmeth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -tb_pkmeth.o: ../../include/openssl/objects.h -tb_pkmeth.o: ../../include/openssl/opensslconf.h -tb_pkmeth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -tb_pkmeth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -tb_pkmeth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -tb_pkmeth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -tb_pkmeth.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h -tb_pkmeth.o: tb_pkmeth.c -tb_rand.o: ../../e_os.h ../../include/openssl/asn1.h -tb_rand.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -tb_rand.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -tb_rand.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -tb_rand.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -tb_rand.o: ../../include/openssl/err.h ../../include/openssl/evp.h -tb_rand.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -tb_rand.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -tb_rand.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -tb_rand.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -tb_rand.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -tb_rand.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -tb_rand.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h tb_rand.c -tb_rsa.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -tb_rsa.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -tb_rsa.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -tb_rsa.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -tb_rsa.o: ../../include/openssl/engine.h ../../include/openssl/err.h -tb_rsa.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -tb_rsa.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -tb_rsa.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -tb_rsa.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -tb_rsa.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -tb_rsa.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -tb_rsa.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -tb_rsa.o: ../cryptlib.h eng_int.h tb_rsa.c -tb_store.o: ../../e_os.h ../../include/openssl/asn1.h -tb_store.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -tb_store.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -tb_store.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -tb_store.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -tb_store.o: ../../include/openssl/err.h ../../include/openssl/evp.h -tb_store.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -tb_store.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -tb_store.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -tb_store.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -tb_store.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -tb_store.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -tb_store.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h tb_store.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/err/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/err/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/err/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/err/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,110 +0,0 @@ -# -# OpenSSL/crypto/err/Makefile -# - -DIR= err -TOP= ../.. -CC= cc -INCLUDES= -I.. -I$(TOP) -I../../include -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile -TEST= -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC=err.c err_all.c err_prn.c -LIBOBJ=err.o err_all.o err_prn.o - -SRC= $(LIBSRC) - -EXHEADER= err.h -HEADER= $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -err.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/buffer.h -err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -err.o: ../cryptlib.h err.c -err_all.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -err_all.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -err_all.o: ../../include/openssl/cms.h ../../include/openssl/comp.h -err_all.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -err_all.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h -err_all.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h -err_all.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -err_all.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -err_all.o: ../../include/openssl/err.h ../../include/openssl/evp.h -err_all.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -err_all.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h -err_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -err_all.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem2.h -err_all.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h -err_all.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h -err_all.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -err_all.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -err_all.o: ../../include/openssl/ts.h ../../include/openssl/ui.h -err_all.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -err_all.o: ../../include/openssl/x509v3.h err_all.c -err_prn.o: ../../e_os.h ../../include/openssl/bio.h -err_prn.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -err_prn.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -err_prn.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -err_prn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -err_prn.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -err_prn.o: ../../include/openssl/symhacks.h ../cryptlib.h err_prn.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/evp/bio_b64.c nodejs-0.10.29/deps/openssl/openssl/crypto/evp/bio_b64.c --- nodejs-0.10.28/deps/openssl/openssl/crypto/evp/bio_b64.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/evp/bio_b64.c 2014-06-09 17:04:36.000000000 +0000 @@ -226,6 +226,7 @@ else if (ctx->start) { q=p=(unsigned char *)ctx->tmp; + num = 0; for (j=0; j<i; j++) { if (*(q++) != '\n') continue; diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/evp/encode.c nodejs-0.10.29/deps/openssl/openssl/crypto/evp/encode.c --- nodejs-0.10.28/deps/openssl/openssl/crypto/evp/encode.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/evp/encode.c 2014-06-09 17:04:36.000000000 +0000 @@ -324,6 +324,7 @@ v=EVP_DecodeBlock(out,d,n); n=0; if (v < 0) { rv=0; goto end; } + if (eof > v) { rv=-1; goto end; } ret+=(v-eof); } else diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/evp/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/evp/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/evp/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/evp/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,776 +0,0 @@ -# -# OpenSSL/crypto/evp/Makefile -# - -DIR= evp -TOP= ../.. -CC= cc -INCLUDES= -I.. -I$(TOP) -I../../include -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile -TEST=evp_test.c -TESTDATA=evptests.txt -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC= encode.c digest.c evp_enc.c evp_key.c evp_acnf.c evp_cnf.c \ - e_des.c e_bf.c e_idea.c e_des3.c e_camellia.c\ - e_rc4.c e_aes.c names.c e_seed.c \ - e_xcbc_d.c e_rc2.c e_cast.c e_rc5.c \ - m_null.c m_md2.c m_md4.c m_md5.c m_sha.c m_sha1.c m_wp.c \ - m_dss.c m_dss1.c m_mdc2.c m_ripemd.c m_ecdsa.c\ - p_open.c p_seal.c p_sign.c p_verify.c p_lib.c p_enc.c p_dec.c \ - bio_md.c bio_b64.c bio_enc.c evp_err.c e_null.c \ - c_all.c c_allc.c c_alld.c evp_lib.c bio_ok.c \ - evp_pkey.c evp_pbe.c p5_crpt.c p5_crpt2.c \ - e_old.c pmeth_lib.c pmeth_fn.c pmeth_gn.c m_sigver.c evp_fips.c \ - e_aes_cbc_hmac_sha1.c e_rc4_hmac_md5.c - -LIBOBJ= encode.o digest.o evp_enc.o evp_key.o evp_acnf.o evp_cnf.o \ - e_des.o e_bf.o e_idea.o e_des3.o e_camellia.o\ - e_rc4.o e_aes.o names.o e_seed.o \ - e_xcbc_d.o e_rc2.o e_cast.o e_rc5.o \ - m_null.o m_md2.o m_md4.o m_md5.o m_sha.o m_sha1.o m_wp.o \ - m_dss.o m_dss1.o m_mdc2.o m_ripemd.o m_ecdsa.o\ - p_open.o p_seal.o p_sign.o p_verify.o p_lib.o p_enc.o p_dec.o \ - bio_md.o bio_b64.o bio_enc.o evp_err.o e_null.o \ - c_all.o c_allc.o c_alld.o evp_lib.o bio_ok.o \ - evp_pkey.o evp_pbe.o p5_crpt.o p5_crpt2.o \ - e_old.o pmeth_lib.o pmeth_fn.o pmeth_gn.o m_sigver.o evp_fips.o \ - e_aes_cbc_hmac_sha1.o e_rc4_hmac_md5.o - -SRC= $(LIBSRC) - -EXHEADER= evp.h -HEADER= evp_locl.h $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @[ -f $(TESTDATA) ] && cp $(TESTDATA) ../../test && echo "$(TESTDATA) -> ../../test/$(TESTDATA)" - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -bio_b64.o: ../../e_os.h ../../include/openssl/asn1.h -bio_b64.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -bio_b64.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -bio_b64.o: ../../include/openssl/err.h ../../include/openssl/evp.h -bio_b64.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -bio_b64.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -bio_b64.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bio_b64.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bio_b64.o: ../../include/openssl/symhacks.h ../cryptlib.h bio_b64.c -bio_enc.o: ../../e_os.h ../../include/openssl/asn1.h -bio_enc.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -bio_enc.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -bio_enc.o: ../../include/openssl/err.h ../../include/openssl/evp.h -bio_enc.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -bio_enc.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -bio_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -bio_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bio_enc.o: ../../include/openssl/symhacks.h ../cryptlib.h bio_enc.c -bio_md.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -bio_md.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bio_md.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bio_md.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -bio_md.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -bio_md.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -bio_md.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -bio_md.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -bio_md.o: ../cryptlib.h bio_md.c -bio_ok.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -bio_ok.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bio_ok.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bio_ok.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -bio_ok.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -bio_ok.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -bio_ok.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h -bio_ok.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bio_ok.o: ../../include/openssl/symhacks.h ../cryptlib.h bio_ok.c -c_all.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -c_all.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -c_all.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -c_all.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -c_all.o: ../../include/openssl/engine.h ../../include/openssl/err.h -c_all.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -c_all.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -c_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -c_all.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -c_all.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -c_all.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -c_all.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -c_all.o: ../cryptlib.h c_all.c -c_allc.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -c_allc.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -c_allc.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -c_allc.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -c_allc.o: ../../include/openssl/err.h ../../include/openssl/evp.h -c_allc.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -c_allc.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -c_allc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -c_allc.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h -c_allc.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -c_allc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -c_allc.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -c_allc.o: ../cryptlib.h c_allc.c -c_alld.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -c_alld.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -c_alld.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -c_alld.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -c_alld.o: ../../include/openssl/err.h ../../include/openssl/evp.h -c_alld.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -c_alld.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -c_alld.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -c_alld.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h -c_alld.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -c_alld.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -c_alld.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -c_alld.o: ../cryptlib.h c_alld.c -digest.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -digest.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -digest.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -digest.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -digest.o: ../../include/openssl/engine.h ../../include/openssl/err.h -digest.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -digest.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -digest.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -digest.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -digest.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -digest.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -digest.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -digest.o: ../cryptlib.h digest.c -e_aes.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h -e_aes.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h -e_aes.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -e_aes.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -e_aes.o: ../../include/openssl/modes.h ../../include/openssl/obj_mac.h -e_aes.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -e_aes.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -e_aes.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -e_aes.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -e_aes.o: ../modes/modes_lcl.h e_aes.c evp_locl.h -e_aes_cbc_hmac_sha1.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h -e_aes_cbc_hmac_sha1.o: ../../include/openssl/bio.h -e_aes_cbc_hmac_sha1.o: ../../include/openssl/crypto.h -e_aes_cbc_hmac_sha1.o: ../../include/openssl/e_os2.h -e_aes_cbc_hmac_sha1.o: ../../include/openssl/evp.h -e_aes_cbc_hmac_sha1.o: ../../include/openssl/obj_mac.h -e_aes_cbc_hmac_sha1.o: ../../include/openssl/objects.h -e_aes_cbc_hmac_sha1.o: ../../include/openssl/opensslconf.h -e_aes_cbc_hmac_sha1.o: ../../include/openssl/opensslv.h -e_aes_cbc_hmac_sha1.o: ../../include/openssl/ossl_typ.h -e_aes_cbc_hmac_sha1.o: ../../include/openssl/safestack.h -e_aes_cbc_hmac_sha1.o: ../../include/openssl/sha.h -e_aes_cbc_hmac_sha1.o: ../../include/openssl/stack.h -e_aes_cbc_hmac_sha1.o: ../../include/openssl/symhacks.h e_aes_cbc_hmac_sha1.c -e_aes_cbc_hmac_sha1.o: evp_locl.h -e_bf.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -e_bf.o: ../../include/openssl/blowfish.h ../../include/openssl/buffer.h -e_bf.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -e_bf.o: ../../include/openssl/err.h ../../include/openssl/evp.h -e_bf.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -e_bf.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -e_bf.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -e_bf.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -e_bf.o: ../../include/openssl/symhacks.h ../cryptlib.h e_bf.c evp_locl.h -e_camellia.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -e_camellia.o: ../../include/openssl/camellia.h ../../include/openssl/crypto.h -e_camellia.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -e_camellia.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -e_camellia.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -e_camellia.o: ../../include/openssl/opensslconf.h -e_camellia.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -e_camellia.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -e_camellia.o: ../../include/openssl/symhacks.h e_camellia.c evp_locl.h -e_cast.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -e_cast.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h -e_cast.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -e_cast.o: ../../include/openssl/err.h ../../include/openssl/evp.h -e_cast.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -e_cast.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -e_cast.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -e_cast.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -e_cast.o: ../../include/openssl/symhacks.h ../cryptlib.h e_cast.c evp_locl.h -e_des.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -e_des.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -e_des.o: ../../include/openssl/des.h ../../include/openssl/des_old.h -e_des.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -e_des.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -e_des.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -e_des.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -e_des.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h -e_des.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -e_des.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h -e_des.o: ../../include/openssl/ui_compat.h ../cryptlib.h e_des.c evp_locl.h -e_des3.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -e_des3.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -e_des3.o: ../../include/openssl/des.h ../../include/openssl/des_old.h -e_des3.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -e_des3.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -e_des3.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -e_des3.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -e_des3.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h -e_des3.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -e_des3.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h -e_des3.o: ../../include/openssl/ui_compat.h ../cryptlib.h e_des3.c evp_locl.h -e_idea.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -e_idea.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -e_idea.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -e_idea.o: ../../include/openssl/evp.h ../../include/openssl/idea.h -e_idea.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -e_idea.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -e_idea.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -e_idea.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -e_idea.o: ../../include/openssl/symhacks.h ../cryptlib.h e_idea.c evp_locl.h -e_null.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -e_null.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -e_null.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -e_null.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -e_null.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -e_null.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -e_null.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -e_null.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -e_null.o: ../cryptlib.h e_null.c -e_old.o: e_old.c -e_rc2.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -e_rc2.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -e_rc2.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -e_rc2.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -e_rc2.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -e_rc2.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -e_rc2.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rc2.h -e_rc2.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -e_rc2.o: ../../include/openssl/symhacks.h ../cryptlib.h e_rc2.c evp_locl.h -e_rc4.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -e_rc4.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -e_rc4.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -e_rc4.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -e_rc4.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -e_rc4.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -e_rc4.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rc4.h -e_rc4.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -e_rc4.o: ../../include/openssl/symhacks.h ../cryptlib.h e_rc4.c evp_locl.h -e_rc4_hmac_md5.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -e_rc4_hmac_md5.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -e_rc4_hmac_md5.o: ../../include/openssl/evp.h ../../include/openssl/md5.h -e_rc4_hmac_md5.o: ../../include/openssl/obj_mac.h -e_rc4_hmac_md5.o: ../../include/openssl/objects.h -e_rc4_hmac_md5.o: ../../include/openssl/opensslconf.h -e_rc4_hmac_md5.o: ../../include/openssl/opensslv.h -e_rc4_hmac_md5.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rc4.h -e_rc4_hmac_md5.o: ../../include/openssl/safestack.h -e_rc4_hmac_md5.o: ../../include/openssl/stack.h -e_rc4_hmac_md5.o: ../../include/openssl/symhacks.h e_rc4_hmac_md5.c -e_rc5.o: ../../e_os.h ../../include/openssl/bio.h -e_rc5.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -e_rc5.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -e_rc5.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -e_rc5.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -e_rc5.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -e_rc5.o: ../../include/openssl/symhacks.h ../cryptlib.h e_rc5.c -e_seed.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -e_seed.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -e_seed.o: ../../include/openssl/err.h ../../include/openssl/evp.h -e_seed.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -e_seed.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -e_seed.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -e_seed.o: ../../include/openssl/safestack.h ../../include/openssl/seed.h -e_seed.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -e_seed.o: e_seed.c evp_locl.h -e_xcbc_d.o: ../../e_os.h ../../include/openssl/asn1.h -e_xcbc_d.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -e_xcbc_d.o: ../../include/openssl/crypto.h ../../include/openssl/des.h -e_xcbc_d.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h -e_xcbc_d.o: ../../include/openssl/err.h ../../include/openssl/evp.h -e_xcbc_d.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -e_xcbc_d.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -e_xcbc_d.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -e_xcbc_d.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -e_xcbc_d.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h -e_xcbc_d.o: ../../include/openssl/ui_compat.h ../cryptlib.h e_xcbc_d.c -e_xcbc_d.o: evp_locl.h -encode.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -encode.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -encode.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -encode.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -encode.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -encode.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -encode.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -encode.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -encode.o: ../cryptlib.h encode.c -evp_acnf.o: ../../e_os.h ../../include/openssl/asn1.h -evp_acnf.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -evp_acnf.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -evp_acnf.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -evp_acnf.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -evp_acnf.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -evp_acnf.o: ../../include/openssl/opensslconf.h -evp_acnf.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -evp_acnf.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -evp_acnf.o: ../../include/openssl/symhacks.h ../cryptlib.h evp_acnf.c -evp_cnf.o: ../../e_os.h ../../include/openssl/asn1.h -evp_cnf.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -evp_cnf.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -evp_cnf.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h -evp_cnf.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -evp_cnf.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -evp_cnf.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -evp_cnf.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -evp_cnf.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -evp_cnf.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -evp_cnf.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -evp_cnf.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -evp_cnf.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -evp_cnf.o: ../../include/openssl/x509v3.h ../cryptlib.h evp_cnf.c -evp_enc.o: ../../e_os.h ../../include/openssl/asn1.h -evp_enc.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -evp_enc.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -evp_enc.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -evp_enc.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -evp_enc.o: ../../include/openssl/err.h ../../include/openssl/evp.h -evp_enc.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -evp_enc.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -evp_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -evp_enc.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -evp_enc.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -evp_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -evp_enc.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -evp_enc.o: ../cryptlib.h evp_enc.c evp_locl.h -evp_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -evp_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -evp_err.o: ../../include/openssl/err.h ../../include/openssl/evp.h -evp_err.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -evp_err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -evp_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -evp_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -evp_err.o: ../../include/openssl/symhacks.h evp_err.c -evp_fips.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -evp_fips.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -evp_fips.o: ../../include/openssl/evp.h ../../include/openssl/obj_mac.h -evp_fips.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -evp_fips.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -evp_fips.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -evp_fips.o: ../../include/openssl/symhacks.h evp_fips.c -evp_key.o: ../../e_os.h ../../include/openssl/asn1.h -evp_key.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -evp_key.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -evp_key.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -evp_key.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -evp_key.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -evp_key.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -evp_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -evp_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -evp_key.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -evp_key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -evp_key.o: ../../include/openssl/ui.h ../../include/openssl/x509.h -evp_key.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_key.c -evp_lib.o: ../../e_os.h ../../include/openssl/asn1.h -evp_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -evp_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -evp_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h -evp_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -evp_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -evp_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -evp_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -evp_lib.o: ../../include/openssl/symhacks.h ../cryptlib.h evp_lib.c -evp_pbe.o: ../../e_os.h ../../include/openssl/asn1.h -evp_pbe.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -evp_pbe.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -evp_pbe.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -evp_pbe.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -evp_pbe.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -evp_pbe.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -evp_pbe.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -evp_pbe.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h -evp_pbe.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -evp_pbe.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -evp_pbe.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -evp_pbe.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_locl.h evp_pbe.c -evp_pkey.o: ../../e_os.h ../../include/openssl/asn1.h -evp_pkey.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -evp_pkey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -evp_pkey.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -evp_pkey.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -evp_pkey.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -evp_pkey.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -evp_pkey.o: ../../include/openssl/opensslconf.h -evp_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -evp_pkey.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -evp_pkey.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -evp_pkey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -evp_pkey.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -evp_pkey.o: ../asn1/asn1_locl.h ../cryptlib.h evp_pkey.c -m_dss.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -m_dss.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -m_dss.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h -m_dss.o: ../../include/openssl/err.h ../../include/openssl/evp.h -m_dss.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -m_dss.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -m_dss.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -m_dss.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -m_dss.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -m_dss.o: ../cryptlib.h m_dss.c -m_dss1.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -m_dss1.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -m_dss1.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h -m_dss1.o: ../../include/openssl/err.h ../../include/openssl/evp.h -m_dss1.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -m_dss1.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -m_dss1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -m_dss1.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -m_dss1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -m_dss1.o: ../cryptlib.h m_dss1.c -m_ecdsa.o: ../../e_os.h ../../include/openssl/asn1.h -m_ecdsa.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -m_ecdsa.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -m_ecdsa.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -m_ecdsa.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -m_ecdsa.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -m_ecdsa.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -m_ecdsa.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -m_ecdsa.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -m_ecdsa.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -m_ecdsa.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -m_ecdsa.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -m_ecdsa.o: ../cryptlib.h m_ecdsa.c -m_md2.o: ../../e_os.h ../../include/openssl/bio.h -m_md2.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -m_md2.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -m_md2.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -m_md2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -m_md2.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -m_md2.o: ../../include/openssl/symhacks.h ../cryptlib.h m_md2.c -m_md4.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -m_md4.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -m_md4.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -m_md4.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -m_md4.o: ../../include/openssl/err.h ../../include/openssl/evp.h -m_md4.o: ../../include/openssl/lhash.h ../../include/openssl/md4.h -m_md4.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -m_md4.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -m_md4.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -m_md4.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -m_md4.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -m_md4.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -m_md4.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_locl.h m_md4.c -m_md5.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -m_md5.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -m_md5.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -m_md5.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -m_md5.o: ../../include/openssl/err.h ../../include/openssl/evp.h -m_md5.o: ../../include/openssl/lhash.h ../../include/openssl/md5.h -m_md5.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -m_md5.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -m_md5.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -m_md5.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -m_md5.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -m_md5.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -m_md5.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_locl.h m_md5.c -m_mdc2.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -m_mdc2.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -m_mdc2.o: ../../include/openssl/des.h ../../include/openssl/des_old.h -m_mdc2.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -m_mdc2.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -m_mdc2.o: ../../include/openssl/err.h ../../include/openssl/evp.h -m_mdc2.o: ../../include/openssl/lhash.h ../../include/openssl/mdc2.h -m_mdc2.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -m_mdc2.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -m_mdc2.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -m_mdc2.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -m_mdc2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -m_mdc2.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h -m_mdc2.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h -m_mdc2.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_locl.h m_mdc2.c -m_null.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -m_null.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -m_null.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -m_null.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -m_null.o: ../../include/openssl/err.h ../../include/openssl/evp.h -m_null.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -m_null.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -m_null.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -m_null.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -m_null.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -m_null.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -m_null.o: ../../include/openssl/x509_vfy.h ../cryptlib.h m_null.c -m_ripemd.o: ../../e_os.h ../../include/openssl/asn1.h -m_ripemd.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -m_ripemd.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -m_ripemd.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -m_ripemd.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -m_ripemd.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -m_ripemd.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -m_ripemd.o: ../../include/openssl/opensslconf.h -m_ripemd.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -m_ripemd.o: ../../include/openssl/pkcs7.h ../../include/openssl/ripemd.h -m_ripemd.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -m_ripemd.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -m_ripemd.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -m_ripemd.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_locl.h -m_ripemd.o: m_ripemd.c -m_sha.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -m_sha.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -m_sha.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -m_sha.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -m_sha.o: ../../include/openssl/err.h ../../include/openssl/evp.h -m_sha.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -m_sha.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -m_sha.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -m_sha.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h -m_sha.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -m_sha.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -m_sha.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -m_sha.o: ../cryptlib.h evp_locl.h m_sha.c -m_sha1.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -m_sha1.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -m_sha1.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -m_sha1.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -m_sha1.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -m_sha1.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -m_sha1.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rsa.h -m_sha1.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -m_sha1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -m_sha1.o: ../cryptlib.h m_sha1.c -m_sigver.o: ../../e_os.h ../../include/openssl/asn1.h -m_sigver.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -m_sigver.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -m_sigver.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -m_sigver.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -m_sigver.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -m_sigver.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -m_sigver.o: ../../include/openssl/opensslconf.h -m_sigver.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -m_sigver.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -m_sigver.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -m_sigver.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -m_sigver.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_locl.h -m_sigver.o: m_sigver.c -m_wp.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -m_wp.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -m_wp.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -m_wp.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -m_wp.o: ../../include/openssl/err.h ../../include/openssl/evp.h -m_wp.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -m_wp.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -m_wp.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -m_wp.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -m_wp.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -m_wp.o: ../../include/openssl/symhacks.h ../../include/openssl/whrlpool.h -m_wp.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -m_wp.o: ../cryptlib.h evp_locl.h m_wp.c -names.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -names.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -names.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -names.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -names.o: ../../include/openssl/err.h ../../include/openssl/evp.h -names.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -names.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -names.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -names.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -names.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -names.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -names.o: ../../include/openssl/x509_vfy.h ../cryptlib.h names.c -p5_crpt.o: ../../e_os.h ../../include/openssl/asn1.h -p5_crpt.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -p5_crpt.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -p5_crpt.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -p5_crpt.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -p5_crpt.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -p5_crpt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -p5_crpt.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -p5_crpt.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -p5_crpt.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -p5_crpt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -p5_crpt.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -p5_crpt.o: ../cryptlib.h p5_crpt.c -p5_crpt2.o: ../../e_os.h ../../include/openssl/asn1.h -p5_crpt2.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -p5_crpt2.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -p5_crpt2.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -p5_crpt2.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -p5_crpt2.o: ../../include/openssl/evp.h ../../include/openssl/hmac.h -p5_crpt2.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -p5_crpt2.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -p5_crpt2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -p5_crpt2.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -p5_crpt2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -p5_crpt2.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -p5_crpt2.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_locl.h -p5_crpt2.o: p5_crpt2.c -p_dec.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -p_dec.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -p_dec.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -p_dec.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -p_dec.o: ../../include/openssl/err.h ../../include/openssl/evp.h -p_dec.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -p_dec.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -p_dec.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -p_dec.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -p_dec.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -p_dec.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -p_dec.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -p_dec.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p_dec.c -p_enc.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -p_enc.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -p_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -p_enc.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -p_enc.o: ../../include/openssl/err.h ../../include/openssl/evp.h -p_enc.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -p_enc.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -p_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -p_enc.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -p_enc.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -p_enc.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -p_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -p_enc.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p_enc.c -p_lib.o: ../../e_os.h ../../include/openssl/asn1.h -p_lib.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h -p_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -p_lib.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h -p_lib.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h -p_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -p_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -p_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h -p_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -p_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -p_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -p_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h -p_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -p_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -p_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -p_lib.o: ../asn1/asn1_locl.h ../cryptlib.h p_lib.c -p_open.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -p_open.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -p_open.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -p_open.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -p_open.o: ../../include/openssl/err.h ../../include/openssl/evp.h -p_open.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -p_open.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -p_open.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -p_open.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h -p_open.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -p_open.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -p_open.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -p_open.o: ../cryptlib.h p_open.c -p_seal.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -p_seal.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -p_seal.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -p_seal.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -p_seal.o: ../../include/openssl/err.h ../../include/openssl/evp.h -p_seal.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -p_seal.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -p_seal.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -p_seal.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -p_seal.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -p_seal.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -p_seal.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -p_seal.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p_seal.c -p_sign.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -p_sign.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -p_sign.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -p_sign.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -p_sign.o: ../../include/openssl/err.h ../../include/openssl/evp.h -p_sign.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -p_sign.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -p_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -p_sign.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -p_sign.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -p_sign.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -p_sign.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p_sign.c -p_verify.o: ../../e_os.h ../../include/openssl/asn1.h -p_verify.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -p_verify.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -p_verify.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -p_verify.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -p_verify.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -p_verify.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -p_verify.o: ../../include/openssl/opensslconf.h -p_verify.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -p_verify.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -p_verify.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -p_verify.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -p_verify.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p_verify.c -pmeth_fn.o: ../../e_os.h ../../include/openssl/asn1.h -pmeth_fn.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -pmeth_fn.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -pmeth_fn.o: ../../include/openssl/err.h ../../include/openssl/evp.h -pmeth_fn.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -pmeth_fn.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -pmeth_fn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -pmeth_fn.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -pmeth_fn.o: ../../include/openssl/symhacks.h ../cryptlib.h evp_locl.h -pmeth_fn.o: pmeth_fn.c -pmeth_gn.o: ../../e_os.h ../../include/openssl/asn1.h -pmeth_gn.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -pmeth_gn.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -pmeth_gn.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -pmeth_gn.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -pmeth_gn.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -pmeth_gn.o: ../../include/openssl/opensslconf.h -pmeth_gn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -pmeth_gn.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -pmeth_gn.o: ../../include/openssl/symhacks.h ../cryptlib.h evp_locl.h -pmeth_gn.o: pmeth_gn.c -pmeth_lib.o: ../../e_os.h ../../include/openssl/asn1.h -pmeth_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -pmeth_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -pmeth_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -pmeth_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -pmeth_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h -pmeth_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -pmeth_lib.o: ../../include/openssl/objects.h -pmeth_lib.o: ../../include/openssl/opensslconf.h -pmeth_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -pmeth_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -pmeth_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -pmeth_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -pmeth_lib.o: ../../include/openssl/x509_vfy.h ../asn1/asn1_locl.h ../cryptlib.h -pmeth_lib.o: evp_locl.h pmeth_lib.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/hmac/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/hmac/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/hmac/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/hmac/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,110 +0,0 @@ -# -# OpenSSL/crypto/md/Makefile -# - -DIR= hmac -TOP= ../.. -CC= cc -INCLUDES= -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile -TEST=hmactest.c -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC=hmac.c hm_ameth.c hm_pmeth.c -LIBOBJ=hmac.o hm_ameth.o hm_pmeth.o - -SRC= $(LIBSRC) - -EXHEADER= hmac.h -HEADER= $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -hm_ameth.o: ../../e_os.h ../../include/openssl/asn1.h -hm_ameth.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -hm_ameth.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -hm_ameth.o: ../../include/openssl/err.h ../../include/openssl/evp.h -hm_ameth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -hm_ameth.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -hm_ameth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -hm_ameth.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -hm_ameth.o: ../../include/openssl/symhacks.h ../asn1/asn1_locl.h ../cryptlib.h -hm_ameth.o: hm_ameth.c -hm_pmeth.o: ../../e_os.h ../../include/openssl/asn1.h -hm_pmeth.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -hm_pmeth.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -hm_pmeth.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -hm_pmeth.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -hm_pmeth.o: ../../include/openssl/err.h ../../include/openssl/evp.h -hm_pmeth.o: ../../include/openssl/hmac.h ../../include/openssl/lhash.h -hm_pmeth.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -hm_pmeth.o: ../../include/openssl/opensslconf.h -hm_pmeth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -hm_pmeth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -hm_pmeth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -hm_pmeth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -hm_pmeth.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -hm_pmeth.o: ../cryptlib.h ../evp/evp_locl.h hm_pmeth.c -hmac.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -hmac.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -hmac.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -hmac.o: ../../include/openssl/evp.h ../../include/openssl/hmac.h -hmac.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -hmac.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -hmac.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -hmac.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -hmac.o: ../../include/openssl/symhacks.h ../cryptlib.h hmac.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/idea/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/idea/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/idea/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/idea/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,89 +0,0 @@ -# -# OpenSSL/crypto/idea/Makefile -# - -DIR= idea -TOP= ../.. -CC= cc -INCLUDES= -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile -TEST=ideatest.c -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC=i_cbc.c i_cfb64.c i_ofb64.c i_ecb.c i_skey.c -LIBOBJ=i_cbc.o i_cfb64.o i_ofb64.o i_ecb.o i_skey.o - -SRC= $(LIBSRC) - -EXHEADER= idea.h -HEADER= idea_lcl.h $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -i_cbc.o: ../../include/openssl/idea.h ../../include/openssl/opensslconf.h -i_cbc.o: i_cbc.c idea_lcl.h -i_cfb64.o: ../../include/openssl/idea.h ../../include/openssl/opensslconf.h -i_cfb64.o: i_cfb64.c idea_lcl.h -i_ecb.o: ../../include/openssl/idea.h ../../include/openssl/opensslconf.h -i_ecb.o: ../../include/openssl/opensslv.h i_ecb.c idea_lcl.h -i_ofb64.o: ../../include/openssl/idea.h ../../include/openssl/opensslconf.h -i_ofb64.o: i_ofb64.c idea_lcl.h -i_skey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -i_skey.o: ../../include/openssl/idea.h ../../include/openssl/opensslconf.h -i_skey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -i_skey.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -i_skey.o: ../../include/openssl/symhacks.h i_skey.c idea_lcl.h diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/krb5/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/krb5/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/krb5/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/krb5/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,84 +0,0 @@ -# -# OpenSSL/krb5/Makefile -# - -DIR= krb5 -TOP= ../.. -CC= cc -INCLUDES= -I.. -I$(TOP) -I../../include -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile README -TEST= -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC= krb5_asn.c - -LIBOBJ= krb5_asn.o - -SRC= $(LIBSRC) - -EXHEADER= krb5_asn.h -HEADER= $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -krb5_asn.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h -krb5_asn.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h -krb5_asn.o: ../../include/openssl/e_os2.h ../../include/openssl/krb5_asn.h -krb5_asn.o: ../../include/openssl/opensslconf.h -krb5_asn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -krb5_asn.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -krb5_asn.o: ../../include/openssl/symhacks.h krb5_asn.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/lhash/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/lhash/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/lhash/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/lhash/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,88 +0,0 @@ -# -# OpenSSL/crypto/lhash/Makefile -# - -DIR= lhash -TOP= ../.. -CC= cc -INCLUDES= -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile -TEST= -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC=lhash.c lh_stats.c -LIBOBJ=lhash.o lh_stats.o - -SRC= $(LIBSRC) - -EXHEADER= lhash.h -HEADER= $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -lh_stats.o: ../../e_os.h ../../include/openssl/bio.h -lh_stats.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -lh_stats.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -lh_stats.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -lh_stats.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -lh_stats.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -lh_stats.o: ../../include/openssl/symhacks.h ../cryptlib.h lh_stats.c -lhash.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h -lhash.o: ../../include/openssl/e_os2.h ../../include/openssl/lhash.h -lhash.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -lhash.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -lhash.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h lhash.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,219 +0,0 @@ -# -# OpenSSL/crypto/Makefile -# - -DIR= crypto -TOP= .. -CC= cc -INCLUDE= -I. -I$(TOP) -I../include $(ZLIB_INCLUDE) -# INCLUDES targets sudbirs! -INCLUDES= -I.. -I../.. -I../modes -I../asn1 -I../evp -I../../include $(ZLIB_INCLUDE) -CFLAG= -g -MAKEDEPPROG= makedepend -MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile -RM= rm -f -AR= ar r - -RECURSIVE_MAKE= [ -n "$(SDIRS)" ] && for i in $(SDIRS) ; do \ - (cd $$i && echo "making $$target in $(DIR)/$$i..." && \ - $(MAKE) -e TOP=../.. DIR=$$i INCLUDES='$(INCLUDES)' $$target ) || exit 1; \ - done; - -PEX_LIBS= -EX_LIBS= - -CFLAGS= $(INCLUDE) $(CFLAG) -ASFLAGS= $(INCLUDE) $(ASFLAG) -AFLAGS=$(ASFLAGS) -CPUID_OBJ=mem_clr.o - -LIBS= - -GENERAL=Makefile README crypto-lib.com install.com - -LIB= $(TOP)/libcrypto.a -SHARED_LIB= libcrypto$(SHLIB_EXT) -LIBSRC= cryptlib.c mem.c mem_clr.c mem_dbg.c cversion.c ex_data.c cpt_err.c \ - ebcdic.c uid.c o_time.c o_str.c o_dir.c o_fips.c o_init.c fips_ers.c -LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o cpt_err.o ebcdic.o \ - uid.o o_time.o o_str.o o_dir.o o_fips.o o_init.o fips_ers.o $(CPUID_OBJ) - -SRC= $(LIBSRC) - -EXHEADER= crypto.h opensslv.h opensslconf.h ebcdic.h symhacks.h \ - ossl_typ.h -HEADER= cryptlib.h buildinf.h md32_common.h o_time.h o_str.h o_dir.h $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - @(cd ..; $(MAKE) DIRS=$(DIR) all) - -all: shared - -buildinf.h: ../Makefile - ( echo "#ifndef MK1MF_BUILD"; \ - echo ' /* auto-generated by crypto/Makefile for crypto/cversion.c */'; \ - echo ' #define CFLAGS "$(CC) $(CFLAG)"'; \ - echo ' #define PLATFORM "$(PLATFORM)"'; \ - echo " #define DATE \"`LC_ALL=C LC_TIME=C date`\""; \ - echo '#endif' ) >buildinf.h - -x86cpuid.s: x86cpuid.pl perlasm/x86asm.pl - $(PERL) x86cpuid.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@ - -applink.o: $(TOP)/ms/applink.c - $(CC) $(CFLAGS) -c -o $@ $(TOP)/ms/applink.c - -uplink.o: $(TOP)/ms/uplink.c applink.o - $(CC) $(CFLAGS) -c -o $@ $(TOP)/ms/uplink.c - -uplink-x86.s: $(TOP)/ms/uplink-x86.pl - $(PERL) $(TOP)/ms/uplink-x86.pl $(PERLASM_SCHEME) > $@ - -x86_64cpuid.s: x86_64cpuid.pl; $(PERL) x86_64cpuid.pl $(PERLASM_SCHEME) > $@ -ia64cpuid.s: ia64cpuid.S; $(CC) $(CFLAGS) -E ia64cpuid.S > $@ -ppccpuid.s: ppccpuid.pl; $(PERL) ppccpuid.pl $(PERLASM_SCHEME) $@ -pariscid.s: pariscid.pl; $(PERL) pariscid.pl $(PERLASM_SCHEME) $@ -alphacpuid.s: alphacpuid.pl - (preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \ - $(PERL) alphacpuid.pl > $$preproc && \ - $(CC) -E $$preproc > $@ && rm $$preproc) - -testapps: - [ -z "$(THIS)" ] || ( if echo $(SDIRS) | fgrep ' des '; \ - then cd des && $(MAKE) -e des; fi ) - [ -z "$(THIS)" ] || ( cd pkcs7 && $(MAKE) -e testapps ); - @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi - -subdirs: - @target=all; $(RECURSIVE_MAKE) - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - @target=files; $(RECURSIVE_MAKE) - -links: - @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../apps $(APPS) - @target=links; $(RECURSIVE_MAKE) - -# lib: $(LIB): are splitted to avoid end-less loop -lib: $(LIB) - @touch lib -$(LIB): $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - [ -z "$(FIPSLIBDIR)" ] || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o - $(RANLIB) $(LIB) || echo Never mind. - -shared: buildinf.h lib subdirs - if [ -n "$(SHARED_LIBS)" ]; then \ - (cd ..; $(MAKE) $(SHARED_LIB)); \ - fi - -libs: - @target=lib; $(RECURSIVE_MAKE) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ;\ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - @target=install; $(RECURSIVE_MAKE) - -lint: - @target=lint; $(RECURSIVE_MAKE) - -depend: - @[ -z "$(THIS)" -o -f buildinf.h ] || touch buildinf.h # fake buildinf.h if it does not exist - @[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDE) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - @[ -z "$(THIS)" -o -s buildinf.h ] || rm buildinf.h - @[ -z "$(THIS)" ] || (set -e; target=depend; $(RECURSIVE_MAKE) ) - @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi - -clean: - rm -f buildinf.h *.s *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - @target=clean; $(RECURSIVE_MAKE) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - rm -f opensslconf.h - @target=dclean; $(RECURSIVE_MAKE) - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -cpt_err.o: ../include/openssl/bio.h ../include/openssl/crypto.h -cpt_err.o: ../include/openssl/e_os2.h ../include/openssl/err.h -cpt_err.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h -cpt_err.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -cpt_err.o: ../include/openssl/safestack.h ../include/openssl/stack.h -cpt_err.o: ../include/openssl/symhacks.h cpt_err.c -cryptlib.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h -cryptlib.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -cryptlib.o: ../include/openssl/err.h ../include/openssl/lhash.h -cryptlib.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -cryptlib.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h -cryptlib.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.c -cryptlib.o: cryptlib.h -cversion.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h -cversion.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -cversion.o: ../include/openssl/err.h ../include/openssl/lhash.h -cversion.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -cversion.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h -cversion.o: ../include/openssl/stack.h ../include/openssl/symhacks.h buildinf.h -cversion.o: cryptlib.h cversion.c -ebcdic.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h ebcdic.c -ex_data.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h -ex_data.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -ex_data.o: ../include/openssl/err.h ../include/openssl/lhash.h -ex_data.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -ex_data.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h -ex_data.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h -ex_data.o: ex_data.c -fips_ers.o: ../include/openssl/opensslconf.h fips_ers.c -mem.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h -mem.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -mem.o: ../include/openssl/err.h ../include/openssl/lhash.h -mem.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -mem.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h -mem.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h -mem.o: mem.c -mem_clr.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -mem_clr.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -mem_clr.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h -mem_clr.o: ../include/openssl/stack.h ../include/openssl/symhacks.h mem_clr.c -mem_dbg.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h -mem_dbg.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -mem_dbg.o: ../include/openssl/err.h ../include/openssl/lhash.h -mem_dbg.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -mem_dbg.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h -mem_dbg.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h -mem_dbg.o: mem_dbg.c -o_dir.o: ../e_os.h ../include/openssl/e_os2.h ../include/openssl/opensslconf.h -o_dir.o: LPdir_unix.c o_dir.c o_dir.h -o_fips.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h -o_fips.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -o_fips.o: ../include/openssl/err.h ../include/openssl/lhash.h -o_fips.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -o_fips.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h -o_fips.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h -o_fips.o: o_fips.c -o_init.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/crypto.h -o_init.o: ../include/openssl/e_os2.h ../include/openssl/err.h -o_init.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h -o_init.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -o_init.o: ../include/openssl/safestack.h ../include/openssl/stack.h -o_init.o: ../include/openssl/symhacks.h o_init.c -o_str.o: ../e_os.h ../include/openssl/e_os2.h ../include/openssl/opensslconf.h -o_str.o: o_str.c o_str.h -o_time.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h o_time.c -o_time.o: o_time.h -uid.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -uid.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -uid.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h -uid.o: ../include/openssl/stack.h ../include/openssl/symhacks.h uid.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/md4/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/md4/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/md4/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/md4/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,89 +0,0 @@ -# -# OpenSSL/crypto/md4/Makefile -# - -DIR= md4 -TOP= ../.. -CC= cc -CPP= $(CC) -E -INCLUDES= -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile -TEST=md4test.c -APPS=md4.c - -LIB=$(TOP)/libcrypto.a -LIBSRC=md4_dgst.c md4_one.c -LIBOBJ=md4_dgst.o md4_one.o - -SRC= $(LIBSRC) - -EXHEADER= md4.h -HEADER= md4_locl.h $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - rm -f ../../include/openssl/$(EXHEADER) ../../test/$(TEST) ../../apps/$(APPS) - -clean: - rm -f asm/mx86unix.cpp *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -md4_dgst.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -md4_dgst.o: ../../include/openssl/md4.h ../../include/openssl/opensslconf.h -md4_dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -md4_dgst.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -md4_dgst.o: ../../include/openssl/symhacks.h ../md32_common.h md4_dgst.c -md4_dgst.o: md4_locl.h -md4_one.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -md4_one.o: ../../include/openssl/md4.h ../../include/openssl/opensslconf.h -md4_one.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -md4_one.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -md4_one.o: ../../include/openssl/symhacks.h md4_one.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/md5/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/md5/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/md5/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/md5/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,102 +0,0 @@ -# -# OpenSSL/crypto/md5/Makefile -# - -DIR= md5 -TOP= ../.. -CC= cc -CPP= $(CC) -E -INCLUDES=-I.. -I$(TOP) -I../../include -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -MD5_ASM_OBJ= - -CFLAGS= $(INCLUDES) $(CFLAG) -ASFLAGS= $(INCLUDES) $(ASFLAG) -AFLAGS= $(ASFLAGS) - -GENERAL=Makefile -TEST=md5test.c -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC=md5_dgst.c md5_one.c -LIBOBJ=md5_dgst.o md5_one.o $(MD5_ASM_OBJ) - -SRC= $(LIBSRC) - -EXHEADER= md5.h -HEADER= md5_locl.h $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -md5-586.s: asm/md5-586.pl ../perlasm/x86asm.pl - $(PERL) asm/md5-586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@ - -md5-x86_64.s: asm/md5-x86_64.pl - $(PERL) asm/md5-x86_64.pl $(PERLASM_SCHEME) > $@ - -md5-ia64.s: asm/md5-ia64.S - $(CC) $(CFLAGS) -E asm/md5-ia64.S | \ - $(PERL) -ne 's/;\s+/;\n/g; print;' > $@ - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -md5_dgst.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -md5_dgst.o: ../../include/openssl/md5.h ../../include/openssl/opensslconf.h -md5_dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -md5_dgst.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -md5_dgst.o: ../../include/openssl/symhacks.h ../md32_common.h md5_dgst.c -md5_dgst.o: md5_locl.h -md5_one.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -md5_one.o: ../../include/openssl/md5.h ../../include/openssl/opensslconf.h -md5_one.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -md5_one.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -md5_one.o: ../../include/openssl/symhacks.h md5_one.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/mdc2/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/mdc2/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/mdc2/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/mdc2/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,93 +0,0 @@ -# -# OpenSSL/crypto/mdc2/Makefile -# - -DIR= mdc2 -TOP= ../.. -CC= cc -INCLUDES= -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile -TEST= mdc2test.c -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC=mdc2dgst.c mdc2_one.c -LIBOBJ=mdc2dgst.o mdc2_one.o - -SRC= $(LIBSRC) - -EXHEADER= mdc2.h -HEADER= $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -mdc2_one.o: ../../e_os.h ../../include/openssl/bio.h -mdc2_one.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -mdc2_one.o: ../../include/openssl/des.h ../../include/openssl/des_old.h -mdc2_one.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -mdc2_one.o: ../../include/openssl/lhash.h ../../include/openssl/mdc2.h -mdc2_one.o: ../../include/openssl/opensslconf.h -mdc2_one.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -mdc2_one.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -mdc2_one.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h -mdc2_one.o: ../../include/openssl/ui_compat.h ../cryptlib.h mdc2_one.c -mdc2dgst.o: ../../include/openssl/crypto.h ../../include/openssl/des.h -mdc2dgst.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h -mdc2dgst.o: ../../include/openssl/mdc2.h ../../include/openssl/opensslconf.h -mdc2dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -mdc2dgst.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -mdc2dgst.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h -mdc2dgst.o: ../../include/openssl/ui_compat.h mdc2dgst.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/modes/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/modes/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/modes/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/modes/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,144 +0,0 @@ -# -# OpenSSL/crypto/modes/Makefile -# - -DIR= modes -TOP= ../.. -CC= cc -INCLUDES= -I.. -I$(TOP) -I../../include -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -MODES_ASM_OBJ= - -CFLAGS= $(INCLUDES) $(CFLAG) -ASFLAGS= $(INCLUDES) $(ASFLAG) -AFLAGS= $(ASFLAGS) - -GENERAL=Makefile -TEST= -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC= cbc128.c ctr128.c cts128.c cfb128.c ofb128.c gcm128.c \ - ccm128.c xts128.c -LIBOBJ= cbc128.o ctr128.o cts128.o cfb128.o ofb128.o gcm128.o \ - ccm128.o xts128.o $(MODES_ASM_OBJ) - -SRC= $(LIBSRC) - -#EXHEADER= store.h str_compat.h -EXHEADER= modes.h -HEADER= modes_lcl.h $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -ghash-ia64.s: asm/ghash-ia64.pl - $(PERL) asm/ghash-ia64.pl $@ $(CFLAGS) -ghash-x86.s: asm/ghash-x86.pl - $(PERL) asm/ghash-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@ -ghash-x86_64.s: asm/ghash-x86_64.pl - $(PERL) asm/ghash-x86_64.pl $(PERLASM_SCHEME) > $@ -ghash-sparcv9.s: asm/ghash-sparcv9.pl - $(PERL) asm/ghash-sparcv9.pl $@ $(CFLAGS) -ghash-alpha.s: asm/ghash-alpha.pl - (preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \ - $(PERL) asm/ghash-alpha.pl > $$preproc && \ - $(CC) -E $$preproc > $@ && rm $$preproc) - -ghash-parisc.s: asm/ghash-parisc.pl - $(PERL) asm/ghash-parisc.pl $(PERLASM_SCHEME) $@ - -# GNU make "catch all" -ghash-%.S: asm/ghash-%.pl; $(PERL) $< $(PERLASM_SCHEME) $@ - -ghash-armv4.o: ghash-armv4.S - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.s *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -cbc128.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -cbc128.o: ../../include/openssl/modes.h ../../include/openssl/opensslconf.h -cbc128.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -cbc128.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -cbc128.o: ../../include/openssl/symhacks.h cbc128.c modes_lcl.h -ccm128.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -ccm128.o: ../../include/openssl/modes.h ../../include/openssl/opensslconf.h -ccm128.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ccm128.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -ccm128.o: ../../include/openssl/symhacks.h ccm128.c modes_lcl.h -cfb128.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -cfb128.o: ../../include/openssl/modes.h ../../include/openssl/opensslconf.h -cfb128.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -cfb128.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -cfb128.o: ../../include/openssl/symhacks.h cfb128.c modes_lcl.h -ctr128.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -ctr128.o: ../../include/openssl/modes.h ../../include/openssl/opensslconf.h -ctr128.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ctr128.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -ctr128.o: ../../include/openssl/symhacks.h ctr128.c modes_lcl.h -cts128.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -cts128.o: ../../include/openssl/modes.h ../../include/openssl/opensslconf.h -cts128.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -cts128.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -cts128.o: ../../include/openssl/symhacks.h cts128.c modes_lcl.h -gcm128.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -gcm128.o: ../../include/openssl/modes.h ../../include/openssl/opensslconf.h -gcm128.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -gcm128.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -gcm128.o: ../../include/openssl/symhacks.h gcm128.c modes_lcl.h -ofb128.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -ofb128.o: ../../include/openssl/modes.h ../../include/openssl/opensslconf.h -ofb128.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ofb128.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -ofb128.o: ../../include/openssl/symhacks.h modes_lcl.h ofb128.c -xts128.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -xts128.o: ../../include/openssl/modes.h ../../include/openssl/opensslconf.h -xts128.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -xts128.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -xts128.o: ../../include/openssl/symhacks.h modes_lcl.h xts128.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/objects/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/objects/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/objects/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/objects/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,130 +0,0 @@ -# -# OpenSSL/crypto/objects/Makefile -# - -DIR= objects -TOP= ../.. -CC= cc -INCLUDES= -I.. -I$(TOP) -I../../include -CFLAG=-g -MAKEFILE= Makefile -AR= ar r -PERL= perl - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile README -TEST= -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC= o_names.c obj_dat.c obj_lib.c obj_err.c obj_xref.c -LIBOBJ= o_names.o obj_dat.o obj_lib.o obj_err.o obj_xref.o - -SRC= $(LIBSRC) - -EXHEADER= objects.h obj_mac.h -HEADER= $(EXHEADER) obj_dat.h obj_xref.h - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: obj_dat.h obj_xref.h lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -obj_dat.h: obj_dat.pl obj_mac.h - $(PERL) obj_dat.pl obj_mac.h obj_dat.h - -# objects.pl both reads and writes obj_mac.num -obj_mac.h: objects.pl objects.txt obj_mac.num - $(PERL) objects.pl objects.txt obj_mac.num obj_mac.h - @sleep 1; touch obj_mac.h; sleep 1 - -obj_xref.h: objxref.pl obj_xref.txt obj_mac.num - $(PERL) objxref.pl obj_mac.num obj_xref.txt > obj_xref.h - @sleep 1; touch obj_xref.h; sleep 1 - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -o_names.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -o_names.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -o_names.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -o_names.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -o_names.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -o_names.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -o_names.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -o_names.o: o_names.c -obj_dat.o: ../../e_os.h ../../include/openssl/asn1.h -obj_dat.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -obj_dat.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -obj_dat.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -obj_dat.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -obj_dat.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -obj_dat.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -obj_dat.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -obj_dat.o: ../../include/openssl/symhacks.h ../cryptlib.h obj_dat.c obj_dat.h -obj_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -obj_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -obj_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -obj_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -obj_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -obj_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -obj_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -obj_err.o: obj_err.c -obj_lib.o: ../../e_os.h ../../include/openssl/asn1.h -obj_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -obj_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -obj_lib.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -obj_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -obj_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -obj_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -obj_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -obj_lib.o: ../cryptlib.h obj_lib.c -obj_xref.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -obj_xref.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -obj_xref.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -obj_xref.o: ../../include/openssl/opensslconf.h -obj_xref.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -obj_xref.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -obj_xref.o: ../../include/openssl/symhacks.h obj_xref.c obj_xref.h diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/ocsp/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/ocsp/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/ocsp/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/ocsp/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,213 +0,0 @@ -# -# OpenSSL/ocsp/Makefile -# - -DIR= ocsp -TOP= ../.. -CC= cc -INCLUDES= -I.. -I$(TOP) -I../../include -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile README -TEST= -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC= ocsp_asn.c ocsp_ext.c ocsp_ht.c ocsp_lib.c ocsp_cl.c \ - ocsp_srv.c ocsp_prn.c ocsp_vfy.c ocsp_err.c - -LIBOBJ= ocsp_asn.o ocsp_ext.o ocsp_ht.o ocsp_lib.o ocsp_cl.o \ - ocsp_srv.o ocsp_prn.o ocsp_vfy.o ocsp_err.o - -SRC= $(LIBSRC) - -EXHEADER= ocsp.h -HEADER= $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -ocsp_asn.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h -ocsp_asn.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -ocsp_asn.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -ocsp_asn.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ocsp_asn.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -ocsp_asn.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -ocsp_asn.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -ocsp_asn.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h -ocsp_asn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ocsp_asn.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -ocsp_asn.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -ocsp_asn.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -ocsp_asn.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -ocsp_asn.o: ocsp_asn.c -ocsp_cl.o: ../../e_os.h ../../include/openssl/asn1.h -ocsp_cl.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -ocsp_cl.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -ocsp_cl.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ocsp_cl.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -ocsp_cl.o: ../../include/openssl/err.h ../../include/openssl/evp.h -ocsp_cl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -ocsp_cl.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h -ocsp_cl.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -ocsp_cl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h -ocsp_cl.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h -ocsp_cl.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -ocsp_cl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -ocsp_cl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -ocsp_cl.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -ocsp_cl.o: ../cryptlib.h ocsp_cl.c -ocsp_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -ocsp_err.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h -ocsp_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -ocsp_err.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -ocsp_err.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -ocsp_err.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -ocsp_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -ocsp_err.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h -ocsp_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ocsp_err.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -ocsp_err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -ocsp_err.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -ocsp_err.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -ocsp_err.o: ocsp_err.c -ocsp_ext.o: ../../e_os.h ../../include/openssl/asn1.h -ocsp_ext.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -ocsp_ext.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -ocsp_ext.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ocsp_ext.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -ocsp_ext.o: ../../include/openssl/err.h ../../include/openssl/evp.h -ocsp_ext.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -ocsp_ext.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h -ocsp_ext.o: ../../include/openssl/opensslconf.h -ocsp_ext.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ocsp_ext.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -ocsp_ext.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -ocsp_ext.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -ocsp_ext.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -ocsp_ext.o: ../../include/openssl/x509v3.h ../cryptlib.h ocsp_ext.c -ocsp_ht.o: ../../e_os.h ../../include/openssl/asn1.h -ocsp_ht.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -ocsp_ht.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -ocsp_ht.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ocsp_ht.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -ocsp_ht.o: ../../include/openssl/err.h ../../include/openssl/evp.h -ocsp_ht.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -ocsp_ht.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h -ocsp_ht.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -ocsp_ht.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -ocsp_ht.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -ocsp_ht.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -ocsp_ht.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -ocsp_ht.o: ../../include/openssl/x509v3.h ocsp_ht.c -ocsp_lib.o: ../../e_os.h ../../include/openssl/asn1.h -ocsp_lib.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -ocsp_lib.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h -ocsp_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -ocsp_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -ocsp_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -ocsp_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -ocsp_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -ocsp_lib.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h -ocsp_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ocsp_lib.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h -ocsp_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -ocsp_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -ocsp_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -ocsp_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -ocsp_lib.o: ../../include/openssl/x509v3.h ../cryptlib.h ocsp_lib.c -ocsp_prn.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -ocsp_prn.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h -ocsp_prn.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -ocsp_prn.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -ocsp_prn.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -ocsp_prn.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -ocsp_prn.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -ocsp_prn.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h -ocsp_prn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ocsp_prn.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h -ocsp_prn.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -ocsp_prn.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -ocsp_prn.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -ocsp_prn.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -ocsp_prn.o: ocsp_prn.c -ocsp_srv.o: ../../e_os.h ../../include/openssl/asn1.h -ocsp_srv.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -ocsp_srv.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -ocsp_srv.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ocsp_srv.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -ocsp_srv.o: ../../include/openssl/err.h ../../include/openssl/evp.h -ocsp_srv.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -ocsp_srv.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h -ocsp_srv.o: ../../include/openssl/opensslconf.h -ocsp_srv.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ocsp_srv.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h -ocsp_srv.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -ocsp_srv.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -ocsp_srv.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -ocsp_srv.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -ocsp_srv.o: ../../include/openssl/x509v3.h ../cryptlib.h ocsp_srv.c -ocsp_vfy.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -ocsp_vfy.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h -ocsp_vfy.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -ocsp_vfy.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -ocsp_vfy.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -ocsp_vfy.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -ocsp_vfy.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -ocsp_vfy.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h -ocsp_vfy.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ocsp_vfy.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -ocsp_vfy.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -ocsp_vfy.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -ocsp_vfy.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -ocsp_vfy.o: ocsp_vfy.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/opensslv.h nodejs-0.10.29/deps/openssl/openssl/crypto/opensslv.h --- nodejs-0.10.28/deps/openssl/openssl/crypto/opensslv.h 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/opensslv.h 2014-06-09 17:04:36.000000000 +0000 @@ -25,11 +25,11 @@ * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for * major minor fix final patch/beta) */ -#define OPENSSL_VERSION_NUMBER 0x1000107fL +#define OPENSSL_VERSION_NUMBER 0x1000108fL #ifdef OPENSSL_FIPS -#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1g-fips 7 Apr 2014" +#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1h-fips 5 Jun 2014" #else -#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1g 7 Apr 2014" +#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1h 5 Jun 2014" #endif #define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/pem/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/pem/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/pem/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/pem/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,258 +0,0 @@ -# -# OpenSSL/crypto/pem/Makefile -# - -DIR= pem -TOP= ../.. -CC= cc -INCLUDES= -I.. -I$(TOP) -I../../include -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile -TEST= -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC= pem_sign.c pem_seal.c pem_info.c pem_lib.c pem_all.c pem_err.c \ - pem_x509.c pem_xaux.c pem_oth.c pem_pk8.c pem_pkey.c pvkfmt.c - -LIBOBJ= pem_sign.o pem_seal.o pem_info.o pem_lib.o pem_all.o pem_err.o \ - pem_x509.o pem_xaux.o pem_oth.o pem_pk8.o pem_pkey.o pvkfmt.o - -SRC= $(LIBSRC) - -EXHEADER= pem.h pem2.h -HEADER= $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -pem_all.o: ../../e_os.h ../../include/openssl/asn1.h -pem_all.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -pem_all.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h -pem_all.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h -pem_all.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -pem_all.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -pem_all.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -pem_all.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -pem_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -pem_all.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h -pem_all.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h -pem_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -pem_all.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -pem_all.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -pem_all.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pem_all.c -pem_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -pem_err.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -pem_err.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -pem_err.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -pem_err.o: ../../include/openssl/err.h ../../include/openssl/evp.h -pem_err.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -pem_err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -pem_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -pem_err.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h -pem_err.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -pem_err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -pem_err.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -pem_err.o: ../../include/openssl/x509_vfy.h pem_err.c -pem_info.o: ../../e_os.h ../../include/openssl/asn1.h -pem_info.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -pem_info.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h -pem_info.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -pem_info.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -pem_info.o: ../../include/openssl/err.h ../../include/openssl/evp.h -pem_info.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -pem_info.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -pem_info.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -pem_info.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h -pem_info.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h -pem_info.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -pem_info.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -pem_info.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -pem_info.o: ../cryptlib.h pem_info.c -pem_lib.o: ../../e_os.h ../../include/openssl/asn1.h -pem_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -pem_lib.o: ../../include/openssl/crypto.h ../../include/openssl/des.h -pem_lib.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h -pem_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -pem_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -pem_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h -pem_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -pem_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -pem_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -pem_lib.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h -pem_lib.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h -pem_lib.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -pem_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -pem_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h -pem_lib.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h -pem_lib.o: ../../include/openssl/x509_vfy.h ../asn1/asn1_locl.h ../cryptlib.h -pem_lib.o: pem_lib.c -pem_oth.o: ../../e_os.h ../../include/openssl/asn1.h -pem_oth.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -pem_oth.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -pem_oth.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -pem_oth.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -pem_oth.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -pem_oth.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -pem_oth.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -pem_oth.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h -pem_oth.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h -pem_oth.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -pem_oth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -pem_oth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -pem_oth.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pem_oth.c -pem_pk8.o: ../../e_os.h ../../include/openssl/asn1.h -pem_pk8.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -pem_pk8.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -pem_pk8.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -pem_pk8.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -pem_pk8.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -pem_pk8.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -pem_pk8.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -pem_pk8.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h -pem_pk8.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs12.h -pem_pk8.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -pem_pk8.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -pem_pk8.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -pem_pk8.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -pem_pk8.o: ../cryptlib.h pem_pk8.c -pem_pkey.o: ../../e_os.h ../../include/openssl/asn1.h -pem_pkey.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -pem_pkey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -pem_pkey.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -pem_pkey.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -pem_pkey.o: ../../include/openssl/err.h ../../include/openssl/evp.h -pem_pkey.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -pem_pkey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -pem_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -pem_pkey.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h -pem_pkey.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h -pem_pkey.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -pem_pkey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -pem_pkey.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -pem_pkey.o: ../../include/openssl/x509_vfy.h ../asn1/asn1_locl.h ../cryptlib.h -pem_pkey.o: pem_pkey.c -pem_seal.o: ../../e_os.h ../../include/openssl/asn1.h -pem_seal.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -pem_seal.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -pem_seal.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -pem_seal.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -pem_seal.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -pem_seal.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -pem_seal.o: ../../include/openssl/opensslconf.h -pem_seal.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -pem_seal.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h -pem_seal.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -pem_seal.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -pem_seal.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -pem_seal.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -pem_seal.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pem_seal.c -pem_sign.o: ../../e_os.h ../../include/openssl/asn1.h -pem_sign.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -pem_sign.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -pem_sign.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -pem_sign.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -pem_sign.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -pem_sign.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -pem_sign.o: ../../include/openssl/opensslconf.h -pem_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -pem_sign.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h -pem_sign.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -pem_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -pem_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -pem_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -pem_sign.o: ../cryptlib.h pem_sign.c -pem_x509.o: ../../e_os.h ../../include/openssl/asn1.h -pem_x509.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -pem_x509.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -pem_x509.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -pem_x509.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -pem_x509.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -pem_x509.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -pem_x509.o: ../../include/openssl/opensslconf.h -pem_x509.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -pem_x509.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h -pem_x509.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -pem_x509.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -pem_x509.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -pem_x509.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pem_x509.c -pem_xaux.o: ../../e_os.h ../../include/openssl/asn1.h -pem_xaux.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -pem_xaux.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -pem_xaux.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -pem_xaux.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -pem_xaux.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -pem_xaux.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -pem_xaux.o: ../../include/openssl/opensslconf.h -pem_xaux.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -pem_xaux.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h -pem_xaux.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -pem_xaux.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -pem_xaux.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -pem_xaux.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pem_xaux.c -pvkfmt.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -pvkfmt.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -pvkfmt.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h -pvkfmt.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -pvkfmt.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -pvkfmt.o: ../../include/openssl/err.h ../../include/openssl/evp.h -pvkfmt.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -pvkfmt.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -pvkfmt.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -pvkfmt.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h -pvkfmt.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -pvkfmt.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -pvkfmt.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -pvkfmt.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -pvkfmt.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pvkfmt.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/pkcs12/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/pkcs12/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/pkcs12/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/pkcs12/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,286 +0,0 @@ -# -# OpenSSL/crypto/pkcs12/Makefile -# - -DIR= pkcs12 -TOP= ../.. -CC= cc -INCLUDES= -I.. -I$(TOP) -I../../include -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile -TEST= -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC= p12_add.c p12_asn.c p12_attr.c p12_crpt.c p12_crt.c p12_decr.c \ - p12_init.c p12_key.c p12_kiss.c p12_mutl.c\ - p12_utl.c p12_npas.c pk12err.c p12_p8d.c p12_p8e.c -LIBOBJ= p12_add.o p12_asn.o p12_attr.o p12_crpt.o p12_crt.o p12_decr.o \ - p12_init.o p12_key.o p12_kiss.o p12_mutl.o\ - p12_utl.o p12_npas.o pk12err.o p12_p8d.o p12_p8e.o - -SRC= $(LIBSRC) - -EXHEADER= pkcs12.h -HEADER= $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -test: - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -p12_add.o: ../../e_os.h ../../include/openssl/asn1.h -p12_add.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -p12_add.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -p12_add.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -p12_add.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -p12_add.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -p12_add.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -p12_add.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -p12_add.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h -p12_add.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -p12_add.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -p12_add.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -p12_add.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_add.c -p12_asn.o: ../../e_os.h ../../include/openssl/asn1.h -p12_asn.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -p12_asn.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -p12_asn.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -p12_asn.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -p12_asn.o: ../../include/openssl/err.h ../../include/openssl/evp.h -p12_asn.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -p12_asn.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -p12_asn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -p12_asn.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h -p12_asn.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -p12_asn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -p12_asn.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -p12_asn.o: ../cryptlib.h p12_asn.c -p12_attr.o: ../../e_os.h ../../include/openssl/asn1.h -p12_attr.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -p12_attr.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -p12_attr.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -p12_attr.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -p12_attr.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -p12_attr.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -p12_attr.o: ../../include/openssl/opensslconf.h -p12_attr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -p12_attr.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h -p12_attr.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -p12_attr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -p12_attr.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -p12_attr.o: ../cryptlib.h p12_attr.c -p12_crpt.o: ../../e_os.h ../../include/openssl/asn1.h -p12_crpt.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -p12_crpt.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -p12_crpt.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -p12_crpt.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -p12_crpt.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -p12_crpt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -p12_crpt.o: ../../include/openssl/opensslconf.h -p12_crpt.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -p12_crpt.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h -p12_crpt.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -p12_crpt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -p12_crpt.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -p12_crpt.o: ../cryptlib.h p12_crpt.c -p12_crt.o: ../../e_os.h ../../include/openssl/asn1.h -p12_crt.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -p12_crt.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -p12_crt.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -p12_crt.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -p12_crt.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -p12_crt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -p12_crt.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -p12_crt.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h -p12_crt.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -p12_crt.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -p12_crt.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -p12_crt.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_crt.c -p12_decr.o: ../../e_os.h ../../include/openssl/asn1.h -p12_decr.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -p12_decr.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -p12_decr.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -p12_decr.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -p12_decr.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -p12_decr.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -p12_decr.o: ../../include/openssl/opensslconf.h -p12_decr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -p12_decr.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h -p12_decr.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -p12_decr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -p12_decr.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -p12_decr.o: ../cryptlib.h p12_decr.c -p12_init.o: ../../e_os.h ../../include/openssl/asn1.h -p12_init.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -p12_init.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -p12_init.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -p12_init.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -p12_init.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -p12_init.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -p12_init.o: ../../include/openssl/opensslconf.h -p12_init.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -p12_init.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h -p12_init.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -p12_init.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -p12_init.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -p12_init.o: ../cryptlib.h p12_init.c -p12_key.o: ../../e_os.h ../../include/openssl/asn1.h -p12_key.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -p12_key.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -p12_key.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -p12_key.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -p12_key.o: ../../include/openssl/err.h ../../include/openssl/evp.h -p12_key.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -p12_key.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -p12_key.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -p12_key.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h -p12_key.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -p12_key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -p12_key.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -p12_key.o: ../cryptlib.h p12_key.c -p12_kiss.o: ../../e_os.h ../../include/openssl/asn1.h -p12_kiss.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -p12_kiss.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -p12_kiss.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -p12_kiss.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -p12_kiss.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -p12_kiss.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -p12_kiss.o: ../../include/openssl/opensslconf.h -p12_kiss.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -p12_kiss.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h -p12_kiss.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -p12_kiss.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -p12_kiss.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -p12_kiss.o: ../cryptlib.h p12_kiss.c -p12_mutl.o: ../../e_os.h ../../include/openssl/asn1.h -p12_mutl.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -p12_mutl.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -p12_mutl.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -p12_mutl.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -p12_mutl.o: ../../include/openssl/evp.h ../../include/openssl/hmac.h -p12_mutl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -p12_mutl.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -p12_mutl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -p12_mutl.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h -p12_mutl.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -p12_mutl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -p12_mutl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -p12_mutl.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_mutl.c -p12_npas.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -p12_npas.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -p12_npas.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -p12_npas.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -p12_npas.o: ../../include/openssl/err.h ../../include/openssl/evp.h -p12_npas.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -p12_npas.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -p12_npas.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -p12_npas.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h -p12_npas.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h -p12_npas.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -p12_npas.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -p12_npas.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -p12_npas.o: p12_npas.c -p12_p8d.o: ../../e_os.h ../../include/openssl/asn1.h -p12_p8d.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -p12_p8d.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -p12_p8d.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -p12_p8d.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -p12_p8d.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -p12_p8d.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -p12_p8d.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -p12_p8d.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h -p12_p8d.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -p12_p8d.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -p12_p8d.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -p12_p8d.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_p8d.c -p12_p8e.o: ../../e_os.h ../../include/openssl/asn1.h -p12_p8e.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -p12_p8e.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -p12_p8e.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -p12_p8e.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -p12_p8e.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -p12_p8e.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -p12_p8e.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -p12_p8e.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h -p12_p8e.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -p12_p8e.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -p12_p8e.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -p12_p8e.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_p8e.c -p12_utl.o: ../../e_os.h ../../include/openssl/asn1.h -p12_utl.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -p12_utl.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -p12_utl.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -p12_utl.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -p12_utl.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -p12_utl.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -p12_utl.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -p12_utl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h -p12_utl.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -p12_utl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -p12_utl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -p12_utl.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_utl.c -pk12err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -pk12err.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -pk12err.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -pk12err.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -pk12err.o: ../../include/openssl/err.h ../../include/openssl/evp.h -pk12err.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -pk12err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -pk12err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -pk12err.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h -pk12err.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -pk12err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -pk12err.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -pk12err.o: pk12err.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/pkcs12/p12_crt.c nodejs-0.10.29/deps/openssl/openssl/crypto/pkcs12/p12_crt.c --- nodejs-0.10.28/deps/openssl/openssl/crypto/pkcs12/p12_crt.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/pkcs12/p12_crt.c 2014-06-09 17:04:36.000000000 +0000 @@ -96,7 +96,11 @@ nid_cert = NID_pbe_WithSHA1And3_Key_TripleDES_CBC; else #endif +#ifdef OPENSSL_NO_RC2 + nid_cert = NID_pbe_WithSHA1And3_Key_TripleDES_CBC; +#else nid_cert = NID_pbe_WithSHA1And40BitRC2_CBC; +#endif } if (!nid_key) nid_key = NID_pbe_WithSHA1And3_Key_TripleDES_CBC; @@ -286,7 +290,11 @@ free_safes = 0; if (nid_safe == 0) +#ifdef OPENSSL_NO_RC2 + nid_safe = NID_pbe_WithSHA1And3_Key_TripleDES_CBC; +#else nid_safe = NID_pbe_WithSHA1And40BitRC2_CBC; +#endif if (nid_safe == -1) p7 = PKCS12_pack_p7data(bags); diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/pkcs12/p12_kiss.c nodejs-0.10.29/deps/openssl/openssl/crypto/pkcs12/p12_kiss.c --- nodejs-0.10.28/deps/openssl/openssl/crypto/pkcs12/p12_kiss.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/pkcs12/p12_kiss.c 2014-06-09 17:04:36.000000000 +0000 @@ -269,7 +269,7 @@ int len, r; unsigned char *data; len = ASN1_STRING_to_UTF8(&data, fname); - if(len > 0) { + if(len >= 0) { r = X509_alias_set1(x509, data, len); OPENSSL_free(data); if (!r) diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/pkcs7/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/pkcs7/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/pkcs7/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/pkcs7/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,194 +0,0 @@ -# -# OpenSSL/crypto/pkcs7/Makefile -# - -DIR= pkcs7 -TOP= ../.. -CC= cc -INCLUDES= -I.. -I$(TOP) -I../../include -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -PEX_LIBS= -EX_LIBS= - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile README -TEST= -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC= pk7_asn1.c pk7_lib.c pkcs7err.c pk7_doit.c pk7_smime.c pk7_attr.c \ - pk7_mime.c bio_pk7.c -LIBOBJ= pk7_asn1.o pk7_lib.o pkcs7err.o pk7_doit.o pk7_smime.o pk7_attr.o \ - pk7_mime.o bio_pk7.o - -SRC= $(LIBSRC) - -EXHEADER= pkcs7.h -HEADER= $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -test: - -all: lib - -testapps: enc dec sign verify - -enc: enc.o lib - $(CC) $(CFLAGS) -o enc enc.o $(PEX_LIBS) $(LIB) $(EX_LIBS) - -dec: dec.o lib - $(CC) $(CFLAGS) -o dec dec.o $(PEX_LIBS) $(LIB) $(EX_LIBS) - -sign: sign.o lib - $(CC) $(CFLAGS) -o sign sign.o $(PEX_LIBS) $(LIB) $(EX_LIBS) - -verify: verify.o example.o lib - $(CC) $(CFLAGS) -o verify verify.o $(PEX_LIBS) example.o $(LIB) $(EX_LIBS) - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff enc dec sign verify - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -bio_pk7.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -bio_pk7.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -bio_pk7.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -bio_pk7.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -bio_pk7.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bio_pk7.o: ../../include/openssl/symhacks.h bio_pk7.c -pk7_asn1.o: ../../e_os.h ../../include/openssl/asn1.h -pk7_asn1.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -pk7_asn1.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -pk7_asn1.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -pk7_asn1.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -pk7_asn1.o: ../../include/openssl/err.h ../../include/openssl/evp.h -pk7_asn1.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -pk7_asn1.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -pk7_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -pk7_asn1.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -pk7_asn1.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -pk7_asn1.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -pk7_asn1.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pk7_asn1.c -pk7_attr.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h -pk7_attr.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -pk7_attr.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -pk7_attr.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -pk7_attr.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -pk7_attr.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -pk7_attr.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -pk7_attr.o: ../../include/openssl/opensslconf.h -pk7_attr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -pk7_attr.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h -pk7_attr.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -pk7_attr.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -pk7_attr.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -pk7_attr.o: ../../include/openssl/x509_vfy.h pk7_attr.c -pk7_doit.o: ../../e_os.h ../../include/openssl/asn1.h -pk7_doit.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -pk7_doit.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -pk7_doit.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -pk7_doit.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -pk7_doit.o: ../../include/openssl/err.h ../../include/openssl/evp.h -pk7_doit.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -pk7_doit.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -pk7_doit.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -pk7_doit.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -pk7_doit.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -pk7_doit.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -pk7_doit.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -pk7_doit.o: ../../include/openssl/x509v3.h ../cryptlib.h pk7_doit.c -pk7_lib.o: ../../e_os.h ../../include/openssl/asn1.h -pk7_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -pk7_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -pk7_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -pk7_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -pk7_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -pk7_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -pk7_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -pk7_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -pk7_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -pk7_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -pk7_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -pk7_lib.o: ../asn1/asn1_locl.h ../cryptlib.h pk7_lib.c -pk7_mime.o: ../../e_os.h ../../include/openssl/asn1.h -pk7_mime.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -pk7_mime.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -pk7_mime.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -pk7_mime.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -pk7_mime.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -pk7_mime.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -pk7_mime.o: ../../include/openssl/opensslconf.h -pk7_mime.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -pk7_mime.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -pk7_mime.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -pk7_mime.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -pk7_mime.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -pk7_mime.o: ../cryptlib.h pk7_mime.c -pk7_smime.o: ../../e_os.h ../../include/openssl/asn1.h -pk7_smime.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -pk7_smime.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -pk7_smime.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -pk7_smime.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -pk7_smime.o: ../../include/openssl/err.h ../../include/openssl/evp.h -pk7_smime.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -pk7_smime.o: ../../include/openssl/objects.h -pk7_smime.o: ../../include/openssl/opensslconf.h -pk7_smime.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -pk7_smime.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -pk7_smime.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -pk7_smime.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -pk7_smime.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -pk7_smime.o: ../cryptlib.h pk7_smime.c -pkcs7err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -pkcs7err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -pkcs7err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -pkcs7err.o: ../../include/openssl/opensslconf.h -pkcs7err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -pkcs7err.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -pkcs7err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -pkcs7err.o: pkcs7err.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/pkcs7/pk7_doit.c nodejs-0.10.29/deps/openssl/openssl/crypto/pkcs7/pk7_doit.c --- nodejs-0.10.28/deps/openssl/openssl/crypto/pkcs7/pk7_doit.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/pkcs7/pk7_doit.c 2014-06-09 17:04:36.000000000 +0000 @@ -440,6 +440,11 @@ { case NID_pkcs7_signed: data_body=PKCS7_get_octet_string(p7->d.sign->contents); + if (!PKCS7_is_detached(p7) && data_body == NULL) + { + PKCS7err(PKCS7_F_PKCS7_DATADECODE,PKCS7_R_INVALID_SIGNED_DATA_TYPE); + goto err; + } md_sk=p7->d.sign->md_algs; break; case NID_pkcs7_signedAndEnveloped: @@ -928,6 +933,7 @@ if (EVP_DigestSignUpdate(&mctx,abuf,alen) <= 0) goto err; OPENSSL_free(abuf); + abuf = NULL; if (EVP_DigestSignFinal(&mctx, NULL, &siglen) <= 0) goto err; abuf = OPENSSL_malloc(siglen); diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/pkcs7/pkcs7err.c nodejs-0.10.29/deps/openssl/openssl/crypto/pkcs7/pkcs7err.c --- nodejs-0.10.28/deps/openssl/openssl/crypto/pkcs7/pkcs7err.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/pkcs7/pkcs7err.c 2014-06-09 17:04:36.000000000 +0000 @@ -1,6 +1,6 @@ /* crypto/pkcs7/pkcs7err.c */ /* ==================================================================== - * Copyright (c) 1999-2007 The OpenSSL Project. All rights reserved. + * Copyright (c) 1999-2014 The OpenSSL Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -130,6 +130,7 @@ {ERR_REASON(PKCS7_R_ERROR_SETTING_CIPHER),"error setting cipher"}, {ERR_REASON(PKCS7_R_INVALID_MIME_TYPE) ,"invalid mime type"}, {ERR_REASON(PKCS7_R_INVALID_NULL_POINTER),"invalid null pointer"}, +{ERR_REASON(PKCS7_R_INVALID_SIGNED_DATA_TYPE),"invalid signed data type"}, {ERR_REASON(PKCS7_R_MIME_NO_CONTENT_TYPE),"mime no content type"}, {ERR_REASON(PKCS7_R_MIME_PARSE_ERROR) ,"mime parse error"}, {ERR_REASON(PKCS7_R_MIME_SIG_PARSE_ERROR),"mime sig parse error"}, diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/pkcs7/pkcs7.h nodejs-0.10.29/deps/openssl/openssl/crypto/pkcs7/pkcs7.h --- nodejs-0.10.28/deps/openssl/openssl/crypto/pkcs7/pkcs7.h 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/pkcs7/pkcs7.h 2014-06-09 17:04:36.000000000 +0000 @@ -453,6 +453,7 @@ #define PKCS7_R_ERROR_SETTING_CIPHER 121 #define PKCS7_R_INVALID_MIME_TYPE 131 #define PKCS7_R_INVALID_NULL_POINTER 143 +#define PKCS7_R_INVALID_SIGNED_DATA_TYPE 155 #define PKCS7_R_MIME_NO_CONTENT_TYPE 132 #define PKCS7_R_MIME_PARSE_ERROR 133 #define PKCS7_R_MIME_SIG_PARSE_ERROR 134 diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/pqueue/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/pqueue/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/pqueue/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/pqueue/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,83 +0,0 @@ -# -# OpenSSL/crypto/pqueue/Makefile -# - -DIR= pqueue -TOP= ../.. -CC= cc -INCLUDES= -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile -TEST= -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC=pqueue.c -LIBOBJ=pqueue.o - -SRC= $(LIBSRC) - -EXHEADER= pqueue.h -HEADER= $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -pqueue.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h -pqueue.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -pqueue.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -pqueue.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -pqueue.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -pqueue.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -pqueue.o: ../../include/openssl/symhacks.h ../cryptlib.h pqueue.c pqueue.h diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/rand/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/rand/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/rand/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/rand/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,164 +0,0 @@ -# -# OpenSSL/crypto/rand/Makefile -# - -DIR= rand -TOP= ../.. -CC= cc -INCLUDES= -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile -TEST= randtest.c -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC=md_rand.c randfile.c rand_lib.c rand_err.c rand_egd.c \ - rand_win.c rand_unix.c rand_os2.c rand_nw.c -LIBOBJ=md_rand.o randfile.o rand_lib.o rand_err.o rand_egd.o \ - rand_win.o rand_unix.o rand_os2.o rand_nw.o - -SRC= $(LIBSRC) - -EXHEADER= rand.h -HEADER= $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -md_rand.o: ../../e_os.h ../../include/openssl/asn1.h -md_rand.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h -md_rand.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -md_rand.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -md_rand.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -md_rand.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -md_rand.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h -md_rand.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -md_rand.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -md_rand.o: md_rand.c rand_lcl.h -rand_egd.o: ../../include/openssl/buffer.h ../../include/openssl/e_os2.h -rand_egd.o: ../../include/openssl/opensslconf.h -rand_egd.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h -rand_egd.o: rand_egd.c -rand_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h -rand_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -rand_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -rand_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -rand_err.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -rand_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -rand_err.o: rand_err.c -rand_lib.o: ../../e_os.h ../../include/openssl/asn1.h -rand_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -rand_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -rand_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -rand_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -rand_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h -rand_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -rand_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -rand_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -rand_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -rand_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -rand_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -rand_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -rand_lib.o: ../cryptlib.h rand_lib.c -rand_nw.o: ../../e_os.h ../../include/openssl/asn1.h -rand_nw.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -rand_nw.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -rand_nw.o: ../../include/openssl/err.h ../../include/openssl/evp.h -rand_nw.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -rand_nw.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -rand_nw.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -rand_nw.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -rand_nw.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -rand_nw.o: ../../include/openssl/symhacks.h ../cryptlib.h rand_lcl.h rand_nw.c -rand_os2.o: ../../e_os.h ../../include/openssl/asn1.h -rand_os2.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -rand_os2.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -rand_os2.o: ../../include/openssl/err.h ../../include/openssl/evp.h -rand_os2.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -rand_os2.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -rand_os2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -rand_os2.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -rand_os2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -rand_os2.o: ../../include/openssl/symhacks.h ../cryptlib.h rand_lcl.h -rand_os2.o: rand_os2.c -rand_unix.o: ../../e_os.h ../../include/openssl/asn1.h -rand_unix.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -rand_unix.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -rand_unix.o: ../../include/openssl/err.h ../../include/openssl/evp.h -rand_unix.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -rand_unix.o: ../../include/openssl/objects.h -rand_unix.o: ../../include/openssl/opensslconf.h -rand_unix.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -rand_unix.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -rand_unix.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -rand_unix.o: ../../include/openssl/symhacks.h ../cryptlib.h rand_lcl.h -rand_unix.o: rand_unix.c -rand_win.o: ../../e_os.h ../../include/openssl/asn1.h -rand_win.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -rand_win.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -rand_win.o: ../../include/openssl/err.h ../../include/openssl/evp.h -rand_win.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -rand_win.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -rand_win.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -rand_win.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -rand_win.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -rand_win.o: ../../include/openssl/symhacks.h ../cryptlib.h rand_lcl.h -rand_win.o: rand_win.c -randfile.o: ../../e_os.h ../../include/openssl/buffer.h -randfile.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -randfile.o: ../../include/openssl/opensslconf.h -randfile.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -randfile.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -randfile.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -randfile.o: randfile.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/rc2/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/rc2/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/rc2/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/rc2/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,90 +0,0 @@ -# -# OpenSSL/crypto/rc2/Makefile -# - -DIR= rc2 -TOP= ../.. -CC= cc -INCLUDES= -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile -TEST=rc2test.c -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC=rc2_ecb.c rc2_skey.c rc2_cbc.c rc2cfb64.c rc2ofb64.c -LIBOBJ=rc2_ecb.o rc2_skey.o rc2_cbc.o rc2cfb64.o rc2ofb64.o - -SRC= $(LIBSRC) - -EXHEADER= rc2.h -HEADER= rc2_locl.h $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -rc2_cbc.o: ../../include/openssl/opensslconf.h ../../include/openssl/rc2.h -rc2_cbc.o: rc2_cbc.c rc2_locl.h -rc2_ecb.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -rc2_ecb.o: ../../include/openssl/rc2.h rc2_ecb.c rc2_locl.h -rc2_skey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -rc2_skey.o: ../../include/openssl/opensslconf.h -rc2_skey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -rc2_skey.o: ../../include/openssl/rc2.h ../../include/openssl/safestack.h -rc2_skey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -rc2_skey.o: rc2_locl.h rc2_skey.c -rc2cfb64.o: ../../include/openssl/opensslconf.h ../../include/openssl/rc2.h -rc2cfb64.o: rc2_locl.h rc2cfb64.c -rc2ofb64.o: ../../include/openssl/opensslconf.h ../../include/openssl/rc2.h -rc2ofb64.o: rc2_locl.h rc2ofb64.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/rc4/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/rc4/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/rc4/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/rc4/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,125 +0,0 @@ -# -# OpenSSL/crypto/rc4/Makefile -# - -DIR= rc4 -TOP= ../.. -CC= cc -CPP= $(CC) -E -INCLUDES= -CFLAG=-g -AR= ar r - -RC4_ENC=rc4_enc.o rc4_skey.o - -CFLAGS= $(INCLUDES) $(CFLAG) -ASFLAGS= $(INCLUDES) $(ASFLAG) -AFLAGS= $(ASFLAGS) - -GENERAL=Makefile -TEST=rc4test.c -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC=rc4_skey.c rc4_enc.c rc4_utl.c -LIBOBJ=$(RC4_ENC) rc4_utl.o - -SRC= $(LIBSRC) - -EXHEADER= rc4.h -HEADER= $(EXHEADER) rc4_locl.h - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -rc4-586.s: asm/rc4-586.pl ../perlasm/x86asm.pl - $(PERL) asm/rc4-586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@ - -rc4-x86_64.s: asm/rc4-x86_64.pl - $(PERL) asm/rc4-x86_64.pl $(PERLASM_SCHEME) > $@ -rc4-md5-x86_64.s: asm/rc4-md5-x86_64.pl - $(PERL) asm/rc4-md5-x86_64.pl $(PERLASM_SCHEME) > $@ - -rc4-ia64.S: asm/rc4-ia64.pl - $(PERL) asm/rc4-ia64.pl $(CFLAGS) > $@ - -rc4-parisc.s: asm/rc4-parisc.pl - $(PERL) asm/rc4-parisc.pl $(PERLASM_SCHEME) $@ - -rc4-ia64.s: rc4-ia64.S - @case `awk '/^#define RC4_INT/{print$$NF}' $(TOP)/include/openssl/opensslconf.h` in \ - int) set -x; $(CC) $(CFLAGS) -DSZ=4 -E rc4-ia64.S > $@ ;; \ - char) set -x; $(CC) $(CFLAGS) -DSZ=1 -E rc4-ia64.S > $@ ;; \ - *) exit 1 ;; \ - esac - -# GNU make "catch all" -rc4-%.s: asm/rc4-%.pl; $(PERL) $< $(PERLASM_SCHEME) $@ - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -rc4_enc.o: ../../e_os.h ../../include/openssl/bio.h -rc4_enc.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -rc4_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -rc4_enc.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -rc4_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -rc4_enc.o: ../../include/openssl/rc4.h ../../include/openssl/safestack.h -rc4_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -rc4_enc.o: ../cryptlib.h rc4_enc.c rc4_locl.h -rc4_skey.o: ../../e_os.h ../../include/openssl/bio.h -rc4_skey.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -rc4_skey.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -rc4_skey.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -rc4_skey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -rc4_skey.o: ../../include/openssl/rc4.h ../../include/openssl/safestack.h -rc4_skey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -rc4_skey.o: ../cryptlib.h rc4_locl.h rc4_skey.c -rc4_utl.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -rc4_utl.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -rc4_utl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rc4.h -rc4_utl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -rc4_utl.o: ../../include/openssl/symhacks.h rc4_utl.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/ripemd/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/ripemd/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/ripemd/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/ripemd/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,95 +0,0 @@ -# -# OpenSSL/crypto/ripemd/Makefile -# - -DIR= ripemd -TOP= ../.. -CC= cc -CPP= $(CC) -E -INCLUDES= -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -RIP_ASM_OBJ= - -CFLAGS= $(INCLUDES) $(CFLAG) -ASFLAGS= $(INCLUDES) $(ASFLAG) -AFLAGS= $(ASFLAGS) - -GENERAL=Makefile -TEST=rmdtest.c -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC=rmd_dgst.c rmd_one.c -LIBOBJ=rmd_dgst.o rmd_one.o $(RMD160_ASM_OBJ) - -SRC= $(LIBSRC) - -EXHEADER= ripemd.h -HEADER= rmd_locl.h rmdconst.h $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -rmd-586.s: asm/rmd-586.pl ../perlasm/x86asm.pl - $(PERL) asm/rmd-586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@ - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -rmd_dgst.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -rmd_dgst.o: ../../include/openssl/opensslconf.h -rmd_dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -rmd_dgst.o: ../../include/openssl/ripemd.h ../../include/openssl/safestack.h -rmd_dgst.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -rmd_dgst.o: ../md32_common.h rmd_dgst.c rmd_locl.h rmdconst.h -rmd_one.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -rmd_one.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -rmd_one.o: ../../include/openssl/ossl_typ.h ../../include/openssl/ripemd.h -rmd_one.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -rmd_one.o: ../../include/openssl/symhacks.h rmd_one.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/rsa/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/rsa/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/rsa/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/rsa/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,308 +0,0 @@ -# -# OpenSSL/crypto/rsa/Makefile -# - -DIR= rsa -TOP= ../.. -CC= cc -INCLUDES= -I.. -I$(TOP) -I../../include -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile -TEST=rsa_test.c -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC= rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c rsa_saos.c rsa_err.c \ - rsa_pk1.c rsa_ssl.c rsa_none.c rsa_oaep.c rsa_chk.c rsa_null.c \ - rsa_pss.c rsa_x931.c rsa_asn1.c rsa_depr.c rsa_ameth.c rsa_prn.c \ - rsa_pmeth.c rsa_crpt.c -LIBOBJ= rsa_eay.o rsa_gen.o rsa_lib.o rsa_sign.o rsa_saos.o rsa_err.o \ - rsa_pk1.o rsa_ssl.o rsa_none.o rsa_oaep.o rsa_chk.o rsa_null.o \ - rsa_pss.o rsa_x931.o rsa_asn1.o rsa_depr.o rsa_ameth.o rsa_prn.o \ - rsa_pmeth.o rsa_crpt.o - -SRC= $(LIBSRC) - -EXHEADER= rsa.h -HEADER= $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -rsa_ameth.o: ../../e_os.h ../../include/openssl/asn1.h -rsa_ameth.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -rsa_ameth.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -rsa_ameth.o: ../../include/openssl/cms.h ../../include/openssl/crypto.h -rsa_ameth.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -rsa_ameth.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -rsa_ameth.o: ../../include/openssl/err.h ../../include/openssl/evp.h -rsa_ameth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -rsa_ameth.o: ../../include/openssl/objects.h -rsa_ameth.o: ../../include/openssl/opensslconf.h -rsa_ameth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -rsa_ameth.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h -rsa_ameth.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -rsa_ameth.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -rsa_ameth.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -rsa_ameth.o: ../asn1/asn1_locl.h ../cryptlib.h rsa_ameth.c -rsa_asn1.o: ../../e_os.h ../../include/openssl/asn1.h -rsa_asn1.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -rsa_asn1.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -rsa_asn1.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -rsa_asn1.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -rsa_asn1.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -rsa_asn1.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -rsa_asn1.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -rsa_asn1.o: ../../include/openssl/opensslconf.h -rsa_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -rsa_asn1.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h -rsa_asn1.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -rsa_asn1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -rsa_asn1.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -rsa_asn1.o: ../cryptlib.h rsa_asn1.c -rsa_chk.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -rsa_chk.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h -rsa_chk.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -rsa_chk.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -rsa_chk.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -rsa_chk.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -rsa_chk.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -rsa_chk.o: rsa_chk.c -rsa_crpt.o: ../../e_os.h ../../include/openssl/asn1.h -rsa_crpt.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -rsa_crpt.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -rsa_crpt.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -rsa_crpt.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -rsa_crpt.o: ../../include/openssl/engine.h ../../include/openssl/err.h -rsa_crpt.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -rsa_crpt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -rsa_crpt.o: ../../include/openssl/opensslconf.h -rsa_crpt.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -rsa_crpt.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -rsa_crpt.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -rsa_crpt.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -rsa_crpt.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -rsa_crpt.o: ../../include/openssl/x509_vfy.h ../cryptlib.h rsa_crpt.c -rsa_depr.o: ../../e_os.h ../../include/openssl/asn1.h -rsa_depr.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -rsa_depr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -rsa_depr.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -rsa_depr.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -rsa_depr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -rsa_depr.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -rsa_depr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -rsa_depr.o: ../cryptlib.h rsa_depr.c -rsa_eay.o: ../../e_os.h ../../include/openssl/asn1.h -rsa_eay.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -rsa_eay.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -rsa_eay.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -rsa_eay.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -rsa_eay.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -rsa_eay.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h -rsa_eay.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -rsa_eay.o: ../../include/openssl/symhacks.h ../cryptlib.h rsa_eay.c -rsa_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -rsa_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -rsa_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -rsa_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -rsa_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rsa.h -rsa_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -rsa_err.o: ../../include/openssl/symhacks.h rsa_err.c -rsa_gen.o: ../../e_os.h ../../include/openssl/asn1.h -rsa_gen.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -rsa_gen.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -rsa_gen.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -rsa_gen.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -rsa_gen.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -rsa_gen.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -rsa_gen.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -rsa_gen.o: ../cryptlib.h rsa_gen.c -rsa_lib.o: ../../e_os.h ../../include/openssl/asn1.h -rsa_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -rsa_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -rsa_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -rsa_lib.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -rsa_lib.o: ../../include/openssl/engine.h ../../include/openssl/err.h -rsa_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -rsa_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -rsa_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -rsa_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -rsa_lib.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h -rsa_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -rsa_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -rsa_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -rsa_lib.o: ../cryptlib.h rsa_lib.c -rsa_none.o: ../../e_os.h ../../include/openssl/asn1.h -rsa_none.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -rsa_none.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -rsa_none.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -rsa_none.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -rsa_none.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -rsa_none.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h -rsa_none.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -rsa_none.o: ../../include/openssl/symhacks.h ../cryptlib.h rsa_none.c -rsa_null.o: ../../e_os.h ../../include/openssl/asn1.h -rsa_null.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -rsa_null.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -rsa_null.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -rsa_null.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -rsa_null.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -rsa_null.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h -rsa_null.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -rsa_null.o: ../../include/openssl/symhacks.h ../cryptlib.h rsa_null.c -rsa_oaep.o: ../../e_os.h ../../include/openssl/asn1.h -rsa_oaep.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -rsa_oaep.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -rsa_oaep.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -rsa_oaep.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -rsa_oaep.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -rsa_oaep.o: ../../include/openssl/opensslconf.h -rsa_oaep.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -rsa_oaep.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h -rsa_oaep.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -rsa_oaep.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -rsa_oaep.o: ../cryptlib.h rsa_oaep.c -rsa_pk1.o: ../../e_os.h ../../include/openssl/asn1.h -rsa_pk1.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -rsa_pk1.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -rsa_pk1.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -rsa_pk1.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -rsa_pk1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -rsa_pk1.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h -rsa_pk1.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -rsa_pk1.o: ../../include/openssl/symhacks.h ../cryptlib.h rsa_pk1.c -rsa_pmeth.o: ../../e_os.h ../../include/openssl/asn1.h -rsa_pmeth.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -rsa_pmeth.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -rsa_pmeth.o: ../../include/openssl/cms.h ../../include/openssl/crypto.h -rsa_pmeth.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -rsa_pmeth.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -rsa_pmeth.o: ../../include/openssl/err.h ../../include/openssl/evp.h -rsa_pmeth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -rsa_pmeth.o: ../../include/openssl/objects.h -rsa_pmeth.o: ../../include/openssl/opensslconf.h -rsa_pmeth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -rsa_pmeth.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h -rsa_pmeth.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -rsa_pmeth.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -rsa_pmeth.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -rsa_pmeth.o: ../cryptlib.h ../evp/evp_locl.h rsa_locl.h rsa_pmeth.c -rsa_prn.o: ../../e_os.h ../../include/openssl/asn1.h -rsa_prn.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -rsa_prn.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -rsa_prn.o: ../../include/openssl/err.h ../../include/openssl/evp.h -rsa_prn.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -rsa_prn.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -rsa_prn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -rsa_prn.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -rsa_prn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -rsa_prn.o: ../cryptlib.h rsa_prn.c -rsa_pss.o: ../../e_os.h ../../include/openssl/asn1.h -rsa_pss.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -rsa_pss.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -rsa_pss.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -rsa_pss.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -rsa_pss.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -rsa_pss.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -rsa_pss.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h -rsa_pss.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -rsa_pss.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -rsa_pss.o: ../../include/openssl/symhacks.h ../cryptlib.h rsa_pss.c -rsa_saos.o: ../../e_os.h ../../include/openssl/asn1.h -rsa_saos.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -rsa_saos.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -rsa_saos.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -rsa_saos.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -rsa_saos.o: ../../include/openssl/err.h ../../include/openssl/evp.h -rsa_saos.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -rsa_saos.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -rsa_saos.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -rsa_saos.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h -rsa_saos.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -rsa_saos.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -rsa_saos.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -rsa_saos.o: ../cryptlib.h rsa_saos.c -rsa_sign.o: ../../e_os.h ../../include/openssl/asn1.h -rsa_sign.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -rsa_sign.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -rsa_sign.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -rsa_sign.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -rsa_sign.o: ../../include/openssl/err.h ../../include/openssl/evp.h -rsa_sign.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -rsa_sign.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -rsa_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -rsa_sign.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h -rsa_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -rsa_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -rsa_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -rsa_sign.o: ../cryptlib.h rsa_locl.h rsa_sign.c -rsa_ssl.o: ../../e_os.h ../../include/openssl/asn1.h -rsa_ssl.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -rsa_ssl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -rsa_ssl.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -rsa_ssl.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -rsa_ssl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -rsa_ssl.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h -rsa_ssl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -rsa_ssl.o: ../../include/openssl/symhacks.h ../cryptlib.h rsa_ssl.c -rsa_x931.o: ../../e_os.h ../../include/openssl/asn1.h -rsa_x931.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -rsa_x931.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -rsa_x931.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -rsa_x931.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -rsa_x931.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -rsa_x931.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -rsa_x931.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h -rsa_x931.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -rsa_x931.o: ../../include/openssl/symhacks.h ../cryptlib.h rsa_x931.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/rsa/rsa_ameth.c nodejs-0.10.29/deps/openssl/openssl/crypto/rsa/rsa_ameth.c --- nodejs-0.10.28/deps/openssl/openssl/crypto/rsa/rsa_ameth.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/rsa/rsa_ameth.c 2014-06-09 17:04:36.000000000 +0000 @@ -358,7 +358,7 @@ if (i2a_ASN1_INTEGER(bp, pss->saltLength) <= 0) goto err; } - else if (BIO_puts(bp, "0x14 (default)") <= 0) + else if (BIO_puts(bp, "14 (default)") <= 0) goto err; BIO_puts(bp, "\n"); diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/seed/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/seed/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/seed/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/seed/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,106 +0,0 @@ -# -# crypto/seed/Makefile -# - -DIR= seed -TOP= ../.. -CC= cc -CPP= $(CC) -E -INCLUDES= -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile -TEST= -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC=seed.c seed_ecb.c seed_cbc.c seed_cfb.c seed_ofb.c -LIBOBJ=seed.o seed_ecb.o seed_cbc.o seed_cfb.o seed_ofb.o - -SRC= $(LIBSRC) - -EXHEADER= seed.h -HEADER= seed_locl.h $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -seed.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -seed.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -seed.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -seed.o: ../../include/openssl/seed.h ../../include/openssl/stack.h -seed.o: ../../include/openssl/symhacks.h seed.c seed_locl.h -seed_cbc.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -seed_cbc.o: ../../include/openssl/modes.h ../../include/openssl/opensslconf.h -seed_cbc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -seed_cbc.o: ../../include/openssl/safestack.h ../../include/openssl/seed.h -seed_cbc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -seed_cbc.o: seed_cbc.c -seed_cfb.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -seed_cfb.o: ../../include/openssl/modes.h ../../include/openssl/opensslconf.h -seed_cfb.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -seed_cfb.o: ../../include/openssl/safestack.h ../../include/openssl/seed.h -seed_cfb.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -seed_cfb.o: seed_cfb.c -seed_ecb.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -seed_ecb.o: ../../include/openssl/opensslconf.h -seed_ecb.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -seed_ecb.o: ../../include/openssl/safestack.h ../../include/openssl/seed.h -seed_ecb.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -seed_ecb.o: seed_ecb.c -seed_ofb.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -seed_ofb.o: ../../include/openssl/modes.h ../../include/openssl/opensslconf.h -seed_ofb.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -seed_ofb.o: ../../include/openssl/safestack.h ../../include/openssl/seed.h -seed_ofb.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -seed_ofb.o: seed_ofb.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/sha/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/sha/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/sha/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/sha/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,168 +0,0 @@ -# -# OpenSSL/crypto/sha/Makefile -# - -DIR= sha -TOP= ../.. -CC= cc -CPP= $(CC) -E -INCLUDES= -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -SHA1_ASM_OBJ= - -CFLAGS= $(INCLUDES) $(CFLAG) -ASFLAGS= $(INCLUDES) $(ASFLAG) -AFLAGS= $(ASFLAGS) - -GENERAL=Makefile -TEST=shatest.c sha1test.c sha256t.c sha512t.c -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC=sha_dgst.c sha1dgst.c sha_one.c sha1_one.c sha256.c sha512.c -LIBOBJ=sha_dgst.o sha1dgst.o sha_one.o sha1_one.o sha256.o sha512.o $(SHA1_ASM_OBJ) - -SRC= $(LIBSRC) - -EXHEADER= sha.h -HEADER= sha_locl.h $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -sha1-586.s: asm/sha1-586.pl ../perlasm/x86asm.pl - $(PERL) asm/sha1-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@ -sha256-586.s: asm/sha256-586.pl ../perlasm/x86asm.pl - $(PERL) asm/sha256-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@ -sha512-586.s: asm/sha512-586.pl ../perlasm/x86asm.pl - $(PERL) asm/sha512-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@ - -sha1-ia64.s: asm/sha1-ia64.pl - (cd asm; $(PERL) sha1-ia64.pl ../$@ $(CFLAGS)) -sha256-ia64.s: asm/sha512-ia64.pl - (cd asm; $(PERL) sha512-ia64.pl ../$@ $(CFLAGS)) -sha512-ia64.s: asm/sha512-ia64.pl - (cd asm; $(PERL) sha512-ia64.pl ../$@ $(CFLAGS)) - -sha256-armv4.S: asm/sha256-armv4.pl - $(PERL) $< $(PERLASM_SCHEME) $@ - -sha1-alpha.s: asm/sha1-alpha.pl - (preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \ - $(PERL) asm/sha1-alpha.pl > $$preproc && \ - $(CC) -E $$preproc > $@ && rm $$preproc) - -# Solaris make has to be explicitly told -sha1-x86_64.s: asm/sha1-x86_64.pl; $(PERL) asm/sha1-x86_64.pl $(PERLASM_SCHEME) > $@ -sha256-x86_64.s:asm/sha512-x86_64.pl; $(PERL) asm/sha512-x86_64.pl $(PERLASM_SCHEME) $@ -sha512-x86_64.s:asm/sha512-x86_64.pl; $(PERL) asm/sha512-x86_64.pl $(PERLASM_SCHEME) $@ -sha1-sparcv9.s: asm/sha1-sparcv9.pl; $(PERL) asm/sha1-sparcv9.pl $@ $(CFLAGS) -sha256-sparcv9.s:asm/sha512-sparcv9.pl; $(PERL) asm/sha512-sparcv9.pl $@ $(CFLAGS) -sha512-sparcv9.s:asm/sha512-sparcv9.pl; $(PERL) asm/sha512-sparcv9.pl $@ $(CFLAGS) - -sha1-ppc.s: asm/sha1-ppc.pl; $(PERL) asm/sha1-ppc.pl $(PERLASM_SCHEME) $@ -sha256-ppc.s: asm/sha512-ppc.pl; $(PERL) asm/sha512-ppc.pl $(PERLASM_SCHEME) $@ -sha512-ppc.s: asm/sha512-ppc.pl; $(PERL) asm/sha512-ppc.pl $(PERLASM_SCHEME) $@ - -sha1-parisc.s: asm/sha1-parisc.pl; $(PERL) asm/sha1-parisc.pl $(PERLASM_SCHEME) $@ -sha256-parisc.s:asm/sha512-parisc.pl; $(PERL) asm/sha512-parisc.pl $(PERLASM_SCHEME) $@ -sha512-parisc.s:asm/sha512-parisc.pl; $(PERL) asm/sha512-parisc.pl $(PERLASM_SCHEME) $@ - -sha1-mips.S: asm/sha1-mips.pl; $(PERL) asm/sha1-mips.pl $(PERLASM_SCHEME) $@ -sha256-mips.S: asm/sha512-mips.pl; $(PERL) asm/sha512-mips.pl $(PERLASM_SCHEME) $@ -sha512-mips.S: asm/sha512-mips.pl; $(PERL) asm/sha512-mips.pl $(PERLASM_SCHEME) $@ - -# GNU make "catch all" -sha1-%.S: asm/sha1-%.pl; $(PERL) $< $(PERLASM_SCHEME) $@ -sha256-%.S: asm/sha512-%.pl; $(PERL) $< $(PERLASM_SCHEME) $@ -sha512-%.S: asm/sha512-%.pl; $(PERL) $< $(PERLASM_SCHEME) $@ - -sha1-armv4-large.o: sha1-armv4-large.S -sha256-armv4.o: sha256-armv4.S -sha512-armv4.o: sha512-armv4.S - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -sha1_one.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -sha1_one.o: ../../include/openssl/opensslconf.h -sha1_one.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -sha1_one.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -sha1_one.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -sha1_one.o: sha1_one.c -sha1dgst.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -sha1dgst.o: ../../include/openssl/opensslconf.h -sha1dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -sha1dgst.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -sha1dgst.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -sha1dgst.o: ../md32_common.h sha1dgst.c sha_locl.h -sha256.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -sha256.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -sha256.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -sha256.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -sha256.o: ../../include/openssl/symhacks.h ../md32_common.h sha256.c -sha512.o: ../../e_os.h ../../include/openssl/bio.h -sha512.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -sha512.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -sha512.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -sha512.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -sha512.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -sha512.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -sha512.o: ../cryptlib.h sha512.c -sha_dgst.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -sha_dgst.o: ../../include/openssl/opensslconf.h -sha_dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -sha_dgst.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -sha_dgst.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -sha_dgst.o: ../md32_common.h sha_dgst.c sha_locl.h -sha_one.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -sha_one.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -sha_one.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -sha_one.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -sha_one.o: ../../include/openssl/symhacks.h sha_one.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/srp/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/srp/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/srp/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/srp/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,98 +0,0 @@ -DIR= srp -TOP= ../.. -CC= cc -INCLUDES= -I.. -I$(TOP) -I../../include -CFLAG=-g -INSTALL_PREFIX= -OPENSSLDIR= /usr/local/ssl -INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl -MAKEDEPPROG= makedepend -MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile -TEST=srptest.c -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC=srp_lib.c srp_vfy.c -LIBOBJ=srp_lib.o srp_vfy.o - -SRC= $(LIBSRC) - -EXHEADER= srp.h -HEADER= $(EXHEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -srptest: top srptest.c $(LIB) - $(CC) $(CFLAGS) -Wall -Werror -g -o srptest srptest.c $(LIB) - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -srp_lib.o: ../../e_os.h ../../include/openssl/asn1.h -srp_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -srp_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -srp_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -srp_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -srp_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -srp_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -srp_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -srp_lib.o: ../../include/openssl/sha.h ../../include/openssl/srp.h -srp_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -srp_lib.o: ../cryptlib.h srp_grps.h srp_lcl.h srp_lib.c -srp_vfy.o: ../../e_os.h ../../include/openssl/asn1.h -srp_vfy.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -srp_vfy.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -srp_vfy.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -srp_vfy.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -srp_vfy.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -srp_vfy.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -srp_vfy.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h -srp_vfy.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -srp_vfy.o: ../../include/openssl/srp.h ../../include/openssl/stack.h -srp_vfy.o: ../../include/openssl/symhacks.h ../../include/openssl/txt_db.h -srp_vfy.o: ../cryptlib.h srp_lcl.h srp_vfy.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/srp/srp_vfy.c nodejs-0.10.29/deps/openssl/openssl/crypto/srp/srp_vfy.c --- nodejs-0.10.28/deps/openssl/openssl/crypto/srp/srp_vfy.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/srp/srp_vfy.c 2014-06-09 17:04:36.000000000 +0000 @@ -93,6 +93,9 @@ else a[i] = loc - b64table; ++i; } + /* if nothing valid to process we have a zero length response */ + if (i == 0) + return 0; size = i; i = size - 1; j = size; diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/stack/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/stack/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/stack/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/stack/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,84 +0,0 @@ -# -# OpenSSL/crypto/stack/Makefile -# - -DIR= stack -TOP= ../.. -CC= cc -INCLUDES= -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile -TEST= -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC=stack.c -LIBOBJ=stack.o - -SRC= $(LIBSRC) - -EXHEADER= stack.h safestack.h -HEADER= $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -stack.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -stack.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -stack.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -stack.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -stack.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -stack.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -stack.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -stack.o: ../../include/openssl/symhacks.h ../cryptlib.h stack.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/ts/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/ts/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/ts/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/ts/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,269 +0,0 @@ -# -# SSLeay/crypto/ts/Makefile -# - -DIR= ts -TOP= ../.. -CC= cc -INCLUDES= -I.. -I../../include -CFLAG = -g -INSTALL_PREFIX= -OPENSSLDIR= /usr/local/ssl -INSTALLTOP=/usr/local/ssl -MAKEDEPPROG= makedepend -MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile -AR= ar r - -PEX_LIBS= -EX_LIBS= - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL= Makefile -TEST= -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC= ts_err.c ts_req_utils.c ts_req_print.c ts_rsp_utils.c ts_rsp_print.c \ - ts_rsp_sign.c ts_rsp_verify.c ts_verify_ctx.c ts_lib.c ts_conf.c \ - ts_asn1.c -LIBOBJ= ts_err.o ts_req_utils.o ts_req_print.o ts_rsp_utils.o ts_rsp_print.o \ - ts_rsp_sign.o ts_rsp_verify.o ts_verify_ctx.o ts_lib.o ts_conf.o \ - ts_asn1.o - -SRC= $(LIBSRC) - -EXHEADER= ts.h -HEADER= $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -test: - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff enc dec sign verify - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -ts_asn1.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h -ts_asn1.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -ts_asn1.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -ts_asn1.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h -ts_asn1.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ts_asn1.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -ts_asn1.o: ../../include/openssl/err.h ../../include/openssl/evp.h -ts_asn1.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -ts_asn1.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -ts_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ts_asn1.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h -ts_asn1.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -ts_asn1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -ts_asn1.o: ../../include/openssl/ts.h ../../include/openssl/x509.h -ts_asn1.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -ts_asn1.o: ts_asn1.c -ts_conf.o: ../../e_os.h ../../include/openssl/asn1.h -ts_conf.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -ts_conf.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -ts_conf.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h -ts_conf.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ts_conf.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -ts_conf.o: ../../include/openssl/engine.h ../../include/openssl/err.h -ts_conf.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -ts_conf.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -ts_conf.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -ts_conf.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h -ts_conf.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h -ts_conf.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -ts_conf.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -ts_conf.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h -ts_conf.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -ts_conf.o: ../../include/openssl/x509v3.h ../cryptlib.h ts_conf.c -ts_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -ts_err.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h -ts_err.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h -ts_err.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h -ts_err.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -ts_err.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -ts_err.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -ts_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -ts_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -ts_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -ts_err.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -ts_err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -ts_err.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h -ts_err.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -ts_err.o: ../../include/openssl/x509v3.h ts_err.c -ts_lib.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -ts_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -ts_lib.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -ts_lib.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h -ts_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ts_lib.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -ts_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h -ts_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -ts_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -ts_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ts_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h -ts_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -ts_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -ts_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -ts_lib.o: ../../include/openssl/x509v3.h ../cryptlib.h ts.h ts_lib.c -ts_req_print.o: ../../e_os.h ../../include/openssl/asn1.h -ts_req_print.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -ts_req_print.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h -ts_req_print.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h -ts_req_print.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h -ts_req_print.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -ts_req_print.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -ts_req_print.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -ts_req_print.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -ts_req_print.o: ../../include/openssl/opensslconf.h -ts_req_print.o: ../../include/openssl/opensslv.h -ts_req_print.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -ts_req_print.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -ts_req_print.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -ts_req_print.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h -ts_req_print.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -ts_req_print.o: ../../include/openssl/x509v3.h ../cryptlib.h ts_req_print.c -ts_req_utils.o: ../../e_os.h ../../include/openssl/asn1.h -ts_req_utils.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -ts_req_utils.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -ts_req_utils.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h -ts_req_utils.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ts_req_utils.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -ts_req_utils.o: ../../include/openssl/err.h ../../include/openssl/evp.h -ts_req_utils.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -ts_req_utils.o: ../../include/openssl/objects.h -ts_req_utils.o: ../../include/openssl/opensslconf.h -ts_req_utils.o: ../../include/openssl/opensslv.h -ts_req_utils.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -ts_req_utils.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -ts_req_utils.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -ts_req_utils.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h -ts_req_utils.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -ts_req_utils.o: ../../include/openssl/x509v3.h ../cryptlib.h ts_req_utils.c -ts_rsp_print.o: ../../e_os.h ../../include/openssl/asn1.h -ts_rsp_print.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -ts_rsp_print.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h -ts_rsp_print.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h -ts_rsp_print.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h -ts_rsp_print.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -ts_rsp_print.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -ts_rsp_print.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -ts_rsp_print.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -ts_rsp_print.o: ../../include/openssl/opensslconf.h -ts_rsp_print.o: ../../include/openssl/opensslv.h -ts_rsp_print.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -ts_rsp_print.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -ts_rsp_print.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -ts_rsp_print.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -ts_rsp_print.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -ts_rsp_print.o: ../cryptlib.h ts.h ts_rsp_print.c -ts_rsp_sign.o: ../../e_os.h ../../include/openssl/asn1.h -ts_rsp_sign.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -ts_rsp_sign.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -ts_rsp_sign.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h -ts_rsp_sign.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ts_rsp_sign.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -ts_rsp_sign.o: ../../include/openssl/err.h ../../include/openssl/evp.h -ts_rsp_sign.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -ts_rsp_sign.o: ../../include/openssl/objects.h -ts_rsp_sign.o: ../../include/openssl/opensslconf.h -ts_rsp_sign.o: ../../include/openssl/opensslv.h -ts_rsp_sign.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -ts_rsp_sign.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -ts_rsp_sign.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -ts_rsp_sign.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h -ts_rsp_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -ts_rsp_sign.o: ../../include/openssl/x509v3.h ../cryptlib.h ts_rsp_sign.c -ts_rsp_utils.o: ../../e_os.h ../../include/openssl/asn1.h -ts_rsp_utils.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -ts_rsp_utils.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -ts_rsp_utils.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h -ts_rsp_utils.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ts_rsp_utils.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -ts_rsp_utils.o: ../../include/openssl/err.h ../../include/openssl/evp.h -ts_rsp_utils.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -ts_rsp_utils.o: ../../include/openssl/objects.h -ts_rsp_utils.o: ../../include/openssl/opensslconf.h -ts_rsp_utils.o: ../../include/openssl/opensslv.h -ts_rsp_utils.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -ts_rsp_utils.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -ts_rsp_utils.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -ts_rsp_utils.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h -ts_rsp_utils.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -ts_rsp_utils.o: ../../include/openssl/x509v3.h ../cryptlib.h ts_rsp_utils.c -ts_rsp_verify.o: ../../e_os.h ../../include/openssl/asn1.h -ts_rsp_verify.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -ts_rsp_verify.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -ts_rsp_verify.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h -ts_rsp_verify.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ts_rsp_verify.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -ts_rsp_verify.o: ../../include/openssl/err.h ../../include/openssl/evp.h -ts_rsp_verify.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -ts_rsp_verify.o: ../../include/openssl/objects.h -ts_rsp_verify.o: ../../include/openssl/opensslconf.h -ts_rsp_verify.o: ../../include/openssl/opensslv.h -ts_rsp_verify.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -ts_rsp_verify.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -ts_rsp_verify.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -ts_rsp_verify.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h -ts_rsp_verify.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -ts_rsp_verify.o: ../../include/openssl/x509v3.h ../cryptlib.h ts_rsp_verify.c -ts_verify_ctx.o: ../../e_os.h ../../include/openssl/asn1.h -ts_verify_ctx.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -ts_verify_ctx.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -ts_verify_ctx.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h -ts_verify_ctx.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -ts_verify_ctx.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -ts_verify_ctx.o: ../../include/openssl/err.h ../../include/openssl/evp.h -ts_verify_ctx.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -ts_verify_ctx.o: ../../include/openssl/objects.h -ts_verify_ctx.o: ../../include/openssl/opensslconf.h -ts_verify_ctx.o: ../../include/openssl/opensslv.h -ts_verify_ctx.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -ts_verify_ctx.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -ts_verify_ctx.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -ts_verify_ctx.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h -ts_verify_ctx.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -ts_verify_ctx.o: ../../include/openssl/x509v3.h ../cryptlib.h ts_verify_ctx.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/ts/ts_rsp_verify.c nodejs-0.10.29/deps/openssl/openssl/crypto/ts/ts_rsp_verify.c --- nodejs-0.10.28/deps/openssl/openssl/crypto/ts/ts_rsp_verify.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/ts/ts_rsp_verify.c 2014-06-09 17:04:36.000000000 +0000 @@ -629,6 +629,7 @@ X509_ALGOR_free(*md_alg); OPENSSL_free(*imprint); *imprint_len = 0; + *imprint = NULL; return 0; } diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/txt_db/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/txt_db/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/txt_db/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/txt_db/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,84 +0,0 @@ -# -# OpenSSL/crypto/txt_db/Makefile -# - -DIR= txt_db -TOP= ../.. -CC= cc -INCLUDES= -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile -TEST= -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC=txt_db.c -LIBOBJ=txt_db.o - -SRC= $(LIBSRC) - -EXHEADER= txt_db.h -HEADER= $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by top Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -txt_db.o: ../../e_os.h ../../include/openssl/bio.h -txt_db.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -txt_db.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -txt_db.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -txt_db.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -txt_db.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -txt_db.o: ../../include/openssl/symhacks.h ../../include/openssl/txt_db.h -txt_db.o: ../cryptlib.h txt_db.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/ui/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/ui/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/ui/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/ui/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,111 +0,0 @@ -# -# OpenSSL/crypto/ui/Makefile -# - -DIR= ui -TOP= ../.. -CC= cc -INCLUDES= -I.. -I$(TOP) -I../../include -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile -#TEST= uitest.c -TEST= -APPS= - -COMPATSRC= ui_compat.c -COMPATOBJ= ui_compat.o - -LIB=$(TOP)/libcrypto.a -LIBSRC= ui_err.c ui_lib.c ui_openssl.c ui_util.c $(COMPATSRC) -LIBOBJ= ui_err.o ui_lib.o ui_openssl.o ui_util.o $(COMPATOBJ) - -SRC= $(LIBSRC) - -EXHEADER= ui.h ui_compat.h -HEADER= $(EXHEADER) ui_locl.h - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -ui_compat.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -ui_compat.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -ui_compat.o: ../../include/openssl/stack.h ../../include/openssl/ui.h -ui_compat.o: ../../include/openssl/ui_compat.h ui_compat.c -ui_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h -ui_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -ui_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -ui_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ui_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -ui_err.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h ui_err.c -ui_lib.o: ../../e_os.h ../../include/openssl/bio.h -ui_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -ui_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -ui_lib.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -ui_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ui_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -ui_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h -ui_lib.o: ../cryptlib.h ui_lib.c ui_locl.h -ui_openssl.o: ../../e_os.h ../../include/openssl/bio.h -ui_openssl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -ui_openssl.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -ui_openssl.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -ui_openssl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ui_openssl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -ui_openssl.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h -ui_openssl.o: ../cryptlib.h ui_locl.h ui_openssl.c -ui_util.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -ui_util.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -ui_util.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -ui_util.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -ui_util.o: ../../include/openssl/ui.h ui_locl.h ui_util.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/whrlpool/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/whrlpool/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/whrlpool/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/whrlpool/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,96 +0,0 @@ -# -# crypto/whrlpool/Makefile -# - -DIR= whrlpool -TOP= ../.. -CC= cc -CPP= $(CC) -E -INCLUDES= -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -WP_ASM_OBJ=wp_block.o - -CFLAGS= $(INCLUDES) $(CFLAG) -ASFLAGS= $(INCLUDES) $(ASFLAG) -AFLAGS= $(ASFLAGS) - -GENERAL=Makefile -TEST=wp_test.c -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC=wp_dgst.c wp_block.c -LIBOBJ=wp_dgst.o $(WP_ASM_OBJ) - -SRC= $(LIBSRC) - -EXHEADER= whrlpool.h -HEADER= wp_locl.h $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -wp-mmx.s: asm/wp-mmx.pl ../perlasm/x86asm.pl - $(PERL) asm/wp-mmx.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@ - -wp-x86_64.s: asm/wp-x86_64.pl - $(PERL) asm/wp-x86_64.pl $(PERLASM_SCHEME) > $@ - -$(LIBOBJ): $(LIBSRC) - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -wp_block.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -wp_block.o: ../../include/openssl/whrlpool.h wp_block.c wp_locl.h -wp_dgst.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -wp_dgst.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -wp_dgst.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -wp_dgst.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -wp_dgst.o: ../../include/openssl/whrlpool.h wp_dgst.c wp_locl.h diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/x509/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/x509/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/x509/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/x509/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,407 +0,0 @@ -# -# OpenSSL/crypto/x509/Makefile -# - -DIR= x509 -TOP= ../.. -CC= cc -INCLUDES= -I.. -I$(TOP) -I../../include -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile README -TEST= -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC= x509_def.c x509_d2.c x509_r2x.c x509_cmp.c \ - x509_obj.c x509_req.c x509spki.c x509_vfy.c \ - x509_set.c x509cset.c x509rset.c x509_err.c \ - x509name.c x509_v3.c x509_ext.c x509_att.c \ - x509type.c x509_lu.c x_all.c x509_txt.c \ - x509_trs.c by_file.c by_dir.c x509_vpm.c -LIBOBJ= x509_def.o x509_d2.o x509_r2x.o x509_cmp.o \ - x509_obj.o x509_req.o x509spki.o x509_vfy.o \ - x509_set.o x509cset.o x509rset.o x509_err.o \ - x509name.o x509_v3.o x509_ext.o x509_att.o \ - x509type.o x509_lu.o x_all.o x509_txt.o \ - x509_trs.o by_file.o by_dir.o x509_vpm.o - -SRC= $(LIBSRC) - -EXHEADER= x509.h x509_vfy.h -HEADER= $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -by_dir.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -by_dir.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -by_dir.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -by_dir.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -by_dir.o: ../../include/openssl/err.h ../../include/openssl/evp.h -by_dir.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -by_dir.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -by_dir.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -by_dir.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -by_dir.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -by_dir.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -by_dir.o: ../../include/openssl/x509_vfy.h ../cryptlib.h by_dir.c -by_file.o: ../../e_os.h ../../include/openssl/asn1.h -by_file.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -by_file.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -by_file.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -by_file.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -by_file.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -by_file.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -by_file.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -by_file.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h -by_file.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h -by_file.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -by_file.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -by_file.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -by_file.o: ../cryptlib.h by_file.c -x509_att.o: ../../e_os.h ../../include/openssl/asn1.h -x509_att.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -x509_att.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -x509_att.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -x509_att.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -x509_att.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x509_att.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x509_att.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -x509_att.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x509_att.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509_att.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x509_att.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x509_att.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -x509_att.o: ../cryptlib.h x509_att.c -x509_cmp.o: ../../e_os.h ../../include/openssl/asn1.h -x509_cmp.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -x509_cmp.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -x509_cmp.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -x509_cmp.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -x509_cmp.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x509_cmp.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x509_cmp.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -x509_cmp.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x509_cmp.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509_cmp.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x509_cmp.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x509_cmp.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -x509_cmp.o: ../cryptlib.h x509_cmp.c -x509_d2.o: ../../e_os.h ../../include/openssl/asn1.h -x509_d2.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -x509_d2.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -x509_d2.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -x509_d2.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -x509_d2.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -x509_d2.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -x509_d2.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -x509_d2.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -x509_d2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -x509_d2.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -x509_d2.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -x509_d2.o: ../cryptlib.h x509_d2.c -x509_def.o: ../../e_os.h ../../include/openssl/asn1.h -x509_def.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -x509_def.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -x509_def.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -x509_def.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -x509_def.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -x509_def.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -x509_def.o: ../../include/openssl/opensslconf.h -x509_def.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x509_def.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509_def.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x509_def.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x509_def.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509_def.c -x509_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -x509_err.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -x509_err.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -x509_err.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -x509_err.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x509_err.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x509_err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -x509_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x509_err.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509_err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x509_err.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x509_err.o: ../../include/openssl/x509_vfy.h x509_err.c -x509_ext.o: ../../e_os.h ../../include/openssl/asn1.h -x509_ext.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -x509_ext.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -x509_ext.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -x509_ext.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -x509_ext.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x509_ext.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x509_ext.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -x509_ext.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x509_ext.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509_ext.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x509_ext.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x509_ext.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -x509_ext.o: ../cryptlib.h x509_ext.c -x509_lu.o: ../../e_os.h ../../include/openssl/asn1.h -x509_lu.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -x509_lu.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -x509_lu.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -x509_lu.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -x509_lu.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x509_lu.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x509_lu.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -x509_lu.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x509_lu.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509_lu.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x509_lu.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x509_lu.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -x509_lu.o: ../cryptlib.h x509_lu.c -x509_obj.o: ../../e_os.h ../../include/openssl/asn1.h -x509_obj.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -x509_obj.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -x509_obj.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -x509_obj.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -x509_obj.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -x509_obj.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -x509_obj.o: ../../include/openssl/opensslconf.h -x509_obj.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x509_obj.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509_obj.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x509_obj.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x509_obj.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509_obj.c -x509_r2x.o: ../../e_os.h ../../include/openssl/asn1.h -x509_r2x.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -x509_r2x.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -x509_r2x.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -x509_r2x.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -x509_r2x.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x509_r2x.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x509_r2x.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -x509_r2x.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x509_r2x.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509_r2x.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x509_r2x.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x509_r2x.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509_r2x.c -x509_req.o: ../../e_os.h ../../include/openssl/asn1.h -x509_req.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -x509_req.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -x509_req.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -x509_req.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -x509_req.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -x509_req.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -x509_req.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -x509_req.o: ../../include/openssl/opensslconf.h -x509_req.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x509_req.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h -x509_req.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509_req.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x509_req.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x509_req.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509_req.c -x509_set.o: ../../e_os.h ../../include/openssl/asn1.h -x509_set.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -x509_set.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -x509_set.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -x509_set.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -x509_set.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -x509_set.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -x509_set.o: ../../include/openssl/opensslconf.h -x509_set.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x509_set.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509_set.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x509_set.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x509_set.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509_set.c -x509_trs.o: ../../e_os.h ../../include/openssl/asn1.h -x509_trs.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -x509_trs.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -x509_trs.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -x509_trs.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -x509_trs.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x509_trs.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x509_trs.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -x509_trs.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x509_trs.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509_trs.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x509_trs.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x509_trs.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -x509_trs.o: ../cryptlib.h x509_trs.c -x509_txt.o: ../../e_os.h ../../include/openssl/asn1.h -x509_txt.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -x509_txt.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -x509_txt.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -x509_txt.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -x509_txt.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -x509_txt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -x509_txt.o: ../../include/openssl/opensslconf.h -x509_txt.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x509_txt.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509_txt.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x509_txt.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x509_txt.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509_txt.c -x509_v3.o: ../../e_os.h ../../include/openssl/asn1.h -x509_v3.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -x509_v3.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -x509_v3.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -x509_v3.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -x509_v3.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x509_v3.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x509_v3.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -x509_v3.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x509_v3.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509_v3.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x509_v3.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x509_v3.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -x509_v3.o: ../cryptlib.h x509_v3.c -x509_vfy.o: ../../e_os.h ../../include/openssl/asn1.h -x509_vfy.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -x509_vfy.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -x509_vfy.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -x509_vfy.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -x509_vfy.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x509_vfy.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x509_vfy.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -x509_vfy.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x509_vfy.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509_vfy.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x509_vfy.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x509_vfy.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -x509_vfy.o: ../cryptlib.h x509_vfy.c -x509_vpm.o: ../../e_os.h ../../include/openssl/asn1.h -x509_vpm.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -x509_vpm.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -x509_vpm.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -x509_vpm.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -x509_vpm.o: ../../include/openssl/err.h ../../include/openssl/evp.h -x509_vpm.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -x509_vpm.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -x509_vpm.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x509_vpm.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509_vpm.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x509_vpm.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x509_vpm.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -x509_vpm.o: ../cryptlib.h x509_vpm.c -x509cset.o: ../../e_os.h ../../include/openssl/asn1.h -x509cset.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -x509cset.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -x509cset.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -x509cset.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -x509cset.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -x509cset.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -x509cset.o: ../../include/openssl/opensslconf.h -x509cset.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x509cset.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509cset.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x509cset.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x509cset.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509cset.c -x509name.o: ../../e_os.h ../../include/openssl/asn1.h -x509name.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -x509name.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -x509name.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -x509name.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -x509name.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -x509name.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -x509name.o: ../../include/openssl/opensslconf.h -x509name.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x509name.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509name.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x509name.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x509name.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509name.c -x509rset.o: ../../e_os.h ../../include/openssl/asn1.h -x509rset.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -x509rset.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -x509rset.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -x509rset.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -x509rset.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -x509rset.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -x509rset.o: ../../include/openssl/opensslconf.h -x509rset.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x509rset.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509rset.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x509rset.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x509rset.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509rset.c -x509spki.o: ../../e_os.h ../../include/openssl/asn1.h -x509spki.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -x509spki.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -x509spki.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -x509spki.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -x509spki.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -x509spki.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -x509spki.o: ../../include/openssl/opensslconf.h -x509spki.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x509spki.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509spki.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x509spki.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x509spki.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509spki.c -x509type.o: ../../e_os.h ../../include/openssl/asn1.h -x509type.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -x509type.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -x509type.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -x509type.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -x509type.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -x509type.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -x509type.o: ../../include/openssl/opensslconf.h -x509type.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -x509type.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -x509type.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x509type.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x509type.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509type.c -x_all.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -x_all.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -x_all.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h -x_all.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -x_all.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -x_all.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -x_all.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -x_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -x_all.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -x_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h -x_all.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -x_all.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -x_all.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_all.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/x509v3/Makefile.save nodejs-0.10.29/deps/openssl/openssl/crypto/x509v3/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/crypto/x509v3/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/x509v3/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,591 +0,0 @@ -# -# OpenSSL/crypto/x509v3/Makefile -# - -DIR= x509v3 -TOP= ../.. -CC= cc -INCLUDES= -I.. -I$(TOP) -I../../include -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile README -TEST= -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC= v3_bcons.c v3_bitst.c v3_conf.c v3_extku.c v3_ia5.c v3_lib.c \ -v3_prn.c v3_utl.c v3err.c v3_genn.c v3_alt.c v3_skey.c v3_akey.c v3_pku.c \ -v3_int.c v3_enum.c v3_sxnet.c v3_cpols.c v3_crld.c v3_purp.c v3_info.c \ -v3_ocsp.c v3_akeya.c v3_pmaps.c v3_pcons.c v3_ncons.c v3_pcia.c v3_pci.c \ -pcy_cache.c pcy_node.c pcy_data.c pcy_map.c pcy_tree.c pcy_lib.c \ -v3_asid.c v3_addr.c -LIBOBJ= v3_bcons.o v3_bitst.o v3_conf.o v3_extku.o v3_ia5.o v3_lib.o \ -v3_prn.o v3_utl.o v3err.o v3_genn.o v3_alt.o v3_skey.o v3_akey.o v3_pku.o \ -v3_int.o v3_enum.o v3_sxnet.o v3_cpols.o v3_crld.o v3_purp.o v3_info.o \ -v3_ocsp.o v3_akeya.o v3_pmaps.o v3_pcons.o v3_ncons.o v3_pcia.o v3_pci.o \ -pcy_cache.o pcy_node.o pcy_data.o pcy_map.o pcy_tree.o pcy_lib.o \ -v3_asid.o v3_addr.o - -SRC= $(LIBSRC) - -EXHEADER= x509v3.h -HEADER= $(EXHEADER) pcy_int.h - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -pcy_cache.o: ../../e_os.h ../../include/openssl/asn1.h -pcy_cache.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -pcy_cache.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -pcy_cache.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -pcy_cache.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -pcy_cache.o: ../../include/openssl/err.h ../../include/openssl/evp.h -pcy_cache.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -pcy_cache.o: ../../include/openssl/objects.h -pcy_cache.o: ../../include/openssl/opensslconf.h -pcy_cache.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -pcy_cache.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -pcy_cache.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -pcy_cache.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -pcy_cache.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -pcy_cache.o: ../cryptlib.h pcy_cache.c pcy_int.h -pcy_data.o: ../../e_os.h ../../include/openssl/asn1.h -pcy_data.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -pcy_data.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -pcy_data.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -pcy_data.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -pcy_data.o: ../../include/openssl/err.h ../../include/openssl/evp.h -pcy_data.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -pcy_data.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -pcy_data.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -pcy_data.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -pcy_data.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -pcy_data.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -pcy_data.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -pcy_data.o: ../cryptlib.h pcy_data.c pcy_int.h -pcy_lib.o: ../../e_os.h ../../include/openssl/asn1.h -pcy_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -pcy_lib.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -pcy_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -pcy_lib.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -pcy_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h -pcy_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -pcy_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -pcy_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -pcy_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -pcy_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -pcy_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -pcy_lib.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -pcy_lib.o: ../cryptlib.h pcy_int.h pcy_lib.c -pcy_map.o: ../../e_os.h ../../include/openssl/asn1.h -pcy_map.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -pcy_map.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -pcy_map.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -pcy_map.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -pcy_map.o: ../../include/openssl/err.h ../../include/openssl/evp.h -pcy_map.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -pcy_map.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -pcy_map.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -pcy_map.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -pcy_map.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -pcy_map.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -pcy_map.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -pcy_map.o: ../cryptlib.h pcy_int.h pcy_map.c -pcy_node.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -pcy_node.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h -pcy_node.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -pcy_node.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -pcy_node.o: ../../include/openssl/ecdsa.h ../../include/openssl/evp.h -pcy_node.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -pcy_node.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -pcy_node.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -pcy_node.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -pcy_node.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -pcy_node.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -pcy_node.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -pcy_node.o: pcy_int.h pcy_node.c -pcy_tree.o: ../../e_os.h ../../include/openssl/asn1.h -pcy_tree.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -pcy_tree.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -pcy_tree.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -pcy_tree.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -pcy_tree.o: ../../include/openssl/err.h ../../include/openssl/evp.h -pcy_tree.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -pcy_tree.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -pcy_tree.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -pcy_tree.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -pcy_tree.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -pcy_tree.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -pcy_tree.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -pcy_tree.o: ../cryptlib.h pcy_int.h pcy_tree.c -v3_addr.o: ../../e_os.h ../../include/openssl/asn1.h -v3_addr.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -v3_addr.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h -v3_addr.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -v3_addr.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -v3_addr.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_addr.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_addr.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_addr.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -v3_addr.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -v3_addr.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -v3_addr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -v3_addr.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -v3_addr.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_addr.c -v3_akey.o: ../../e_os.h ../../include/openssl/asn1.h -v3_akey.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -v3_akey.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h -v3_akey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -v3_akey.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -v3_akey.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_akey.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_akey.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_akey.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -v3_akey.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -v3_akey.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -v3_akey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -v3_akey.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -v3_akey.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_akey.c -v3_akeya.o: ../../e_os.h ../../include/openssl/asn1.h -v3_akeya.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -v3_akeya.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h -v3_akeya.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -v3_akeya.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -v3_akeya.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_akeya.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_akeya.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_akeya.o: ../../include/openssl/opensslconf.h -v3_akeya.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -v3_akeya.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -v3_akeya.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -v3_akeya.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -v3_akeya.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -v3_akeya.o: ../cryptlib.h v3_akeya.c -v3_alt.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -v3_alt.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h -v3_alt.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -v3_alt.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -v3_alt.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_alt.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_alt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_alt.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -v3_alt.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -v3_alt.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -v3_alt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -v3_alt.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -v3_alt.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_alt.c -v3_asid.o: ../../e_os.h ../../include/openssl/asn1.h -v3_asid.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -v3_asid.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -v3_asid.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -v3_asid.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -v3_asid.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -v3_asid.o: ../../include/openssl/err.h ../../include/openssl/evp.h -v3_asid.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -v3_asid.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -v3_asid.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -v3_asid.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -v3_asid.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -v3_asid.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -v3_asid.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -v3_asid.o: ../cryptlib.h v3_asid.c -v3_bcons.o: ../../e_os.h ../../include/openssl/asn1.h -v3_bcons.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -v3_bcons.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h -v3_bcons.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -v3_bcons.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -v3_bcons.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_bcons.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_bcons.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_bcons.o: ../../include/openssl/opensslconf.h -v3_bcons.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -v3_bcons.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -v3_bcons.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -v3_bcons.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -v3_bcons.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -v3_bcons.o: ../cryptlib.h v3_bcons.c -v3_bitst.o: ../../e_os.h ../../include/openssl/asn1.h -v3_bitst.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -v3_bitst.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -v3_bitst.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -v3_bitst.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -v3_bitst.o: ../../include/openssl/err.h ../../include/openssl/evp.h -v3_bitst.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -v3_bitst.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -v3_bitst.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -v3_bitst.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -v3_bitst.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -v3_bitst.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -v3_bitst.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -v3_bitst.o: ../cryptlib.h v3_bitst.c -v3_conf.o: ../../e_os.h ../../include/openssl/asn1.h -v3_conf.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -v3_conf.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -v3_conf.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -v3_conf.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -v3_conf.o: ../../include/openssl/err.h ../../include/openssl/evp.h -v3_conf.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -v3_conf.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -v3_conf.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -v3_conf.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -v3_conf.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -v3_conf.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -v3_conf.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -v3_conf.o: ../cryptlib.h v3_conf.c -v3_cpols.o: ../../e_os.h ../../include/openssl/asn1.h -v3_cpols.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -v3_cpols.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h -v3_cpols.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -v3_cpols.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -v3_cpols.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_cpols.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_cpols.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_cpols.o: ../../include/openssl/opensslconf.h -v3_cpols.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -v3_cpols.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -v3_cpols.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -v3_cpols.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -v3_cpols.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -v3_cpols.o: ../cryptlib.h pcy_int.h v3_cpols.c -v3_crld.o: ../../e_os.h ../../include/openssl/asn1.h -v3_crld.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -v3_crld.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h -v3_crld.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -v3_crld.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -v3_crld.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_crld.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_crld.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_crld.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -v3_crld.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -v3_crld.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -v3_crld.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -v3_crld.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -v3_crld.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_crld.c -v3_enum.o: ../../e_os.h ../../include/openssl/asn1.h -v3_enum.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -v3_enum.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -v3_enum.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -v3_enum.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -v3_enum.o: ../../include/openssl/err.h ../../include/openssl/evp.h -v3_enum.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -v3_enum.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -v3_enum.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -v3_enum.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -v3_enum.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -v3_enum.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -v3_enum.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -v3_enum.o: ../cryptlib.h v3_enum.c -v3_extku.o: ../../e_os.h ../../include/openssl/asn1.h -v3_extku.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -v3_extku.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h -v3_extku.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -v3_extku.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -v3_extku.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_extku.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_extku.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_extku.o: ../../include/openssl/opensslconf.h -v3_extku.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -v3_extku.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -v3_extku.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -v3_extku.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -v3_extku.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -v3_extku.o: ../cryptlib.h v3_extku.c -v3_genn.o: ../../e_os.h ../../include/openssl/asn1.h -v3_genn.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -v3_genn.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h -v3_genn.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -v3_genn.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -v3_genn.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_genn.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_genn.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_genn.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -v3_genn.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -v3_genn.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -v3_genn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -v3_genn.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -v3_genn.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_genn.c -v3_ia5.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -v3_ia5.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h -v3_ia5.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -v3_ia5.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -v3_ia5.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_ia5.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_ia5.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_ia5.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -v3_ia5.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -v3_ia5.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -v3_ia5.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -v3_ia5.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -v3_ia5.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_ia5.c -v3_info.o: ../../e_os.h ../../include/openssl/asn1.h -v3_info.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -v3_info.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h -v3_info.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -v3_info.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -v3_info.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_info.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_info.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_info.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -v3_info.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -v3_info.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -v3_info.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -v3_info.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -v3_info.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_info.c -v3_int.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -v3_int.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h -v3_int.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -v3_int.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -v3_int.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_int.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_int.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_int.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -v3_int.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -v3_int.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -v3_int.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -v3_int.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -v3_int.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_int.c -v3_lib.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -v3_lib.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h -v3_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -v3_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -v3_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -v3_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -v3_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -v3_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -v3_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -v3_lib.o: ../../include/openssl/x509v3.h ../cryptlib.h ext_dat.h v3_lib.c -v3_ncons.o: ../../e_os.h ../../include/openssl/asn1.h -v3_ncons.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -v3_ncons.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h -v3_ncons.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -v3_ncons.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -v3_ncons.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_ncons.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_ncons.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_ncons.o: ../../include/openssl/opensslconf.h -v3_ncons.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -v3_ncons.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -v3_ncons.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -v3_ncons.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -v3_ncons.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -v3_ncons.o: ../cryptlib.h v3_ncons.c -v3_ocsp.o: ../../e_os.h ../../include/openssl/asn1.h -v3_ocsp.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -v3_ocsp.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -v3_ocsp.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -v3_ocsp.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -v3_ocsp.o: ../../include/openssl/err.h ../../include/openssl/evp.h -v3_ocsp.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -v3_ocsp.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h -v3_ocsp.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -v3_ocsp.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -v3_ocsp.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -v3_ocsp.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -v3_ocsp.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -v3_ocsp.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_ocsp.c -v3_pci.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -v3_pci.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h -v3_pci.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -v3_pci.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -v3_pci.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_pci.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_pci.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_pci.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -v3_pci.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -v3_pci.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -v3_pci.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -v3_pci.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -v3_pci.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_pci.c -v3_pcia.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h -v3_pcia.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -v3_pcia.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -v3_pcia.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -v3_pcia.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -v3_pcia.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_pcia.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_pcia.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -v3_pcia.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -v3_pcia.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -v3_pcia.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -v3_pcia.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -v3_pcia.o: ../../include/openssl/x509v3.h v3_pcia.c -v3_pcons.o: ../../e_os.h ../../include/openssl/asn1.h -v3_pcons.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -v3_pcons.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h -v3_pcons.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -v3_pcons.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -v3_pcons.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_pcons.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_pcons.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_pcons.o: ../../include/openssl/opensslconf.h -v3_pcons.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -v3_pcons.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -v3_pcons.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -v3_pcons.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -v3_pcons.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -v3_pcons.o: ../cryptlib.h v3_pcons.c -v3_pku.o: ../../e_os.h ../../include/openssl/asn1.h -v3_pku.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -v3_pku.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h -v3_pku.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -v3_pku.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -v3_pku.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_pku.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_pku.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_pku.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -v3_pku.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -v3_pku.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -v3_pku.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -v3_pku.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -v3_pku.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_pku.c -v3_pmaps.o: ../../e_os.h ../../include/openssl/asn1.h -v3_pmaps.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -v3_pmaps.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h -v3_pmaps.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -v3_pmaps.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -v3_pmaps.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_pmaps.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_pmaps.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_pmaps.o: ../../include/openssl/opensslconf.h -v3_pmaps.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -v3_pmaps.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -v3_pmaps.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -v3_pmaps.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -v3_pmaps.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -v3_pmaps.o: ../cryptlib.h v3_pmaps.c -v3_prn.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -v3_prn.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h -v3_prn.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -v3_prn.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -v3_prn.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_prn.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_prn.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_prn.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -v3_prn.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -v3_prn.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -v3_prn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -v3_prn.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -v3_prn.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_prn.c -v3_purp.o: ../../e_os.h ../../include/openssl/asn1.h -v3_purp.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -v3_purp.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -v3_purp.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -v3_purp.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -v3_purp.o: ../../include/openssl/err.h ../../include/openssl/evp.h -v3_purp.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -v3_purp.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -v3_purp.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -v3_purp.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -v3_purp.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -v3_purp.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -v3_purp.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -v3_purp.o: ../cryptlib.h v3_purp.c -v3_skey.o: ../../e_os.h ../../include/openssl/asn1.h -v3_skey.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -v3_skey.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -v3_skey.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -v3_skey.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -v3_skey.o: ../../include/openssl/err.h ../../include/openssl/evp.h -v3_skey.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -v3_skey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -v3_skey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -v3_skey.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -v3_skey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -v3_skey.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -v3_skey.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -v3_skey.o: ../cryptlib.h v3_skey.c -v3_sxnet.o: ../../e_os.h ../../include/openssl/asn1.h -v3_sxnet.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h -v3_sxnet.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h -v3_sxnet.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -v3_sxnet.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -v3_sxnet.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3_sxnet.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3_sxnet.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3_sxnet.o: ../../include/openssl/opensslconf.h -v3_sxnet.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -v3_sxnet.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -v3_sxnet.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -v3_sxnet.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -v3_sxnet.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -v3_sxnet.o: ../cryptlib.h v3_sxnet.c -v3_utl.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h -v3_utl.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -v3_utl.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -v3_utl.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -v3_utl.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -v3_utl.o: ../../include/openssl/err.h ../../include/openssl/evp.h -v3_utl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -v3_utl.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -v3_utl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -v3_utl.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -v3_utl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -v3_utl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -v3_utl.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -v3_utl.o: ../cryptlib.h v3_utl.c -v3err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -v3err.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h -v3err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -v3err.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -v3err.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -v3err.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -v3err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -v3err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -v3err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -v3err.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -v3err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -v3err.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -v3err.o: ../../include/openssl/x509v3.h v3err.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/crypto/x509v3/v3_purp.c nodejs-0.10.29/deps/openssl/openssl/crypto/x509v3/v3_purp.c --- nodejs-0.10.28/deps/openssl/openssl/crypto/x509v3/v3_purp.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/crypto/x509v3/v3_purp.c 2014-06-09 17:04:36.000000000 +0000 @@ -389,8 +389,8 @@ /* Handle proxy certificates */ if((pci=X509_get_ext_d2i(x, NID_proxyCertInfo, NULL, NULL))) { if (x->ex_flags & EXFLAG_CA - || X509_get_ext_by_NID(x, NID_subject_alt_name, 0) >= 0 - || X509_get_ext_by_NID(x, NID_issuer_alt_name, 0) >= 0) { + || X509_get_ext_by_NID(x, NID_subject_alt_name, -1) >= 0 + || X509_get_ext_by_NID(x, NID_issuer_alt_name, -1) >= 0) { x->ex_flags |= EXFLAG_INVALID; } if (pci->pcPathLengthConstraint) { @@ -670,7 +670,7 @@ return 0; /* Extended Key Usage MUST be critical */ - i_ext = X509_get_ext_by_NID((X509 *) x, NID_ext_key_usage, 0); + i_ext = X509_get_ext_by_NID((X509 *) x, NID_ext_key_usage, -1); if (i_ext >= 0) { X509_EXTENSION *ext = X509_get_ext((X509 *) x, i_ext); diff -Nru nodejs-0.10.28/deps/openssl/openssl/doc/apps/cms.pod nodejs-0.10.29/deps/openssl/openssl/doc/apps/cms.pod --- nodejs-0.10.28/deps/openssl/openssl/doc/apps/cms.pod 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/doc/apps/cms.pod 2014-06-09 17:04:36.000000000 +0000 @@ -90,6 +90,11 @@ encrypted mail message in MIME format for the input file. The decrypted mail is written to the output file. +=item B<-debug_decrypt> + +this option sets the B<CMS_DEBUG_DECRYPT> flag. This option should be used +with caution: see the notes section below. + =item B<-sign> sign mail using the supplied certificate and private key. Input file is @@ -446,32 +451,42 @@ since the content is no longer part of the CMS structure the encoding remains DER. +If the B<-decrypt> option is used without a recipient certificate then an +attempt is made to locate the recipient by trying each potential recipient +in turn using the supplied private key. To thwart the MMA attack +(Bleichenbacher's attack on PKCS #1 v1.5 RSA padding) all recipients are +tried whether they succeed or not and if no recipients match the message +is "decrypted" using a random key which will typically output garbage. +The B<-debug_decrypt> option can be used to disable the MMA attack protection +and return an error if no recipient can be found: this option should be used +with caution. For a fuller description see L<CMS_decrypt(3)|CMS_decrypt(3)>). + =head1 EXIT CODES =over 4 -=item 0 +=item Z<>0 the operation was completely successfully. -=item 1 +=item Z<>1 an error occurred parsing the command options. -=item 2 +=item Z<>2 one of the input files could not be read. -=item 3 +=item Z<>3 an error occurred creating the CMS file or when reading the MIME message. -=item 4 +=item Z<>4 an error occurred decrypting or verifying the message. -=item 5 +=item Z<>5 the message was verified correctly but an error occurred writing out the signers certificates. diff -Nru nodejs-0.10.28/deps/openssl/openssl/doc/apps/enc.pod nodejs-0.10.29/deps/openssl/openssl/doc/apps/enc.pod --- nodejs-0.10.28/deps/openssl/openssl/doc/apps/enc.pod 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/doc/apps/enc.pod 2014-06-09 17:04:36.000000000 +0000 @@ -215,6 +215,10 @@ list of ciphers, supported by your versesion of OpenSSL, including ones provided by configured engines. +The B<enc> program does not support authenticated encryption modes +like CCM and GCM. The utility does not store or retrieve the +authentication tag. + base64 Base 64 diff -Nru nodejs-0.10.28/deps/openssl/openssl/doc/apps/smime.pod nodejs-0.10.29/deps/openssl/openssl/doc/apps/smime.pod --- nodejs-0.10.28/deps/openssl/openssl/doc/apps/smime.pod 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/doc/apps/smime.pod 2014-06-09 17:04:36.000000000 +0000 @@ -159,7 +159,7 @@ example B<-aes_128_cbc>. See L<B<enc>|enc(1)> for list of ciphers supported by your version of OpenSSL. -If not specified 40 bit RC2 is used. Only used with B<-encrypt>. +If not specified triple DES is used. Only used with B<-encrypt>. =item B<-nointern> @@ -308,28 +308,28 @@ =over 4 -=item 0 +=item Z<>0 the operation was completely successfully. -=item 1 +=item Z<>1 an error occurred parsing the command options. -=item 2 +=item Z<>2 one of the input files could not be read. -=item 3 +=item Z<>3 an error occurred creating the PKCS#7 file or when reading the MIME message. -=item 4 +=item Z<>4 an error occurred decrypting or verifying the message. -=item 5 +=item Z<>5 the message was verified correctly but an error occurred writing out the signers certificates. diff -Nru nodejs-0.10.28/deps/openssl/openssl/doc/apps/s_server.pod nodejs-0.10.29/deps/openssl/openssl/doc/apps/s_server.pod --- nodejs-0.10.28/deps/openssl/openssl/doc/apps/s_server.pod 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/doc/apps/s_server.pod 2014-06-09 17:04:36.000000000 +0000 @@ -44,6 +44,7 @@ [B<-no_ssl3>] [B<-no_tls1>] [B<-no_dhe>] +[B<-no_ecdhe>] [B<-bugs>] [B<-hack>] [B<-www>] @@ -131,6 +132,11 @@ if this option is set then no DH parameters will be loaded effectively disabling the ephemeral DH cipher suites. +=item B<-no_ecdhe> + +if this option is set then no ECDH parameters will be loaded effectively +disabling the ephemeral ECDH cipher suites. + =item B<-no_tmp_rsa> certain export cipher suites sometimes use a temporary RSA key, this option diff -Nru nodejs-0.10.28/deps/openssl/openssl/doc/apps/verify.pod nodejs-0.10.29/deps/openssl/openssl/doc/apps/verify.pod --- nodejs-0.10.28/deps/openssl/openssl/doc/apps/verify.pod 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/doc/apps/verify.pod 2014-06-09 17:04:36.000000000 +0000 @@ -25,6 +25,7 @@ [B<-untrusted file>] [B<-help>] [B<-issuer_checks>] +[B<-attime timestamp>] [B<-verbose>] [B<->] [certificates] @@ -80,6 +81,12 @@ anything is wrong; during the normal verification process, several rejections may take place. +=item B<-attime timestamp> + +Perform validation checks using time specified by B<timestamp> and not +current system time. B<timestamp> is the number of seconds since +01.01.1970 (UNIX time). + =item B<-policy arg> Enable policy processing and add B<arg> to the user-initial-policy-set (see @@ -386,7 +393,7 @@ =head1 BUGS -Although the issuer checks are a considerably improvement over the old technique they still +Although the issuer checks are a considerable improvement over the old technique they still suffer from limitations in the underlying X509_LOOKUP API. One consequence of this is that trusted certificates with matching subject name must either appear in a file (as specified by the B<-CAfile> option) or a directory (as specified by B<-CApath>. If they occur in both then only diff -Nru nodejs-0.10.28/deps/openssl/openssl/doc/apps/version.pod nodejs-0.10.29/deps/openssl/openssl/doc/apps/version.pod --- nodejs-0.10.28/deps/openssl/openssl/doc/apps/version.pod 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/doc/apps/version.pod 2014-06-09 17:04:36.000000000 +0000 @@ -13,6 +13,7 @@ [B<-o>] [B<-f>] [B<-p>] +[B<-d>] =head1 DESCRIPTION @@ -38,7 +39,7 @@ option information: various options set when the library was built. -=item B<-c> +=item B<-f> compilation flags. diff -Nru nodejs-0.10.28/deps/openssl/openssl/doc/apps/x509v3_config.pod nodejs-0.10.29/deps/openssl/openssl/doc/apps/x509v3_config.pod --- nodejs-0.10.28/deps/openssl/openssl/doc/apps/x509v3_config.pod 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/doc/apps/x509v3_config.pod 2014-06-09 17:04:36.000000000 +0000 @@ -301,7 +301,7 @@ O=Organisation CN=Some Name - + =head2 Certificate Policies. This is a I<raw> extension. All the fields of this extension can be set by @@ -390,7 +390,7 @@ nameConstraints=permitted;email:.somedomain.com nameConstraints=excluded;email:.com -issuingDistributionPoint = idp_section + =head2 OCSP No Check diff -Nru nodejs-0.10.28/deps/openssl/openssl/doc/crypto/CMS_decrypt.pod nodejs-0.10.29/deps/openssl/openssl/doc/crypto/CMS_decrypt.pod --- nodejs-0.10.28/deps/openssl/openssl/doc/crypto/CMS_decrypt.pod 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/doc/crypto/CMS_decrypt.pod 2014-06-09 17:04:36.000000000 +0000 @@ -27,7 +27,21 @@ Although the recipients certificate is not needed to decrypt the data it is needed to locate the appropriate (of possible several) recipients in the CMS -structure. If B<cert> is set to NULL all possible recipients are tried. +structure. + +If B<cert> is set to NULL all possible recipients are tried. This case however +is problematic. To thwart the MMA attack (Bleichenbacher's attack on +PKCS #1 v1.5 RSA padding) all recipients are tried whether they succeed or +not. If no recipient succeeds then a random symmetric key is used to decrypt +the content: this will typically output garbage and may (but is not guaranteed +to) ultimately return a padding error only. If CMS_decrypt() just returned an +error when all recipient encrypted keys failed to decrypt an attacker could +use this in a timing attack. If the special flag B<CMS_DEBUG_DECRYPT> is set +then the above behaviour is modified and an error B<is> returned if no +recipient encrypted key can be decrypted B<without> generating a random +content encryption key. Applications should use this flag with +B<extreme caution> especially in automated gateways as it can leave them +open to attack. It is possible to determine the correct recipient key by other means (for example looking them up in a database) and setting them in the CMS structure diff -Nru nodejs-0.10.28/deps/openssl/openssl/doc/crypto/CONF_modules_free.pod nodejs-0.10.29/deps/openssl/openssl/doc/crypto/CONF_modules_free.pod --- nodejs-0.10.28/deps/openssl/openssl/doc/crypto/CONF_modules_free.pod 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/doc/crypto/CONF_modules_free.pod 2014-06-09 17:04:36.000000000 +0000 @@ -37,7 +37,7 @@ =head1 SEE ALSO L<conf(5)|conf(5)>, L<OPENSSL_config(3)|OPENSSL_config(3)>, -L<CONF_modules_load_file(3), CONF_modules_load_file(3)> +L<CONF_modules_load_file(3)|CONF_modules_load_file(3)> =head1 HISTORY diff -Nru nodejs-0.10.28/deps/openssl/openssl/doc/crypto/CONF_modules_load_file.pod nodejs-0.10.29/deps/openssl/openssl/doc/crypto/CONF_modules_load_file.pod --- nodejs-0.10.28/deps/openssl/openssl/doc/crypto/CONF_modules_load_file.pod 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/doc/crypto/CONF_modules_load_file.pod 2014-06-09 17:04:36.000000000 +0000 @@ -51,7 +51,7 @@ =head1 SEE ALSO L<conf(5)|conf(5)>, L<OPENSSL_config(3)|OPENSSL_config(3)>, -L<CONF_free(3), CONF_free(3)>, L<err(3),err(3)> +L<CONF_free(3)|CONF_free(3)>, L<err(3)|err(3)> =head1 HISTORY diff -Nru nodejs-0.10.28/deps/openssl/openssl/doc/crypto/OPENSSL_config.pod nodejs-0.10.29/deps/openssl/openssl/doc/crypto/OPENSSL_config.pod --- nodejs-0.10.28/deps/openssl/openssl/doc/crypto/OPENSSL_config.pod 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/doc/crypto/OPENSSL_config.pod 2014-06-09 17:04:36.000000000 +0000 @@ -73,7 +73,7 @@ =head1 SEE ALSO L<conf(5)|conf(5)>, L<CONF_load_modules_file(3)|CONF_load_modules_file(3)>, -L<CONF_modules_free(3),CONF_modules_free(3)> +L<CONF_modules_free(3)|CONF_modules_free(3)> =head1 HISTORY diff -Nru nodejs-0.10.28/deps/openssl/openssl/doc/crypto/X509_NAME_ENTRY_get_object.pod nodejs-0.10.29/deps/openssl/openssl/doc/crypto/X509_NAME_ENTRY_get_object.pod --- nodejs-0.10.28/deps/openssl/openssl/doc/crypto/X509_NAME_ENTRY_get_object.pod 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/doc/crypto/X509_NAME_ENTRY_get_object.pod 2014-06-09 17:04:36.000000000 +0000 @@ -65,7 +65,7 @@ =head1 SEE ALSO L<ERR_get_error(3)|ERR_get_error(3)>, L<d2i_X509_NAME(3)|d2i_X509_NAME(3)>, -L<OBJ_nid2obj(3),OBJ_nid2obj(3)> +L<OBJ_nid2obj(3)|OBJ_nid2obj(3)> =head1 HISTORY diff -Nru nodejs-0.10.28/deps/openssl/openssl/doc/crypto/X509_STORE_CTX_get_ex_new_index.pod nodejs-0.10.29/deps/openssl/openssl/doc/crypto/X509_STORE_CTX_get_ex_new_index.pod --- nodejs-0.10.28/deps/openssl/openssl/doc/crypto/X509_STORE_CTX_get_ex_new_index.pod 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/doc/crypto/X509_STORE_CTX_get_ex_new_index.pod 2014-06-09 17:04:36.000000000 +0000 @@ -15,7 +15,7 @@ int X509_STORE_CTX_set_ex_data(X509_STORE_CTX *d, int idx, void *arg); - char *X509_STORE_CTX_get_ex_data(X509_STORE_CTX *d, int idx); + void *X509_STORE_CTX_get_ex_data(X509_STORE_CTX *d, int idx); =head1 DESCRIPTION diff -Nru nodejs-0.10.28/deps/openssl/openssl/doc/fingerprints.txt nodejs-0.10.29/deps/openssl/openssl/doc/fingerprints.txt --- nodejs-0.10.28/deps/openssl/openssl/doc/fingerprints.txt 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/doc/fingerprints.txt 2014-06-09 17:04:36.000000000 +0000 @@ -21,6 +21,13 @@ Key fingerprint = D0 5D 8C 61 6E 27 E6 60 41 EC B1 B8 D5 7E E5 97 uid Dr S N Henson <shenson@drh-consultancy.demon.co.uk> +pub 4096R/FA40E9E2 2005-03-19 + Key fingerprint = 6260 5AA4 334A F9F0 DDE5 D349 D357 7507 FA40 E9E2 +uid Dr Stephen Henson <shenson@opensslfoundation.com> +uid Dr Stephen Henson <shenson@drh-consultancy.co.uk> +uid Dr Stephen N Henson <steve@openssl.org> +sub 4096R/8811F530 2005-03-19 + pub 1024R/49A563D9 1997-02-24 Key fingerprint = 7B 79 19 FA 71 6B 87 25 0E 77 21 E5 52 D9 83 BF uid Mark Cox <mjc@redhat.com> diff -Nru nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_accept.pod nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_accept.pod --- nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_accept.pod 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_accept.pod 2014-06-09 17:04:36.000000000 +0000 @@ -44,13 +44,13 @@ =over 4 -=item 0 +=item Z<>0 The TLS/SSL handshake was not successful but was shut down controlled and by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the return value B<ret> to find out the reason. -=item 1 +=item Z<>1 The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been established. diff -Nru nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_clear.pod nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_clear.pod --- nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_clear.pod 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_clear.pod 2014-06-09 17:04:36.000000000 +0000 @@ -56,12 +56,12 @@ =over 4 -=item 0 +=item Z<>0 The SSL_clear() operation could not be performed. Check the error stack to find out the reason. -=item 1 +=item Z<>1 The SSL_clear() operation was successful. diff -Nru nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_COMP_add_compression_method.pod nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_COMP_add_compression_method.pod --- nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_COMP_add_compression_method.pod 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_COMP_add_compression_method.pod 2014-06-09 17:04:36.000000000 +0000 @@ -53,11 +53,11 @@ =over 4 -=item 0 +=item Z<>0 The operation succeeded. -=item 1 +=item Z<>1 The operation failed. Check the error queue to find out the reason. diff -Nru nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_connect.pod nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_connect.pod --- nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_connect.pod 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_connect.pod 2014-06-09 17:04:36.000000000 +0000 @@ -41,13 +41,13 @@ =over 4 -=item 0 +=item Z<>0 The TLS/SSL handshake was not successful but was shut down controlled and by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the return value B<ret> to find out the reason. -=item 1 +=item Z<>1 The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been established. diff -Nru nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_CTX_add_session.pod nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_CTX_add_session.pod --- nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_CTX_add_session.pod 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_CTX_add_session.pod 2014-06-09 17:04:36.000000000 +0000 @@ -52,13 +52,13 @@ =over 4 -=item 0 +=item Z<>0 The operation failed. In case of the add operation, it was tried to add the same (identical) session twice. In case of the remove operation, the session was not found in the cache. -=item 1 +=item Z<>1 The operation succeeded. diff -Nru nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_CTX_load_verify_locations.pod nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_CTX_load_verify_locations.pod --- nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_CTX_load_verify_locations.pod 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_CTX_load_verify_locations.pod 2014-06-09 17:04:36.000000000 +0000 @@ -100,13 +100,13 @@ =over 4 -=item 0 +=item Z<>0 The operation failed because B<CAfile> and B<CApath> are NULL or the processing at one of the locations specified failed. Check the error stack to find out the reason. -=item 1 +=item Z<>1 The operation succeeded. diff -Nru nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_CTX_set_client_CA_list.pod nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_CTX_set_client_CA_list.pod --- nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_CTX_set_client_CA_list.pod 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_CTX_set_client_CA_list.pod 2014-06-09 17:04:36.000000000 +0000 @@ -66,13 +66,13 @@ =over 4 -=item 0 +=item Z<>0 A failure while manipulating the STACK_OF(X509_NAME) object occurred or the X509_NAME could not be extracted from B<cacert>. Check the error stack to find out the reason. -=item 1 +=item Z<>1 The operation succeeded. diff -Nru nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_CTX_set_msg_callback.pod nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_CTX_set_msg_callback.pod --- nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_CTX_set_msg_callback.pod 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_CTX_set_msg_callback.pod 2014-06-09 17:04:36.000000000 +0000 @@ -11,8 +11,8 @@ void SSL_CTX_set_msg_callback(SSL_CTX *ctx, void (*cb)(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg)); void SSL_CTX_set_msg_callback_arg(SSL_CTX *ctx, void *arg); - void SSL_set_msg_callback(SSL_CTX *ctx, void (*cb)(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg)); - void SSL_set_msg_callback_arg(SSL_CTX *ctx, void *arg); + void SSL_set_msg_callback(SSL *ssl, void (*cb)(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg)); + void SSL_set_msg_callback_arg(SSL *ssl, void *arg); =head1 DESCRIPTION diff -Nru nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_CTX_set_options.pod nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_CTX_set_options.pod --- nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_CTX_set_options.pod 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_CTX_set_options.pod 2014-06-09 17:04:36.000000000 +0000 @@ -112,6 +112,12 @@ broken SSL implementations. This option has no effect for connections using other ciphers. +=item SSL_OP_TLSEXT_PADDING + +Adds a padding extension to ensure the ClientHello size is never between +256 and 511 bytes in length. This is needed as a workaround for some +implementations. + =item SSL_OP_ALL All of the above bug workarounds. diff -Nru nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_CTX_set_session_id_context.pod nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_CTX_set_session_id_context.pod --- nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_CTX_set_session_id_context.pod 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_CTX_set_session_id_context.pod 2014-06-09 17:04:36.000000000 +0000 @@ -64,13 +64,13 @@ =over 4 -=item 0 +=item Z<>0 The length B<sid_ctx_len> of the session id context B<sid_ctx> exceeded the maximum allowed length of B<SSL_MAX_SSL_SESSION_ID_LENGTH>. The error is logged to the error stack. -=item 1 +=item Z<>1 The operation succeeded. diff -Nru nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_CTX_set_ssl_version.pod nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_CTX_set_ssl_version.pod --- nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_CTX_set_ssl_version.pod 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_CTX_set_ssl_version.pod 2014-06-09 17:04:36.000000000 +0000 @@ -42,11 +42,11 @@ =over 4 -=item 0 +=item Z<>0 The new choice failed, check the error stack to find out the reason. -=item 1 +=item Z<>1 The operation succeeded. diff -Nru nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_CTX_use_psk_identity_hint.pod nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_CTX_use_psk_identity_hint.pod --- nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_CTX_use_psk_identity_hint.pod 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_CTX_use_psk_identity_hint.pod 2014-06-09 17:04:36.000000000 +0000 @@ -96,7 +96,7 @@ connection will fail with decryption_error before it will be finished completely. -=item 0 +=item Z<>0 PSK identity was not found. An "unknown_psk_identity" alert message will be sent and the connection setup fails. diff -Nru nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_do_handshake.pod nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_do_handshake.pod --- nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_do_handshake.pod 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_do_handshake.pod 2014-06-09 17:04:36.000000000 +0000 @@ -45,13 +45,13 @@ =over 4 -=item 0 +=item Z<>0 The TLS/SSL handshake was not successful but was shut down controlled and by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the return value B<ret> to find out the reason. -=item 1 +=item Z<>1 The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been established. diff -Nru nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_get_peer_cert_chain.pod nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_get_peer_cert_chain.pod --- nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_get_peer_cert_chain.pod 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_get_peer_cert_chain.pod 2014-06-09 17:04:36.000000000 +0000 @@ -8,11 +8,11 @@ #include <openssl/ssl.h> - STACKOF(X509) *SSL_get_peer_cert_chain(const SSL *ssl); + STACK_OF(X509) *SSL_get_peer_cert_chain(const SSL *ssl); =head1 DESCRIPTION -SSL_get_peer_cert_chain() returns a pointer to STACKOF(X509) certificates +SSL_get_peer_cert_chain() returns a pointer to STACK_OF(X509) certificates forming the certificate chain of the peer. If called on the client side, the stack also contains the peer's certificate; if called on the server side, the peer's certificate must be obtained separately using @@ -24,7 +24,7 @@ The peer certificate chain is not necessarily available after reusing a session, in which case a NULL pointer is returned. -The reference count of the STACKOF(X509) object is not incremented. +The reference count of the STACK_OF(X509) object is not incremented. If the corresponding session is freed, the pointer must not be used any longer. @@ -39,7 +39,7 @@ No certificate was presented by the peer or no connection was established or the certificate chain is no longer available when a session is reused. -=item Pointer to a STACKOF(X509) +=item Pointer to a STACK_OF(X509) The return value points to the certificate chain presented by the peer. diff -Nru nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_read.pod nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_read.pod --- nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_read.pod 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_read.pod 2014-06-09 17:04:36.000000000 +0000 @@ -86,7 +86,7 @@ The read operation was successful; the return value is the number of bytes actually read from the TLS/SSL connection. -=item 0 +=item Z<>0 The read operation was not successful. The reason may either be a clean shutdown due to a "close notify" alert sent by the peer (in which case diff -Nru nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_session_reused.pod nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_session_reused.pod --- nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_session_reused.pod 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_session_reused.pod 2014-06-09 17:04:36.000000000 +0000 @@ -27,11 +27,11 @@ =over 4 -=item 0 +=item Z<>0 A new session was negotiated. -=item 1 +=item Z<>1 A session was reused. diff -Nru nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_set_fd.pod nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_set_fd.pod --- nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_set_fd.pod 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_set_fd.pod 2014-06-09 17:04:36.000000000 +0000 @@ -35,11 +35,11 @@ =over 4 -=item 0 +=item Z<>0 The operation failed. Check the error stack to find out why. -=item 1 +=item Z<>1 The operation succeeded. diff -Nru nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_set_session.pod nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_set_session.pod --- nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_set_session.pod 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_set_session.pod 2014-06-09 17:04:36.000000000 +0000 @@ -37,11 +37,11 @@ =over 4 -=item 0 +=item Z<>0 The operation failed; check the error stack to find out the reason. -=item 1 +=item Z<>1 The operation succeeded. diff -Nru nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_shutdown.pod nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_shutdown.pod --- nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_shutdown.pod 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_shutdown.pod 2014-06-09 17:04:36.000000000 +0000 @@ -92,14 +92,14 @@ =over 4 -=item 0 +=item Z<>0 The shutdown is not yet finished. Call SSL_shutdown() for a second time, if a bidirectional shutdown shall be performed. The output of L<SSL_get_error(3)|SSL_get_error(3)> may be misleading, as an erroneous SSL_ERROR_SYSCALL may be flagged even though no error occurred. -=item 1 +=item Z<>1 The shutdown was successfully completed. The "close notify" alert was sent and the peer's "close notify" alert was received. diff -Nru nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_write.pod nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_write.pod --- nodejs-0.10.28/deps/openssl/openssl/doc/ssl/SSL_write.pod 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/doc/ssl/SSL_write.pod 2014-06-09 17:04:36.000000000 +0000 @@ -79,7 +79,7 @@ The write operation was successful, the return value is the number of bytes actually written to the TLS/SSL connection. -=item 0 +=item Z<>0 The write operation was not successful. Probably the underlying connection was closed. Call SSL_get_error() with the return value B<ret> to find out, diff -Nru nodejs-0.10.28/deps/openssl/openssl/engines/ccgost/gost_ameth.c nodejs-0.10.29/deps/openssl/openssl/engines/ccgost/gost_ameth.c --- nodejs-0.10.28/deps/openssl/openssl/engines/ccgost/gost_ameth.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/engines/ccgost/gost_ameth.c 2014-06-09 17:04:36.000000000 +0000 @@ -269,7 +269,7 @@ case ASN1_PKEY_CTRL_CMS_ENVELOPE: if (arg1 == 0) { - X509_ALGOR *alg; + X509_ALGOR *alg = NULL; ASN1_STRING * params = encode_gost_algor_params(pkey); if (!params) { diff -Nru nodejs-0.10.28/deps/openssl/openssl/engines/ccgost/Makefile.save nodejs-0.10.29/deps/openssl/openssl/engines/ccgost/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/engines/ccgost/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/engines/ccgost/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,275 +0,0 @@ -DIR=ccgost -TOP=../.. -CC=cc -INCLUDES= -I../../include -CFLAG=-g -MAKEFILE= Makefile -AR= ar r -CFLAGS= $(INCLUDES) $(CFLAG) -LIB=$(TOP)/libcrypto.a - -LIBSRC= gost2001.c gost2001_keyx.c gost89.c gost94_keyx.c gost_ameth.c gost_asn1.c gost_crypt.c gost_ctl.c gost_eng.c gosthash.c gost_keywrap.c gost_md.c gost_params.c gost_pmeth.c gost_sign.c - -LIBOBJ= e_gost_err.o gost2001_keyx.o gost2001.o gost89.o gost94_keyx.o gost_ameth.o gost_asn1.o gost_crypt.o gost_ctl.o gost_eng.o gosthash.o gost_keywrap.o gost_md.o gost_params.o gost_pmeth.o gost_sign.o - -SRC=$(LIBSRC) - -LIBNAME=gost - -top: - (cd $(TOP); $(MAKE) DIRS=engines EDIRS=$(DIR) sub_all) - -all: lib - -tags: - ctags $(SRC) - -errors: - $(PERL) ../../util/mkerr.pl -conf gost.ec -nostatic -write $(SRC) - -lib: $(LIBOBJ) - if [ -n "$(SHARED_LIBS)" ]; then \ - $(MAKE) -f $(TOP)/Makefile.shared -e \ - LIBNAME=$(LIBNAME) \ - LIBEXTRAS='$(LIBOBJ)' \ - LIBDEPS='-L$(TOP) -lcrypto' \ - link_o.$(SHLIB_TARGET); \ - else \ - $(AR) $(LIB) $(LIBOBJ); \ - fi - @touch lib - -install: - [ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - if [ -n "$(SHARED_LIBS)" ]; then \ - set -e; \ - echo installing $(LIBNAME); \ - pfx=lib; \ - if [ "$(PLATFORM)" != "Cygwin" ]; then \ - case "$(CFLAGS)" in \ - *DSO_BEOS*) sfx=".so";; \ - *DSO_DLFCN*) sfx=`expr "$(SHLIB_EXT)" : '.*\(\.[a-z][a-z]*\)' \| ".so"`;; \ - *DSO_DL*) sfx=".sl";; \ - *DSO_WIN32*) sfx="eay32.dll"; pfx=;; \ - *) sfx=".bad";; \ - esac; \ - cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \ - else \ - sfx=".so"; \ - cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \ - fi; \ - chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \ - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx; \ - fi - -links: - -tests: - -depend: - @if [ -z "$(THIS)" ]; then \ - $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; \ - else \ - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC); \ - fi - -files: - - - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff *.so *.sl *.dll - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -gost2001.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h -gost2001.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -gost2001.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -gost2001.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h -gost2001.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -gost2001.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -gost2001.o: ../../include/openssl/err.h ../../include/openssl/evp.h -gost2001.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -gost2001.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -gost2001.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -gost2001.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -gost2001.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -gost2001.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -gost2001.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -gost2001.o: e_gost_err.h gost2001.c gost89.h gost_lcl.h gost_params.h -gost2001.o: gosthash.h -gost2001_keyx.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h -gost2001_keyx.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -gost2001_keyx.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -gost2001_keyx.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h -gost2001_keyx.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -gost2001_keyx.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -gost2001_keyx.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -gost2001_keyx.o: ../../include/openssl/obj_mac.h -gost2001_keyx.o: ../../include/openssl/objects.h -gost2001_keyx.o: ../../include/openssl/opensslconf.h -gost2001_keyx.o: ../../include/openssl/opensslv.h -gost2001_keyx.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -gost2001_keyx.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -gost2001_keyx.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -gost2001_keyx.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -gost2001_keyx.o: ../../include/openssl/x509_vfy.h e_gost_err.h gost2001_keyx.c -gost2001_keyx.o: gost2001_keyx.h gost89.h gost_keywrap.h gost_lcl.h gosthash.h -gost89.o: gost89.c gost89.h -gost94_keyx.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h -gost94_keyx.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -gost94_keyx.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -gost94_keyx.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h -gost94_keyx.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -gost94_keyx.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -gost94_keyx.o: ../../include/openssl/engine.h ../../include/openssl/evp.h -gost94_keyx.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -gost94_keyx.o: ../../include/openssl/objects.h -gost94_keyx.o: ../../include/openssl/opensslconf.h -gost94_keyx.o: ../../include/openssl/opensslv.h -gost94_keyx.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -gost94_keyx.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -gost94_keyx.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -gost94_keyx.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -gost94_keyx.o: ../../include/openssl/x509_vfy.h e_gost_err.h gost89.h -gost94_keyx.o: gost94_keyx.c gost_keywrap.h gost_lcl.h gosthash.h -gost_ameth.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h -gost_ameth.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -gost_ameth.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h -gost_ameth.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h -gost_ameth.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -gost_ameth.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -gost_ameth.o: ../../include/openssl/engine.h ../../include/openssl/err.h -gost_ameth.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -gost_ameth.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -gost_ameth.o: ../../include/openssl/opensslconf.h -gost_ameth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -gost_ameth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -gost_ameth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -gost_ameth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -gost_ameth.o: ../../include/openssl/x509_vfy.h e_gost_err.h gost89.h -gost_ameth.o: gost_ameth.c gost_lcl.h gost_params.h gosthash.h -gost_asn1.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h -gost_asn1.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -gost_asn1.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -gost_asn1.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h -gost_asn1.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -gost_asn1.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -gost_asn1.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -gost_asn1.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -gost_asn1.o: ../../include/openssl/opensslconf.h -gost_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -gost_asn1.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -gost_asn1.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -gost_asn1.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -gost_asn1.o: ../../include/openssl/x509_vfy.h gost89.h gost_asn1.c gost_lcl.h -gost_asn1.o: gosthash.h -gost_crypt.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h -gost_crypt.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -gost_crypt.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -gost_crypt.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h -gost_crypt.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -gost_crypt.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -gost_crypt.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -gost_crypt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -gost_crypt.o: ../../include/openssl/opensslconf.h -gost_crypt.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -gost_crypt.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -gost_crypt.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -gost_crypt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -gost_crypt.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -gost_crypt.o: e_gost_err.h gost89.h gost_crypt.c gost_lcl.h gosthash.h -gost_ctl.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h -gost_ctl.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -gost_ctl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -gost_ctl.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h -gost_ctl.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -gost_ctl.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -gost_ctl.o: ../../include/openssl/err.h ../../include/openssl/evp.h -gost_ctl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -gost_ctl.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -gost_ctl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -gost_ctl.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -gost_ctl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -gost_ctl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -gost_ctl.o: ../../include/openssl/x509_vfy.h gost89.h gost_ctl.c gost_lcl.h -gost_ctl.o: gosthash.h -gost_eng.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h -gost_eng.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -gost_eng.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -gost_eng.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h -gost_eng.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -gost_eng.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -gost_eng.o: ../../include/openssl/err.h ../../include/openssl/evp.h -gost_eng.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -gost_eng.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -gost_eng.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -gost_eng.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -gost_eng.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -gost_eng.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -gost_eng.o: ../../include/openssl/x509_vfy.h e_gost_err.h gost89.h gost_eng.c -gost_eng.o: gost_lcl.h gosthash.h -gost_keywrap.o: gost89.h gost_keywrap.c gost_keywrap.h -gost_md.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h -gost_md.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -gost_md.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -gost_md.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h -gost_md.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -gost_md.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -gost_md.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -gost_md.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -gost_md.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -gost_md.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h -gost_md.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -gost_md.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -gost_md.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -gost_md.o: e_gost_err.h gost89.h gost_lcl.h gost_md.c gosthash.h -gost_params.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -gost_params.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -gost_params.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -gost_params.o: ../../include/openssl/opensslconf.h -gost_params.o: ../../include/openssl/opensslv.h -gost_params.o: ../../include/openssl/ossl_typ.h -gost_params.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -gost_params.o: ../../include/openssl/symhacks.h gost_params.c gost_params.h -gost_pmeth.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h -gost_pmeth.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -gost_pmeth.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h -gost_pmeth.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h -gost_pmeth.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -gost_pmeth.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -gost_pmeth.o: ../../include/openssl/engine.h ../../include/openssl/evp.h -gost_pmeth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -gost_pmeth.o: ../../include/openssl/objects.h -gost_pmeth.o: ../../include/openssl/opensslconf.h -gost_pmeth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -gost_pmeth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -gost_pmeth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -gost_pmeth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -gost_pmeth.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -gost_pmeth.o: e_gost_err.h gost89.h gost_lcl.h gost_params.h gost_pmeth.c -gost_pmeth.o: gosthash.h -gost_sign.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h -gost_sign.o: ../../include/openssl/bio.h ../../include/openssl/bn.h -gost_sign.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -gost_sign.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h -gost_sign.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -gost_sign.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -gost_sign.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -gost_sign.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -gost_sign.o: ../../include/openssl/opensslconf.h -gost_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -gost_sign.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h -gost_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -gost_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -gost_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -gost_sign.o: e_gost_err.h gost89.h gost_lcl.h gost_params.h gost_sign.c -gost_sign.o: gosthash.h -gosthash.o: gost89.h gosthash.c gosthash.h diff -Nru nodejs-0.10.28/deps/openssl/openssl/engines/Makefile.save nodejs-0.10.29/deps/openssl/openssl/engines/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/engines/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/engines/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,335 +0,0 @@ -# -# OpenSSL/engines/Makefile -# - -DIR= engines -TOP= .. -CC= cc -INCLUDES= -I../include -CFLAG=-g -MAKEFILE= Makefile -AR= ar r -ENGDIRS= ccgost - -RECURSIVE_MAKE= [ -z "$(ENGDIRS)" ] || for i in $(ENGDIRS) ; do \ - (cd $$i && echo "making $$target in $(DIR)/$$i..." && \ - $(MAKE) -e TOP=../.. DIR=$$i $$target ) || exit 1; \ - done; - -PEX_LIBS= -EX_LIBS= - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile engines.com install.com engine_vector.mar -TEST= -APPS= - -LIB=$(TOP)/libcrypto.a -LIBNAMES= 4758cca aep atalla cswift gmp chil nuron sureware ubsec padlock capi - -LIBSRC= e_4758cca.c \ - e_aep.c \ - e_atalla.c \ - e_cswift.c \ - e_gmp.c \ - e_chil.c \ - e_nuron.c \ - e_sureware.c \ - e_ubsec.c \ - e_padlock.c \ - e_capi.c -LIBOBJ= e_4758cca.o \ - e_aep.o \ - e_atalla.o \ - e_cswift.o \ - e_gmp.o \ - e_chil.o \ - e_nuron.o \ - e_sureware.o \ - e_ubsec.o \ - e_padlock.o \ - e_capi.o - -SRC= $(LIBSRC) - -EXHEADER= -HEADER= e_4758cca_err.c e_4758cca_err.h \ - e_aep_err.c e_aep_err.h \ - e_atalla_err.c e_atalla_err.h \ - e_cswift_err.c e_cswift_err.h \ - e_gmp_err.c e_gmp_err.h \ - e_chil_err.c e_chil_err.h \ - e_nuron_err.c e_nuron_err.h \ - e_sureware_err.c e_sureware_err.h \ - e_ubsec_err.c e_ubsec_err.h \ - e_capi_err.c e_capi_err.h - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ..; $(MAKE) DIRS=$(DIR) all) - -all: lib subdirs - -lib: $(LIBOBJ) - @if [ -n "$(SHARED_LIBS)" ]; then \ - set -e; \ - for l in $(LIBNAMES); do \ - $(MAKE) -f ../Makefile.shared -e \ - LIBNAME=$$l LIBEXTRAS=e_$$l.o \ - LIBDEPS='-L.. -lcrypto $(EX_LIBS)' \ - link_o.$(SHLIB_TARGET); \ - done; \ - else \ - $(AR) $(LIB) $(LIBOBJ); \ - $(RANLIB) $(LIB) || echo Never mind.; \ - fi; \ - touch lib - -subdirs: - echo $(EDIRS) - @target=all; $(RECURSIVE_MAKE) - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - @target=files; $(RECURSIVE_MAKE) - -links: - @target=links; $(RECURSIVE_MAKE) - -# XXXXX This currently only works on systems that use .so as suffix -# for shared libraries as well as for Cygwin which uses the -# dlfcn_name_converter and therefore stores the engines with .so suffix, too. -# XXXXX This was extended to HP-UX dl targets, which use .sl suffix. -# XXXXX This was extended to mingw targets, which use eay32.dll suffix without lib as prefix. -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @if [ -n "$(SHARED_LIBS)" ]; then \ - set -e; \ - $(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines; \ - for l in $(LIBNAMES); do \ - ( echo installing $$l; \ - pfx=lib; \ - if [ "$(PLATFORM)" != "Cygwin" ]; then \ - case "$(CFLAGS)" in \ - *DSO_BEOS*) sfx=".so";; \ - *DSO_DLFCN*) sfx=`expr "$(SHLIB_EXT)" : '.*\(\.[a-z][a-z]*\)' \| ".so"`;; \ - *DSO_DL*) sfx=".sl";; \ - *DSO_WIN32*) sfx="eay32.dll"; pfx=;; \ - *) sfx=".bad";; \ - esac; \ - cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ - else \ - sfx=".so"; \ - cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ - fi; \ - chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \ - done; \ - fi - @target=install; $(RECURSIVE_MAKE) - -tags: - ctags $(SRC) - -errors: - set -e; for l in $(LIBNAMES); do \ - $(PERL) ../util/mkerr.pl -conf e_$$l.ec \ - -nostatic -staticloader -write e_$$l.c; \ - done - (cd ccgost; $(MAKE) PERL=$(PERL) errors) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - @target=lint; $(RECURSIVE_MAKE) - -depend: - @if [ -z "$(THIS)" ]; then \ - $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; \ - fi - @[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - @[ -z "$(THIS)" ] || (set -e; target=depend; $(RECURSIVE_MAKE) ) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - @target=dclean; $(RECURSIVE_MAKE) - -clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - @target=clean; $(RECURSIVE_MAKE) - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -e_4758cca.o: ../include/openssl/asn1.h ../include/openssl/bio.h -e_4758cca.o: ../include/openssl/bn.h ../include/openssl/buffer.h -e_4758cca.o: ../include/openssl/crypto.h ../include/openssl/dso.h -e_4758cca.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -e_4758cca.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -e_4758cca.o: ../include/openssl/engine.h ../include/openssl/err.h -e_4758cca.o: ../include/openssl/evp.h ../include/openssl/lhash.h -e_4758cca.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -e_4758cca.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -e_4758cca.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h -e_4758cca.o: ../include/openssl/rand.h ../include/openssl/rsa.h -e_4758cca.o: ../include/openssl/safestack.h ../include/openssl/sha.h -e_4758cca.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -e_4758cca.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -e_4758cca.o: e_4758cca.c e_4758cca_err.c e_4758cca_err.h -e_4758cca.o: vendor_defns/hw_4758_cca.h -e_aep.o: ../include/openssl/asn1.h ../include/openssl/bio.h -e_aep.o: ../include/openssl/bn.h ../include/openssl/buffer.h -e_aep.o: ../include/openssl/crypto.h ../include/openssl/dh.h -e_aep.o: ../include/openssl/dsa.h ../include/openssl/dso.h -e_aep.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -e_aep.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -e_aep.o: ../include/openssl/engine.h ../include/openssl/err.h -e_aep.o: ../include/openssl/evp.h ../include/openssl/lhash.h -e_aep.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -e_aep.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -e_aep.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h -e_aep.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -e_aep.o: ../include/openssl/sha.h ../include/openssl/stack.h -e_aep.o: ../include/openssl/symhacks.h ../include/openssl/x509.h -e_aep.o: ../include/openssl/x509_vfy.h e_aep.c e_aep_err.c e_aep_err.h -e_aep.o: vendor_defns/aep.h -e_atalla.o: ../include/openssl/asn1.h ../include/openssl/bio.h -e_atalla.o: ../include/openssl/bn.h ../include/openssl/buffer.h -e_atalla.o: ../include/openssl/crypto.h ../include/openssl/dh.h -e_atalla.o: ../include/openssl/dsa.h ../include/openssl/dso.h -e_atalla.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -e_atalla.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -e_atalla.o: ../include/openssl/engine.h ../include/openssl/err.h -e_atalla.o: ../include/openssl/evp.h ../include/openssl/lhash.h -e_atalla.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -e_atalla.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -e_atalla.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h -e_atalla.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -e_atalla.o: ../include/openssl/sha.h ../include/openssl/stack.h -e_atalla.o: ../include/openssl/symhacks.h ../include/openssl/x509.h -e_atalla.o: ../include/openssl/x509_vfy.h e_atalla.c e_atalla_err.c -e_atalla.o: e_atalla_err.h vendor_defns/atalla.h -e_capi.o: ../include/openssl/asn1.h ../include/openssl/bio.h -e_capi.o: ../include/openssl/bn.h ../include/openssl/buffer.h -e_capi.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -e_capi.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -e_capi.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -e_capi.o: ../include/openssl/evp.h ../include/openssl/lhash.h -e_capi.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -e_capi.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -e_capi.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h -e_capi.o: ../include/openssl/safestack.h ../include/openssl/sha.h -e_capi.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -e_capi.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h e_capi.c -e_chil.o: ../include/openssl/asn1.h ../include/openssl/bio.h -e_chil.o: ../include/openssl/bn.h ../include/openssl/buffer.h -e_chil.o: ../include/openssl/crypto.h ../include/openssl/dh.h -e_chil.o: ../include/openssl/dso.h ../include/openssl/e_os2.h -e_chil.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -e_chil.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -e_chil.o: ../include/openssl/err.h ../include/openssl/evp.h -e_chil.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -e_chil.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -e_chil.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -e_chil.o: ../include/openssl/pem.h ../include/openssl/pem2.h -e_chil.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h -e_chil.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -e_chil.o: ../include/openssl/sha.h ../include/openssl/stack.h -e_chil.o: ../include/openssl/symhacks.h ../include/openssl/ui.h -e_chil.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h e_chil.c -e_chil.o: e_chil_err.c e_chil_err.h vendor_defns/hwcryptohook.h -e_cswift.o: ../include/openssl/asn1.h ../include/openssl/bio.h -e_cswift.o: ../include/openssl/bn.h ../include/openssl/buffer.h -e_cswift.o: ../include/openssl/crypto.h ../include/openssl/dh.h -e_cswift.o: ../include/openssl/dsa.h ../include/openssl/dso.h -e_cswift.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -e_cswift.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -e_cswift.o: ../include/openssl/engine.h ../include/openssl/err.h -e_cswift.o: ../include/openssl/evp.h ../include/openssl/lhash.h -e_cswift.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -e_cswift.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -e_cswift.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h -e_cswift.o: ../include/openssl/rand.h ../include/openssl/rsa.h -e_cswift.o: ../include/openssl/safestack.h ../include/openssl/sha.h -e_cswift.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -e_cswift.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h e_cswift.c -e_cswift.o: e_cswift_err.c e_cswift_err.h vendor_defns/cswift.h -e_gmp.o: ../include/openssl/asn1.h ../include/openssl/bio.h -e_gmp.o: ../include/openssl/bn.h ../include/openssl/buffer.h -e_gmp.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -e_gmp.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -e_gmp.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -e_gmp.o: ../include/openssl/evp.h ../include/openssl/lhash.h -e_gmp.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -e_gmp.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -e_gmp.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h -e_gmp.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -e_gmp.o: ../include/openssl/sha.h ../include/openssl/stack.h -e_gmp.o: ../include/openssl/symhacks.h ../include/openssl/x509.h -e_gmp.o: ../include/openssl/x509_vfy.h e_gmp.c -e_nuron.o: ../include/openssl/asn1.h ../include/openssl/bio.h -e_nuron.o: ../include/openssl/bn.h ../include/openssl/buffer.h -e_nuron.o: ../include/openssl/crypto.h ../include/openssl/dh.h -e_nuron.o: ../include/openssl/dsa.h ../include/openssl/dso.h -e_nuron.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -e_nuron.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -e_nuron.o: ../include/openssl/engine.h ../include/openssl/err.h -e_nuron.o: ../include/openssl/evp.h ../include/openssl/lhash.h -e_nuron.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -e_nuron.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -e_nuron.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h -e_nuron.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -e_nuron.o: ../include/openssl/sha.h ../include/openssl/stack.h -e_nuron.o: ../include/openssl/symhacks.h ../include/openssl/x509.h -e_nuron.o: ../include/openssl/x509_vfy.h e_nuron.c e_nuron_err.c e_nuron_err.h -e_padlock.o: ../include/openssl/aes.h ../include/openssl/asn1.h -e_padlock.o: ../include/openssl/bio.h ../include/openssl/buffer.h -e_padlock.o: ../include/openssl/crypto.h ../include/openssl/dso.h -e_padlock.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -e_padlock.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -e_padlock.o: ../include/openssl/engine.h ../include/openssl/err.h -e_padlock.o: ../include/openssl/evp.h ../include/openssl/lhash.h -e_padlock.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -e_padlock.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -e_padlock.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h -e_padlock.o: ../include/openssl/rand.h ../include/openssl/safestack.h -e_padlock.o: ../include/openssl/sha.h ../include/openssl/stack.h -e_padlock.o: ../include/openssl/symhacks.h ../include/openssl/x509.h -e_padlock.o: ../include/openssl/x509_vfy.h e_padlock.c -e_sureware.o: ../include/openssl/asn1.h ../include/openssl/bio.h -e_sureware.o: ../include/openssl/bn.h ../include/openssl/buffer.h -e_sureware.o: ../include/openssl/crypto.h ../include/openssl/dh.h -e_sureware.o: ../include/openssl/dsa.h ../include/openssl/dso.h -e_sureware.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -e_sureware.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -e_sureware.o: ../include/openssl/engine.h ../include/openssl/err.h -e_sureware.o: ../include/openssl/evp.h ../include/openssl/lhash.h -e_sureware.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -e_sureware.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -e_sureware.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -e_sureware.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -e_sureware.o: ../include/openssl/rand.h ../include/openssl/rsa.h -e_sureware.o: ../include/openssl/safestack.h ../include/openssl/sha.h -e_sureware.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -e_sureware.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -e_sureware.o: e_sureware.c e_sureware_err.c e_sureware_err.h -e_sureware.o: vendor_defns/sureware.h -e_ubsec.o: ../include/openssl/asn1.h ../include/openssl/bio.h -e_ubsec.o: ../include/openssl/bn.h ../include/openssl/buffer.h -e_ubsec.o: ../include/openssl/crypto.h ../include/openssl/dh.h -e_ubsec.o: ../include/openssl/dsa.h ../include/openssl/dso.h -e_ubsec.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -e_ubsec.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -e_ubsec.o: ../include/openssl/engine.h ../include/openssl/err.h -e_ubsec.o: ../include/openssl/evp.h ../include/openssl/lhash.h -e_ubsec.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -e_ubsec.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -e_ubsec.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h -e_ubsec.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -e_ubsec.o: ../include/openssl/sha.h ../include/openssl/stack.h -e_ubsec.o: ../include/openssl/symhacks.h ../include/openssl/x509.h -e_ubsec.o: ../include/openssl/x509_vfy.h e_ubsec.c e_ubsec_err.c e_ubsec_err.h -e_ubsec.o: vendor_defns/hw_ubsec.h diff -Nru nodejs-0.10.28/deps/openssl/openssl/Makefile nodejs-0.10.29/deps/openssl/openssl/Makefile --- nodejs-0.10.28/deps/openssl/openssl/Makefile 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/Makefile 2014-06-09 17:04:36.000000000 +0000 @@ -4,7 +4,7 @@ ## Makefile for OpenSSL ## -VERSION=1.0.1g +VERSION=1.0.1h MAJOR=1 MINOR=0.1 SHLIB_VERSION_NUMBER=1.0.0 diff -Nru nodejs-0.10.28/deps/openssl/openssl/Makefile.bak nodejs-0.10.29/deps/openssl/openssl/Makefile.bak --- nodejs-0.10.28/deps/openssl/openssl/Makefile.bak 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/Makefile.bak 2014-06-09 17:04:36.000000000 +0000 @@ -4,7 +4,7 @@ ## Makefile for OpenSSL ## -VERSION=1.0.1g-dev +VERSION=1.0.1h-dev MAJOR=1 MINOR=0.1 SHLIB_VERSION_NUMBER=1.0.0 diff -Nru nodejs-0.10.28/deps/openssl/openssl/NEWS nodejs-0.10.29/deps/openssl/openssl/NEWS --- nodejs-0.10.28/deps/openssl/openssl/NEWS 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/NEWS 2014-06-09 17:04:36.000000000 +0000 @@ -5,6 +5,14 @@ This file gives a brief overview of the major changes between each OpenSSL release. For more details please read the CHANGES file. + Major changes between OpenSSL 1.0.1g and OpenSSL 1.0.1h [5 Jun 2014] + + o Fix for CVE-2014-0224 + o Fix for CVE-2014-0221 + o Fix for CVE-2014-0195 + o Fix for CVE-2014-3470 + o Fix for CVE-2010-5298 + Major changes between OpenSSL 1.0.1f and OpenSSL 1.0.1g [7 Apr 2014] o Fix for CVE-2014-0160 diff -Nru nodejs-0.10.28/deps/openssl/openssl/openssl.spec nodejs-0.10.29/deps/openssl/openssl/openssl.spec --- nodejs-0.10.28/deps/openssl/openssl/openssl.spec 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/openssl.spec 2014-06-09 17:04:36.000000000 +0000 @@ -7,7 +7,7 @@ Summary: Secure Sockets Layer and cryptography libraries and tools Name: openssl #Version: %{libmaj}.%{libmin}.%{librel} -Version: 1.0.1g +Version: 1.0.1h Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz License: OpenSSL Group: System Environment/Libraries diff -Nru nodejs-0.10.28/deps/openssl/openssl/README nodejs-0.10.29/deps/openssl/openssl/README --- nodejs-0.10.28/deps/openssl/openssl/README 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/README 2014-06-09 17:04:36.000000000 +0000 @@ -1,5 +1,5 @@ - OpenSSL 1.0.1g 7 Apr 2014 + OpenSSL 1.0.1h 5 Jun 2014 Copyright (c) 1998-2011 The OpenSSL Project Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson diff -Nru nodejs-0.10.28/deps/openssl/openssl/ssl/d1_both.c nodejs-0.10.29/deps/openssl/openssl/ssl/d1_both.c --- nodejs-0.10.28/deps/openssl/openssl/ssl/d1_both.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/ssl/d1_both.c 2014-06-09 17:04:36.000000000 +0000 @@ -627,7 +627,16 @@ frag->msg_header.frag_off = 0; } else + { frag = (hm_fragment*) item->data; + if (frag->msg_header.msg_len != msg_hdr->msg_len) + { + item = NULL; + frag = NULL; + goto err; + } + } + /* If message is already reassembled, this must be a * retransmit and can be dropped. @@ -674,8 +683,8 @@ item = pitem_new(seq64be, frag); if (item == NULL) { - goto err; i = -1; + goto err; } pqueue_insert(s->d1->buffered_messages, item); @@ -784,6 +793,7 @@ int i,al; struct hm_header_st msg_hdr; + redo: /* see if we have the required fragment already */ if ((frag_len = dtls1_retrieve_buffered_fragment(s,max,ok)) || *ok) { @@ -842,8 +852,7 @@ s->msg_callback_arg); s->init_num = 0; - return dtls1_get_message_fragment(s, st1, stn, - max, ok); + goto redo; } else /* Incorrectly formated Hello request */ { diff -Nru nodejs-0.10.28/deps/openssl/openssl/ssl/d1_lib.c nodejs-0.10.29/deps/openssl/openssl/ssl/d1_lib.c --- nodejs-0.10.28/deps/openssl/openssl/ssl/d1_lib.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/ssl/d1_lib.c 2014-06-09 17:04:36.000000000 +0000 @@ -176,9 +176,12 @@ while ( (item = pqueue_pop(s->d1->buffered_app_data.q)) != NULL) { - frag = (hm_fragment *)item->data; - OPENSSL_free(frag->fragment); - OPENSSL_free(frag); + rdata = (DTLS1_RECORD_DATA *) item->data; + if (rdata->rbuf.buf) + { + OPENSSL_free(rdata->rbuf.buf); + } + OPENSSL_free(item->data); pitem_free(item); } } diff -Nru nodejs-0.10.28/deps/openssl/openssl/ssl/d1_pkt.c nodejs-0.10.29/deps/openssl/openssl/ssl/d1_pkt.c --- nodejs-0.10.28/deps/openssl/openssl/ssl/d1_pkt.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/ssl/d1_pkt.c 2014-06-09 17:04:36.000000000 +0000 @@ -239,14 +239,6 @@ } #endif - /* insert should not fail, since duplicates are dropped */ - if (pqueue_insert(queue->q, item) == NULL) - { - OPENSSL_free(rdata); - pitem_free(item); - return(0); - } - s->packet = NULL; s->packet_length = 0; memset(&(s->s3->rbuf), 0, sizeof(SSL3_BUFFER)); @@ -259,7 +251,16 @@ pitem_free(item); return(0); } - + + /* insert should not fail, since duplicates are dropped */ + if (pqueue_insert(queue->q, item) == NULL) + { + SSLerr(SSL_F_DTLS1_BUFFER_RECORD, ERR_R_INTERNAL_ERROR); + OPENSSL_free(rdata); + pitem_free(item); + return(0); + } + return(1); } diff -Nru nodejs-0.10.28/deps/openssl/openssl/ssl/d1_srvr.c nodejs-0.10.29/deps/openssl/openssl/ssl/d1_srvr.c --- nodejs-0.10.28/deps/openssl/openssl/ssl/d1_srvr.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/ssl/d1_srvr.c 2014-06-09 17:04:36.000000000 +0000 @@ -1356,6 +1356,7 @@ (unsigned char *)encodedPoint, encodedlen); OPENSSL_free(encodedPoint); + encodedPoint = NULL; p += encodedlen; } #endif diff -Nru nodejs-0.10.28/deps/openssl/openssl/ssl/heartbeat_test.c nodejs-0.10.29/deps/openssl/openssl/ssl/heartbeat_test.c --- nodejs-0.10.28/deps/openssl/openssl/ssl/heartbeat_test.c 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/ssl/heartbeat_test.c 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,465 @@ +/* test/heartbeat_test.c */ +/* + * Unit test for TLS heartbeats. + * + * Acts as a regression test against the Heartbleed bug (CVE-2014-0160). + * + * Author: Mike Bland (mbland@acm.org, http://mike-bland.com/) + * Date: 2014-04-12 + * License: Creative Commons Attribution 4.0 International (CC By 4.0) + * http://creativecommons.org/licenses/by/4.0/deed.en_US + * + * OUTPUT + * ------ + * The program returns zero on success. It will print a message with a count + * of the number of failed tests and return nonzero if any tests fail. + * + * It will print the contents of the request and response buffers for each + * failing test. In a "fixed" version, all the tests should pass and there + * should be no output. + * + * In a "bleeding" version, you'll see: + * + * test_dtls1_heartbleed failed: + * expected payload len: 0 + * received: 1024 + * sent 26 characters + * "HEARTBLEED " + * received 1024 characters + * "HEARTBLEED \xde\xad\xbe\xef..." + * ** test_dtls1_heartbleed failed ** + * + * The contents of the returned buffer in the failing test will depend on the + * contents of memory on your machine. + * + * MORE INFORMATION + * ---------------- + * http://mike-bland.com/2014/04/12/heartbleed.html + * http://mike-bland.com/tags/heartbleed.html + */ + +#include "../ssl/ssl_locl.h" +#include <ctype.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#if !defined(OPENSSL_NO_HEARTBEATS) && !defined(OPENSSL_SYS_WINDOWS) + +/* As per https://tools.ietf.org/html/rfc6520#section-4 */ +#define MIN_PADDING_SIZE 16 + +/* Maximum number of payload characters to print as test output */ +#define MAX_PRINTABLE_CHARACTERS 1024 + +typedef struct heartbeat_test_fixture + { + SSL_CTX *ctx; + SSL *s; + const char* test_case_name; + int (*process_heartbeat)(SSL* s); + unsigned char* payload; + int sent_payload_len; + int expected_return_value; + int return_payload_offset; + int expected_payload_len; + const char* expected_return_payload; + } HEARTBEAT_TEST_FIXTURE; + +static HEARTBEAT_TEST_FIXTURE set_up(const char* const test_case_name, + const SSL_METHOD* meth) + { + HEARTBEAT_TEST_FIXTURE fixture; + int setup_ok = 1; + memset(&fixture, 0, sizeof(fixture)); + fixture.test_case_name = test_case_name; + + fixture.ctx = SSL_CTX_new(meth); + if (!fixture.ctx) + { + fprintf(stderr, "Failed to allocate SSL_CTX for test: %s\n", + test_case_name); + setup_ok = 0; + goto fail; + } + + fixture.s = SSL_new(fixture.ctx); + if (!fixture.s) + { + fprintf(stderr, "Failed to allocate SSL for test: %s\n", test_case_name); + setup_ok = 0; + goto fail; + } + + if (!ssl_init_wbio_buffer(fixture.s, 1)) + { + fprintf(stderr, "Failed to set up wbio buffer for test: %s\n", + test_case_name); + setup_ok = 0; + goto fail; + } + + if (!ssl3_setup_buffers(fixture.s)) + { + fprintf(stderr, "Failed to setup buffers for test: %s\n", + test_case_name); + setup_ok = 0; + goto fail; + } + + /* Clear the memory for the return buffer, since this isn't automatically + * zeroed in opt mode and will cause spurious test failures that will change + * with each execution. + */ + memset(fixture.s->s3->wbuf.buf, 0, fixture.s->s3->wbuf.len); + + fail: + if (!setup_ok) + { + ERR_print_errors_fp(stderr); + exit(EXIT_FAILURE); + } + return fixture; + } + +static HEARTBEAT_TEST_FIXTURE set_up_dtls(const char* const test_case_name) + { + HEARTBEAT_TEST_FIXTURE fixture = set_up(test_case_name, + DTLSv1_server_method()); + fixture.process_heartbeat = dtls1_process_heartbeat; + + /* As per dtls1_get_record(), skipping the following from the beginning of + * the returned heartbeat message: + * type-1 byte; version-2 bytes; sequence number-8 bytes; length-2 bytes + * + * And then skipping the 1-byte type encoded by process_heartbeat for + * a total of 14 bytes, at which point we can grab the length and the + * payload we seek. + */ + fixture.return_payload_offset = 14; + return fixture; + } + +/* Needed by ssl3_write_bytes() */ +static int dummy_handshake(SSL* s) + { + return 1; + } + +static HEARTBEAT_TEST_FIXTURE set_up_tls(const char* const test_case_name) + { + HEARTBEAT_TEST_FIXTURE fixture = set_up(test_case_name, + TLSv1_server_method()); + fixture.process_heartbeat = tls1_process_heartbeat; + fixture.s->handshake_func = dummy_handshake; + + /* As per do_ssl3_write(), skipping the following from the beginning of + * the returned heartbeat message: + * type-1 byte; version-2 bytes; length-2 bytes + * + * And then skipping the 1-byte type encoded by process_heartbeat for + * a total of 6 bytes, at which point we can grab the length and the payload + * we seek. + */ + fixture.return_payload_offset = 6; + return fixture; + } + +static void tear_down(HEARTBEAT_TEST_FIXTURE fixture) + { + ERR_print_errors_fp(stderr); + SSL_free(fixture.s); + SSL_CTX_free(fixture.ctx); + } + +static void print_payload(const char* const prefix, + const unsigned char *payload, const int n) + { + const int end = n < MAX_PRINTABLE_CHARACTERS ? n + : MAX_PRINTABLE_CHARACTERS; + int i = 0; + + printf("%s %d character%s", prefix, n, n == 1 ? "" : "s"); + if (end != n) printf(" (first %d shown)", end); + printf("\n \""); + + for (; i != end; ++i) + { + const unsigned char c = payload[i]; + if (isprint(c)) fputc(c, stdout); + else printf("\\x%02x", c); + } + printf("\"\n"); + } + +static int execute_heartbeat(HEARTBEAT_TEST_FIXTURE fixture) + { + int result = 0; + SSL* s = fixture.s; + unsigned char *payload = fixture.payload; + unsigned char sent_buf[MAX_PRINTABLE_CHARACTERS + 1]; + int return_value; + unsigned const char *p; + int actual_payload_len; + + s->s3->rrec.data = payload; + s->s3->rrec.length = strlen((const char*)payload); + *payload++ = TLS1_HB_REQUEST; + s2n(fixture.sent_payload_len, payload); + + /* Make a local copy of the request, since it gets overwritten at some + * point */ + memcpy((char *)sent_buf, (const char*)payload, sizeof(sent_buf)); + + return_value = fixture.process_heartbeat(s); + + if (return_value != fixture.expected_return_value) + { + printf("%s failed: expected return value %d, received %d\n", + fixture.test_case_name, fixture.expected_return_value, + return_value); + result = 1; + } + + /* If there is any byte alignment, it will be stored in wbuf.offset. */ + p = &(s->s3->wbuf.buf[ + fixture.return_payload_offset + s->s3->wbuf.offset]); + actual_payload_len = 0; + n2s(p, actual_payload_len); + + if (actual_payload_len != fixture.expected_payload_len) + { + printf("%s failed:\n expected payload len: %d\n received: %d\n", + fixture.test_case_name, fixture.expected_payload_len, + actual_payload_len); + print_payload("sent", sent_buf, strlen((const char*)sent_buf)); + print_payload("received", p, actual_payload_len); + result = 1; + } + else + { + char* actual_payload = BUF_strndup((const char*)p, actual_payload_len); + if (strcmp(actual_payload, fixture.expected_return_payload) != 0) + { + printf("%s failed:\n expected payload: \"%s\"\n received: \"%s\"\n", + fixture.test_case_name, fixture.expected_return_payload, + actual_payload); + result = 1; + } + OPENSSL_free(actual_payload); + } + + if (result != 0) + { + printf("** %s failed **\n--------\n", fixture.test_case_name); + } + return result; + } + +static int honest_payload_size(unsigned char payload_buf[]) + { + /* Omit three-byte pad at the beginning for type and payload length */ + return strlen((const char*)&payload_buf[3]) - MIN_PADDING_SIZE; + } + +#define SETUP_HEARTBEAT_TEST_FIXTURE(type)\ + HEARTBEAT_TEST_FIXTURE fixture = set_up_##type(__func__);\ + int result = 0 + +#define EXECUTE_HEARTBEAT_TEST()\ + if (execute_heartbeat(fixture) != 0) result = 1;\ + tear_down(fixture);\ + return result + +static int test_dtls1_not_bleeding() + { + SETUP_HEARTBEAT_TEST_FIXTURE(dtls); + /* Three-byte pad at the beginning for type and payload length */ + unsigned char payload_buf[] = " Not bleeding, sixteen spaces of padding" + " "; + const int payload_buf_len = honest_payload_size(payload_buf); + + fixture.payload = &payload_buf[0]; + fixture.sent_payload_len = payload_buf_len; + fixture.expected_return_value = 0; + fixture.expected_payload_len = payload_buf_len; + fixture.expected_return_payload = "Not bleeding, sixteen spaces of padding"; + EXECUTE_HEARTBEAT_TEST(); + } + +static int test_dtls1_not_bleeding_empty_payload() + { + int payload_buf_len; + + SETUP_HEARTBEAT_TEST_FIXTURE(dtls); + /* Three-byte pad at the beginning for type and payload length, plus a NUL + * at the end */ + unsigned char payload_buf[4 + MIN_PADDING_SIZE]; + memset(payload_buf, ' ', sizeof(payload_buf)); + payload_buf[sizeof(payload_buf) - 1] = '\0'; + payload_buf_len = honest_payload_size(payload_buf); + + fixture.payload = &payload_buf[0]; + fixture.sent_payload_len = payload_buf_len; + fixture.expected_return_value = 0; + fixture.expected_payload_len = payload_buf_len; + fixture.expected_return_payload = ""; + EXECUTE_HEARTBEAT_TEST(); + } + +static int test_dtls1_heartbleed() + { + SETUP_HEARTBEAT_TEST_FIXTURE(dtls); + /* Three-byte pad at the beginning for type and payload length */ + unsigned char payload_buf[] = " HEARTBLEED "; + + fixture.payload = &payload_buf[0]; + fixture.sent_payload_len = MAX_PRINTABLE_CHARACTERS; + fixture.expected_return_value = 0; + fixture.expected_payload_len = 0; + fixture.expected_return_payload = ""; + EXECUTE_HEARTBEAT_TEST(); + } + +static int test_dtls1_heartbleed_empty_payload() + { + SETUP_HEARTBEAT_TEST_FIXTURE(dtls); + /* Excluding the NUL at the end, one byte short of type + payload length + + * minimum padding */ + unsigned char payload_buf[MIN_PADDING_SIZE + 3]; + memset(payload_buf, ' ', sizeof(payload_buf)); + payload_buf[sizeof(payload_buf) - 1] = '\0'; + + fixture.payload = &payload_buf[0]; + fixture.sent_payload_len = MAX_PRINTABLE_CHARACTERS; + fixture.expected_return_value = 0; + fixture.expected_payload_len = 0; + fixture.expected_return_payload = ""; + EXECUTE_HEARTBEAT_TEST(); + } + +static int test_dtls1_heartbleed_excessive_plaintext_length() + { + SETUP_HEARTBEAT_TEST_FIXTURE(dtls); + /* Excluding the NUL at the end, one byte in excess of maximum allowed + * heartbeat message length */ + unsigned char payload_buf[SSL3_RT_MAX_PLAIN_LENGTH + 2]; + memset(payload_buf, ' ', sizeof(payload_buf)); + payload_buf[sizeof(payload_buf) - 1] = '\0'; + + fixture.payload = &payload_buf[0]; + fixture.sent_payload_len = honest_payload_size(payload_buf); + fixture.expected_return_value = 0; + fixture.expected_payload_len = 0; + fixture.expected_return_payload = ""; + EXECUTE_HEARTBEAT_TEST(); + } + +static int test_tls1_not_bleeding() + { + SETUP_HEARTBEAT_TEST_FIXTURE(tls); + /* Three-byte pad at the beginning for type and payload length */ + unsigned char payload_buf[] = " Not bleeding, sixteen spaces of padding" + " "; + const int payload_buf_len = honest_payload_size(payload_buf); + + fixture.payload = &payload_buf[0]; + fixture.sent_payload_len = payload_buf_len; + fixture.expected_return_value = 0; + fixture.expected_payload_len = payload_buf_len; + fixture.expected_return_payload = "Not bleeding, sixteen spaces of padding"; + EXECUTE_HEARTBEAT_TEST(); + } + +static int test_tls1_not_bleeding_empty_payload() + { + int payload_buf_len; + + SETUP_HEARTBEAT_TEST_FIXTURE(tls); + /* Three-byte pad at the beginning for type and payload length, plus a NUL + * at the end */ + unsigned char payload_buf[4 + MIN_PADDING_SIZE]; + memset(payload_buf, ' ', sizeof(payload_buf)); + payload_buf[sizeof(payload_buf) - 1] = '\0'; + payload_buf_len = honest_payload_size(payload_buf); + + fixture.payload = &payload_buf[0]; + fixture.sent_payload_len = payload_buf_len; + fixture.expected_return_value = 0; + fixture.expected_payload_len = payload_buf_len; + fixture.expected_return_payload = ""; + EXECUTE_HEARTBEAT_TEST(); + } + +static int test_tls1_heartbleed() + { + SETUP_HEARTBEAT_TEST_FIXTURE(tls); + /* Three-byte pad at the beginning for type and payload length */ + unsigned char payload_buf[] = " HEARTBLEED "; + + fixture.payload = &payload_buf[0]; + fixture.sent_payload_len = MAX_PRINTABLE_CHARACTERS; + fixture.expected_return_value = 0; + fixture.expected_payload_len = 0; + fixture.expected_return_payload = ""; + EXECUTE_HEARTBEAT_TEST(); + } + +static int test_tls1_heartbleed_empty_payload() + { + SETUP_HEARTBEAT_TEST_FIXTURE(tls); + /* Excluding the NUL at the end, one byte short of type + payload length + + * minimum padding */ + unsigned char payload_buf[MIN_PADDING_SIZE + 3]; + memset(payload_buf, ' ', sizeof(payload_buf)); + payload_buf[sizeof(payload_buf) - 1] = '\0'; + + fixture.payload = &payload_buf[0]; + fixture.sent_payload_len = MAX_PRINTABLE_CHARACTERS; + fixture.expected_return_value = 0; + fixture.expected_payload_len = 0; + fixture.expected_return_payload = ""; + EXECUTE_HEARTBEAT_TEST(); + } + +#undef EXECUTE_HEARTBEAT_TEST +#undef SETUP_HEARTBEAT_TEST_FIXTURE + +int main(int argc, char *argv[]) + { + int num_failed; + + SSL_library_init(); + SSL_load_error_strings(); + + num_failed = test_dtls1_not_bleeding() + + test_dtls1_not_bleeding_empty_payload() + + test_dtls1_heartbleed() + + test_dtls1_heartbleed_empty_payload() + + /* The following test causes an assertion failure at + * ssl/d1_pkt.c:dtls1_write_bytes() in versions prior to 1.0.1g: */ + (OPENSSL_VERSION_NUMBER >= 0x1000107fL ? + test_dtls1_heartbleed_excessive_plaintext_length() : 0) + + test_tls1_not_bleeding() + + test_tls1_not_bleeding_empty_payload() + + test_tls1_heartbleed() + + test_tls1_heartbleed_empty_payload() + + 0; + + ERR_print_errors_fp(stderr); + + if (num_failed != 0) + { + printf("%d test%s failed\n", num_failed, num_failed != 1 ? "s" : ""); + return EXIT_FAILURE; + } + return EXIT_SUCCESS; + } + +#else /* OPENSSL_NO_HEARTBEATS*/ + +int main(int argc, char *argv[]) + { + return EXIT_SUCCESS; + } +#endif /* OPENSSL_NO_HEARTBEATS */ diff -Nru nodejs-0.10.28/deps/openssl/openssl/ssl/Makefile nodejs-0.10.29/deps/openssl/openssl/ssl/Makefile --- nodejs-0.10.28/deps/openssl/openssl/ssl/Makefile 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/ssl/Makefile 2014-06-09 17:04:36.000000000 +0000 @@ -15,7 +15,7 @@ CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile README ssl-lib.com install.com -TEST=ssltest.c +TEST=ssltest.c heartbeat_test.c APPS= LIB=$(TOP)/libssl.a diff -Nru nodejs-0.10.28/deps/openssl/openssl/ssl/Makefile.save nodejs-0.10.29/deps/openssl/openssl/ssl/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/ssl/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/ssl/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,1061 +0,0 @@ -# -# OpenSSL/ssl/Makefile -# - -DIR= ssl -TOP= .. -CC= cc -INCLUDES= -I../crypto -I$(TOP) -I../include $(KRB5_INCLUDES) -CFLAG=-g -MAKEFILE= Makefile -AR= ar r -# KRB5 stuff -KRB5_INCLUDES= - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile README ssl-lib.com install.com -TEST=ssltest.c -APPS= - -LIB=$(TOP)/libssl.a -SHARED_LIB= libssl$(SHLIB_EXT) -LIBSRC= \ - s2_meth.c s2_srvr.c s2_clnt.c s2_lib.c s2_enc.c s2_pkt.c \ - s3_meth.c s3_srvr.c s3_clnt.c s3_lib.c s3_enc.c s3_pkt.c s3_both.c s3_cbc.c \ - s23_meth.c s23_srvr.c s23_clnt.c s23_lib.c s23_pkt.c \ - t1_meth.c t1_srvr.c t1_clnt.c t1_lib.c t1_enc.c \ - d1_meth.c d1_srvr.c d1_clnt.c d1_lib.c d1_pkt.c \ - d1_both.c d1_enc.c d1_srtp.c \ - ssl_lib.c ssl_err2.c ssl_cert.c ssl_sess.c \ - ssl_ciph.c ssl_stat.c ssl_rsa.c \ - ssl_asn1.c ssl_txt.c ssl_algs.c \ - bio_ssl.c ssl_err.c kssl.c tls_srp.c t1_reneg.c -LIBOBJ= \ - s2_meth.o s2_srvr.o s2_clnt.o s2_lib.o s2_enc.o s2_pkt.o \ - s3_meth.o s3_srvr.o s3_clnt.o s3_lib.o s3_enc.o s3_pkt.o s3_both.o s3_cbc.o \ - s23_meth.o s23_srvr.o s23_clnt.o s23_lib.o s23_pkt.o \ - t1_meth.o t1_srvr.o t1_clnt.o t1_lib.o t1_enc.o \ - d1_meth.o d1_srvr.o d1_clnt.o d1_lib.o d1_pkt.o \ - d1_both.o d1_enc.o d1_srtp.o\ - ssl_lib.o ssl_err2.o ssl_cert.o ssl_sess.o \ - ssl_ciph.o ssl_stat.o ssl_rsa.o \ - ssl_asn1.o ssl_txt.o ssl_algs.o \ - bio_ssl.o ssl_err.o kssl.o tls_srp.o t1_reneg.o - -SRC= $(LIBSRC) - -EXHEADER= ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h kssl.h srtp.h -HEADER= $(EXHEADER) ssl_locl.h kssl_lcl.h - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ..; $(MAKE) DIRS=$(DIR) all) - -all: shared - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -shared: lib - if [ -n "$(SHARED_LIBS)" ]; then \ - (cd ..; $(MAKE) $(SHARED_LIB)); \ - fi - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @if [ -z "$(THIS)" ]; then \ - $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; \ - else \ - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC); \ - fi - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -bio_ssl.o: ../include/openssl/asn1.h ../include/openssl/bio.h -bio_ssl.o: ../include/openssl/buffer.h ../include/openssl/comp.h -bio_ssl.o: ../include/openssl/crypto.h ../include/openssl/dtls1.h -bio_ssl.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -bio_ssl.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -bio_ssl.o: ../include/openssl/err.h ../include/openssl/evp.h -bio_ssl.o: ../include/openssl/hmac.h ../include/openssl/kssl.h -bio_ssl.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -bio_ssl.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -bio_ssl.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -bio_ssl.o: ../include/openssl/pem.h ../include/openssl/pem2.h -bio_ssl.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h -bio_ssl.o: ../include/openssl/safestack.h ../include/openssl/sha.h -bio_ssl.o: ../include/openssl/srtp.h ../include/openssl/ssl.h -bio_ssl.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h -bio_ssl.o: ../include/openssl/ssl3.h ../include/openssl/stack.h -bio_ssl.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -bio_ssl.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h bio_ssl.c -d1_both.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -d1_both.o: ../include/openssl/buffer.h ../include/openssl/comp.h -d1_both.o: ../include/openssl/crypto.h ../include/openssl/dsa.h -d1_both.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -d1_both.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -d1_both.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -d1_both.o: ../include/openssl/evp.h ../include/openssl/hmac.h -d1_both.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -d1_both.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -d1_both.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -d1_both.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -d1_both.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -d1_both.o: ../include/openssl/pqueue.h ../include/openssl/rand.h -d1_both.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -d1_both.o: ../include/openssl/sha.h ../include/openssl/srtp.h -d1_both.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h -d1_both.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h -d1_both.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -d1_both.o: ../include/openssl/tls1.h ../include/openssl/x509.h -d1_both.o: ../include/openssl/x509_vfy.h d1_both.c ssl_locl.h -d1_clnt.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -d1_clnt.o: ../include/openssl/bn.h ../include/openssl/buffer.h -d1_clnt.o: ../include/openssl/comp.h ../include/openssl/crypto.h -d1_clnt.o: ../include/openssl/dh.h ../include/openssl/dsa.h -d1_clnt.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -d1_clnt.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -d1_clnt.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -d1_clnt.o: ../include/openssl/evp.h ../include/openssl/hmac.h -d1_clnt.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -d1_clnt.o: ../include/openssl/md5.h ../include/openssl/obj_mac.h -d1_clnt.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -d1_clnt.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -d1_clnt.o: ../include/openssl/pem.h ../include/openssl/pem2.h -d1_clnt.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h -d1_clnt.o: ../include/openssl/rand.h ../include/openssl/rsa.h -d1_clnt.o: ../include/openssl/safestack.h ../include/openssl/sha.h -d1_clnt.o: ../include/openssl/srtp.h ../include/openssl/ssl.h -d1_clnt.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h -d1_clnt.o: ../include/openssl/ssl3.h ../include/openssl/stack.h -d1_clnt.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -d1_clnt.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h d1_clnt.c -d1_clnt.o: kssl_lcl.h ssl_locl.h -d1_enc.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -d1_enc.o: ../include/openssl/buffer.h ../include/openssl/comp.h -d1_enc.o: ../include/openssl/crypto.h ../include/openssl/dsa.h -d1_enc.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -d1_enc.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -d1_enc.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -d1_enc.o: ../include/openssl/evp.h ../include/openssl/hmac.h -d1_enc.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -d1_enc.o: ../include/openssl/md5.h ../include/openssl/obj_mac.h -d1_enc.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -d1_enc.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -d1_enc.o: ../include/openssl/pem.h ../include/openssl/pem2.h -d1_enc.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h -d1_enc.o: ../include/openssl/rand.h ../include/openssl/rsa.h -d1_enc.o: ../include/openssl/safestack.h ../include/openssl/sha.h -d1_enc.o: ../include/openssl/srtp.h ../include/openssl/ssl.h -d1_enc.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h -d1_enc.o: ../include/openssl/ssl3.h ../include/openssl/stack.h -d1_enc.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -d1_enc.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h d1_enc.c -d1_enc.o: ssl_locl.h -d1_lib.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -d1_lib.o: ../include/openssl/buffer.h ../include/openssl/comp.h -d1_lib.o: ../include/openssl/crypto.h ../include/openssl/dsa.h -d1_lib.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -d1_lib.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -d1_lib.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -d1_lib.o: ../include/openssl/evp.h ../include/openssl/hmac.h -d1_lib.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -d1_lib.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -d1_lib.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -d1_lib.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -d1_lib.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -d1_lib.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h -d1_lib.o: ../include/openssl/safestack.h ../include/openssl/sha.h -d1_lib.o: ../include/openssl/srtp.h ../include/openssl/ssl.h -d1_lib.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h -d1_lib.o: ../include/openssl/ssl3.h ../include/openssl/stack.h -d1_lib.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -d1_lib.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h d1_lib.c -d1_lib.o: ssl_locl.h -d1_meth.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -d1_meth.o: ../include/openssl/buffer.h ../include/openssl/comp.h -d1_meth.o: ../include/openssl/crypto.h ../include/openssl/dsa.h -d1_meth.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -d1_meth.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -d1_meth.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -d1_meth.o: ../include/openssl/evp.h ../include/openssl/hmac.h -d1_meth.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -d1_meth.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -d1_meth.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -d1_meth.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -d1_meth.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -d1_meth.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h -d1_meth.o: ../include/openssl/safestack.h ../include/openssl/sha.h -d1_meth.o: ../include/openssl/srtp.h ../include/openssl/ssl.h -d1_meth.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h -d1_meth.o: ../include/openssl/ssl3.h ../include/openssl/stack.h -d1_meth.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -d1_meth.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h d1_meth.c -d1_meth.o: ssl_locl.h -d1_pkt.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -d1_pkt.o: ../include/openssl/buffer.h ../include/openssl/comp.h -d1_pkt.o: ../include/openssl/crypto.h ../include/openssl/dsa.h -d1_pkt.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -d1_pkt.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -d1_pkt.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -d1_pkt.o: ../include/openssl/evp.h ../include/openssl/hmac.h -d1_pkt.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -d1_pkt.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -d1_pkt.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -d1_pkt.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -d1_pkt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -d1_pkt.o: ../include/openssl/pqueue.h ../include/openssl/rand.h -d1_pkt.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -d1_pkt.o: ../include/openssl/sha.h ../include/openssl/srtp.h -d1_pkt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h -d1_pkt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h -d1_pkt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -d1_pkt.o: ../include/openssl/tls1.h ../include/openssl/x509.h -d1_pkt.o: ../include/openssl/x509_vfy.h d1_pkt.c ssl_locl.h -d1_srtp.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -d1_srtp.o: ../include/openssl/buffer.h ../include/openssl/comp.h -d1_srtp.o: ../include/openssl/crypto.h ../include/openssl/dsa.h -d1_srtp.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -d1_srtp.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -d1_srtp.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -d1_srtp.o: ../include/openssl/evp.h ../include/openssl/hmac.h -d1_srtp.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -d1_srtp.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -d1_srtp.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -d1_srtp.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -d1_srtp.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -d1_srtp.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h -d1_srtp.o: ../include/openssl/safestack.h ../include/openssl/sha.h -d1_srtp.o: ../include/openssl/srtp.h ../include/openssl/ssl.h -d1_srtp.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h -d1_srtp.o: ../include/openssl/ssl3.h ../include/openssl/stack.h -d1_srtp.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -d1_srtp.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h d1_srtp.c -d1_srtp.o: srtp.h ssl_locl.h -d1_srvr.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -d1_srvr.o: ../include/openssl/bn.h ../include/openssl/buffer.h -d1_srvr.o: ../include/openssl/comp.h ../include/openssl/crypto.h -d1_srvr.o: ../include/openssl/dh.h ../include/openssl/dsa.h -d1_srvr.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -d1_srvr.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -d1_srvr.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -d1_srvr.o: ../include/openssl/evp.h ../include/openssl/hmac.h -d1_srvr.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -d1_srvr.o: ../include/openssl/md5.h ../include/openssl/obj_mac.h -d1_srvr.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -d1_srvr.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -d1_srvr.o: ../include/openssl/pem.h ../include/openssl/pem2.h -d1_srvr.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h -d1_srvr.o: ../include/openssl/rand.h ../include/openssl/rsa.h -d1_srvr.o: ../include/openssl/safestack.h ../include/openssl/sha.h -d1_srvr.o: ../include/openssl/srtp.h ../include/openssl/ssl.h -d1_srvr.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h -d1_srvr.o: ../include/openssl/ssl3.h ../include/openssl/stack.h -d1_srvr.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -d1_srvr.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h d1_srvr.c -d1_srvr.o: ssl_locl.h -kssl.o: ../include/openssl/asn1.h ../include/openssl/bio.h -kssl.o: ../include/openssl/buffer.h ../include/openssl/comp.h -kssl.o: ../include/openssl/crypto.h ../include/openssl/dtls1.h -kssl.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -kssl.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -kssl.o: ../include/openssl/evp.h ../include/openssl/hmac.h -kssl.o: ../include/openssl/krb5_asn.h ../include/openssl/kssl.h -kssl.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -kssl.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -kssl.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -kssl.o: ../include/openssl/pem.h ../include/openssl/pem2.h -kssl.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h -kssl.o: ../include/openssl/safestack.h ../include/openssl/sha.h -kssl.o: ../include/openssl/srtp.h ../include/openssl/ssl.h -kssl.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h -kssl.o: ../include/openssl/ssl3.h ../include/openssl/stack.h -kssl.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -kssl.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h kssl.c -kssl.o: kssl_lcl.h -s23_clnt.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -s23_clnt.o: ../include/openssl/buffer.h ../include/openssl/comp.h -s23_clnt.o: ../include/openssl/crypto.h ../include/openssl/dsa.h -s23_clnt.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -s23_clnt.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -s23_clnt.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -s23_clnt.o: ../include/openssl/evp.h ../include/openssl/hmac.h -s23_clnt.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -s23_clnt.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -s23_clnt.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -s23_clnt.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -s23_clnt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -s23_clnt.o: ../include/openssl/pqueue.h ../include/openssl/rand.h -s23_clnt.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -s23_clnt.o: ../include/openssl/sha.h ../include/openssl/srtp.h -s23_clnt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h -s23_clnt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h -s23_clnt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -s23_clnt.o: ../include/openssl/tls1.h ../include/openssl/x509.h -s23_clnt.o: ../include/openssl/x509_vfy.h s23_clnt.c ssl_locl.h -s23_lib.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -s23_lib.o: ../include/openssl/buffer.h ../include/openssl/comp.h -s23_lib.o: ../include/openssl/crypto.h ../include/openssl/dsa.h -s23_lib.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -s23_lib.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -s23_lib.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -s23_lib.o: ../include/openssl/evp.h ../include/openssl/hmac.h -s23_lib.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -s23_lib.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -s23_lib.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -s23_lib.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -s23_lib.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -s23_lib.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h -s23_lib.o: ../include/openssl/safestack.h ../include/openssl/sha.h -s23_lib.o: ../include/openssl/srtp.h ../include/openssl/ssl.h -s23_lib.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h -s23_lib.o: ../include/openssl/ssl3.h ../include/openssl/stack.h -s23_lib.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -s23_lib.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h s23_lib.c -s23_lib.o: ssl_locl.h -s23_meth.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -s23_meth.o: ../include/openssl/buffer.h ../include/openssl/comp.h -s23_meth.o: ../include/openssl/crypto.h ../include/openssl/dsa.h -s23_meth.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -s23_meth.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -s23_meth.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -s23_meth.o: ../include/openssl/evp.h ../include/openssl/hmac.h -s23_meth.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -s23_meth.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -s23_meth.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -s23_meth.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -s23_meth.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -s23_meth.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h -s23_meth.o: ../include/openssl/safestack.h ../include/openssl/sha.h -s23_meth.o: ../include/openssl/srtp.h ../include/openssl/ssl.h -s23_meth.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h -s23_meth.o: ../include/openssl/ssl3.h ../include/openssl/stack.h -s23_meth.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -s23_meth.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h s23_meth.c -s23_meth.o: ssl_locl.h -s23_pkt.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -s23_pkt.o: ../include/openssl/buffer.h ../include/openssl/comp.h -s23_pkt.o: ../include/openssl/crypto.h ../include/openssl/dsa.h -s23_pkt.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -s23_pkt.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -s23_pkt.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -s23_pkt.o: ../include/openssl/evp.h ../include/openssl/hmac.h -s23_pkt.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -s23_pkt.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -s23_pkt.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -s23_pkt.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -s23_pkt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -s23_pkt.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h -s23_pkt.o: ../include/openssl/safestack.h ../include/openssl/sha.h -s23_pkt.o: ../include/openssl/srtp.h ../include/openssl/ssl.h -s23_pkt.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h -s23_pkt.o: ../include/openssl/ssl3.h ../include/openssl/stack.h -s23_pkt.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -s23_pkt.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h s23_pkt.c -s23_pkt.o: ssl_locl.h -s23_srvr.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -s23_srvr.o: ../include/openssl/buffer.h ../include/openssl/comp.h -s23_srvr.o: ../include/openssl/crypto.h ../include/openssl/dsa.h -s23_srvr.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -s23_srvr.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -s23_srvr.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -s23_srvr.o: ../include/openssl/evp.h ../include/openssl/hmac.h -s23_srvr.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -s23_srvr.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -s23_srvr.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -s23_srvr.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -s23_srvr.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -s23_srvr.o: ../include/openssl/pqueue.h ../include/openssl/rand.h -s23_srvr.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -s23_srvr.o: ../include/openssl/sha.h ../include/openssl/srtp.h -s23_srvr.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h -s23_srvr.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h -s23_srvr.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -s23_srvr.o: ../include/openssl/tls1.h ../include/openssl/x509.h -s23_srvr.o: ../include/openssl/x509_vfy.h s23_srvr.c ssl_locl.h -s2_clnt.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -s2_clnt.o: ../include/openssl/buffer.h ../include/openssl/comp.h -s2_clnt.o: ../include/openssl/crypto.h ../include/openssl/dsa.h -s2_clnt.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -s2_clnt.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -s2_clnt.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -s2_clnt.o: ../include/openssl/evp.h ../include/openssl/hmac.h -s2_clnt.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -s2_clnt.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -s2_clnt.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -s2_clnt.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -s2_clnt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -s2_clnt.o: ../include/openssl/pqueue.h ../include/openssl/rand.h -s2_clnt.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -s2_clnt.o: ../include/openssl/sha.h ../include/openssl/srtp.h -s2_clnt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h -s2_clnt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h -s2_clnt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -s2_clnt.o: ../include/openssl/tls1.h ../include/openssl/x509.h -s2_clnt.o: ../include/openssl/x509_vfy.h s2_clnt.c ssl_locl.h -s2_enc.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -s2_enc.o: ../include/openssl/buffer.h ../include/openssl/comp.h -s2_enc.o: ../include/openssl/crypto.h ../include/openssl/dsa.h -s2_enc.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -s2_enc.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -s2_enc.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -s2_enc.o: ../include/openssl/evp.h ../include/openssl/hmac.h -s2_enc.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -s2_enc.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -s2_enc.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -s2_enc.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -s2_enc.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -s2_enc.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h -s2_enc.o: ../include/openssl/safestack.h ../include/openssl/sha.h -s2_enc.o: ../include/openssl/srtp.h ../include/openssl/ssl.h -s2_enc.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h -s2_enc.o: ../include/openssl/ssl3.h ../include/openssl/stack.h -s2_enc.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -s2_enc.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h s2_enc.c -s2_enc.o: ssl_locl.h -s2_lib.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -s2_lib.o: ../include/openssl/buffer.h ../include/openssl/comp.h -s2_lib.o: ../include/openssl/crypto.h ../include/openssl/dsa.h -s2_lib.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -s2_lib.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -s2_lib.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -s2_lib.o: ../include/openssl/evp.h ../include/openssl/hmac.h -s2_lib.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -s2_lib.o: ../include/openssl/md5.h ../include/openssl/obj_mac.h -s2_lib.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -s2_lib.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -s2_lib.o: ../include/openssl/pem.h ../include/openssl/pem2.h -s2_lib.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h -s2_lib.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -s2_lib.o: ../include/openssl/sha.h ../include/openssl/srtp.h -s2_lib.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h -s2_lib.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h -s2_lib.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -s2_lib.o: ../include/openssl/tls1.h ../include/openssl/x509.h -s2_lib.o: ../include/openssl/x509_vfy.h s2_lib.c ssl_locl.h -s2_meth.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -s2_meth.o: ../include/openssl/buffer.h ../include/openssl/comp.h -s2_meth.o: ../include/openssl/crypto.h ../include/openssl/dsa.h -s2_meth.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -s2_meth.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -s2_meth.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -s2_meth.o: ../include/openssl/evp.h ../include/openssl/hmac.h -s2_meth.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -s2_meth.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -s2_meth.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -s2_meth.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -s2_meth.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -s2_meth.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h -s2_meth.o: ../include/openssl/safestack.h ../include/openssl/sha.h -s2_meth.o: ../include/openssl/srtp.h ../include/openssl/ssl.h -s2_meth.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h -s2_meth.o: ../include/openssl/ssl3.h ../include/openssl/stack.h -s2_meth.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -s2_meth.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h s2_meth.c -s2_meth.o: ssl_locl.h -s2_pkt.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -s2_pkt.o: ../include/openssl/buffer.h ../include/openssl/comp.h -s2_pkt.o: ../include/openssl/crypto.h ../include/openssl/dsa.h -s2_pkt.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -s2_pkt.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -s2_pkt.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -s2_pkt.o: ../include/openssl/evp.h ../include/openssl/hmac.h -s2_pkt.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -s2_pkt.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -s2_pkt.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -s2_pkt.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -s2_pkt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -s2_pkt.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h -s2_pkt.o: ../include/openssl/safestack.h ../include/openssl/sha.h -s2_pkt.o: ../include/openssl/srtp.h ../include/openssl/ssl.h -s2_pkt.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h -s2_pkt.o: ../include/openssl/ssl3.h ../include/openssl/stack.h -s2_pkt.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -s2_pkt.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h s2_pkt.c -s2_pkt.o: ssl_locl.h -s2_srvr.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -s2_srvr.o: ../include/openssl/buffer.h ../include/openssl/comp.h -s2_srvr.o: ../include/openssl/crypto.h ../include/openssl/dsa.h -s2_srvr.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -s2_srvr.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -s2_srvr.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -s2_srvr.o: ../include/openssl/evp.h ../include/openssl/hmac.h -s2_srvr.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -s2_srvr.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -s2_srvr.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -s2_srvr.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -s2_srvr.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -s2_srvr.o: ../include/openssl/pqueue.h ../include/openssl/rand.h -s2_srvr.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -s2_srvr.o: ../include/openssl/sha.h ../include/openssl/srtp.h -s2_srvr.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h -s2_srvr.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h -s2_srvr.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -s2_srvr.o: ../include/openssl/tls1.h ../include/openssl/x509.h -s2_srvr.o: ../include/openssl/x509_vfy.h s2_srvr.c ssl_locl.h -s3_both.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -s3_both.o: ../include/openssl/buffer.h ../include/openssl/comp.h -s3_both.o: ../include/openssl/crypto.h ../include/openssl/dsa.h -s3_both.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -s3_both.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -s3_both.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -s3_both.o: ../include/openssl/evp.h ../include/openssl/hmac.h -s3_both.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -s3_both.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -s3_both.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -s3_both.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -s3_both.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -s3_both.o: ../include/openssl/pqueue.h ../include/openssl/rand.h -s3_both.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -s3_both.o: ../include/openssl/sha.h ../include/openssl/srtp.h -s3_both.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h -s3_both.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h -s3_both.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -s3_both.o: ../include/openssl/tls1.h ../include/openssl/x509.h -s3_both.o: ../include/openssl/x509_vfy.h s3_both.c ssl_locl.h -s3_cbc.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -s3_cbc.o: ../include/openssl/buffer.h ../include/openssl/comp.h -s3_cbc.o: ../include/openssl/crypto.h ../include/openssl/dsa.h -s3_cbc.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -s3_cbc.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -s3_cbc.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -s3_cbc.o: ../include/openssl/evp.h ../include/openssl/hmac.h -s3_cbc.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -s3_cbc.o: ../include/openssl/md5.h ../include/openssl/obj_mac.h -s3_cbc.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -s3_cbc.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -s3_cbc.o: ../include/openssl/pem.h ../include/openssl/pem2.h -s3_cbc.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h -s3_cbc.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -s3_cbc.o: ../include/openssl/sha.h ../include/openssl/srtp.h -s3_cbc.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h -s3_cbc.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h -s3_cbc.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -s3_cbc.o: ../include/openssl/tls1.h ../include/openssl/x509.h -s3_cbc.o: ../include/openssl/x509_vfy.h s3_cbc.c ssl_locl.h -s3_clnt.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -s3_clnt.o: ../include/openssl/bn.h ../include/openssl/buffer.h -s3_clnt.o: ../include/openssl/comp.h ../include/openssl/crypto.h -s3_clnt.o: ../include/openssl/dh.h ../include/openssl/dsa.h -s3_clnt.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -s3_clnt.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -s3_clnt.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -s3_clnt.o: ../include/openssl/err.h ../include/openssl/evp.h -s3_clnt.o: ../include/openssl/hmac.h ../include/openssl/kssl.h -s3_clnt.o: ../include/openssl/lhash.h ../include/openssl/md5.h -s3_clnt.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -s3_clnt.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -s3_clnt.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -s3_clnt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -s3_clnt.o: ../include/openssl/pqueue.h ../include/openssl/rand.h -s3_clnt.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -s3_clnt.o: ../include/openssl/sha.h ../include/openssl/srtp.h -s3_clnt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h -s3_clnt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h -s3_clnt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -s3_clnt.o: ../include/openssl/tls1.h ../include/openssl/x509.h -s3_clnt.o: ../include/openssl/x509_vfy.h kssl_lcl.h s3_clnt.c ssl_locl.h -s3_enc.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -s3_enc.o: ../include/openssl/buffer.h ../include/openssl/comp.h -s3_enc.o: ../include/openssl/crypto.h ../include/openssl/dsa.h -s3_enc.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -s3_enc.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -s3_enc.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -s3_enc.o: ../include/openssl/evp.h ../include/openssl/hmac.h -s3_enc.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -s3_enc.o: ../include/openssl/md5.h ../include/openssl/obj_mac.h -s3_enc.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -s3_enc.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -s3_enc.o: ../include/openssl/pem.h ../include/openssl/pem2.h -s3_enc.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h -s3_enc.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -s3_enc.o: ../include/openssl/sha.h ../include/openssl/srtp.h -s3_enc.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h -s3_enc.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h -s3_enc.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -s3_enc.o: ../include/openssl/tls1.h ../include/openssl/x509.h -s3_enc.o: ../include/openssl/x509_vfy.h s3_enc.c ssl_locl.h -s3_lib.o: ../crypto/ec/ec_lcl.h ../e_os.h ../include/openssl/asn1.h -s3_lib.o: ../include/openssl/bio.h ../include/openssl/bn.h -s3_lib.o: ../include/openssl/buffer.h ../include/openssl/comp.h -s3_lib.o: ../include/openssl/crypto.h ../include/openssl/dh.h -s3_lib.o: ../include/openssl/dsa.h ../include/openssl/dtls1.h -s3_lib.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -s3_lib.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -s3_lib.o: ../include/openssl/err.h ../include/openssl/evp.h -s3_lib.o: ../include/openssl/hmac.h ../include/openssl/kssl.h -s3_lib.o: ../include/openssl/lhash.h ../include/openssl/md5.h -s3_lib.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -s3_lib.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -s3_lib.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -s3_lib.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -s3_lib.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h -s3_lib.o: ../include/openssl/safestack.h ../include/openssl/sha.h -s3_lib.o: ../include/openssl/srtp.h ../include/openssl/ssl.h -s3_lib.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h -s3_lib.o: ../include/openssl/ssl3.h ../include/openssl/stack.h -s3_lib.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -s3_lib.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h kssl_lcl.h -s3_lib.o: s3_lib.c ssl_locl.h -s3_meth.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -s3_meth.o: ../include/openssl/buffer.h ../include/openssl/comp.h -s3_meth.o: ../include/openssl/crypto.h ../include/openssl/dsa.h -s3_meth.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -s3_meth.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -s3_meth.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -s3_meth.o: ../include/openssl/evp.h ../include/openssl/hmac.h -s3_meth.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -s3_meth.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -s3_meth.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -s3_meth.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -s3_meth.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -s3_meth.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h -s3_meth.o: ../include/openssl/safestack.h ../include/openssl/sha.h -s3_meth.o: ../include/openssl/srtp.h ../include/openssl/ssl.h -s3_meth.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h -s3_meth.o: ../include/openssl/ssl3.h ../include/openssl/stack.h -s3_meth.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -s3_meth.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h s3_meth.c -s3_meth.o: ssl_locl.h -s3_pkt.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -s3_pkt.o: ../include/openssl/buffer.h ../include/openssl/comp.h -s3_pkt.o: ../include/openssl/crypto.h ../include/openssl/dsa.h -s3_pkt.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -s3_pkt.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -s3_pkt.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -s3_pkt.o: ../include/openssl/evp.h ../include/openssl/hmac.h -s3_pkt.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -s3_pkt.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -s3_pkt.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -s3_pkt.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -s3_pkt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -s3_pkt.o: ../include/openssl/pqueue.h ../include/openssl/rand.h -s3_pkt.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -s3_pkt.o: ../include/openssl/sha.h ../include/openssl/srtp.h -s3_pkt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h -s3_pkt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h -s3_pkt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -s3_pkt.o: ../include/openssl/tls1.h ../include/openssl/x509.h -s3_pkt.o: ../include/openssl/x509_vfy.h s3_pkt.c ssl_locl.h -s3_srvr.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -s3_srvr.o: ../include/openssl/bn.h ../include/openssl/buffer.h -s3_srvr.o: ../include/openssl/comp.h ../include/openssl/crypto.h -s3_srvr.o: ../include/openssl/dh.h ../include/openssl/dsa.h -s3_srvr.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -s3_srvr.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -s3_srvr.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -s3_srvr.o: ../include/openssl/evp.h ../include/openssl/hmac.h -s3_srvr.o: ../include/openssl/krb5_asn.h ../include/openssl/kssl.h -s3_srvr.o: ../include/openssl/lhash.h ../include/openssl/md5.h -s3_srvr.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -s3_srvr.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -s3_srvr.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -s3_srvr.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -s3_srvr.o: ../include/openssl/pqueue.h ../include/openssl/rand.h -s3_srvr.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -s3_srvr.o: ../include/openssl/sha.h ../include/openssl/srtp.h -s3_srvr.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h -s3_srvr.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h -s3_srvr.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -s3_srvr.o: ../include/openssl/tls1.h ../include/openssl/x509.h -s3_srvr.o: ../include/openssl/x509_vfy.h kssl_lcl.h s3_srvr.c ssl_locl.h -ssl_algs.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -ssl_algs.o: ../include/openssl/buffer.h ../include/openssl/comp.h -ssl_algs.o: ../include/openssl/crypto.h ../include/openssl/dsa.h -ssl_algs.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -ssl_algs.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -ssl_algs.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -ssl_algs.o: ../include/openssl/evp.h ../include/openssl/hmac.h -ssl_algs.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -ssl_algs.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -ssl_algs.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -ssl_algs.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -ssl_algs.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -ssl_algs.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h -ssl_algs.o: ../include/openssl/safestack.h ../include/openssl/sha.h -ssl_algs.o: ../include/openssl/srtp.h ../include/openssl/ssl.h -ssl_algs.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h -ssl_algs.o: ../include/openssl/ssl3.h ../include/openssl/stack.h -ssl_algs.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -ssl_algs.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_algs.c -ssl_algs.o: ssl_locl.h -ssl_asn1.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/asn1_mac.h -ssl_asn1.o: ../include/openssl/bio.h ../include/openssl/buffer.h -ssl_asn1.o: ../include/openssl/comp.h ../include/openssl/crypto.h -ssl_asn1.o: ../include/openssl/dsa.h ../include/openssl/dtls1.h -ssl_asn1.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -ssl_asn1.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -ssl_asn1.o: ../include/openssl/err.h ../include/openssl/evp.h -ssl_asn1.o: ../include/openssl/hmac.h ../include/openssl/kssl.h -ssl_asn1.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -ssl_asn1.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -ssl_asn1.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -ssl_asn1.o: ../include/openssl/pem.h ../include/openssl/pem2.h -ssl_asn1.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h -ssl_asn1.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -ssl_asn1.o: ../include/openssl/sha.h ../include/openssl/srtp.h -ssl_asn1.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h -ssl_asn1.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h -ssl_asn1.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -ssl_asn1.o: ../include/openssl/tls1.h ../include/openssl/x509.h -ssl_asn1.o: ../include/openssl/x509_vfy.h ssl_asn1.c ssl_locl.h -ssl_cert.o: ../crypto/o_dir.h ../e_os.h ../include/openssl/asn1.h -ssl_cert.o: ../include/openssl/bio.h ../include/openssl/bn.h -ssl_cert.o: ../include/openssl/buffer.h ../include/openssl/comp.h -ssl_cert.o: ../include/openssl/conf.h ../include/openssl/crypto.h -ssl_cert.o: ../include/openssl/dh.h ../include/openssl/dsa.h -ssl_cert.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -ssl_cert.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -ssl_cert.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -ssl_cert.o: ../include/openssl/evp.h ../include/openssl/hmac.h -ssl_cert.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -ssl_cert.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -ssl_cert.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -ssl_cert.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -ssl_cert.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -ssl_cert.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h -ssl_cert.o: ../include/openssl/safestack.h ../include/openssl/sha.h -ssl_cert.o: ../include/openssl/srtp.h ../include/openssl/ssl.h -ssl_cert.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h -ssl_cert.o: ../include/openssl/ssl3.h ../include/openssl/stack.h -ssl_cert.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -ssl_cert.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -ssl_cert.o: ../include/openssl/x509v3.h ssl_cert.c ssl_locl.h -ssl_ciph.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -ssl_ciph.o: ../include/openssl/buffer.h ../include/openssl/comp.h -ssl_ciph.o: ../include/openssl/crypto.h ../include/openssl/dsa.h -ssl_ciph.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -ssl_ciph.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -ssl_ciph.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -ssl_ciph.o: ../include/openssl/err.h ../include/openssl/evp.h -ssl_ciph.o: ../include/openssl/hmac.h ../include/openssl/kssl.h -ssl_ciph.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -ssl_ciph.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -ssl_ciph.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -ssl_ciph.o: ../include/openssl/pem.h ../include/openssl/pem2.h -ssl_ciph.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h -ssl_ciph.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -ssl_ciph.o: ../include/openssl/sha.h ../include/openssl/srtp.h -ssl_ciph.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h -ssl_ciph.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h -ssl_ciph.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -ssl_ciph.o: ../include/openssl/tls1.h ../include/openssl/x509.h -ssl_ciph.o: ../include/openssl/x509_vfy.h ssl_ciph.c ssl_locl.h -ssl_err.o: ../include/openssl/asn1.h ../include/openssl/bio.h -ssl_err.o: ../include/openssl/buffer.h ../include/openssl/comp.h -ssl_err.o: ../include/openssl/crypto.h ../include/openssl/dtls1.h -ssl_err.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -ssl_err.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -ssl_err.o: ../include/openssl/err.h ../include/openssl/evp.h -ssl_err.o: ../include/openssl/hmac.h ../include/openssl/kssl.h -ssl_err.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -ssl_err.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -ssl_err.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -ssl_err.o: ../include/openssl/pem.h ../include/openssl/pem2.h -ssl_err.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h -ssl_err.o: ../include/openssl/safestack.h ../include/openssl/sha.h -ssl_err.o: ../include/openssl/srtp.h ../include/openssl/ssl.h -ssl_err.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h -ssl_err.o: ../include/openssl/ssl3.h ../include/openssl/stack.h -ssl_err.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -ssl_err.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_err.c -ssl_err2.o: ../include/openssl/asn1.h ../include/openssl/bio.h -ssl_err2.o: ../include/openssl/buffer.h ../include/openssl/comp.h -ssl_err2.o: ../include/openssl/crypto.h ../include/openssl/dtls1.h -ssl_err2.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -ssl_err2.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -ssl_err2.o: ../include/openssl/err.h ../include/openssl/evp.h -ssl_err2.o: ../include/openssl/hmac.h ../include/openssl/kssl.h -ssl_err2.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -ssl_err2.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -ssl_err2.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -ssl_err2.o: ../include/openssl/pem.h ../include/openssl/pem2.h -ssl_err2.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h -ssl_err2.o: ../include/openssl/safestack.h ../include/openssl/sha.h -ssl_err2.o: ../include/openssl/srtp.h ../include/openssl/ssl.h -ssl_err2.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h -ssl_err2.o: ../include/openssl/ssl3.h ../include/openssl/stack.h -ssl_err2.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -ssl_err2.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_err2.c -ssl_lib.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -ssl_lib.o: ../include/openssl/buffer.h ../include/openssl/comp.h -ssl_lib.o: ../include/openssl/conf.h ../include/openssl/crypto.h -ssl_lib.o: ../include/openssl/dh.h ../include/openssl/dsa.h -ssl_lib.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -ssl_lib.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -ssl_lib.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -ssl_lib.o: ../include/openssl/err.h ../include/openssl/evp.h -ssl_lib.o: ../include/openssl/hmac.h ../include/openssl/kssl.h -ssl_lib.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -ssl_lib.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -ssl_lib.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -ssl_lib.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -ssl_lib.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -ssl_lib.o: ../include/openssl/pqueue.h ../include/openssl/rand.h -ssl_lib.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -ssl_lib.o: ../include/openssl/sha.h ../include/openssl/srtp.h -ssl_lib.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h -ssl_lib.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h -ssl_lib.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -ssl_lib.o: ../include/openssl/tls1.h ../include/openssl/x509.h -ssl_lib.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h kssl_lcl.h -ssl_lib.o: ssl_lib.c ssl_locl.h -ssl_rsa.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -ssl_rsa.o: ../include/openssl/buffer.h ../include/openssl/comp.h -ssl_rsa.o: ../include/openssl/crypto.h ../include/openssl/dsa.h -ssl_rsa.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -ssl_rsa.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -ssl_rsa.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -ssl_rsa.o: ../include/openssl/evp.h ../include/openssl/hmac.h -ssl_rsa.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -ssl_rsa.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -ssl_rsa.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -ssl_rsa.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -ssl_rsa.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -ssl_rsa.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h -ssl_rsa.o: ../include/openssl/safestack.h ../include/openssl/sha.h -ssl_rsa.o: ../include/openssl/srtp.h ../include/openssl/ssl.h -ssl_rsa.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h -ssl_rsa.o: ../include/openssl/ssl3.h ../include/openssl/stack.h -ssl_rsa.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -ssl_rsa.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_locl.h -ssl_rsa.o: ssl_rsa.c -ssl_sess.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -ssl_sess.o: ../include/openssl/buffer.h ../include/openssl/comp.h -ssl_sess.o: ../include/openssl/crypto.h ../include/openssl/dsa.h -ssl_sess.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -ssl_sess.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -ssl_sess.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -ssl_sess.o: ../include/openssl/err.h ../include/openssl/evp.h -ssl_sess.o: ../include/openssl/hmac.h ../include/openssl/kssl.h -ssl_sess.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -ssl_sess.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -ssl_sess.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -ssl_sess.o: ../include/openssl/pem.h ../include/openssl/pem2.h -ssl_sess.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h -ssl_sess.o: ../include/openssl/rand.h ../include/openssl/rsa.h -ssl_sess.o: ../include/openssl/safestack.h ../include/openssl/sha.h -ssl_sess.o: ../include/openssl/srtp.h ../include/openssl/ssl.h -ssl_sess.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h -ssl_sess.o: ../include/openssl/ssl3.h ../include/openssl/stack.h -ssl_sess.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -ssl_sess.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_locl.h -ssl_sess.o: ssl_sess.c -ssl_stat.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -ssl_stat.o: ../include/openssl/buffer.h ../include/openssl/comp.h -ssl_stat.o: ../include/openssl/crypto.h ../include/openssl/dsa.h -ssl_stat.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -ssl_stat.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -ssl_stat.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -ssl_stat.o: ../include/openssl/evp.h ../include/openssl/hmac.h -ssl_stat.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -ssl_stat.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -ssl_stat.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -ssl_stat.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -ssl_stat.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -ssl_stat.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h -ssl_stat.o: ../include/openssl/safestack.h ../include/openssl/sha.h -ssl_stat.o: ../include/openssl/srtp.h ../include/openssl/ssl.h -ssl_stat.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h -ssl_stat.o: ../include/openssl/ssl3.h ../include/openssl/stack.h -ssl_stat.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -ssl_stat.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_locl.h -ssl_stat.o: ssl_stat.c -ssl_txt.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -ssl_txt.o: ../include/openssl/buffer.h ../include/openssl/comp.h -ssl_txt.o: ../include/openssl/crypto.h ../include/openssl/dsa.h -ssl_txt.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -ssl_txt.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -ssl_txt.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -ssl_txt.o: ../include/openssl/evp.h ../include/openssl/hmac.h -ssl_txt.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -ssl_txt.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -ssl_txt.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -ssl_txt.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -ssl_txt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -ssl_txt.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h -ssl_txt.o: ../include/openssl/safestack.h ../include/openssl/sha.h -ssl_txt.o: ../include/openssl/srtp.h ../include/openssl/ssl.h -ssl_txt.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h -ssl_txt.o: ../include/openssl/ssl3.h ../include/openssl/stack.h -ssl_txt.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -ssl_txt.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_locl.h -ssl_txt.o: ssl_txt.c -t1_clnt.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -t1_clnt.o: ../include/openssl/buffer.h ../include/openssl/comp.h -t1_clnt.o: ../include/openssl/crypto.h ../include/openssl/dsa.h -t1_clnt.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -t1_clnt.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -t1_clnt.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -t1_clnt.o: ../include/openssl/evp.h ../include/openssl/hmac.h -t1_clnt.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -t1_clnt.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -t1_clnt.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -t1_clnt.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -t1_clnt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -t1_clnt.o: ../include/openssl/pqueue.h ../include/openssl/rand.h -t1_clnt.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -t1_clnt.o: ../include/openssl/sha.h ../include/openssl/srtp.h -t1_clnt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h -t1_clnt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h -t1_clnt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -t1_clnt.o: ../include/openssl/tls1.h ../include/openssl/x509.h -t1_clnt.o: ../include/openssl/x509_vfy.h ssl_locl.h t1_clnt.c -t1_enc.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -t1_enc.o: ../include/openssl/buffer.h ../include/openssl/comp.h -t1_enc.o: ../include/openssl/crypto.h ../include/openssl/dsa.h -t1_enc.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -t1_enc.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -t1_enc.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -t1_enc.o: ../include/openssl/evp.h ../include/openssl/hmac.h -t1_enc.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -t1_enc.o: ../include/openssl/md5.h ../include/openssl/obj_mac.h -t1_enc.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -t1_enc.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -t1_enc.o: ../include/openssl/pem.h ../include/openssl/pem2.h -t1_enc.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h -t1_enc.o: ../include/openssl/rand.h ../include/openssl/rsa.h -t1_enc.o: ../include/openssl/safestack.h ../include/openssl/sha.h -t1_enc.o: ../include/openssl/srtp.h ../include/openssl/ssl.h -t1_enc.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h -t1_enc.o: ../include/openssl/ssl3.h ../include/openssl/stack.h -t1_enc.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -t1_enc.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_locl.h -t1_enc.o: t1_enc.c -t1_lib.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -t1_lib.o: ../include/openssl/buffer.h ../include/openssl/comp.h -t1_lib.o: ../include/openssl/conf.h ../include/openssl/crypto.h -t1_lib.o: ../include/openssl/dsa.h ../include/openssl/dtls1.h -t1_lib.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -t1_lib.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -t1_lib.o: ../include/openssl/err.h ../include/openssl/evp.h -t1_lib.o: ../include/openssl/hmac.h ../include/openssl/kssl.h -t1_lib.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -t1_lib.o: ../include/openssl/objects.h ../include/openssl/ocsp.h -t1_lib.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -t1_lib.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -t1_lib.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -t1_lib.o: ../include/openssl/pqueue.h ../include/openssl/rand.h -t1_lib.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -t1_lib.o: ../include/openssl/sha.h ../include/openssl/srtp.h -t1_lib.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h -t1_lib.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h -t1_lib.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -t1_lib.o: ../include/openssl/tls1.h ../include/openssl/x509.h -t1_lib.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h ssl_locl.h -t1_lib.o: t1_lib.c -t1_meth.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -t1_meth.o: ../include/openssl/buffer.h ../include/openssl/comp.h -t1_meth.o: ../include/openssl/crypto.h ../include/openssl/dsa.h -t1_meth.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -t1_meth.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -t1_meth.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -t1_meth.o: ../include/openssl/evp.h ../include/openssl/hmac.h -t1_meth.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -t1_meth.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -t1_meth.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -t1_meth.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -t1_meth.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -t1_meth.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h -t1_meth.o: ../include/openssl/safestack.h ../include/openssl/sha.h -t1_meth.o: ../include/openssl/srtp.h ../include/openssl/ssl.h -t1_meth.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h -t1_meth.o: ../include/openssl/ssl3.h ../include/openssl/stack.h -t1_meth.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -t1_meth.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_locl.h -t1_meth.o: t1_meth.c -t1_reneg.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -t1_reneg.o: ../include/openssl/buffer.h ../include/openssl/comp.h -t1_reneg.o: ../include/openssl/crypto.h ../include/openssl/dsa.h -t1_reneg.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -t1_reneg.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -t1_reneg.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -t1_reneg.o: ../include/openssl/evp.h ../include/openssl/hmac.h -t1_reneg.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -t1_reneg.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -t1_reneg.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -t1_reneg.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -t1_reneg.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -t1_reneg.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h -t1_reneg.o: ../include/openssl/safestack.h ../include/openssl/sha.h -t1_reneg.o: ../include/openssl/srtp.h ../include/openssl/ssl.h -t1_reneg.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h -t1_reneg.o: ../include/openssl/ssl3.h ../include/openssl/stack.h -t1_reneg.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -t1_reneg.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_locl.h -t1_reneg.o: t1_reneg.c -t1_srvr.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -t1_srvr.o: ../include/openssl/buffer.h ../include/openssl/comp.h -t1_srvr.o: ../include/openssl/crypto.h ../include/openssl/dsa.h -t1_srvr.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -t1_srvr.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -t1_srvr.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -t1_srvr.o: ../include/openssl/evp.h ../include/openssl/hmac.h -t1_srvr.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -t1_srvr.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -t1_srvr.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -t1_srvr.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -t1_srvr.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -t1_srvr.o: ../include/openssl/pqueue.h ../include/openssl/rand.h -t1_srvr.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -t1_srvr.o: ../include/openssl/sha.h ../include/openssl/srtp.h -t1_srvr.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h -t1_srvr.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h -t1_srvr.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -t1_srvr.o: ../include/openssl/tls1.h ../include/openssl/x509.h -t1_srvr.o: ../include/openssl/x509_vfy.h ssl_locl.h t1_srvr.c -tls_srp.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -tls_srp.o: ../include/openssl/bn.h ../include/openssl/buffer.h -tls_srp.o: ../include/openssl/comp.h ../include/openssl/crypto.h -tls_srp.o: ../include/openssl/dsa.h ../include/openssl/dtls1.h -tls_srp.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -tls_srp.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -tls_srp.o: ../include/openssl/err.h ../include/openssl/evp.h -tls_srp.o: ../include/openssl/hmac.h ../include/openssl/kssl.h -tls_srp.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -tls_srp.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -tls_srp.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -tls_srp.o: ../include/openssl/pem.h ../include/openssl/pem2.h -tls_srp.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h -tls_srp.o: ../include/openssl/rand.h ../include/openssl/rsa.h -tls_srp.o: ../include/openssl/safestack.h ../include/openssl/sha.h -tls_srp.o: ../include/openssl/srp.h ../include/openssl/srtp.h -tls_srp.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h -tls_srp.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h -tls_srp.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -tls_srp.o: ../include/openssl/tls1.h ../include/openssl/x509.h -tls_srp.o: ../include/openssl/x509_vfy.h ssl_locl.h tls_srp.c diff -Nru nodejs-0.10.28/deps/openssl/openssl/ssl/s3_clnt.c nodejs-0.10.29/deps/openssl/openssl/ssl/s3_clnt.c --- nodejs-0.10.28/deps/openssl/openssl/ssl/s3_clnt.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/ssl/s3_clnt.c 2014-06-09 17:04:36.000000000 +0000 @@ -559,6 +559,7 @@ case SSL3_ST_CR_FINISHED_A: case SSL3_ST_CR_FINISHED_B: + s->s3->flags |= SSL3_FLAGS_CCS_OK; ret=ssl3_get_finished(s,SSL3_ST_CR_FINISHED_A, SSL3_ST_CR_FINISHED_B); if (ret <= 0) goto end; @@ -915,6 +916,7 @@ SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT); goto f_err; } + s->s3->flags |= SSL3_FLAGS_CCS_OK; s->hit=1; } else /* a miss or crap from the other end */ @@ -2510,6 +2512,13 @@ int ecdh_clnt_cert = 0; int field_size = 0; + if (s->session->sess_cert == NULL) + { + ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_UNEXPECTED_MESSAGE); + SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,SSL_R_UNEXPECTED_MESSAGE); + goto err; + } + /* Did we send out the client's * ECDH share for use in premaster * computation as part of client certificate? diff -Nru nodejs-0.10.28/deps/openssl/openssl/ssl/s3_pkt.c nodejs-0.10.29/deps/openssl/openssl/ssl/s3_pkt.c --- nodejs-0.10.28/deps/openssl/openssl/ssl/s3_pkt.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/ssl/s3_pkt.c 2014-06-09 17:04:36.000000000 +0000 @@ -110,6 +110,7 @@ */ #include <stdio.h> +#include <limits.h> #include <errno.h> #define USE_SOCKETS #include "ssl_locl.h" @@ -580,10 +581,11 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len) { const unsigned char *buf=buf_; - unsigned int tot,n,nw; - int i; + unsigned int n,nw; + int i,tot; s->rwstate=SSL_NOTHING; + OPENSSL_assert(s->s3->wnum <= INT_MAX); tot=s->s3->wnum; s->s3->wnum=0; @@ -598,6 +600,22 @@ } } + /* ensure that if we end up with a smaller value of data to write + * out than the the original len from a write which didn't complete + * for non-blocking I/O and also somehow ended up avoiding + * the check for this in ssl3_write_pending/SSL_R_BAD_WRITE_RETRY as + * it must never be possible to end up with (len-tot) as a large + * number that will then promptly send beyond the end of the users + * buffer ... so we trap and report the error in a way the user + * will notice + */ + if (len < tot) + { + SSLerr(SSL_F_SSL3_WRITE_BYTES,SSL_R_BAD_LENGTH); + return(-1); + } + + n=(len-tot); for (;;) { @@ -641,9 +659,6 @@ SSL3_BUFFER *wb=&(s->s3->wbuf); SSL_SESSION *sess; - if (wb->buf == NULL) - if (!ssl3_setup_write_buffer(s)) - return -1; /* first check if there is a SSL3_BUFFER still being written * out. This will happen with non blocking IO */ @@ -659,6 +674,10 @@ /* if it went, fall through and send more stuff */ } + if (wb->buf == NULL) + if (!ssl3_setup_write_buffer(s)) + return -1; + if (len == 0 && !create_empty_fragment) return 0; @@ -1055,7 +1074,7 @@ { s->rstate=SSL_ST_READ_HEADER; rr->off=0; - if (s->mode & SSL_MODE_RELEASE_BUFFERS) + if (s->mode & SSL_MODE_RELEASE_BUFFERS && s->s3->rbuf.left == 0) ssl3_release_read_buffer(s); } } @@ -1297,6 +1316,15 @@ goto f_err; } + if (!(s->s3->flags & SSL3_FLAGS_CCS_OK)) + { + al=SSL_AD_UNEXPECTED_MESSAGE; + SSLerr(SSL_F_SSL3_READ_BYTES,SSL_R_CCS_RECEIVED_EARLY); + goto f_err; + } + + s->s3->flags &= ~SSL3_FLAGS_CCS_OK; + rr->length=0; if (s->msg_callback) @@ -1431,7 +1459,7 @@ if (s->s3->tmp.key_block == NULL) { - if (s->session == NULL) + if (s->session == NULL || s->session->master_key_length == 0) { /* might happen if dtls1_read_bytes() calls this */ SSLerr(SSL_F_SSL3_DO_CHANGE_CIPHER_SPEC,SSL_R_CCS_RECEIVED_EARLY); diff -Nru nodejs-0.10.28/deps/openssl/openssl/ssl/s3_srvr.c nodejs-0.10.29/deps/openssl/openssl/ssl/s3_srvr.c --- nodejs-0.10.28/deps/openssl/openssl/ssl/s3_srvr.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/ssl/s3_srvr.c 2014-06-09 17:04:36.000000000 +0000 @@ -673,6 +673,7 @@ case SSL3_ST_SR_CERT_VRFY_A: case SSL3_ST_SR_CERT_VRFY_B: + s->s3->flags |= SSL3_FLAGS_CCS_OK; /* we should decide if we expected this one */ ret=ssl3_get_cert_verify(s); if (ret <= 0) goto end; @@ -700,6 +701,7 @@ case SSL3_ST_SR_FINISHED_A: case SSL3_ST_SR_FINISHED_B: + s->s3->flags |= SSL3_FLAGS_CCS_OK; ret=ssl3_get_finished(s,SSL3_ST_SR_FINISHED_A, SSL3_ST_SR_FINISHED_B); if (ret <= 0) goto end; @@ -770,7 +772,10 @@ s->s3->tmp.next_state=SSL3_ST_SR_FINISHED_A; #else if (s->s3->next_proto_neg_seen) + { + s->s3->flags |= SSL3_FLAGS_CCS_OK; s->s3->tmp.next_state=SSL3_ST_SR_NEXT_PROTO_A; + } else s->s3->tmp.next_state=SSL3_ST_SR_FINISHED_A; #endif @@ -2097,6 +2102,11 @@ s->init_num=n+4; s->init_off=0; #ifdef NETSCAPE_HANG_BUG + if (!BUF_MEM_grow_clean(buf, s->init_num + 4)) + { + SSLerr(SSL_F_SSL3_SEND_CERTIFICATE_REQUEST,ERR_R_BUF_LIB); + goto err; + } p=(unsigned char *)s->init_buf->data + s->init_num; /* do the header */ @@ -2813,6 +2823,8 @@ unsigned char premaster_secret[32], *start; size_t outlen=32, inlen; unsigned long alg_a; + int Ttag, Tclass; + long Tlen; /* Get our certificate private key*/ alg_a = s->s3->tmp.new_cipher->algorithm_auth; @@ -2834,26 +2846,15 @@ ERR_clear_error(); } /* Decrypt session key */ - if ((*p!=( V_ASN1_SEQUENCE| V_ASN1_CONSTRUCTED))) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_DECRYPTION_FAILED); - goto gerr; - } - if (p[1] == 0x81) - { - start = p+3; - inlen = p[2]; - } - else if (p[1] < 0x80) - { - start = p+2; - inlen = p[1]; - } - else + if (ASN1_get_object((const unsigned char **)&p, &Tlen, &Ttag, &Tclass, n) != V_ASN1_CONSTRUCTED || + Ttag != V_ASN1_SEQUENCE || + Tclass != V_ASN1_UNIVERSAL) { SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_DECRYPTION_FAILED); goto gerr; } + start = p; + inlen = Tlen; if (EVP_PKEY_decrypt(pkey_ctx,premaster_secret,&outlen,start,inlen) <=0) { diff -Nru nodejs-0.10.28/deps/openssl/openssl/ssl/ssl3.h nodejs-0.10.29/deps/openssl/openssl/ssl/ssl3.h --- nodejs-0.10.28/deps/openssl/openssl/ssl/ssl3.h 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/ssl/ssl3.h 2014-06-09 17:04:36.000000000 +0000 @@ -388,6 +388,7 @@ #define TLS1_FLAGS_TLS_PADDING_BUG 0x0008 #define TLS1_FLAGS_SKIP_CERT_VERIFY 0x0010 #define TLS1_FLAGS_KEEP_HANDSHAKE 0x0020 +#define SSL3_FLAGS_CCS_OK 0x0080 /* SSL3_FLAGS_SGC_RESTART_DONE is set when we * restart a handshake because of MS SGC and so prevents us diff -Nru nodejs-0.10.28/deps/openssl/openssl/ssl/ssl_asn1.c nodejs-0.10.29/deps/openssl/openssl/ssl/ssl_asn1.c --- nodejs-0.10.28/deps/openssl/openssl/ssl/ssl_asn1.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/ssl/ssl_asn1.c 2014-06-09 17:04:36.000000000 +0000 @@ -408,6 +408,7 @@ if (os.length != 3) { c.error=SSL_R_CIPHER_CODE_WRONG_LENGTH; + c.line=__LINE__; goto err; } id=0x02000000L| @@ -420,6 +421,7 @@ if (os.length != 2) { c.error=SSL_R_CIPHER_CODE_WRONG_LENGTH; + c.line=__LINE__; goto err; } id=0x03000000L| @@ -429,6 +431,7 @@ else { c.error=SSL_R_UNKNOWN_SSL_VERSION; + c.line=__LINE__; goto err; } @@ -521,6 +524,7 @@ if (os.length > SSL_MAX_SID_CTX_LENGTH) { c.error=SSL_R_BAD_LENGTH; + c.line=__LINE__; goto err; } else diff -Nru nodejs-0.10.28/deps/openssl/openssl/ssl/ssl_err.c nodejs-0.10.29/deps/openssl/openssl/ssl/ssl_err.c --- nodejs-0.10.28/deps/openssl/openssl/ssl/ssl_err.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/ssl/ssl_err.c 2014-06-09 17:04:36.000000000 +0000 @@ -541,7 +541,7 @@ {ERR_REASON(SSL_R_TLSV1_UNRECOGNIZED_NAME),"tlsv1 unrecognized name"}, {ERR_REASON(SSL_R_TLSV1_UNSUPPORTED_EXTENSION),"tlsv1 unsupported extension"}, {ERR_REASON(SSL_R_TLS_CLIENT_CERT_REQ_WITH_ANON_CIPHER),"tls client cert req with anon cipher"}, -{ERR_REASON(SSL_R_TLS_HEARTBEAT_PEER_DOESNT_ACCEPT),"peer does not accept heartbearts"}, +{ERR_REASON(SSL_R_TLS_HEARTBEAT_PEER_DOESNT_ACCEPT),"peer does not accept heartbeats"}, {ERR_REASON(SSL_R_TLS_HEARTBEAT_PENDING) ,"heartbeat request already pending"}, {ERR_REASON(SSL_R_TLS_ILLEGAL_EXPORTER_LABEL),"tls illegal exporter label"}, {ERR_REASON(SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST),"tls invalid ecpointformat list"}, diff -Nru nodejs-0.10.28/deps/openssl/openssl/ssl/ssl.h nodejs-0.10.29/deps/openssl/openssl/ssl/ssl.h --- nodejs-0.10.28/deps/openssl/openssl/ssl/ssl.h 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/ssl/ssl.h 2014-06-09 17:04:36.000000000 +0000 @@ -553,7 +553,7 @@ /* Allow initial connection to servers that don't support RI */ #define SSL_OP_LEGACY_SERVER_CONNECT 0x00000004L #define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG 0x00000008L -#define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG 0x00000010L +#define SSL_OP_TLSEXT_PADDING 0x00000010L #define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER 0x00000020L #define SSL_OP_SAFARI_ECDHE_ECDSA_BUG 0x00000040L #define SSL_OP_SSLEAY_080_CLIENT_DH_BUG 0x00000080L @@ -562,6 +562,8 @@ /* Hasn't done anything since OpenSSL 0.9.7h, retained for compatibility */ #define SSL_OP_MSIE_SSLV2_RSA_PADDING 0x0 +/* Refers to ancient SSLREF and SSLv2, retained for compatibility */ +#define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG 0x0 /* Disable SSL 3.0/TLS 1.0 CBC vulnerability workaround that was added * in OpenSSL 0.9.6d. Usually (depending on the application protocol) diff -Nru nodejs-0.10.28/deps/openssl/openssl/ssl/ssl_lib.c nodejs-0.10.29/deps/openssl/openssl/ssl/ssl_lib.c --- nodejs-0.10.28/deps/openssl/openssl/ssl/ssl_lib.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/ssl/ssl_lib.c 2014-06-09 17:04:36.000000000 +0000 @@ -1349,6 +1349,10 @@ p=buf; sk=s->session->ciphers; + + if (sk_SSL_CIPHER_num(sk) == 0) + return NULL; + for (i=0; i<sk_SSL_CIPHER_num(sk); i++) { int n; diff -Nru nodejs-0.10.28/deps/openssl/openssl/ssl/ssl-lib.com nodejs-0.10.29/deps/openssl/openssl/ssl/ssl-lib.com --- nodejs-0.10.28/deps/openssl/openssl/ssl/ssl-lib.com 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/ssl/ssl-lib.com 2014-06-09 17:04:36.000000000 +0000 @@ -857,7 +857,7 @@ $ IF F$TYPE(USER_CCDEFS) .NES. "" THEN CCDEFS = CCDEFS + "," + USER_CCDEFS $ CCEXTRAFLAGS = "" $ IF F$TYPE(USER_CCFLAGS) .NES. "" THEN CCEXTRAFLAGS = USER_CCFLAGS -$ CCDISABLEWARNINGS = "MAYLOSEDATA3" !!! "LONGLONGTYPE,LONGLONGSUFX,FOUNDCR" +$ CCDISABLEWARNINGS = "" !!! "MAYLOSEDATA3" !!! "LONGLONGTYPE,LONGLONGSUFX,FOUNDCR" $ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. "" THEN - CCDISABLEWARNINGS = CCDISABLEWARNINGS + "," + USER_CCDISABLEWARNINGS $! @@ -1022,6 +1022,18 @@ $! $ IF COMPILER .EQS. "DECC" $ THEN +$! Not all compiler versions support MAYLOSEDATA3. +$ OPT_TEST = "MAYLOSEDATA3" +$ DEFINE /USER_MODE SYS$ERROR NL: +$ DEFINE /USER_MODE SYS$OUTPUT NL: +$ 'CC' /NOCROSS_REFERENCE /NOLIST /NOOBJECT - + /WARNINGS = DISABLE = ('OPT_TEST', EMPTYFILE) NL: +$ IF ($SEVERITY) +$ THEN +$ IF CCDISABLEWARNINGS .NES. "" THEN - + CCDISABLEWARNINGS = CCDISABLEWARNINGS+ "," +$ CCDISABLEWARNINGS = CCDISABLEWARNINGS+ OPT_TEST +$ ENDIF $ IF CCDISABLEWARNINGS .EQS. "" $ THEN $ CC4DISABLEWARNINGS = "DOLLARID" diff -Nru nodejs-0.10.28/deps/openssl/openssl/ssl/t1_enc.c nodejs-0.10.29/deps/openssl/openssl/ssl/t1_enc.c --- nodejs-0.10.28/deps/openssl/openssl/ssl/t1_enc.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/ssl/t1_enc.c 2014-06-09 17:04:36.000000000 +0000 @@ -1048,14 +1048,10 @@ if (!stream_mac) EVP_MD_CTX_cleanup(&hmac); #ifdef TLS_DEBUG -printf("sec="); -{unsigned int z; for (z=0; z<md_size; z++) printf("%02X ",mac_sec[z]); printf("\n"); } printf("seq="); {int z; for (z=0; z<8; z++) printf("%02X ",seq[z]); printf("\n"); } -printf("buf="); -{int z; for (z=0; z<5; z++) printf("%02X ",buf[z]); printf("\n"); } printf("rec="); -{unsigned int z; for (z=0; z<rec->length; z++) printf("%02X ",buf[z]); printf("\n"); } +{unsigned int z; for (z=0; z<rec->length; z++) printf("%02X ",rec->data[z]); printf("\n"); } #endif if (ssl->version != DTLS1_VERSION && ssl->version != DTLS1_BAD_VER) @@ -1185,7 +1181,7 @@ if (memcmp(val, TLS_MD_KEY_EXPANSION_CONST, TLS_MD_KEY_EXPANSION_CONST_SIZE) == 0) goto err1; - rv = tls1_PRF(s->s3->tmp.new_cipher->algorithm2, + rv = tls1_PRF(ssl_get_algorithm2(s), val, vallen, NULL, 0, NULL, 0, diff -Nru nodejs-0.10.28/deps/openssl/openssl/ssl/t1_lib.c nodejs-0.10.29/deps/openssl/openssl/ssl/t1_lib.c --- nodejs-0.10.28/deps/openssl/openssl/ssl/t1_lib.c 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/ssl/t1_lib.c 2014-06-09 17:04:36.000000000 +0000 @@ -617,6 +617,8 @@ #ifndef OPENSSL_NO_HEARTBEATS /* Add Heartbeat extension */ + if ((limit - ret - 4 - 1) < 0) + return NULL; s2n(TLSEXT_TYPE_heartbeat,ret); s2n(1,ret); /* Set mode: @@ -661,36 +663,35 @@ ret += el; } #endif - -#ifdef TLSEXT_TYPE_padding /* Add padding to workaround bugs in F5 terminators. * See https://tools.ietf.org/html/draft-agl-tls-padding-03 * * NB: because this code works out the length of all existing * extensions it MUST always appear last. */ - { - int hlen = ret - (unsigned char *)s->init_buf->data; - /* The code in s23_clnt.c to build ClientHello messages includes the - * 5-byte record header in the buffer, while the code in s3_clnt.c does - * not. */ - if (s->state == SSL23_ST_CW_CLNT_HELLO_A) - hlen -= 5; - if (hlen > 0xff && hlen < 0x200) + if (s->options & SSL_OP_TLSEXT_PADDING) { - hlen = 0x200 - hlen; - if (hlen >= 4) - hlen -= 4; - else - hlen = 0; - - s2n(TLSEXT_TYPE_padding, ret); - s2n(hlen, ret); - memset(ret, 0, hlen); - ret += hlen; + int hlen = ret - (unsigned char *)s->init_buf->data; + /* The code in s23_clnt.c to build ClientHello messages + * includes the 5-byte record header in the buffer, while + * the code in s3_clnt.c does not. + */ + if (s->state == SSL23_ST_CW_CLNT_HELLO_A) + hlen -= 5; + if (hlen > 0xff && hlen < 0x200) + { + hlen = 0x200 - hlen; + if (hlen >= 4) + hlen -= 4; + else + hlen = 0; + + s2n(TLSEXT_TYPE_padding, ret); + s2n(hlen, ret); + memset(ret, 0, hlen); + ret += hlen; + } } - } -#endif if ((extdatalen = ret-p-2)== 0) return p; @@ -845,6 +846,8 @@ /* Add Heartbeat extension if we've received one */ if (s->tlsext_heartbeat & SSL_TLSEXT_HB_ENABLED) { + if ((limit - ret - 4 - 1) < 0) + return NULL; s2n(TLSEXT_TYPE_heartbeat,ret); s2n(1,ret); /* Set mode: diff -Nru nodejs-0.10.28/deps/openssl/openssl/test/heartbeat_test.c nodejs-0.10.29/deps/openssl/openssl/test/heartbeat_test.c --- nodejs-0.10.28/deps/openssl/openssl/test/heartbeat_test.c 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/test/heartbeat_test.c 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,465 @@ +/* test/heartbeat_test.c */ +/* + * Unit test for TLS heartbeats. + * + * Acts as a regression test against the Heartbleed bug (CVE-2014-0160). + * + * Author: Mike Bland (mbland@acm.org, http://mike-bland.com/) + * Date: 2014-04-12 + * License: Creative Commons Attribution 4.0 International (CC By 4.0) + * http://creativecommons.org/licenses/by/4.0/deed.en_US + * + * OUTPUT + * ------ + * The program returns zero on success. It will print a message with a count + * of the number of failed tests and return nonzero if any tests fail. + * + * It will print the contents of the request and response buffers for each + * failing test. In a "fixed" version, all the tests should pass and there + * should be no output. + * + * In a "bleeding" version, you'll see: + * + * test_dtls1_heartbleed failed: + * expected payload len: 0 + * received: 1024 + * sent 26 characters + * "HEARTBLEED " + * received 1024 characters + * "HEARTBLEED \xde\xad\xbe\xef..." + * ** test_dtls1_heartbleed failed ** + * + * The contents of the returned buffer in the failing test will depend on the + * contents of memory on your machine. + * + * MORE INFORMATION + * ---------------- + * http://mike-bland.com/2014/04/12/heartbleed.html + * http://mike-bland.com/tags/heartbleed.html + */ + +#include "../ssl/ssl_locl.h" +#include <ctype.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#if !defined(OPENSSL_NO_HEARTBEATS) && !defined(OPENSSL_SYS_WINDOWS) + +/* As per https://tools.ietf.org/html/rfc6520#section-4 */ +#define MIN_PADDING_SIZE 16 + +/* Maximum number of payload characters to print as test output */ +#define MAX_PRINTABLE_CHARACTERS 1024 + +typedef struct heartbeat_test_fixture + { + SSL_CTX *ctx; + SSL *s; + const char* test_case_name; + int (*process_heartbeat)(SSL* s); + unsigned char* payload; + int sent_payload_len; + int expected_return_value; + int return_payload_offset; + int expected_payload_len; + const char* expected_return_payload; + } HEARTBEAT_TEST_FIXTURE; + +static HEARTBEAT_TEST_FIXTURE set_up(const char* const test_case_name, + const SSL_METHOD* meth) + { + HEARTBEAT_TEST_FIXTURE fixture; + int setup_ok = 1; + memset(&fixture, 0, sizeof(fixture)); + fixture.test_case_name = test_case_name; + + fixture.ctx = SSL_CTX_new(meth); + if (!fixture.ctx) + { + fprintf(stderr, "Failed to allocate SSL_CTX for test: %s\n", + test_case_name); + setup_ok = 0; + goto fail; + } + + fixture.s = SSL_new(fixture.ctx); + if (!fixture.s) + { + fprintf(stderr, "Failed to allocate SSL for test: %s\n", test_case_name); + setup_ok = 0; + goto fail; + } + + if (!ssl_init_wbio_buffer(fixture.s, 1)) + { + fprintf(stderr, "Failed to set up wbio buffer for test: %s\n", + test_case_name); + setup_ok = 0; + goto fail; + } + + if (!ssl3_setup_buffers(fixture.s)) + { + fprintf(stderr, "Failed to setup buffers for test: %s\n", + test_case_name); + setup_ok = 0; + goto fail; + } + + /* Clear the memory for the return buffer, since this isn't automatically + * zeroed in opt mode and will cause spurious test failures that will change + * with each execution. + */ + memset(fixture.s->s3->wbuf.buf, 0, fixture.s->s3->wbuf.len); + + fail: + if (!setup_ok) + { + ERR_print_errors_fp(stderr); + exit(EXIT_FAILURE); + } + return fixture; + } + +static HEARTBEAT_TEST_FIXTURE set_up_dtls(const char* const test_case_name) + { + HEARTBEAT_TEST_FIXTURE fixture = set_up(test_case_name, + DTLSv1_server_method()); + fixture.process_heartbeat = dtls1_process_heartbeat; + + /* As per dtls1_get_record(), skipping the following from the beginning of + * the returned heartbeat message: + * type-1 byte; version-2 bytes; sequence number-8 bytes; length-2 bytes + * + * And then skipping the 1-byte type encoded by process_heartbeat for + * a total of 14 bytes, at which point we can grab the length and the + * payload we seek. + */ + fixture.return_payload_offset = 14; + return fixture; + } + +/* Needed by ssl3_write_bytes() */ +static int dummy_handshake(SSL* s) + { + return 1; + } + +static HEARTBEAT_TEST_FIXTURE set_up_tls(const char* const test_case_name) + { + HEARTBEAT_TEST_FIXTURE fixture = set_up(test_case_name, + TLSv1_server_method()); + fixture.process_heartbeat = tls1_process_heartbeat; + fixture.s->handshake_func = dummy_handshake; + + /* As per do_ssl3_write(), skipping the following from the beginning of + * the returned heartbeat message: + * type-1 byte; version-2 bytes; length-2 bytes + * + * And then skipping the 1-byte type encoded by process_heartbeat for + * a total of 6 bytes, at which point we can grab the length and the payload + * we seek. + */ + fixture.return_payload_offset = 6; + return fixture; + } + +static void tear_down(HEARTBEAT_TEST_FIXTURE fixture) + { + ERR_print_errors_fp(stderr); + SSL_free(fixture.s); + SSL_CTX_free(fixture.ctx); + } + +static void print_payload(const char* const prefix, + const unsigned char *payload, const int n) + { + const int end = n < MAX_PRINTABLE_CHARACTERS ? n + : MAX_PRINTABLE_CHARACTERS; + int i = 0; + + printf("%s %d character%s", prefix, n, n == 1 ? "" : "s"); + if (end != n) printf(" (first %d shown)", end); + printf("\n \""); + + for (; i != end; ++i) + { + const unsigned char c = payload[i]; + if (isprint(c)) fputc(c, stdout); + else printf("\\x%02x", c); + } + printf("\"\n"); + } + +static int execute_heartbeat(HEARTBEAT_TEST_FIXTURE fixture) + { + int result = 0; + SSL* s = fixture.s; + unsigned char *payload = fixture.payload; + unsigned char sent_buf[MAX_PRINTABLE_CHARACTERS + 1]; + int return_value; + unsigned const char *p; + int actual_payload_len; + + s->s3->rrec.data = payload; + s->s3->rrec.length = strlen((const char*)payload); + *payload++ = TLS1_HB_REQUEST; + s2n(fixture.sent_payload_len, payload); + + /* Make a local copy of the request, since it gets overwritten at some + * point */ + memcpy((char *)sent_buf, (const char*)payload, sizeof(sent_buf)); + + return_value = fixture.process_heartbeat(s); + + if (return_value != fixture.expected_return_value) + { + printf("%s failed: expected return value %d, received %d\n", + fixture.test_case_name, fixture.expected_return_value, + return_value); + result = 1; + } + + /* If there is any byte alignment, it will be stored in wbuf.offset. */ + p = &(s->s3->wbuf.buf[ + fixture.return_payload_offset + s->s3->wbuf.offset]); + actual_payload_len = 0; + n2s(p, actual_payload_len); + + if (actual_payload_len != fixture.expected_payload_len) + { + printf("%s failed:\n expected payload len: %d\n received: %d\n", + fixture.test_case_name, fixture.expected_payload_len, + actual_payload_len); + print_payload("sent", sent_buf, strlen((const char*)sent_buf)); + print_payload("received", p, actual_payload_len); + result = 1; + } + else + { + char* actual_payload = BUF_strndup((const char*)p, actual_payload_len); + if (strcmp(actual_payload, fixture.expected_return_payload) != 0) + { + printf("%s failed:\n expected payload: \"%s\"\n received: \"%s\"\n", + fixture.test_case_name, fixture.expected_return_payload, + actual_payload); + result = 1; + } + OPENSSL_free(actual_payload); + } + + if (result != 0) + { + printf("** %s failed **\n--------\n", fixture.test_case_name); + } + return result; + } + +static int honest_payload_size(unsigned char payload_buf[]) + { + /* Omit three-byte pad at the beginning for type and payload length */ + return strlen((const char*)&payload_buf[3]) - MIN_PADDING_SIZE; + } + +#define SETUP_HEARTBEAT_TEST_FIXTURE(type)\ + HEARTBEAT_TEST_FIXTURE fixture = set_up_##type(__func__);\ + int result = 0 + +#define EXECUTE_HEARTBEAT_TEST()\ + if (execute_heartbeat(fixture) != 0) result = 1;\ + tear_down(fixture);\ + return result + +static int test_dtls1_not_bleeding() + { + SETUP_HEARTBEAT_TEST_FIXTURE(dtls); + /* Three-byte pad at the beginning for type and payload length */ + unsigned char payload_buf[] = " Not bleeding, sixteen spaces of padding" + " "; + const int payload_buf_len = honest_payload_size(payload_buf); + + fixture.payload = &payload_buf[0]; + fixture.sent_payload_len = payload_buf_len; + fixture.expected_return_value = 0; + fixture.expected_payload_len = payload_buf_len; + fixture.expected_return_payload = "Not bleeding, sixteen spaces of padding"; + EXECUTE_HEARTBEAT_TEST(); + } + +static int test_dtls1_not_bleeding_empty_payload() + { + int payload_buf_len; + + SETUP_HEARTBEAT_TEST_FIXTURE(dtls); + /* Three-byte pad at the beginning for type and payload length, plus a NUL + * at the end */ + unsigned char payload_buf[4 + MIN_PADDING_SIZE]; + memset(payload_buf, ' ', sizeof(payload_buf)); + payload_buf[sizeof(payload_buf) - 1] = '\0'; + payload_buf_len = honest_payload_size(payload_buf); + + fixture.payload = &payload_buf[0]; + fixture.sent_payload_len = payload_buf_len; + fixture.expected_return_value = 0; + fixture.expected_payload_len = payload_buf_len; + fixture.expected_return_payload = ""; + EXECUTE_HEARTBEAT_TEST(); + } + +static int test_dtls1_heartbleed() + { + SETUP_HEARTBEAT_TEST_FIXTURE(dtls); + /* Three-byte pad at the beginning for type and payload length */ + unsigned char payload_buf[] = " HEARTBLEED "; + + fixture.payload = &payload_buf[0]; + fixture.sent_payload_len = MAX_PRINTABLE_CHARACTERS; + fixture.expected_return_value = 0; + fixture.expected_payload_len = 0; + fixture.expected_return_payload = ""; + EXECUTE_HEARTBEAT_TEST(); + } + +static int test_dtls1_heartbleed_empty_payload() + { + SETUP_HEARTBEAT_TEST_FIXTURE(dtls); + /* Excluding the NUL at the end, one byte short of type + payload length + + * minimum padding */ + unsigned char payload_buf[MIN_PADDING_SIZE + 3]; + memset(payload_buf, ' ', sizeof(payload_buf)); + payload_buf[sizeof(payload_buf) - 1] = '\0'; + + fixture.payload = &payload_buf[0]; + fixture.sent_payload_len = MAX_PRINTABLE_CHARACTERS; + fixture.expected_return_value = 0; + fixture.expected_payload_len = 0; + fixture.expected_return_payload = ""; + EXECUTE_HEARTBEAT_TEST(); + } + +static int test_dtls1_heartbleed_excessive_plaintext_length() + { + SETUP_HEARTBEAT_TEST_FIXTURE(dtls); + /* Excluding the NUL at the end, one byte in excess of maximum allowed + * heartbeat message length */ + unsigned char payload_buf[SSL3_RT_MAX_PLAIN_LENGTH + 2]; + memset(payload_buf, ' ', sizeof(payload_buf)); + payload_buf[sizeof(payload_buf) - 1] = '\0'; + + fixture.payload = &payload_buf[0]; + fixture.sent_payload_len = honest_payload_size(payload_buf); + fixture.expected_return_value = 0; + fixture.expected_payload_len = 0; + fixture.expected_return_payload = ""; + EXECUTE_HEARTBEAT_TEST(); + } + +static int test_tls1_not_bleeding() + { + SETUP_HEARTBEAT_TEST_FIXTURE(tls); + /* Three-byte pad at the beginning for type and payload length */ + unsigned char payload_buf[] = " Not bleeding, sixteen spaces of padding" + " "; + const int payload_buf_len = honest_payload_size(payload_buf); + + fixture.payload = &payload_buf[0]; + fixture.sent_payload_len = payload_buf_len; + fixture.expected_return_value = 0; + fixture.expected_payload_len = payload_buf_len; + fixture.expected_return_payload = "Not bleeding, sixteen spaces of padding"; + EXECUTE_HEARTBEAT_TEST(); + } + +static int test_tls1_not_bleeding_empty_payload() + { + int payload_buf_len; + + SETUP_HEARTBEAT_TEST_FIXTURE(tls); + /* Three-byte pad at the beginning for type and payload length, plus a NUL + * at the end */ + unsigned char payload_buf[4 + MIN_PADDING_SIZE]; + memset(payload_buf, ' ', sizeof(payload_buf)); + payload_buf[sizeof(payload_buf) - 1] = '\0'; + payload_buf_len = honest_payload_size(payload_buf); + + fixture.payload = &payload_buf[0]; + fixture.sent_payload_len = payload_buf_len; + fixture.expected_return_value = 0; + fixture.expected_payload_len = payload_buf_len; + fixture.expected_return_payload = ""; + EXECUTE_HEARTBEAT_TEST(); + } + +static int test_tls1_heartbleed() + { + SETUP_HEARTBEAT_TEST_FIXTURE(tls); + /* Three-byte pad at the beginning for type and payload length */ + unsigned char payload_buf[] = " HEARTBLEED "; + + fixture.payload = &payload_buf[0]; + fixture.sent_payload_len = MAX_PRINTABLE_CHARACTERS; + fixture.expected_return_value = 0; + fixture.expected_payload_len = 0; + fixture.expected_return_payload = ""; + EXECUTE_HEARTBEAT_TEST(); + } + +static int test_tls1_heartbleed_empty_payload() + { + SETUP_HEARTBEAT_TEST_FIXTURE(tls); + /* Excluding the NUL at the end, one byte short of type + payload length + + * minimum padding */ + unsigned char payload_buf[MIN_PADDING_SIZE + 3]; + memset(payload_buf, ' ', sizeof(payload_buf)); + payload_buf[sizeof(payload_buf) - 1] = '\0'; + + fixture.payload = &payload_buf[0]; + fixture.sent_payload_len = MAX_PRINTABLE_CHARACTERS; + fixture.expected_return_value = 0; + fixture.expected_payload_len = 0; + fixture.expected_return_payload = ""; + EXECUTE_HEARTBEAT_TEST(); + } + +#undef EXECUTE_HEARTBEAT_TEST +#undef SETUP_HEARTBEAT_TEST_FIXTURE + +int main(int argc, char *argv[]) + { + int num_failed; + + SSL_library_init(); + SSL_load_error_strings(); + + num_failed = test_dtls1_not_bleeding() + + test_dtls1_not_bleeding_empty_payload() + + test_dtls1_heartbleed() + + test_dtls1_heartbleed_empty_payload() + + /* The following test causes an assertion failure at + * ssl/d1_pkt.c:dtls1_write_bytes() in versions prior to 1.0.1g: */ + (OPENSSL_VERSION_NUMBER >= 0x1000107fL ? + test_dtls1_heartbleed_excessive_plaintext_length() : 0) + + test_tls1_not_bleeding() + + test_tls1_not_bleeding_empty_payload() + + test_tls1_heartbleed() + + test_tls1_heartbleed_empty_payload() + + 0; + + ERR_print_errors_fp(stderr); + + if (num_failed != 0) + { + printf("%d test%s failed\n", num_failed, num_failed != 1 ? "s" : ""); + return EXIT_FAILURE; + } + return EXIT_SUCCESS; + } + +#else /* OPENSSL_NO_HEARTBEATS*/ + +int main(int argc, char *argv[]) + { + return EXIT_SUCCESS; + } +#endif /* OPENSSL_NO_HEARTBEATS */ diff -Nru nodejs-0.10.28/deps/openssl/openssl/test/Makefile nodejs-0.10.29/deps/openssl/openssl/test/Makefile --- nodejs-0.10.28/deps/openssl/openssl/test/Makefile 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/test/Makefile 2014-06-09 17:04:36.000000000 +0000 @@ -63,6 +63,7 @@ JPAKETEST= jpaketest SRPTEST= srptest ASN1TEST= asn1test +HEARTBEATTEST= heartbeat_test TESTS= alltests @@ -74,7 +75,7 @@ $(RANDTEST)$(EXE_EXT) $(DHTEST)$(EXE_EXT) $(ENGINETEST)$(EXE_EXT) \ $(BFTEST)$(EXE_EXT) $(CASTTEST)$(EXE_EXT) $(SSLTEST)$(EXE_EXT) $(EXPTEST)$(EXE_EXT) $(DSATEST)$(EXE_EXT) $(RSATEST)$(EXE_EXT) \ $(EVPTEST)$(EXE_EXT) $(IGETEST)$(EXE_EXT) $(JPAKETEST)$(EXE_EXT) $(SRPTEST)$(EXE_EXT) \ - $(ASN1TEST)$(EXE_EXT) + $(ASN1TEST)$(EXE_EXT) $(HEARTBEATTEST)$(EXE_EXT) # $(METHTEST)$(EXE_EXT) @@ -86,7 +87,8 @@ $(MDC2TEST).o $(RMDTEST).o \ $(RANDTEST).o $(DHTEST).o $(ENGINETEST).o $(CASTTEST).o \ $(BFTEST).o $(SSLTEST).o $(DSATEST).o $(EXPTEST).o $(RSATEST).o \ - $(EVPTEST).o $(IGETEST).o $(JPAKETEST).o $(ASN1TEST).o + $(EVPTEST).o $(IGETEST).o $(JPAKETEST).o $(ASN1TEST).o $(HEARTBEATTEST).o + SRC= $(BNTEST).c $(ECTEST).c $(ECDSATEST).c $(ECDHTEST).c $(IDEATEST).c \ $(MD2TEST).c $(MD4TEST).c $(MD5TEST).c \ $(HMACTEST).c $(WPTEST).c \ @@ -94,7 +96,8 @@ $(DESTEST).c $(SHATEST).c $(SHA1TEST).c $(MDC2TEST).c $(RMDTEST).c \ $(RANDTEST).c $(DHTEST).c $(ENGINETEST).c $(CASTTEST).c \ $(BFTEST).c $(SSLTEST).c $(DSATEST).c $(EXPTEST).c $(RSATEST).c \ - $(EVPTEST).c $(IGETEST).c $(JPAKETEST).c $(SRPTEST).c $(ASN1TEST).c + $(EVPTEST).c $(IGETEST).c $(JPAKETEST).c $(SRPTEST).c $(ASN1TEST).c \ + $(HEARTBEATTEST).c EXHEADER= HEADER= $(EXHEADER) @@ -137,7 +140,7 @@ test_enc test_x509 test_rsa test_crl test_sid \ test_gen test_req test_pkcs7 test_verify test_dh test_dsa \ test_ss test_ca test_engine test_evp test_ssl test_tsa test_ige \ - test_jpake test_srp test_cms + test_jpake test_srp test_cms test_heartbeat test_evp: ../util/shlib_wrap.sh ./$(EVPTEST) evptests.txt @@ -227,7 +230,7 @@ @../util/shlib_wrap.sh ./$(BNTEST) >tmp.bntest @echo quit >>tmp.bntest @echo "running bc" - @<tmp.bntest sh -c "`sh ./bctest ignore`" | $(PERL) -e '$$i=0; while (<STDIN>) {if (/^test (.*)/) {print STDERR "\nverify $$1";} elsif (!/^0$$/) {die "\nFailed! bc: $$_";} else {print STDERR "."; $$i++;}} print STDERR "\n$$i tests passed\n"' + @<tmp.bntest sh -c "`sh ./bctest ignore`" | $(PERL) -e '$$i=0; while (<STDIN>) {if (/^test (.*)/) {print STDERR "\nverify $$1";} elsif (!/^0\r?$$/) {die "\nFailed! bc: $$_";} else {print STDERR "."; $$i++;}} print STDERR "\n$$i tests passed\n"' @echo 'test a^b%c implementations' ../util/shlib_wrap.sh ./$(EXPTEST) @@ -318,6 +321,9 @@ @echo "Test SRP" ../util/shlib_wrap.sh ./srptest +test_heartbeat: $(HEARTBEATTEST)$(EXE_EXT) + ../util/shlib_wrap.sh ./$(HEARTBEATTEST) + lint: lint -DLINT $(INCLUDES) $(SRC)>fluff @@ -469,6 +475,9 @@ $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO) @target=$(SRPTEST); $(BUILD_CMD) +$(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO) + @target=$(HEARTBEATTEST); $(BUILD_CMD) + #$(AESTEST).o: $(AESTEST).c # $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c @@ -604,6 +613,27 @@ exptest.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h exptest.o: ../include/openssl/safestack.h ../include/openssl/stack.h exptest.o: ../include/openssl/symhacks.h exptest.c +heartbeat_test.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h +heartbeat_test.o: ../include/openssl/buffer.h ../include/openssl/comp.h +heartbeat_test.o: ../include/openssl/crypto.h ../include/openssl/dsa.h +heartbeat_test.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h +heartbeat_test.o: ../include/openssl/ec.h ../include/openssl/ecdh.h +heartbeat_test.o: ../include/openssl/ecdsa.h ../include/openssl/err.h +heartbeat_test.o: ../include/openssl/evp.h ../include/openssl/hmac.h +heartbeat_test.o: ../include/openssl/kssl.h ../include/openssl/lhash.h +heartbeat_test.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +heartbeat_test.o: ../include/openssl/opensslconf.h +heartbeat_test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +heartbeat_test.o: ../include/openssl/pem.h ../include/openssl/pem2.h +heartbeat_test.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h +heartbeat_test.o: ../include/openssl/rsa.h ../include/openssl/safestack.h +heartbeat_test.o: ../include/openssl/sha.h ../include/openssl/srtp.h +heartbeat_test.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h +heartbeat_test.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h +heartbeat_test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +heartbeat_test.o: ../include/openssl/tls1.h ../include/openssl/x509.h +heartbeat_test.o: ../include/openssl/x509_vfy.h ../ssl/ssl_locl.h +heartbeat_test.o: heartbeat_test.c hmactest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h hmactest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h hmactest.o: ../include/openssl/evp.h ../include/openssl/hmac.h diff -Nru nodejs-0.10.28/deps/openssl/openssl/test/Makefile.save nodejs-0.10.29/deps/openssl/openssl/test/Makefile.save --- nodejs-0.10.28/deps/openssl/openssl/test/Makefile.save 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/openssl/openssl/test/Makefile.save 1970-01-01 00:00:00.000000000 +0000 @@ -1,729 +0,0 @@ -# -# test/Makefile -# - -DIR= test -TOP= .. -CC= cc -INCLUDES= -I$(TOP) -I../include $(KRB5_INCLUDES) -CFLAG= -g -MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -PERL= perl -# KRB5 stuff -KRB5_INCLUDES= -LIBKRB5= - -PEX_LIBS= -EX_LIBS= #-lnsl -lsocket - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile maketests.com \ - tests.com testenc.com tx509.com trsa.com tcrl.com tsid.com treq.com \ - tpkcs7.com tpkcs7d.com tverify.com testgen.com testss.com testssl.com \ - testca.com VMSca-response.1 VMSca-response.2 - -DLIBCRYPTO= ../libcrypto.a -DLIBSSL= ../libssl.a -LIBCRYPTO= -L.. -lcrypto -LIBSSL= -L.. -lssl - -BNTEST= bntest -ECTEST= ectest -ECDSATEST= ecdsatest -ECDHTEST= ecdhtest -EXPTEST= exptest -IDEATEST= ideatest -SHATEST= shatest -SHA1TEST= sha1test -SHA256TEST= sha256t -SHA512TEST= sha512t -MDC2TEST= mdc2test -RMDTEST= rmdtest -MD2TEST= md2test -MD4TEST= md4test -MD5TEST= md5test -HMACTEST= hmactest -WPTEST= wp_test -RC2TEST= rc2test -RC4TEST= rc4test -RC5TEST= rc5test -BFTEST= bftest -CASTTEST= casttest -DESTEST= destest -RANDTEST= randtest -DHTEST= dhtest -DSATEST= dsatest -METHTEST= methtest -SSLTEST= ssltest -RSATEST= rsa_test -ENGINETEST= enginetest -EVPTEST= evp_test -IGETEST= igetest -JPAKETEST= jpaketest -SRPTEST= srptest -ASN1TEST= asn1test - -TESTS= alltests - -EXE= $(BNTEST)$(EXE_EXT) $(ECTEST)$(EXE_EXT) $(ECDSATEST)$(EXE_EXT) $(ECDHTEST)$(EXE_EXT) $(IDEATEST)$(EXE_EXT) \ - $(MD2TEST)$(EXE_EXT) $(MD4TEST)$(EXE_EXT) $(MD5TEST)$(EXE_EXT) $(HMACTEST)$(EXE_EXT) $(WPTEST)$(EXE_EXT) \ - $(RC2TEST)$(EXE_EXT) $(RC4TEST)$(EXE_EXT) $(RC5TEST)$(EXE_EXT) \ - $(DESTEST)$(EXE_EXT) $(SHATEST)$(EXE_EXT) $(SHA1TEST)$(EXE_EXT) $(SHA256TEST)$(EXE_EXT) $(SHA512TEST)$(EXE_EXT) \ - $(MDC2TEST)$(EXE_EXT) $(RMDTEST)$(EXE_EXT) \ - $(RANDTEST)$(EXE_EXT) $(DHTEST)$(EXE_EXT) $(ENGINETEST)$(EXE_EXT) \ - $(BFTEST)$(EXE_EXT) $(CASTTEST)$(EXE_EXT) $(SSLTEST)$(EXE_EXT) $(EXPTEST)$(EXE_EXT) $(DSATEST)$(EXE_EXT) $(RSATEST)$(EXE_EXT) \ - $(EVPTEST)$(EXE_EXT) $(IGETEST)$(EXE_EXT) $(JPAKETEST)$(EXE_EXT) $(SRPTEST)$(EXE_EXT) \ - $(ASN1TEST)$(EXE_EXT) - -# $(METHTEST)$(EXE_EXT) - -OBJ= $(BNTEST).o $(ECTEST).o $(ECDSATEST).o $(ECDHTEST).o $(IDEATEST).o \ - $(MD2TEST).o $(MD4TEST).o $(MD5TEST).o \ - $(HMACTEST).o $(WPTEST).o \ - $(RC2TEST).o $(RC4TEST).o $(RC5TEST).o \ - $(DESTEST).o $(SHATEST).o $(SHA1TEST).o $(SHA256TEST).o $(SHA512TEST).o \ - $(MDC2TEST).o $(RMDTEST).o \ - $(RANDTEST).o $(DHTEST).o $(ENGINETEST).o $(CASTTEST).o \ - $(BFTEST).o $(SSLTEST).o $(DSATEST).o $(EXPTEST).o $(RSATEST).o \ - $(EVPTEST).o $(IGETEST).o $(JPAKETEST).o $(ASN1TEST).o -SRC= $(BNTEST).c $(ECTEST).c $(ECDSATEST).c $(ECDHTEST).c $(IDEATEST).c \ - $(MD2TEST).c $(MD4TEST).c $(MD5TEST).c \ - $(HMACTEST).c $(WPTEST).c \ - $(RC2TEST).c $(RC4TEST).c $(RC5TEST).c \ - $(DESTEST).c $(SHATEST).c $(SHA1TEST).c $(MDC2TEST).c $(RMDTEST).c \ - $(RANDTEST).c $(DHTEST).c $(ENGINETEST).c $(CASTTEST).c \ - $(BFTEST).c $(SSLTEST).c $(DSATEST).c $(EXPTEST).c $(RSATEST).c \ - $(EVPTEST).c $(IGETEST).c $(JPAKETEST).c $(SRPTEST).c $(ASN1TEST).c - -EXHEADER= -HEADER= $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ..; $(MAKE) DIRS=$(DIR) TESTS=$(TESTS) all) - -all: exe - -exe: $(EXE) dummytest$(EXE_EXT) - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - -generate: $(SRC) -$(SRC): - @sh $(TOP)/util/point.sh dummytest.c $@ - -errors: - -install: - -tags: - ctags $(SRC) - -tests: exe apps $(TESTS) - -apps: - @(cd ..; $(MAKE) DIRS=apps all) - -alltests: \ - test_des test_idea test_sha test_md4 test_md5 test_hmac \ - test_md2 test_mdc2 test_wp \ - test_rmd test_rc2 test_rc4 test_rc5 test_bf test_cast test_aes \ - test_rand test_bn test_ec test_ecdsa test_ecdh \ - test_enc test_x509 test_rsa test_crl test_sid \ - test_gen test_req test_pkcs7 test_verify test_dh test_dsa \ - test_ss test_ca test_engine test_evp test_ssl test_tsa test_ige \ - test_jpake test_srp test_cms - -test_evp: - ../util/shlib_wrap.sh ./$(EVPTEST) evptests.txt - -test_des: - ../util/shlib_wrap.sh ./$(DESTEST) - -test_idea: - ../util/shlib_wrap.sh ./$(IDEATEST) - -test_sha: - ../util/shlib_wrap.sh ./$(SHATEST) - ../util/shlib_wrap.sh ./$(SHA1TEST) - ../util/shlib_wrap.sh ./$(SHA256TEST) - ../util/shlib_wrap.sh ./$(SHA512TEST) - -test_mdc2: - ../util/shlib_wrap.sh ./$(MDC2TEST) - -test_md5: - ../util/shlib_wrap.sh ./$(MD5TEST) - -test_md4: - ../util/shlib_wrap.sh ./$(MD4TEST) - -test_hmac: - ../util/shlib_wrap.sh ./$(HMACTEST) - -test_wp: - ../util/shlib_wrap.sh ./$(WPTEST) - -test_md2: - ../util/shlib_wrap.sh ./$(MD2TEST) - -test_rmd: - ../util/shlib_wrap.sh ./$(RMDTEST) - -test_bf: - ../util/shlib_wrap.sh ./$(BFTEST) - -test_cast: - ../util/shlib_wrap.sh ./$(CASTTEST) - -test_rc2: - ../util/shlib_wrap.sh ./$(RC2TEST) - -test_rc4: - ../util/shlib_wrap.sh ./$(RC4TEST) - -test_rc5: - ../util/shlib_wrap.sh ./$(RC5TEST) - -test_rand: - ../util/shlib_wrap.sh ./$(RANDTEST) - -test_enc: - @sh ./testenc - -test_x509: - echo test normal x509v1 certificate - sh ./tx509 2>/dev/null - echo test first x509v3 certificate - sh ./tx509 v3-cert1.pem 2>/dev/null - echo test second x509v3 certificate - sh ./tx509 v3-cert2.pem 2>/dev/null - -test_rsa: $(RSATEST)$(EXE_EXT) - @sh ./trsa 2>/dev/null - ../util/shlib_wrap.sh ./$(RSATEST) - -test_crl: - @sh ./tcrl 2>/dev/null - -test_sid: - @sh ./tsid 2>/dev/null - -test_req: - @sh ./treq 2>/dev/null - @sh ./treq testreq2.pem 2>/dev/null - -test_pkcs7: - @sh ./tpkcs7 2>/dev/null - @sh ./tpkcs7d 2>/dev/null - -test_bn: - @echo starting big number library test, could take a while... - @../util/shlib_wrap.sh ./$(BNTEST) >tmp.bntest - @echo quit >>tmp.bntest - @echo "running bc" - @<tmp.bntest sh -c "`sh ./bctest ignore`" | $(PERL) -e '$$i=0; while (<STDIN>) {if (/^test (.*)/) {print STDERR "\nverify $$1";} elsif (!/^0$$/) {die "\nFailed! bc: $$_";} else {print STDERR "."; $$i++;}} print STDERR "\n$$i tests passed\n"' - @echo 'test a^b%c implementations' - ../util/shlib_wrap.sh ./$(EXPTEST) - -test_ec: - @echo 'test elliptic curves' - ../util/shlib_wrap.sh ./$(ECTEST) - -test_ecdsa: - @echo 'test ecdsa' - ../util/shlib_wrap.sh ./$(ECDSATEST) - -test_ecdh: - @echo 'test ecdh' - ../util/shlib_wrap.sh ./$(ECDHTEST) - -test_verify: - @echo "The following command should have some OK's and some failures" - @echo "There are definitly a few expired certificates" - ../util/shlib_wrap.sh ../apps/openssl verify -CApath ../certs/demo ../certs/demo/*.pem - -test_dh: - @echo "Generate a set of DH parameters" - ../util/shlib_wrap.sh ./$(DHTEST) - -test_dsa: - @echo "Generate a set of DSA parameters" - ../util/shlib_wrap.sh ./$(DSATEST) - ../util/shlib_wrap.sh ./$(DSATEST) -app2_1 - -test_gen: - @echo "Generate and verify a certificate request" - @sh ./testgen - -test_ss keyU.ss certU.ss certCA.ss certP1.ss keyP1.ss certP2.ss keyP2.ss \ - intP1.ss intP2.ss: testss - @echo "Generate and certify a test certificate" - @sh ./testss - @cat certCA.ss certU.ss > intP1.ss - @cat certCA.ss certU.ss certP1.ss > intP2.ss - -test_engine: - @echo "Manipulate the ENGINE structures" - ../util/shlib_wrap.sh ./$(ENGINETEST) - -test_ssl: keyU.ss certU.ss certCA.ss certP1.ss keyP1.ss certP2.ss keyP2.ss \ - intP1.ss intP2.ss - @echo "test SSL protocol" - @if [ -n "$(FIPSCANLIB)" ]; then \ - sh ./testfipsssl keyU.ss certU.ss certCA.ss; \ - fi - ../util/shlib_wrap.sh ./$(SSLTEST) -test_cipherlist - @sh ./testssl keyU.ss certU.ss certCA.ss - @sh ./testsslproxy keyP1.ss certP1.ss intP1.ss - @sh ./testsslproxy keyP2.ss certP2.ss intP2.ss - -test_ca: - @if ../util/shlib_wrap.sh ../apps/openssl no-rsa; then \ - echo "skipping CA.sh test -- requires RSA"; \ - else \ - echo "Generate and certify a test certificate via the 'ca' program"; \ - sh ./testca; \ - fi - -test_aes: #$(AESTEST) -# @echo "test Rijndael" -# ../util/shlib_wrap.sh ./$(AESTEST) - -test_tsa: - @if ../util/shlib_wrap.sh ../apps/openssl no-rsa; then \ - echo "skipping testtsa test -- requires RSA"; \ - else \ - sh ./testtsa; \ - fi - -test_ige: $(IGETEST)$(EXE_EXT) - @echo "Test IGE mode" - ../util/shlib_wrap.sh ./$(IGETEST) - -test_jpake: $(JPAKETEST)$(EXE_EXT) - @echo "Test JPAKE" - ../util/shlib_wrap.sh ./$(JPAKETEST) - -test_cms: - @echo "CMS consistency test" - $(PERL) cms-test.pl - -test_srp: $(SRPTEST)$(EXE_EXT) - @echo "Test SRP" - ../util/shlib_wrap.sh ./srptest - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - @if [ -z "$(THIS)" ]; then \ - $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; \ - else \ - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(SRC); \ - fi - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - rm -f $(SRC) $(SHA256TEST).c $(SHA512TEST).c evptests.txt newkey.pem testkey.pem \ - testreq.pem - -clean: - rm -f .rnd tmp.bntest tmp.bctest *.o *.obj *.dll lib tags core .pure .nfs* *.old *.bak fluff $(EXE) *.ss *.srl log dummytest - -$(DLIBSSL): - (cd ..; $(MAKE) DIRS=ssl all) - -$(DLIBCRYPTO): - (cd ..; $(MAKE) DIRS=crypto all) - -BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \ - shlib_target="$(SHLIB_TARGET)"; \ - fi; \ - LIBRARIES="$(LIBSSL) $(LIBCRYPTO) $(LIBKRB5)"; \ - $(MAKE) -f $(TOP)/Makefile.shared -e \ - CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \ - LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ - link_app.$${shlib_target} - -FIPS_BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \ - shlib_target="$(SHLIB_TARGET)"; \ - fi; \ - LIBRARIES="$(LIBSSL) $(LIBCRYPTO) $(LIBKRB5)"; \ - if [ -z "$(SHARED_LIBS)" -a -n "$(FIPSCANLIB)" ] ; then \ - FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)/bin/fipsld; export CC FIPSLD_CC; \ - fi; \ - $(MAKE) -f $(TOP)/Makefile.shared -e \ - CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \ - LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ - link_app.$${shlib_target} - -$(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO) - @target=$(RSATEST); $(BUILD_CMD) - -$(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO) - @target=$(BNTEST); $(BUILD_CMD) - -$(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO) - @target=$(ECTEST); $(BUILD_CMD) - -$(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO) - @target=$(EXPTEST); $(BUILD_CMD) - -$(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO) - @target=$(IDEATEST); $(BUILD_CMD) - -$(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO) - @target=$(MD2TEST); $(BUILD_CMD) - -$(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO) - @target=$(SHATEST); $(BUILD_CMD) - -$(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO) - @target=$(SHA1TEST); $(BUILD_CMD) - -$(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO) - @target=$(SHA256TEST); $(BUILD_CMD) - -$(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO) - @target=$(SHA512TEST); $(BUILD_CMD) - -$(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO) - @target=$(RMDTEST); $(BUILD_CMD) - -$(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO) - @target=$(MDC2TEST); $(BUILD_CMD) - -$(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO) - @target=$(MD4TEST); $(BUILD_CMD) - -$(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO) - @target=$(MD5TEST); $(BUILD_CMD) - -$(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO) - @target=$(HMACTEST); $(BUILD_CMD) - -$(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO) - @target=$(WPTEST); $(BUILD_CMD) - -$(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO) - @target=$(RC2TEST); $(BUILD_CMD) - -$(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO) - @target=$(BFTEST); $(BUILD_CMD) - -$(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO) - @target=$(CASTTEST); $(BUILD_CMD) - -$(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO) - @target=$(RC4TEST); $(BUILD_CMD) - -$(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO) - @target=$(RC5TEST); $(BUILD_CMD) - -$(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO) - @target=$(DESTEST); $(BUILD_CMD) - -$(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO) - @target=$(RANDTEST); $(BUILD_CMD) - -$(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO) - @target=$(DHTEST); $(BUILD_CMD) - -$(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO) - @target=$(DSATEST); $(BUILD_CMD) - -$(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO) - @target=$(METHTEST); $(BUILD_CMD) - -$(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO) - @target=$(SSLTEST); $(FIPS_BUILD_CMD) - -$(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO) - @target=$(ENGINETEST); $(BUILD_CMD) - -$(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO) - @target=$(EVPTEST); $(BUILD_CMD) - -$(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO) - @target=$(ECDSATEST); $(BUILD_CMD) - -$(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO) - @target=$(ECDHTEST); $(BUILD_CMD) - -$(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO) - @target=$(IGETEST); $(BUILD_CMD) - -$(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO) - @target=$(JPAKETEST); $(BUILD_CMD) - -$(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO) - @target=$(ASN1TEST); $(BUILD_CMD) - -$(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO) - @target=$(SRPTEST); $(BUILD_CMD) - -#$(AESTEST).o: $(AESTEST).c -# $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c - -#$(AESTEST)$(EXE_EXT): $(AESTEST).o $(DLIBCRYPTO) -# if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \ -# $(CC) -o $(AESTEST)$(EXE_EXT) $(CFLAGS) $(AESTEST).o $(PEX_LIBS) $(DLIBCRYPTO) $(EX_LIBS) ; \ -# else \ -# $(CC) -o $(AESTEST)$(EXE_EXT) $(CFLAGS) $(AESTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) ; \ -# fi - -dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO) - @target=dummytest; $(BUILD_CMD) - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -asn1test.o: ../include/openssl/asn1.h ../include/openssl/asn1_mac.h -asn1test.o: ../include/openssl/bio.h ../include/openssl/buffer.h -asn1test.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -asn1test.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -asn1test.o: ../include/openssl/ecdsa.h ../include/openssl/evp.h -asn1test.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -asn1test.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -asn1test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -asn1test.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h -asn1test.o: ../include/openssl/sha.h ../include/openssl/stack.h -asn1test.o: ../include/openssl/symhacks.h ../include/openssl/x509.h -asn1test.o: ../include/openssl/x509_vfy.h asn1test.c -bftest.o: ../e_os.h ../include/openssl/blowfish.h ../include/openssl/e_os2.h -bftest.o: ../include/openssl/opensslconf.h bftest.c -bntest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -bntest.o: ../include/openssl/bn.h ../include/openssl/buffer.h -bntest.o: ../include/openssl/crypto.h ../include/openssl/dh.h -bntest.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h -bntest.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -bntest.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -bntest.o: ../include/openssl/evp.h ../include/openssl/lhash.h -bntest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -bntest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -bntest.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h -bntest.o: ../include/openssl/rand.h ../include/openssl/rsa.h -bntest.o: ../include/openssl/safestack.h ../include/openssl/sha.h -bntest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -bntest.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h bntest.c -casttest.o: ../e_os.h ../include/openssl/cast.h ../include/openssl/e_os2.h -casttest.o: ../include/openssl/opensslconf.h casttest.c -destest.o: ../include/openssl/des.h ../include/openssl/des_old.h -destest.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h -destest.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h -destest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -destest.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h destest.c -dhtest.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/bn.h -dhtest.o: ../include/openssl/crypto.h ../include/openssl/dh.h -dhtest.o: ../include/openssl/e_os2.h ../include/openssl/err.h -dhtest.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h -dhtest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -dhtest.o: ../include/openssl/rand.h ../include/openssl/safestack.h -dhtest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h dhtest.c -dsatest.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/bn.h -dsatest.o: ../include/openssl/crypto.h ../include/openssl/dh.h -dsatest.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h -dsatest.o: ../include/openssl/err.h ../include/openssl/lhash.h -dsatest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -dsatest.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h -dsatest.o: ../include/openssl/safestack.h ../include/openssl/stack.h -dsatest.o: ../include/openssl/symhacks.h dsatest.c -ecdhtest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -ecdhtest.o: ../include/openssl/bn.h ../include/openssl/crypto.h -ecdhtest.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -ecdhtest.o: ../include/openssl/ecdh.h ../include/openssl/err.h -ecdhtest.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -ecdhtest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -ecdhtest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -ecdhtest.o: ../include/openssl/rand.h ../include/openssl/safestack.h -ecdhtest.o: ../include/openssl/sha.h ../include/openssl/stack.h -ecdhtest.o: ../include/openssl/symhacks.h ecdhtest.c -ecdsatest.o: ../include/openssl/asn1.h ../include/openssl/bio.h -ecdsatest.o: ../include/openssl/bn.h ../include/openssl/buffer.h -ecdsatest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -ecdsatest.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -ecdsatest.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -ecdsatest.o: ../include/openssl/err.h ../include/openssl/evp.h -ecdsatest.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -ecdsatest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -ecdsatest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -ecdsatest.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h -ecdsatest.o: ../include/openssl/safestack.h ../include/openssl/sha.h -ecdsatest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -ecdsatest.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -ecdsatest.o: ecdsatest.c -ectest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -ectest.o: ../include/openssl/bn.h ../include/openssl/buffer.h -ectest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -ectest.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -ectest.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -ectest.o: ../include/openssl/err.h ../include/openssl/evp.h -ectest.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -ectest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -ectest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -ectest.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h -ectest.o: ../include/openssl/safestack.h ../include/openssl/sha.h -ectest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -ectest.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ectest.c -enginetest.o: ../include/openssl/asn1.h ../include/openssl/bio.h -enginetest.o: ../include/openssl/buffer.h ../include/openssl/crypto.h -enginetest.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -enginetest.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -enginetest.o: ../include/openssl/engine.h ../include/openssl/err.h -enginetest.o: ../include/openssl/evp.h ../include/openssl/lhash.h -enginetest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -enginetest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -enginetest.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h -enginetest.o: ../include/openssl/safestack.h ../include/openssl/sha.h -enginetest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -enginetest.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -enginetest.o: enginetest.c -evp_test.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -evp_test.o: ../include/openssl/buffer.h ../include/openssl/conf.h -evp_test.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -evp_test.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -evp_test.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -evp_test.o: ../include/openssl/err.h ../include/openssl/evp.h -evp_test.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -evp_test.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -evp_test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -evp_test.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h -evp_test.o: ../include/openssl/sha.h ../include/openssl/stack.h -evp_test.o: ../include/openssl/symhacks.h ../include/openssl/x509.h -evp_test.o: ../include/openssl/x509_vfy.h evp_test.c -exptest.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/bn.h -exptest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -exptest.o: ../include/openssl/err.h ../include/openssl/lhash.h -exptest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -exptest.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h -exptest.o: ../include/openssl/safestack.h ../include/openssl/stack.h -exptest.o: ../include/openssl/symhacks.h exptest.c -hmactest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -hmactest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -hmactest.o: ../include/openssl/evp.h ../include/openssl/hmac.h -hmactest.o: ../include/openssl/md5.h ../include/openssl/obj_mac.h -hmactest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -hmactest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -hmactest.o: ../include/openssl/safestack.h ../include/openssl/stack.h -hmactest.o: ../include/openssl/symhacks.h hmactest.c -ideatest.o: ../e_os.h ../include/openssl/e_os2.h ../include/openssl/idea.h -ideatest.o: ../include/openssl/opensslconf.h ideatest.c -igetest.o: ../include/openssl/aes.h ../include/openssl/e_os2.h -igetest.o: ../include/openssl/opensslconf.h ../include/openssl/ossl_typ.h -igetest.o: ../include/openssl/rand.h igetest.c -jpaketest.o: ../include/openssl/buffer.h ../include/openssl/crypto.h -jpaketest.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h -jpaketest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -jpaketest.o: ../include/openssl/safestack.h ../include/openssl/stack.h -jpaketest.o: ../include/openssl/symhacks.h jpaketest.c -md2test.o: ../include/openssl/buffer.h ../include/openssl/crypto.h -md2test.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h -md2test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -md2test.o: ../include/openssl/safestack.h ../include/openssl/stack.h -md2test.o: ../include/openssl/symhacks.h md2test.c -md4test.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -md4test.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -md4test.o: ../include/openssl/evp.h ../include/openssl/md4.h -md4test.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -md4test.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -md4test.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h -md4test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h md4test.c -md5test.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -md5test.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -md5test.o: ../include/openssl/evp.h ../include/openssl/md5.h -md5test.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -md5test.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -md5test.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h -md5test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h md5test.c -mdc2test.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -mdc2test.o: ../include/openssl/crypto.h ../include/openssl/des.h -mdc2test.o: ../include/openssl/des_old.h ../include/openssl/e_os2.h -mdc2test.o: ../include/openssl/evp.h ../include/openssl/mdc2.h -mdc2test.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -mdc2test.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -mdc2test.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h -mdc2test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -mdc2test.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h mdc2test.c -randtest.o: ../e_os.h ../include/openssl/e_os2.h -randtest.o: ../include/openssl/opensslconf.h ../include/openssl/ossl_typ.h -randtest.o: ../include/openssl/rand.h randtest.c -rc2test.o: ../e_os.h ../include/openssl/e_os2.h -rc2test.o: ../include/openssl/opensslconf.h ../include/openssl/rc2.h rc2test.c -rc4test.o: ../e_os.h ../include/openssl/e_os2.h -rc4test.o: ../include/openssl/opensslconf.h ../include/openssl/rc4.h -rc4test.o: ../include/openssl/sha.h rc4test.c -rc5test.o: ../include/openssl/buffer.h ../include/openssl/crypto.h -rc5test.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h -rc5test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -rc5test.o: ../include/openssl/safestack.h ../include/openssl/stack.h -rc5test.o: ../include/openssl/symhacks.h rc5test.c -rmdtest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -rmdtest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -rmdtest.o: ../include/openssl/evp.h ../include/openssl/obj_mac.h -rmdtest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -rmdtest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -rmdtest.o: ../include/openssl/ripemd.h ../include/openssl/safestack.h -rmdtest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h rmdtest.c -rsa_test.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -rsa_test.o: ../include/openssl/bn.h ../include/openssl/crypto.h -rsa_test.o: ../include/openssl/e_os2.h ../include/openssl/err.h -rsa_test.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h -rsa_test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -rsa_test.o: ../include/openssl/rand.h ../include/openssl/rsa.h -rsa_test.o: ../include/openssl/safestack.h ../include/openssl/stack.h -rsa_test.o: ../include/openssl/symhacks.h rsa_test.c -sha1test.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -sha1test.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -sha1test.o: ../include/openssl/evp.h ../include/openssl/obj_mac.h -sha1test.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -sha1test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -sha1test.o: ../include/openssl/safestack.h ../include/openssl/sha.h -sha1test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h sha1test.c -shatest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -shatest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -shatest.o: ../include/openssl/evp.h ../include/openssl/obj_mac.h -shatest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -shatest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -shatest.o: ../include/openssl/safestack.h ../include/openssl/sha.h -shatest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h shatest.c -srptest.o: ../include/openssl/bio.h ../include/openssl/bn.h -srptest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -srptest.o: ../include/openssl/err.h ../include/openssl/lhash.h -srptest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -srptest.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h -srptest.o: ../include/openssl/safestack.h ../include/openssl/srp.h -srptest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h srptest.c -ssltest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -ssltest.o: ../include/openssl/bn.h ../include/openssl/buffer.h -ssltest.o: ../include/openssl/comp.h ../include/openssl/conf.h -ssltest.o: ../include/openssl/crypto.h ../include/openssl/dh.h -ssltest.o: ../include/openssl/dsa.h ../include/openssl/dtls1.h -ssltest.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -ssltest.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -ssltest.o: ../include/openssl/engine.h ../include/openssl/err.h -ssltest.o: ../include/openssl/evp.h ../include/openssl/hmac.h -ssltest.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -ssltest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -ssltest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -ssltest.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -ssltest.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -ssltest.o: ../include/openssl/pqueue.h ../include/openssl/rand.h -ssltest.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -ssltest.o: ../include/openssl/sha.h ../include/openssl/srp.h -ssltest.o: ../include/openssl/srtp.h ../include/openssl/ssl.h -ssltest.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h -ssltest.o: ../include/openssl/ssl3.h ../include/openssl/stack.h -ssltest.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -ssltest.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -ssltest.o: ../include/openssl/x509v3.h ssltest.c -wp_test.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -wp_test.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -wp_test.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h -wp_test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -wp_test.o: ../include/openssl/whrlpool.h wp_test.c diff -Nru nodejs-0.10.28/deps/v8/include/v8.h nodejs-0.10.29/deps/v8/include/v8.h --- nodejs-0.10.28/deps/v8/include/v8.h 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/v8/include/v8.h 2014-06-09 17:04:36.000000000 +0000 @@ -1076,7 +1076,11 @@ NO_OPTIONS = 0, HINT_MANY_WRITES_EXPECTED = 1, NO_NULL_TERMINATION = 2, - PRESERVE_ASCII_NULL = 4 + PRESERVE_ASCII_NULL = 4, + // Used by WriteUtf8 to replace orphan surrogate code units with the + // unicode replacement character. Needs to be set to guarantee valid UTF-8 + // output. + REPLACE_INVALID_UTF8 = 8 }; // 16-bit character codes. diff -Nru nodejs-0.10.28/deps/v8/src/api.cc nodejs-0.10.29/deps/v8/src/api.cc --- nodejs-0.10.28/deps/v8/src/api.cc 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/v8/src/api.cc 2014-06-09 17:04:36.000000000 +0000 @@ -3759,7 +3759,8 @@ int end, int recursion_budget, int32_t previous_character, - int32_t* last_character) { + int32_t* last_character, + bool replace_invalid_utf8) { int utf8_bytes = 0; while (true) { if (string->IsAsciiRepresentation()) { @@ -3775,7 +3776,10 @@ for (int i = start; i < end; i++) { uint16_t character = data[i]; current += - unibrow::Utf8::Encode(current, character, previous_character); + unibrow::Utf8::Encode(current, + character, + previous_character, + replace_invalid_utf8); previous_character = character; } *last_character = previous_character; @@ -3788,7 +3792,10 @@ for (int i = start; i < end; i++) { uint16_t character = data[i]; current += - unibrow::Utf8::Encode(current, character, previous_character); + unibrow::Utf8::Encode(current, + character, + previous_character, + replace_invalid_utf8); previous_character = character; } *last_character = previous_character; @@ -3824,7 +3831,8 @@ boundary, recursion_budget - 1, previous_character, - &previous_character); + &previous_character, + replace_invalid_utf8); if (extra_utf8_bytes < 0) return extra_utf8_bytes; buffer += extra_utf8_bytes; utf8_bytes += extra_utf8_bytes; @@ -3879,7 +3887,10 @@ return len; } - if (capacity == -1 || capacity / 3 >= string_length) { + bool replace_invalid_utf8 = (options & REPLACE_INVALID_UTF8); + int max16BitCodeUnitSize = unibrow::Utf8::kMax16BitCodeUnitSize; + + if (capacity == -1 || capacity / max16BitCodeUnitSize >= string_length) { int32_t previous = unibrow::Utf16::kNoPreviousCharacter; const int kMaxRecursion = 100; int utf8_bytes = @@ -3889,7 +3900,8 @@ string_length, kMaxRecursion, previous, - &previous); + &previous, + replace_invalid_utf8); if (utf8_bytes >= 0) { // Success serializing with recursion. if ((options & NO_NULL_TERMINATION) == 0 && @@ -3942,14 +3954,16 @@ char intermediate[unibrow::Utf8::kMaxEncodedSize]; for (; i < len && pos < capacity; i++) { i::uc32 c = write_input_buffer.GetNext(); - if (unibrow::Utf16::IsTrailSurrogate(c) && - unibrow::Utf16::IsLeadSurrogate(previous)) { + if (unibrow::Utf16::IsSurrogatePair(previous, c)) { // We can't use the intermediate buffer here because the encoding // of surrogate pairs is done under assumption that you can step // back and fix the UTF8 stream. Luckily we only need space for one // more byte, so there is always space. ASSERT(pos < capacity); - int written = unibrow::Utf8::Encode(buffer + pos, c, previous); + int written = unibrow::Utf8::Encode(buffer + pos, + c, + previous, + replace_invalid_utf8); ASSERT(written == 1); pos += written; nchars++; @@ -3957,7 +3971,8 @@ int written = unibrow::Utf8::Encode(intermediate, c, - unibrow::Utf16::kNoPreviousCharacter); + unibrow::Utf16::kNoPreviousCharacter, + replace_invalid_utf8); if (pos + written <= capacity) { for (int j = 0; j < written; j++) { buffer[pos + j] = intermediate[j]; diff -Nru nodejs-0.10.28/deps/v8/src/platform-posix.cc nodejs-0.10.29/deps/v8/src/platform-posix.cc --- nodejs-0.10.28/deps/v8/src/platform-posix.cc 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/v8/src/platform-posix.cc 2014-06-09 17:04:36.000000000 +0000 @@ -92,6 +92,33 @@ } #endif // __CYGWIN__ +// For our illumos/Solaris mmap hint, we pick a random address in the bottom +// half of the top half of the address space (that is, the third quarter). +// Because we do not MAP_FIXED, this will be treated only as a hint -- the +// system will not fail to mmap() because something else happens to already be +// mapped at our random address. We deliberately set the hint high enough to +// get well above the system's break (that is, the heap); illumos and Solaris +// will try the hint and if that fails allocate as if there were no hint at +// all. The high hint prevents the break from getting hemmed in at low values, +// ceding half of the address space to the system heap. + +// On all other 32bit platforms the range 0x20000000 - 0x60000000 is relatively +// unpopulated across a variety of ASLR modes (PAE kernel, NX compat mode, etc) +// and on macos 10.6 and 10.7. + +#ifdef V8_TARGET_ARCH_X64 +# ifdef __sun +# define V8_ASLR_MEMORY_SHIFT 0x400000000000ULL +# else +# define V8_ASLR_MEMORY_SHIFT 0 +# endif // __sun +#else +# ifdef __sun +# define V8_ASLR_MEMORY_SHIFT 0x80000000 +# else +# define V8_ASLR_MEMORY_SHIFT 0x20000000 +# endif // __sun +#endif // V8_TARGET_ARCH_X64 void* OS::GetRandomMmapAddr() { Isolate* isolate = Isolate::UncheckedCurrent(); @@ -111,25 +138,8 @@ uint32_t raw_addr = V8::RandomPrivate(isolate); raw_addr &= 0x3ffff000; - -# ifdef __sun - // For our Solaris/illumos mmap hint, we pick a random address in the bottom - // half of the top half of the address space (that is, the third quarter). - // Because we do not MAP_FIXED, this will be treated only as a hint -- the - // system will not fail to mmap() because something else happens to already - // be mapped at our random address. We deliberately set the hint high enough - // to get well above the system's break (that is, the heap); Solaris and - // illumos will try the hint and if that fails allocate as if there were - // no hint at all. The high hint prevents the break from getting hemmed in - // at low values, ceding half of the address space to the system heap. - raw_addr += 0x80000000; -# else - // The range 0x20000000 - 0x60000000 is relatively unpopulated across a - // variety of ASLR modes (PAE kernel, NX compat mode, etc) and on macos - // 10.6 and 10.7. - raw_addr += 0x20000000; -# endif #endif + raw_addr += V8_ASLR_MEMORY_SHIFT; return reinterpret_cast<void*>(raw_addr); } return NULL; diff -Nru nodejs-0.10.28/deps/v8/src/unicode.h nodejs-0.10.29/deps/v8/src/unicode.h --- nodejs-0.10.28/deps/v8/src/unicode.h 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/v8/src/unicode.h 2014-06-09 17:04:36.000000000 +0000 @@ -117,6 +117,9 @@ class Utf16 { public: + static inline bool IsSurrogatePair(int lead, int trail) { + return IsLeadSurrogate(lead) && IsTrailSurrogate(trail); + } static inline bool IsLeadSurrogate(int code) { if (code == kNoPreviousCharacter) return false; return (code & 0xfc00) == 0xd800; @@ -152,13 +155,19 @@ class Utf8 { public: static inline uchar Length(uchar chr, int previous); - static inline unsigned Encode( - char* out, uchar c, int previous); + static inline unsigned Encode(char* out, + uchar c, + int previous, + bool replace_invalid = false); static const byte* ReadBlock(Buffer<const char*> str, byte* buffer, unsigned capacity, unsigned* chars_read, unsigned* offset); static uchar CalculateValue(const byte* str, unsigned length, unsigned* cursor); + + + // The unicode replacement character, used to signal invalid unicode + // sequences (e.g. an orphan surrogate) when converting to a UTF-8 encoding. static const uchar kBadChar = 0xFFFD; static const unsigned kMaxEncodedSize = 4; static const unsigned kMaxOneByteChar = 0x7f; @@ -170,6 +179,9 @@ // that match are coded as a 4 byte UTF-8 sequence. static const unsigned kBytesSavedByCombiningSurrogates = 2; static const unsigned kSizeOfUnmatchedSurrogate = 3; + // The maximum size a single UTF-16 code unit may take up when encoded as + // UTF-8. + static const unsigned kMax16BitCodeUnitSize = 3; private: template <unsigned s> friend class Utf8InputBuffer; diff -Nru nodejs-0.10.28/deps/v8/src/unicode-inl.h nodejs-0.10.29/deps/v8/src/unicode-inl.h --- nodejs-0.10.28/deps/v8/src/unicode-inl.h 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/v8/src/unicode-inl.h 2014-06-09 17:04:36.000000000 +0000 @@ -79,7 +79,10 @@ } -unsigned Utf8::Encode(char* str, uchar c, int previous) { +unsigned Utf8::Encode(char* str, + uchar c, + int previous, + bool replace_invalid) { static const int kMask = ~(1 << 6); if (c <= kMaxOneByteChar) { str[0] = c; @@ -89,12 +92,16 @@ str[1] = 0x80 | (c & kMask); return 2; } else if (c <= kMaxThreeByteChar) { - if (Utf16::IsTrailSurrogate(c) && - Utf16::IsLeadSurrogate(previous)) { + if (Utf16::IsSurrogatePair(previous, c)) { const int kUnmatchedSize = kSizeOfUnmatchedSurrogate; return Encode(str - kUnmatchedSize, Utf16::CombineSurrogatePair(previous, c), - Utf16::kNoPreviousCharacter) - kUnmatchedSize; + Utf16::kNoPreviousCharacter, + replace_invalid) - kUnmatchedSize; + } else if (replace_invalid && + (Utf16::IsLeadSurrogate(c) || + Utf16::IsTrailSurrogate(c))) { + c = kBadChar; } str[0] = 0xE0 | (c >> 12); str[1] = 0x80 | ((c >> 6) & kMask); diff -Nru nodejs-0.10.28/deps/v8/src/x64/code-stubs-x64.cc nodejs-0.10.29/deps/v8/src/x64/code-stubs-x64.cc --- nodejs-0.10.28/deps/v8/src/x64/code-stubs-x64.cc 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/deps/v8/src/x64/code-stubs-x64.cc 2014-06-09 17:04:36.000000000 +0000 @@ -5580,7 +5580,7 @@ __ subq(rdx, rax); __ j(no_overflow, &done, Label::kNear); // Correct sign of result in case of overflow. - __ SmiNot(rdx, rdx); + __ not_(rdx); __ bind(&done); __ movq(rax, rdx); } diff -Nru nodejs-0.10.28/doc/api/addons.html nodejs-0.10.29/doc/api/addons.html --- nodejs-0.10.28/doc/api/addons.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/addons.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ <html lang="en"> <head> <meta charset="utf-8"> - <title>Addons Node.js v0.10.28 Manual & Documentation + Addons Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@

-

Node.js v0.10.28 Manual & Documentation

+

Node.js v0.10.29 Manual & Documentation

Index | @@ -745,7 +745,7 @@

    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/all.html nodejs-0.10.29/doc/api/all.html --- nodejs-0.10.28/doc/api/all.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/all.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - About this Documentation Node.js v0.10.28 Manual & Documentation + About this Documentation Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -343,6 +343,7 @@

  • new stream.Transform([options])
  • transform._transform(chunk, encoding, callback)
  • transform._flush(callback)
    • +
  • Events: 'finish' and 'end'
  • Example: SimpleProtocol parser v2
    • @@ -5068,7 +5069,7 @@ console.log('got %d bytes of data', chunk.length); })

    Event: 'end'#

    -

    This event fires when no more data will be provided. +

    This event fires when there will be no more data to read.

    Note that the end event will not fire unless the data is @@ -6051,6 +6052,14 @@ your own extension classes.

    +

    Events: 'finish' and 'end'#

    +

    The finish and end events are from the parent Writable +and Readable classes respectively. The finish event is fired after +.end() is called and all chunks have been processed by _transform, +end is fired after all data has been output which is after the callback +in _flush has been called. + +

    Example: SimpleProtocol parser v2#

    The example above of a simple protocol parser can be implemented simply by using the higher level Transform stream class, similar to @@ -10723,6 +10732,9 @@

  • protocol: The request protocol, lowercased.

    Example: 'http:'

    • +

  • slashes: The protocol requires slashes after the colon

    +

    Example: true or false

    +

  • host: The full lowercased host portion of the URL, including port information.

    Example: 'host.com:8080'

    @@ -10785,6 +10797,11 @@ be postfixed with : (colon)
    • +
  • slashes set to true if the protocol requires :// (colon-slash-slash)
      +
    • Only needs to be set for protocols not previously listed as requiring +slashes, such as mongodb://localhost:8000/
      • +
    +
  • auth will be used if present.
  • hostname will only be used if host is absent.
  • port will only be used if host is absent.
    • @@ -11995,7 +12012,8 @@ of being received, most likely immediately.

    -

    Note that you can also call process.disconnect() in the child process. +

    Note that you can also call process.disconnect() in the child process when the +child process has any open IPC channels with the parent (i.e fork()).

    child_process.spawn(command, [args], [options])#

    @@ -13819,7 +13837,7 @@
    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/all.json nodejs-0.10.29/doc/api/all.json --- nodejs-0.10.28/doc/api/all.json 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/all.json 2014-06-09 17:13:22.000000000 +0000 @@ -4282,7 +4282,7 @@ "textRaw": "Event: 'end'", "type": "event", "name": "end", - "desc": "

    This event fires when no more data will be provided.\n\n

    \n

    Note that the end event will not fire unless the data is\ncompletely consumed. This can be done by switching into flowing mode,\nor by calling read() repeatedly until you get to the end.\n\n

    \n
    var readable = getReadableStreamSomehow();\nreadable.on('data', function(chunk) {\n  console.log('got %d bytes of data', chunk.length);\n})\nreadable.on('end', function() {\n  console.log('there will be no more data.');\n});
    \n", + "desc": "

    This event fires when there will be no more data to read.\n\n

    \n

    Note that the end event will not fire unless the data is\ncompletely consumed. This can be done by switching into flowing mode,\nor by calling read() repeatedly until you get to the end.\n\n

    \n
    var readable = getReadableStreamSomehow();\nreadable.on('data', function(chunk) {\n  console.log('got %d bytes of data', chunk.length);\n})\nreadable.on('end', function() {\n  console.log('there will be no more data.');\n});
    \n", "params": [] }, { @@ -4694,7 +4694,7 @@ "textRaw": "Event: 'end'", "type": "event", "name": "end", - "desc": "

    This event fires when no more data will be provided.\n\n

    \n

    Note that the end event will not fire unless the data is\ncompletely consumed. This can be done by switching into flowing mode,\nor by calling read() repeatedly until you get to the end.\n\n

    \n
    var readable = getReadableStreamSomehow();\nreadable.on('data', function(chunk) {\n  console.log('got %d bytes of data', chunk.length);\n})\nreadable.on('end', function() {\n  console.log('there will be no more data.');\n});
    \n", + "desc": "

    This event fires when there will be no more data to read.\n\n

    \n

    Note that the end event will not fire unless the data is\ncompletely consumed. This can be done by switching into flowing mode,\nor by calling read() repeatedly until you get to the end.\n\n

    \n
    var readable = getReadableStreamSomehow();\nreadable.on('data', function(chunk) {\n  console.log('got %d bytes of data', chunk.length);\n})\nreadable.on('end', function() {\n  console.log('there will be no more data.');\n});
    \n", "params": [] }, { @@ -5442,7 +5442,16 @@ ] } ], - "desc": "

    Note: This function MUST NOT be called directly. It MAY be implemented\nby child classes, and if so, will be called by the internal Transform\nclass methods only.\n\n

    \n

    In some cases, your transform operation may need to emit a bit more\ndata at the end of the stream. For example, a Zlib compression\nstream will store up some internal state so that it can optimally\ncompress the output. At the end, however, it needs to do the best it\ncan with what is left, so that the data will be complete.\n\n

    \n

    In those cases, you can implement a _flush method, which will be\ncalled at the very end, after all the written data is consumed, but\nbefore emitting end to signal the end of the readable side. Just\nlike with _transform, call transform.push(chunk) zero or more\ntimes, as appropriate, and call callback when the flush operation is\ncomplete.\n\n

    \n

    This method is prefixed with an underscore because it is internal to\nthe class that defines it, and should not be called directly by user\nprograms. However, you are expected to override this method in\nyour own extension classes.\n\n

    \n

    Example: SimpleProtocol parser v2

    \n

    The example above of a simple protocol parser can be implemented\nsimply by using the higher level [Transform][] stream class, similar to\nthe parseHeader and SimpleProtocol v1 examples above.\n\n

    \n

    In this example, rather than providing the input as an argument, it\nwould be piped into the parser, which is a more idiomatic Node stream\napproach.\n\n

    \n
    var util = require('util');\nvar Transform = require('stream').Transform;\nutil.inherits(SimpleProtocol, Transform);\n\nfunction SimpleProtocol(options) {\n  if (!(this instanceof SimpleProtocol))\n    return new SimpleProtocol(options);\n\n  Transform.call(this, options);\n  this._inBody = false;\n  this._sawFirstCr = false;\n  this._rawHeader = [];\n  this.header = null;\n}\n\nSimpleProtocol.prototype._transform = function(chunk, encoding, done) {\n  if (!this._inBody) {\n    // check if the chunk has a \\n\\n\n    var split = -1;\n    for (var i = 0; i < chunk.length; i++) {\n      if (chunk[i] === 10) { // '\\n'\n        if (this._sawFirstCr) {\n          split = i;\n          break;\n        } else {\n          this._sawFirstCr = true;\n        }\n      } else {\n        this._sawFirstCr = false;\n      }\n    }\n\n    if (split === -1) {\n      // still waiting for the \\n\\n\n      // stash the chunk, and try again.\n      this._rawHeader.push(chunk);\n    } else {\n      this._inBody = true;\n      var h = chunk.slice(0, split);\n      this._rawHeader.push(h);\n      var header = Buffer.concat(this._rawHeader).toString();\n      try {\n        this.header = JSON.parse(header);\n      } catch (er) {\n        this.emit('error', new Error('invalid simple protocol data'));\n        return;\n      }\n      // and let them know that we are done parsing the header.\n      this.emit('header', this.header);\n\n      // now, because we got some extra data, emit this first.\n      this.push(chunk.slice(split));\n    }\n  } else {\n    // from there on, just provide the data to our consumer as-is.\n    this.push(chunk);\n  }\n  done();\n};\n\n// Usage:\n// var parser = new SimpleProtocol();\n// source.pipe(parser)\n// Now parser is a readable stream that will emit 'header'\n// with the parsed header data.
    \n" + "desc": "

    Note: This function MUST NOT be called directly. It MAY be implemented\nby child classes, and if so, will be called by the internal Transform\nclass methods only.\n\n

    \n

    In some cases, your transform operation may need to emit a bit more\ndata at the end of the stream. For example, a Zlib compression\nstream will store up some internal state so that it can optimally\ncompress the output. At the end, however, it needs to do the best it\ncan with what is left, so that the data will be complete.\n\n

    \n

    In those cases, you can implement a _flush method, which will be\ncalled at the very end, after all the written data is consumed, but\nbefore emitting end to signal the end of the readable side. Just\nlike with _transform, call transform.push(chunk) zero or more\ntimes, as appropriate, and call callback when the flush operation is\ncomplete.\n\n

    \n

    This method is prefixed with an underscore because it is internal to\nthe class that defines it, and should not be called directly by user\nprograms. However, you are expected to override this method in\nyour own extension classes.\n\n

    \n" + } + ], + "modules": [ + { + "textRaw": "Events: 'finish' and 'end'", + "name": "events:_'finish'_and_'end'", + "desc": "

    The [finish][] and [end][] events are from the parent Writable\nand Readable classes respectively. The finish event is fired after\n.end() is called and all chunks have been processed by _transform,\nend is fired after all data has been output which is after the callback\nin _flush has been called.\n\n

    \n

    Example: SimpleProtocol parser v2

    \n

    The example above of a simple protocol parser can be implemented\nsimply by using the higher level [Transform][] stream class, similar to\nthe parseHeader and SimpleProtocol v1 examples above.\n\n

    \n

    In this example, rather than providing the input as an argument, it\nwould be piped into the parser, which is a more idiomatic Node stream\napproach.\n\n

    \n
    var util = require('util');\nvar Transform = require('stream').Transform;\nutil.inherits(SimpleProtocol, Transform);\n\nfunction SimpleProtocol(options) {\n  if (!(this instanceof SimpleProtocol))\n    return new SimpleProtocol(options);\n\n  Transform.call(this, options);\n  this._inBody = false;\n  this._sawFirstCr = false;\n  this._rawHeader = [];\n  this.header = null;\n}\n\nSimpleProtocol.prototype._transform = function(chunk, encoding, done) {\n  if (!this._inBody) {\n    // check if the chunk has a \\n\\n\n    var split = -1;\n    for (var i = 0; i < chunk.length; i++) {\n      if (chunk[i] === 10) { // '\\n'\n        if (this._sawFirstCr) {\n          split = i;\n          break;\n        } else {\n          this._sawFirstCr = true;\n        }\n      } else {\n        this._sawFirstCr = false;\n      }\n    }\n\n    if (split === -1) {\n      // still waiting for the \\n\\n\n      // stash the chunk, and try again.\n      this._rawHeader.push(chunk);\n    } else {\n      this._inBody = true;\n      var h = chunk.slice(0, split);\n      this._rawHeader.push(h);\n      var header = Buffer.concat(this._rawHeader).toString();\n      try {\n        this.header = JSON.parse(header);\n      } catch (er) {\n        this.emit('error', new Error('invalid simple protocol data'));\n        return;\n      }\n      // and let them know that we are done parsing the header.\n      this.emit('header', this.header);\n\n      // now, because we got some extra data, emit this first.\n      this.push(chunk.slice(split));\n    }\n  } else {\n    // from there on, just provide the data to our consumer as-is.\n    this.push(chunk);\n  }\n  done();\n};\n\n// Usage:\n// var parser = new SimpleProtocol();\n// source.pipe(parser)\n// Now parser is a readable stream that will emit 'header'\n// with the parsed header data.
    \n", + "type": "module", + "displayName": "Events: 'finish' and 'end'" } ] }, @@ -10918,7 +10927,7 @@ "name": "url", "stability": 3, "stabilityText": "Stable", - "desc": "

    This module has utilities for URL resolution and parsing.\nCall require('url') to use it.\n\n

    \n

    Parsed URL objects have some or all of the following fields, depending on\nwhether or not they exist in the URL string. Any parts that are not in the URL\nstring will not be in the parsed object. Examples are shown for the URL\n\n

    \n

    'http://user:pass@host.com:8080/p/a/t/h?query=string#hash'\n\n

    \n
      \n

    • href: The full URL that was originally parsed. Both the protocol and host are lowercased.

      \n

      Example: 'http://user:pass@host.com:8080/p/a/t/h?query=string#hash'

      \n
      • \n

    • protocol: The request protocol, lowercased.

      \n

      Example: 'http:'

      \n
      • \n

    • host: The full lowercased host portion of the URL, including port\ninformation.

      \n

      Example: 'host.com:8080'

      \n
      • \n

    • auth: The authentication information portion of a URL.

      \n

      Example: 'user:pass'

      \n
      • \n

    • hostname: Just the lowercased hostname portion of the host.

      \n

      Example: 'host.com'

      \n
      • \n

    • port: The port number portion of the host.

      \n

      Example: '8080'

      \n
      • \n

    • pathname: The path section of the URL, that comes after the host and\nbefore the query, including the initial slash if present.

      \n

      Example: '/p/a/t/h'

      \n
      • \n

    • search: The 'query string' portion of the URL, including the leading\nquestion mark.

      \n

      Example: '?query=string'

      \n
      • \n

    • path: Concatenation of pathname and search.

      \n

      Example: '/p/a/t/h?query=string'

      \n
      • \n

    • query: Either the 'params' portion of the query string, or a\nquerystring-parsed object.

      \n

      Example: 'query=string' or {'query':'string'}

      \n
      • \n

    • hash: The 'fragment' portion of the URL including the pound-sign.

      \n

      Example: '#hash'

      \n
      • \n
    \n

    The following methods are provided by the URL module:\n\n

    \n", + "desc": "

    This module has utilities for URL resolution and parsing.\nCall require('url') to use it.\n\n

    \n

    Parsed URL objects have some or all of the following fields, depending on\nwhether or not they exist in the URL string. Any parts that are not in the URL\nstring will not be in the parsed object. Examples are shown for the URL\n\n

    \n

    'http://user:pass@host.com:8080/p/a/t/h?query=string#hash'\n\n

    \n
      \n

    • href: The full URL that was originally parsed. Both the protocol and host are lowercased.

      \n

      Example: 'http://user:pass@host.com:8080/p/a/t/h?query=string#hash'

      \n
      • \n

    • protocol: The request protocol, lowercased.

      \n

      Example: 'http:'

      \n
      • \n

    • slashes: The protocol requires slashes after the colon

      \n

      Example: true or false

      \n
      • \n

    • host: The full lowercased host portion of the URL, including port\ninformation.

      \n

      Example: 'host.com:8080'

      \n
      • \n

    • auth: The authentication information portion of a URL.

      \n

      Example: 'user:pass'

      \n
      • \n

    • hostname: Just the lowercased hostname portion of the host.

      \n

      Example: 'host.com'

      \n
      • \n

    • port: The port number portion of the host.

      \n

      Example: '8080'

      \n
      • \n

    • pathname: The path section of the URL, that comes after the host and\nbefore the query, including the initial slash if present.

      \n

      Example: '/p/a/t/h'

      \n
      • \n

    • search: The 'query string' portion of the URL, including the leading\nquestion mark.

      \n

      Example: '?query=string'

      \n
      • \n

    • path: Concatenation of pathname and search.

      \n

      Example: '/p/a/t/h?query=string'

      \n
      • \n

    • query: Either the 'params' portion of the query string, or a\nquerystring-parsed object.

      \n

      Example: 'query=string' or {'query':'string'}

      \n
      • \n

    • hash: The 'fragment' portion of the URL including the pound-sign.

      \n

      Example: '#hash'

      \n
      • \n
    \n

    The following methods are provided by the URL module:\n\n

    \n", "methods": [ { "textRaw": "url.parse(urlStr, [parseQueryString], [slashesDenoteHost])", @@ -10947,7 +10956,7 @@ "textRaw": "url.format(urlObj)", "type": "method", "name": "format", - "desc": "

    Take a parsed URL object, and return a formatted URL string.\n\n

    \n
      \n
    • href will be ignored.
      • \n
    • protocol is treated the same with or without the trailing : (colon).
        \n
      • The protocols http, https, ftp, gopher, file will be\npostfixed with :// (colon-slash-slash).
        • \n
      • All other protocols mailto, xmpp, aim, sftp, foo, etc will\nbe postfixed with : (colon)
        • \n
      \n
      • \n
    • auth will be used if present.
      • \n
    • hostname will only be used if host is absent.
      • \n
    • port will only be used if host is absent.
      • \n
    • host will be used in place of hostname and port
      • \n
    • pathname is treated the same with or without the leading / (slash)
      • \n
    • search will be used in place of query
      • \n
    • query (object; see querystring) will only be used if search is absent.
      • \n
    • search is treated the same with or without the leading ? (question mark)
      • \n
    • hash is treated the same with or without the leading # (pound sign, anchor)
      • \n
    \n", + "desc": "

    Take a parsed URL object, and return a formatted URL string.\n\n

    \n
      \n
    • href will be ignored.
      • \n
    • protocol is treated the same with or without the trailing : (colon).
        \n
      • The protocols http, https, ftp, gopher, file will be\npostfixed with :// (colon-slash-slash).
        • \n
      • All other protocols mailto, xmpp, aim, sftp, foo, etc will\nbe postfixed with : (colon)
        • \n
      \n
      • \n
    • slashes set to true if the protocol requires :// (colon-slash-slash)
        \n
      • Only needs to be set for protocols not previously listed as requiring\nslashes, such as mongodb://localhost:8000/
        • \n
      \n
      • \n
    • auth will be used if present.
      • \n
    • hostname will only be used if host is absent.
      • \n
    • port will only be used if host is absent.
      • \n
    • host will be used in place of hostname and port
      • \n
    • pathname is treated the same with or without the leading / (slash)
      • \n
    • search will be used in place of query
      • \n
    • query (object; see querystring) will only be used if search is absent.
      • \n
    • search is treated the same with or without the leading ? (question mark)
      • \n
    • hash is treated the same with or without the leading # (pound sign, anchor)
      • \n
    \n", "signatures": [ { "params": [ @@ -11780,7 +11789,7 @@ "textRaw": "child.disconnect()", "type": "method", "name": "disconnect", - "desc": "

    Close the IPC channel between parent and child, allowing the child to exit\ngracefully once there are no other connections keeping it alive. After calling\nthis method the .connected flag will be set to false in both the parent and\nchild, and it is no longer possible to send messages.\n\n

    \n

    The 'disconnect' event will be emitted when there are no messages in the process\nof being received, most likely immediately.\n\n

    \n

    Note that you can also call process.disconnect() in the child process.\n\n

    \n", + "desc": "

    Close the IPC channel between parent and child, allowing the child to exit\ngracefully once there are no other connections keeping it alive. After calling\nthis method the .connected flag will be set to false in both the parent and\nchild, and it is no longer possible to send messages.\n\n

    \n

    The 'disconnect' event will be emitted when there are no messages in the process\nof being received, most likely immediately.\n\n

    \n

    Note that you can also call process.disconnect() in the child process when the\nchild process has any open IPC channels with the parent (i.e fork()).\n\n

    \n", "signatures": [ { "params": [] diff -Nru nodejs-0.10.28/doc/api/assert.html nodejs-0.10.29/doc/api/assert.html --- nodejs-0.10.28/doc/api/assert.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/assert.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - Assert Node.js v0.10.28 Manual & Documentation + Assert Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -165,7 +165,7 @@

    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/buffer.html nodejs-0.10.29/doc/api/buffer.html --- nodejs-0.10.28/doc/api/buffer.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/buffer.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - Buffer Node.js v0.10.28 Manual & Documentation + Buffer Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -892,7 +892,7 @@

    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/child_process.html nodejs-0.10.29/doc/api/child_process.html --- nodejs-0.10.28/doc/api/child_process.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/child_process.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - Child Process Node.js v0.10.28 Manual & Documentation + Child Process Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -400,7 +400,8 @@ of being received, most likely immediately.

    -

    Note that you can also call process.disconnect() in the child process. +

    Note that you can also call process.disconnect() in the child process when the +child process has any open IPC channels with the parent (i.e fork()).

    child_process.spawn(command, [args], [options])#

    @@ -743,7 +744,7 @@
    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/child_process.json nodejs-0.10.29/doc/api/child_process.json --- nodejs-0.10.28/doc/api/child_process.json 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/child_process.json 2014-06-09 17:13:22.000000000 +0000 @@ -143,7 +143,7 @@ "textRaw": "child.disconnect()", "type": "method", "name": "disconnect", - "desc": "

    Close the IPC channel between parent and child, allowing the child to exit\ngracefully once there are no other connections keeping it alive. After calling\nthis method the .connected flag will be set to false in both the parent and\nchild, and it is no longer possible to send messages.\n\n

    \n

    The 'disconnect' event will be emitted when there are no messages in the process\nof being received, most likely immediately.\n\n

    \n

    Note that you can also call process.disconnect() in the child process.\n\n

    \n", + "desc": "

    Close the IPC channel between parent and child, allowing the child to exit\ngracefully once there are no other connections keeping it alive. After calling\nthis method the .connected flag will be set to false in both the parent and\nchild, and it is no longer possible to send messages.\n\n

    \n

    The 'disconnect' event will be emitted when there are no messages in the process\nof being received, most likely immediately.\n\n

    \n

    Note that you can also call process.disconnect() in the child process when the\nchild process has any open IPC channels with the parent (i.e fork()).\n\n

    \n", "signatures": [ { "params": [] diff -Nru nodejs-0.10.28/doc/api/child_process.markdown nodejs-0.10.29/doc/api/child_process.markdown --- nodejs-0.10.28/doc/api/child_process.markdown 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/doc/api/child_process.markdown 2014-06-09 17:04:36.000000000 +0000 @@ -290,7 +290,8 @@ The 'disconnect' event will be emitted when there are no messages in the process of being received, most likely immediately. -Note that you can also call `process.disconnect()` in the child process. +Note that you can also call `process.disconnect()` in the child process when the +child process has any open IPC channels with the parent (i.e `fork()`). ## child_process.spawn(command, [args], [options]) diff -Nru nodejs-0.10.28/doc/api/cluster.html nodejs-0.10.29/doc/api/cluster.html --- nodejs-0.10.28/doc/api/cluster.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/cluster.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - Cluster Node.js v0.10.28 Manual & Documentation + Cluster Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -730,7 +730,7 @@

    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/console.html nodejs-0.10.29/doc/api/console.html --- nodejs-0.10.28/doc/api/console.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/console.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - console Node.js v0.10.28 Manual & Documentation + console Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -154,7 +154,7 @@

    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/crypto.html nodejs-0.10.29/doc/api/crypto.html --- nodejs-0.10.28/doc/api/crypto.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/crypto.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - Crypto Node.js v0.10.28 Manual & Documentation + Crypto Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -702,7 +702,7 @@

    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/debugger.html nodejs-0.10.29/doc/api/debugger.html --- nodejs-0.10.28/doc/api/debugger.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/debugger.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - Debugger Node.js v0.10.28 Manual & Documentation + Debugger Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -252,7 +252,7 @@

    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/dgram.html nodejs-0.10.29/doc/api/dgram.html --- nodejs-0.10.28/doc/api/dgram.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/dgram.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - UDP / Datagram Sockets Node.js v0.10.28 Manual & Documentation + UDP / Datagram Sockets Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -371,7 +371,7 @@

    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/dns.html nodejs-0.10.29/doc/api/dns.html --- nodejs-0.10.28/doc/api/dns.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/dns.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - DNS Node.js v0.10.28 Manual & Documentation + DNS Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -237,7 +237,7 @@

    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/documentation.html nodejs-0.10.29/doc/api/documentation.html --- nodejs-0.10.28/doc/api/documentation.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/documentation.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - About this Documentation Node.js v0.10.28 Manual & Documentation + About this Documentation Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -135,7 +135,7 @@

    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/domain.html nodejs-0.10.29/doc/api/domain.html --- nodejs-0.10.28/doc/api/domain.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/domain.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - Domain Node.js v0.10.28 Manual & Documentation + Domain Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -552,7 +552,7 @@

    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/events.html nodejs-0.10.29/doc/api/events.html --- nodejs-0.10.28/doc/api/events.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/events.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - Events Node.js v0.10.28 Manual & Documentation + Events Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -213,7 +213,7 @@

    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/fs.html nodejs-0.10.29/doc/api/fs.html --- nodejs-0.10.28/doc/api/fs.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/fs.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - File System Node.js v0.10.28 Manual & Documentation + File System Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -943,7 +943,7 @@

    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/globals.html nodejs-0.10.29/doc/api/globals.html --- nodejs-0.10.28/doc/api/globals.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/globals.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - Global Objects Node.js v0.10.28 Manual & Documentation + Global Objects Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -296,7 +296,7 @@

    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/http.html nodejs-0.10.29/doc/api/http.html --- nodejs-0.10.28/doc/api/http.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/http.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - HTTP Node.js v0.10.28 Manual & Documentation + HTTP Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -1108,7 +1108,7 @@

    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/https.html nodejs-0.10.29/doc/api/https.html --- nodejs-0.10.28/doc/api/https.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/https.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - HTTPS Node.js v0.10.28 Manual & Documentation + HTTPS Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -293,7 +293,7 @@

    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/index.html nodejs-0.10.29/doc/api/index.html --- nodejs-0.10.28/doc/api/index.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/index.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - Node.js v0.10.28 Manual & Documentation + Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -105,7 +105,7 @@

    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/modules.html nodejs-0.10.29/doc/api/modules.html --- nodejs-0.10.28/doc/api/modules.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/modules.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - Modules Node.js v0.10.28 Manual & Documentation + Modules Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -651,7 +651,7 @@

    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/net.html nodejs-0.10.29/doc/api/net.html --- nodejs-0.10.28/doc/api/net.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/net.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - net Node.js v0.10.28 Manual & Documentation + net Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -697,7 +697,7 @@

    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/os.html nodejs-0.10.29/doc/api/os.html --- nodejs-0.10.28/doc/api/os.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/os.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - os Node.js v0.10.28 Manual & Documentation + os Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -238,7 +238,7 @@

    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/path.html nodejs-0.10.29/doc/api/path.html --- nodejs-0.10.28/doc/api/path.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/path.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - Path Node.js v0.10.28 Manual & Documentation + Path Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -268,7 +268,7 @@

    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/process.html nodejs-0.10.29/doc/api/process.html --- nodejs-0.10.28/doc/api/process.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/process.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - process Node.js v0.10.28 Manual & Documentation + process Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -771,7 +771,7 @@

    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/punycode.html nodejs-0.10.29/doc/api/punycode.html --- nodejs-0.10.28/doc/api/punycode.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/punycode.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - punycode Node.js v0.10.28 Manual & Documentation + punycode Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -143,7 +143,7 @@

    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/querystring.html nodejs-0.10.29/doc/api/querystring.html --- nodejs-0.10.28/doc/api/querystring.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/querystring.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - Query String Node.js v0.10.28 Manual & Documentation + Query String Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -124,7 +124,7 @@

    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/readline.html nodejs-0.10.29/doc/api/readline.html --- nodejs-0.10.28/doc/api/readline.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/readline.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - Readline Node.js v0.10.28 Manual & Documentation + Readline Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -422,7 +422,7 @@

    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/repl.html nodejs-0.10.29/doc/api/repl.html --- nodejs-0.10.28/doc/api/repl.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/repl.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - REPL Node.js v0.10.28 Manual & Documentation + REPL Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -280,7 +280,7 @@

    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/stream.html nodejs-0.10.29/doc/api/stream.html --- nodejs-0.10.28/doc/api/stream.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/stream.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - Stream Node.js v0.10.28 Manual & Documentation + Stream Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -99,6 +99,7 @@

  • new stream.Transform([options])
  • transform._transform(chunk, encoding, callback)
  • transform._flush(callback)
    • +
  • Events: 'finish' and 'end'
  • Example: SimpleProtocol parser v2
    • @@ -287,7 +288,7 @@ console.log('got %d bytes of data', chunk.length); })

    Event: 'end'#

    -

    This event fires when no more data will be provided. +

    This event fires when there will be no more data to read.

    Note that the end event will not fire unless the data is @@ -1270,6 +1271,14 @@ your own extension classes.

    +

    Events: 'finish' and 'end'#

    +

    The finish and end events are from the parent Writable +and Readable classes respectively. The finish event is fired after +.end() is called and all chunks have been processed by _transform, +end is fired after all data has been output which is after the callback +in _flush has been called. + +

    Example: SimpleProtocol parser v2#

    The example above of a simple protocol parser can be implemented simply by using the higher level Transform stream class, similar to @@ -1619,7 +1628,7 @@

    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/stream.json nodejs-0.10.29/doc/api/stream.json --- nodejs-0.10.28/doc/api/stream.json 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/stream.json 2014-06-09 17:13:22.000000000 +0000 @@ -32,7 +32,7 @@ "textRaw": "Event: 'end'", "type": "event", "name": "end", - "desc": "

    This event fires when no more data will be provided.\n\n

    \n

    Note that the end event will not fire unless the data is\ncompletely consumed. This can be done by switching into flowing mode,\nor by calling read() repeatedly until you get to the end.\n\n

    \n
    var readable = getReadableStreamSomehow();\nreadable.on('data', function(chunk) {\n  console.log('got %d bytes of data', chunk.length);\n})\nreadable.on('end', function() {\n  console.log('there will be no more data.');\n});
    \n", + "desc": "

    This event fires when there will be no more data to read.\n\n

    \n

    Note that the end event will not fire unless the data is\ncompletely consumed. This can be done by switching into flowing mode,\nor by calling read() repeatedly until you get to the end.\n\n

    \n
    var readable = getReadableStreamSomehow();\nreadable.on('data', function(chunk) {\n  console.log('got %d bytes of data', chunk.length);\n})\nreadable.on('end', function() {\n  console.log('there will be no more data.');\n});
    \n", "params": [] }, { @@ -444,7 +444,7 @@ "textRaw": "Event: 'end'", "type": "event", "name": "end", - "desc": "

    This event fires when no more data will be provided.\n\n

    \n

    Note that the end event will not fire unless the data is\ncompletely consumed. This can be done by switching into flowing mode,\nor by calling read() repeatedly until you get to the end.\n\n

    \n
    var readable = getReadableStreamSomehow();\nreadable.on('data', function(chunk) {\n  console.log('got %d bytes of data', chunk.length);\n})\nreadable.on('end', function() {\n  console.log('there will be no more data.');\n});
    \n", + "desc": "

    This event fires when there will be no more data to read.\n\n

    \n

    Note that the end event will not fire unless the data is\ncompletely consumed. This can be done by switching into flowing mode,\nor by calling read() repeatedly until you get to the end.\n\n

    \n
    var readable = getReadableStreamSomehow();\nreadable.on('data', function(chunk) {\n  console.log('got %d bytes of data', chunk.length);\n})\nreadable.on('end', function() {\n  console.log('there will be no more data.');\n});
    \n", "params": [] }, { @@ -1192,7 +1192,16 @@ ] } ], - "desc": "

    Note: This function MUST NOT be called directly. It MAY be implemented\nby child classes, and if so, will be called by the internal Transform\nclass methods only.\n\n

    \n

    In some cases, your transform operation may need to emit a bit more\ndata at the end of the stream. For example, a Zlib compression\nstream will store up some internal state so that it can optimally\ncompress the output. At the end, however, it needs to do the best it\ncan with what is left, so that the data will be complete.\n\n

    \n

    In those cases, you can implement a _flush method, which will be\ncalled at the very end, after all the written data is consumed, but\nbefore emitting end to signal the end of the readable side. Just\nlike with _transform, call transform.push(chunk) zero or more\ntimes, as appropriate, and call callback when the flush operation is\ncomplete.\n\n

    \n

    This method is prefixed with an underscore because it is internal to\nthe class that defines it, and should not be called directly by user\nprograms. However, you are expected to override this method in\nyour own extension classes.\n\n

    \n

    Example: SimpleProtocol parser v2

    \n

    The example above of a simple protocol parser can be implemented\nsimply by using the higher level [Transform][] stream class, similar to\nthe parseHeader and SimpleProtocol v1 examples above.\n\n

    \n

    In this example, rather than providing the input as an argument, it\nwould be piped into the parser, which is a more idiomatic Node stream\napproach.\n\n

    \n
    var util = require('util');\nvar Transform = require('stream').Transform;\nutil.inherits(SimpleProtocol, Transform);\n\nfunction SimpleProtocol(options) {\n  if (!(this instanceof SimpleProtocol))\n    return new SimpleProtocol(options);\n\n  Transform.call(this, options);\n  this._inBody = false;\n  this._sawFirstCr = false;\n  this._rawHeader = [];\n  this.header = null;\n}\n\nSimpleProtocol.prototype._transform = function(chunk, encoding, done) {\n  if (!this._inBody) {\n    // check if the chunk has a \\n\\n\n    var split = -1;\n    for (var i = 0; i < chunk.length; i++) {\n      if (chunk[i] === 10) { // '\\n'\n        if (this._sawFirstCr) {\n          split = i;\n          break;\n        } else {\n          this._sawFirstCr = true;\n        }\n      } else {\n        this._sawFirstCr = false;\n      }\n    }\n\n    if (split === -1) {\n      // still waiting for the \\n\\n\n      // stash the chunk, and try again.\n      this._rawHeader.push(chunk);\n    } else {\n      this._inBody = true;\n      var h = chunk.slice(0, split);\n      this._rawHeader.push(h);\n      var header = Buffer.concat(this._rawHeader).toString();\n      try {\n        this.header = JSON.parse(header);\n      } catch (er) {\n        this.emit('error', new Error('invalid simple protocol data'));\n        return;\n      }\n      // and let them know that we are done parsing the header.\n      this.emit('header', this.header);\n\n      // now, because we got some extra data, emit this first.\n      this.push(chunk.slice(split));\n    }\n  } else {\n    // from there on, just provide the data to our consumer as-is.\n    this.push(chunk);\n  }\n  done();\n};\n\n// Usage:\n// var parser = new SimpleProtocol();\n// source.pipe(parser)\n// Now parser is a readable stream that will emit 'header'\n// with the parsed header data.
    \n" + "desc": "

    Note: This function MUST NOT be called directly. It MAY be implemented\nby child classes, and if so, will be called by the internal Transform\nclass methods only.\n\n

    \n

    In some cases, your transform operation may need to emit a bit more\ndata at the end of the stream. For example, a Zlib compression\nstream will store up some internal state so that it can optimally\ncompress the output. At the end, however, it needs to do the best it\ncan with what is left, so that the data will be complete.\n\n

    \n

    In those cases, you can implement a _flush method, which will be\ncalled at the very end, after all the written data is consumed, but\nbefore emitting end to signal the end of the readable side. Just\nlike with _transform, call transform.push(chunk) zero or more\ntimes, as appropriate, and call callback when the flush operation is\ncomplete.\n\n

    \n

    This method is prefixed with an underscore because it is internal to\nthe class that defines it, and should not be called directly by user\nprograms. However, you are expected to override this method in\nyour own extension classes.\n\n

    \n" + } + ], + "modules": [ + { + "textRaw": "Events: 'finish' and 'end'", + "name": "events:_'finish'_and_'end'", + "desc": "

    The [finish][] and [end][] events are from the parent Writable\nand Readable classes respectively. The finish event is fired after\n.end() is called and all chunks have been processed by _transform,\nend is fired after all data has been output which is after the callback\nin _flush has been called.\n\n

    \n

    Example: SimpleProtocol parser v2

    \n

    The example above of a simple protocol parser can be implemented\nsimply by using the higher level [Transform][] stream class, similar to\nthe parseHeader and SimpleProtocol v1 examples above.\n\n

    \n

    In this example, rather than providing the input as an argument, it\nwould be piped into the parser, which is a more idiomatic Node stream\napproach.\n\n

    \n
    var util = require('util');\nvar Transform = require('stream').Transform;\nutil.inherits(SimpleProtocol, Transform);\n\nfunction SimpleProtocol(options) {\n  if (!(this instanceof SimpleProtocol))\n    return new SimpleProtocol(options);\n\n  Transform.call(this, options);\n  this._inBody = false;\n  this._sawFirstCr = false;\n  this._rawHeader = [];\n  this.header = null;\n}\n\nSimpleProtocol.prototype._transform = function(chunk, encoding, done) {\n  if (!this._inBody) {\n    // check if the chunk has a \\n\\n\n    var split = -1;\n    for (var i = 0; i < chunk.length; i++) {\n      if (chunk[i] === 10) { // '\\n'\n        if (this._sawFirstCr) {\n          split = i;\n          break;\n        } else {\n          this._sawFirstCr = true;\n        }\n      } else {\n        this._sawFirstCr = false;\n      }\n    }\n\n    if (split === -1) {\n      // still waiting for the \\n\\n\n      // stash the chunk, and try again.\n      this._rawHeader.push(chunk);\n    } else {\n      this._inBody = true;\n      var h = chunk.slice(0, split);\n      this._rawHeader.push(h);\n      var header = Buffer.concat(this._rawHeader).toString();\n      try {\n        this.header = JSON.parse(header);\n      } catch (er) {\n        this.emit('error', new Error('invalid simple protocol data'));\n        return;\n      }\n      // and let them know that we are done parsing the header.\n      this.emit('header', this.header);\n\n      // now, because we got some extra data, emit this first.\n      this.push(chunk.slice(split));\n    }\n  } else {\n    // from there on, just provide the data to our consumer as-is.\n    this.push(chunk);\n  }\n  done();\n};\n\n// Usage:\n// var parser = new SimpleProtocol();\n// source.pipe(parser)\n// Now parser is a readable stream that will emit 'header'\n// with the parsed header data.
    \n", + "type": "module", + "displayName": "Events: 'finish' and 'end'" } ] }, diff -Nru nodejs-0.10.28/doc/api/stream.markdown nodejs-0.10.29/doc/api/stream.markdown --- nodejs-0.10.28/doc/api/stream.markdown 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/doc/api/stream.markdown 2014-06-09 17:04:36.000000000 +0000 @@ -160,7 +160,7 @@ #### Event: 'end' -This event fires when no more data will be provided. +This event fires when there will be no more data to read. Note that the `end` event **will not fire** unless the data is completely consumed. This can be done by switching into flowing mode, @@ -1121,6 +1121,14 @@ programs. However, you **are** expected to override this method in your own extension classes. +#### Events: 'finish' and 'end' + +The [`finish`][] and [`end`][] events are from the parent Writable +and Readable classes respectively. The `finish` event is fired after +`.end()` is called and all chunks have been processed by `_transform`, +`end` is fired after all data has been output which is after the callback +in `_flush` has been called. + #### Example: `SimpleProtocol` parser v2 The example above of a simple protocol parser can be implemented @@ -1464,6 +1472,8 @@ [Writable]: #stream_class_stream_writable [Duplex]: #stream_class_stream_duplex [Transform]: #stream_class_stream_transform +[`end`]: #stream_event_end +[`finish`]: #stream_event_finish [`_read(size)`]: #stream_readable_read_size_1 [`_read()`]: #stream_readable_read_size_1 [_read]: #stream_readable_read_size_1 diff -Nru nodejs-0.10.28/doc/api/string_decoder.html nodejs-0.10.29/doc/api/string_decoder.html --- nodejs-0.10.28/doc/api/string_decoder.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/string_decoder.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - StringDecoder Node.js v0.10.28 Manual & Documentation + StringDecoder Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -102,7 +102,7 @@

    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/synopsis.html nodejs-0.10.29/doc/api/synopsis.html --- nodejs-0.10.28/doc/api/synopsis.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/synopsis.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - Synopsis Node.js v0.10.28 Manual & Documentation + Synopsis Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -93,7 +93,7 @@

    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/timers.html nodejs-0.10.29/doc/api/timers.html --- nodejs-0.10.28/doc/api/timers.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/timers.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - Timers Node.js v0.10.28 Manual & Documentation + Timers Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -147,7 +147,7 @@

    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/tls.html nodejs-0.10.29/doc/api/tls.html --- nodejs-0.10.28/doc/api/tls.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/tls.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - TLS (SSL) Node.js v0.10.28 Manual & Documentation + TLS (SSL) Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -699,7 +699,7 @@

    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/_toc.html nodejs-0.10.29/doc/api/_toc.html --- nodejs-0.10.28/doc/api/_toc.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/_toc.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - Node.js v0.10.28 Manual & Documentation + Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -105,7 +105,7 @@

    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/tty.html nodejs-0.10.29/doc/api/tty.html --- nodejs-0.10.28/doc/api/tty.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/tty.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - TTY Node.js v0.10.28 Manual & Documentation + TTY Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -158,7 +158,7 @@

    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/url.html nodejs-0.10.29/doc/api/url.html --- nodejs-0.10.28/doc/api/url.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/url.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - URL Node.js v0.10.28 Manual & Documentation + URL Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -76,6 +76,9 @@

  • protocol: The request protocol, lowercased.

    Example: 'http:'

    • +

  • slashes: The protocol requires slashes after the colon

    +

    Example: true or false

    +

  • host: The full lowercased host portion of the URL, including port information.

    Example: 'host.com:8080'

    @@ -138,6 +141,11 @@ be postfixed with : (colon)
    • +
  • slashes set to true if the protocol requires :// (colon-slash-slash)
      +
    • Only needs to be set for protocols not previously listed as requiring +slashes, such as mongodb://localhost:8000/
      • +
    +
  • auth will be used if present.
  • hostname will only be used if host is absent.
  • port will only be used if host is absent.
    • @@ -175,7 +183,7 @@
    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/url.json nodejs-0.10.29/doc/api/url.json --- nodejs-0.10.28/doc/api/url.json 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/url.json 2014-06-09 17:13:22.000000000 +0000 @@ -6,7 +6,7 @@ "name": "url", "stability": 3, "stabilityText": "Stable", - "desc": "

    This module has utilities for URL resolution and parsing.\nCall require('url') to use it.\n\n

    \n

    Parsed URL objects have some or all of the following fields, depending on\nwhether or not they exist in the URL string. Any parts that are not in the URL\nstring will not be in the parsed object. Examples are shown for the URL\n\n

    \n

    'http://user:pass@host.com:8080/p/a/t/h?query=string#hash'\n\n

    \n
      \n

    • href: The full URL that was originally parsed. Both the protocol and host are lowercased.

      \n

      Example: 'http://user:pass@host.com:8080/p/a/t/h?query=string#hash'

      \n
      • \n

    • protocol: The request protocol, lowercased.

      \n

      Example: 'http:'

      \n
      • \n

    • host: The full lowercased host portion of the URL, including port\ninformation.

      \n

      Example: 'host.com:8080'

      \n
      • \n

    • auth: The authentication information portion of a URL.

      \n

      Example: 'user:pass'

      \n
      • \n

    • hostname: Just the lowercased hostname portion of the host.

      \n

      Example: 'host.com'

      \n
      • \n

    • port: The port number portion of the host.

      \n

      Example: '8080'

      \n
      • \n

    • pathname: The path section of the URL, that comes after the host and\nbefore the query, including the initial slash if present.

      \n

      Example: '/p/a/t/h'

      \n
      • \n

    • search: The 'query string' portion of the URL, including the leading\nquestion mark.

      \n

      Example: '?query=string'

      \n
      • \n

    • path: Concatenation of pathname and search.

      \n

      Example: '/p/a/t/h?query=string'

      \n
      • \n

    • query: Either the 'params' portion of the query string, or a\nquerystring-parsed object.

      \n

      Example: 'query=string' or {'query':'string'}

      \n
      • \n

    • hash: The 'fragment' portion of the URL including the pound-sign.

      \n

      Example: '#hash'

      \n
      • \n
    \n

    The following methods are provided by the URL module:\n\n

    \n", + "desc": "

    This module has utilities for URL resolution and parsing.\nCall require('url') to use it.\n\n

    \n

    Parsed URL objects have some or all of the following fields, depending on\nwhether or not they exist in the URL string. Any parts that are not in the URL\nstring will not be in the parsed object. Examples are shown for the URL\n\n

    \n

    'http://user:pass@host.com:8080/p/a/t/h?query=string#hash'\n\n

    \n
      \n

    • href: The full URL that was originally parsed. Both the protocol and host are lowercased.

      \n

      Example: 'http://user:pass@host.com:8080/p/a/t/h?query=string#hash'

      \n
      • \n

    • protocol: The request protocol, lowercased.

      \n

      Example: 'http:'

      \n
      • \n

    • slashes: The protocol requires slashes after the colon

      \n

      Example: true or false

      \n
      • \n

    • host: The full lowercased host portion of the URL, including port\ninformation.

      \n

      Example: 'host.com:8080'

      \n
      • \n

    • auth: The authentication information portion of a URL.

      \n

      Example: 'user:pass'

      \n
      • \n

    • hostname: Just the lowercased hostname portion of the host.

      \n

      Example: 'host.com'

      \n
      • \n

    • port: The port number portion of the host.

      \n

      Example: '8080'

      \n
      • \n

    • pathname: The path section of the URL, that comes after the host and\nbefore the query, including the initial slash if present.

      \n

      Example: '/p/a/t/h'

      \n
      • \n

    • search: The 'query string' portion of the URL, including the leading\nquestion mark.

      \n

      Example: '?query=string'

      \n
      • \n

    • path: Concatenation of pathname and search.

      \n

      Example: '/p/a/t/h?query=string'

      \n
      • \n

    • query: Either the 'params' portion of the query string, or a\nquerystring-parsed object.

      \n

      Example: 'query=string' or {'query':'string'}

      \n
      • \n

    • hash: The 'fragment' portion of the URL including the pound-sign.

      \n

      Example: '#hash'

      \n
      • \n
    \n

    The following methods are provided by the URL module:\n\n

    \n", "methods": [ { "textRaw": "url.parse(urlStr, [parseQueryString], [slashesDenoteHost])", @@ -35,7 +35,7 @@ "textRaw": "url.format(urlObj)", "type": "method", "name": "format", - "desc": "

    Take a parsed URL object, and return a formatted URL string.\n\n

    \n
      \n
    • href will be ignored.
      • \n
    • protocol is treated the same with or without the trailing : (colon).
        \n
      • The protocols http, https, ftp, gopher, file will be\npostfixed with :// (colon-slash-slash).
        • \n
      • All other protocols mailto, xmpp, aim, sftp, foo, etc will\nbe postfixed with : (colon)
        • \n
      \n
      • \n
    • auth will be used if present.
      • \n
    • hostname will only be used if host is absent.
      • \n
    • port will only be used if host is absent.
      • \n
    • host will be used in place of hostname and port
      • \n
    • pathname is treated the same with or without the leading / (slash)
      • \n
    • search will be used in place of query
      • \n
    • query (object; see querystring) will only be used if search is absent.
      • \n
    • search is treated the same with or without the leading ? (question mark)
      • \n
    • hash is treated the same with or without the leading # (pound sign, anchor)
      • \n
    \n", + "desc": "

    Take a parsed URL object, and return a formatted URL string.\n\n

    \n
      \n
    • href will be ignored.
      • \n
    • protocol is treated the same with or without the trailing : (colon).
        \n
      • The protocols http, https, ftp, gopher, file will be\npostfixed with :// (colon-slash-slash).
        • \n
      • All other protocols mailto, xmpp, aim, sftp, foo, etc will\nbe postfixed with : (colon)
        • \n
      \n
      • \n
    • slashes set to true if the protocol requires :// (colon-slash-slash)
        \n
      • Only needs to be set for protocols not previously listed as requiring\nslashes, such as mongodb://localhost:8000/
        • \n
      \n
      • \n
    • auth will be used if present.
      • \n
    • hostname will only be used if host is absent.
      • \n
    • port will only be used if host is absent.
      • \n
    • host will be used in place of hostname and port
      • \n
    • pathname is treated the same with or without the leading / (slash)
      • \n
    • search will be used in place of query
      • \n
    • query (object; see querystring) will only be used if search is absent.
      • \n
    • search is treated the same with or without the leading ? (question mark)
      • \n
    • hash is treated the same with or without the leading # (pound sign, anchor)
      • \n
    \n", "signatures": [ { "params": [ diff -Nru nodejs-0.10.28/doc/api/url.markdown nodejs-0.10.29/doc/api/url.markdown --- nodejs-0.10.28/doc/api/url.markdown 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/doc/api/url.markdown 2014-06-09 17:04:36.000000000 +0000 @@ -19,6 +19,10 @@ Example: `'http:'` +* `slashes`: The protocol requires slashes after the colon + + Example: true or false + * `host`: The full lowercased host portion of the URL, including port information. @@ -83,6 +87,9 @@ postfixed with `://` (colon-slash-slash). * All other protocols `mailto`, `xmpp`, `aim`, `sftp`, `foo`, etc will be postfixed with `:` (colon) +* `slashes` set to `true` if the protocol requires `://` (colon-slash-slash) + * Only needs to be set for protocols not previously listed as requiring + slashes, such as `mongodb://localhost:8000/` * `auth` will be used if present. * `hostname` will only be used if `host` is absent. * `port` will only be used if `host` is absent. diff -Nru nodejs-0.10.28/doc/api/util.html nodejs-0.10.29/doc/api/util.html --- nodejs-0.10.28/doc/api/util.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/util.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - util Node.js v0.10.28 Manual & Documentation + util Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -308,7 +308,7 @@

    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/vm.html nodejs-0.10.29/doc/api/vm.html --- nodejs-0.10.28/doc/api/vm.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/vm.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - Executing JavaScript Node.js v0.10.28 Manual & Documentation + Executing JavaScript Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -316,7 +316,7 @@

    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/doc/api/zlib.html nodejs-0.10.29/doc/api/zlib.html --- nodejs-0.10.28/doc/api/zlib.html 2014-05-02 00:53:58.000000000 +0000 +++ nodejs-0.10.29/doc/api/zlib.html 2014-06-09 17:13:22.000000000 +0000 @@ -2,7 +2,7 @@ - Zlib Node.js v0.10.28 Manual & Documentation + Zlib Node.js v0.10.29 Manual & Documentation @@ -31,7 +31,7 @@
    -

    Node.js v0.10.28 Manual & Documentation

    +

    Node.js v0.10.29 Manual & Documentation

    Index | @@ -476,7 +476,7 @@

    • -

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff -Nru nodejs-0.10.28/lib/child_process.js nodejs-0.10.29/lib/child_process.js --- nodejs-0.10.28/lib/child_process.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/lib/child_process.js 2014-06-09 17:04:36.000000000 +0000 @@ -710,6 +710,8 @@ if (Array.isArray(arguments[1])) { args = arguments[1].slice(0); options = arguments[2]; + } else if (arguments[1] && !Array.isArray(arguments[1])) { + throw new TypeError('Incorrect value of args option'); } else { args = []; options = arguments[1]; @@ -717,7 +719,7 @@ args.unshift(file); - var env = (options ? options.env : null) || process.env; + var env = (options && options.env ? options.env : null) || process.env; var envPairs = []; for (var key in env) { envPairs.push(key + '=' + env[key]); diff -Nru nodejs-0.10.28/lib/events.js nodejs-0.10.29/lib/events.js --- nodejs-0.10.28/lib/events.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/lib/events.js 2014-06-09 17:04:36.000000000 +0000 @@ -44,13 +44,13 @@ // Obviously not all Emitters should be limited to 10. This function allows // that to be increased. Set to zero for unlimited. var defaultMaxListeners = 10; -EventEmitter.prototype.setMaxListeners = function(n) { +EventEmitter.prototype.setMaxListeners = function setMaxListeners(n) { if (typeof n !== 'number' || n < 0 || isNaN(n)) throw TypeError('n must be a positive number'); this._maxListeners = n; }; -EventEmitter.prototype.emit = function(type) { +EventEmitter.prototype.emit = function emit(type) { var er, handler, len, args, i, listeners; if (!this._events) @@ -123,7 +123,7 @@ return true; }; -EventEmitter.prototype.addListener = function(type, listener) { +EventEmitter.prototype.addListener = function addListener(type, listener) { var m; if (typeof listener !== 'function') @@ -166,7 +166,7 @@ EventEmitter.prototype.on = EventEmitter.prototype.addListener; -EventEmitter.prototype.once = function(type, listener) { +EventEmitter.prototype.once = function once(type, listener) { if (typeof listener !== 'function') throw TypeError('listener must be a function'); @@ -188,7 +188,8 @@ }; // emits a 'removeListener' event iff the listener was removed -EventEmitter.prototype.removeListener = function(type, listener) { +EventEmitter.prototype.removeListener = + function removeListener(type, listener) { var list, position, length, i; if (typeof listener !== 'function') @@ -233,7 +234,8 @@ return this; }; -EventEmitter.prototype.removeAllListeners = function(type) { +EventEmitter.prototype.removeAllListeners = + function removeAllListeners(type) { var key, listeners; if (!this._events) @@ -273,7 +275,7 @@ return this; }; -EventEmitter.prototype.listeners = function(type) { +EventEmitter.prototype.listeners = function listeners(type) { var ret; if (!this._events || !this._events[type]) ret = []; diff -Nru nodejs-0.10.28/lib/fs.js nodejs-0.10.29/lib/fs.js --- nodejs-0.10.28/lib/fs.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/lib/fs.js 2014-06-09 17:04:36.000000000 +0000 @@ -208,7 +208,12 @@ fd = fd_; fs.fstat(fd, function(er, st) { - if (er) return callback(er); + if (er) { + return fs.close(fd, function() { + callback(er); + }); + } + size = st.size; if (size === 0) { // the kernel lies about many files. @@ -939,7 +944,7 @@ assertEncoding(options.encoding); var flag = options.flag || 'w'; - fs.open(path, options.flag || 'w', options.mode, function(openErr, fd) { + fs.open(path, flag, options.mode, function(openErr, fd) { if (openErr) { if (callback) callback(openErr); } else { diff -Nru nodejs-0.10.28/lib/http.js nodejs-0.10.29/lib/http.js --- nodejs-0.10.28/lib/http.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/lib/http.js 2014-06-09 17:04:36.000000000 +0000 @@ -2078,7 +2078,7 @@ // if the user never called req.read(), and didn't pipe() or // .resume() or .on('data'), then we call req._dump() so that the // bytes will be pulled off the wire. - if (!req._consuming) + if (!req._consuming && !req._readableState.oldMode) req._dump(); res.detachSocket(socket); diff -Nru nodejs-0.10.28/lib/_stream_readable.js nodejs-0.10.29/lib/_stream_readable.js --- nodejs-0.10.28/lib/_stream_readable.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/lib/_stream_readable.js 2014-06-09 17:04:36.000000000 +0000 @@ -87,6 +87,9 @@ // if true, a maybeReadMore has been scheduled this.readingMore = false; + // if true, stream is in old mode + this.oldMode = false; + this.decoder = null; this.encoding = null; if (options.encoding) { @@ -766,8 +769,15 @@ this.emit('resume'); }; - // now make it start, just in case it hadn't already. - stream.emit('readable'); + // Start reading in next tick to allow caller to set event listeners on + // the stream object (like 'error') + process.nextTick(function() { + // now make it start, just in case it hadn't already. + stream.emit('readable'); + }); + + // Let others know about our mode + state.oldMode = true; } // wrap an old-style stream as the async data source. diff -Nru nodejs-0.10.28/lib/string_decoder.js nodejs-0.10.29/lib/string_decoder.js --- nodejs-0.10.28/lib/string_decoder.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/lib/string_decoder.js 2014-06-09 17:04:36.000000000 +0000 @@ -25,6 +25,14 @@ } } +// StringDecoder provides an interface for efficiently splitting a series of +// buffers into a series of JS strings without breaking apart multi-byte +// characters. CESU-8 is handled as part of the UTF-8 encoding. +// +// @TODO Handling all encodings inside a single object makes it very difficult +// to reason about this code, so it should be split up in the future. +// @TODO There should be a utf8-strict encoding that rejects invalid UTF-8 code +// points as used by CESU-8. var StringDecoder = exports.StringDecoder = function(encoding) { this.encoding = (encoding || 'utf8').toLowerCase().replace(/[-_]/, ''); assertEncoding(encoding); @@ -49,37 +57,50 @@ return; } + // Enough space to store all bytes of a single character. UTF-8 needs 4 + // bytes, but CESU-8 may require up to 6 (3 bytes per surrogate). this.charBuffer = new Buffer(6); + // Number of bytes received for the current incomplete multi-byte character. this.charReceived = 0; + // Number of bytes expected for the current incomplete multi-byte character. this.charLength = 0; }; +// write decodes the given buffer and returns it as JS string that is +// guaranteed to not contain any partial multi-byte characters. Any partial +// character found at the end of the buffer is buffered up, and will be +// returned when calling write again with the remaining bytes. +// +// Note: Converting a Buffer containing an orphan surrogate to a String +// currently works, but converting a String to a Buffer (via `new Buffer`, or +// Buffer#write) will replace incomplete surrogates with the unicode +// replacement character. See https://codereview.chromium.org/121173009/ . StringDecoder.prototype.write = function(buffer) { var charStr = ''; - var offset = 0; - // if our last write ended with an incomplete multibyte character while (this.charLength) { // determine how many remaining bytes this buffer has to offer for this char - var i = (buffer.length >= this.charLength - this.charReceived) ? + var available = (buffer.length >= this.charLength - this.charReceived) ? this.charLength - this.charReceived : buffer.length; // add the new bytes to the char buffer - buffer.copy(this.charBuffer, this.charReceived, offset, i); - this.charReceived += (i - offset); - offset = i; + buffer.copy(this.charBuffer, this.charReceived, 0, available); + this.charReceived += available; if (this.charReceived < this.charLength) { // still not enough chars in this buffer? wait for more ... return ''; } + // remove bytes belonging to the current character from the buffer + buffer = buffer.slice(available, buffer.length); + // get the character that was split charStr = this.charBuffer.slice(0, this.charLength).toString(this.encoding); - // lead surrogate (D800-DBFF) is also the incomplete character + // CESU-8: lead surrogate (D800-DBFF) is also the incomplete character var charCode = charStr.charCodeAt(charStr.length - 1); if (charCode >= 0xD800 && charCode <= 0xDBFF) { this.charLength += this.surrogateSize; @@ -89,34 +110,33 @@ this.charReceived = this.charLength = 0; // if there are no more bytes in this buffer, just emit our char - if (i == buffer.length) return charStr; - - // otherwise cut off the characters end from the beginning of this buffer - buffer = buffer.slice(i, buffer.length); + if (buffer.length === 0) { + return charStr; + } break; } - var lenIncomplete = this.detectIncompleteChar(buffer); + // determine and set charLength / charReceived + this.detectIncompleteChar(buffer); var end = buffer.length; if (this.charLength) { // buffer the incomplete character bytes we got - buffer.copy(this.charBuffer, 0, buffer.length - lenIncomplete, end); - this.charReceived = lenIncomplete; - end -= lenIncomplete; + buffer.copy(this.charBuffer, 0, buffer.length - this.charReceived, end); + end -= this.charReceived; } charStr += buffer.toString(this.encoding, 0, end); var end = charStr.length - 1; var charCode = charStr.charCodeAt(end); - // lead surrogate (D800-DBFF) is also the incomplete character + // CESU-8: lead surrogate (D800-DBFF) is also the incomplete character if (charCode >= 0xD800 && charCode <= 0xDBFF) { var size = this.surrogateSize; this.charLength += size; this.charReceived += size; this.charBuffer.copy(this.charBuffer, size, 0, size); - this.charBuffer.write(charStr.charAt(charStr.length - 1), this.encoding); + buffer.copy(this.charBuffer, 0, 0, size); return charStr.substring(0, end); } @@ -124,6 +144,10 @@ return charStr; }; +// detectIncompleteChar determines if there is an incomplete UTF-8 character at +// the end of the given buffer. If so, it sets this.charLength to the byte +// length that character, and sets this.charReceived to the number of bytes +// that are available for this character. StringDecoder.prototype.detectIncompleteChar = function(buffer) { // determine how many bytes we have to check at the end of this buffer var i = (buffer.length >= 3) ? 3 : buffer.length; @@ -153,8 +177,7 @@ break; } } - - return i; + this.charReceived = i; }; StringDecoder.prototype.end = function(buffer) { @@ -177,13 +200,11 @@ } function utf16DetectIncompleteChar(buffer) { - var incomplete = this.charReceived = buffer.length % 2; - this.charLength = incomplete ? 2 : 0; - return incomplete; + this.charReceived = buffer.length % 2; + this.charLength = this.charReceived ? 2 : 0; } function base64DetectIncompleteChar(buffer) { - var incomplete = this.charReceived = buffer.length % 3; - this.charLength = incomplete ? 3 : 0; - return incomplete; + this.charReceived = buffer.length % 3; + this.charLength = this.charReceived ? 3 : 0; } diff -Nru nodejs-0.10.28/lib/tls.js nodejs-0.10.29/lib/tls.js --- nodejs-0.10.28/lib/tls.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/lib/tls.js 2014-06-09 17:04:36.000000000 +0000 @@ -510,16 +510,11 @@ if (this.ondata) { this.ondata(pool, start, start + bytesRead); - // Deceive streams2 - var self = this; + // Force state.reading to set to false + this.push(''); - setImmediate(function() { - // Force state.reading to set to false - self.push(''); - - // Try reading more, we most likely have some data - self.read(0); - }); + // Try reading more, we most likely have some data + this.read(0); } else { this.push(pool.slice(start, start + bytesRead)); } diff -Nru nodejs-0.10.28/src/cares_wrap.cc nodejs-0.10.29/src/cares_wrap.cc --- nodejs-0.10.28/src/cares_wrap.cc 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/src/cares_wrap.cc 2014-06-09 17:04:36.000000000 +0000 @@ -31,6 +31,8 @@ #include "tree.h" #include "uv.h" +#include "util.h" + #if defined(__OpenBSD__) || defined(__MINGW32__) || defined(_MSC_VER) # include #else @@ -739,7 +741,7 @@ // object reference, causing wrap->GetObject() to return undefined. Local object = Local::New(wrap->GetObject()); - String::Utf8Value name(args[0]); + node::Utf8Value name(args[0]); int r = wrap->Send(*name); if (r) { @@ -768,7 +770,7 @@ // object reference, causing wrap->GetObject() to return undefined. Local object = Local::New(wrap->GetObject()); - String::Utf8Value name(args[0]); + node::Utf8Value name(args[0]); int family = args[1]->Int32Value(); int r = wrap->Send(*name, family); @@ -898,7 +900,7 @@ static Handle GetAddrInfo(const Arguments& args) { HandleScope scope; - String::Utf8Value hostname(args[0]); + node::Utf8Value hostname(args[0]); int fam = AF_UNSPEC; if (args[1]->IsInt32()) { diff -Nru nodejs-0.10.28/src/fs_event_wrap.cc nodejs-0.10.29/src/fs_event_wrap.cc --- nodejs-0.10.28/src/fs_event_wrap.cc 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/src/fs_event_wrap.cc 2014-06-09 17:04:36.000000000 +0000 @@ -21,6 +21,7 @@ #include "node.h" #include "handle_wrap.h" +#include "util.h" #include @@ -97,7 +98,7 @@ return ThrowException(Exception::TypeError(String::New("Bad arguments"))); } - String::Utf8Value path(args[0]); + node::Utf8Value path(args[0]); int r = uv_fs_event_init(uv_default_loop(), &wrap->handle_, *path, OnEvent, 0); if (r == 0) { diff -Nru nodejs-0.10.28/src/node.cc nodejs-0.10.29/src/node.cc --- nodejs-0.10.28/src/node.cc 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/src/node.cc 2014-06-09 17:04:36.000000000 +0000 @@ -82,6 +82,8 @@ #include "node_script.h" #include "v8_typed_array.h" +#include "util.h" + using namespace v8; # ifdef __APPLE__ @@ -176,6 +178,8 @@ // Declared in node_internals.h Isolate* node_isolate = NULL; +int WRITE_UTF8_FLAGS = v8::String::HINT_MANY_WRITES_EXPECTED | + v8::String::NO_NULL_TERMINATION; static void Spin(uv_idle_t* handle, int status) { assert((uv_idle_t*) handle == &tick_spinner); @@ -1100,7 +1104,7 @@ if (!encoding_v->IsString()) return _default; - String::Utf8Value encoding(encoding_v); + node::Utf8Value encoding(encoding_v); if (strcasecmp(*encoding, "utf8") == 0) { return UTF8; @@ -1200,12 +1204,12 @@ if (!message.IsEmpty()) { // Print (filename):(line number): (message). - String::Utf8Value filename(message->GetScriptResourceName()); + node::Utf8Value filename(message->GetScriptResourceName()); const char* filename_string = *filename; int linenum = message->GetLineNumber(); fprintf(stderr, "%s:%i\n", filename_string, linenum); // Print line of source code. - String::Utf8Value sourceline(message->GetSourceLine()); + node::Utf8Value sourceline(message->GetSourceLine()); const char* sourceline_string = *sourceline; // Because of how node modules work, all scripts are wrapped with a @@ -1252,7 +1256,7 @@ if (show_line) DisplayExceptionLine(try_catch); - String::Utf8Value trace(try_catch.StackTrace()); + node::Utf8Value trace(try_catch.StackTrace()); // range errors have a trace member set to undefined if (trace.length() > 0 && !try_catch.StackTrace()->IsUndefined()) { @@ -1267,11 +1271,11 @@ !(er->ToObject()->Get(String::New("name"))->IsUndefined()); if (isErrorObject) { - String::Utf8Value name(er->ToObject()->Get(String::New("name"))); + node::Utf8Value name(er->ToObject()->Get(String::New("name"))); fprintf(stderr, "%s: ", *name); } - String::Utf8Value msg(!isErrorObject ? er + node::Utf8Value msg(!isErrorObject ? er : er->ToObject()->Get(String::New("message"))); fprintf(stderr, "%s\n", *msg); } @@ -1353,7 +1357,7 @@ return ThrowException(Exception::Error(String::New("Bad argument."))); } - String::Utf8Value path(args[0]); + node::Utf8Value path(args[0]); uv_err_t r = uv_chdir(*path); @@ -1404,7 +1408,7 @@ oct = args[0]->Uint32Value(); } else { oct = 0; - String::Utf8Value str(args[0]); + node::Utf8Value str(args[0]); // Parse the octal string. for (int i = 0; i < str.length(); i++) { @@ -1510,7 +1514,7 @@ if (value->IsUint32()) { return static_cast(value->Uint32Value()); } else { - String::Utf8Value name(value); + node::Utf8Value name(value); return uid_by_name(*name); } } @@ -1520,7 +1524,7 @@ if (value->IsUint32()) { return static_cast(value->Uint32Value()); } else { - String::Utf8Value name(value); + node::Utf8Value name(value); return gid_by_name(*name); } } @@ -1663,7 +1667,7 @@ return ThrowTypeError("argument 2 must be a number or a string"); } - String::Utf8Value arg0(args[0]); + node::Utf8Value arg0(args[0]); gid_t extra_group; bool must_free; char* user; @@ -1824,7 +1828,7 @@ } Local module = args[0]->ToObject(); // Cast - String::Utf8Value filename(args[1]); // Cast + node::Utf8Value filename(args[1]); // Cast if (exports_symbol.IsEmpty()) { exports_symbol = NODE_PSYMBOL("exports"); @@ -1840,7 +1844,7 @@ return ThrowException(Exception::Error(errmsg)); } - String::Utf8Value path(args[1]); + node::Utf8Value path(args[1]); base = *path; /* Find the shared library filename within the full path. */ @@ -1959,7 +1963,7 @@ HandleScope scope; Local module = args[0]->ToString(); - String::Utf8Value module_v(module); + node::Utf8Value module_v(module); node_module_struct* modp; if (binding_cache.IsEmpty()) { @@ -2018,7 +2022,7 @@ Local value, const AccessorInfo& info) { HandleScope scope; - String::Utf8Value title(value); + node::Utf8Value title(value); // TODO: protect with a lock uv_set_process_title(*title); } @@ -2028,7 +2032,7 @@ const AccessorInfo& info) { HandleScope scope; #ifdef __POSIX__ - String::Utf8Value key(property); + node::Utf8Value key(property); const char* val = getenv(*key); if (val) { return scope.Close(String::New(val)); @@ -2057,8 +2061,8 @@ const AccessorInfo& info) { HandleScope scope; #ifdef __POSIX__ - String::Utf8Value key(property); - String::Utf8Value val(value); + node::Utf8Value key(property); + node::Utf8Value val(value); setenv(*key, *val, 1); #else // _WIN32 String::Value key(property); @@ -2078,7 +2082,7 @@ const AccessorInfo& info) { HandleScope scope; #ifdef __POSIX__ - String::Utf8Value key(property); + node::Utf8Value key(property); if (getenv(*key)) { return scope.Close(Integer::New(0)); } @@ -2106,7 +2110,7 @@ const AccessorInfo& info) { HandleScope scope; #ifdef __POSIX__ - String::Utf8Value key(property); + node::Utf8Value key(property); if (!getenv(*key)) return False(); unsetenv(*key); // can't check return value, it's void on some platforms return True(); @@ -3042,6 +3046,11 @@ } int Start(int argc, char *argv[]) { + const char* replaceInvalid = getenv("NODE_INVALID_UTF8"); + + if (replaceInvalid == NULL) + WRITE_UTF8_FLAGS |= String::REPLACE_INVALID_UTF8; + // Hack aroung with the argv pointer. Used for process.title = "blah". argv = uv_setup_args(argc, argv); diff -Nru nodejs-0.10.28/src/node_constants.cc nodejs-0.10.29/src/node_constants.cc --- nodejs-0.10.28/src/node_constants.cc 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/src/node_constants.cc 2014-06-09 17:04:36.000000000 +0000 @@ -19,15 +19,24 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // USE OR OTHER DEALINGS IN THE SOFTWARE. +// O_NONBLOCK is not exported unless _XOPEN_SOURCE >= 500. +#if defined(_XOPEN_SOURCE) && _XOPEN_SOURCE < 500 +#undef _XOPEN_SOURCE +#endif + +#if !defined(_XOPEN_SOURCE) +#define _XOPEN_SOURCE 500 +#endif + #include "node_constants.h" #include "uv.h" #include +#include #if !defined(_MSC_VER) #include #endif -#include #include #include #include @@ -110,6 +119,10 @@ NODE_DEFINE_CONSTANT(target, O_DIRECT); #endif +#ifdef O_NONBLOCK + NODE_DEFINE_CONSTANT(target, O_NONBLOCK); +#endif + #ifdef S_IRWXU NODE_DEFINE_CONSTANT(target, S_IRWXU); #endif diff -Nru nodejs-0.10.28/src/node_crypto.cc nodejs-0.10.29/src/node_crypto.cc --- nodejs-0.10.28/src/node_crypto.cc 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/src/node_crypto.cc 2014-06-09 17:04:36.000000000 +0000 @@ -26,6 +26,7 @@ #include "node.h" #include "node_buffer.h" #include "string_bytes.h" +#include "util.h" #include #ifdef _MSC_VER @@ -241,7 +242,7 @@ OPENSSL_CONST SSL_METHOD *method = SSLv23_method(); if (args.Length() == 1 && args[0]->IsString()) { - String::Utf8Value sslmethod(args[0]); + node::Utf8Value sslmethod(args[0]); if (strcmp(*sslmethod, "SSLv2_method") == 0) { #ifndef OPENSSL_NO_SSL2 @@ -361,7 +362,7 @@ int r = -1; if (v->IsString()) { - String::Utf8Value s(v); + node::Utf8Value s(v); r = BIO_write(bio, *s, s.length()); } else if (Buffer::HasInstance(v)) { char* buffer_data = Buffer::Data(v); @@ -413,7 +414,7 @@ BIO *bio = LoadBIO(args[0]); if (!bio) return False(); - String::Utf8Value passphrase(args[1]); + node::Utf8Value passphrase(args[1]); EVP_PKEY* key = PEM_read_bio_PrivateKey(bio, NULL, NULL, len == 1 ? NULL : *passphrase); @@ -643,7 +644,7 @@ return ThrowException(Exception::TypeError(String::New("Bad parameter"))); } - String::Utf8Value ciphers(args[0]); + node::Utf8Value ciphers(args[0]); SSL_CTX_set_cipher_list(sc->ctx_, *ciphers); return True(); @@ -672,7 +673,7 @@ return ThrowException(Exception::TypeError(String::New("Bad parameter"))); } - String::Utf8Value sessionIdContext(args[0]); + node::Utf8Value sessionIdContext(args[0]); const unsigned char* sid_ctx = (const unsigned char*) *sessionIdContext; unsigned int sid_ctx_len = sessionIdContext.length(); @@ -784,12 +785,14 @@ size_t ClientHelloParser::Write(const uint8_t* data, size_t len) { HandleScope scope; + assert(state_ != kEnded); + // Just accumulate data, everything will be pushed to BIO later if (state_ == kPaused) return 0; // Copy incoming data to the internal buffer // (which has a size of the biggest possible TLS frame) - size_t available = sizeof(data_) - offset_; + size_t available = kBufferSize - offset_; size_t copied = len < available ? len : available; memcpy(data_ + offset_, data, copied); offset_ += copied; @@ -824,7 +827,7 @@ } // Sanity check (too big frame, or too small) - if (frame_len_ >= sizeof(data_)) { + if (frame_len_ >= kBufferSize) { // Let OpenSSL handle it Finish(); return copied; @@ -905,7 +908,6 @@ argv[0] = hello; MakeCallback(conn_->handle_, onclienthello_sym, 1, argv); break; - case kEnded: default: break; } @@ -922,6 +924,9 @@ int r = BIO_write(conn_->bio_read_, reinterpret_cast(data_), offset_); conn_->HandleBIOError(conn_->bio_read_, "BIO_write", r); conn_->SetShutdownFlags(); + + delete[] data_; + data_ = NULL; } @@ -1276,7 +1281,7 @@ if (is_server) { SSL_CTX_set_tlsext_servername_callback(sc->ctx_, SelectSNIContextCallback_); } else { - String::Utf8Value servername(args[2]); + node::Utf8Value servername(args[2]); SSL_set_tlsext_host_name(p->ssl_, *servername); } #endif @@ -2229,7 +2234,7 @@ ssize_t key_written = DecodeWrite(key_buf, key_buf_len, args[1], BINARY); assert(key_written == key_buf_len); - String::Utf8Value cipherType(args[0]); + node::Utf8Value cipherType(args[0]); bool r = cipher->CipherInit(*cipherType, key_buf, key_buf_len); @@ -2280,7 +2285,7 @@ ssize_t iv_written = DecodeWrite(iv_buf, iv_len, args[2], BINARY); assert(iv_written == iv_len); - String::Utf8Value cipherType(args[0]); + node::Utf8Value cipherType(args[0]); bool r = cipher->CipherInitIv(*cipherType, key_buf,key_len,iv_buf,iv_len); @@ -2539,7 +2544,7 @@ ssize_t key_written = DecodeWrite(key_buf, key_len, args[1], BINARY); assert(key_written == key_len); - String::Utf8Value cipherType(args[0]); + node::Utf8Value cipherType(args[0]); bool r = cipher->DecipherInit(*cipherType, key_buf,key_len); @@ -2590,7 +2595,7 @@ ssize_t iv_written = DecodeWrite(iv_buf, iv_len, args[2], BINARY); assert(iv_written == iv_len); - String::Utf8Value cipherType(args[0]); + node::Utf8Value cipherType(args[0]); bool r = cipher->DecipherInitIv(*cipherType, key_buf,key_len,iv_buf,iv_len); @@ -2771,7 +2776,7 @@ return ThrowException(exception); } - String::Utf8Value hashType(args[0]); + node::Utf8Value hashType(args[0]); bool r; @@ -2916,7 +2921,7 @@ "Must give hashtype string as argument"))); } - String::Utf8Value hashType(args[0]); + node::Utf8Value hashType(args[0]); Hash *hash = new Hash(); if (!hash->HashInit(*hashType)) { @@ -3090,7 +3095,7 @@ "Must give signtype string as argument"))); } - String::Utf8Value signType(args[0]); + node::Utf8Value signType(args[0]); bool r = sign->SignInit(*signType); @@ -3323,7 +3328,7 @@ "Must give verifytype string as argument"))); } - String::Utf8Value verifyType(args[0]); + node::Utf8Value verifyType(args[0]); bool r = verify->VerifyInit(*verifyType); @@ -3506,7 +3511,7 @@ String::New("No group name given"))); } - String::Utf8Value group_name(args[0]); + node::Utf8Value group_name(args[0]); modp_group* it = modp_groups; diff -Nru nodejs-0.10.28/src/node_crypto.h nodejs-0.10.29/src/node_crypto.h --- nodejs-0.10.28/src/node_crypto.h 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/src/node_crypto.h 2014-06-09 17:04:36.000000000 +0000 @@ -43,7 +43,6 @@ #define EVP_F_EVP_DECRYPTFINAL 101 - namespace node { namespace crypto { @@ -137,6 +136,16 @@ state_(kWaiting), offset_(0), body_offset_(0) { + data_ = new uint8_t[kBufferSize]; + if (!data_) + abort(); + } + + ~ClientHelloParser() { + if (data_) { + delete[] data_; + data_ = NULL; + } } size_t Write(const uint8_t* data, size_t len); @@ -145,11 +154,12 @@ inline bool ended() { return state_ == kEnded; } private: + static const int kBufferSize = 18432; Connection* conn_; ParseState state_; size_t frame_len_; - uint8_t data_[18432]; + uint8_t* data_; size_t offset_; size_t body_offset_; }; diff -Nru nodejs-0.10.28/src/node_dtrace.cc nodejs-0.10.29/src/node_dtrace.cc --- nodejs-0.10.28/src/node_dtrace.cc 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/src/node_dtrace.cc 2014-06-09 17:04:36.000000000 +0000 @@ -20,6 +20,8 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. +#include "util.h" + #ifdef HAVE_DTRACE #include "node_dtrace.h" #include @@ -66,7 +68,7 @@ return (ThrowException(Exception::Error(String::New("expected " \ "object for " #obj " to contain string member " #member)))); \ } \ - String::Utf8Value _##member(obj->Get(String::New(#member))); \ + node::Utf8Value _##member(obj->Get(String::New(#member))); \ if ((*(const char **)valp = *_##member) == NULL) \ *(const char **)valp = ""; @@ -241,7 +243,7 @@ "object for request to contain string member headers")))); Local strfwdfor = headers->Get(String::New("x-forwarded-for")); - String::Utf8Value fwdfor(strfwdfor); + node::Utf8Value fwdfor(strfwdfor); if (!strfwdfor->IsString() || (req.forwardedFor = *fwdfor) == NULL) req.forwardedFor = const_cast(""); diff -Nru nodejs-0.10.28/src/node_file.cc nodejs-0.10.29/src/node_file.cc --- nodejs-0.10.28/src/node_file.cc 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/src/node_file.cc 2014-06-09 17:04:36.000000000 +0000 @@ -24,6 +24,7 @@ #include "node_buffer.h" #include "node_stat_watcher.h" #include "req_wrap.h" +#include "util.h" #include #include @@ -403,7 +404,7 @@ if (args.Length() < 1) return TYPE_ERROR("path required"); if (!args[0]->IsString()) return TYPE_ERROR("path must be a string"); - String::Utf8Value path(args[0]); + node::Utf8Value path(args[0]); if (args[1]->IsFunction()) { ASYNC_CALL(stat, args[1], *path) @@ -420,7 +421,7 @@ if (args.Length() < 1) return TYPE_ERROR("path required"); if (!args[0]->IsString()) return TYPE_ERROR("path must be a string"); - String::Utf8Value path(args[0]); + node::Utf8Value path(args[0]); if (args[1]->IsFunction()) { ASYNC_CALL(lstat, args[1], *path) @@ -458,12 +459,12 @@ if (!args[0]->IsString()) return TYPE_ERROR("dest path must be a string"); if (!args[1]->IsString()) return TYPE_ERROR("src path must be a string"); - String::Utf8Value dest(args[0]); - String::Utf8Value path(args[1]); + node::Utf8Value dest(args[0]); + node::Utf8Value path(args[1]); int flags = 0; if (args[2]->IsString()) { - String::Utf8Value mode(args[2]); + node::Utf8Value mode(args[2]); if (strcmp(*mode, "dir") == 0) { flags |= UV_FS_SYMLINK_DIR; } else if (strcmp(*mode, "junction") == 0) { @@ -491,8 +492,8 @@ if (!args[0]->IsString()) return TYPE_ERROR("dest path must be a string"); if (!args[1]->IsString()) return TYPE_ERROR("src path must be a string"); - String::Utf8Value orig_path(args[0]); - String::Utf8Value new_path(args[1]); + node::Utf8Value orig_path(args[0]); + node::Utf8Value new_path(args[1]); if (args[2]->IsFunction()) { ASYNC_DEST_CALL(link, args[2], *new_path, *orig_path, *new_path) @@ -508,7 +509,7 @@ if (args.Length() < 1) return TYPE_ERROR("path required"); if (!args[0]->IsString()) return TYPE_ERROR("path must be a string"); - String::Utf8Value path(args[0]); + node::Utf8Value path(args[0]); if (args[1]->IsFunction()) { ASYNC_CALL(readlink, args[1], *path) @@ -527,8 +528,8 @@ if (!args[0]->IsString()) return TYPE_ERROR("old path must be a string"); if (!args[1]->IsString()) return TYPE_ERROR("new path must be a string"); - String::Utf8Value old_path(args[0]); - String::Utf8Value new_path(args[1]); + node::Utf8Value old_path(args[0]); + node::Utf8Value new_path(args[1]); if (args[2]->IsFunction()) { ASYNC_DEST_CALL(rename, args[2], *new_path, *old_path, *new_path) @@ -598,7 +599,7 @@ if (args.Length() < 1) return TYPE_ERROR("path required"); if (!args[0]->IsString()) return TYPE_ERROR("path must be a string"); - String::Utf8Value path(args[0]); + node::Utf8Value path(args[0]); if (args[1]->IsFunction()) { ASYNC_CALL(unlink, args[1], *path) @@ -614,7 +615,7 @@ if (args.Length() < 1) return TYPE_ERROR("path required"); if (!args[0]->IsString()) return TYPE_ERROR("path must be a string"); - String::Utf8Value path(args[0]); + node::Utf8Value path(args[0]); if (args[1]->IsFunction()) { ASYNC_CALL(rmdir, args[1], *path) @@ -631,7 +632,7 @@ return THROW_BAD_ARGS; } - String::Utf8Value path(args[0]); + node::Utf8Value path(args[0]); int mode = static_cast(args[1]->Int32Value()); if (args[2]->IsFunction()) { @@ -648,7 +649,7 @@ if (args.Length() < 1) return TYPE_ERROR("path required"); if (!args[0]->IsString()) return TYPE_ERROR("path must be a string"); - String::Utf8Value path(args[0]); + node::Utf8Value path(args[0]); if (args[1]->IsFunction()) { ASYNC_CALL(readdir, args[1], *path, 0 /*flags*/) @@ -686,7 +687,7 @@ if (!args[1]->IsInt32()) return TYPE_ERROR("flags must be an int"); if (!args[2]->IsInt32()) return TYPE_ERROR("mode must be an int"); - String::Utf8Value path(args[0]); + node::Utf8Value path(args[0]); int flags = args[1]->Int32Value(); int mode = static_cast(args[2]->Int32Value()); @@ -826,7 +827,7 @@ if(args.Length() < 2 || !args[0]->IsString() || !args[1]->IsInt32()) { return THROW_BAD_ARGS; } - String::Utf8Value path(args[0]); + node::Utf8Value path(args[0]); int mode = static_cast(args[1]->Int32Value()); if(args[2]->IsFunction()) { @@ -873,7 +874,7 @@ if (!args[1]->IsUint32()) return TYPE_ERROR("uid must be an unsigned int"); if (!args[2]->IsUint32()) return TYPE_ERROR("gid must be an unsigned int"); - String::Utf8Value path(args[0]); + node::Utf8Value path(args[0]); uv_uid_t uid = static_cast(args[1]->Uint32Value()); uv_gid_t gid = static_cast(args[2]->Uint32Value()); @@ -924,7 +925,7 @@ if (!args[1]->IsNumber()) return TYPE_ERROR("atime must be a number"); if (!args[2]->IsNumber()) return TYPE_ERROR("mtime must be a number"); - const String::Utf8Value path(args[0]); + const node::Utf8Value path(args[0]); const double atime = static_cast(args[1]->NumberValue()); const double mtime = static_cast(args[2]->NumberValue()); diff -Nru nodejs-0.10.28/src/node_stat_watcher.cc nodejs-0.10.29/src/node_stat_watcher.cc --- nodejs-0.10.28/src/node_stat_watcher.cc 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/src/node_stat_watcher.cc 2014-06-09 17:04:36.000000000 +0000 @@ -20,6 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. #include "node_stat_watcher.h" +#include "util.h" #include #include @@ -104,7 +105,7 @@ HandleScope scope; StatWatcher* wrap = ObjectWrap::Unwrap(args.Holder()); - String::Utf8Value path(args[0]); + node::Utf8Value path(args[0]); const bool persistent = args[1]->BooleanValue(); const uint32_t interval = args[2]->Uint32Value(); diff -Nru nodejs-0.10.28/src/node_version.h nodejs-0.10.29/src/node_version.h --- nodejs-0.10.28/src/node_version.h 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/src/node_version.h 2014-06-09 17:04:36.000000000 +0000 @@ -24,7 +24,7 @@ #define NODE_MAJOR_VERSION 0 #define NODE_MINOR_VERSION 10 -#define NODE_PATCH_VERSION 28 +#define NODE_PATCH_VERSION 29 #define NODE_VERSION_IS_RELEASE 1 diff -Nru nodejs-0.10.28/src/process_wrap.cc nodejs-0.10.29/src/process_wrap.cc --- nodejs-0.10.28/src/process_wrap.cc 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/src/process_wrap.cc 2014-06-09 17:04:36.000000000 +0000 @@ -25,6 +25,7 @@ #include "tty_wrap.h" #include "tcp_wrap.h" #include "udp_wrap.h" +#include "util.h" #include #include @@ -187,7 +188,7 @@ // options.file Local file_v = js_options->Get(String::NewSymbol("file")); - String::Utf8Value file(file_v->IsString() ? file_v : Local()); + node::Utf8Value file(file_v->IsString() ? file_v : Local()); if (file.length() > 0) { options.file = *file; } else { @@ -202,7 +203,7 @@ // Heap allocate to detect errors. +1 is for NULL. options.args = new char*[argc + 1]; for (int i = 0; i < argc; i++) { - String::Utf8Value arg(js_argv->Get(i)); + node::Utf8Value arg(js_argv->Get(i)); options.args[i] = strdup(*arg); } options.args[argc] = NULL; @@ -210,7 +211,7 @@ // options.cwd Local cwd_v = js_options->Get(String::NewSymbol("cwd")); - String::Utf8Value cwd(cwd_v->IsString() ? cwd_v : Local()); + node::Utf8Value cwd(cwd_v->IsString() ? cwd_v : Local()); if (cwd.length() > 0) { options.cwd = *cwd; } @@ -222,7 +223,7 @@ int envc = env->Length(); options.env = new char*[envc + 1]; // Heap allocated to detect errors. for (int i = 0; i < envc; i++) { - String::Utf8Value pair(env->Get(i)); + node::Utf8Value pair(env->Get(i)); options.env[i] = strdup(*pair); } options.env[envc] = NULL; diff -Nru nodejs-0.10.28/src/string_bytes.cc nodejs-0.10.29/src/string_bytes.cc --- nodejs-0.10.28/src/string_bytes.cc 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/src/string_bytes.cc 2014-06-09 17:04:36.000000000 +0000 @@ -199,7 +199,7 @@ break; case UTF8: - len = str->WriteUtf8(buf, buflen, chars_written, flags); + len = str->WriteUtf8(buf, buflen, chars_written, WRITE_UTF8_FLAGS); break; case UCS2: diff -Nru nodejs-0.10.28/src/string_bytes.h nodejs-0.10.29/src/string_bytes.h --- nodejs-0.10.28/src/string_bytes.h 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/src/string_bytes.h 2014-06-09 17:04:36.000000000 +0000 @@ -29,6 +29,8 @@ namespace node { +extern int WRITE_UTF8_FLAGS; + using v8::Handle; using v8::Local; using v8::String; diff -Nru nodejs-0.10.28/src/udp_wrap.cc nodejs-0.10.29/src/udp_wrap.cc --- nodejs-0.10.28/src/udp_wrap.cc 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/src/udp_wrap.cc 2014-06-09 17:04:36.000000000 +0000 @@ -25,6 +25,7 @@ #include "req_wrap.h" #include "handle_wrap.h" #include "udp_wrap.h" +#include "util.h" #include @@ -160,7 +161,7 @@ // bind(ip, port, flags) assert(args.Length() == 3); - String::Utf8Value address(args[0]); + node::Utf8Value address(args[0]); const int port = args[1]->Uint32Value(); const int flags = args[2]->Uint32Value(); @@ -219,8 +220,8 @@ assert(args.Length() == 2); - String::Utf8Value address(args[0]); - String::Utf8Value iface(args[1]); + node::Utf8Value address(args[0]); + node::Utf8Value iface(args[1]); const char* iface_cstr = *iface; if (args[1]->IsUndefined() || args[1]->IsNull()) { @@ -271,7 +272,7 @@ length); const unsigned short port = args[3]->Uint32Value(); - String::Utf8Value address(args[4]); + node::Utf8Value address(args[4]); switch (family) { case AF_INET: diff -Nru nodejs-0.10.28/src/util.h nodejs-0.10.29/src/util.h --- nodejs-0.10.28/src/util.h 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/src/util.h 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,78 @@ +// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + +#ifndef SRC_UTIL_H_ +#define SRC_UTIL_H_ + +#include "v8.h" +#include "string_bytes.h" + +namespace node { + +class Utf8Value { + public: + explicit Utf8Value(v8::Handle value) + : length_(0), str_(NULL) { + if (value.IsEmpty()) + return; + + v8::Local val_ = value->ToString(); + + // Allocate enough space to include the null terminator + size_t len = StringBytes::StorageSize(val_, UTF8) + 1; + + char* str = static_cast(calloc(1, len)); + + int flags = WRITE_UTF8_FLAGS; + flags |= ~v8::String::NO_NULL_TERMINATION; + + length_ = val_->WriteUtf8(str, + len, + 0, + flags); + + str_ = reinterpret_cast(str); + } + + ~Utf8Value() { + free(str_); + } + + char* operator*() { + return str_; + }; + + const char* operator*() const { + return str_; + }; + + size_t length() { + return length_; + }; + + private: + size_t length_; + char* str_; +}; + +} // namespace node + +#endif // SRC_UTIL_H_ diff -Nru nodejs-0.10.28/test/message/stdin_messages.out nodejs-0.10.29/test/message/stdin_messages.out --- nodejs-0.10.28/test/message/stdin_messages.out 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/test/message/stdin_messages.out 2014-06-09 17:04:36.000000000 +0000 @@ -8,7 +8,7 @@ at Module._compile (module.js:*:*) at evalScript (node.js:*:*) at Socket. (node.js:*:*) - at Socket.EventEmitter.emit (events.js:*:*) + at Socket.emit (events.js:*:*) at _stream_readable.js:*:* at process._tickCallback (node.js:*:*) 42 @@ -23,7 +23,7 @@ at Module._compile (module.js:*:*) at evalScript (node.js:*:*) at Socket. (node.js:*:*) - at Socket.EventEmitter.emit (events.js:*:*) + at Socket.emit (events.js:*:*) at _stream_readable.js:*:* at process._tickCallback (node.js:*:*) @@ -36,7 +36,7 @@ at Module._compile (module.js:*:*) at evalScript (node.js:*:*) at Socket. (node.js:*:*) - at Socket.EventEmitter.emit (events.js:*:*) + at Socket.emit (events.js:*:*) at _stream_readable.js:*:* at process._tickCallback (node.js:*:*) 100 @@ -50,7 +50,7 @@ at Module._compile (module.js:*:*) at evalScript (node.js:*:*) at Socket. (node.js:*:*) - at Socket.EventEmitter.emit (events.js:*:*) + at Socket.emit (events.js:*:*) at _stream_readable.js:*:* at process._tickCallback (node.js:*:*) diff -Nru nodejs-0.10.28/test/simple/test-buffer.js nodejs-0.10.29/test/simple/test-buffer.js --- nodejs-0.10.28/test/simple/test-buffer.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/test/simple/test-buffer.js 2014-06-09 17:04:36.000000000 +0000 @@ -791,6 +791,18 @@ assert.equal(buf[3], 0xFF); }); +// test unmatched surrogates not producing invalid utf8 output +// ef bf bd = utf-8 representation of unicode replacement character +// see https://codereview.chromium.org/121173009/ +buf = new Buffer('ab\ud800cd', 'utf8'); +assert.equal(buf[0], 0x61); +assert.equal(buf[1], 0x62); +assert.equal(buf[2], 0xef); +assert.equal(buf[3], 0xbf); +assert.equal(buf[4], 0xbd); +assert.equal(buf[5], 0x63); +assert.equal(buf[6], 0x64); + // test for buffer overrun buf = new Buffer([0, 0, 0, 0, 0]); // length: 5 var sub = buf.slice(0, 4); // length: 4 diff -Nru nodejs-0.10.28/test/simple/test-child-process-spawn-typeerror.js nodejs-0.10.29/test/simple/test-child-process-spawn-typeerror.js --- nodejs-0.10.28/test/simple/test-child-process-spawn-typeerror.js 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/test/simple/test-child-process-spawn-typeerror.js 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,42 @@ +// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + +var spawn = require('child_process').spawn, + assert = require('assert'), + windows = (process.platform === 'win32'), + cmd = (windows) ? 'ls' : 'dir', + errors = 0; + +try { + // Ensure this throws a TypeError + var child = spawn(cmd, 'this is not an array'); + + child.on('error', function (err) { + errors++; + }); + +} catch (e) { + assert.equal(e instanceof TypeError, true); +} + +process.on('exit', function() { + assert.equal(errors, 0); +}); diff -Nru nodejs-0.10.28/test/simple/test-event-emitter-method-names.js nodejs-0.10.29/test/simple/test-event-emitter-method-names.js --- nodejs-0.10.28/test/simple/test-event-emitter-method-names.js 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/test/simple/test-event-emitter-method-names.js 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,32 @@ +// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + +var common = require('../common'); +var assert = require('assert'); +var events = require('events'); + +var E = events.EventEmitter.prototype; +assert.equal(E.constructor.name, 'EventEmitter'); +assert.equal(E.on, E.addListener); // Same method. +Object.getOwnPropertyNames(E).forEach(function(name) { + if (name === 'constructor' || name === 'on') return; + assert.equal(E[name].name, name); +}); diff -Nru nodejs-0.10.28/test/simple/test-stream2-compatibility.js nodejs-0.10.29/test/simple/test-stream2-compatibility.js --- nodejs-0.10.28/test/simple/test-stream2-compatibility.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/test/simple/test-stream2-compatibility.js 2014-06-09 17:04:36.000000000 +0000 @@ -47,4 +47,6 @@ }; var reader = new TestReader(); -assert.equal(ondataCalled, 1); +process.nextTick(function() { + assert.equal(ondataCalled, 1); +}); diff -Nru nodejs-0.10.28/test/simple/test-stream-readable-data-sync-race.js nodejs-0.10.29/test/simple/test-stream-readable-data-sync-race.js --- nodejs-0.10.28/test/simple/test-stream-readable-data-sync-race.js 1970-01-01 00:00:00.000000000 +0000 +++ nodejs-0.10.29/test/simple/test-stream-readable-data-sync-race.js 2014-06-09 17:04:36.000000000 +0000 @@ -0,0 +1,41 @@ +// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + +var common = require('../common'); +var assert = require('assert'); + +var Readable = require('stream').Readable; + +var r = new Readable(); +var errors = 0; + +// Setting `data` listener should not trigger `_read()` calls before we will +// set the `error` listener below +r.on('data', function() { +}); + +r.on('error', function() { + errors++; +}); + +process.on('exit', function() { + assert.equal(errors, 1); +}); diff -Nru nodejs-0.10.28/test/simple/test-string-decoder.js nodejs-0.10.29/test/simple/test-string-decoder.js --- nodejs-0.10.28/test/simple/test-string-decoder.js 2014-05-02 00:47:47.000000000 +0000 +++ nodejs-0.10.29/test/simple/test-string-decoder.js 2014-06-09 17:04:36.000000000 +0000 @@ -22,142 +22,101 @@ var common = require('../common'); var assert = require('assert'); var StringDecoder = require('string_decoder').StringDecoder; -var decoder = new StringDecoder('utf8'); +process.stdout.write('scanning '); - -var buffer = new Buffer('$'); -assert.deepEqual('$', decoder.write(buffer)); - -buffer = new Buffer('¢'); -assert.deepEqual('', decoder.write(buffer.slice(0, 1))); -assert.deepEqual('¢', decoder.write(buffer.slice(1, 2))); - -buffer = new Buffer('€'); -assert.deepEqual('', decoder.write(buffer.slice(0, 1))); -assert.deepEqual('', decoder.write(buffer.slice(1, 2))); -assert.deepEqual('€', decoder.write(buffer.slice(2, 3))); - -buffer = new Buffer([0xF0, 0xA4, 0xAD, 0xA2]); -var s = ''; -s += decoder.write(buffer.slice(0, 1)); -s += decoder.write(buffer.slice(1, 2)); -s += decoder.write(buffer.slice(2, 3)); -s += decoder.write(buffer.slice(3, 4)); -assert.ok(s.length > 0); +// UTF-8 +test('utf-8', new Buffer('$', 'utf-8'), '$'); +test('utf-8', new Buffer('¢', 'utf-8'), '¢'); +test('utf-8', new Buffer('€', 'utf-8'), '€'); +test('utf-8', new Buffer('𤭢', 'utf-8'), '𤭢'); +// A mixed ascii and non-ascii string +// Test stolen from deps/v8/test/cctest/test-strings.cc +// U+02E4 -> CB A4 +// U+0064 -> 64 +// U+12E4 -> E1 8B A4 +// U+0030 -> 30 +// U+3045 -> E3 81 85 +test( + 'utf-8', + new Buffer([0xCB, 0xA4, 0x64, 0xE1, 0x8B, 0xA4, 0x30, 0xE3, 0x81, 0x85]), + '\u02e4\u0064\u12e4\u0030\u3045' +); // CESU-8 -buffer = new Buffer('EDA0BDEDB18D', 'hex'); // THUMBS UP SIGN (in CESU-8) -var s = ''; -s += decoder.write(buffer.slice(0, 1)); -s += decoder.write(buffer.slice(1, 2)); -s += decoder.write(buffer.slice(2, 3)); // complete lead surrogate -assert.equal(s, ''); -s += decoder.write(buffer.slice(3, 4)); -s += decoder.write(buffer.slice(4, 5)); -s += decoder.write(buffer.slice(5, 6)); // complete trail surrogate -assert.equal(s, '\uD83D\uDC4D'); // THUMBS UP SIGN (in UTF-16) - -var s = ''; -s += decoder.write(buffer.slice(0, 2)); -s += decoder.write(buffer.slice(2, 4)); // complete lead surrogate -assert.equal(s, ''); -s += decoder.write(buffer.slice(4, 6)); // complete trail surrogate -assert.equal(s, '\uD83D\uDC4D'); // THUMBS UP SIGN (in UTF-16) - -var s = ''; -s += decoder.write(buffer.slice(0, 3)); // complete lead surrogate -assert.equal(s, ''); -s += decoder.write(buffer.slice(3, 6)); // complete trail surrogate -assert.equal(s, '\uD83D\uDC4D'); // THUMBS UP SIGN (in UTF-16) - -var s = ''; -s += decoder.write(buffer.slice(0, 4)); // complete lead surrogate -assert.equal(s, ''); -s += decoder.write(buffer.slice(4, 5)); -s += decoder.write(buffer.slice(5, 6)); // complete trail surrogate -assert.equal(s, '\uD83D\uDC4D'); // THUMBS UP SIGN (in UTF-16) - -var s = ''; -s += decoder.write(buffer.slice(0, 5)); // complete lead surrogate -assert.equal(s, ''); -s += decoder.write(buffer.slice(5, 6)); // complete trail surrogate -assert.equal(s, '\uD83D\uDC4D'); // THUMBS UP SIGN (in UTF-16) - -var s = ''; -s += decoder.write(buffer.slice(0, 6)); -assert.equal(s, '\uD83D\uDC4D'); // THUMBS UP SIGN (in UTF-16) - +test('utf-8', new Buffer('EDA0BDEDB18D', 'hex'), '\ud83d\udc4d'); // thumbs up // UCS-2 -decoder = new StringDecoder('ucs2'); -buffer = new Buffer('ab', 'ucs2'); -assert.equal(decoder.write(buffer), 'ab'); // 2 complete chars -buffer = new Buffer('abc', 'ucs2'); -assert.equal(decoder.write(buffer.slice(0, 3)), 'a'); // 'a' and first of 'b' -assert.equal(decoder.write(buffer.slice(3, 6)), 'bc'); // second of 'b' and 'c' - +test('ucs2', new Buffer('ababc', 'ucs2'), 'ababc'); // UTF-16LE -buffer = new Buffer('3DD84DDC', 'hex'); // THUMBS UP SIGN (in CESU-8) -var s = ''; -s += decoder.write(buffer.slice(0, 1)); -s += decoder.write(buffer.slice(1, 2)); // complete lead surrogate -assert.equal(s, ''); -s += decoder.write(buffer.slice(2, 3)); -s += decoder.write(buffer.slice(3, 4)); // complete trail surrogate -assert.equal(s, '\uD83D\uDC4D'); // THUMBS UP SIGN (in UTF-16) - -var s = ''; -s += decoder.write(buffer.slice(0, 2)); // complete lead surrogate -assert.equal(s, ''); -s += decoder.write(buffer.slice(2, 4)); // complete trail surrogate -assert.equal(s, '\uD83D\uDC4D'); // THUMBS UP SIGN (in UTF-16) - -var s = ''; -s += decoder.write(buffer.slice(0, 3)); // complete lead surrogate -assert.equal(s, ''); -s += decoder.write(buffer.slice(3, 4)); // complete trail surrogate -assert.equal(s, '\uD83D\uDC4D'); // THUMBS UP SIGN (in UTF-16) - -var s = ''; -s += decoder.write(buffer.slice(0, 4)); -assert.equal(s, '\uD83D\uDC4D'); // THUMBS UP SIGN (in UTF-16) +test('ucs2', new Buffer('3DD84DDC', 'hex'), '\ud83d\udc4d'); // thumbs up +console.log(' crayon!'); -// A mixed ascii and non-ascii string -// Test stolen from deps/v8/test/cctest/test-strings.cc -// U+02E4 -> CB A4 -// U+0064 -> 64 -// U+12E4 -> E1 8B A4 -// U+0030 -> 30 -// U+3045 -> E3 81 85 -var expected = '\u02e4\u0064\u12e4\u0030\u3045'; -var buffer = new Buffer([0xCB, 0xA4, 0x64, 0xE1, 0x8B, 0xA4, - 0x30, 0xE3, 0x81, 0x85]); -var charLengths = [0, 0, 1, 2, 2, 2, 3, 4, 4, 4, 5, 5]; - -// Split the buffer into 3 segments -// |----|------|-------| -// 0 i j buffer.length -// Scan through every possible 3 segment combination -// and make sure that the string is always parsed. -common.print('scanning '); -for (var j = 2; j < buffer.length; j++) { - for (var i = 1; i < j; i++) { - var decoder = new StringDecoder('utf8'); - - var sum = decoder.write(buffer.slice(0, i)); - - // just check that we've received the right amount - // after the first write - assert.equal(charLengths[i], sum.length); - - sum += decoder.write(buffer.slice(i, j)); - sum += decoder.write(buffer.slice(j, buffer.length)); - assert.equal(expected, sum); - common.print('.'); +// test verifies that StringDecoder will correctly decode the given input +// buffer with the given encoding to the expected output. It will attempt all +// possible ways to write() the input buffer, see writeSequences(). The +// singleSequence allows for easy debugging of a specific sequence which is +// useful in case of test failures. +function test(encoding, input, expected, singleSequence) { + var sequences; + if (!singleSequence) { + sequences = writeSequences(input.length); + } else { + sequences = [singleSequence]; } + sequences.forEach(function(sequence) { + var decoder = new StringDecoder(encoding); + var output = ''; + sequence.forEach(function(write) { + output += decoder.write(input.slice(write[0], write[1])); + }); + process.stdout.write('.'); + if (output !== expected) { + var message = + 'Expected "'+unicodeEscape(expected)+'", '+ + 'but got "'+unicodeEscape(output)+'"\n'+ + 'Write sequence: '+JSON.stringify(sequence)+'\n'+ + 'Decoder charBuffer: 0x'+decoder.charBuffer.toString('hex')+'\n'+ + 'Full Decoder State: '+JSON.stringify(decoder, null, 2); + assert.fail(output, expected, message); + } + }); +} + +// unicodeEscape prints the str contents as unicode escape codes. +function unicodeEscape(str) { + var r = ''; + for (var i = 0; i < str.length; i++) { + r += '\\u'+str.charCodeAt(i).toString(16); + } + return r; +} + +// writeSequences returns an array of arrays that describes all possible ways a +// buffer of the given length could be split up and passed to sequential write +// calls. +// +// e.G. writeSequences(3) will return: [ +// [ [ 0, 3 ] ], +// [ [ 0, 2 ], [ 2, 3 ] ], +// [ [ 0, 1 ], [ 1, 3 ] ], +// [ [ 0, 1 ], [ 1, 2 ], [ 2, 3 ] ] +// ] +function writeSequences(length, start, sequence) { + if (start === undefined) { + start = 0; + sequence = [] + } else if (start === length) { + return [sequence]; + } + var sequences = []; + for (var end = length; end > start; end--) { + var subSequence = sequence.concat([[start, end]]); + var subSequences = writeSequences(length, end, subSequence, sequences); + sequences = sequences.concat(subSequences); + } + return sequences; } -console.log(' crayon!');