[gentoo-commits] gentoo-x86 commit in dev-python/m2crypto/files: m2crypto-0.18.2-timeval_struct_size.patch

[Tiziano Mueller (dev-zero)]

dev-zero    08/02/24 11:34:26

  Added:                m2crypto-0.18.2-timeval_struct_size.patch
  Log:
  Version bump. Fixes one test-error (upstream bug: http://bugzilla.osafoundation.org/show_bug.cgi?id=11893). Added ~sh keyword wrt bug #172817).
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.1                  dev-python/m2crypto/files/m2crypto-0.18.2-timeval_struct_size.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/m2crypto/files/m2crypto-0.18.2-timeval_struct_size.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/m2crypto/files/m2crypto-0.18.2-timeval_struct_size.patch?rev=1.1&content-type=text/plain

Index: m2crypto-0.18.2-timeval_struct_size.patch
===================================================================
--- M2Crypto/SSL/Connection.py.orig	2008-02-24 12:27:31.000000000 +0100
+++ M2Crypto/SSL/Connection.py	2008-02-24 12:28:26.000000000 +0100
@@ -4,6 +4,8 @@
 
 # Python
 import socket
+import struct
+sizeof_timeval = struct.calcsize('ll')
 
 # M2Crypto
 from Cipher import Cipher, Cipher_Stack
@@ -325,10 +327,10 @@
         return m2.ssl_get_default_session_timeout(self.ssl)
 
     def get_socket_read_timeout(self):
-        return timeout.struct_to_timeout(self.socket.getsockopt(socket.SOL_SOCKET, socket.SO_RCVTIMEO, 8))
+        return timeout.struct_to_timeout(self.socket.getsockopt(socket.SOL_SOCKET, socket.SO_RCVTIMEO, sizeof_timeval))
 
     def get_socket_write_timeout(self):
-        return timeout.struct_to_timeout(self.socket.getsockopt(socket.SOL_SOCKET, socket.SO_SNDTIMEO, 8))
+        return timeout.struct_to_timeout(self.socket.getsockopt(socket.SOL_SOCKET, socket.SO_SNDTIMEO, sizeof_timeval))
 
     def set_socket_read_timeout(self, timeo):
         assert isinstance(timeo, timeout.timeout)



-- 
gentoo-commits@l.g.o mailing list