rpms/m2crypto/devel m2crypto-0.19.1-locking.patch, NONE, 1.1 m2crypto.spec, 1.53, 1.54

[Miloslav Trmac]

Author: mitr

Update of /cvs/pkgs/rpms/m2crypto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv566

Modified Files:
	m2crypto.spec 
Added Files:
	m2crypto-0.19.1-locking.patch 
Log Message:
* Wed Jun 24 2009 Miloslav Trmač <mitr at redhat.com> - 0.19.1-9
- Fix OpenSSL locking callback
  Resolves: #507903


m2crypto-0.19.1-locking.patch:

--- NEW FILE m2crypto-0.19.1-locking.patch ---
Index: SWIG/_threads.i
===================================================================
--- SWIG/_threads.i	(revision 686)
+++ SWIG/_threads.i	(working copy)
@@ -14,7 +14,7 @@
 void threading_locking_callback(int mode, int type, const char *file, int line) {
 #ifdef THREADING
         if (mode & CRYPTO_LOCK) {
-                PyThread_acquire_lock(lock_cs[type], 0);
+                PyThread_acquire_lock(lock_cs[type], WAIT_LOCK);
                 lock_count[type]++;
         } else {
                 PyThread_release_lock(lock_cs[type]);


Index: m2crypto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m2crypto/devel/m2crypto.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- m2crypto.spec	10 Jun 2009 15:52:33 -0000	1.53
+++ m2crypto.spec	24 Jun 2009 17:55:31 -0000	1.54
@@ -6,7 +6,7 @@
 Summary: Support for using OpenSSL in python scripts
 Name: m2crypto
 Version: 0.19.1
-Release: 8
+Release: 9
 Source0: http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-%{version}.tar.gz
 # https://bugzilla.osafoundation.org/show_bug.cgi?id=2341
 Patch0: m2crypto-0.18-timeouts.patch
@@ -19,6 +19,8 @@ Patch2: m2crypto-0.19.1-close-HTTPRespon
 Patch3: m2crypto-0.19.1-ssl-selector.patch
 # https://bugzilla.osafoundation.org/show_bug.cgi?id=9605
 Patch4: m2crypto-0.19.1-no-dns-in-altname.patch
+# https://bugzilla.osafoundation.org/show_bug.cgi?id=12847
+Patch5: m2crypto-0.19.1-locking.patch
 License: MIT
 Group: System Environment/Libraries
 URL: http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto
@@ -37,6 +39,7 @@ This package allows you to call OpenSSL 
 %patch2 -p1
 %patch3 -p1
 %patch4 -p0
+%patch5 -p0
 
 # Red Hat opensslconf.h #includes an architecture-specific file, but SWIG
 # doesn't follow the #include.
@@ -99,6 +102,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/M2Crypto-*.egg-info
 
 %changelog
+* Wed Jun 24 2009 Miloslav Trmač <mitr at redhat.com> - 0.19.1-9
+- Fix OpenSSL locking callback
+  Resolves: #507903
+
 * Wed Jun 10 2009 Miloslav Trmač <mitr at redhat.com> - 0.19.1-8
 - Don't reject certificates with subjectAltName that does not contain a dNSName
   Resolves: #504060