[m2crypto] Don't assume that export ciphers are enabled in the test suite

[Miloslav Trmac]

commit ded36a3279733c4aa770805701070f42ac21cb5d
Author: Miloslav Trmač <mitr at redhat.com>
Date:   Mon Jan 6 23:16:48 2014 +0100

    Don't assume that export ciphers are enabled in the test suite

 m2crypto-0.21.1-tests-no-export-ciphers.patch |   14 ++++++++++++++
 m2crypto.spec                                 |    9 ++++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/m2crypto-0.21.1-tests-no-export-ciphers.patch b/m2crypto-0.21.1-tests-no-export-ciphers.patch
new file mode 100644
index 0000000..d123e72
--- /dev/null
+++ b/m2crypto-0.21.1-tests-no-export-ciphers.patch
@@ -0,0 +1,14 @@
+Recent Fedora releases have disabled export ciphers by default, so
+don't test that they work.
+
+diff -ur M2Crypto/tests/test_ssl.py M2Crypto-0.21.1/tests/test_ssl.py
+--- M2Crypto/tests/test_ssl.py	2014-01-06 22:35:45.777935677 +0100
++++ M2Crypto-0.21.1/tests/test_ssl.py	2014-01-06 22:43:34.025594902 +0100
+@@ -463,6 +463,7 @@
+         finally:
+             self.stop_server(pid)
+         
++    @unittest.skip("Export ciphers are prohibited in recent Fedora releases")
+     def test_use_weak_cipher(self):
+         if fips_mode: # Weak ciphers are prohibited
+             return
diff --git a/m2crypto.spec b/m2crypto.spec
index 13e02a7..7c61bb8 100644
--- a/m2crypto.spec
+++ b/m2crypto.spec
@@ -6,7 +6,7 @@
 Summary: Support for using OpenSSL in python scripts
 Name: m2crypto
 Version: 0.21.1
-Release: 13%{?dist}
+Release: 14%{?dist}
 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.21.1-timeouts.patch
@@ -38,6 +38,8 @@ Patch12: m2crypto-0.21.1-sni.patch
 Patch13: m2crypto-0.21.1-supported-ec.patch
 # https://bugzilla.osafoundation.org/show_bug.cgi?id=13101
 Patch14: m2crypto-0.21.1-tests-no-SIGHUP.patch
+# https://bugzilla.osafoundation.org/show_bug.cgi?id=13103
+Patch15: m2crypto-0.21.1-tests-no-export-ciphers.patch
 License: MIT
 Group: System Environment/Libraries
 URL: http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto
@@ -68,6 +70,7 @@ openssl x509 -in tests/x509.pem -out tests/x509.der -outform DER
 %patch12 -p1 -b .sni
 %patch13 -p1 -b .supported-ec
 %patch14 -p1 -b .tests-no-SIGHUP
+%patch15 -p1 -b .tests-no-export-ciphers
 
 # Red Hat opensslconf.h #includes an architecture-specific file, but SWIG
 # doesn't follow the #include.
@@ -132,6 +135,10 @@ rm tests/*.{pem,py}.* # Patch backup files
 %{python_sitearch}/M2Crypto-*.egg-info
 
 %changelog
+* Mon Jan 6 2014 Miloslav Trmač <mitr at redhat.com> - 0.21.1-14
+- Don't assume that export ciphers are enabled in the test suite
+  Resolves: #1048887
+
 * Wed Dec 18 2013 Miloslav Trmač <mitr at redhat.com> - 0.21.1-13
 - Use only ECC curves available in Fedora in the test suite
   Related: #904996