Attachment #209764 for bug #239347

Lines 2-8 Link Here

(-)percona57-server/Makefile (-1 / +1 lines)
2	# $FreeBSD: head/databases/percona57-server/Makefile 519153 2019-12-06 16:00:36Z fluffy $	2	# $FreeBSD: head/databases/percona57-server/Makefile 519153 2019-12-06 16:00:36Z fluffy $
3		3
4	PORTNAME?= percona	4	PORTNAME?= percona
5	DISTVERSION= 5.7.27-30	5	DISTVERSION= 5.7.28-31
6	PORTREVISION?= 0	6	PORTREVISION?= 0
7	CATEGORIES= databases	7	CATEGORIES= databases
8	MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-${DISTVERSION}/source/tarball/:percona \	8	MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-${DISTVERSION}/source/tarball/:percona \

Lines 1-5 Link Here

(-)percona57-server/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1567963686	1	TIMESTAMP = 1575656176
2	SHA256 (percona-server-5.7.27-30.tar.gz) = b50dff3d222c6444468ff328c652df24a81103627c9da2fa98ee878b8f65a226	2	SHA256 (percona-server-5.7.28-31.tar.gz) = 8a55a37b494086850ff3699d4f1ef39b2cfe9aa4d35662505dc372ccb9cb283f
3	SIZE (percona-server-5.7.27-30.tar.gz) = 84672298	3	SIZE (percona-server-5.7.28-31.tar.gz) = 84704254
4	SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac	4	SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac
5	SIZE (boost_1_59_0.tar.gz) = 83709983	5	SIZE (boost_1_59_0.tar.gz) = 83709983




--- client/CMakeLists.txt.orig	2016-11-27 19:44:54 UTC
+++ client/CMakeLists.txt
@@ -42,8 +42,6 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil
 
 ## Subdirectory with common client code.
 ADD_SUBDIRECTORY(base)

 
 ## We will need libeay32.dll and ssleay32.dll when running client executables.
 COPY_OPENSSL_DLLS(copy_openssl_client)
@@ -48,11 +46,13 @@ COPY_OPENSSL_DLLS(copy_openssl_client)
 INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
 
 ADD_DEFINITIONS(${SSL_DEFINES})

 
 IF(NOT WITHOUT_SERVER)
   MYSQL_ADD_EXECUTABLE(mysql_upgrade
@@ -70,6 +70,7 @@ TARGET_LINK_LIBRARIES(mysqltest perconas
 ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
 TARGET_LINK_LIBRARIES(mysqlcheck_core perconaserverclient)
 

 MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)
 TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)
 
@@ -82,10 +83,12 @@ TARGET_LINK_LIBRARIES(mysqlimport percon
 
 MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
 TARGET_LINK_LIBRARIES(mysqlshow perconaserverclient)

 MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
 ADD_COMPILE_FLAGS(
   mysqlbinlog.cc
@@ -102,9 +104,12 @@ TARGET_LINK_LIBRARIES(mysqlslap perconas
 
 MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
 TARGET_LINK_LIBRARIES(mysql_config_editor ${FORCE_SSL_SOLARIS} perconaserverclient)
+ENDIF()
 
+IF(FALSE)

 
 IF(UNIX AND NOT WITHOUT_SERVER)
   MYSQL_ADD_EXECUTABLE(mysql_install_db
@@ -117,9 +123,11 @@ IF(UNIX AND NOT WITHOUT_SERVER)
   ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema)
 ENDIF()
 

 
 # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
 IF(WIN32)
@@ -128,11 +136,6 @@ ENDIF(WIN32)
 
 SET_TARGET_PROPERTIES (
   mysql_plugin




--- libmysql/CMakeLists.txt.orig	2018-03-09 22:41:36 UTC
+++ libmysql/CMakeLists.txt
@@ -266,7 +266,7 @@
 ADD_SUBDIRECTORY(authentication_ldap)
  
 # Merge several convenience libraries into one big perconaserverclient
-MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS_TO_MERGE} COMPONENT Development)
+MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS_TO_MERGE} COMPONENT Development SKIP_INSTALL)
 TARGET_LINK_LIBRARIES(perconaserverclient ${LIBS_TO_LINK})

 # Visual Studio users need debug  static library for debug projects
@@ -312,7 +312,8 @@
@@ -271,7 +271,8 @@
   # and link them together into shared library.
   MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE}
     EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
-    COMPONENT SharedLibraries)
+    COMPONENT SharedLibraries SKIP_INSTALL)
+IF(FALSE)
   TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK})
   IF(UNIX)
     # libtool compatability
@@ -369,6 +370,7 @@
@@ -327,6 +328,7 @@
 # to initialize api_calls[] array in api_test.c
 #
 SET(CLIENT_API_FUNCTION_LIST "")




--- sql/mysqld.cc.orig	2016-11-27 19:44:54 UTC
+++ sql/mysqld.cc
@@ -1524,6 +1524,16 @@ static void clean_up_mutexes()
 ****************************************************************************/
 
 /* Initialise proxy protocol. */

 static void set_proxy()
 {
   const char *p;
@@ -3682,6 +3692,7 @@ static int init_ssl()
 static int init_ssl()
 {
 #ifdef HAVE_OPENSSL
 #ifndef HAVE_YASSL
+#ifndef LIBRESSL_VERSION_NUMBER
   int fips_mode= FIPS_mode();
   if (fips_mode != 0)
   {
@@ -3691,7 +3702,9 @@ static int init_ssl()
         " Disabling FIPS.");
     FIPS_mode_set(0);
   }

Return to bug 239347

Lines 1-6 Link Here

(-)percona57-server/files/patch-client_CMakeLists.txt (-8 / +8 lines)
1	--- client/CMakeLists.txt.orig 2016-11-27 19:44:54 UTC	1	--- client/CMakeLists.txt.orig 2016-11-27 19:44:54 UTC
2	+++ client/CMakeLists.txt	2	+++ client/CMakeLists.txt
3	@@ -32,8 +32,6 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil	3	@@ -42,8 +42,6 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil
4		4
5	## Subdirectory with common client code.	5	## Subdirectory with common client code.
6	ADD_SUBDIRECTORY(base)	6	ADD_SUBDIRECTORY(base)
Lines 9-15 Link Here
9		9
10	## We will need libeay32.dll and ssleay32.dll when running client executables.	10	## We will need libeay32.dll and ssleay32.dll when running client executables.
11	COPY_OPENSSL_DLLS(copy_openssl_client)	11	COPY_OPENSSL_DLLS(copy_openssl_client)
12	@@ -41,11 +39,13 @@ COPY_OPENSSL_DLLS(copy_openssl_client)	12	@@ -48,11 +46,13 @@ COPY_OPENSSL_DLLS(copy_openssl_client)
13	INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)	13	INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
14		14
15	ADD_DEFINITIONS(${SSL_DEFINES})	15	ADD_DEFINITIONS(${SSL_DEFINES})
Lines 23-29 Link Here
23		23
24	IF(NOT WITHOUT_SERVER)	24	IF(NOT WITHOUT_SERVER)
25	MYSQL_ADD_EXECUTABLE(mysql_upgrade	25	MYSQL_ADD_EXECUTABLE(mysql_upgrade
26	@@ -65,6 +65,7 @@ TARGET_LINK_LIBRARIES(mysqltest perconas	26	@@ -70,6 +70,7 @@ TARGET_LINK_LIBRARIES(mysqltest perconas
27	ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)	27	ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
28	TARGET_LINK_LIBRARIES(mysqlcheck_core perconaserverclient)	28	TARGET_LINK_LIBRARIES(mysqlcheck_core perconaserverclient)
29		29
Lines 31-37 Link Here
31	MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)	31	MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)
32	TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)	32	TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)
33		33
34	@@ -77,10 +78,12 @@ TARGET_LINK_LIBRARIES(mysqlimport percon	34	@@ -82,10 +83,12 @@ TARGET_LINK_LIBRARIES(mysqlimport percon
35		35
36	MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)	36	MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
37	TARGET_LINK_LIBRARIES(mysqlshow perconaserverclient)	37	TARGET_LINK_LIBRARIES(mysqlshow perconaserverclient)
Lines 44-53 Link Here
44	MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)	44	MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
45	ADD_COMPILE_FLAGS(	45	ADD_COMPILE_FLAGS(
46	mysqlbinlog.cc	46	mysqlbinlog.cc
47	@@ -97,9 +100,12 @@ TARGET_LINK_LIBRARIES(mysqlslap perconas	47	@@ -102,9 +104,12 @@ TARGET_LINK_LIBRARIES(mysqlslap perconas
48		48
49	MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)	49	MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
50	TARGET_LINK_LIBRARIES(mysql_config_editor perconaserverclient)	50	TARGET_LINK_LIBRARIES(mysql_config_editor ${FORCE_SSL_SOLARIS} perconaserverclient)
51	+ENDIF()	51	+ENDIF()
52		52
53	+IF(FALSE)	53	+IF(FALSE)
Lines 57-63 Link Here
57		57
58	IF(UNIX AND NOT WITHOUT_SERVER)	58	IF(UNIX AND NOT WITHOUT_SERVER)
59	MYSQL_ADD_EXECUTABLE(mysql_install_db	59	MYSQL_ADD_EXECUTABLE(mysql_install_db
60	@@ -112,9 +118,11 @@ IF(UNIX AND NOT WITHOUT_SERVER)	60	@@ -117,9 +123,11 @@ IF(UNIX AND NOT WITHOUT_SERVER)
61	ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema)	61	ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema)
62	ENDIF()	62	ENDIF()
63		63
Lines 69-75 Link Here
69		69
70	# "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".	70	# "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
71	IF(WIN32)	71	IF(WIN32)
72	@@ -123,11 +131,6 @@ ENDIF(WIN32)	72	@@ -128,11 +136,6 @@ ENDIF(WIN32)
73		73
74	SET_TARGET_PROPERTIES (	74	SET_TARGET_PROPERTIES (
75	mysql_plugin	75	mysql_plugin

Lines 1-25 Link Here

(-)percona57-server/files/patch-libmysql_CMakeLists.txt (-10 / +10 lines)
1	--- libmysql/CMakeLists.txt.orig 2018-03-09 22:41:36 UTC	1	--- libmysql/CMakeLists.txt.orig 2018-03-09 22:41:36 UTC
2	+++ libmysql/CMakeLists.txt	2	+++ libmysql/CMakeLists.txt
3	@@ -235,7 +235,7 @@	3	@@ -266,7 +266,7 @@
4	ADD_SUBDIRECTORY(authentication_ldap)	4	ADD_SUBDIRECTORY(authentication_ldap)
5		5
6	# Merge several convenience libraries into one big perconaserverclient	6	# Merge several convenience libraries into one big perconaserverclient
7	-MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS} COMPONENT Development)	7	-MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS_TO_MERGE} COMPONENT Development)
8	+MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS} COMPONENT Development SKIP_INSTALL)	8	+MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS_TO_MERGE} COMPONENT Development SKIP_INSTALL)
9		9	TARGET_LINK_LIBRARIES(perconaserverclient ${LIBS_TO_LINK})
		10
10	# Visual Studio users need debug static library for debug projects	11	# Visual Studio users need debug static library for debug projects
11	IF(MSVC)	12	@@ -312,7 +312,8 @@
12	@@ -271,7 +271,8 @@
13	# and link them together into shared library.	13	# and link them together into shared library.
14	MERGE_LIBRARIES_SHARED(libmysql ${LIBS}	14	MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE}
15	EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}	15	EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
16	- COMPONENT SharedLibraries)	16	- COMPONENT SharedLibraries)
17	+ COMPONENT SharedLibraries SKIP_INSTALL)	17	+ COMPONENT SharedLibraries SKIP_INSTALL)
18	+IF(FALSE)	18	+IF(FALSE)
		19	TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK})
19	IF(UNIX)	20	IF(UNIX)
20	# libtool compatability	21	# libtool compatability
21	IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)	22	@@ -369,6 +370,7 @@
22	@@ -327,6 +328,7 @@
23	# to initialize api_calls[] array in api_test.c	23	# to initialize api_calls[] array in api_test.c
24	#	24	#
25	SET(CLIENT_API_FUNCTION_LIST "")	25	SET(CLIENT_API_FUNCTION_LIST "")

Lines 1-6 Link Here

(-)percona57-server/files/patch-sql_mysqld.cc (-4 / +4 lines)
1	--- sql/mysqld.cc.orig 2016-11-27 19:44:54 UTC	1	--- sql/mysqld.cc.orig 2016-11-27 19:44:54 UTC
2	+++ sql/mysqld.cc	2	+++ sql/mysqld.cc
3	@@ -1517,6 +1517,16 @@ static void clean_up_mutexes()	3	@@ -1524,6 +1524,16 @@ static void clean_up_mutexes()
4	****************************************************************************/	4	****************************************************************************/
5		5
6	/* Initialise proxy protocol. */	6	/* Initialise proxy protocol. */
Lines 17-31 Link Here
17	static void set_proxy()	17	static void set_proxy()
18	{	18	{
19	const char *p;	19	const char *p;
20	@@ -3678,6 +3688,7 @@ static int init_ssl()	20	@@ -3682,6 +3692,7 @@ static int init_ssl()
		21	static int init_ssl()
21	{	22	{
22	#ifdef HAVE_OPENSSL	23	#ifdef HAVE_OPENSSL
23	#ifndef HAVE_YASSL
24	+#ifndef LIBRESSL_VERSION_NUMBER	24	+#ifndef LIBRESSL_VERSION_NUMBER
25	int fips_mode= FIPS_mode();	25	int fips_mode= FIPS_mode();
26	if (fips_mode != 0)	26	if (fips_mode != 0)
27	{	27	{
28	@@ -3687,7 +3698,9 @@ static int init_ssl()	28	@@ -3691,7 +3702,9 @@ static int init_ssl()
29	" Disabling FIPS.");	29	" Disabling FIPS.");
30	FIPS_mode_set(0);	30	FIPS_mode_set(0);
31	}	31	}