frida 17.5.1 → 17.5.2

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.5.2",
   "authors": [
     "Frida Developers"
   ],

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/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/subprojects/frida-core.wrap

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