openpkg-packages/npm/npm.patch

Index: lib/build.js
--- lib/build.js.orig	2015-02-06 10:00:27.000000000 +0100
+++ lib/build.js	2015-02-08 10:15:39.195356706 +0100
@@ -211,7 +211,7 @@
 function linkMans (pkg, folder, parent, gtop, cb) {
   if (!pkg.man || !gtop || process.platform === "win32") return cb()
 
-  var manRoot = path.resolve(npm.config.get("prefix"), "share", "man")
+  var manRoot = path.resolve(npm.config.get("prefix"), "man")
   log.verbose("linkMans", "man files are", pkg.man, "in", manRoot)
 
   // make sure that the mans are unique.
Index: lib/cache/add-local-tarball.js
--- lib/cache/add-local-tarball.js.orig	2015-02-06 10:00:27.000000000 +0100
+++ lib/cache/add-local-tarball.js	2015-02-08 10:15:39.195356706 +0100
@@ -167,7 +167,7 @@
       if (er) return cb(er)
       var read = fs.createReadStream(tgz)
       var write = writeStream(target, { mode: npm.modes.file })
-      var fin = cs.uid && cs.gid ? chown : done
+      var fin = cs.uid && cs.gid ? done : done
       read.on("error", cb).pipe(write).on("error", cb).on("close", fin)
     })
 
Index: lib/cache/add-local.js
--- lib/cache/add-local.js.orig	2015-02-06 10:00:27.000000000 +0100
+++ lib/cache/add-local.js	2015-02-08 10:15:39.195356706 +0100
@@ -97,9 +97,7 @@
             return cb(er)
           }
 
-          if (!cs || isNaN(cs.uid) || isNaN(cs.gid)) wrapped()
-
-          chownr(made || tgz, cs.uid, cs.gid, wrapped)
+          wrapped()
         })
       })
     })
Index: lib/cache/add-remote-git.js
--- lib/cache/add-remote-git.js.orig	2015-02-06 10:00:27.000000000 +0100
+++ lib/cache/add-remote-git.js	2015-02-08 10:15:39.195356706 +0100
@@ -70,16 +70,7 @@
     // the templates, creating it (and setting its permissions) if necessary.
     mkdir(templates, function (er) {
       if (er) return cb(er)
-
-      // Ensure that both the template and remotes directories have the correct
-      // permissions.
-      fs.chown(templates, st.uid, st.gid, function (er) {
-        if (er) return cb(er)
-
-        fs.chown(remotes, st.uid, st.gid, function (er) {
-          cb(er, st)
-        })
-      })
+      cb(undefined, st);
     })
   })
 }
@@ -159,14 +150,7 @@
             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(p, u, co, origUrl, cb)
-          })
         })
       }
     }
Index: lib/cache/get-stat.js
--- lib/cache/get-stat.js.orig	2015-02-06 10:00:27.000000000 +0100
+++ lib/cache/get-stat.js	2015-02-08 10:15:39.195356706 +0100
@@ -66,9 +66,6 @@
 
     if (!made) return cb(er, cacheStat)
 
-    // ensure that the ownership is correct.
-    chownr(made, cacheStat.uid, cacheStat.gid, function (er) {
-      return cb(er, cacheStat)
-    })
+    return cb(undefined, cacheStat)
   }
 }
Index: lib/npm.js
--- lib/npm.js.orig	2015-02-06 10:00:27.000000000 +0100
+++ lib/npm.js	2015-02-08 10:29:14.105477476 +0100
@@ -414,7 +414,7 @@
 Object.defineProperty(npm, "globalDir",
   { 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: node_modules/node-gyp/lib/node-gyp.js
--- node_modules/node-gyp/lib/node-gyp.js.orig	2015-02-06 10:00:27.000000000 +0100
+++ node_modules/node-gyp/lib/node-gyp.js	2015-02-08 10:15:39.195356706 +0100
@@ -49,6 +49,10 @@
   // set the dir where node-gyp dev files get installed
   // TODO: make this *more* configurable?
   //       see: https://github.com/TooTallNate/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 = {}