[arch-commits] Commit in cmake/trunk (PKGBUILD fix-openssl.patch)

[Andrea Scarpino]

    Date: Tuesday, February 3, 2015 @ 19:08:32
  Author: andrea
Revision: 230399

upgpkg: cmake 3.1.1-2

Fix openssl detection (FS#43688)

Added:
  cmake/trunk/fix-openssl.patch
Modified:
  cmake/trunk/PKGBUILD

-------------------+
 PKGBUILD          |   13 ++++++--
 fix-openssl.patch |   76 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 86 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-03 17:59:39 UTC (rev 230398)
+++ PKGBUILD	2015-02-03 18:08:32 UTC (rev 230399)
@@ -4,7 +4,7 @@
 
 pkgname=cmake
 pkgver=3.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc='A cross-platform open-source make system'
 arch=('i686' 'x86_64')
 url="http://www.cmake.org/"
@@ -14,9 +14,16 @@
 optdepends=('qt5-base: cmake-gui'
             'libxkbcommon-x11: cmake-gui')
 install="${pkgname}.install"
-source=("http://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('0ae4f25dbec66697c0c3cec1b9e885ae')
+source=("http://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz"
+        'fix-openssl.patch')
+md5sums=('0ae4f25dbec66697c0c3cec1b9e885ae'
+         '6e7853ca9d495a06615cb8049d4434ee')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/fix-openssl.patch
+}
+
 build() {
   cd ${pkgname}-${pkgver}
 

Added: fix-openssl.patch
===================================================================
--- fix-openssl.patch	                        (rev 0)
+++ fix-openssl.patch	2015-02-03 18:08:32 UTC (rev 230399)
@@ -0,0 +1,76 @@
+X-Git-Url: http://www.cmake.org/gitweb?p=cmake.git;a=blobdiff_plain;f=Modules%2FFindOpenSSL.cmake;h=3adc2692622e459a175f31d5b2a54619ec8164f2;hp=bfbe01f59090ed096ba81e95f2d125d2d53b2179;hb=27da8cf2d3ddf34acd9eeccf630d83ccbf89cd38;hpb=081c724ccb82ed1bae3f629f4b6f0b3afc79fdfc
+
+diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
+index bfbe01f..3adc269 100644
+--- a/Modules/FindOpenSSL.cmake
++++ b/Modules/FindOpenSSL.cmake
+@@ -285,7 +285,7 @@ endfunction()
+ if (OPENSSL_INCLUDE_DIR)
+   if(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.
+X-Git-Url: http://www.cmake.org/gitweb?p=cmake.git;a=blobdiff_plain;f=Modules%2FFindOpenSSL.cmake;h=3adc2692622e459a175f31d5b2a54619ec8164f2;hp=6b4f9853c01f64b94bfec3ff51da8789af63a07e;hb=27da8cf2d3ddf34acd9eeccf630d83ccbf89cd38;hpb=c5d9a8283cfac15b4a5a07f18d5eb10c1f388505
+
+diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
+index 6b4f985..3adc269 100644
+--- a/Modules/FindOpenSSL.cmake
++++ b/Modules/FindOpenSSL.cmake
+@@ -16,10 +16,12 @@
+ #
+ # ::
+ #
+-#   OPENSSL_FOUND - system has the OpenSSL library
+-#   OPENSSL_INCLUDE_DIR - the OpenSSL include directory
+-#   OPENSSL_LIBRARIES - The libraries needed to use OpenSSL
+-#   OPENSSL_VERSION - This is set to $major.$minor.$revision$path (eg. 0.9.8s)
++#   OPENSSL_FOUND - System has the OpenSSL library
++#   OPENSSL_INCLUDE_DIR - The OpenSSL include directory
++#   OPENSSL_CRYPTO_LIBRARY - The OpenSSL crypto library
++#   OPENSSL_SSL_LIBRARY - The OpenSSL SSL library
++#   OPENSSL_LIBRARIES - All OpenSSL libraries
++#   OPENSSL_VERSION - This is set to $major.$minor.$revision$patch (eg. 0.9.8s)
+ 
+ #=============================================================================
+ # Copyright 2006-2009 Kitware, Inc.
+@@ -153,6 +155,8 @@ if(WIN32 AND NOT CYGWIN)
+ 
+     mark_as_advanced(LIB_EAY_LIBRARY_DEBUG LIB_EAY_LIBRARY_RELEASE
+                      SSL_EAY_LIBRARY_DEBUG SSL_EAY_LIBRARY_RELEASE)
++    set( OPENSSL_SSL_LIBRARY ${SSL_EAY_LIBRARY} )
++    set( OPENSSL_CRYPTO_LIBRARY ${LIB_EAY_LIBRARY} )
+     set( OPENSSL_LIBRARIES ${SSL_EAY_LIBRARY} ${LIB_EAY_LIBRARY} )
+   elseif(MINGW)
+     # same player, for MinGW
+@@ -181,6 +185,8 @@ if(WIN32 AND NOT CYGWIN)
+     )
+ 
+     mark_as_advanced(SSL_EAY LIB_EAY)
++    set( OPENSSL_SSL_LIBRARY ${SSL_EAY} )
++    set( OPENSSL_CRYPTO_LIBRARY ${LIB_EAY} )
+     set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
+     unset(LIB_EAY_NAMES)
+     unset(SSL_EAY_NAMES)
+@@ -207,6 +213,8 @@ if(WIN32 AND NOT CYGWIN)
+     )
+ 
+     mark_as_advanced(SSL_EAY LIB_EAY)
++    set( OPENSSL_SSL_LIBRARY ${SSL_EAY} )
++    set( OPENSSL_CRYPTO_LIBRARY ${LIB_EAY} )
+     set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
+   endif()
+ else()
+@@ -275,9 +283,7 @@ function(from_hex HEX DEC)
+ endfunction()
+ 
+ if (OPENSSL_INCLUDE_DIR)
+-  if (_OPENSSL_VERSION)
+-    set(OPENSSL_VERSION "${_OPENSSL_VERSION}")
+-  elseif(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
++  if(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])+.*")
+