From 01416243d265c8ed4d44eb8aa27ba37af981e9e5 Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Mon, 27 Apr 2026 19:55:31 -0700 Subject: [PATCH] build: replace spec dep fork with patch --- .../dbus-native-npm-0.4.0-fd59c31eb6.patch | 26 +++++++++++ package.json | 3 +- spec/package.json | 2 +- yarn.lock | 45 ++++++++++++++----- 4 files changed, 62 insertions(+), 14 deletions(-) create mode 100644 .yarn/patches/dbus-native-npm-0.4.0-fd59c31eb6.patch diff --git a/.yarn/patches/dbus-native-npm-0.4.0-fd59c31eb6.patch b/.yarn/patches/dbus-native-npm-0.4.0-fd59c31eb6.patch new file mode 100644 index 0000000000..82daaed7a6 --- /dev/null +++ b/.yarn/patches/dbus-native-npm-0.4.0-fd59c31eb6.patch @@ -0,0 +1,26 @@ +diff --git a/lib/marshall.js b/lib/marshall.js +index 5a7434162d97208ec34fb87bfce3c953fd90345a..86f0efd9d0c99ecb3ae4d12c46130778f813ac5b 100644 +--- a/lib/marshall.js ++++ b/lib/marshall.js +@@ -1,7 +1,7 @@ + const assert = require('assert'); + + const parseSignature = require('./signature'); +-const put = require('put'); ++const put = require('@nornagon/put'); + const Marshallers = require('./marshallers'); + const align = require('./align').align; + +diff --git a/package.json b/package.json +index 2519ac38fad44569cb8a156a91af25a70c8166a5..f7d88ac6cdb00a0a7064b0e39986821816c75554 100644 +--- a/package.json ++++ b/package.json +@@ -42,7 +42,7 @@ + "hexy": "^0.2.10", + "long": "^4.0.0", + "optimist": "^0.6.1", +- "put": "0.0.6", ++ "@nornagon/put": "0.0.8", + "safe-buffer": "^5.1.1", + "xml2js": "^0.4.17" + }, diff --git a/package.json b/package.json index d4e0c34f27..ce807b6380 100644 --- a/package.json +++ b/package.json @@ -143,7 +143,8 @@ "resolutions": { "dbus-native/xml2js": "0.5.0", "abstract-socket": "github:deepak1556/node-abstractsocket#928cc591decd12aff7dad96449da8afc29832c19", - "minimist@npm:~0.0.1": "0.2.4" + "minimist@npm:~0.0.1": "0.2.4", + "put": "npm:@nornagon/put@0.0.8" }, "packageManager": "yarn@4.12.0", "workspaces": [ diff --git a/spec/package.json b/spec/package.json index 7e582b52b6..8eb1e8892e 100644 --- a/spec/package.json +++ b/spec/package.json @@ -33,7 +33,7 @@ "chai": "^4.2.0", "chai-as-promised": "^7.1.1", "coffeescript": "^2.4.1", - "dbus-native": "github:nornagon/dbus-native#master", + "dbus-native": "patch:dbus-native@npm%3A0.4.0#~/.yarn/patches/dbus-native-npm-0.4.0-fd59c31eb6.patch", "dirty-chai": "^2.0.1", "express": "^4.20.0", "graceful-fs": "^4.1.15", diff --git a/yarn.lock b/yarn.lock index 3dabe9d751..536264c344 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1282,13 +1282,6 @@ __metadata: languageName: node linkType: hard -"@nornagon/put@npm:0.0.8": - version: 0.0.8 - resolution: "@nornagon/put@npm:0.0.8" - checksum: 10c0/855f9cee72d76570c76cdded2c3727ae7c3caa08208066ba77561675a43173bc62c8ee6dce6f4b64d65c5b465d20b4f9d986975ef3f2a6413e6f6c97bb5e1627 - languageName: node - linkType: hard - "@npmcli/agent@npm:^3.0.0": version: 3.0.0 resolution: "@npmcli/agent@npm:3.0.0" @@ -4108,16 +4101,16 @@ __metadata: languageName: node linkType: hard -"dbus-native@github:nornagon/dbus-native#master": +"dbus-native@npm:0.4.0": version: 0.4.0 - resolution: "dbus-native@https://github.com/nornagon/dbus-native.git#commit=b90ed62d0b5cb93909173c3e0551d9bff0602a90" + resolution: "dbus-native@npm:0.4.0" dependencies: - "@nornagon/put": "npm:0.0.8" abstract-socket: "npm:^2.0.0" event-stream: "npm:^4.0.0" hexy: "npm:^0.2.10" long: "npm:^4.0.0" optimist: "npm:^0.6.1" + put: "npm:0.0.6" safe-buffer: "npm:^5.1.1" xml2js: "npm:^0.4.17" dependenciesMeta: @@ -4125,7 +4118,28 @@ __metadata: optional: true bin: dbus2js: ./bin/dbus2js.js - checksum: 10c0/4467ae4f9f1e9d5f7fc4d12f227a7cf5e45f77c89743646ccef7a1f89e5f37fbe671b47488cf78d6557fd6d4f2c3719f5c5a1de70078843e6b0f317d12aa55b1 + checksum: 10c0/f913bb8dc2162e0c6ee684dd7e63375005de2d238569f499b9478174ce31bcd089ea6bbddd629599a330218927e4bfe4fecaeb951db23aba4befd018f5f7ecfe + languageName: node + linkType: hard + +"dbus-native@patch:dbus-native@npm%3A0.4.0#~/.yarn/patches/dbus-native-npm-0.4.0-fd59c31eb6.patch": + version: 0.4.0 + resolution: "dbus-native@patch:dbus-native@npm%3A0.4.0#~/.yarn/patches/dbus-native-npm-0.4.0-fd59c31eb6.patch::version=0.4.0&hash=d53594" + dependencies: + abstract-socket: "npm:^2.0.0" + event-stream: "npm:^4.0.0" + hexy: "npm:^0.2.10" + long: "npm:^4.0.0" + optimist: "npm:^0.6.1" + put: "npm:0.0.6" + safe-buffer: "npm:^5.1.1" + xml2js: "npm:^0.4.17" + dependenciesMeta: + abstract-socket: + optional: true + bin: + dbus2js: ./bin/dbus2js.js + checksum: 10c0/16ed77e808044737c8ab56f1a06b8e845b7ab107838254d2990583c2a0b1f5e242c0e446fae860610072df5d25a9e2f88c58213f3212855969201109ef206983 languageName: node linkType: hard @@ -4502,7 +4516,7 @@ __metadata: chai: "npm:^4.2.0" chai-as-promised: "npm:^7.1.1" coffeescript: "npm:^2.4.1" - dbus-native: "github:nornagon/dbus-native#master" + dbus-native: "patch:dbus-native@npm%3A0.4.0#~/.yarn/patches/dbus-native-npm-0.4.0-fd59c31eb6.patch" dirty-chai: "npm:^2.0.1" express: "npm:^4.20.0" graceful-fs: "npm:^4.1.15" @@ -9806,6 +9820,13 @@ __metadata: languageName: node linkType: hard +"put@npm:@nornagon/put@0.0.8": + version: 0.0.8 + resolution: "@nornagon/put@npm:0.0.8" + checksum: 10c0/855f9cee72d76570c76cdded2c3727ae7c3caa08208066ba77561675a43173bc62c8ee6dce6f4b64d65c5b465d20b4f9d986975ef3f2a6413e6f6c97bb5e1627 + languageName: node + linkType: hard + "q@npm:^1.5.1": version: 1.5.1 resolution: "q@npm:1.5.1"