Bug#1085611: m2crypto: FTBFS on armel and armhf (and hppa, hurd-i386, powerpc and x32)

[Paul Gevers]

Source: m2crypto
Version: 0.42.0-1
Severity: serious
Tags: ftbfs patch pending
Justification: ftbfs

Hi,



I'll upload the attached NMU to DELAYED/10 shortly (adding the bug number).

Paul

https://salsa.debian.org/python-team/packages/m2crypto/-/commit/7f86ac049121f798d9ecc2a6df1b0f498e831c9c#caa888e864d322d64f070a08057f61b5626c2e13

diff -Nru m2crypto-0.42.0/debian/changelog m2crypto-0.42.0/debian/changelog
--- m2crypto-0.42.0/debian/changelog    2024-08-20 18:06:43.000000000 +0200
+++ m2crypto-0.42.0/debian/changelog    2024-10-20 22:02:01.000000000 +0200
@@ -1,3 +1,10 @@
+m2crypto (0.42.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * fix-ssl-timeout-for-t64.patch: reinstate qq in pack()
+
+ -- Paul Gevers <elb...@debian.org>  Sun, 20 Oct 2024 22:02:01 +0200
+
 m2crypto (0.42.0-1) unstable; urgency=medium
 
   * Team upload
diff -Nru m2crypto-0.42.0/debian/patches/fix-ssl-timeout-for-t64.patch 
m2crypto-0.42.0/debian/patches/fix-ssl-timeout-for-t64.patch
--- m2crypto-0.42.0/debian/patches/fix-ssl-timeout-for-t64.patch        
2024-08-20 18:06:43.000000000 +0200
+++ m2crypto-0.42.0/debian/patches/fix-ssl-timeout-for-t64.patch        
2024-10-20 22:02:01.000000000 +0200
@@ -14,7 +14,22 @@
  
  from M2Crypto.util import is_32bit, is_libc_musl
  
-@@ -43,7 +44,10 @@
+@@ -27,10 +28,12 @@
+             millisec = int(self.sec * 1000 + round(float(self.microsec) / 
1000))
+             binstr = struct.pack('l', millisec)
+         else:
+-            if is_32bit() and not is_libc_musl():
++            if platform.machine() in ["i386", "i686"] and not is_libc_musl():
+                 binstr = struct.pack('ii', self.sec, self.microsec)
+-            else:
++            elif platform.machine() in ["i386", "i686"]:
+                 binstr = struct.pack('ll', self.sec, self.microsec)
++            else:
++                binstr = struct.pack('qq', self.sec, self.microsec)
+         return binstr
+ 
+ 
+@@ -43,7 +46,10 @@
          sec = int(millisec / 1000)
          microsec = (millisec % 1000) * 1000
      else:
@@ -26,7 +41,7 @@
      return timeout(sec, microsec)
  
  
-@@ -52,4 +56,7 @@
+@@ -52,4 +58,7 @@
      if sys.platform == 'win32':
          return struct.calcsize('l')
      else:

As hinted at in bug 1082422, m2crypto fails to build on armel and armhf. I've hunted it down to a refreshed patch that dropped a 64-bit time_t part for non-i386 [1].

OpenPGP_signature.asc
Description: OpenPGP digital signature