[Python-modules-commits] r27194 - in packages/pyopenssl/trunk/debian (3 files)

[morph at users.alioth.debian.org]

    Date: Sunday, January 12, 2014 @ 21:05:21
  Author: morph
Revision: 27194

* debian/patches/bts733366_make_symbol_optional.patch
  - fix a FTBFS by making SSL_OP_MSIE_SSLV2_RSA_PADDING optional; thanks to
    David Su?\195?\161rez for the report and to Mehdi Abaakouk for the patch;
    Closes: #733366

Added:
  packages/pyopenssl/trunk/debian/patches/bts733366_make_symbol_optional.patch
Modified:
  packages/pyopenssl/trunk/debian/changelog
  packages/pyopenssl/trunk/debian/patches/series

Modified: packages/pyopenssl/trunk/debian/changelog
===================================================================
--- packages/pyopenssl/trunk/debian/changelog	2014-01-12 18:34:30 UTC (rev 27193)
+++ packages/pyopenssl/trunk/debian/changelog	2014-01-12 21:05:21 UTC (rev 27194)
@@ -7,8 +7,12 @@
   * New upstream release
     - debian/patches/CVE-2013-4314.patch removed, merged upstream
   * Acknowledge NMU; thanks Salvatore Bonaccorso; Closes: #722055
+  * debian/patches/bts733366_make_symbol_optional.patch
+    - fix a FTBFS by making SSL_OP_MSIE_SSLV2_RSA_PADDING optional; thanks to
+      David Suárez for the report and to Mehdi Abaakouk for the patch;
+      Closes: #733366
 
- -- Sandro Tosi <morph at debian.org>  Sun, 12 Jan 2014 18:50:28 +0100
+ -- Sandro Tosi <morph at debian.org>  Sun, 12 Jan 2014 22:02:34 +0100
 
 pyopenssl (0.13-3.1) experimental; urgency=low
 

Added: packages/pyopenssl/trunk/debian/patches/bts733366_make_symbol_optional.patch
===================================================================
--- packages/pyopenssl/trunk/debian/patches/bts733366_make_symbol_optional.patch	                        (rev 0)
+++ packages/pyopenssl/trunk/debian/patches/bts733366_make_symbol_optional.patch	2014-01-12 21:05:21 UTC (rev 27194)
@@ -0,0 +1,25 @@
+Description: Make SSL_OP_MSIE_SSLV2_RSA_PADDING optional
+ Since 0.9.7h SSL_OP_MSIE_SSLV2_RSA_PADDING has no effect and
+ it have been removed in version 0.9.8a
+ .
+ This patch makes it optional.
+Author: Mehdi Abaakouk <sileht at sileht.net>
+Origin: https://bugs.launchpad.net/pyopenssl/+bug/1266521
+Bug: https://bugs.launchpad.net/pyopenssl/+bug/1266521
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=733366
+Forwarded: not-needed
+Last-Update: 2014-01-12
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/OpenSSL/ssl/ssl.c
++++ b/OpenSSL/ssl/ssl.c
+@@ -211,7 +211,9 @@ do {
+     PyModule_AddIntConstant(module, "OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG", SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG);
+     PyModule_AddIntConstant(module, "OP_SSLREF2_REUSE_CERT_TYPE_BUG", SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG);
+     PyModule_AddIntConstant(module, "OP_MICROSOFT_BIG_SSLV3_BUFFER", SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER);
++#ifdef SSL_OP_MSIE_SSLV2_RSA_PADDING
+     PyModule_AddIntConstant(module, "OP_MSIE_SSLV2_RSA_PADDING", SSL_OP_MSIE_SSLV2_RSA_PADDING);
++#endif
+     PyModule_AddIntConstant(module, "OP_SSLEAY_080_CLIENT_DH_BUG", SSL_OP_SSLEAY_080_CLIENT_DH_BUG);
+     PyModule_AddIntConstant(module, "OP_TLS_D5_BUG", SSL_OP_TLS_D5_BUG);
+     PyModule_AddIntConstant(module, "OP_TLS_BLOCK_PADDING_BUG", SSL_OP_TLS_BLOCK_PADDING_BUG);

Modified: packages/pyopenssl/trunk/debian/patches/series
===================================================================
--- packages/pyopenssl/trunk/debian/patches/series	2014-01-12 18:34:30 UTC (rev 27193)
+++ packages/pyopenssl/trunk/debian/patches/series	2014-01-12 21:05:21 UTC (rev 27194)
@@ -1,2 +1,3 @@
 10_fix_doc_buildsystem.patch
 disable_test_set_default_verify_paths.patch
+bts733366_make_symbol_optional.patch