From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E19ED138A1A for ; Tue, 27 Jan 2015 13:51:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A0E62E0802; Tue, 27 Jan 2015 13:51:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 48F83E0802 for ; Tue, 27 Jan 2015 13:51:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2DA2B34070A for ; Tue, 27 Jan 2015 13:51:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 51D42107C5 for ; Tue, 27 Jan 2015 13:51:01 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1422366649.2eaaa54428187bab4c9cc39ea9a9d09df73b9d62.grknight@gentoo> Subject: [gentoo-commits] proj/mysql-extras:master commit in: / X-VCS-Repository: proj/mysql-extras X-VCS-Files: 00000_index.txt 20017_all_mysql-openssl-cmake-detection.patch X-VCS-Directories: / X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 2eaaa54428187bab4c9cc39ea9a9d09df73b9d62 X-VCS-Branch: master Date: Tue, 27 Jan 2015 13:51:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fd0e1ff7-cc34-4dfa-bcdc-6bfa27bcf231 X-Archives-Hash: df6315b92b452fafb94714f2b63497d0 commit: 2eaaa54428187bab4c9cc39ea9a9d09df73b9d62 Author: Brian Evans gentoo org> AuthorDate: Tue Jan 27 13:50:49 2015 +0000 Commit: Brian Evans gentoo org> CommitDate: Tue Jan 27 13:50:49 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=2eaaa544 Add patch to Fix detection of >=openssl-1.0.2 wrt bug 537872 --- 00000_index.txt | 9 +++++++++ 20017_all_mysql-openssl-cmake-detection.patch | 12 ++++++++++++ 2 files changed, 21 insertions(+) diff --git a/00000_index.txt b/00000_index.txt index 49b7d42..58e74cd 100644 --- a/00000_index.txt +++ b/00000_index.txt @@ -1824,3 +1824,12 @@ @pn mariadb-galera @@ Fix build on sparc and other arches with no atomics @@ Also fix critical replication bug discovered shortly after release MDEV-7237 + +@patch 20017_all_mysql-openssl-cmake-detection.patch +@ver 5.06.00.00 to 5.07.99.99 +@pn mysql +@pn percona-server +@@ Fix detection of OpenSSL 1.0.2 +@@ Bug 537872 +@@ Upstream bug 75622 + diff --git a/20017_all_mysql-openssl-cmake-detection.patch b/20017_all_mysql-openssl-cmake-detection.patch new file mode 100644 index 0000000..3a5f53e --- /dev/null +++ b/20017_all_mysql-openssl-cmake-detection.patch @@ -0,0 +1,12 @@ +diff -aurN a/cmake/ssl.cmake b/cmake/ssl.cmake +--- a/cmake/ssl.cmake 2014-11-21 00:39:51.000000000 -0500 ++++ b/cmake/ssl.cmake 2015-01-27 08:45:36.771744344 -0500 +@@ -166,7 +166,7 @@ + # Encoded as MNNFFPPS: major minor fix patch status + FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" + OPENSSL_VERSION_NUMBER +- REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" ++ REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" + ) + STRING(REGEX REPLACE + "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"