openpkg
/
openpkg-packages
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

upgrading package: npm 3.10.9 -> 4.0.0

master
Dr. Ralf S. Engelschall 9 years ago
parent
9af2b596cb
commit
39d8315920
2 changed files with 38 additions and 97 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 131
      npm/npm.patch
  2. 4
      npm/npm.spec

131
npm/npm.patch
Unescape View File

@ -1,7 +1,7 @@
Index: lib/build.js
--- lib/build.js.orig 2016-07-01 01:03:11.000000000 +0200
+++ lib/build.js 2016-07-01 18:41:20.951088197 +0200
@@ -231,7 +231,7 @@
--- lib/build.js.orig 2016-10-21 03:46:47.000000000 +0200
+++ lib/build.js 2016-10-21 18:18:51.746070163 +0200
@@ -230,7 +230,7 @@
function linkMans (pkg, folder, parent, gtop, cb) {
if (!pkg.man || !gtop || process.platform === 'win32') return cb()
@ -11,9 +11,16 @@ Index: lib/build.js
// make sure that the mans are unique.
Index: lib/cache/add-local-tarball.js
--- lib/cache/add-local-tarball.js.orig 2016-07-01 01:03:11.000000000 +0200
+++ lib/cache/add-local-tarball.js 2016-07-01 18:41:20.951088197 +0200
@@ -163,7 +163,7 @@
--- lib/cache/add-local-tarball.js.orig 2016-10-21 03:46:47.000000000 +0200
+++ lib/cache/add-local-tarball.js 2016-10-21 18:27:02.837082568 +0200
@@ -157,13 +157,13 @@
// or the root dir, if none had to be created, so that
// we know that we get all the children.
function chown () {
- chownr(created || root, cs.uid, cs.gid, done)
+ done(null)
}
if (er) return cb(er)
var read = fs.createReadStream(tgz)
var write = writeStreamAtomic(target, { mode: npm.modes.file })
@ -23,9 +30,9 @@ Index: lib/cache/add-local-tarball.js
})
})
Index: lib/cache/add-local.js
--- lib/cache/add-local.js.orig 2016-07-01 18:41:20.951088000 +0200
+++ lib/cache/add-local.js 2016-07-01 18:43:39.720993101 +0200
@@ -105,12 +105,7 @@
--- lib/cache/add-local.js.orig 2016-10-21 03:46:47.000000000 +0200
+++ lib/cache/add-local.js 2016-10-21 18:18:51.746070163 +0200
@@ -123,12 +123,7 @@
return wrapped(er)
}
@ -40,9 +47,9 @@ Index: lib/cache/add-local.js
}
})
Index: lib/cache/add-remote-git.js
--- lib/cache/add-remote-git.js.orig 2016-07-01 01:03:11.000000000 +0200
+++ lib/cache/add-remote-git.js 2016-07-01 18:41:20.961082065 +0200
@@ -232,19 +232,7 @@
--- lib/cache/add-remote-git.js.orig 2016-10-21 03:46:47.000000000 +0200
+++ lib/cache/add-remote-git.js 2016-10-21 18:18:51.746070163 +0200
@@ -233,19 +233,7 @@
return cb(er)
}
@ -62,7 +69,7 @@ Index: lib/cache/add-remote-git.js
})
}
}
@@ -405,9 +393,7 @@
@@ -406,9 +394,7 @@
// Ensure that both the template and remotes directories have the correct
// permissions.
@ -74,8 +81,8 @@ Index: lib/cache/add-remote-git.js
})
}
Index: lib/cache/caching-client.js
--- lib/cache/caching-client.js.orig 2016-07-01 01:03:11.000000000 +0200
+++ lib/cache/caching-client.js 2016-07-01 18:41:20.961082065 +0200
--- lib/cache/caching-client.js.orig 2016-10-21 03:46:47.000000000 +0200
+++ lib/cache/caching-client.js 2016-10-21 18:18:51.746070163 +0200
@@ -183,7 +183,7 @@
writeFile(cachePath, JSON.stringify(data), function (er) {
if (er) return saved()
@ -85,53 +92,21 @@ Index: lib/cache/caching-client.js
})
})
})
Index: lib/cache/update-index.js
--- lib/cache/update-index.js.orig 2016-07-01 01:03:11.000000000 +0200
+++ lib/cache/update-index.js 2016-07-01 18:41:20.961082065 +0200
@@ -45,9 +45,6 @@
return updateIndex_(uri, params, {}, cachePath, cb)
}
- chownr(made || cachePath, st.uid, st.gid, function (er) {
- if (er) return cb(er)
-
data = parseJSON.noExceptions(data)
if (!data) {
fs.writeFile(cachePath, '{}', function (er) {
@@ -72,7 +69,6 @@
uri += '/since?stale=update_after&startkey=' + t
}
updateIndex_(uri, params, data, cachePath, cb)
- })
})
})
})
@@ -96,9 +92,7 @@
fs.writeFile(cachePath, JSON.stringify(data), function (er) {
delete data._updated
if (er) return cb(er)
- chownr(cachePath, st.uid, st.gid, function (er) {
- cb(er, data)
- })
+ cb(undefined, data)
})
Index: lib/search/all-package-metadata.js
--- lib/search/all-package-metadata.js.orig 2016-10-21 03:46:47.000000000 +0200
+++ lib/search/all-package-metadata.js 2016-10-21 18:26:12.456101745 +0200
@@ -238,7 +238,7 @@
if (er) return cb(er)
mkdir(cacheBase, function (er, made) {
if (er) return cb(er)
- chownr(made || cacheBase, st.uid, st.gid, cb)
+ cb(null)
})
}))
Index: lib/npm.js
--- lib/npm.js.orig 2016-07-01 01:03:11.000000000 +0200
+++ lib/npm.js 2016-07-01 18:41:20.961082065 +0200
@@ -350,7 +350,7 @@
{
get: function () {
return (process.platform !== 'win32')
- ? path.resolve(npm.globalPrefix, 'lib', 'node_modules')
+ ? path.resolve(npm.globalPrefix, 'lib', 'node', 'usr', 'node_modules')
: path.resolve(npm.globalPrefix, 'node_modules')
},
enumerable: true
})
}
Index: lib/utils/correct-mkdir.js
--- lib/utils/correct-mkdir.js.orig 2016-07-01 18:41:20.961082000 +0200
+++ lib/utils/correct-mkdir.js 2016-07-01 18:44:11.671066504 +0200
--- lib/utils/correct-mkdir.js.orig 2016-10-21 03:46:47.000000000 +0200
+++ lib/utils/correct-mkdir.js 2016-10-21 18:25:35.946379699 +0200
@@ -116,8 +116,5 @@
}
@ -140,39 +115,5 @@ Index: lib/utils/correct-mkdir.js
- if (er && er.code === 'ENOENT') return cb(null, st)
- return cb(er, st)
- })
+ cb(null, st)
+ cb(null, st)
}
Index: node_modules/node-gyp/lib/install.js
--- node_modules/node-gyp/lib/install.js.orig 2016-07-01 01:03:11.000000000 +0200
+++ node_modules/node-gyp/lib/install.js 2016-07-01 18:41:20.961082065 +0200
@@ -412,8 +412,6 @@
function eaccesFallback () {
var tmpdir = osenv.tmpdir()
gyp.devDir = path.resolve(tmpdir, '.node-gyp')
- log.warn('EACCES', 'user "%s" does not have permission to access the dev dir "%s"', osenv.user(), devDir)
- log.warn('EACCES', 'attempting to reinstall using temporary dev dir "%s"', gyp.devDir)
if (process.cwd() == tmpdir) {
log.verbose('tmpdir == cwd', 'automatically will remove dev files after to save disk space')
gyp.todo.push({ name: 'remove', args: argv })
Index: node_modules/node-gyp/lib/node-gyp.js
--- node_modules/node-gyp/lib/node-gyp.js.orig 2016-07-01 01:03:11.000000000 +0200
+++ node_modules/node-gyp/lib/node-gyp.js 2016-07-01 18:41:20.961082065 +0200
@@ -49,6 +49,10 @@
// set the dir where node-gyp dev files get installed
// TODO: make this *more* configurable?
// see: https://github.com/nodejs/node-gyp/issues/21
+ var baseDir = process.env.NODE_GYP
+ if (baseDir)
+ this.devDir = path.resolve(baseDir)
+ else {
var homeDir = process.env.HOME || process.env.USERPROFILE
if (!homeDir) {
throw new Error(
@@ -57,6 +61,7 @@
);
}
this.devDir = path.resolve(homeDir, '.node-gyp')
+ }
this.commands = {}

4
npm/npm.spec
Unescape View File

@ -22,7 +22,7 @@
##
# package version
%define V_npm 3.10.9
%define V_npm 4.0.0
%define V_node6 6.9.1
%define V_node5 5.12.0
%define V_node4 4.6.1
@ -39,7 +39,7 @@ Class: PLUS
Group: Archiver
License: MIT
Version: %{V_npm}
Release: 20161020
Release: 20161021
# list of sources
Source0: https://github.com/npm/npm/archive/v%{V_npm}.tar.gz

Write Preview
Loading…
Cancel
Save