[petsc] 01/01: Update build-ssl1.1.patch to upstream patch ecd1d7b.

[Drew Parsons]

This is an automated email from the git hooks/post-receive script.

dparsons pushed a commit to branch master
in repository petsc.

commit 2c5fc4357a3ca22c6451c7c927a3ab8e1b5efefc
Author: Drew Parsons <dparsons at debian.org>
Date:   Mon Nov 28 12:10:40 2016 +0800

    Update build-ssl1.1.patch to upstream patch ecd1d7b.
    
    cf.
    https://bitbucket.org/petsc/petsc/issues/145/petsc-config-sslpy-does-not-detect-ssl-11
    https://bitbucket.org/petsc/petsc/commits/ecd1d7b800a8
---
 debian/changelog                  |  6 ++++++
 debian/patches/build-ssl1.1.patch | 44 ++++++++++++++++++++++++++++++++++++++-
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1447409..3f77ee6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+petsc (3.7.4+dfsg1-5) UNRELEASED; urgency=medium
+
+  * Update build-ssl1.1.patch to upstream patch ecd1d7b.
+
+ -- Drew Parsons <dparsons at debian.org>  Mon, 28 Nov 2016 11:11:34 +0800
+
 petsc (3.7.4+dfsg1-4) unstable; urgency=medium
 
   * Version Build-Depends: libhypre-dev (>= 2.11.1-3).
diff --git a/debian/patches/build-ssl1.1.patch b/debian/patches/build-ssl1.1.patch
index 4207ca6..b55ec1a 100644
--- a/debian/patches/build-ssl1.1.patch
+++ b/debian/patches/build-ssl1.1.patch
@@ -1,3 +1,18 @@
+From ecd1d7b800a8e5d54bd2bb04019759f2bc8b1326 Mon Sep 17 00:00:00 2001
+From: Barry Smith <bsmith at mcs.anl.gov>
+Date: Fri, 25 Nov 2016 20:14:29 -0600
+Subject: [PATCH] Update so that ssl support will compile and run with SSL 1.1
+
+Tested on Apple with brew install openssl at 1.1 and on linux with manual install of 1.1
+Please report any problems
+
+Resolves issue #145
+Reported-by: Drew Parsons
+---
+ config/BuildSystem/config/packages/ssl.py | 4 ++--
+ src/sys/webclient/client.c                | 7 ++++++-
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
 Index: petsc/config/BuildSystem/config/packages/ssl.py
 ===================================================================
 --- petsc.orig/config/BuildSystem/config/packages/ssl.py
@@ -7,7 +22,34 @@ Index: petsc/config/BuildSystem/config/packages/ssl.py
    def __init__(self, framework):
      config.package.Package.__init__(self, framework)
 -    self.functions         = ['SSLv23_method']
-+    self.functions         = ['TLSv1_2_method']
++    self.functions         = ['SSL_version']
      self.includes          = ['openssl/ssl.h']
      self.liblist           = [['libssl.a','libcrypto.a']]
      self.lookforbydefault  = 1
+@@ -22,7 +22,7 @@ class Configure(config.package.Package):
+ 
+   def getSearchDirectories(self):
+     '''macOS no longer provides openssl include files. On macOS brew puts them in the second location listed here'''
+-    return ['',os.path.join('/usr','local','opt','openssl')]
++    return ['',os.path.join('/usr','local','opt','openssl at 1.1'),os.path.join('/usr','local','opt','openssl')]
+ 
+   def configureLibrary(self):
+     if 'with-ios' in self.argDB and self.argDB['with-ios']: 
+Index: petsc/src/sys/webclient/client.c
+===================================================================
+--- petsc.orig/src/sys/webclient/client.c
++++ petsc/src/sys/webclient/client.c
+@@ -53,7 +53,12 @@ PetscErrorCode PetscSSLInitializeContext
+     /* Set up a SIGPIPE handler */
+     signal(SIGPIPE,sigpipe_handle);
+ 
+-    ctx  = SSL_CTX_new(SSLv23_method());
++/* suggested at https://mta.openssl.org/pipermail/openssl-dev/2015-May/001449.html */
++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
++    ctx  = SSL_CTX_new(TLS_client_method());
++#else
++    ctx  = SSL_CTX_new(SSLv23_client_method());
++#endif
+     SSL_CTX_set_mode(ctx,SSL_MODE_AUTO_RETRY);
+ 
+ #if defined(PETSC_USE_SSL_CERTIFICATE)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/petsc.git