7 files changed, 41 insertions, 29 deletions
diff --git a/devel/libdatadog/files/patch-crashtracker-src-collector-crash_handler.rs b/devel/libdatadog/files/patch-crashtracker-src-collector-crash_handler.rs
deleted file mode 100644
index f055d23ccd49..000000000000
--- a/devel/libdatadog/files/patch-crashtracker-src-collector-crash_handler.rs
+++ /dev/null
@@ -1,11 +0,0 @@
---- crashtracker/src/collector/crash_handler.rs.orig	2025-02-11 17:46:31 UTC
-+++ crashtracker/src/collector/crash_handler.rs
-@@ -48,7 +48,7 @@ use std::time::{Duration, Instant};
- // Macos seems to have deprecated vfork.  The reason to prefer vfork is to suppress atfork
- // handlers.  This is OK because macos is primarily a test platform, and we have system-level
- // testing on Linux in various CI environments.
--#[cfg(target_os = "macos")]
-+#[cfg(any(target_os = "freebsd", target_os = "macos"))]
- use libc::fork as vfork;
- 
- #[cfg(target_os = "linux")]
diff --git a/devel/libdatadog/files/patch-crashtracker-src-collector-emitters.rs b/devel/libdatadog/files/patch-crashtracker-src-collector-emitters.rs
deleted file mode 100644
index 0972ee8b4027..000000000000
--- a/devel/libdatadog/files/patch-crashtracker-src-collector-emitters.rs
+++ /dev/null
@@ -1,11 +0,0 @@
---- crashtracker/src/collector/emitters.rs.orig	2025-02-11 17:46:31 UTC
-+++ crashtracker/src/collector/emitters.rs
-@@ -151,7 +151,7 @@ fn emit_proc_self_maps(w: &mut impl Write) -> anyhow::
-     Ok(())
- }
- 
--#[cfg(target_os = "linux")]
-+#[cfg(any(target_os = "freebsd", target_os = "linux"))]
- fn emit_ucontext(w: &mut impl Write, ucontext: *const ucontext_t) -> anyhow::Result<()> {
-     anyhow::ensure!(!ucontext.is_null());
-     writeln!(w, "{DD_CRASHTRACK_BEGIN_UCONTEXT}")?;
diff --git a/devel/libdatadog/files/patch-datadog-crashtracker-src-collector-emitters.rs b/devel/libdatadog/files/patch-datadog-crashtracker-src-collector-emitters.rs
new file mode 100644
index 000000000000..1e73a6a45a30
--- /dev/null
+++ b/devel/libdatadog/files/patch-datadog-crashtracker-src-collector-emitters.rs
@@ -0,0 +1,23 @@
+--- datadog-crashtracker/src/collector/emitters.rs.orig	2025-02-11 17:46:31 UTC
++++ datadog-crashtracker/src/collector/emitters.rs
+@@ -178,7 +178,7 @@ fn emit_proc_self_maps(w: &mut impl Write) -> Result<(
+     Ok(())
+ }
+ 
+-#[cfg(target_os = "linux")]
++#[cfg(any(target_os = "freebsd", target_os = "linux"))]
+ fn emit_ucontext(w: &mut impl Write, ucontext: *const ucontext_t) -> Result<(), EmitterError> {
+     if ucontext.is_null() {
+         return Err(EmitterError::NullUcontext);
+@@ -305,6 +305,11 @@ fn extract_rsp(ucontext: *const ucontext_t) -> usize {
+         return (*(*ucontext).uc_mcontext).__ss.__rsp as usize;
+         #[cfg(all(target_os = "macos", target_arch = "aarch64"))]
+         return (*(*ucontext).uc_mcontext).__ss.__sp as usize;
++
++        #[cfg(all(target_os = "freebsd", target_arch = "x86_64"))]
++        return (*ucontext).uc_mcontext.mc_rsp as usize;
++        #[cfg(all(target_os = "freebsd", target_arch = "aarch64"))]
++        return (*ucontext).uc_mcontext.mc_gpregs.gp_sp;
+ 
+         #[cfg(all(target_os = "linux", target_arch = "x86_64"))]
+         return (*ucontext).uc_mcontext.gregs[libc::REG_RSP as usize] as usize;
diff --git a/devel/libdatadog/files/patch-ipc-src-platform-unix-locks.rs b/devel/libdatadog/files/patch-datadog-ipc-src-platform-unix-locks.rs
index 5f1dd777e878..59c259bede76 100644
--- a/devel/libdatadog/files/patch-ipc-src-platform-unix-locks.rs
+++ b/devel/libdatadog/files/patch-datadog-ipc-src-platform-unix-locks.rs
@@ -1,6 +1,6 @@
---- ipc/src/platform/unix/locks.rs.orig	2023-03-27 13:18:03 UTC
-+++ ipc/src/platform/unix/locks.rs
-@@ -77,6 +77,8 @@ impl FLock {
+--- datadog-ipc/src/platform/unix/locks.rs.orig	2023-03-27 13:18:03 UTC
++++ datadog-ipc/src/platform/unix/locks.rs
+@@ -78,6 +78,8 @@ impl FLock {
              l_start: 0,
              l_len: 0,
              l_pid: 0,
diff --git a/devel/libdatadog/files/patch-library-config-src-lib.rs b/devel/libdatadog/files/patch-datadog-library-config-src-lib.rs
index bd62ef03fd4f..7d4efe514104 100644
--- a/devel/libdatadog/files/patch-library-config-src-lib.rs
+++ b/devel/libdatadog/files/patch-datadog-library-config-src-lib.rs
@@ -1,5 +1,5 @@
---- library-config/src/lib.rs.orig	2025-02-11 17:46:31 UTC
-+++ library-config/src/lib.rs
+--- datadog-library-config/src/lib.rs.orig	2025-02-11 17:46:31 UTC
++++ datadog-library-config/src/lib.rs
 @@ -461,14 +461,19 @@ pub enum Target {
  }
  
diff --git a/devel/libdatadog/files/patch-sidecar-src-setup-unix.rs b/devel/libdatadog/files/patch-datadog-sidecar-src-setup-unix.rs
index c89f7547f2c3..5c37c84f50de 100644
--- a/devel/libdatadog/files/patch-sidecar-src-setup-unix.rs
+++ b/devel/libdatadog/files/patch-datadog-sidecar-src-setup-unix.rs
@@ -1,5 +1,5 @@
---- sidecar/src/setup/unix.rs.orig	2024-05-03 17:30:09 UTC
-+++ sidecar/src/setup/unix.rs
+--- datadog-sidecar/src/setup/unix.rs.orig	2024-05-03 17:30:09 UTC
++++ datadog-sidecar/src/setup/unix.rs
 @@ -111,6 +111,9 @@ impl Default for SharedDirLiaison {
      }
  }
diff --git a/devel/libdatadog/files/patch-ddcommon-src-unix_utils-fork.rs b/devel/libdatadog/files/patch-ddcommon-src-unix_utils-fork.rs
new file mode 100644
index 000000000000..fd0ea26196d1
--- /dev/null
+++ b/devel/libdatadog/files/patch-ddcommon-src-unix_utils-fork.rs
@@ -0,0 +1,11 @@
+--- ddcommon/src/unix_utils/fork.rs.orig	2025-08-22 12:57:44.659695000 +0000
++++ ddcommon/src/unix_utils/fork.rs	2025-08-22 12:57:54.570083000 +0000
+@@ -1,7 +1,7 @@
+ // Copyright 2025-Present Datadog, Inc. https://www.datadoghq.com/
+ // SPDX-License-Identifier: Apache-2.0
+ 
+-#[cfg(target_os = "macos")]
++#[cfg(any(target_os = "freebsd", target_os = "macos"))]
+ pub fn alt_fork() -> i32 {
+     // There is a lower-level `__fork()` function in macOS, and we can call it from Rust, but the
+     // runtime is much stricter about which operations (e.g., no malloc) are allowed in the child.