frida 17.2.10 → 17.2.12

package/package.json

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

package/releng/deps.py

@@ -19,7 +19,7 @@ import sys
 import tarfile
 import tempfile
 import time
-from typing import Callable, Iterator, Optional, Mapping, Sequence, Union
+from typing import Callable, Dict, Iterator, List, Optional, Mapping, Sequence, Set, Tuple, Union
 import urllib.request
 
 RELENG_DIR = Path(__file__).resolve().parent
@@ -107,7 +107,7 @@ def parse_bundle_option_value(raw_bundle: str) -> Bundle:
         raise argparse.ArgumentTypeError(f"invalid choice: {raw_bundle} (choose from '{choices}')")
 
 
-def parse_set_option_value(v: str) -> set[str]:
+def parse_set_option_value(v: str) -> Set[str]:
     return set([v.strip() for v in v.split(",")])
 
 
@@ -123,7 +123,7 @@ def query_toolchain_prefix(machine: MachineSpec,
 def ensure_toolchain(machine: MachineSpec,
                      cache_dir: Path,
                      version: Optional[str] = None,
-                     on_progress: ProgressCallback = print_progress) -> tuple[Path, SourceState]:
+                     on_progress: ProgressCallback = print_progress) -> Tuple[Path, SourceState]:
     toolchain_prefix = query_toolchain_prefix(machine, cache_dir)
     state = sync(Bundle.TOOLCHAIN, machine, toolchain_prefix, version, on_progress)
     return (toolchain_prefix, state)
@@ -137,7 +137,7 @@ def query_sdk_prefix(machine: MachineSpec,
 def ensure_sdk(machine: MachineSpec,
                cache_dir: Path,
                version: Optional[str] = None,
-               on_progress: ProgressCallback = print_progress) -> tuple[Path, SourceState]:
+               on_progress: ProgressCallback = print_progress) -> Tuple[Path, SourceState]:
     sdk_prefix = query_sdk_prefix(machine, cache_dir)
     state = sync(Bundle.SDK, machine, sdk_prefix, version, on_progress)
     return (sdk_prefix, state)
@@ -283,8 +283,8 @@ def roll(bundle: Bundle,
 def build(bundle: Bundle,
           build_machine: MachineSpec,
           host_machine: MachineSpec,
-          only_packages: Optional[set[str]] = None,
-          excluded_packages: set[str] = set(),
+          only_packages: Optional[Set[str]] = None,
+          excluded_packages: Set[str] = set(),
           verbose: bool = False) -> Path:
     builder = Builder(bundle, build_machine, host_machine, verbose)
     try:
@@ -317,15 +317,15 @@ class Builder:
         self._toolchain_prefix: Optional[Path] = None
         self._build_config: Optional[env.MachineConfig] = None
         self._host_config: Optional[env.MachineConfig] = None
-        self._build_env: dict[str, str] = {}
-        self._host_env: dict[str, str] = {}
+        self._build_env: Dict[str, str] = {}
+        self._host_env: Dict[str, str] = {}
 
         self._ansi_supported = os.environ.get("TERM") != "dumb" \
                     and (self._build_machine.os != "windows" or "WT_SESSION" in os.environ)
 
     def build(self,
-              only_packages: Optional[list[str]],
-              excluded_packages: set[str]) -> Path:
+              only_packages: Optional[List[str]],
+              excluded_packages: Set[str]) -> Path:
         started_at = time.time()
         prepare_ended_at = None
         clone_time_elapsed = None
@@ -407,7 +407,7 @@ class Builder:
 
     def _resolve_dependencies(self,
                               packages: Sequence[PackageSpec],
-                              all_packages: Mapping[str, PackageSpec]) -> dict[str, PackageSpec]:
+                              all_packages: Mapping[str, PackageSpec]) -> Dict[str, PackageSpec]:
         result = {p.identifier: p for p in packages}
         for p in packages:
             self._resolve_package_dependencies(p, all_packages, result)
@@ -454,7 +454,7 @@ class Builder:
                 symfile = envdir / "toolchain-executable.symbols"
                 symfile.write_text("# No exported symbols.\n", encoding="utf-8")
                 extra_ldflags += [f"-Wl,-exported_symbols_list,{symfile}"]
-            elif self._host_machine.os != "windows":
+            elif self._host_machine.os == "freebsd":
                 verfile = envdir / "toolchain-executable.version"
                 verfile.write_text("\n".join([
                                                  "{",
@@ -470,6 +470,17 @@ class Builder:
                                              ]),
                                    encoding="utf-8")
                 extra_ldflags += [f"-Wl,--version-script,{verfile}"]
+            elif self._host_machine.os != "windows":
+                verfile = envdir / "toolchain-executable.version"
+                verfile.write_text("\n".join([
+                                                 "{",
+                                                 "  local:",
+                                                 "    *;",
+                                                 "};",
+                                                 ""
+                                             ]),
+                                   encoding="utf-8")
+                extra_ldflags += [f"-Wl,--version-script,{verfile}"]
             if extra_ldflags:
                 menv["LDFLAGS"] = shlex.join(extra_ldflags + shlex.split(menv.get("LDFLAGS", "")))
 
@@ -627,7 +638,7 @@ class Builder:
 
         return outfile
 
-    def _stage_toolchain_files(self, location: Path) -> list[Path]:
+    def _stage_toolchain_files(self, location: Path) -> List[Path]:
         if self._host_machine.os == "windows":
             toolchain_prefix = self._toolchain_prefix
             mixin_files = [f for f in self._walk_plain_files(toolchain_prefix)
@@ -639,7 +650,7 @@ class Builder:
                  if self._file_is_toolchain_related(f)]
         copy_files(prefix, files, location)
 
-    def _stage_sdk_files(self, location: Path) -> list[Path]:
+    def _stage_sdk_files(self, location: Path) -> List[Path]:
         prefix = self._get_prefix(self._host_machine)
         files = [f for f in self._walk_plain_files(prefix)
                  if self._file_is_sdk_related(f)]
@@ -846,7 +857,7 @@ def wait(bundle: Bundle, machine: MachineSpec):
 
 
 def bump():
-    def run(argv: list[str], **kwargs) -> subprocess.CompletedProcess:
+    def run(argv: List[str], **kwargs) -> subprocess.CompletedProcess:
         return subprocess.run(argv,
                               capture_output=True,
                               encoding="utf-8",
@@ -901,7 +912,7 @@ def bump_wraps(identifier: str,
         print(f"\tno relevant wraps, only: {', '.join([blob['path'] for blob, _ in all_wraps])}")
         return
 
-    pending_wraps: list[tuple[str, str, PackageSpec]] = []
+    pending_wraps: List[Tuple[str, str, PackageSpec]] = []
     for blob, spec in relevant_wraps:
         filename = blob["path"]
 
@@ -965,7 +976,7 @@ def identifier_from_wrap_filename(filename: str) -> str:
 
 def compute_bundle_parameters(bundle: Bundle,
                               machine: MachineSpec,
-                              version: str) -> tuple[str, str]:
+                              version: str) -> Tuple[str, str]:
     if bundle == Bundle.TOOLCHAIN and machine.os == "windows":
         os_arch_config = "windows-x86" if machine.arch in {"x86", "x86_64"} else machine.os_dash_arch
     else:
@@ -1061,7 +1072,7 @@ def parse_dependency(v: Union[str, dict]) -> OptionSpec:
 
 
 def copy_files(fromdir: Path,
-               files: list[Path],
+               files: List[Path],
                todir: Path):
     for filename in files:
         src = fromdir / filename
@@ -1103,7 +1114,7 @@ class SourceState(Enum):
 class DependencyParameters:
     deps_version: str
     bootstrap_version: str
-    packages: dict[str, PackageSpec]
+    packages: Dict[str, PackageSpec]
 
 
 @dataclass
@@ -1112,8 +1123,8 @@ class PackageSpec:
     name: str
     version: str
     url: str
-    options: list[OptionSpec] = field(default_factory=list)
-    dependencies: list[DependencySpec] = field(default_factory=list)
+    options: List[OptionSpec] = field(default_factory=list)
+    dependencies: List[DependencySpec] = field(default_factory=list)
     scope: Optional[str] = None
     when: Optional[str] = None
 

package/releng/deps.toml

@@ -1,6 +1,6 @@
 [dependencies]
-version = "20250512"
-bootstrap_version = "20250321"
+version = "20250718"
+bootstrap_version = "20250512"
 
 [ninja]
 scope = "toolchain"
@@ -20,7 +20,7 @@ dependencies = [
 [vala]
 scope = "toolchain"
 name = "Vala"
-version = "12aa6728cdd9f9a4653802e021f4cad0289eee26"
+version = "9feabf0f8076c33b702d7cba612edfe0c1e45a00"
 url = "https://github.com/frida/vala.git"
 dependencies = [
     "glib",
@@ -32,7 +32,7 @@ dependencies = [
 # We use Apple's implementation in toolchains to make them smaller.
 when = """ \
        (machine.is_apple and bundle is Bundle.SDK) \
-       or machine.os in {'android', 'qnx'} \
+       or machine.os in {'android', 'qnx', 'none'} \
        or machine.config == 'uclibc' \
        """
 name = "libiconv"
@@ -73,7 +73,7 @@ options = [
 
 [glib]
 name = "GLib"
-version = "8f43c78bc4f6a510c610c7738fdf23ecf99c6be8"
+version = "86b3f5fe2ebaa2f1c1954e7c28fdffb6db7c6e35"
 url = "https://github.com/frida/glib.git"
 options = [
     "-Dcocoa=disabled",
@@ -87,7 +87,7 @@ options = [
     { value = "-Dglib_checks=false", when = "machine.config_is_optimized" },
     { value = "-Diconv=external", when = """ \
                                          machine.is_apple \
-                                         or machine.os in {'android', 'qnx'} \
+                                         or machine.os in {'android', 'qnx', 'none'} \
                                          or machine.config == 'uclibc' \
                                          """ }
 ]
@@ -97,7 +97,7 @@ dependencies = [
     "zlib",
     { id = "libiconv", when = """ \
                               (machine.is_apple and bundle is Bundle.SDK) \
-                              or machine.os in {'android', 'qnx'} \
+                              or machine.os in {'android', 'qnx', 'none'} \
                               or machine.config == 'uclibc' \
                               """ }
 ]
@@ -112,6 +112,7 @@ options = [
 ]
 
 [xz]
+when = "machine.os != 'none'"
 name = "XZ Utils"
 version = "e70f5800ab5001c9509d374dbf3e7e6b866c43fe"
 url = "https://github.com/frida/xz.git"
@@ -120,11 +121,18 @@ options = [
 ]
 
 [brotli]
+when = "machine.os != 'none'"
 name = "Brotli"
 version = "01d9e2922ca878965ebcd71ee8965d2a7aadb47a"
 url = "https://github.com/frida/brotli.git"
 
+[lzfse]
+name = "LZFSE"
+version = "5cfb7c86919d3c2c636d0d7552b51855a611ba1c"
+url = "https://github.com/frida/lzfse.git"
+
 [minizip-ng]
+when = "machine.os != 'none'"
 name = "minizip-ng"
 version = "dfc1ccc070ff7bb50726c80215cac515253a8ba0"
 url = "https://github.com/frida/minizip-ng.git"
@@ -142,6 +150,7 @@ dependencies = [
 ]
 
 [sqlite]
+when = "machine.os != 'none'"
 name = "SQLite"
 version = "9337327a50008f2d2236112ccb6f44059b1bafbd"
 url = "https://github.com/frida/sqlite.git"
@@ -166,6 +175,7 @@ dependencies = [
 ]
 
 [glib-networking]
+when = "machine.os != 'none'"
 name = "glib-networking"
 version = "af4b017028e695528951c749a7096e96359521d8"
 url = "https://github.com/frida/glib-networking.git"
@@ -182,6 +192,7 @@ dependencies = [
 ]
 
 [libnice]
+when = "machine.os != 'none'"
 name = "libnice"
 version = "e12567b0a16a0c2eb5dfe5e0782baba8496772ff"
 url = "https://github.com/frida/libnice.git"
@@ -205,8 +216,9 @@ version = "ffff4bdfe8faa38cecfad5aab106cae923502d55"
 url = "https://github.com/frida/libusb.git"
 
 [lwip]
+when = "machine.os != 'none'"
 name = "lwIP"
-version = "267d9f082e9e38083b643421a93c03d4a7046fd0"
+version = "13fb5e0f519cc46dc4cd938808430f60a73f03d4"
 url = "https://github.com/frida/lwip.git"
 options = [
     "-Dipv4=disabled",
@@ -224,6 +236,7 @@ dependencies = [
 ]
 
 [usrsctp]
+when = "machine.os != 'none'"
 name = "usrsctp"
 version = "f459ae9d3700c06e59d709901e92c08e31c6e623"
 url = "https://github.com/frida/usrsctp.git"
@@ -234,6 +247,7 @@ options = [
 ]
 
 [libgee]
+when = "machine.os != 'none'"
 name = "libgee"
 version = "ad17ed847039469fcc2dc711ecfee2bbf7d2bf87"
 url = "https://github.com/frida/libgee.git"
@@ -247,7 +261,7 @@ dependencies = [
 
 [json-glib]
 name = "JSON-GLib"
-version = "1f40dc373415b728efa8315af7f975bd5a4e2490"
+version = "ae19eff63b9c141112e8f1e2524852dda0010404"
 url = "https://github.com/frida/json-glib.git"
 options = [
     "-Dintrospection=disabled",
@@ -260,6 +274,7 @@ dependencies = [
 ]
 
 [libpsl]
+when = "machine.os != 'none'"
 name = "libpsl"
 version = "b76c0fed2e27353d5fbb067ecdfdf76d2281eb91"
 url = "https://github.com/frida/libpsl.git"
@@ -270,6 +285,7 @@ options = [
 ]
 
 [libxml2]
+when = "machine.os != 'none'"
 name = "libxml2"
 version = "f09ad5551829b7f2df3666759e701644a0ea8558"
 url = "https://github.com/frida/libxml2.git"
@@ -280,6 +296,7 @@ options = [
 ]
 
 [ngtcp2]
+when = "machine.os != 'none'"
 name = "ngtcp2"
 version = "828dcaed498b40954e1b496664a3309796968db6"
 url = "https://github.com/frida/ngtcp2.git"
@@ -288,11 +305,13 @@ dependencies = [
 ]
 
 [nghttp2]
+when = "machine.os != 'none'"
 name = "nghttp2"
 version = "ae13d24ea59c30e36ca53d1b22c4e664588d0445"
 url = "https://github.com/frida/nghttp2.git"
 
 [libsoup]
+when = "machine.os != 'none'"
 name = "libsoup"
 version = "80dc080951c9037aef51a40ffbe4508d3ce98d1b"
 url = "https://github.com/frida/libsoup.git"
@@ -329,13 +348,14 @@ options = [
 
 [quickjs]
 name = "QuickJS"
-version = "12de2e4904b63405052508c891b215d056962c18"
+version = "f48e71e5240106dbca136e60f751e206d15cdb3f"
 url = "https://github.com/frida/quickjs.git"
 options = [
     "-Dlibc=false",
     "-Dbignum=true",
     "-Datomics=disabled",
     "-Dstack_check=disabled",
+    { value = "-Dstack_mode=optimize", when = "machine.os == 'none'" },
 ]
 
 [tinycc]
@@ -347,10 +367,11 @@ when = """ \
        } \
        """
 name = "TinyCC"
-version = "722c253d8dece3bc9a46b6f510c6682329d838b7"
+version = "517aa684db053997a9a5b4b57a8a210007e2b1c4"
 url = "https://github.com/frida/tinycc.git"
 
 [openssl]
+when = "machine.os != 'none'"
 name = "OpenSSL"
 version = "7b86cb6a0c5cb9d79dca012c98a0a30a58eef5b5"
 url = "https://github.com/frida/openssl.git"
@@ -365,7 +386,7 @@ when = """ \
        and machine.arch != 'arm64beilp32' \
        and not machine.arch.startswith('mips') \
        and not machine.arch.startswith('powerpc') \
-       and machine.os != 'qnx' \
+       and machine.os not in {'none', 'qnx'} \
        """
 name = "V8"
 version = "990fdb00e1506126019493dd3bda4d416c81eaee"

package/releng/devkit.py

@@ -1,4 +1,5 @@
 from collections import OrderedDict
+from enum import Enum
 import itertools
 import locale
 import os
@@ -27,12 +28,18 @@ ASSETS_PATH = Path(__file__).parent / "devkit-assets"
 INCLUDE_PATTERN = re.compile(r"#include\s+[<\"](.*?)[>\"]")
 
 
+class DepSymbolScope(str, Enum):
+    PREFIXED = "prefixed"
+    ORIGINAL = "original"
+
+
 class CompilerApplication:
     def __init__(self,
                  kit: str,
                  machine: MachineSpec,
                  meson_config: Mapping[str, Union[str, Sequence[str]]],
-                 output_dir: Path):
+                 output_dir: Path,
+                 dep_symbol_scope: DepSymbolScope = DepSymbolScope.PREFIXED):
         self.kit = kit
         package, umbrella_header = DEVKITS[kit]
         self.package = package
@@ -42,6 +49,7 @@ class CompilerApplication:
         self.meson_config = meson_config
         self.compiler_argument_syntax = None
         self.output_dir = output_dir
+        self.dep_symbol_scope = dep_symbol_scope
         self.library_filename = None
 
     def run(self):
@@ -131,7 +139,13 @@ class CompilerApplication:
         umbrella_header = header_files[0]
         processed_header_files = {umbrella_header}
         ingest_header(umbrella_header, header_files, processed_header_files, devkit_header_lines)
-        if kit == "frida-gumjs":
+        if kit in {"frida-gum", "frida-gumjs"} and machine.os == "none":
+            gum_dir = umbrella_header_path.parent
+            if kit == "frida-gumjs":
+                gum_dir = gum_dir.parent.parent / "gum"
+            barebone_header = gum_dir / "backend-barebone" / "include" / "gum" / "gumbarebone.h"
+            ingest_header(barebone_header, header_files, processed_header_files, devkit_header_lines)
+        if kit == "frida-gumjs" and machine.os != "none":
             inspector_server_header = umbrella_header_path.parent / "guminspectorserver.h"
             ingest_header(inspector_server_header, header_files, processed_header_files, devkit_header_lines)
         if kit == "frida-core" and machine.os == "android":
@@ -263,9 +277,8 @@ class CompilerApplication:
             shutil.rmtree(combined_dir)
 
         objcopy = meson_config.get("objcopy", None)
-        if objcopy is not None:
+        if self.dep_symbol_scope is DepSymbolScope.PREFIXED and objcopy is not None:
             thirdparty_symbol_mappings = get_thirdparty_symbol_mappings(output_path, meson_config)
-
             renames = "\n".join([f"{original} {renamed}" for original, renamed in thirdparty_symbol_mappings]) + "\n"
             with tempfile.NamedTemporaryFile() as renames_file:
                 renames_file.write(renames.encode("utf-8"))

package/releng/env.py

@@ -9,7 +9,7 @@ import shlex
 import shutil
 import subprocess
 import sys
-from typing import Callable, Literal, Optional
+from typing import Callable, Dict, List, Literal, Optional, Tuple
 
 from . import env_android, env_apple, env_generic, machine_file
 from .machine_file import bool_to_meson, str_to_meson, strv_to_meson
@@ -19,10 +19,10 @@ from .machine_spec import MachineSpec
 @dataclass
 class MachineConfig:
     machine_file: Path
-    binpath: list[Path]
-    environ: dict[str, str]
+    binpath: List[Path]
+    environ: Dict[str, str]
 
-    def make_merged_environment(self, source_environ: dict[str, str]) -> dict[str, str]:
+    def make_merged_environment(self, source_environ: Dict[str, str]) -> Dict[str, str]:
         menv = {**source_environ}
         menv.update(self.environ)
 
@@ -63,13 +63,13 @@ def detect_default_prefix() -> Path:
 
 def generate_machine_configs(build_machine: MachineSpec,
                              host_machine: MachineSpec,
-                             environ: dict[str, str],
+                             environ: Dict[str, str],
                              toolchain_prefix: Optional[Path],
                              build_sdk_prefix: Optional[Path],
                              host_sdk_prefix: Optional[Path],
                              call_selected_meson: Callable,
                              default_library: DefaultLibrary,
-                             outdir: Path) -> tuple[MachineConfig, MachineConfig]:
+                             outdir: Path) -> Tuple[MachineConfig, MachineConfig]:
     is_cross_build = host_machine != build_machine
 
     if is_cross_build:
@@ -107,7 +107,7 @@ def generate_machine_configs(build_machine: MachineSpec,
 def generate_machine_config(machine: MachineSpec,
                             build_machine: MachineSpec,
                             is_cross_build: bool,
-                            environ: dict[str, str],
+                            environ: Dict[str, str],
                             toolchain_prefix: Optional[Path],
                             sdk_prefix: Optional[Path],
                             call_selected_meson: Callable,
@@ -249,13 +249,13 @@ def generate_machine_config(machine: MachineSpec,
 
 def needs_exe_wrapper(build_machine: MachineSpec,
                       host_machine: MachineSpec,
-                      environ: dict[str, str]) -> bool:
+                      environ: Dict[str, str]) -> bool:
     return not can_run_host_binaries(build_machine, host_machine, environ)
 
 
 def can_run_host_binaries(build_machine: MachineSpec,
                           host_machine: MachineSpec,
-                          environ: dict[str, str]) -> bool:
+                          environ: Dict[str, str]) -> bool:
     if host_machine == build_machine:
         return True
 
@@ -281,7 +281,7 @@ def can_run_host_binaries(build_machine: MachineSpec,
 
 
 def find_exe_wrapper(machine: MachineSpec,
-                     environ: dict[str, str]) -> Optional[list[str]]:
+                     environ: Dict[str, str]) -> Optional[List[str]]:
     if machine.arch == "arm64beilp32":
         return None
 
@@ -297,7 +297,7 @@ def find_exe_wrapper(machine: MachineSpec,
     return [qemu_binary, "-L", qemu_sysroot]
 
 
-def make_pkg_config_wrapper(pkg_config: list[str], pkg_config_path: list[str]) -> str:
+def make_pkg_config_wrapper(pkg_config: List[str], pkg_config_path: List[str]) -> str:
     return "\n".join([
         "import os",
         "import subprocess",
@@ -317,7 +317,7 @@ def make_pkg_config_wrapper(pkg_config: list[str], pkg_config_path: list[str]) -
 
 
 def detect_toolchain_vala_compiler(toolchain_prefix: Path,
-                                   build_machine: MachineSpec) -> Optional[tuple[Path, Path]]:
+                                   build_machine: MachineSpec) -> Optional[Tuple[Path, Path]]:
     datadir = next((toolchain_prefix / "share").glob("vala-*"), None)
     if datadir is None:
         return None

package/releng/env_android.py

@@ -1,7 +1,7 @@
 from configparser import ConfigParser
 from pathlib import Path
 import shlex
-from typing import Callable, Optional
+from typing import Callable, Dict, List, Optional
 
 from .machine_file import strv_to_meson
 from .machine_spec import MachineSpec
@@ -10,13 +10,13 @@ from .machine_spec import MachineSpec
 def init_machine_config(machine: MachineSpec,
                         build_machine: MachineSpec,
                         is_cross_build: bool,
-                        environ: dict[str, str],
+                        environ: Dict[str, str],
                         toolchain_prefix: Optional[Path],
                         sdk_prefix: Optional[Path],
                         call_selected_meson: Callable,
                         config: ConfigParser,
-                        outpath: list[str],
-                        outenv: dict[str, str],
+                        outpath: List[str],
+                        outenv: Dict[str, str],
                         outdir: Path):
     ndk_found = False
     try:

package/releng/env_apple.py

@@ -2,7 +2,7 @@ from configparser import ConfigParser
 from pathlib import Path
 import shlex
 import subprocess
-from typing import Callable, Optional
+from typing import Callable, Dict, List, Optional
 
 from .machine_file import strv_to_meson
 from .machine_spec import MachineSpec
@@ -11,13 +11,13 @@ from .machine_spec import MachineSpec
 def init_machine_config(machine: MachineSpec,
                         build_machine: MachineSpec,
                         is_cross_build: bool,
-                        environ: dict[str, str],
+                        environ: Dict[str, str],
                         toolchain_prefix: Optional[Path],
                         sdk_prefix: Optional[Path],
                         call_selected_meson: Callable,
                         config: ConfigParser,
-                        outpath: list[str],
-                        outenv: dict[str, str],
+                        outpath: List[str],
+                        outenv: Dict[str, str],
                         outdir: Path):
     xcenv = {**environ}
     if machine.arch == "arm64eoabi":

package/releng/env_generic.py

@@ -5,7 +5,7 @@ from pathlib import Path
 import shutil
 import subprocess
 import tempfile
-from typing import Callable, Optional, Mapping, Sequence
+from typing import Callable, Dict, List, Optional, Mapping, Sequence, Tuple
 
 from . import winenv
 from .machine_file import strv_to_meson
@@ -15,13 +15,13 @@ from .machine_spec import MachineSpec
 def init_machine_config(machine: MachineSpec,
                         build_machine: MachineSpec,
                         is_cross_build: bool,
-                        environ: dict[str, str],
+                        environ: Dict[str, str],
                         toolchain_prefix: Optional[Path],
                         sdk_prefix: Optional[Path],
                         call_selected_meson: Callable,
                         config: ConfigParser,
-                        outpath: list[str],
-                        outenv: dict[str, str],
+                        outpath: List[str],
+                        outenv: Dict[str, str],
                         outdir: Path):
     allow_undefined_symbols = machine.os == "freebsd"
 
@@ -201,10 +201,9 @@ def init_machine_config(machine: MachineSpec,
         if linker_flavor.startswith("gnu-"):
             linker_flags += ["-static-libgcc"]
             if machine.os != "windows":
-                linker_flags += [
-                    "-Wl,-z,relro",
-                    "-Wl,-z,noexecstack",
-                ]
+                linker_flags += ["-Wl,-z,noexecstack"]
+            if machine.os != "none":
+                linker_flags += ["-Wl,-z,relro"]
             cxx_link_flags += ["-static-libstdc++"]
 
         if linker_flavor == "apple":
@@ -214,6 +213,9 @@ def init_machine_config(machine: MachineSpec,
         if linker_flavor == "gnu-gold":
             linker_flags += ["-Wl,--icf=all"]
 
+        if machine.os == "none":
+            linker_flags += ["-specs=nosys.specs"]
+
     constants = config["constants"]
     constants["common_flags"] = strv_to_meson(common_flags)
     constants["c_like_flags"] = strv_to_meson(c_like_flags)
@@ -222,7 +224,7 @@ def init_machine_config(machine: MachineSpec,
     constants["cxx_link_flags"] = strv_to_meson(cxx_link_flags)
 
 
-def resolve_gcc_binaries(toolprefix: str = "") -> tuple[list[str], dict[str, str]]:
+def resolve_gcc_binaries(toolprefix: str = "") -> Tuple[List[str], Dict[str, str]]:
     cc = None
     binaries = OrderedDict()
 
@@ -255,7 +257,7 @@ def resolve_gcc_binaries(toolprefix: str = "") -> tuple[list[str], dict[str, str
     return (cc, binaries)
 
 
-def detect_linker_flavor(cc: list[str]) -> str:
+def detect_linker_flavor(cc: List[str]) -> str:
     linker_version = subprocess.run(cc + ["-Wl,--version"],
                                     stdout=subprocess.PIPE,
                                     stderr=subprocess.STDOUT,
@@ -266,7 +268,7 @@ def detect_linker_flavor(cc: list[str]) -> str:
         return "gnu-ld"
     if "GNU gold " in linker_version:
         return "gnu-gold"
-    if linker_version.startswith("LLD "):
+    if linker_version.startswith("LLD ") or "compatible with GNU linkers" in linker_version:
         return "lld"
     if linker_version.startswith("ld: "):
         return "apple"
@@ -305,6 +307,10 @@ ARCH_COMMON_FLAGS_UNIX = {
         "-mfpu=neon-vfpv4",
         "-mthumb",
     ],
+    "armv6kz": [
+        "-march=armv6kz",
+        "-mcpu=arm1176jzf-s",
+    ],
     "arm64": [
         "-march=armv8-a",
     ],

package/releng/frida_version.py

@@ -6,6 +6,7 @@ import os
 from pathlib import Path
 import subprocess
 import sys
+from typing import List
 
 
 RELENG_DIR = Path(__file__).resolve().parent
@@ -22,7 +23,7 @@ class FridaVersion:
     commit: str
 
 
-def main(argv: list[str]):
+def main(argv: List[str]):
     parser = argparse.ArgumentParser()
     parser.add_argument("repo", nargs="?", type=Path, default=ROOT_DIR)
     args = parser.parse_args()

package/releng/machine_file.py

@@ -1,9 +1,9 @@
 from configparser import ConfigParser
 from pathlib import Path
-from typing import Sequence, Union
+from typing import Dict, List, Sequence, Union
 
 
-def load(mfile: Path) -> dict[str, Union[str, list[str]]]:
+def load(mfile: Path) -> Dict[str, Union[str, List[str]]]:
     config = ConfigParser()
     config.read(mfile)
 

package/releng/machine_spec.py

@@ -3,7 +3,7 @@ from dataclasses import dataclass
 import platform
 import re
 import subprocess
-from typing import Optional
+from typing import List, Optional
 
 if platform.system() == "Windows":
     import ctypes
@@ -145,7 +145,7 @@ class MachineSpec:
         return True
 
     @property
-    def meson_optimization_options(self) -> list[str]:
+    def meson_optimization_options(self) -> List[str]:
         if self.config_is_optimized:
             optimization = "s"
             ndebug = "true"
@@ -335,6 +335,7 @@ CPU_FAMILIES = {
     "armbe8":       "arm",
     "armeabi":      "arm",
     "armhf":        "arm",
+    "armv6kz":      "arm",
 
     "arm64":        "aarch64",
     "arm64be":      "aarch64",
@@ -353,6 +354,7 @@ CPU_TYPES = {
     "armbe8":       "armv6",
     "armhf":        "armv7hf",
     "armeabi":      "armv7eabi",
+    "armv6kz":      "armv6",
 
     "arm64":        "aarch64",
     "arm64be":      "aarch64",
@@ -366,6 +368,7 @@ CPU_TYPES_PER_OS_OVERRIDES = {
         "arm":        "armv5t",
         "armbe8":     "armv6t",
         "armhf":      "armv7a",
+        "armv6kz":    "armv6t",
 
         "mips":       "mips1",
         "mipsel":     "mips1",

package/releng/meson/mesonbuild/compilers/mixins/clike.py

@@ -1238,7 +1238,7 @@ class CLikeCompiler(Compiler):
     def thread_flags(self, env: 'Environment') -> T.List[str]:
         # TODO: does this belong here or in GnuLike or maybe PosixLike?
         host_m = env.machines[self.for_machine]
-        if host_m.is_haiku() or host_m.is_darwin():
+        if host_m.is_haiku() or host_m.is_darwin() or host_m.is_none():
             return []
         return ['-pthread']
 

package/releng/meson/mesonbuild/envconfig.py

@@ -366,6 +366,12 @@ class MachineInfo(HoldableObject):
         """Machine is IRIX?"""
         return self.system.startswith('irix')
 
+    def is_none(self) -> bool:
+        """
+        Machine has no standard OS, e.g. kernel or firmware?
+        """
+        return self.system == 'none'
+
     # Various prefixes and suffixes for import libraries, shared libraries,
     # static libraries, and executables.
     # Versioning is added to these names in the backends as-needed.

package/releng/meson/mesonbuild/linkers/linkers.py

@@ -641,7 +641,8 @@ class GnuLikeDynamicLinkerMixin(DynamicLinkerBase):
         return self._apply_prefix('--out-implib=' + implibname)
 
     def thread_flags(self, env: 'Environment') -> T.List[str]:
-        if env.machines[self.for_machine].is_haiku():
+        host_m = env.machines[self.for_machine]
+        if host_m.is_haiku() or host_m.is_none():
             return []
         return ['-pthread']
 

package/releng/meson_configure.py

@@ -8,7 +8,7 @@ import shlex
 import shutil
 import subprocess
 import sys
-from typing import Any, Callable, Optional
+from typing import Any, Callable, Dict, List, Optional, Set
 
 RELENG_DIR = Path(__file__).resolve().parent
 SCRIPTS_DIR = RELENG_DIR / "meson-scripts"
@@ -35,7 +35,8 @@ def main():
     builddir = Path(os.environ.get("MESON_BUILD_ROOT", default_builddir)).resolve()
 
     parser = argparse.ArgumentParser(prog="configure",
-                                     add_help=False)
+                                     add_help=False,
+                                     formatter_class=argparse.RawTextHelpFormatter)
     opts = parser.add_argument_group(title="generic options")
     opts.add_argument("-h", "--help",
                       help="show this help message and exit",
@@ -118,12 +119,12 @@ def configure(sourcedir: Path,
               prefix: Optional[str] = None,
               build_machine: Optional[MachineSpec] = None,
               host_machine: Optional[MachineSpec] = None,
-              environ: dict[str, str] = os.environ,
+              environ: Dict[str, str] = os.environ,
               debug_symbols: str = "stripped",
               default_library: str = "static",
-              allowed_prebuilds: set[str] = None,
+              allowed_prebuilds: Set[str] = None,
               meson: str = "internal",
-              extra_meson_options: list[str] = [],
+              extra_meson_options: List[str] = [],
               call_meson: Callable = env.call_meson,
               on_progress: ProgressCallback = print_progress):
     if prefix is None:
@@ -243,7 +244,7 @@ def parse_prefix(raw_prefix: str) -> Path:
     return prefix
 
 
-def query_supported_bundle_types(include_wildcards: bool) -> list[str]:
+def query_supported_bundle_types(include_wildcards: bool) -> List[str]:
     for e in deps.Bundle:
         identifier = e.name.lower()
         if e == deps.Bundle.SDK:
@@ -255,11 +256,11 @@ def query_supported_bundle_types(include_wildcards: bool) -> list[str]:
             yield identifier
 
 
-def query_supported_bundle_type_values() -> list[deps.Bundle]:
+def query_supported_bundle_type_values() -> List[deps.Bundle]:
     return [e for e in deps.Bundle]
 
 
-def parse_bundle_type_set(raw_array: str) -> list[str]:
+def parse_bundle_type_set(raw_array: str) -> List[str]:
     supported_types = list(query_supported_bundle_types(include_wildcards=True))
     result = set()
     for element in raw_array.split(","):
@@ -411,7 +412,7 @@ def help_text_from_meson(description: str) -> str:
     return description
 
 
-def collect_meson_options(options: argparse.Namespace) -> list[str]:
+def collect_meson_options(options: argparse.Namespace) -> List[str]:
     result = []
 
     for raw_name, raw_val in vars(options).items():
@@ -429,11 +430,11 @@ def collect_meson_options(options: argparse.Namespace) -> list[str]:
     return result
 
 
-def make_array_option_value_parser(opt: UserOption[Any]) -> Callable[[str], list[str]]:
+def make_array_option_value_parser(opt: UserOption[Any]) -> Callable[[str], List[str]]:
     return lambda v: parse_array_option_value(v, opt)
 
 
-def parse_array_option_value(v: str, opt: UserArrayOption) -> list[str]:
+def parse_array_option_value(v: str, opt: UserArrayOption) -> List[str]:
     vals = [v.strip() for v in v.split(",")]
 
     choices = opt.choices

package/releng/meson_make.py

@@ -5,7 +5,7 @@ import pickle
 import shlex
 import shutil
 import sys
-from typing import Callable
+from typing import Callable, Dict, List
 
 from . import env
 from .meson_configure import configure
@@ -41,8 +41,8 @@ def main():
 
 def make(sourcedir: Path,
          builddir: Path,
-         targets: list[str],
-         environ: dict[str, str] = os.environ,
+         targets: List[str],
+         environ: Dict[str, str] = os.environ,
          call_meson: Callable = env.call_meson):
     if not (builddir / "build.ninja").exists():
         configure(sourcedir, builddir, environ=environ)

package/releng/mkdevkit.py

@@ -1,20 +1,24 @@
 #!/usr/bin/env python3
 
 import argparse
+from enum import Enum
 import hashlib
 from pathlib import Path
 import subprocess
 import sys
-from typing import Optional
+import textwrap
+from typing import Dict, List, Optional
 
 REPO_ROOT = Path(__file__).resolve().parent.parent
 sys.path.insert(0, str(REPO_ROOT))
 from releng import devkit, env, machine_spec
 
+DepSymbolScope = devkit.DepSymbolScope
+
 
 def main():
-    raw_args: list[str] = []
-    ool_optvals: dict[str, list[str]] = {}
+    raw_args: List[str] = []
+    ool_optvals: Dict[str, List[str]] = {}
     pending_raw_args = sys.argv[1:]
     while len(pending_raw_args) > 0:
         cur = pending_raw_args.pop(0)
@@ -33,7 +37,7 @@ def main():
         else:
             raw_args.append(cur)
 
-    parser = argparse.ArgumentParser()
+    parser = argparse.ArgumentParser(formatter_class=argparse.RawTextHelpFormatter)
     parser.add_argument("kit")
     parser.add_argument("machine",
                         type=machine_spec.MachineSpec.parse)
@@ -45,6 +49,16 @@ def main():
                         dest="flavor",
                         const="_thin",
                         default="")
+    parser.add_argument("--dep-symbol-scope",
+                        metavar="S",
+                        type=DepSymbolScope,
+                        choices=list(DepSymbolScope),
+                        default=DepSymbolScope.PREFIXED.value,
+                        help=textwrap.dedent("""\
+                            how to scope symbols from third-party archives:
+                             - prefixed: add the '_frida_' prefix
+                             - original: keep symbols exactly as upstream
+                            """))
     parser.add_argument("--cc",
                         help="C compiler to use",
                         type=lambda v: parse_array_option_value(v, ool_optvals))
@@ -52,7 +66,7 @@ def main():
     for name in machine_options.keys():
         pretty_name = name.replace("_", "-")
         parser.add_argument("--" + pretty_name,
-                            help=f"The {pretty_name} to use",
+                            help=f"the {pretty_name} to use",
                             type=lambda v: parse_array_option_value(v, ool_optvals))
 
     options = parser.parse_args(raw_args)
@@ -82,7 +96,7 @@ def main():
         assert meson_config is not None
 
     try:
-        app = devkit.CompilerApplication(kit, machine, meson_config, outdir)
+        app = devkit.CompilerApplication(kit, machine, meson_config, outdir, options.dep_symbol_scope)
         app.run()
     except subprocess.CalledProcessError as e:
         print(e, file=sys.stderr)
@@ -93,7 +107,7 @@ def main():
         sys.exit(1)
 
 
-def parse_array_option_value(val: str, ool_optvals: dict[str, list[str]]) -> Optional[list[str]]:
+def parse_array_option_value(val: str, ool_optvals: Dict[str, List[str]]) -> Optional[List[str]]:
     if val == "":
         return None
     if val.startswith("ool:"):

package/releng/winenv.py

@@ -4,7 +4,7 @@ import os
 from pathlib import Path
 import platform
 import subprocess
-from typing import Optional
+from typing import List, Optional, Tuple
 if platform.system() == "Windows":
     import winreg
 
@@ -53,7 +53,7 @@ def detect_msvc_tool_dir(toolchain_prefix: Optional[Path]) -> Path:
     return cached_msvc_dir
 
 
-def detect_windows_sdk() -> tuple[Path, str]:
+def detect_windows_sdk() -> Tuple[Path, str]:
     global cached_winsdk
     if cached_winsdk is None:
         try:
@@ -82,7 +82,7 @@ def detect_msvs_tool_path(machine: MachineSpec,
 
 def detect_msvs_runtime_path(machine: MachineSpec,
                              build_machine: MachineSpec,
-                             toolchain_prefix: Optional[Path]) -> list[Path]:
+                             toolchain_prefix: Optional[Path]) -> List[Path]:
     msvc_platform = machine.msvc_platform
     native_msvc_platform = build_machine.msvc_platform
 
@@ -99,7 +99,7 @@ def detect_msvs_runtime_path(machine: MachineSpec,
     return [winsdk_bindir, msvc_bindir] + msvc_dll_dirs
 
 
-def detect_msvs_include_path(toolchain_prefix: Optional[Path]) -> list[Path]:
+def detect_msvs_include_path(toolchain_prefix: Optional[Path]) -> List[Path]:
     msvc_dir = detect_msvc_tool_dir(toolchain_prefix)
     vc_dir = detect_msvs_installation_dir(toolchain_prefix) / "VC"
 
@@ -118,7 +118,7 @@ def detect_msvs_include_path(toolchain_prefix: Optional[Path]) -> list[Path]:
 
 
 def detect_msvs_library_path(machine: MachineSpec,
-                             toolchain_prefix: Optional[Path]) -> list[Path]:
+                             toolchain_prefix: Optional[Path]) -> List[Path]:
     msvc_platform = machine.msvc_platform
 
     msvc_dir = detect_msvc_tool_dir(toolchain_prefix)

package/src/frida_bindgen/assets/codegen_helpers.c

@@ -1856,10 +1856,15 @@ fdn_keep_alive_on_destroy_signal_handler_detached (gpointer data,
 static void
 fdn_keep_alive_schedule_cleanup (FdnKeepAliveContext * context)
 {
+  napi_threadsafe_function tsfn;
+
   if (fdn_in_cleanup)
     return;
 
-  napi_call_threadsafe_function (context->tsfn, NULL, napi_tsfn_blocking);
+  if ((tsfn = g_atomic_pointer_exchange (&context->tsfn, NULL)) != NULL)
+    napi_call_threadsafe_function (tsfn, tsfn, napi_tsfn_blocking);
+  else
+    fdn_keep_alive_context_unref (context);
 }
 
 static void
@@ -1869,19 +1874,22 @@ fdn_keep_alive_on_tsfn_invoke (napi_env env,
                                void * data)
 {
   FdnKeepAliveContext * ctx = context;
+  napi_threadsafe_function tsfn = data;
 
-  if (ctx->signal_handler_id != 0)
-  {
-    g_signal_handler_disconnect (ctx->handle, ctx->signal_handler_id);
-    ctx->signal_handler_id = 0;
+  g_signal_handler_disconnect (ctx->handle, ctx->signal_handler_id);
+  ctx->signal_handler_id = 0;
 
-    g_object_unref (ctx->handle);
-    ctx->handle = NULL;
+  g_object_unref (ctx->handle);
+  ctx->handle = NULL;
 
-    napi_release_threadsafe_function (ctx->tsfn, napi_tsfn_abort);
-    ctx->tsfn = NULL;
-  }
+  napi_release_threadsafe_function (tsfn, napi_tsfn_abort);
 
+  fdn_keep_alive_context_unref (ctx);
+}
+
+static void
+fdn_keep_alive_context_unref (FdnKeepAliveContext * ctx)
+{
   if (g_atomic_int_dec_and_test (&ctx->ref_count))
     g_slice_free (FdnKeepAliveContext, ctx);
 }

package/src/frida_bindgen/assets/codegen_prototypes.h

@@ -69,6 +69,7 @@ static void fdn_keep_alive_on_destroy_signal (GObject * handle, gpointer user_da
 static void fdn_keep_alive_on_destroy_signal_handler_detached (gpointer data, GClosure * closure);
 static void fdn_keep_alive_schedule_cleanup (FdnKeepAliveContext * context);
 static void fdn_keep_alive_on_tsfn_invoke (napi_env env, napi_value js_cb, void * context, void * data);
+static void fdn_keep_alive_context_unref (FdnKeepAliveContext * ctx);
 
 static void fdn_inherit_val_val (napi_env env, napi_value sub_ctor, napi_value super_ctor, napi_value object_ctor, napi_value set_proto);
 G_GNUC_UNUSED static void fdn_inherit_val_ref (napi_env env, napi_value sub_ctor, napi_ref super_ctor, napi_value object_ctor, napi_value set_proto);

package/subprojects/frida-core.wrap

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