Attachment #209857 for bug #239347

Lines 2-8 Link Here

(-)percona57-server/Makefile (-1 / +1 lines)
2	# $FreeBSD: head/databases/percona57-server/Makefile 519176 2019-12-07 01:17:53Z fluffy $	2	# $FreeBSD: head/databases/percona57-server/Makefile 519176 2019-12-07 01:17:53Z 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 = 1576055476
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

Lines 47-53 Link Here

(-)percona57-server/files/patch-client_CMakeLists.txt (-1 / +1 lines)
47	@@ -97,9 +100,12 @@ TARGET_LINK_LIBRARIES(mysqlslap perconas	47	@@ -97,9 +100,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)




 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})

 IF(MSVC)
@@ -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)
   TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK})
+IF(FALSE)
   IF(UNIX)
     # libtool compatability
     IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
@@ -327,6 +328,7 @@
 # to initialize api_calls[] array in api_test.c
 #




@@ -3678,6 +3688,7 @@ static int init_ssl()
 {
 #ifdef HAVE_OPENSSL
 #ifndef HAVE_YASSL
+#ifndef LIBRESSL_VERSION_NUMBER
   int fips_mode= FIPS_mode();
   if (fips_mode != 0)
   {
     /* FIPS is enabled, Log warning and Disable it now */
@@ -3687,7 +3698,9 @@ static int init_ssl()
         " Disabling FIPS.");
     FIPS_mode_set(0);

Return to bug 239347

Lines 4-24 Link Here

(-)percona57-server/files/patch-libmysql_CMakeLists.txt (-6 / +6 lines)
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	# Visual Studio users need debug static library for debug projects	10
11	IF(MSVC)	11	IF(MSVC)
12	@@ -271,7 +271,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	TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK})
18	+IF(FALSE)	19	+IF(FALSE)
19	IF(UNIX)	20	IF(UNIX)
20	# libtool compatability	21	# libtool compatability
21	IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
22	@@ -327,6 +328,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	#

Lines 20-30 Link Here

(-)percona57-server/files/patch-sql_mysqld.cc (-1 / +1 lines)
20	@@ -3678,6 +3688,7 @@ static int init_ssl()	20	@@ -3678,6 +3688,7 @@ static int init_ssl()
21	{	21	{
22	#ifdef HAVE_OPENSSL	22	#ifdef HAVE_OPENSSL
23	#ifndef HAVE_YASSL
24	+#ifndef LIBRESSL_VERSION_NUMBER	23	+#ifndef LIBRESSL_VERSION_NUMBER
25	int fips_mode= FIPS_mode();	24	int fips_mode= FIPS_mode();
26	if (fips_mode != 0)	25	if (fips_mode != 0)
27	{	26	{
		27	/* FIPS is enabled, Log warning and Disable it now */
28	@@ -3687,7 +3698,9 @@ static int init_ssl()	28	@@ -3687,7 +3698,9 @@ static int init_ssl()
29	" Disabling FIPS.");	29	" Disabling FIPS.");
30	FIPS_mode_set(0);	30	FIPS_mode_set(0);