← Back to branch summary

~ubuntu-branches/ubuntu/quantal/m2crypto/quantal

« back to all changes in this revision

Viewing changes to debian/patches/0002-Disable-SSLv2_method-when-disabled-in-OpenSSL-iself-.patch

  • Committer: Package Import Robot
  • Author(s): Julian Taylor
  • Date: 2011-08-10 17:01:24 UTC
  • mfrom: (23.3.1 oneiric)
  • Revision ID: package-import@ubuntu.com-20110810170124-ctuhz524p63n0hrz
https://launchpad.net/bugs/788514
https://launchpad.net/bugs/600549
https://launchpad.net/bugs/600549
https://launchpad.net/bugs/451998
* repackage upstream
  - remove non-free demo/x509/proxylib.py
* switch to dh_python2 (LP: #788514) 
* switch to 3.0 (quilt)
  - converted all upstream changes to patches
  - fix_sslv2_test.patch: testsuite patch for sslv2 deactivation
  - fix_build_with_new_openssl.patch: build fix from debian 0.20.1-1.1
* Merge from debian testing, remaining changes:
  - disable_sslv2_test.patch: disable sslv23_weak_crypto test as it is expected to
    fail with SSLv2 having been disabled in openssl 0.9.8o-1ubuntu3.
    (LP: #600549)
  - fix_sslv2_test2.patch: fix testsuite with newer openssl. (LP: #600549)
    - Backported from http://svn.osafoundation.org/viewvc/m2crypto/trunk/tests/test_smime.py?r1=698&r2=721
  - debian/control: Add openssl for FTBFS. 
  - debian/rules; enable testsuite, add more files to "clean" rule.
  - fix_kill_signal.patch: use signal 9 to kill old s_server processes
    to work around build HUP signal-ignore-mask (LP: #451998).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0002-Disable-SSLv2_method-when-disabled-in-OpenSSL-iself-.patch
1
 
From 939cdded84d39a3bfef7cb85dd19a1dc3860e767 Mon Sep 17 00:00:00 2001
2
 
From: Charles Plessy <plessy@debian.org>
3
 
Date: Tue, 16 Aug 2011 07:54:38 +0900
4
 
Subject: [PATCH] Disable SSLv2_method when disabled in OpenSSL iself (Closes:
5
 
 #637904).
6
 
 
7
 
Thanks, Sebastian Ramacher <s.ramacher@gmx.at>.
8
 
---
9
 
 SWIG/_ssl.i |    2 ++
10
 
 1 files changed, 2 insertions(+), 0 deletions(-)
11
 
 
12
 
diff --git a/SWIG/_ssl.i b/SWIG/_ssl.i
13
 
index 2373ff2..2844da7 100644
14
 
--- a/SWIG/_ssl.i
15
 
+++ b/SWIG/_ssl.i
16
 
@@ -48,8 +48,10 @@ extern const char *SSL_alert_desc_string(int);
17
 
 %rename(ssl_get_alert_desc_v) SSL_alert_desc_string_long;
18
 
 extern const char *SSL_alert_desc_string_long(int);
19
 
 
20
 
+#ifndef OPENSSL_NO_SSL2
21
 
 %rename(sslv2_method) SSLv2_method;
22
 
 extern SSL_METHOD *SSLv2_method(void);
23
 
+#endif
24
 
 %rename(sslv3_method) SSLv3_method;
25
 
 extern SSL_METHOD *SSLv3_method(void);
26
 
 %rename(sslv23_method) SSLv23_method;
27
 
1.7.5.4
28