Adam Majer
6120bed876
overwrite and access via "bin" field (bsc#1159352, CVE-2019-16777, CVE-2019-16776, CVE-2019-16775). - CVE-2019-13173.patch - upstreamed - refreshed: node-gyp-addon-gypi.patch, npm_search_paths.patch, versioned.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs6?expand=0&rev=116
47 lines
1.8 KiB
Diff
47 lines
1.8 KiB
Diff
Index: node-v6.17.1/deps/npm/lib/config/core.js
|
|
===================================================================
|
|
--- node-v6.17.1.orig/deps/npm/lib/config/core.js
|
|
+++ node-v6.17.1/deps/npm/lib/config/core.js
|
|
@@ -151,11 +151,9 @@ function load_ (builtin, rc, cli, cb) {
|
|
// 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')
|
|
+ var etc = path.resolve('/etc/nodejs')
|
|
defaults.globalconfig = path.resolve(etc, 'npmrc')
|
|
defaults.globalignorefile = path.resolve(etc, 'npmignore')
|
|
- }
|
|
|
|
conf.addFile(conf.get('globalconfig'), 'global')
|
|
|
|
Index: node-v6.17.1/deps/npm/lib/help-search.js
|
|
===================================================================
|
|
--- node-v6.17.1.orig/deps/npm/lib/help-search.js
|
|
+++ node-v6.17.1/deps/npm/lib/help-search.js
|
|
@@ -18,7 +18,7 @@ function helpSearch (args, silent, cb) {
|
|
}
|
|
if (!args.length) return cb(helpSearch.usage)
|
|
|
|
- var docPath = path.resolve(__dirname, '..', 'doc')
|
|
+ var docPath = "/usr/share/doc/packages/nodejs"
|
|
return glob(docPath + '/*/*.md', function (er, files) {
|
|
if (er) return cb(er)
|
|
readFiles(files, function (er, data) {
|
|
Index: node-v6.17.1/deps/npm/lib/config/defaults.js
|
|
===================================================================
|
|
--- node-v6.17.1.orig/deps/npm/lib/config/defaults.js
|
|
+++ node-v6.17.1/deps/npm/lib/config/defaults.js
|
|
@@ -102,6 +102,11 @@ Object.defineProperty(exports, 'defaults
|
|
if (process.env.DESTDIR) {
|
|
globalPrefix = path.join(process.env.DESTDIR, globalPrefix)
|
|
}
|
|
+
|
|
+ // don't poop all over distro territory - use /usr/local instead
|
|
+ if (globalPrefix === '/usr') {
|
|
+ globalPrefix = path.join(globalPrefix, '/local');
|
|
+ }
|
|
}
|
|
|
|
defaults = {
|