summaryrefslogtreecommitdiffstats
path: root/meta-python/recipes-devtools/python/python3-m2crypto
diff options
context:
space:
mode:
Diffstat (limited to 'meta-python/recipes-devtools/python/python3-m2crypto')
-rw-r--r--meta-python/recipes-devtools/python/python3-m2crypto/0001-timeout.py-use-qq-format-when-time_t-is-64bit-on-32b.patch80
1 files changed, 80 insertions, 0 deletions
diff --git a/meta-python/recipes-devtools/python/python3-m2crypto/0001-timeout.py-use-qq-format-when-time_t-is-64bit-on-32b.patch b/meta-python/recipes-devtools/python/python3-m2crypto/0001-timeout.py-use-qq-format-when-time_t-is-64bit-on-32b.patch
new file mode 100644
index 0000000000..120a67b6a2
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-m2crypto/0001-timeout.py-use-qq-format-when-time_t-is-64bit-on-32b.patch
@@ -0,0 +1,80 @@
1From 7fa4f17cc183e04b10684b28219cf15780910206 Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Mon, 30 Jun 2025 16:11:16 +0800
4Subject: [PATCH] timeout.py: use qq format when time_t is 64bit on 32bit
5 platform
6
7Fixes:
8 # python3
9 Python 3.13.2 (main, Feb 4 2025, 14:51:09) [GCC 14.2.0] on linux
10 Type "help", "copyright", "credits" or "license" for more information.
11 >>> import socket
12 >>> import struct
13 >>> s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
14 >>> seconds = 5
15 >>> microseconds = 0
16 >>> timeval_packed = struct.pack('ll', seconds, microseconds)
17 >>> s.setsockopt(socket.SOL_SOCKET, socket.SO_RCVTIMEO, timeval_packed)
18Traceback (most recent call last):
19 File "<python-input-6>", line 1, in <module>
20 s.setsockopt(socket.SOL_SOCKET, socket.SO_RCVTIMEO, timeval_packed)
21 ~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
22OSError: [Errno 22] Invalid argument
23
24Upstream-Status: Submitted [https://lists.sr.ht/~mcepl/m2crypto/patches/60463]
25
26Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
27---
28 src/M2Crypto/SSL/timeout.py | 18 ++++++++++++++----
29 1 file changed, 14 insertions(+), 4 deletions(-)
30
31diff --git a/src/M2Crypto/SSL/timeout.py b/src/M2Crypto/SSL/timeout.py
32index 298a9ca..0b38329 100644
33--- a/src/M2Crypto/SSL/timeout.py
34+++ b/src/M2Crypto/SSL/timeout.py
35@@ -15,7 +15,7 @@ __all__ = [
36 import sys
37 import struct
38
39-from M2Crypto import m2
40+from M2Crypto import m2, util
41
42 DEFAULT_TIMEOUT: int = 600
43
44@@ -40,7 +40,10 @@ class timeout(object):
45 if m2.time_t_bits() == 32:
46 binstr = struct.pack('ii', self.sec, self.microsec)
47 else:
48- binstr = struct.pack('ll', self.sec, self.microsec)
49+ if util.is_32bit():
50+ binstr = struct.pack('qq', self.sec, self.microsec)
51+ else:
52+ binstr = struct.pack('ll', self.sec, self.microsec)
53 return binstr
54
55
56@@ -52,7 +55,10 @@ def struct_to_timeout(binstr: bytes) -> timeout:
57 sec = int(millisec / 1000)
58 microsec = (millisec % 1000) * 1000
59 else:
60- (sec, microsec) = struct.unpack('ll', binstr)
61+ if sys.platform == 'linux' and util.is_32bit() and m2.time_t_bits() == 64:
62+ (sec, microsec) = struct.unpack('qq', binstr)
63+ else:
64+ (sec, microsec) = struct.unpack('ll', binstr)
65 return timeout(sec, microsec)
66
67
68@@ -60,4 +66,8 @@ def struct_size() -> int:
69 if sys.platform == 'win32':
70 return struct.calcsize('l')
71 else:
72- return struct.calcsize('ll')
73+ if sys.platform == 'linux' and util.is_32bit() and m2.time_t_bits() == 64:
74+ return struct.calcsize('qq')
75+ else:
76+ return struct.calcsize('ll')
77+
78--
792.34.1
80