frida 17.8.0 → 17.8.2

package/build/src/frida.js

@@ -749,6 +749,21 @@ export const LogLevel = binding.LogLevel;
         get isCancelled() {
             return this._isCancelled();
         }
+        static withTimeout(ms) {
+            const c = new Cancellable();
+            setTimeout(() => c.cancel(), ms).unref();
+            return c;
+        }
+        combine(other) {
+            const c = new Cancellable();
+            this.cancelled.connect(() => c.cancel());
+            other.cancelled.connect(() => c.cancel());
+            if (this.isCancelled)
+                c.cancel();
+            if (other.isCancelled)
+                c.cancel();
+            return c;
+        }
     }
     binding.Cancellable = Cancellable;
     binding.IOStream.prototype[inspect.custom] = function (depth, options) {

package/build/src/frida_binding.d.ts

@@ -550,6 +550,8 @@ export class BaseObject {
 
 export class Cancellable extends _Cancellable {
     readonly isCancelled: boolean;
+    static withTimeout(ms: number): Cancellable;
+    combine(other: Cancellable): Cancellable;
 }
 
 export class _Cancellable extends BaseObject {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frida",
-  "version": "17.8.0",
+  "version": "17.8.2",
   "authors": [
     "Frida Developers"
   ],

package/releng/deps.toml

@@ -1,5 +1,5 @@
 [dependencies]
-version = "20260216"
+version = "20260311"
 bootstrap_version = "20250801"
 
 [ninja]

package/releng/env_android.py

@@ -41,9 +41,10 @@ def init_machine_config(machine: MachineSpec,
 
     android_build_os = "darwin" if build_machine.os == "macos" else build_machine.os
     android_build_arch = "x86_64" if build_machine.os in {"macos", "linux"} else build_machine.arch
-    android_api = 19 if machine.arch in {"x86", "arm"} else 21
+    android_api = 21
 
     llvm_bindir = ndk_root / "toolchains" / "llvm" / "prebuilt" / f"{android_build_os}-{android_build_arch}" / "bin"
+    libcxx_include_dir = llvm_bindir.parent / "sysroot" / "usr" / "include" / "c++" / "v1"
 
     binaries = config["binaries"]
     for (identifier, tool_name, *rest) in NDK_BINARIES:
@@ -80,14 +81,17 @@ def init_machine_config(machine: MachineSpec,
     read_envflags = lambda name: shlex.split(environ.get(name, ""))
 
     common_flags += ARCH_COMMON_FLAGS.get(machine.arch, [])
+
     c_like_flags += ARCH_C_LIKE_FLAGS.get(machine.arch, [])
     c_like_flags += read_envflags("CPPFLAGS")
+
+    if _needs_patched_fstream(machine, android_api):
+        overlay_dir = _generate_libcpp_overlay(libcxx_include_dir, outdir)
+        cxx_like_flags += ["-isystem", str(overlay_dir)]
+
     linker_flags += ARCH_LINKER_FLAGS.get(machine.arch, [])
     linker_flags += read_envflags("LDFLAGS")
 
-    if android_api < 24:
-        cxx_like_flags += ["-D_LIBCPP_HAS_NO_OFF_T_FUNCTIONS"]
-
     constants = config["constants"]
     constants["common_flags"] = strv_to_meson(common_flags)
     constants["c_like_flags"] = strv_to_meson(c_like_flags)
@@ -103,6 +107,63 @@ def init_machine_config(machine: MachineSpec,
     options["b_lundef"] = "true"
 
 
+def _needs_patched_fstream(machine: MachineSpec, android_api: int) -> bool:
+    return machine.pointer_size == 4 and android_api < 24
+
+
+def _generate_libcpp_overlay(libcxx_include_dir: Path, outdir: Path) -> Path:
+    src = libcxx_include_dir / "fstream"
+    if not src.exists():
+        raise FileNotFoundError(f"Missing libc++ header: {src}")
+
+    overlay_dir = outdir / "libcpp-overlay"
+    overlay_dir.mkdir(parents=True, exist_ok=True)
+
+    patched = src.read_text(encoding="utf-8")
+    patched = _patch_fstream_header(patched)
+
+    dst = overlay_dir / "fstream"
+    old_contents = dst.read_text(encoding="utf-8") if dst.exists() else None
+    if old_contents != patched:
+        dst.write_text(patched, encoding="utf-8")
+
+    return overlay_dir
+
+
+def _patch_fstream_header(header: str) -> str:
+    old_fseek = """#    elif defined(_NEWLIB_VERSION)
+  return fseek(__file, __offset, __whence);
+#    else
+  return ::fseeko(__file, __offset, __whence);
+#    endif"""
+
+    new_fseek = """#    elif defined(_NEWLIB_VERSION) || (defined(__ANDROID__) && __SIZEOF_POINTER__ == 4 && __ANDROID_API__ < 24)
+  return fseek(__file, __offset, __whence);
+#    else
+  return ::fseeko(__file, __offset, __whence);
+#    endif"""
+
+    old_ftell = """#    elif defined(_NEWLIB_VERSION)
+  return ftell(__file);
+#    else
+  return ftello(__file);
+#    endif"""
+
+    new_ftell = """#    elif defined(_NEWLIB_VERSION) || (defined(__ANDROID__) && __SIZEOF_POINTER__ == 4 && __ANDROID_API__ < 24)
+  return ftell(__file);
+#    else
+  return ftello(__file);
+#    endif"""
+
+    result = header.replace(old_fseek, new_fseek)
+    result = result.replace(old_ftell, new_ftell)
+
+    if result == header:
+        raise ValueError("Failed to patch libc++ fstream header; expected patterns not found")
+
+    return result
+
+
 class NdkNotFoundError(Exception):
     pass
 
@@ -111,7 +172,7 @@ class NdkVersionError(Exception):
     pass
 
 
-NDK_REQUIRED = 25
+NDK_REQUIRED = 29
 
 NDK_BINARIES = [
     ("c",       "clang"),

package/src/frida_bindgen/customization.py

@@ -807,6 +807,31 @@ const assetRoot = params?.assetRoot ?? null;
 get isCancelled(): boolean {
     return this._isCancelled();
 }
+""",
+                    ),
+                    CustomMethod(
+                        typing="static withTimeout(ms: number): Cancellable",
+                        code="""
+static withTimeout(ms: number): Cancellable {
+    const c = new Cancellable();
+    setTimeout(() => c.cancel(), ms).unref();
+    return c;
+}
+""",
+                    ),
+                    CustomMethod(
+                        typing="combine(other: Cancellable): Cancellable",
+                        code="""
+combine(other: Cancellable): Cancellable {
+    const c = new Cancellable();
+    this.cancelled.connect(() => c.cancel());
+    other.cancelled.connect(() => c.cancel());
+    if (this.isCancelled)
+        c.cancel();
+    if (other.isCancelled)
+        c.cancel();
+    return c;
+}
 """,
                     ),
                 ],

package/subprojects/frida-core.wrap

@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://github.com/frida/frida-core.git
-revision = 17.8.0
+revision = 17.8.2
 depth = 1
 
 [provide]