Merge ~dviererbe/ubuntu/+source/m2crypto:ubuntu/devel into ubuntu/+source/m2crypto:ubuntu/devel

[Dominik Viererbe]

m2crypto FTBFS on reolute for armhf, because the upstream version 0.43 introduced a test to check for 32-bit time_t [1]. Debian added upstream version 0.46 in unstable.

This MP changes the test to check for 64-bit time_t, because the time_t transition in noble changed the behavior to always return 64_bit time_t timestamp.

[1] https://git.launchpad.net/ubuntu/+source/m2crypto/tree/CHANGES?id=f792a58978997c2357edbadb4b0dbf5fa5c828d5#n80

[Dominik Viererbe (dviererbe)]

This change builds successfully in this PPA: https://launchpad.net/~canonical-python-maintainers/+archive/ubuntu/lp2136110/+packages

[Graham Inggs (ginggs)]

The FTBFS was fixed in m2crypto 0.46.2-2, but the autopkgtest is failing on armhf.

Does your patch ifx the autopkgtest?

review: Needs Information

Unmerged commits

9e1d225... by Dominik Viererbe on 2025-12-15

changelog

56ac5aa... by Dominik Viererbe on 2025-12-15

update-maintainer

fc7c26a... by Dominik Viererbe on 2025-12-15

d/p/check-for-time_t-64-bits.patch: check for 64-bit time_t (LP: #2136110)

diff --git a/debian/changelog b/debian/changelog
index 92a5085..f143374 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+m2crypto (0.46.2-1ubuntu1) resolute; urgency=medium
+
+  * d/p/check-for-time_t-64-bits.patch: check for 64-bit time_t (LP: #2136110)
+
+ -- Dominik Viererbe <[e-mail]>  Mon, 15 Dec 2025 12:22:48 +0200
+
 m2crypto (0.46.2-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 072db32..5f83988 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: m2crypto
 Section: python
 Priority: optional
-Maintainer: Debian Python Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Python Team <[e-mail]>
 Uploaders:
  Alexandre Detiste <[e-mail]>,
 Build-Depends:
diff --git a/debian/patches/check-for-time_t-64-bits.patch b/debian/patches/check-for-time_t-64-bits.patch
new file mode 100644
index 0000000..d6a6260
--- /dev/null
+++ b/debian/patches/check-for-time_t-64-bits.patch
@@ -0,0 +1,43 @@
+Description: Check for 64-bit time_t
+ Since the 64-bit time_t transition introduced with Ubuntu 24.04 LTS
+ the time_t timestamp should always be 64 bits in size.
+Author: Dominik Viererbe <[e-mail]>, Ujjwal Sarswat <[e-mail]>
+Origin: vendor
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/m2crypto/+bug/2136110
+Forwarded: not-needed
+Last-Update: 2025-12-15
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/tests/test_util.py b/tests/test_util.py
+index e925d03..c7f89e4 100644
+--- a/tests/test_util.py
++++ b/tests/test_util.py
+@@ -14,22 +14,12 @@ from tests import unittest
+ 
+ class UtilTestCase(unittest.TestCase):
+ 
+-    def test_is32bit(self):
+-        # defaults
+-        bit32 = m2.time_t_bits()
+-        # test for libc musl from unfinished upstream bug gh#python/cpython#87414
+-        if (
+-            util.is_32bit()
+-            and (platform.libc_ver() != ("", ""))
+-            and (
+-                os.environ.get("M2_TIMET_NO_ARCH", "").casefold()
+-                not in ["true", "1", "yes"]
+-            )
+-        ):
+-            self.assertEqual(bit32, 32)
+-        else:
+-            self.assertNotEqual(bit32, 32)
+-        self.assertIsInstance(bit32, int)
++    # Since the 64-bit time_t transition introduced with Ubuntu 24.04 LTS
++    # the time_t timestamp should always be 64 bits in size.
++    def test_is64bit(self):
++        bit64 = m2.time_t_bits()
++        self.assertEqual(bit64, 64)
++        self.assertIsInstance(bit64, int)
+ 
+ 
+ def suite():
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..179abe7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+check-for-time_t-64-bits.patch