6 files changed, 38 insertions, 31 deletions
diff --git a/misc/codex/files/patch-codex-rs_cli_Cargo.toml b/misc/codex/files/patch-codex-rs_cli_Cargo.toml
deleted file mode 100644
index 628216c84f5f..000000000000
--- a/misc/codex/files/patch-codex-rs_cli_Cargo.toml
+++ /dev/null
@@ -1,12 +0,0 @@
---- codex-rs/cli/Cargo.toml.orig	2025-09-27 08:06:01 UTC
-+++ codex-rs/cli/Cargo.toml
-@@ -52,6 +52,9 @@ libc = { workspace = true }
- [target.'cfg(target_os = "macos")'.dependencies]
- libc = { workspace = true }
- 
-+[target.'cfg(target_os = "freebsd")'.dependencies]
-+libc = { workspace = true }
-+
- [dev-dependencies]
- assert_cmd = { workspace = true }
- predicates = { workspace = true }
diff --git a/misc/codex/files/patch-codex-rs_cli_src_main.rs b/misc/codex/files/patch-codex-rs_cli_src_main.rs
deleted file mode 100644
index 577f39d19f85..000000000000
--- a/misc/codex/files/patch-codex-rs_cli_src_main.rs
+++ /dev/null
@@ -1,12 +0,0 @@
---- codex-rs/cli/src/main.rs.orig	2025-09-27 08:29:56 UTC
-+++ codex-rs/cli/src/main.rs
-@@ -219,6 +219,9 @@ fn pre_main_hardening() {
-         #[cfg(target_os = "macos")]
-         crate::pre_main_hardening::pre_main_hardening_macos();
- 
-+        #[cfg(target_os = "freebsd")]
-+        crate::pre_main_hardening::pre_main_hardening_freebsd();
-+
-         #[cfg(windows)]
-         crate::pre_main_hardening::pre_main_hardening_windows();
-     }
diff --git a/misc/codex/files/patch-codex-rs_exec_tests_suite_mod.rs b/misc/codex/files/patch-codex-rs_exec_tests_suite_mod.rs
index 35dee0499c66..e327dc0a115a 100644
--- a/misc/codex/files/patch-codex-rs_exec_tests_suite_mod.rs
+++ b/misc/codex/files/patch-codex-rs_exec_tests_suite_mod.rs
@@ -1,8 +1,9 @@
---- codex-rs/exec/tests/suite/mod.rs.orig	2025-09-26 18:28:59 UTC
+--- codex-rs/exec/tests/suite/mod.rs.orig	2025-10-09 01:48:45 UTC
 +++ codex-rs/exec/tests/suite/mod.rs
-@@ -2,4 +2,5 @@ mod resume;
- mod apply_patch;
+@@ -4,5 +4,6 @@ mod resume;
+ mod originator;
  mod output_schema;
  mod resume;
 +#[cfg(not(target_os = "freebsd"))]
  mod sandbox;
+ mod server_error_exit;
diff --git a/misc/codex/files/patch-codex-rs_process-hardening_Cargo.toml b/misc/codex/files/patch-codex-rs_process-hardening_Cargo.toml
new file mode 100644
index 000000000000..d10fb15bb2a6
--- /dev/null
+++ b/misc/codex/files/patch-codex-rs_process-hardening_Cargo.toml
@@ -0,0 +1,9 @@
+--- codex-rs/process-hardening/Cargo.toml.orig	2025-10-06 07:49:12 UTC
++++ codex-rs/process-hardening/Cargo.toml
+@@ -19,3 +19,6 @@ libc = { workspace = true }
+ 
+ [target.'cfg(target_os = "macos")'.dependencies]
+ libc = { workspace = true }
++
++[target.'cfg(target_os = "freebsd")'.dependencies]
++libc = { workspace = true }
diff --git a/misc/codex/files/patch-codex-rs_cli_src_pre__main__hardening.rs b/misc/codex/files/patch-codex-rs_process-hardening_src_lib.rs
index 7302568f4512..6805a52575ea 100644
--- a/misc/codex/files/patch-codex-rs_cli_src_pre__main__hardening.rs
+++ b/misc/codex/files/patch-codex-rs_process-hardening_src_lib.rs
@@ -1,6 +1,16 @@
---- codex-rs/cli/src/pre_main_hardening.rs.orig	2025-09-26 18:28:59 UTC
-+++ codex-rs/cli/src/pre_main_hardening.rs
-@@ -4,9 +4,12 @@ const PTRACE_DENY_ATTACH_FAILED_EXIT_CODE: i32 = 6;
+--- codex-rs/process-hardening/src/lib.rs.orig	2025-10-03 16:43:33 UTC
++++ codex-rs/process-hardening/src/lib.rs
+@@ -10,6 +10,9 @@ pub fn pre_main_hardening() {
+     #[cfg(target_os = "macos")]
+     pre_main_hardening_macos();
+ 
++    #[cfg(target_os = "freebsd")]
++    pre_main_hardening_freebsd();
++
+     #[cfg(windows)]
+     pre_main_hardening_windows();
+ }
+@@ -20,9 +23,12 @@ const PTRACE_DENY_ATTACH_FAILED_EXIT_CODE: i32 = 6;
  #[cfg(target_os = "macos")]
  const PTRACE_DENY_ATTACH_FAILED_EXIT_CODE: i32 = 6;
  
@@ -14,7 +24,7 @@
  #[cfg(any(target_os = "linux", target_os = "android"))]
  pub(crate) fn pre_main_hardening_linux() {
      // Disable ptrace attach / mark process non-dumpable.
-@@ -69,6 +72,43 @@ pub(crate) fn pre_main_hardening_macos() {
+@@ -85,6 +91,43 @@ pub(crate) fn pre_main_hardening_macos() {
          .collect();
  
      for key in dyld_keys {
diff --git a/misc/codex/files/patch-codex-rs_rmcp-client_Cargo.toml b/misc/codex/files/patch-codex-rs_rmcp-client_Cargo.toml
new file mode 100644
index 000000000000..c2e28d88334d
--- /dev/null
+++ b/misc/codex/files/patch-codex-rs_rmcp-client_Cargo.toml
@@ -0,0 +1,11 @@
+--- codex-rs/rmcp-client/Cargo.toml.orig	2025-10-09 07:52:04 UTC
++++ codex-rs/rmcp-client/Cargo.toml
+@@ -16,7 +16,7 @@ keyring = { workspace = true, features = [
+ keyring = { workspace = true, features = [
+     "apple-native",
+     "crypto-rust",
+-    "linux-native-async-persistent",
++    "linux-native",
+     "windows-native",
+ ] }
+ mcp-types = { path = "../mcp-types" }