Skip to content

Commit

Permalink
meshcentral: 1.1.35 -> 1.1.38
Browse files Browse the repository at this point in the history
Closes #372296

ChangeLogs:
* https://github.com/Ylianst/MeshCentral/releases/tag/1.1.38
* https://github.com/Ylianst/MeshCentral/releases/tag/1.1.37
* https://github.com/Ylianst/MeshCentral/releases/tag/1.1.36

Also adjusted the update script a little to discover optional
dependencies after most recent code changes.
  • Loading branch information
Ma27 committed Jan 19, 2025
1 parent 8e614ad commit 792640d
Show file tree
Hide file tree
Showing 4 changed files with 1,996 additions and 1,307 deletions.
8 changes: 4 additions & 4 deletions pkgs/tools/admin/meshcentral/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
}:

yarn2nix-moretea.mkYarnPackage {
version = "1.1.35";
version = "1.1.38";

src = fetchzip {
url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.35.tgz";
sha256 = "0y0c6r8bijkz2pwc9mgkkg3fi7sbaawcarvcjf47xa5zkl65a2qf";
url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.38.tgz";
sha256 = "1g87r4z6xh4hz1xsq64q2ryjr9pa7z2ym3gi9rdx4ch0qn0brsj0";
};

patches = [
Expand All @@ -24,7 +24,7 @@ yarn2nix-moretea.mkYarnPackage {

offlineCache = fetchYarnDeps {
yarnLock = ./yarn.lock;
hash = "sha256-wK3w5y0Ic9g6iBOUG7KseA1lPW2wzPMbJqb0YWiZJTM=";
hash = "sha256-wlIVi1ucxXTzVhTqwKRAkfIhuVy/aXAJgFQFChGtmeU=";
};

# Tarball has CRLF line endings. This makes patching difficult, so let's convert them.
Expand Down
18 changes: 10 additions & 8 deletions pkgs/tools/admin/meshcentral/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "meshcentral",
"version": "1.1.35",
"version": "1.1.38",
"keywords": [
"Remote Device Management",
"Remote Device Monitoring",
Expand Down Expand Up @@ -41,9 +41,9 @@
"archiver": "7.0.1",
"body-parser": "1.20.3",
"cbor": "5.2.0",
"compression": "1.7.4",
"compression": "1.7.5",
"cookie-session": "2.1.0",
"express": "4.21.1",
"express": "4.21.2",
"express-handlebars": "7.1.3",
"express-ws": "5.0.2",
"ipcheck": "0.1.0",
Expand Down Expand Up @@ -72,12 +72,13 @@
"jwt-simple": "*",
"openid-client": "5.7.1",
"passport-saml": "*",
"@duosecurity/duo_universal": "*",
"archiver": "7.0.1",
"body-parser": "1.20.3",
"cbor": "5.2.0",
"compression": "1.7.4",
"compression": "1.7.5",
"cookie-session": "2.1.0",
"express": "4.21.1",
"express": "4.21.2",
"express-handlebars": "7.1.3",
"express-ws": "5.0.2",
"ipcheck": "0.1.0",
Expand Down Expand Up @@ -109,16 +110,17 @@
"semver": "7.5.4",
"https-proxy-agent": "7.0.2",
"mongojs": "3.1.0",
"nodemailer": "6.9.15",
"nodemailer": "6.9.16",
"@sendgrid/mail": "*",
"jsdom": "22.1.0",
"esprima": "4.0.1",
"html-minifier": "4.0.0",
"@crowdsec/express-bouncer": "0.1.0",
"prom-client": "*",
"archiver-zip-encrypted": "2.0.0",
"googleapis": "128.0.0",
"webdav": "4.11.4",
"minio": "8.0.1",
"minio": "8.0.2",
"wildleek": "2.0.0",
"yubikeyotp": "0.2.0",
"otplib": "10.2.3",
Expand All @@ -132,7 +134,7 @@
"node-pushover": "1.0.0",
"zulip": "0.1.0",
"web-push": "3.6.6",
"node-xcs": "0.1.8",
"firebase-admin": "12.7.0",
"modern-syslog": "1.2.0",
"syslog": "0.1.1-1",
"heapdump": "0.3.15"
Expand Down
2 changes: 1 addition & 1 deletion pkgs/tools/admin/meshcentral/update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ cd package
awk <meshcentral.js "
BEGIN { RS=\"[\n;]\" }
match(\$0, /(modules|passport) = (\[.*\])$/, a) { print a[2] }
match(\$0, /(modules|passport).push\(('[^']+')\)/, a) { print a[2] }
match(\$0, /(modules|passport).push\(('[^)]+')\)/, a) { print \"[\" a[2] \"]\" }
" |
tr \' \" |
jq --slurp '[if type == "array" then .[] else . end] | flatten' |
Expand Down
Loading

0 comments on commit 792640d

Please sign in to comment.