Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main

1 files changed, 29 insertions, 0 deletions

diff --git a/devel/electron39/files/patch-electron_spec_api-net-log-spec.ts b/devel/electron39/files/patch-electron_spec_api-net-log-spec.ts
new file mode 100644
index 000000000000..5a52c3198a13
--- /dev/null
+++ b/devel/electron39/files/patch-electron_spec_api-net-log-spec.ts
@@ -0,0 +1,29 @@
+--- electron/spec/api-net-log-spec.ts.orig	2024-10-09 13:53:06 UTC
++++ electron/spec/api-net-log-spec.ts
+@@ -121,7 +121,7 @@ describe('netLog module', () => {
+     expect(JSON.parse(dump).events.some((x: any) => x.params && x.params.bytes && Buffer.from(x.params.bytes, 'base64').includes(unique))).to.be.true('uuid present in dump');
+   });
+ 
+-  ifit(process.platform !== 'linux')('should begin and end logging automatically when --log-net-log is passed', async () => {
++  ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('should begin and end logging automatically when --log-net-log is passed', async () => {
+     const appProcess = ChildProcess.spawn(process.execPath,
+       [appPath], {
+         env: {
+@@ -134,7 +134,7 @@ describe('netLog module', () => {
+     expect(fs.existsSync(dumpFile)).to.be.true('dump file exists');
+   });
+ 
+-  ifit(process.platform !== 'linux')('should begin and end logging automatically when --log-net-log is passed, and behave correctly when .startLogging() and .stopLogging() is called', async () => {
++  ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('should begin and end logging automatically when --log-net-log is passed, and behave correctly when .startLogging() and .stopLogging() is called', async () => {
+     const appProcess = ChildProcess.spawn(process.execPath,
+       [appPath], {
+         env: {
+@@ -150,7 +150,7 @@ describe('netLog module', () => {
+     expect(fs.existsSync(dumpFileDynamic)).to.be.true('dynamic dump file exists');
+   });
+ 
+-  ifit(process.platform !== 'linux')('should end logging automatically when only .startLogging() is called', async () => {
++  ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('should end logging automatically when only .startLogging() is called', async () => {
+     const appProcess = ChildProcess.spawn(process.execPath,
+       [appPath], {
+         env: {