From f670bfaaaa689eb2cb058313ea784767e0c0847a Mon Sep 17 00:00:00 2001 From: Petter Reinholdtsen Date: Mon, 1 Oct 2018 09:28:20 +0200 Subject: Rename patches to follow suggested name schema. --- debian/patches/2000-mime-gettype.patch | 17 -- debian/patches/2000-shebang.patch | 13 + debian/patches/2010-disable-default-ssl.patch | 21 ++ .../2020-bundle-connect-static-module.patch | 270 +++++++++++++++++++++ .../2021-bundle-connect-static-mime-gettype.patch | 17 ++ debian/patches/2030-bundle-curlydiff-module.patch | 120 +++++++++ debian/patches/2040-bundle-mv-module.patch | 179 ++++++++++++++ debian/patches/2050-bundle-human-size-module.patch | 62 +++++ debian/patches/bundle-connect-static-module.patch | 270 --------------------- debian/patches/bundle-curlydiff-module.patch | 120 --------- debian/patches/bundle-human-size-module.patch | 62 ----- debian/patches/bundle-mv-module.patch | 179 -------------- debian/patches/disable-default-ssl.patch | 21 -- debian/patches/series | 14 +- debian/patches/shebang.patch | 13 - 15 files changed, 689 insertions(+), 689 deletions(-) delete mode 100644 debian/patches/2000-mime-gettype.patch create mode 100644 debian/patches/2000-shebang.patch create mode 100644 debian/patches/2010-disable-default-ssl.patch create mode 100644 debian/patches/2020-bundle-connect-static-module.patch create mode 100644 debian/patches/2021-bundle-connect-static-mime-gettype.patch create mode 100644 debian/patches/2030-bundle-curlydiff-module.patch create mode 100644 debian/patches/2040-bundle-mv-module.patch create mode 100644 debian/patches/2050-bundle-human-size-module.patch delete mode 100644 debian/patches/bundle-connect-static-module.patch delete mode 100644 debian/patches/bundle-curlydiff-module.patch delete mode 100644 debian/patches/bundle-human-size-module.patch delete mode 100644 debian/patches/bundle-mv-module.patch delete mode 100644 debian/patches/disable-default-ssl.patch delete mode 100644 debian/patches/shebang.patch diff --git a/debian/patches/2000-mime-gettype.patch b/debian/patches/2000-mime-gettype.patch deleted file mode 100644 index fdacd99..0000000 --- a/debian/patches/2000-mime-gettype.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Adjust bundled connect-static to work with recent mime library. -Bug-Debian: https://bugs.debian.org/907785 -Author: Petter Reinholdtsen - -Index: groovebasin/node_modules/connect-static/index.js -=================================================================== ---- groovebasin.orig/node_modules/connect-static/index.js 2018-09-30 21:52:53.105572238 +0200 -+++ groovebasin/node_modules/connect-static/index.js 2018-09-30 21:54:07.482611957 +0200 -@@ -35,7 +35,7 @@ - var cacheObj; - cache[relName] = cacheObj = { - sink: sink, -- mime: mime.lookup(relName), -+ mime: mime.getType(relName), - mtime: stat.mtime, - hash: null, - }; diff --git a/debian/patches/2000-shebang.patch b/debian/patches/2000-shebang.patch new file mode 100644 index 0000000..af67df0 --- /dev/null +++ b/debian/patches/2000-shebang.patch @@ -0,0 +1,13 @@ +Description: shebang line to nodejs +Author: Andrew Kelley +Forwarded: not-needed +Last-Update: 2014-07-04 + +--- groovebasin-1.2.0.orig/lib/server.js ++++ groovebasin-1.2.0/lib/server.js +@@ -1,4 +1,4 @@ +-#!/usr/bin/env node ++#!/usr/bin/env nodejs + + if (!process.env.NODE_ENV) process.env.NODE_ENV = "dev"; + diff --git a/debian/patches/2010-disable-default-ssl.patch b/debian/patches/2010-disable-default-ssl.patch new file mode 100644 index 0000000..4a2a14d --- /dev/null +++ b/debian/patches/2010-disable-default-ssl.patch @@ -0,0 +1,21 @@ +Description: disable default SSL + upstream defaults to using a self-signed cert and https. This requires users + to click through a certificate warning in the browser. We would rather have + the security vulnerability of passwords passing unprotected over HTTP than + train users to click through the "ignore bad certificate" warning. +Author: Andrew Kelley +Forwarded: not-needed + +--- groovebasin-1.3.0.orig/lib/groovebasin.js ++++ groovebasin-1.3.0/lib/groovebasin.js +@@ -42,8 +42,8 @@ var defaultConfig = { + mpdPort: 6600, + acoustidAppKey: 'bgFvC4vW', + encodeQueueDuration: 8, +- sslKey: 'certs/self-signed-key.pem', +- sslCert: 'certs/self-signed-cert.pem', ++ sslKey: null, ++ sslCert: null, + }; + + util.inherits(GrooveBasin, EventEmitter); diff --git a/debian/patches/2020-bundle-connect-static-module.patch b/debian/patches/2020-bundle-connect-static-module.patch new file mode 100644 index 0000000..6daeebe --- /dev/null +++ b/debian/patches/2020-bundle-connect-static-module.patch @@ -0,0 +1,270 @@ +Description: bundle connect-static module + FTP masters rejected node-connect-static on the account of it being too small, + so we bundle the module here. +Author: Andrew Kelley +Forwarded: not-needed +--- /dev/null ++++ groovebasin-1.4.0/node_modules/connect-static/index.js +@@ -0,0 +1,110 @@ ++var zlib = require('zlib'); ++var fs = require('fs'); ++var stream = require('stream'); ++var util = require('util'); ++var path = require('path'); ++var Pend = require('pend'); ++var findit = require('findit2'); ++var mime = require('mime'); ++var url = require('url'); ++var StreamSink = require('streamsink'); ++var crypto = require('crypto'); ++ ++module.exports = createGzipStaticMiddleware; ++ ++function createGzipStaticMiddleware(options, cb) { ++ options = options || {}; ++ var dir = options.dir || "public"; ++ var ignoreFile = options.ignoreFile || defaultIgnoreFile; ++ var aliases = options.aliases || [['/', '/index.html']]; ++ var followSymlinks = (options.followSymlinks == null) ? true : !!options.followSymlinks; ++ ++ var cache = {}; ++ var pend = new Pend(); ++ var walker = findit(dir, {followSymlinks: followSymlinks}); ++ walker.on('error', function(err) { ++ walker.stop(); ++ cb(err); ++ }); ++ walker.on('file', function(file, stat, linkPath) { ++ var usePath = linkPath || file; ++ if (ignoreFile(usePath)) return; ++ var relName = '/' + path.relative(dir, usePath); ++ var sink = new StreamSink(); ++ var inStream = fs.createReadStream(file); ++ var cacheObj; ++ cache[relName] = cacheObj = { ++ sink: sink, ++ mime: mime.lookup(relName), ++ mtime: stat.mtime, ++ hash: null, ++ }; ++ var gzipPendCb, hashPendCb; ++ inStream.on('error', function(err) { ++ if (err.code === 'EISDIR') { ++ delete cache[relName]; ++ gzipPendCb(); ++ hashPendCb(); ++ } else { ++ walker.stop(); ++ gzipPendCb(err); ++ hashPendCb(err); ++ } ++ }); ++ pend.go(function(cb) { ++ gzipPendCb = cb; ++ inStream.pipe(zlib.createGzip()).pipe(sink); ++ sink.on('finish', cb); ++ }); ++ pend.go(function(cb) { ++ hashPendCb = cb; ++ var hashSink = new StreamSink(); ++ inStream.pipe(crypto.createHash('sha1')).pipe(hashSink); ++ hashSink.on('finish', function() { ++ cacheObj.hash = hashSink.toString('base64'); ++ cb(); ++ }); ++ }); ++ }); ++ walker.on('end', function() { ++ pend.wait(function(err) { ++ if (err) return cb(err); ++ aliases.forEach(function(alias) { ++ cache[alias[0]] = cache[alias[1]]; ++ }); ++ cb(null, middleware); ++ }); ++ function middleware(req, resp, next) { ++ var parsedUrl = url.parse(req.url); ++ var c = cache[parsedUrl.pathname]; ++ if (!c) return next(); ++ if (req.headers['if-none-match'] === c.hash) { ++ resp.statusCode = 304; ++ resp.end(); ++ return; ++ } ++ var ifModifiedSince = new Date(req.headers['if-modified-since']); ++ if (!isNaN(ifModifiedSince) && c.mtime <= ifModifiedSince) { ++ resp.statusCode = 304; ++ resp.end(); ++ return; ++ } ++ ++ var sink = c.sink; ++ resp.setHeader('Content-Type', c.mime); ++ resp.setHeader('Cache-Control', 'max-age=0, must-revalidate'); ++ resp.setHeader('ETag', c.hash); ++ if (req.headers['accept-encoding'] == null) { ++ sink.createReadStream().pipe(zlib.createGunzip()).pipe(resp); ++ } else { ++ resp.setHeader('Content-Encoding', 'gzip'); ++ sink.createReadStream().pipe(resp); ++ } ++ } ++ }); ++} ++ ++function defaultIgnoreFile(file) { ++ var basename = path.basename(file); ++ return /^\./.test(basename) || /~$/.test(basename); ++} +--- /dev/null ++++ groovebasin-1.4.0/node_modules/connect-static/node_modules/streamsink/index.js +@@ -0,0 +1,53 @@ ++var stream = require('stream'); ++var util = require('util'); ++ ++module.exports = StreamSink; ++StreamSink.fromBuffer = fromBuffer; ++StreamSink.fromBufferList = fromBufferList; ++ ++function fromBuffer(buffer, options) { ++ return fromBufferList([buffer], options); ++} ++ ++function fromBufferList(bufferList, options) { ++ var sink = new StreamSink(options); ++ sink.buffer = bufferList; ++ sink.length = 0; ++ bufferList.forEach(function(buffer) { ++ sink.length += buffer.length; ++ }); ++ return sink; ++} ++ ++util.inherits(StreamSink, stream.Writable); ++function StreamSink(options) { ++ stream.Writable.call(this, options); ++ this.buffer = []; ++ this.length = 0; ++} ++ ++StreamSink.prototype._write = function(chunk, encoding, callback) { ++ this.buffer.push(chunk); ++ this.length += chunk.length; ++ callback(); ++}; ++ ++StreamSink.prototype.createReadStream = function(options) { ++ var s = new stream.Readable(options); ++ s.buffer = this.buffer; ++ s._read = function(size) { ++ for (var i = 0; i < s.buffer.length; i += 1) { ++ s.push(s.buffer[i]); ++ } ++ s.push(null); ++ }; ++ return s; ++}; ++ ++StreamSink.prototype.toString = function(encoding, start, end) { ++ return this.toBuffer().toString(encoding, start, end); ++}; ++ ++StreamSink.prototype.toBuffer = function() { ++ return Buffer.concat(this.buffer, this.length); ++}; +--- /dev/null ++++ groovebasin-1.4.0/node_modules/connect-static/node_modules/streamsink/package.json +@@ -0,0 +1,42 @@ ++{ ++ "name": "streamsink", ++ "version": "1.2.0", ++ "description": "pipe to a buffer, then create readable streams from it", ++ "main": "index.js", ++ "scripts": { ++ "test": "node test.js" ++ }, ++ "repository": { ++ "type": "git", ++ "url": "git://github.com/andrewrk/node-streamsink.git" ++ }, ++ "author": { ++ "name": "Andrew Kelley", ++ "email": "superjoe30@gmail.com" ++ }, ++ "license": "MIT", ++ "bugs": { ++ "url": "https://github.com/andrewrk/node-streamsink/issues" ++ }, ++ "homepage": "https://github.com/andrewrk/node-streamsink", ++ "_id": "streamsink@1.2.0", ++ "dist": { ++ "shasum": "efafee9f1e22d3591ed7de3dcaa95c3f5e79f73c", ++ "tarball": "http://registry.npmjs.org/streamsink/-/streamsink-1.2.0.tgz" ++ }, ++ "_from": "streamsink@~1.2.0", ++ "_npmVersion": "1.3.10", ++ "_npmUser": { ++ "name": "superjoe", ++ "email": "superjoe30@gmail.com" ++ }, ++ "maintainers": [ ++ { ++ "name": "superjoe", ++ "email": "superjoe30@gmail.com" ++ } ++ ], ++ "directories": {}, ++ "_shasum": "efafee9f1e22d3591ed7de3dcaa95c3f5e79f73c", ++ "_resolved": "https://registry.npmjs.org/streamsink/-/streamsink-1.2.0.tgz" ++} +--- /dev/null ++++ groovebasin-1.4.0/node_modules/connect-static/package.json +@@ -0,0 +1,48 @@ ++{ ++ "name": "connect-static", ++ "version": "1.3.1", ++ "description": "static file server middleware for connect. loads files once at startup and saves gzipped versions in memory", ++ "main": "index.js", ++ "scripts": { ++ "test": "node test/test.js" ++ }, ++ "repository": { ++ "type": "git", ++ "url": "git://github.com/andrewrk/connect-static.git" ++ }, ++ "author": { ++ "name": "Andrew Kelley", ++ "email": "superjoe30@gmail.com" ++ }, ++ "license": "MIT", ++ "bugs": { ++ "url": "https://github.com/andrewrk/connect-static/issues" ++ }, ++ "homepage": "https://github.com/andrewrk/connect-static", ++ "dependencies": { ++ "findit2": "~2.2.0", ++ "mime": "~1.2.11", ++ "pend": "~1.1.3", ++ "streamsink": "~1.2.0" ++ }, ++ "_id": "connect-static@1.3.1", ++ "dist": { ++ "shasum": "9920c86365ebb518b1c9a2a33855682bea55044f", ++ "tarball": "http://registry.npmjs.org/connect-static/-/connect-static-1.3.1.tgz" ++ }, ++ "_from": "connect-static@~1.3.1", ++ "_npmVersion": "1.3.10", ++ "_npmUser": { ++ "name": "superjoe", ++ "email": "superjoe30@gmail.com" ++ }, ++ "maintainers": [ ++ { ++ "name": "superjoe", ++ "email": "superjoe30@gmail.com" ++ } ++ ], ++ "directories": {}, ++ "_shasum": "9920c86365ebb518b1c9a2a33855682bea55044f", ++ "_resolved": "https://registry.npmjs.org/connect-static/-/connect-static-1.3.1.tgz" ++} diff --git a/debian/patches/2021-bundle-connect-static-mime-gettype.patch b/debian/patches/2021-bundle-connect-static-mime-gettype.patch new file mode 100644 index 0000000..fdacd99 --- /dev/null +++ b/debian/patches/2021-bundle-connect-static-mime-gettype.patch @@ -0,0 +1,17 @@ +Description: Adjust bundled connect-static to work with recent mime library. +Bug-Debian: https://bugs.debian.org/907785 +Author: Petter Reinholdtsen + +Index: groovebasin/node_modules/connect-static/index.js +=================================================================== +--- groovebasin.orig/node_modules/connect-static/index.js 2018-09-30 21:52:53.105572238 +0200 ++++ groovebasin/node_modules/connect-static/index.js 2018-09-30 21:54:07.482611957 +0200 +@@ -35,7 +35,7 @@ + var cacheObj; + cache[relName] = cacheObj = { + sink: sink, +- mime: mime.lookup(relName), ++ mime: mime.getType(relName), + mtime: stat.mtime, + hash: null, + }; diff --git a/debian/patches/2030-bundle-curlydiff-module.patch b/debian/patches/2030-bundle-curlydiff-module.patch new file mode 100644 index 0000000..9df77ad --- /dev/null +++ b/debian/patches/2030-bundle-curlydiff-module.patch @@ -0,0 +1,120 @@ +Description: bundle curlydiff module + FTP masters would reject node-curlydiff on the account of it being too small, + so we bundle the module here. +Author: Andrew Kelley +Forwarded: not-needed + +--- /dev/null ++++ groovebasin-1.3.0/node_modules/curlydiff/index.js +@@ -0,0 +1,62 @@ ++module.exports.diff = diff; ++module.exports.apply = apply; ++module.exports.isObject = isObject; ++ ++function diff(from, to) { ++ if (!isObject(from) || !isObject(to)) { ++ // not both objects ++ if (from === to) return undefined; ++ if (from instanceof Date && to instanceof Date && from.getTime() === to.getTime()) return undefined; ++ // there's a difference ++ return to; ++ } ++ // both are objects ++ var result = {}; ++ var anythingChanged = false; ++ for (var key in from) { ++ var childDiff; ++ if (key in to) { ++ childDiff = diff(from[key], to[key]); ++ if (childDiff === undefined) continue; ++ } else { ++ // deleted ++ childDiff = null; ++ } ++ // there's a difference ++ result[key] = childDiff; ++ anythingChanged = true; ++ } ++ for (var key in to) { ++ if (key in from) continue; // handled above ++ result[key] = to[key]; ++ anythingChanged = true; ++ } ++ if (anythingChanged) return result; ++ // no change ++ return undefined; ++} ++ ++function apply(object, patch) { ++ if (patch === undefined) return object; ++ if (!isObject(object) || !isObject(patch)) return patch; ++ // both are objects ++ for (var key in patch) { ++ var patchChild = patch[key]; ++ if (patchChild == null) { ++ // removed ++ delete object[key]; ++ } else { ++ // either this assignment or this function call will have side effects ++ object[key] = apply(object[key], patchChild); ++ } ++ } ++ return object; ++} ++ ++function isObject(object) { ++ if (object == null) return false; ++ if (typeof object !== "object") return false; ++ if (Array.isArray(object)) return false; ++ if (object instanceof Date) return false; ++ return true; ++} +--- /dev/null ++++ groovebasin-1.3.0/node_modules/curlydiff/package.json +@@ -0,0 +1,46 @@ ++{ ++ "name": "curlydiff", ++ "version": "2.0.1", ++ "description": "diff nested JavaScript objects", ++ "main": "index.js", ++ "scripts": { ++ "test": "node test/test.js" ++ }, ++ "repository": { ++ "type": "git", ++ "url": "git://github.com/thejoshwolfe/curlydiff.git" ++ }, ++ "author": { ++ "name": "Josh Wolfe", ++ "email": "thejoshwolfe@gmail.com" ++ }, ++ "license": "MIT", ++ "bugs": { ++ "url": "https://github.com/thejoshwolfe/curlydiff/issues" ++ }, ++ "devDependencies": { ++ "whynoteq": "~1.0.2" ++ }, ++ "gitHead": "b8f52b5906ec3e93873447e072c2d370c02cf869", ++ "homepage": "https://github.com/thejoshwolfe/curlydiff", ++ "_id": "curlydiff@2.0.1", ++ "_shasum": "6ac4b754ea5b63af2632022d03a152306f7eac0b", ++ "_from": "curlydiff@~2.0.1", ++ "_npmVersion": "1.4.28", ++ "_npmUser": { ++ "name": "thejoshwolfe", ++ "email": "thejoshwolfe@gmail.com" ++ }, ++ "maintainers": [ ++ { ++ "name": "thejoshwolfe", ++ "email": "thejoshwolfe@gmail.com" ++ } ++ ], ++ "dist": { ++ "shasum": "6ac4b754ea5b63af2632022d03a152306f7eac0b", ++ "tarball": "http://registry.npmjs.org/curlydiff/-/curlydiff-2.0.1.tgz" ++ }, ++ "directories": {}, ++ "_resolved": "https://registry.npmjs.org/curlydiff/-/curlydiff-2.0.1.tgz" ++} diff --git a/debian/patches/2040-bundle-mv-module.patch b/debian/patches/2040-bundle-mv-module.patch new file mode 100644 index 0000000..78dccc9 --- /dev/null +++ b/debian/patches/2040-bundle-mv-module.patch @@ -0,0 +1,179 @@ +Description: bundle mv module + FTP masters rejected node-mv on the account of it being too small, so we + bundle the module here. +Author: Andrew Kelley +Forwarded: not-needed + +--- /dev/null ++++ groovebasin-1.3.0/node_modules/mv/index.js +@@ -0,0 +1,105 @@ ++var fs = require('fs'); ++var ncp = require('ncp').ncp; ++var path = require('path'); ++var rimraf = require('rimraf'); ++var mkdirp = require('mkdirp'); ++ ++module.exports = mv; ++ ++function mv(source, dest, options, cb){ ++ if (typeof options === 'function') { ++ cb = options; ++ options = {}; ++ } ++ var shouldMkdirp = !!options.mkdirp; ++ var clobber = options.clobber !== false; ++ var limit = options.limit || 16; ++ ++ if (shouldMkdirp) { ++ mkdirs(); ++ } else { ++ doRename(); ++ } ++ ++ function mkdirs() { ++ mkdirp(path.dirname(dest), function(err) { ++ if (err) return cb(err); ++ doRename(); ++ }); ++ } ++ ++ function doRename() { ++ if (clobber) { ++ fs.rename(source, dest, function(err) { ++ if (!err) return cb(); ++ if (err.code !== 'EXDEV') return cb(err); ++ moveFileAcrossDevice(source, dest, clobber, limit, cb); ++ }); ++ } else { ++ fs.link(source, dest, function(err) { ++ if (err) { ++ if (err.code === 'EXDEV') { ++ moveFileAcrossDevice(source, dest, clobber, limit, cb); ++ return; ++ } ++ if (err.code === 'EISDIR' || err.code === 'EPERM') { ++ moveDirAcrossDevice(source, dest, clobber, limit, cb); ++ return; ++ } ++ cb(err); ++ return; ++ } ++ fs.unlink(source, cb); ++ }); ++ } ++ } ++} ++ ++function moveFileAcrossDevice(source, dest, clobber, limit, cb) { ++ var outFlags = clobber ? 'w' : 'wx'; ++ var ins = fs.createReadStream(source); ++ var outs = fs.createWriteStream(dest, {flags: outFlags}); ++ ins.on('error', function(err){ ++ ins.destroy(); ++ outs.destroy(); ++ outs.removeListener('close', onClose); ++ if (err.code === 'EISDIR' || err.code === 'EPERM') { ++ moveDirAcrossDevice(source, dest, clobber, limit, cb); ++ } else { ++ cb(err); ++ } ++ }); ++ outs.on('error', function(err){ ++ ins.destroy(); ++ outs.destroy(); ++ outs.removeListener('close', onClose); ++ cb(err); ++ }); ++ outs.once('close', onClose); ++ ins.pipe(outs); ++ function onClose(){ ++ fs.unlink(source, cb); ++ } ++} ++ ++function moveDirAcrossDevice(source, dest, clobber, limit, cb) { ++ var options = { ++ stopOnErr: true, ++ clobber: false, ++ limit: limit, ++ }; ++ if (clobber) { ++ rimraf(dest, function(err) { ++ if (err) return cb(err); ++ startNcp(); ++ }); ++ } else { ++ startNcp(); ++ } ++ function startNcp() { ++ ncp(source, dest, options, function(errList) { ++ if (errList) return cb(errList[0]); ++ rimraf(source, cb); ++ }); ++ } ++} +--- /dev/null ++++ groovebasin-1.3.0/node_modules/mv/package.json +@@ -0,0 +1,62 @@ ++{ ++ "name": "mv", ++ "version": "2.0.3", ++ "description": "fs.rename but works across devices. same as the unix utility 'mv'", ++ "main": "index.js", ++ "scripts": { ++ "test": "mocha test/test.js --reporter spec" ++ }, ++ "repository": { ++ "type": "git", ++ "url": "git://github.com/andrewrk/node-mv.git" ++ }, ++ "keywords": [ ++ "mv", ++ "move", ++ "rename", ++ "device", ++ "recursive", ++ "folder" ++ ], ++ "author": { ++ "name": "Andrew Kelley" ++ }, ++ "license": "MIT", ++ "engines": { ++ "node": ">=0.8.0" ++ }, ++ "devDependencies": { ++ "mocha": "~1.21.0" ++ }, ++ "dependencies": { ++ "mkdirp": "~0.5.0", ++ "ncp": "~0.6.0", ++ "rimraf": "~2.2.8" ++ }, ++ "bugs": { ++ "url": "https://github.com/andrewrk/node-mv/issues" ++ }, ++ "homepage": "https://github.com/andrewrk/node-mv", ++ "directories": { ++ "test": "test" ++ }, ++ "_id": "mv@2.0.3", ++ "dist": { ++ "shasum": "e9ab707d71dc38de24edcc637a8e2f5f480c7f32", ++ "tarball": "http://registry.npmjs.org/mv/-/mv-2.0.3.tgz" ++ }, ++ "_from": "mv@~2.0.3", ++ "_npmVersion": "1.3.10", ++ "_npmUser": { ++ "name": "superjoe", ++ "email": "superjoe30@gmail.com" ++ }, ++ "maintainers": [ ++ { ++ "name": "superjoe", ++ "email": "superjoe30@gmail.com" ++ } ++ ], ++ "_shasum": "e9ab707d71dc38de24edcc637a8e2f5f480c7f32", ++ "_resolved": "https://registry.npmjs.org/mv/-/mv-2.0.3.tgz" ++} diff --git a/debian/patches/2050-bundle-human-size-module.patch b/debian/patches/2050-bundle-human-size-module.patch new file mode 100644 index 0000000..dbf4ef8 --- /dev/null +++ b/debian/patches/2050-bundle-human-size-module.patch @@ -0,0 +1,62 @@ +Description: bundle human-size module + FTP masters rejected node-human-size on the account of it being too small, + so we bundle the module here. +Author: Andrew Kelley +Forwarded: not-needed +--- /dev/null ++++ groovebasin-1.4.0/node_modules/human-size/index.js +@@ -0,0 +1,10 @@ ++module.exports = humanSize; ++ ++var mags = ' KMGTPEZY'; ++ ++function humanSize(bytes, precision) { ++ var magnitude = Math.min(Math.log(bytes) / Math.log(1024) | 0, mags.length - 1); ++ var result = bytes / Math.pow(1024, magnitude); ++ var suffix = mags[magnitude].trim() + 'B'; ++ return result.toFixed(precision) + suffix; ++} +--- /dev/null ++++ groovebasin-1.4.0/node_modules/human-size/package.json +@@ -0,0 +1,41 @@ ++{ ++ "name": "human-size", ++ "version": "1.1.0", ++ "description": "human readable file size", ++ "main": "index.js", ++ "scripts": { ++ "test": "node test.js" ++ }, ++ "author": { ++ "name": "Andrew Kelley", ++ "email": "superjoe30@gmail.com" ++ }, ++ "license": "MIT", ++ "repository": { ++ "type": "git", ++ "url": "git://github.com/andrewrk/node-human-size.git" ++ }, ++ "bugs": { ++ "url": "https://github.com/andrewrk/node-human-size/issues" ++ }, ++ "_id": "human-size@1.1.0", ++ "dist": { ++ "shasum": "052562be999841c037022c20259990c56ea996f9", ++ "tarball": "http://registry.npmjs.org/human-size/-/human-size-1.1.0.tgz" ++ }, ++ "_from": "human-size@", ++ "_npmVersion": "1.3.10", ++ "_npmUser": { ++ "name": "superjoe", ++ "email": "superjoe30@gmail.com" ++ }, ++ "maintainers": [ ++ { ++ "name": "superjoe", ++ "email": "superjoe30@gmail.com" ++ } ++ ], ++ "directories": {}, ++ "_shasum": "052562be999841c037022c20259990c56ea996f9", ++ "_resolved": "https://registry.npmjs.org/human-size/-/human-size-1.1.0.tgz" ++} diff --git a/debian/patches/bundle-connect-static-module.patch b/debian/patches/bundle-connect-static-module.patch deleted file mode 100644 index 6daeebe..0000000 --- a/debian/patches/bundle-connect-static-module.patch +++ /dev/null @@ -1,270 +0,0 @@ -Description: bundle connect-static module - FTP masters rejected node-connect-static on the account of it being too small, - so we bundle the module here. -Author: Andrew Kelley -Forwarded: not-needed ---- /dev/null -+++ groovebasin-1.4.0/node_modules/connect-static/index.js -@@ -0,0 +1,110 @@ -+var zlib = require('zlib'); -+var fs = require('fs'); -+var stream = require('stream'); -+var util = require('util'); -+var path = require('path'); -+var Pend = require('pend'); -+var findit = require('findit2'); -+var mime = require('mime'); -+var url = require('url'); -+var StreamSink = require('streamsink'); -+var crypto = require('crypto'); -+ -+module.exports = createGzipStaticMiddleware; -+ -+function createGzipStaticMiddleware(options, cb) { -+ options = options || {}; -+ var dir = options.dir || "public"; -+ var ignoreFile = options.ignoreFile || defaultIgnoreFile; -+ var aliases = options.aliases || [['/', '/index.html']]; -+ var followSymlinks = (options.followSymlinks == null) ? true : !!options.followSymlinks; -+ -+ var cache = {}; -+ var pend = new Pend(); -+ var walker = findit(dir, {followSymlinks: followSymlinks}); -+ walker.on('error', function(err) { -+ walker.stop(); -+ cb(err); -+ }); -+ walker.on('file', function(file, stat, linkPath) { -+ var usePath = linkPath || file; -+ if (ignoreFile(usePath)) return; -+ var relName = '/' + path.relative(dir, usePath); -+ var sink = new StreamSink(); -+ var inStream = fs.createReadStream(file); -+ var cacheObj; -+ cache[relName] = cacheObj = { -+ sink: sink, -+ mime: mime.lookup(relName), -+ mtime: stat.mtime, -+ hash: null, -+ }; -+ var gzipPendCb, hashPendCb; -+ inStream.on('error', function(err) { -+ if (err.code === 'EISDIR') { -+ delete cache[relName]; -+ gzipPendCb(); -+ hashPendCb(); -+ } else { -+ walker.stop(); -+ gzipPendCb(err); -+ hashPendCb(err); -+ } -+ }); -+ pend.go(function(cb) { -+ gzipPendCb = cb; -+ inStream.pipe(zlib.createGzip()).pipe(sink); -+ sink.on('finish', cb); -+ }); -+ pend.go(function(cb) { -+ hashPendCb = cb; -+ var hashSink = new StreamSink(); -+ inStream.pipe(crypto.createHash('sha1')).pipe(hashSink); -+ hashSink.on('finish', function() { -+ cacheObj.hash = hashSink.toString('base64'); -+ cb(); -+ }); -+ }); -+ }); -+ walker.on('end', function() { -+ pend.wait(function(err) { -+ if (err) return cb(err); -+ aliases.forEach(function(alias) { -+ cache[alias[0]] = cache[alias[1]]; -+ }); -+ cb(null, middleware); -+ }); -+ function middleware(req, resp, next) { -+ var parsedUrl = url.parse(req.url); -+ var c = cache[parsedUrl.pathname]; -+ if (!c) return next(); -+ if (req.headers['if-none-match'] === c.hash) { -+ resp.statusCode = 304; -+ resp.end(); -+ return; -+ } -+ var ifModifiedSince = new Date(req.headers['if-modified-since']); -+ if (!isNaN(ifModifiedSince) && c.mtime <= ifModifiedSince) { -+ resp.statusCode = 304; -+ resp.end(); -+ return; -+ } -+ -+ var sink = c.sink; -+ resp.setHeader('Content-Type', c.mime); -+ resp.setHeader('Cache-Control', 'max-age=0, must-revalidate'); -+ resp.setHeader('ETag', c.hash); -+ if (req.headers['accept-encoding'] == null) { -+ sink.createReadStream().pipe(zlib.createGunzip()).pipe(resp); -+ } else { -+ resp.setHeader('Content-Encoding', 'gzip'); -+ sink.createReadStream().pipe(resp); -+ } -+ } -+ }); -+} -+ -+function defaultIgnoreFile(file) { -+ var basename = path.basename(file); -+ return /^\./.test(basename) || /~$/.test(basename); -+} ---- /dev/null -+++ groovebasin-1.4.0/node_modules/connect-static/node_modules/streamsink/index.js -@@ -0,0 +1,53 @@ -+var stream = require('stream'); -+var util = require('util'); -+ -+module.exports = StreamSink; -+StreamSink.fromBuffer = fromBuffer; -+StreamSink.fromBufferList = fromBufferList; -+ -+function fromBuffer(buffer, options) { -+ return fromBufferList([buffer], options); -+} -+ -+function fromBufferList(bufferList, options) { -+ var sink = new StreamSink(options); -+ sink.buffer = bufferList; -+ sink.length = 0; -+ bufferList.forEach(function(buffer) { -+ sink.length += buffer.length; -+ }); -+ return sink; -+} -+ -+util.inherits(StreamSink, stream.Writable); -+function StreamSink(options) { -+ stream.Writable.call(this, options); -+ this.buffer = []; -+ this.length = 0; -+} -+ -+StreamSink.prototype._write = function(chunk, encoding, callback) { -+ this.buffer.push(chunk); -+ this.length += chunk.length; -+ callback(); -+}; -+ -+StreamSink.prototype.createReadStream = function(options) { -+ var s = new stream.Readable(options); -+ s.buffer = this.buffer; -+ s._read = function(size) { -+ for (var i = 0; i < s.buffer.length; i += 1) { -+ s.push(s.buffer[i]); -+ } -+ s.push(null); -+ }; -+ return s; -+}; -+ -+StreamSink.prototype.toString = function(encoding, start, end) { -+ return this.toBuffer().toString(encoding, start, end); -+}; -+ -+StreamSink.prototype.toBuffer = function() { -+ return Buffer.concat(this.buffer, this.length); -+}; ---- /dev/null -+++ groovebasin-1.4.0/node_modules/connect-static/node_modules/streamsink/package.json -@@ -0,0 +1,42 @@ -+{ -+ "name": "streamsink", -+ "version": "1.2.0", -+ "description": "pipe to a buffer, then create readable streams from it", -+ "main": "index.js", -+ "scripts": { -+ "test": "node test.js" -+ }, -+ "repository": { -+ "type": "git", -+ "url": "git://github.com/andrewrk/node-streamsink.git" -+ }, -+ "author": { -+ "name": "Andrew Kelley", -+ "email": "superjoe30@gmail.com" -+ }, -+ "license": "MIT", -+ "bugs": { -+ "url": "https://github.com/andrewrk/node-streamsink/issues" -+ }, -+ "homepage": "https://github.com/andrewrk/node-streamsink", -+ "_id": "streamsink@1.2.0", -+ "dist": { -+ "shasum": "efafee9f1e22d3591ed7de3dcaa95c3f5e79f73c", -+ "tarball": "http://registry.npmjs.org/streamsink/-/streamsink-1.2.0.tgz" -+ }, -+ "_from": "streamsink@~1.2.0", -+ "_npmVersion": "1.3.10", -+ "_npmUser": { -+ "name": "superjoe", -+ "email": "superjoe30@gmail.com" -+ }, -+ "maintainers": [ -+ { -+ "name": "superjoe", -+ "email": "superjoe30@gmail.com" -+ } -+ ], -+ "directories": {}, -+ "_shasum": "efafee9f1e22d3591ed7de3dcaa95c3f5e79f73c", -+ "_resolved": "https://registry.npmjs.org/streamsink/-/streamsink-1.2.0.tgz" -+} ---- /dev/null -+++ groovebasin-1.4.0/node_modules/connect-static/package.json -@@ -0,0 +1,48 @@ -+{ -+ "name": "connect-static", -+ "version": "1.3.1", -+ "description": "static file server middleware for connect. loads files once at startup and saves gzipped versions in memory", -+ "main": "index.js", -+ "scripts": { -+ "test": "node test/test.js" -+ }, -+ "repository": { -+ "type": "git", -+ "url": "git://github.com/andrewrk/connect-static.git" -+ }, -+ "author": { -+ "name": "Andrew Kelley", -+ "email": "superjoe30@gmail.com" -+ }, -+ "license": "MIT", -+ "bugs": { -+ "url": "https://github.com/andrewrk/connect-static/issues" -+ }, -+ "homepage": "https://github.com/andrewrk/connect-static", -+ "dependencies": { -+ "findit2": "~2.2.0", -+ "mime": "~1.2.11", -+ "pend": "~1.1.3", -+ "streamsink": "~1.2.0" -+ }, -+ "_id": "connect-static@1.3.1", -+ "dist": { -+ "shasum": "9920c86365ebb518b1c9a2a33855682bea55044f", -+ "tarball": "http://registry.npmjs.org/connect-static/-/connect-static-1.3.1.tgz" -+ }, -+ "_from": "connect-static@~1.3.1", -+ "_npmVersion": "1.3.10", -+ "_npmUser": { -+ "name": "superjoe", -+ "email": "superjoe30@gmail.com" -+ }, -+ "maintainers": [ -+ { -+ "name": "superjoe", -+ "email": "superjoe30@gmail.com" -+ } -+ ], -+ "directories": {}, -+ "_shasum": "9920c86365ebb518b1c9a2a33855682bea55044f", -+ "_resolved": "https://registry.npmjs.org/connect-static/-/connect-static-1.3.1.tgz" -+} diff --git a/debian/patches/bundle-curlydiff-module.patch b/debian/patches/bundle-curlydiff-module.patch deleted file mode 100644 index 9df77ad..0000000 --- a/debian/patches/bundle-curlydiff-module.patch +++ /dev/null @@ -1,120 +0,0 @@ -Description: bundle curlydiff module - FTP masters would reject node-curlydiff on the account of it being too small, - so we bundle the module here. -Author: Andrew Kelley -Forwarded: not-needed - ---- /dev/null -+++ groovebasin-1.3.0/node_modules/curlydiff/index.js -@@ -0,0 +1,62 @@ -+module.exports.diff = diff; -+module.exports.apply = apply; -+module.exports.isObject = isObject; -+ -+function diff(from, to) { -+ if (!isObject(from) || !isObject(to)) { -+ // not both objects -+ if (from === to) return undefined; -+ if (from instanceof Date && to instanceof Date && from.getTime() === to.getTime()) return undefined; -+ // there's a difference -+ return to; -+ } -+ // both are objects -+ var result = {}; -+ var anythingChanged = false; -+ for (var key in from) { -+ var childDiff; -+ if (key in to) { -+ childDiff = diff(from[key], to[key]); -+ if (childDiff === undefined) continue; -+ } else { -+ // deleted -+ childDiff = null; -+ } -+ // there's a difference -+ result[key] = childDiff; -+ anythingChanged = true; -+ } -+ for (var key in to) { -+ if (key in from) continue; // handled above -+ result[key] = to[key]; -+ anythingChanged = true; -+ } -+ if (anythingChanged) return result; -+ // no change -+ return undefined; -+} -+ -+function apply(object, patch) { -+ if (patch === undefined) return object; -+ if (!isObject(object) || !isObject(patch)) return patch; -+ // both are objects -+ for (var key in patch) { -+ var patchChild = patch[key]; -+ if (patchChild == null) { -+ // removed -+ delete object[key]; -+ } else { -+ // either this assignment or this function call will have side effects -+ object[key] = apply(object[key], patchChild); -+ } -+ } -+ return object; -+} -+ -+function isObject(object) { -+ if (object == null) return false; -+ if (typeof object !== "object") return false; -+ if (Array.isArray(object)) return false; -+ if (object instanceof Date) return false; -+ return true; -+} ---- /dev/null -+++ groovebasin-1.3.0/node_modules/curlydiff/package.json -@@ -0,0 +1,46 @@ -+{ -+ "name": "curlydiff", -+ "version": "2.0.1", -+ "description": "diff nested JavaScript objects", -+ "main": "index.js", -+ "scripts": { -+ "test": "node test/test.js" -+ }, -+ "repository": { -+ "type": "git", -+ "url": "git://github.com/thejoshwolfe/curlydiff.git" -+ }, -+ "author": { -+ "name": "Josh Wolfe", -+ "email": "thejoshwolfe@gmail.com" -+ }, -+ "license": "MIT", -+ "bugs": { -+ "url": "https://github.com/thejoshwolfe/curlydiff/issues" -+ }, -+ "devDependencies": { -+ "whynoteq": "~1.0.2" -+ }, -+ "gitHead": "b8f52b5906ec3e93873447e072c2d370c02cf869", -+ "homepage": "https://github.com/thejoshwolfe/curlydiff", -+ "_id": "curlydiff@2.0.1", -+ "_shasum": "6ac4b754ea5b63af2632022d03a152306f7eac0b", -+ "_from": "curlydiff@~2.0.1", -+ "_npmVersion": "1.4.28", -+ "_npmUser": { -+ "name": "thejoshwolfe", -+ "email": "thejoshwolfe@gmail.com" -+ }, -+ "maintainers": [ -+ { -+ "name": "thejoshwolfe", -+ "email": "thejoshwolfe@gmail.com" -+ } -+ ], -+ "dist": { -+ "shasum": "6ac4b754ea5b63af2632022d03a152306f7eac0b", -+ "tarball": "http://registry.npmjs.org/curlydiff/-/curlydiff-2.0.1.tgz" -+ }, -+ "directories": {}, -+ "_resolved": "https://registry.npmjs.org/curlydiff/-/curlydiff-2.0.1.tgz" -+} diff --git a/debian/patches/bundle-human-size-module.patch b/debian/patches/bundle-human-size-module.patch deleted file mode 100644 index dbf4ef8..0000000 --- a/debian/patches/bundle-human-size-module.patch +++ /dev/null @@ -1,62 +0,0 @@ -Description: bundle human-size module - FTP masters rejected node-human-size on the account of it being too small, - so we bundle the module here. -Author: Andrew Kelley -Forwarded: not-needed ---- /dev/null -+++ groovebasin-1.4.0/node_modules/human-size/index.js -@@ -0,0 +1,10 @@ -+module.exports = humanSize; -+ -+var mags = ' KMGTPEZY'; -+ -+function humanSize(bytes, precision) { -+ var magnitude = Math.min(Math.log(bytes) / Math.log(1024) | 0, mags.length - 1); -+ var result = bytes / Math.pow(1024, magnitude); -+ var suffix = mags[magnitude].trim() + 'B'; -+ return result.toFixed(precision) + suffix; -+} ---- /dev/null -+++ groovebasin-1.4.0/node_modules/human-size/package.json -@@ -0,0 +1,41 @@ -+{ -+ "name": "human-size", -+ "version": "1.1.0", -+ "description": "human readable file size", -+ "main": "index.js", -+ "scripts": { -+ "test": "node test.js" -+ }, -+ "author": { -+ "name": "Andrew Kelley", -+ "email": "superjoe30@gmail.com" -+ }, -+ "license": "MIT", -+ "repository": { -+ "type": "git", -+ "url": "git://github.com/andrewrk/node-human-size.git" -+ }, -+ "bugs": { -+ "url": "https://github.com/andrewrk/node-human-size/issues" -+ }, -+ "_id": "human-size@1.1.0", -+ "dist": { -+ "shasum": "052562be999841c037022c20259990c56ea996f9", -+ "tarball": "http://registry.npmjs.org/human-size/-/human-size-1.1.0.tgz" -+ }, -+ "_from": "human-size@", -+ "_npmVersion": "1.3.10", -+ "_npmUser": { -+ "name": "superjoe", -+ "email": "superjoe30@gmail.com" -+ }, -+ "maintainers": [ -+ { -+ "name": "superjoe", -+ "email": "superjoe30@gmail.com" -+ } -+ ], -+ "directories": {}, -+ "_shasum": "052562be999841c037022c20259990c56ea996f9", -+ "_resolved": "https://registry.npmjs.org/human-size/-/human-size-1.1.0.tgz" -+} diff --git a/debian/patches/bundle-mv-module.patch b/debian/patches/bundle-mv-module.patch deleted file mode 100644 index 78dccc9..0000000 --- a/debian/patches/bundle-mv-module.patch +++ /dev/null @@ -1,179 +0,0 @@ -Description: bundle mv module - FTP masters rejected node-mv on the account of it being too small, so we - bundle the module here. -Author: Andrew Kelley -Forwarded: not-needed - ---- /dev/null -+++ groovebasin-1.3.0/node_modules/mv/index.js -@@ -0,0 +1,105 @@ -+var fs = require('fs'); -+var ncp = require('ncp').ncp; -+var path = require('path'); -+var rimraf = require('rimraf'); -+var mkdirp = require('mkdirp'); -+ -+module.exports = mv; -+ -+function mv(source, dest, options, cb){ -+ if (typeof options === 'function') { -+ cb = options; -+ options = {}; -+ } -+ var shouldMkdirp = !!options.mkdirp; -+ var clobber = options.clobber !== false; -+ var limit = options.limit || 16; -+ -+ if (shouldMkdirp) { -+ mkdirs(); -+ } else { -+ doRename(); -+ } -+ -+ function mkdirs() { -+ mkdirp(path.dirname(dest), function(err) { -+ if (err) return cb(err); -+ doRename(); -+ }); -+ } -+ -+ function doRename() { -+ if (clobber) { -+ fs.rename(source, dest, function(err) { -+ if (!err) return cb(); -+ if (err.code !== 'EXDEV') return cb(err); -+ moveFileAcrossDevice(source, dest, clobber, limit, cb); -+ }); -+ } else { -+ fs.link(source, dest, function(err) { -+ if (err) { -+ if (err.code === 'EXDEV') { -+ moveFileAcrossDevice(source, dest, clobber, limit, cb); -+ return; -+ } -+ if (err.code === 'EISDIR' || err.code === 'EPERM') { -+ moveDirAcrossDevice(source, dest, clobber, limit, cb); -+ return; -+ } -+ cb(err); -+ return; -+ } -+ fs.unlink(source, cb); -+ }); -+ } -+ } -+} -+ -+function moveFileAcrossDevice(source, dest, clobber, limit, cb) { -+ var outFlags = clobber ? 'w' : 'wx'; -+ var ins = fs.createReadStream(source); -+ var outs = fs.createWriteStream(dest, {flags: outFlags}); -+ ins.on('error', function(err){ -+ ins.destroy(); -+ outs.destroy(); -+ outs.removeListener('close', onClose); -+ if (err.code === 'EISDIR' || err.code === 'EPERM') { -+ moveDirAcrossDevice(source, dest, clobber, limit, cb); -+ } else { -+ cb(err); -+ } -+ }); -+ outs.on('error', function(err){ -+ ins.destroy(); -+ outs.destroy(); -+ outs.removeListener('close', onClose); -+ cb(err); -+ }); -+ outs.once('close', onClose); -+ ins.pipe(outs); -+ function onClose(){ -+ fs.unlink(source, cb); -+ } -+} -+ -+function moveDirAcrossDevice(source, dest, clobber, limit, cb) { -+ var options = { -+ stopOnErr: true, -+ clobber: false, -+ limit: limit, -+ }; -+ if (clobber) { -+ rimraf(dest, function(err) { -+ if (err) return cb(err); -+ startNcp(); -+ }); -+ } else { -+ startNcp(); -+ } -+ function startNcp() { -+ ncp(source, dest, options, function(errList) { -+ if (errList) return cb(errList[0]); -+ rimraf(source, cb); -+ }); -+ } -+} ---- /dev/null -+++ groovebasin-1.3.0/node_modules/mv/package.json -@@ -0,0 +1,62 @@ -+{ -+ "name": "mv", -+ "version": "2.0.3", -+ "description": "fs.rename but works across devices. same as the unix utility 'mv'", -+ "main": "index.js", -+ "scripts": { -+ "test": "mocha test/test.js --reporter spec" -+ }, -+ "repository": { -+ "type": "git", -+ "url": "git://github.com/andrewrk/node-mv.git" -+ }, -+ "keywords": [ -+ "mv", -+ "move", -+ "rename", -+ "device", -+ "recursive", -+ "folder" -+ ], -+ "author": { -+ "name": "Andrew Kelley" -+ }, -+ "license": "MIT", -+ "engines": { -+ "node": ">=0.8.0" -+ }, -+ "devDependencies": { -+ "mocha": "~1.21.0" -+ }, -+ "dependencies": { -+ "mkdirp": "~0.5.0", -+ "ncp": "~0.6.0", -+ "rimraf": "~2.2.8" -+ }, -+ "bugs": { -+ "url": "https://github.com/andrewrk/node-mv/issues" -+ }, -+ "homepage": "https://github.com/andrewrk/node-mv", -+ "directories": { -+ "test": "test" -+ }, -+ "_id": "mv@2.0.3", -+ "dist": { -+ "shasum": "e9ab707d71dc38de24edcc637a8e2f5f480c7f32", -+ "tarball": "http://registry.npmjs.org/mv/-/mv-2.0.3.tgz" -+ }, -+ "_from": "mv@~2.0.3", -+ "_npmVersion": "1.3.10", -+ "_npmUser": { -+ "name": "superjoe", -+ "email": "superjoe30@gmail.com" -+ }, -+ "maintainers": [ -+ { -+ "name": "superjoe", -+ "email": "superjoe30@gmail.com" -+ } -+ ], -+ "_shasum": "e9ab707d71dc38de24edcc637a8e2f5f480c7f32", -+ "_resolved": "https://registry.npmjs.org/mv/-/mv-2.0.3.tgz" -+} diff --git a/debian/patches/disable-default-ssl.patch b/debian/patches/disable-default-ssl.patch deleted file mode 100644 index 4a2a14d..0000000 --- a/debian/patches/disable-default-ssl.patch +++ /dev/null @@ -1,21 +0,0 @@ -Description: disable default SSL - upstream defaults to using a self-signed cert and https. This requires users - to click through a certificate warning in the browser. We would rather have - the security vulnerability of passwords passing unprotected over HTTP than - train users to click through the "ignore bad certificate" warning. -Author: Andrew Kelley -Forwarded: not-needed - ---- groovebasin-1.3.0.orig/lib/groovebasin.js -+++ groovebasin-1.3.0/lib/groovebasin.js -@@ -42,8 +42,8 @@ var defaultConfig = { - mpdPort: 6600, - acoustidAppKey: 'bgFvC4vW', - encodeQueueDuration: 8, -- sslKey: 'certs/self-signed-key.pem', -- sslCert: 'certs/self-signed-cert.pem', -+ sslKey: null, -+ sslCert: null, - }; - - util.inherits(GrooveBasin, EventEmitter); diff --git a/debian/patches/series b/debian/patches/series index ea562dc..15eb7c2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,7 @@ -shebang.patch -disable-default-ssl.patch -bundle-connect-static-module.patch -bundle-curlydiff-module.patch -bundle-mv-module.patch -bundle-human-size-module.patch -2000-mime-gettype.patch +2000-shebang.patch +2010-disable-default-ssl.patch +2020-bundle-connect-static-module.patch +2021-bundle-connect-static-mime-gettype.patch +2030-bundle-curlydiff-module.patch +2040-bundle-mv-module.patch +2050-bundle-human-size-module.patch diff --git a/debian/patches/shebang.patch b/debian/patches/shebang.patch deleted file mode 100644 index af67df0..0000000 --- a/debian/patches/shebang.patch +++ /dev/null @@ -1,13 +0,0 @@ -Description: shebang line to nodejs -Author: Andrew Kelley -Forwarded: not-needed -Last-Update: 2014-07-04 - ---- groovebasin-1.2.0.orig/lib/server.js -+++ groovebasin-1.2.0/lib/server.js -@@ -1,4 +1,4 @@ --#!/usr/bin/env node -+#!/usr/bin/env nodejs - - if (!process.env.NODE_ENV) process.env.NODE_ENV = "dev"; - -- cgit v1.2.3