From dae5b01520d0274f99e381e457515fd89faff506 Mon Sep 17 00:00:00 2001 From: Ylarod Date: Mon, 25 Dec 2023 09:53:31 +0800 Subject: [PATCH] update patches for 16.1.10 --- .../0001-Florida-string_frida_rpc.patch | 4 +-- ...atch => 0002-Florida-frida_agent_so.patch} | 4 +-- .../0002-Florida-re_frida_server.patch | 33 ------------------- ...003-Florida-symbol_frida_agent_main.patch} | 4 +-- ... => 0004-Florida-thread_gum_js_loop.patch} | 4 +-- ....patch => 0005-Florida-thread_gmain.patch} | 4 +-- ...Florida-protocol_unexpected_command.patch} | 4 +-- ...> 0007-Florida-update-python-script.patch} | 4 +-- ...da.patch => 0008-Florida-pool-frida.patch} | 16 ++++----- ...> 0009-Florida-memfd-name-jit-cache.patch} | 8 ++--- 10 files changed, 26 insertions(+), 59 deletions(-) rename patches/frida-core/{0003-Florida-frida_agent_so.patch => 0002-Florida-frida_agent_so.patch} (92%) delete mode 100644 patches/frida-core/0002-Florida-re_frida_server.patch rename patches/frida-core/{0004-Florida-symbol_frida_agent_main.patch => 0003-Florida-symbol_frida_agent_main.patch} (98%) rename patches/frida-core/{0005-Florida-thread_gum_js_loop.patch => 0004-Florida-thread_gum_js_loop.patch} (87%) rename patches/frida-core/{0006-Florida-thread_gmain.patch => 0005-Florida-thread_gmain.patch} (89%) rename patches/frida-core/{0007-Florida-protocol_unexpected_command.patch => 0006-Florida-protocol_unexpected_command.patch} (84%) rename patches/frida-core/{0008-Florida-update-python-script.patch => 0007-Florida-update-python-script.patch} (96%) rename patches/frida-core/{0009-Florida-pool-frida.patch => 0008-Florida-pool-frida.patch} (50%) rename patches/frida-core/{0010-Florida-memfd-name-jit-cache.patch => 0009-Florida-memfd-name-jit-cache.patch} (75%) diff --git a/patches/frida-core/0001-Florida-string_frida_rpc.patch b/patches/frida-core/0001-Florida-string_frida_rpc.patch index c97eb53..065e75b 100644 --- a/patches/frida-core/0001-Florida-string_frida_rpc.patch +++ b/patches/frida-core/0001-Florida-string_frida_rpc.patch @@ -1,7 +1,7 @@ -From 6819aa2d3f2a6bbde8d31566b3dff6dd085776fc Mon Sep 17 00:00:00 2001 +From db22f5d7065cef473fe4fd7771583ddf9d2771dd Mon Sep 17 00:00:00 2001 From: Ylarod Date: Tue, 18 Jul 2023 15:51:29 +0800 -Subject: [PATCH 01/10] Florida: string_frida_rpc +Subject: [PATCH 1/9] Florida: string_frida_rpc --- lib/base/rpc.vala | 15 ++++++++++++--- diff --git a/patches/frida-core/0003-Florida-frida_agent_so.patch b/patches/frida-core/0002-Florida-frida_agent_so.patch similarity index 92% rename from patches/frida-core/0003-Florida-frida_agent_so.patch rename to patches/frida-core/0002-Florida-frida_agent_so.patch index 13f912c..0b3a7f0 100644 --- a/patches/frida-core/0003-Florida-frida_agent_so.patch +++ b/patches/frida-core/0002-Florida-frida_agent_so.patch @@ -1,7 +1,7 @@ -From 1505aff0b6c01c5e0faa4a6b56bbb04a78068b89 Mon Sep 17 00:00:00 2001 +From 87052a5bb1abe2788ac1775d20154187081da390 Mon Sep 17 00:00:00 2001 From: Ylarod Date: Tue, 18 Jul 2023 15:57:19 +0800 -Subject: [PATCH 03/10] Florida: frida_agent_so +Subject: [PATCH 2/9] Florida: frida_agent_so --- src/linux/linux-host-session.vala | 7 ++++--- diff --git a/patches/frida-core/0002-Florida-re_frida_server.patch b/patches/frida-core/0002-Florida-re_frida_server.patch deleted file mode 100644 index b5e0701..0000000 --- a/patches/frida-core/0002-Florida-re_frida_server.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3abc151103db6b7ac3c971a5dfc5f90299d3932f Mon Sep 17 00:00:00 2001 -From: Ylarod -Date: Tue, 18 Jul 2023 15:52:56 +0800 -Subject: [PATCH 02/10] Florida: re_frida_server - ---- - server/server.vala | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/server/server.vala b/server/server.vala -index 525c145e..f7547819 100644 ---- a/server/server.vala -+++ b/server/server.vala -@@ -1,7 +1,7 @@ - namespace Frida.Server { - private static Application application; - -- private const string DEFAULT_DIRECTORY = "re.frida.server"; -+ private static string DEFAULT_DIRECTORY = null; - private static bool output_version = false; - private static string? listen_address = null; - private static string? certpath = null; -@@ -50,6 +50,7 @@ namespace Frida.Server { - }; - - private static int main (string[] args) { -+ DEFAULT_DIRECTORY = GLib.Uuid.string_random(); - Environment.init (); - - #if DARWIN --- -2.39.3 (Apple Git-145) - diff --git a/patches/frida-core/0004-Florida-symbol_frida_agent_main.patch b/patches/frida-core/0003-Florida-symbol_frida_agent_main.patch similarity index 98% rename from patches/frida-core/0004-Florida-symbol_frida_agent_main.patch rename to patches/frida-core/0003-Florida-symbol_frida_agent_main.patch index 883c0e2..b863e03 100644 --- a/patches/frida-core/0004-Florida-symbol_frida_agent_main.patch +++ b/patches/frida-core/0003-Florida-symbol_frida_agent_main.patch @@ -1,7 +1,7 @@ -From 36f933383018c359a04d5772806d88ba686f4067 Mon Sep 17 00:00:00 2001 +From 32ec17a186c957fb4c5a3198655767a2bd442fc4 Mon Sep 17 00:00:00 2001 From: Ylarod Date: Tue, 18 Jul 2023 16:02:50 +0800 -Subject: [PATCH 04/10] Florida: symbol_frida_agent_main +Subject: [PATCH 3/9] Florida: symbol_frida_agent_main --- src/agent-container.vala | 2 +- diff --git a/patches/frida-core/0005-Florida-thread_gum_js_loop.patch b/patches/frida-core/0004-Florida-thread_gum_js_loop.patch similarity index 87% rename from patches/frida-core/0005-Florida-thread_gum_js_loop.patch rename to patches/frida-core/0004-Florida-thread_gum_js_loop.patch index 0632798..e520760 100644 --- a/patches/frida-core/0005-Florida-thread_gum_js_loop.patch +++ b/patches/frida-core/0004-Florida-thread_gum_js_loop.patch @@ -1,7 +1,7 @@ -From a3a873849788a117c799d7901b907b458a4ff44f Mon Sep 17 00:00:00 2001 +From 240274823e8b56765b4fb29928e11e19a6807c26 Mon Sep 17 00:00:00 2001 From: Ylarod Date: Tue, 18 Jul 2023 16:03:47 +0800 -Subject: [PATCH 05/10] Florida: thread_gum_js_loop +Subject: [PATCH 4/9] Florida: thread_gum_js_loop --- src/anti-anti-frida.py | 7 ++++++- diff --git a/patches/frida-core/0006-Florida-thread_gmain.patch b/patches/frida-core/0005-Florida-thread_gmain.patch similarity index 89% rename from patches/frida-core/0006-Florida-thread_gmain.patch rename to patches/frida-core/0005-Florida-thread_gmain.patch index 97b2c79..532595e 100644 --- a/patches/frida-core/0006-Florida-thread_gmain.patch +++ b/patches/frida-core/0005-Florida-thread_gmain.patch @@ -1,7 +1,7 @@ -From 2ab3dafa1d0fc152757427b6f4e923daf0bd169b Mon Sep 17 00:00:00 2001 +From eac56e85a60b250805d83c47acb2d7eff1d46802 Mon Sep 17 00:00:00 2001 From: Ylarod Date: Tue, 18 Jul 2023 16:04:15 +0800 -Subject: [PATCH 06/10] Florida: thread_gmain +Subject: [PATCH 5/9] Florida: thread_gmain --- src/anti-anti-frida.py | 7 ++++++- diff --git a/patches/frida-core/0007-Florida-protocol_unexpected_command.patch b/patches/frida-core/0006-Florida-protocol_unexpected_command.patch similarity index 84% rename from patches/frida-core/0007-Florida-protocol_unexpected_command.patch rename to patches/frida-core/0006-Florida-protocol_unexpected_command.patch index 12273da..a560136 100644 --- a/patches/frida-core/0007-Florida-protocol_unexpected_command.patch +++ b/patches/frida-core/0006-Florida-protocol_unexpected_command.patch @@ -1,7 +1,7 @@ -From 0561228bc0dde4dd62af2feceff1a09e9d38f9cd Mon Sep 17 00:00:00 2001 +From 6d24d91ee0bbba3cbd288e1c37c1c6b5f87f1af8 Mon Sep 17 00:00:00 2001 From: Ylarod Date: Tue, 18 Jul 2023 16:04:55 +0800 -Subject: [PATCH 07/10] Florida: protocol_unexpected_command +Subject: [PATCH 6/9] Florida: protocol_unexpected_command --- src/droidy/droidy-client.vala | 2 +- diff --git a/patches/frida-core/0008-Florida-update-python-script.patch b/patches/frida-core/0007-Florida-update-python-script.patch similarity index 96% rename from patches/frida-core/0008-Florida-update-python-script.patch rename to patches/frida-core/0007-Florida-update-python-script.patch index 4928090..7a4be20 100644 --- a/patches/frida-core/0008-Florida-update-python-script.patch +++ b/patches/frida-core/0007-Florida-update-python-script.patch @@ -1,7 +1,7 @@ -From f0cea5f7ffac814fc1aed478247c1f8b8190c180 Mon Sep 17 00:00:00 2001 +From cface25f4bfff96704bd35678593286536b0ffff Mon Sep 17 00:00:00 2001 From: Ylarod Date: Tue, 18 Jul 2023 19:55:59 +0800 -Subject: [PATCH 08/10] Florida: update python script +Subject: [PATCH 7/9] Florida: update python script --- src/anti-anti-frida.py | 59 +++++++++++++++++++++++++++++------------- diff --git a/patches/frida-core/0009-Florida-pool-frida.patch b/patches/frida-core/0008-Florida-pool-frida.patch similarity index 50% rename from patches/frida-core/0009-Florida-pool-frida.patch rename to patches/frida-core/0008-Florida-pool-frida.patch index 2ba20d9..d956cf7 100644 --- a/patches/frida-core/0009-Florida-pool-frida.patch +++ b/patches/frida-core/0008-Florida-pool-frida.patch @@ -1,25 +1,25 @@ -From 4b88bae0ba2d67a8ac2b1ffbd2d2216e879c3813 Mon Sep 17 00:00:00 2001 +From c209740d0a3afb95444f49dc542088a81b55d042 Mon Sep 17 00:00:00 2001 From: Ylarod Date: Thu, 20 Jul 2023 10:01:20 +0800 -Subject: [PATCH 09/10] Florida: pool-frida +Subject: [PATCH 8/9] Florida: pool-frida --- - src/frida-glue.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + src/frida-glue.c | 2 ++ + 1 file changed, 2 insertions(+) diff --git a/src/frida-glue.c b/src/frida-glue.c -index 13429703..43cc8167 100644 +index ee8f0737..43cc8167 100644 --- a/src/frida-glue.c +++ b/src/frida-glue.c -@@ -40,7 +40,7 @@ frida_init_with_runtime (FridaRuntime rt) +@@ -40,6 +40,8 @@ frida_init_with_runtime (FridaRuntime rt) g_io_module_openssl_register (); #endif -- g_set_prgname ("frida"); + g_set_prgname ("ggbond"); - ++ if (runtime == FRIDA_RUNTIME_OTHER) { + main_context = g_main_context_ref (g_main_context_default ()); -- 2.39.3 (Apple Git-145) diff --git a/patches/frida-core/0010-Florida-memfd-name-jit-cache.patch b/patches/frida-core/0009-Florida-memfd-name-jit-cache.patch similarity index 75% rename from patches/frida-core/0010-Florida-memfd-name-jit-cache.patch rename to patches/frida-core/0009-Florida-memfd-name-jit-cache.patch index 79de09a..be34e67 100644 --- a/patches/frida-core/0010-Florida-memfd-name-jit-cache.patch +++ b/patches/frida-core/0009-Florida-memfd-name-jit-cache.patch @@ -1,17 +1,17 @@ -From 7758c68170a1294d8af09de6d50184195ffa0035 Mon Sep 17 00:00:00 2001 +From d5417438834ed1c2c7a7992d6bbfd38b8ce6b7fc Mon Sep 17 00:00:00 2001 From: Ylarod Date: Fri, 1 Sep 2023 12:51:06 +0800 -Subject: [PATCH 10/10] Florida: memfd-name-jit-cache +Subject: [PATCH 9/9] Florida: memfd-name-jit-cache --- src/linux/frida-helper-backend.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/linux/frida-helper-backend.vala b/src/linux/frida-helper-backend.vala -index 61f8307b..0121b1b4 100644 +index 9e6308b6..b6934e70 100644 --- a/src/linux/frida-helper-backend.vala +++ b/src/linux/frida-helper-backend.vala -@@ -3184,7 +3184,7 @@ namespace Frida { +@@ -3202,7 +3202,7 @@ namespace Frida { } private int memfd_create (string name, uint flags) {