[Pkg-cmake-commits] [cmake] 01/01: Fix FindOpenSSL module to detect OpenSSL 1.0.1t.

[Felix Geyer]

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

fgeyer pushed a commit to branch jessie
in repository cmake.

commit f68c991a24b6d3943c4fac6da8676647e4d8c53a
Author: Felix Geyer <fgeyer at debian.org>
Date:   Tue Jun 7 17:08:31 2016 +0200

    Fix FindOpenSSL module to detect OpenSSL 1.0.1t.
    
    * Fix FindOpenSSL module to detect OpenSSL 1.0.1t. (Closes: #826656)
      - Add FindOpenSSL-fix-detection-of-OpenSSL-1.0.2.patch
      - Add FindOpenSSL-Tolerate-tabs-in-header-while-parsing-ve.patch
---
 debian/changelog                                   |  8 +++++++
 ...-Tolerate-tabs-in-header-while-parsing-ve.patch | 27 ++++++++++++++++++++++
 ...indOpenSSL-fix-detection-of-OpenSSL-1.0.2.patch | 25 ++++++++++++++++++++
 debian/patches/series                              |  2 ++
 4 files changed, 62 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 670074e..23ab67d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+cmake (3.0.2-1+deb8u1) jessie; urgency=medium
+
+  * Fix FindOpenSSL module to detect OpenSSL 1.0.1t. (Closes: #826656)
+    - Add FindOpenSSL-fix-detection-of-OpenSSL-1.0.2.patch
+    - Add FindOpenSSL-Tolerate-tabs-in-header-while-parsing-ve.patch
+
+ -- Felix Geyer <fgeyer at debian.org>  Tue, 07 Jun 2016 16:50:32 +0200
+
 cmake (3.0.2-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/FindOpenSSL-Tolerate-tabs-in-header-while-parsing-ve.patch b/debian/patches/FindOpenSSL-Tolerate-tabs-in-header-while-parsing-ve.patch
new file mode 100644
index 0000000..09506b8
--- /dev/null
+++ b/debian/patches/FindOpenSSL-Tolerate-tabs-in-header-while-parsing-ve.patch
@@ -0,0 +1,27 @@
+From 6b575dec8d393c4a38c587ee97afa068eeb4b432 Mon Sep 17 00:00:00 2001
+From: Wayne Stambaugh <stambaughw at gmail.com>
+Date: Sat, 3 Oct 2015 11:40:00 -0400
+Subject: [PATCH] FindOpenSSL: Tolerate tabs in header while parsing version
+ (#15765)
+
+Tolerate tabs instead of spaces in the "# define" line.
+---
+ Modules/FindOpenSSL.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
+index a0f4c52..3aea695 100644
+--- a/Modules/FindOpenSSL.cmake
++++ b/Modules/FindOpenSSL.cmake
+@@ -325,7 +325,7 @@ endfunction()
+     set(OPENSSL_VERSION "${_OPENSSL_VERSION}")
+   elseif(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
+     file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str
+-         REGEX "^# *define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
++         REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
+ 
+     # The version number is encoded as 0xMNNFFPPS: major minor fix patch status
+     # The status gives if this is a developer or prerelease and is ignored here.
+-- 
+2.8.1
+
diff --git a/debian/patches/FindOpenSSL-fix-detection-of-OpenSSL-1.0.2.patch b/debian/patches/FindOpenSSL-fix-detection-of-OpenSSL-1.0.2.patch
new file mode 100644
index 0000000..b35e04c
--- /dev/null
+++ b/debian/patches/FindOpenSSL-fix-detection-of-OpenSSL-1.0.2.patch
@@ -0,0 +1,25 @@
+From c5d9a8283cfac15b4a5a07f18d5eb10c1f388505 Mon Sep 17 00:00:00 2001
+From: Guillaume Belz <guillaume.belz at gmail.com>
+Date: Tue, 27 Jan 2015 22:53:54 +0100
+Subject: [PATCH] FindOpenSSL: fix detection of OpenSSL 1.0.2
+
+---
+ Modules/FindOpenSSL.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
+index 340b417..6b4f985 100644
+--- a/Modules/FindOpenSSL.cmake
++++ b/Modules/FindOpenSSL.cmake
+@@ -279,7 +279,7 @@ if (OPENSSL_INCLUDE_DIR)
+     set(OPENSSL_VERSION "${_OPENSSL_VERSION}")
+   elseif(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
+     file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str
+-         REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
++         REGEX "^# *define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
+ 
+     # The version number is encoded as 0xMNNFFPPS: major minor fix patch status
+     # The status gives if this is a developer or prerelease and is ignored here.
+-- 
+2.8.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 080b2cf..866b01b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,5 @@ fix-FindImageMagick-2.diff
 fix-hdf5-hl.patch
 FindJNI_ppc64le.diff
 hurd_host_system_processor.diff
+FindOpenSSL-fix-detection-of-OpenSSL-1.0.2.patch
+FindOpenSSL-Tolerate-tabs-in-header-while-parsing-ve.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cmake/cmake.git