Merge ~vmpyr/ubuntu/+source/python-ptrace:ubuntu/devel into ubuntu/+source/python-ptrace:ubuntu/devel

[Ujjwal Sarswat]

The test test_link tries to regex match link() with the system call arising from os.link(). This behaviour was changed in Python 3.14 to instead use linkat(), if available [1].

This MP updates the regex to also match for linkat().

[1] https://github.com/python/cpython/commit/5a57248b22ad3b9aafcaaadae2c304a1923daeca

[Ujjwal Sarswat (vmpyr)]

I built the package locally against resolute-proposed and the build was successful.

[Graham Inggs (ginggs)]

It looks like this was fixed in python-ptrace 0.9.9-0.3

review: Needs Information

[Ujjwal Sarswat (vmpyr)]

Confirmed, yes this has been fixed.

review: Disapprove (not needed)

Unmerged commits

0d8a869... by Ujjwal Sarswat on 2025-12-15

update maintainer

15db4f5... by Ujjwal Sarswat on 2025-12-15

changelog

e30d4be... by Ujjwal Sarswat on 2025-12-15

d/p/fix-linkat-regex-for-python314.patch: match both link and linkat (LP: #2136100)

90b0c8b... by Graham Inggs on 2025-10-18

0.9.9-0.2build1 (patches unapplied)

Imported using git-ubuntu import.

diff --git a/debian/changelog b/debian/changelog
index 1a52961..bf4650d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+python-ptrace (0.9.9-0.2ubuntu1) resolute; urgency=medium
+
+  * d/p/fix-linkat-regex-for-python314.patch: match both link and linkat
+    (LP: #2136100)
+
+ -- Ujjwal Sarswat <[e-mail]>  Mon, 15 Dec 2025 14:52:32 +0530
+
 python-ptrace (0.9.9-0.2build1) resolute; urgency=medium
 
   * No-change rebuild with Python 3.14 as supported version
diff --git a/debian/control b/debian/control
index 60608cf..35b06d0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: python-ptrace
 Section: python
 Priority: optional
-Maintainer: Pierre Chifflier <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Pierre Chifflier <[e-mail]>
 Build-Depends: debhelper-compat (= 13),
     dh-python,
     python3-all-dev,
diff --git a/debian/patches/fix-linkat-regex-for-python314.patch b/debian/patches/fix-linkat-regex-for-python314.patch
new file mode 100644
index 0000000..f201345
--- /dev/null
+++ b/debian/patches/fix-linkat-regex-for-python314.patch
@@ -0,0 +1,25 @@
+Description: Fix linkat regex for Python 3.14
+ Python 3.14 introduced calling of linkat() instead of link() from os.link(),
+ if available on platforms (like Linux and OpenIndiana) where the
+ system link() function does not follow symlinks.
+ See: https://github.com/python/cpython/commit/5a57248b22ad3b9aafcaaadae2c304a1923daeca
+Author: Ujjwal Sarswat <[e-mail]>, Dominik Viererbe <[e-mail]>
+Origin: vendor
+Bug: https://github.com/vstinner/python-ptrace/pull/91
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1117911
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-ptrace/+bug/2136100
+Forwarded: not-needed, already reported
+Last-Update: 2025-12-15
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/tests/test_strace.py
++++ b/tests/test_strace.py
+@@ -85,7 +85,7 @@
+                             pattern)
+ 
+     def test_link(self):
+-        pattern = br"^link\('oldpath', 'newpath'\)"
++        pattern = br"^(link|linkat)\(.*'oldpath'.*'newpath'.*\)"
+         if AARCH64 or RISCV:
+             pattern = br"^linkat\(.*'oldpath'.*'newpath'.*\)"
+         self.assert_syscall("import os; os.link('oldpath', 'newpath')",
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ce365c8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-linkat-regex-for-python314.patch