Attachment 209970 Details for Bug 242649 – patch to 5.7.28-31

[patch] patch to 5.7.28-31

patch-percona-server-28-31 (text/plain), 3.49 KB, created by Igor Zabelin on 2019-12-15 12:08:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Igor Zabelin

Created: 2019-12-15 12:08:59 UTC

Size: 3.49 KB

patch

obsolete

>--- ../percona57-server/Makefile	2019-12-07 04:17:53.000000000 +0300
>+++ percona57-server/Makefile	2019-12-11 13:26:15.471319000 +0300
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/databases/percona57-server/Makefile 519176 2019-12-07 01:17:53Z fluffy $
> 
> PORTNAME?=	percona
>-DISTVERSION=	5.7.27-30
>+DISTVERSION=	5.7.28-31
> PORTREVISION?=	0
> CATEGORIES=	databases
> MASTER_SITES=	http://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-${DISTVERSION}/source/tarball/:percona \
>--- ../percona57-server/distinfo	2019-12-06 19:00:36.000000000 +0300
>+++ percona57-server/distinfo	2019-12-11 13:26:15.471559000 +0300
>@@ -1,5 +1,5 @@
>-TIMESTAMP = 1567963686
>-SHA256 (percona-server-5.7.27-30.tar.gz) = b50dff3d222c6444468ff328c652df24a81103627c9da2fa98ee878b8f65a226
>-SIZE (percona-server-5.7.27-30.tar.gz) = 84672298
>+TIMESTAMP = 1576055476
>+SHA256 (percona-server-5.7.28-31.tar.gz) = 8a55a37b494086850ff3699d4f1ef39b2cfe9aa4d35662505dc372ccb9cb283f
>+SIZE (percona-server-5.7.28-31.tar.gz) = 84704254
> SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac
> SIZE (boost_1_59_0.tar.gz) = 83709983
>--- ../percona57-server/files/patch-client_CMakeLists.txt	2017-01-10 21:54:32.000000000 +0300
>+++ percona57-server/files/patch-client_CMakeLists.txt	2019-12-11 13:26:15.471817000 +0300
>@@ -47,7 +47,7 @@
> @@ -97,9 +100,12 @@ TARGET_LINK_LIBRARIES(mysqlslap perconas
>  
>  MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
>- TARGET_LINK_LIBRARIES(mysql_config_editor perconaserverclient)
>+ TARGET_LINK_LIBRARIES(mysql_config_editor ${FORCE_SSL_SOLARIS} perconaserverclient)
> +ENDIF()
>  
> +IF(FALSE)
>--- ../percona57-server/files/patch-libmysql_CMakeLists.txt	2018-03-31 21:26:51.000000000 +0300
>+++ percona57-server/files/patch-libmysql_CMakeLists.txt	2019-12-11 13:32:44.838944000 +0300
>@@ -4,21 +4,21 @@
>  ADD_SUBDIRECTORY(authentication_ldap)
>    
>  # Merge several convenience libraries into one big perconaserverclient
>--MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS} COMPONENT Development)
>-+MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS} COMPONENT Development SKIP_INSTALL)
>- 
>+-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
>- IF(MSVC)
> @@ -271,7 +271,8 @@
>    # and link them together into shared library.
>-   MERGE_LIBRARIES_SHARED(libmysql ${LIBS}
>+   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
>  #
>--- ../percona57-server/files/patch-sql_mysqld.cc	2019-12-06 19:00:36.000000000 +0300
>+++ percona57-server/files/patch-sql_mysqld.cc	2019-12-11 13:26:15.472297000 +0300
>@@ -20,11 +20,11 @@
> @@ -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);

Actions: View | Diff

Attachments on bug 242649: 209970 | 210010