CVS commit: pkgsrc/databases/mysql57-client

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Dec  6 14:05:11 UTC 2019

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

Log Message:
mysql57-client: Limit SunPro fix to SunPro.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/databases/mysql57-client/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    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.34 pkgsrc/databases/mysql57-client/distinfo:1.35
--- pkgsrc/databases/mysql57-client/distinfo:1.34       Thu Nov 14 16:59:38 2019
+++ pkgsrc/databases/mysql57-client/distinfo    Fri Dec  6 14:05:11 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.34 2019/11/14 16:59:38 adam Exp $
+$NetBSD: distinfo,v 1.35 2019/12/06 14:05:11 jperkin Exp $
 
 SHA1 (mysql-5.7.28.tar.gz) = 93d5c460f32576c92f95d9d81938e1d15ece1ae4
 RMD160 (mysql-5.7.28.tar.gz) = 2ab8cddf7479aac8f5eaddd5a23cd4ee62b042d3
@@ -13,7 +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-cmake_ssl.cmake) = e3919316b3d4dc62648b64b8a04dfd824742b4b8
 SHA1 (patch-cmd-line-utils_libedit_chartype.h) = 6b1453df648001ed1fc81190106e15872a69a04c
 SHA1 (patch-cmd-line-utils_libedit_vi.c) = 7c5ce1d07f650815d028e435a59e5d078ec74c2f
 SHA1 (patch-include_CMakeLists.txt) = 944991702f046ea7a5e2b6ea4dc390f17426e55a

Index: pkgsrc/databases/mysql57-client/patches/patch-cmake_ssl.cmake
diff -u pkgsrc/databases/mysql57-client/patches/patch-cmake_ssl.cmake:1.1 pkgsrc/databases/mysql57-client/patches/patch-cmake_ssl.cmake:1.2
--- pkgsrc/databases/mysql57-client/patches/patch-cmake_ssl.cmake:1.1   Thu Nov 14 16:59:38 2019
+++ pkgsrc/databases/mysql57-client/patches/patch-cmake_ssl.cmake       Fri Dec  6 14:05:11 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-cmake_ssl.cmake,v 1.1 2019/11/14 16:59:38 adam Exp $
+$NetBSD: patch-cmake_ssl.cmake,v 1.2 2019/12/06 14:05:11 jperkin Exp $
 
 Allow OpenSSH versions below 1.0.
 Do not prefer static libraries (or linking will fail).
@@ -15,7 +15,14 @@ Do not prefer static libraries (or linki
        MESSAGE(STATUS "suffixes <${CMAKE_FIND_LIBRARY_SUFFIXES}>")
      ENDIF()
  
-@@ -198,8 +196,7 @@ MACRO (MYSQL_CHECK_SSL)
+@@ -192,14 +190,13 @@ MACRO (MYSQL_CHECK_SSL)
+     IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" VERSION_GREATER "1.1.0")
+        ADD_DEFINITIONS(-DHAVE_TLSv13)
+        SET(HAVE_TLSv13 1)
+-       IF(SOLARIS)
++       IF(SOLARIS AND CMAKE_C_COMPILER_ID MATCHES "SunPro")
+          SET(FORCE_SSL_SOLARIS "-Wl,--undefined,address_of_sk_new_null")
+        ENDIF()
      ENDIF()
      IF(OPENSSL_INCLUDE_DIR AND
         OPENSSL_LIBRARY   AND