[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#826662: marked as done (jessie-pu: package cmake/3.0.2-1+deb8u1)

Your message dated Sat, 17 Sep 2016 13:08:06 +0100
with message-id <1474114086.2011.126.camel@adam-barratt.org.uk>
and subject line Closing p-u bugs for updates in 8.6
has caused the Debian Bug report #826662,
regarding jessie-pu: package cmake/3.0.2-1+deb8u1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
826662: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=826662
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian.org@packages.debian.org
Usertags: pu

Hi,

The openssl 1.0.1t stable update broke the FindOpenSSL module in cmake.
I'd like to fix that module in jessie.
Attached is a debdiff that contains the necessary backported patches.

Cheers,
Felix

diff -Nru cmake-3.0.2/debian/changelog cmake-3.0.2/debian/changelog
--- cmake-3.0.2/debian/changelog	2014-09-14 19:16:52.000000000 +0200
+++ cmake-3.0.2/debian/changelog	2016-06-07 16:55:44.000000000 +0200
@@ -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@debian.org>  Tue, 07 Jun 2016 16:50:32 +0200
+
 cmake (3.0.2-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru cmake-3.0.2/debian/patches/FindOpenSSL-fix-detection-of-OpenSSL-1.0.2.patch cmake-3.0.2/debian/patches/FindOpenSSL-fix-detection-of-OpenSSL-1.0.2.patch
--- cmake-3.0.2/debian/patches/FindOpenSSL-fix-detection-of-OpenSSL-1.0.2.patch	1970-01-01 01:00:00.000000000 +0100
+++ cmake-3.0.2/debian/patches/FindOpenSSL-fix-detection-of-OpenSSL-1.0.2.patch	2016-06-07 16:57:17.000000000 +0200
@@ -0,0 +1,25 @@
+From c5d9a8283cfac15b4a5a07f18d5eb10c1f388505 Mon Sep 17 00:00:00 2001
+From: Guillaume Belz <guillaume.belz@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 -Nru cmake-3.0.2/debian/patches/FindOpenSSL-Tolerate-tabs-in-header-while-parsing-ve.patch cmake-3.0.2/debian/patches/FindOpenSSL-Tolerate-tabs-in-header-while-parsing-ve.patch
--- cmake-3.0.2/debian/patches/FindOpenSSL-Tolerate-tabs-in-header-while-parsing-ve.patch	1970-01-01 01:00:00.000000000 +0100
+++ cmake-3.0.2/debian/patches/FindOpenSSL-Tolerate-tabs-in-header-while-parsing-ve.patch	2016-06-07 16:57:32.000000000 +0200
@@ -0,0 +1,27 @@
+From 6b575dec8d393c4a38c587ee97afa068eeb4b432 Mon Sep 17 00:00:00 2001
+From: Wayne Stambaugh <stambaughw@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 -Nru cmake-3.0.2/debian/patches/series cmake-3.0.2/debian/patches/series
--- cmake-3.0.2/debian/patches/series	2014-09-13 15:41:36.000000000 +0200
+++ cmake-3.0.2/debian/patches/series	2016-06-07 16:55:34.000000000 +0200
@@ -7,3 +7,5 @@
 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

--- End Message ---
--- Begin Message --- 
Version: 8.6

The updates referred to in each of these bugs were included in today's
stable point release.

Regards,

Adam

--- End Message ---
Reply to: