CVS commit: pkgsrc/databases/mysql57-client

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Nov 14 16:59:38 UTC 2019

Modified Files:
        pkgsrc/databases/mysql57-client: distinfo
Added Files:
        pkgsrc/databases/mysql57-client/patches: patch-cmake_ssl.cmake

Log Message:
mysql57-client: add a patch for cmake/ssl.cmake taken from mysql56-client


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/databases/mysql57-client/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/mysql57-client/patches/patch-cmake_ssl.cmake

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/mysql57-client/distinfo
diff -u pkgsrc/databases/mysql57-client/distinfo:1.33 pkgsrc/databases/mysql57-client/distinfo:1.34
--- pkgsrc/databases/mysql57-client/distinfo:1.33       Thu Oct 31 12:04:22 2019
+++ pkgsrc/databases/mysql57-client/distinfo    Thu Nov 14 16:59:38 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.33 2019/10/31 12:04:22 jperkin Exp $
+$NetBSD: distinfo,v 1.34 2019/11/14 16:59:38 adam Exp $
 
 SHA1 (mysql-5.7.28.tar.gz) = 93d5c460f32576c92f95d9d81938e1d15ece1ae4
 RMD160 (mysql-5.7.28.tar.gz) = 2ab8cddf7479aac8f5eaddd5a23cd4ee62b042d3
@@ -13,6 +13,7 @@ SHA1 (patch-cmake_build__configurations_
 SHA1 (patch-cmake_os_SunOS.cmake) = b71c3e1fafb48ebbba77c19bb1c31556ebe1ad2a
 SHA1 (patch-cmake_plugin.cmake) = 4480438969e297f67890b1974a86fb88a23d28ed
 SHA1 (patch-cmake_readline.cmake) = fb79ed969240ae2984098f72c2d3fb501154902c
+SHA1 (patch-cmake_ssl.cmake) = 7b76396b74b56d77a6b3046e971b4d394974fa1c
 SHA1 (patch-cmd-line-utils_libedit_chartype.h) = 6b1453df648001ed1fc81190106e15872a69a04c
 SHA1 (patch-cmd-line-utils_libedit_vi.c) = 7c5ce1d07f650815d028e435a59e5d078ec74c2f
 SHA1 (patch-include_CMakeLists.txt) = 944991702f046ea7a5e2b6ea4dc390f17426e55a

Added files:

Index: pkgsrc/databases/mysql57-client/patches/patch-cmake_ssl.cmake
diff -u /dev/null pkgsrc/databases/mysql57-client/patches/patch-cmake_ssl.cmake:1.1
--- /dev/null   Thu Nov 14 16:59:38 2019
+++ pkgsrc/databases/mysql57-client/patches/patch-cmake_ssl.cmake       Thu Nov 14 16:59:38 2019
@@ -0,0 +1,27 @@
+$NetBSD: patch-cmake_ssl.cmake,v 1.1 2019/11/14 16:59:38 adam Exp $
+
+Allow OpenSSH versions below 1.0.
+Do not prefer static libraries (or linking will fail).
+
+--- cmake/ssl.cmake.orig       2019-09-27 07:00:15.000000000 +0000
++++ cmake/ssl.cmake
+@@ -152,9 +152,7 @@ MACRO (MYSQL_CHECK_SSL)
+     ENDIF()
+ 
+     # On mac this list is <.dylib;.so;.a>
+-    # We prefer static libraries, so we revert it here.
+     IF (WITH_SSL_PATH)
+-      LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
+       MESSAGE(STATUS "suffixes <${CMAKE_FIND_LIBRARY_SUFFIXES}>")
+     ENDIF()
+ 
+@@ -198,8 +196,7 @@ MACRO (MYSQL_CHECK_SSL)
+     ENDIF()
+     IF(OPENSSL_INCLUDE_DIR AND
+        OPENSSL_LIBRARY   AND
+-       CRYPTO_LIBRARY      AND
+-       OPENSSL_MAJOR_VERSION STREQUAL "1"
++       CRYPTO_LIBRARY
+       )
+       SET(OPENSSL_FOUND TRUE)
+     ELSE()