meshcentral: 1.0.18 -> 1.1.0

This commit is contained in:
Maximilian Bosch 2022-11-29 14:28:54 +01:00
parent 24fbf8323c
commit 54dba44317
No known key found for this signature in database
GPG Key ID: 9A6EEA275CA5BE0A
5 changed files with 6540 additions and 2079 deletions

View File

@ -1,13 +1,15 @@
{ lib, fetchpatch, fetchzip, yarn2nix-moretea, nodejs, jq, dos2unix }: { lib, fetchpatch, fetchzip, yarn2nix-moretea, nodejs-16_x, jq, dos2unix }:
yarn2nix-moretea.mkYarnPackage rec { yarn2nix-moretea.mkYarnPackage {
version = "1.0.18"; version = "1.1.0";
src = fetchzip { src = fetchzip {
url = "https://registry.npmjs.org/meshcentral/-/meshcentral-${version}.tgz"; url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.0.tgz";
sha256 = "03bs7c2n4cxpsjkrcwinmjarcfwxvkg10xvnjk5r1rnkzlrsy8pm"; sha256 = "1g7wgph35h8vi44yn4niv1jq2d8v9xrwps9k4bfjyd6470gg2sfc";
}; };
patches = [ ./fix-js-include-paths.patch ];
packageJSON = ./package.json; packageJSON = ./package.json;
yarnLock = ./yarn.lock; yarnLock = ./yarn.lock;
yarnNix = ./yarn.nix; yarnNix = ./yarn.nix;
@ -22,7 +24,7 @@ yarn2nix-moretea.mkYarnPackage rec {
preFixup = '' preFixup = ''
mkdir -p $out/bin mkdir -p $out/bin
chmod a+x $out/libexec/meshcentral/deps/meshcentral/meshcentral.js chmod a+x $out/libexec/meshcentral/deps/meshcentral/meshcentral.js
sed -i '1i#!${nodejs}/bin/node' $out/libexec/meshcentral/deps/meshcentral/meshcentral.js sed -i '1i#!${nodejs-16_x}/bin/node' $out/libexec/meshcentral/deps/meshcentral/meshcentral.js
ln -s $out/libexec/meshcentral/deps/meshcentral/meshcentral.js $out/bin/meshcentral ln -s $out/libexec/meshcentral/deps/meshcentral/meshcentral.js $out/bin/meshcentral
''; '';

View File

@ -0,0 +1,31 @@
diff --git a/pkcs7-modified.js b/pkcs7-modified.js
index 661904a6..932a41ad 100644
--- a/pkcs7-modified.js
+++ b/pkcs7-modified.js
@@ -31,16 +31,16 @@ try {
} catch (ex) { }
if (forge == null) {
- forge = require('./node_modules/node-forge/lib/forge');
- require('./node_modules/node-forge/lib/aes');
- require('./node_modules/node-forge/lib/asn1');
- require('./node_modules/node-forge/lib/des');
- require('./node_modules/node-forge/lib/oids');
- require('./node_modules/node-forge/lib/pem');
- require('./node_modules/node-forge/lib/pkcs7asn1');
- require('./node_modules/node-forge/lib/random');
- require('./node_modules/node-forge/lib/util');
- require('./node_modules/node-forge/lib/x509');
+ forge = require('node-forge/lib/forge');
+ require('node-forge/lib/aes');
+ require('node-forge/lib/asn1');
+ require('node-forge/lib/des');
+ require('node-forge/lib/oids');
+ require('node-forge/lib/pem');
+ require('node-forge/lib/pkcs7asn1');
+ require('node-forge/lib/random');
+ require('node-forge/lib/util');
+ require('node-forge/lib/x509');
}
// shortcut for ASN.1 API

View File

@ -1,6 +1,6 @@
{ {
"name": "meshcentral", "name": "meshcentral",
"version": "1.0.18", "version": "1.1.0",
"keywords": [ "keywords": [
"Remote Device Management", "Remote Device Management",
"Remote Device Monitoring", "Remote Device Monitoring",
@ -37,6 +37,7 @@
"sample-config-advanced.json" "sample-config-advanced.json"
], ],
"dependencies": { "dependencies": {
"archiver": "^5.3.1",
"body-parser": "^1.19.0", "body-parser": "^1.19.0",
"cbor": "~5.2.0", "cbor": "~5.2.0",
"compression": "^1.7.4", "compression": "^1.7.4",
@ -59,16 +60,17 @@
"type": "git", "type": "git",
"url": "https://github.com/Ylianst/MeshCentral.git" "url": "https://github.com/Ylianst/MeshCentral.git"
}, },
"readme": "readme.txt", "readme": "readme.md",
"optionalDependencies": { "optionalDependencies": {
"passport": "*", "passport": "0.5.3",
"passport-twitter": "*", "passport-twitter": "*",
"passport-google-oauth20": "*", "passport-google-oauth20": "*",
"passport-github2": "*", "passport-github2": "*",
"passport-reddit": "*", "passport-reddit": "*",
"passport-azure-oauth2": "*", "passport-azure-oauth2": "*",
"jwt-simple": "*", "jwt-simple": "*",
"@mstrhakr/passport-generic-oidc": "*", "@mstrhakr/passport-openidconnect": "*",
"openid-client": "*",
"passport-saml": "*", "passport-saml": "*",
"ws": "5.2.3", "ws": "5.2.3",
"cbor": "5.2.0", "cbor": "5.2.0",
@ -77,7 +79,7 @@
"yauzl": "*", "yauzl": "*",
"ipcheck": "*", "ipcheck": "*",
"express": "*", "express": "*",
"archiver": "4.0.2", "archiver": "5.3.1",
"multiparty": "*", "multiparty": "*",
"node-forge": "*", "node-forge": "*",
"express-ws": "4.0.0", "express-ws": "4.0.0",
@ -90,16 +92,19 @@
"node-sspi": "*", "node-sspi": "*",
"ldapauth-fork": "*", "ldapauth-fork": "*",
"ssh2": "*", "ssh2": "*",
"svg-captcha": "*",
"image-size": "*", "image-size": "*",
"acme-client": "*", "acme-client": "4.2.5",
"aedes": "0.39.0", "aedes": "0.39.0",
"mysql": "*", "mysql": "*",
"@mysql/xdevapi": "*", "@mysql/xdevapi": "*",
"mongodb": "4.1.0", "mongodb": "4.9.1",
"saslprep": "*", "saslprep": "*",
"pg": "8.7.1", "pg": "8.7.1",
"pgtools": "0.3.2", "pgtools": "0.3.2",
"mariadb": "*", "mariadb": "*",
"acebase": "*",
"sqlite3": "*",
"node-vault": "*", "node-vault": "*",
"semver": "*", "semver": "*",
"https-proxy-agent": "*", "https-proxy-agent": "*",
@ -110,6 +115,7 @@
"esprima": "*", "esprima": "*",
"minify-js": "*", "minify-js": "*",
"html-minifier": "*", "html-minifier": "*",
"@crowdsec/express-bouncer": "*",
"archiver-zip-encrypted": "*", "archiver-zip-encrypted": "*",
"googleapis": "*", "googleapis": "*",
"webdav": "*", "webdav": "*",
@ -119,8 +125,14 @@
"twilio": "*", "twilio": "*",
"plivo": "*", "plivo": "*",
"telnyx": "*", "telnyx": "*",
"telegram": "*",
"input": "*",
"discord.js": "14.6.0",
"@xmpp/client": "*",
"node-pushover": "*",
"zulip": "*",
"web-push": "*", "web-push": "*",
"node-xcs": "*", "node-xcs": "0.1.7",
"modern-syslog": "*", "modern-syslog": "*",
"syslog": "*", "syslog": "*",
"heapdump": "*" "heapdump": "*"

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff