2 files changed, 16 insertions, 89 deletions

diff --git a/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-Make-the-cmd-available.patch b/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-Make-the-cmd-available.patch
index c4262985ba..12216ce46a 100644
--- a/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-Make-the-cmd-available.patch
+++ b/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-Make-the-cmd-available.patch
@@ -1,4 +1,4 @@
-From eaeb95ec64762a58dde7cf368fc17188382e7df6 Mon Sep 17 00:00:00 2001
+From 6262f49de177a79bc17f8d583aa5a7acaf48bf9c Mon Sep 17 00:00:00 2001
 From: Mingli Yu <mingli.yu@windriver.com>
 Date: Fri, 28 Mar 2025 12:13:26 +0800
 Subject: [PATCH] setup.py: Make the cmd available
@@ -19,19 +19,26 @@ Upstream-Status: Inappropriate [oe specific]
 
 Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
 ---
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ setup.py | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 9938e67..21e2346 100644
+index 792d7365b6ed..5b8a5d791793 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -230,7 +230,7 @@ class _M2CryptoBuildExt(build_ext.build_ext):
-             with open(
-                 "src/SWIG/x509_v_flag.h", "w", encoding="utf-8"
-             ) as x509_v_h:
--                cmd = [shutil.which(os.environ.get('CC', 'gcc'))]
+@@ -208,8 +208,10 @@ class _M2CryptoBuildExt(build_ext.build_ext):
+         if sys.platform != "win32":
+             # generate src/SWIG/x509_v_flag.h to overcome weaknesses of swig
+             # https://todo.sr.ht/~mcepl/m2crypto/298
+-            with open("src/SWIG/x509_v_flag.h", "w", encoding="utf-8") as x509_v_h:
+-                cmd = [shutil.which(os.environ.get("CC", "gcc"))]
++            with open(
++                "src/SWIG/x509_v_flag.h", "w", encoding="utf-8"
++            ) as x509_v_h:
 +                cmd = os.environ.get('CC', 'gcc').split()
                  cflags = os.environ.get("CFLAGS")
                  if cflags is not None:
                      cmd += cflags.split()
+-- 
+2.34.1
+
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
deleted file mode 100644
index 120a67b6a2..0000000000
--- a/meta-python/recipes-devtools/python/python3-m2crypto/0001-timeout.py-use-qq-format-when-time_t-is-64bit-on-32b.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 7fa4f17cc183e04b10684b28219cf15780910206 Mon Sep 17 00:00:00 2001
-From: Mingli Yu <mingli.yu@windriver.com>
-Date: Mon, 30 Jun 2025 16:11:16 +0800
-Subject: [PATCH] timeout.py: use qq format when time_t is 64bit on 32bit
- platform
-
-Fixes:
-   # python3
-  Python 3.13.2 (main, Feb  4 2025, 14:51:09) [GCC 14.2.0] on linux
-  Type "help", "copyright", "credits" or "license" for more information.
-  >>> import socket
-  >>> import struct
-  >>> s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-  >>> seconds = 5
-  >>> microseconds = 0
-  >>> timeval_packed = struct.pack('ll', seconds, microseconds)
-  >>> s.setsockopt(socket.SOL_SOCKET, socket.SO_RCVTIMEO, timeval_packed)
-Traceback (most recent call last):
-  File "<python-input-6>", line 1, in <module>
-    s.setsockopt(socket.SOL_SOCKET, socket.SO_RCVTIMEO, timeval_packed)
-    ~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-OSError: [Errno 22] Invalid argument
-
-Upstream-Status: Submitted [https://lists.sr.ht/~mcepl/m2crypto/patches/60463]
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
----
- src/M2Crypto/SSL/timeout.py | 18 ++++++++++++++----
- 1 file changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/src/M2Crypto/SSL/timeout.py b/src/M2Crypto/SSL/timeout.py
-index 298a9ca..0b38329 100644
---- a/src/M2Crypto/SSL/timeout.py
-+++ b/src/M2Crypto/SSL/timeout.py
-@@ -15,7 +15,7 @@ __all__ = [
- import sys
- import struct
- 
--from M2Crypto import m2
-+from M2Crypto import m2, util
- 
- DEFAULT_TIMEOUT: int = 600
- 
-@@ -40,7 +40,10 @@ class timeout(object):
-             if m2.time_t_bits() == 32:
-                 binstr = struct.pack('ii', self.sec, self.microsec)
-             else:
--                binstr = struct.pack('ll', self.sec, self.microsec)
-+                if util.is_32bit():
-+                    binstr = struct.pack('qq', self.sec, self.microsec)
-+                else:
-+                    binstr = struct.pack('ll', self.sec, self.microsec)
-         return binstr
- 
- 
-@@ -52,7 +55,10 @@ def struct_to_timeout(binstr: bytes) -> timeout:
-         sec = int(millisec / 1000)
-         microsec = (millisec % 1000) * 1000
-     else:
--        (sec, microsec) = struct.unpack('ll', binstr)
-+        if sys.platform == 'linux' and util.is_32bit() and m2.time_t_bits() == 64:
-+             (sec, microsec) = struct.unpack('qq', binstr)
-+        else:
-+            (sec, microsec) = struct.unpack('ll', binstr)
-     return timeout(sec, microsec)
- 
- 
-@@ -60,4 +66,8 @@ def struct_size() -> int:
-     if sys.platform == 'win32':
-         return struct.calcsize('l')
-     else:
--        return struct.calcsize('ll')
-+        if sys.platform == 'linux' and util.is_32bit() and m2.time_t_bits() == 64:
-+            return struct.calcsize('qq')
-+        else:
-+            return struct.calcsize('ll')
-+
--- 
-2.34.1
-