frida 17.5.1 → 17.6.0

package/build/Makefile

@@ -2,8 +2,8 @@ PYTHON ?= $(shell which python3 >/dev/null && echo python3 || echo python)
 
 all $(MAKECMDGOALS):
 	@$(PYTHON) \
-		-c "import sys; sys.path.insert(0, r'/home/runner/work/frida/frida/subprojects/frida-node'); from releng.meson_make import main; main()" \
-		/home/runner/work/frida/frida/subprojects/frida-node \
+		-c "import sys; sys.path.insert(0, r'/home/runner/work/frida-node/frida-node'); from releng.meson_make import main; main()" \
+		/home/runner/work/frida-node/frida-node \
 		. \
 		$(MAKECMDGOALS)
 

package/package.json

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

package/releng/deps.toml

@@ -1,5 +1,5 @@
 [dependencies]
-version = "20250919"
+version = "20260106"
 bootstrap_version = "20250801"
 
 [ninja]
@@ -65,7 +65,7 @@ options = [
 [selinux]
 when = "machine.os == 'android'"
 name = "SELinux Userspace"
-version = "6d5513fd8069e9ff9b7aa10970d34457b32970c8"
+version = "b7c8cd70d821bb3fc69500e6273149299b80b923"
 url = "https://github.com/frida/selinux.git"
 options = [
     "-Dregex=disabled",
@@ -73,7 +73,7 @@ options = [
 
 [glib]
 name = "GLib"
-version = "9dc59b1b5503789ada22f7699e53256fa3287217"
+version = "81b631758fe5c665ade9d869554148f6160fe681"
 url = "https://github.com/frida/glib.git"
 options = [
     "-Dcocoa=disabled",
@@ -218,7 +218,7 @@ url = "https://github.com/frida/libusb.git"
 [lwip]
 when = "machine.os != 'none'"
 name = "lwIP"
-version = "4fe7223c2e80dc328266fb2483e789ee5fad7c79"
+version = "334ebb20a22023db2f0d5017e96eb0c7798082fd"
 url = "https://github.com/frida/lwip.git"
 options = [
     "-Dipv4=disabled",
@@ -386,7 +386,7 @@ when = """ \
        and machine.os not in {'none', 'qnx'} \
        """
 name = "V8"
-version = "669119f601663b73fc01f8eee02cf2f093bbf25b"
+version = "ef1c2f15d84ff1e1afcc6dd165a23c9fd63608b4"
 url = "https://github.com/frida/v8.git"
 options = [
     "-Ddebug=false",

package/releng/frida_version.py

@@ -4,6 +4,7 @@ import argparse
 from dataclasses import dataclass
 import os
 from pathlib import Path
+import re
 import subprocess
 import sys
 from typing import List
@@ -40,31 +41,66 @@ def detect(repo: Path) -> FridaVersion:
     nano = 0
     commit = ""
 
-    if (repo / ".git").exists():
-        description = subprocess.run(["git", "describe", "--tags", "--always", "--long"],
-                                     cwd=repo,
-                                     capture_output=True,
-                                     encoding="utf-8").stdout
-
-        tokens = description.strip().replace("-", ".").split(".")
-        if len(tokens) > 1:
-            (raw_major, raw_minor, raw_micro, raw_nano, commit) = tokens
-            major = int(raw_major)
-            minor = int(raw_minor)
-            micro = int(raw_micro)
-            nano = int(raw_nano)
-            if nano > 0:
-                micro += 1
-
-            if nano == 0:
-                version_name = f"{major}.{minor}.{micro}"
-            else:
-                version_name = f"{major}.{minor}.{micro}-dev.{nano - 1}"
+    if not (repo / ".git").exists():
+        return FridaVersion(version_name, major, minor, micro, nano, commit)
+
+    proc = subprocess.run(
+        ["git", "describe", "--tags", "--always", "--long"],
+        cwd=repo,
+        capture_output=True,
+        encoding="utf-8",
+        check=False,
+    )
+    description = proc.stdout.strip()
+
+    if "-" not in description:
+        commit = description
+        return FridaVersion(version_name, major, minor, micro, nano, commit)
+
+    parts = description.rsplit("-", 2)
+    if len(parts) != 3:
+        raise VersionParseError(f"Unexpected format from git describe: {description!r}")
+
+    tag_part, distance_str, commit_part = parts
+    commit = commit_part.lstrip("g")
+
+    try:
+        distance = int(distance_str)
+    except ValueError as exc:
+        raise VersionParseError(f"Invalid distance in {description!r}") from exc
+
+    nano = distance
+
+    m = re.match(r"^(\d+)\.(\d+)\.(\d+)(?:-(.+))?$", tag_part)
+    if m is None:
+        raise VersionParseError(
+            f"Tag does not match expected semver pattern: {tag_part!r}"
+        )
+
+    major = int(m.group(1))
+    minor = int(m.group(2))
+    micro = int(m.group(3))
+    suffix = m.group(4)
+
+    if suffix is None:
+        if distance == 0:
+            version_name = f"{major}.{minor}.{micro}"
         else:
-            commit = tokens[0]
+            micro += 1
+            version_name = f"{major}.{minor}.{micro}-dev.{distance - 1}"
+    else:
+        base = f"{major}.{minor}.{micro}-{suffix}"
+        if distance == 0:
+            version_name = base
+        else:
+            version_name = f"{base}-dev.{distance - 1}"
 
     return FridaVersion(version_name, major, minor, micro, nano, commit)
 
 
+class VersionParseError(Exception):
+    pass
+
+
 if __name__ == "__main__":
     main(sys.argv)

package/releng/machine_spec.py

@@ -113,7 +113,7 @@ class MachineSpec:
     def maybe_adapt_to_host(self, host_machine: MachineSpec) -> MachineSpec:
         if self.identifier == host_machine.identifier and host_machine.triplet is not None:
             return host_machine
-        if self.os == "windows":
+        if self.os == "windows" and host_machine.os == "windows":
             if host_machine.arch in {"x86_64", "x86"}:
                 return host_machine
             if self.arch == host_machine.arch:

package/releng/meson/mesonbuild/compilers/swift.py

@@ -50,13 +50,18 @@ class SwiftCompiler(Compiler):
     def get_dependency_gen_args(self, outtarget: str, outfile: str) -> T.List[str]:
         return ['-emit-dependencies']
 
+    def get_dependency_compile_args(self, dep: 'Dependency') -> T.List[str]:
+        return [arg for arg in dep.get_compile_args() if arg != "-pthread"]
+
     def get_dependency_link_args(self, dep: 'Dependency') -> T.List[str]:
         result = []
         for arg in dep.get_link_args():
             if arg.startswith("-Wl,"):
                 for flag in arg[4:].split(","):
                     result += ["-Xlinker", flag]
-            else:
+            elif arg != '-pthread':
+                if arg.endswith('.a'):
+                    result.append('-Xlinker')
                 result.append(arg)
         return result
 

package/releng/meson/mesonbuild/interpreter/interpreter.py

@@ -843,7 +843,7 @@ class Interpreter(InterpreterBase, HoldableObject):
                     a = os.path.join(srcdir, self.subdir, a)
             self.add_build_def_file(a)
 
-        return RunProcess(cmd, expanded_args, env, srcdir, builddir, self.subdir,
+        return RunProcess(cmd, expanded_args, env, srcdir, builddir, self.relative_builddir_path_for(self.subdir),
                           self.environment.get_build_command() + ['introspect'],
                           in_builddir=in_builddir, check=check, capture=capture)
 

package/releng/sync-from-upstream.py

@@ -36,6 +36,7 @@ upstreams = {
     "v8": "https://chromium.googlesource.com/v8/v8",
     "capstone": ("https://github.com/capstone-engine/capstone.git", "v5"),
     "tinycc": "https://repo.or.cz/tinycc.git",
+    "selinux": "https://github.com/SELinuxProject/selinux.git",
 }
 
 

package/src/frida_bindgen/assets/codegen_helpers.c

@@ -633,6 +633,7 @@ fdn_variant_from_value (napi_env env,
           {
             napi_value second;
             GVariant * val;
+            napi_value desc_prop;
             napi_value desc;
             gchar * type;
             GVariant * t[2];
@@ -640,12 +641,24 @@ fdn_variant_from_value (napi_env env,
             if (napi_get_element (env, value, 1, &second) != napi_ok)
               return FALSE;
 
-            if (!fdn_variant_from_value (env, second, &val))
-              return FALSE;
-
-            napi_coerce_to_string (env, first, &desc);
+            desc_prop = fdn_utf8_to_value (env, "description");
+            napi_get_property (env, first, desc_prop, &desc);
             fdn_utf8_from_value (env, desc, &type);
 
+            if (strcmp (type, "uint64") == 0)
+            {
+              gint64 i;
+
+              if (!fdn_int64_from_value (env, second, &i))
+                return FALSE;
+
+              val = g_variant_new_uint64 ((guint64) i);
+            }
+            else if (!fdn_variant_from_value (env, second, &val))
+            {
+              return FALSE;
+            }
+
             t[0] = g_variant_new_take_string (type);
             t[1] = val;
 

package/subprojects/frida-core.wrap

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