From 67f0c3c126859a0a06b84068256c715547f2d864 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@openpkg.org>
Date: Sun, 3 May 2020 17:29:05 +0200
Subject: [PATCH] upgrading package: mysql 5.7.29 -> 5.7.30

---
 mysql/mysql.spec | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/mysql/mysql.spec b/mysql/mysql.spec
index 7e1e6c4081..eece8c954a 100644
--- a/mysql/mysql.spec
+++ b/mysql/mysql.spec
@@ -23,7 +23,7 @@
 
 #   package version
 %define       V_major   5.7
-%define       V_minor   29
+%define       V_minor   30
 %define       V_mysql   %{V_major}.%{V_minor}
 %define       V_opkg    %{V_major}.%{V_minor}
 
@@ -38,7 +38,7 @@ Class:        BASE
 Group:        Database
 License:      GPL
 Version:      %{V_opkg}
-Release:      20200113
+Release:      20200503
 
 #   package options
 %option       with_server      yes
@@ -62,8 +62,8 @@ Patch0:       mysql.patch
 #   build information
 BuildPreReq:  OpenPKG, openpkg >= 20160101, perl, make, cmake, gcc, gcc::with_cxx = yes
 PreReq:       OpenPKG, openpkg >= 20160101, perl, x509
-BuildPreReq:  zlib, readline, ncurses, boost >= 1.68.0, libevent, openssl
-PreReq:       zlib, readline, ncurses, boost >= 1.68.0, libevent, openssl
+BuildPreReq:  zlib, readline, ncurses, boost >= 1.68.0, libevent, openssl11
+PreReq:       zlib, readline, ncurses, boost >= 1.68.0, libevent, openssl11
 
 %description
     MySQL is a multi-user Relational Database Management System (RDBMS),
@@ -103,10 +103,10 @@ PreReq:       zlib, readline, ncurses, boost >= 1.68.0, libevent, openssl
         -Wno-dev \
         -DCMAKE_BUILD_TYPE="Release" \
         -DCMAKE_C_COMPILER="%{l_cc}" \
-        -DCMAKE_C_FLAGS="%{l_cflags -O} -I`pwd`/../include -I`pwd`/include %{l_cppflags ncurses .} -Wno-deprecated-declarations -Wno-implicit-fallthrough" \
+        -DCMAKE_C_FLAGS="%{l_cflags -O} -I`pwd`/../include -I`pwd`/include %{l_cppflags openssl11 ncurses .} -Wno-deprecated-declarations -Wno-implicit-fallthrough" \
         -DCMAKE_CXX_COMPILER="%{l_cxx}" \
-        -DCMAKE_CXX_FLAGS="%{l_cxxflags -O} -I`pwd`/../include -I`pwd`/include %{l_cppflags ncurses .} -Wno-deprecated-declarations -Wno-implicit-fallthrough" \
-        -DCMAKE_EXE_LINKER_FLAGS="%{l_ldflags}" \
+        -DCMAKE_CXX_FLAGS="%{l_cxxflags -O} -I`pwd`/../include -I`pwd`/include %{l_cppflags openssl11 ncurses .} -Wno-deprecated-declarations -Wno-implicit-fallthrough" \
+        -DCMAKE_EXE_LINKER_FLAGS="%{l_ldflags openssl11 .}" \
         -DCMAKE_INSTALL_PREFIX="%{l_prefix}" \
         -DFORCE_UNSUPPORTED_COMPILER=ON \
         -DSYSCONFDIR="%{l_prefix}/etc/mysql" \
@@ -122,6 +122,9 @@ PreReq:       zlib, readline, ncurses, boost >= 1.68.0, libevent, openssl
         -DWITH_SSL="%{l_prefix}" \
         -DWITH_ZLIB="system" \
         -DWITH_LIBEVENT="system" \
+        -DOPENSSL_INCLUDE_DIR="%{l_prefix}/include/openssl11" \
+        -DOPENSSL_LIBRARY="%{l_prefix}/lib/openssl11/libssl.a" \
+        -DCRYPTO_LIBRARY="%{l_prefix}/lib/openssl11/libcrypto.a" \
         -DLIBEVENT_INCLUDE_PATH="%{l_prefix}/include" \
         -DLIBEVENT_LIB_PATHS="%{l_prefix}/lib" \
 %if "%{with_innobase}" == "yes"