Update to 5.6.49.89.0 and fix build on head.

8 files changed, 61 insertions, 47 deletions

diff --git a/databases/percona56-client/files/patch-extra_CMakeLists.txt b/databases/percona56-client/files/patch-extra_CMakeLists.txt
index ecb8c412cb02..5235c53fe569 100644
--- a/databases/percona56-client/files/patch-extra_CMakeLists.txt
+++ b/databases/percona56-client/files/patch-extra_CMakeLists.txt
@@ -1,17 +1,16 @@
---- extra/CMakeLists.txt.orig	2016-03-03 15:27:37.000000000 +0200
-+++ extra/CMakeLists.txt	2016-03-10 21:04:51.367091216 +0200
-@@ -59,7 +59,7 @@
-   ADD_DEPENDENCIES(GenError copy_openssl_extra)
- ENDIF()
+--- extra/CMakeLists.txt.orig	2020-07-21 12:31:43.000000000 +0200
++++ extra/CMakeLists.txt	2020-09-17 22:40:42.442794000 +0200
+@@ -58,6 +58,7 @@
+                   ${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys 
+                   ${PROJECT_SOURCE_DIR}/sql/share/errmsg-utf8.txt)
  
--
 +IF(FALSE)
  MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
- TARGET_LINK_LIBRARIES(my_print_defaults  mysys mysys_ssl)
+ TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl)
  SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX)
-@@ -98,10 +98,13 @@
-   MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES})
+@@ -97,10 +98,13 @@
    TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl)
+   ADD_DEPENDENCIES(innochecksum GenError)
  ENDIF()
 +ENDIF()
  
diff --git a/databases/percona56-client/files/patch-vio_viosslfactories.c b/databases/percona56-client/files/patch-vio_viosslfactories.c
index 267a2fd82d03..42a28cd67cdd 100644
--- a/databases/percona56-client/files/patch-vio_viosslfactories.c
+++ b/databases/percona56-client/files/patch-vio_viosslfactories.c
@@ -1,11 +1,20 @@
---- vio/viosslfactories.c.orig	2018-01-17 11:42:33.764076000 +0000
-+++ vio/viosslfactories.c	2018-01-17 11:43:21.072238000 +0000
-@@ -125,7 +125,7 @@
-   {
-     BIGNUM* p= BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
-     BIGNUM* g= BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
+--- vio/viosslfactories.c.orig	2020-07-21 12:31:43.000000000 +0200
++++ vio/viosslfactories.c	2020-09-17 22:38:47.837385000 +0200
+@@ -128,7 +128,7 @@
+     BIGNUM *p= BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL);
+     BIGNUM *g= BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL);
+     if (!p || !g
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined( LIBRESSL_VERSION_NUMBER )
+         || !DH_set0_pqg(dh, p, NULL, g)
+ #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
+     ) {
+@@ -136,7 +136,7 @@
+       DH_free(dh);
+       return NULL;
+     }
 -#if OPENSSL_VERSION_NUMBER < 0x10100000L
 +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined( LIBRESSL_VERSION_NUMBER )
      dh->p= p;
      dh->g= g;
-     if (! dh->p || ! dh->g)
+ #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
diff --git a/databases/percona56-server/Makefile b/databases/percona56-server/Makefile
index 6b2251cecbed..74e8d30d840e 100644
--- a/databases/percona56-server/Makefile
+++ b/databases/percona56-server/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	percona
-DISTVERSION=	5.6.45-86.1
+DISTVERSION=	5.6.49-89.0
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${DISTVERSION}/source/tarball/
@@ -95,6 +95,9 @@ CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON"
 
 .include <bsd.port.options.mk>
 
+# Workaround to clang11/gcc10 with -fno-common by default
+CFLAGS+=        -fcommon
+
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
 SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
 .else
diff --git a/databases/percona56-server/distinfo b/databases/percona56-server/distinfo
index a81bcc037d07..555dc2720fa9 100644
--- a/databases/percona56-server/distinfo
+++ b/databases/percona56-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1566412174
-SHA256 (percona-server-5.6.45-86.1.tar.gz) = 0c4d1541b4e4292d48f9fe25a7f39a6c46a85beb0f9bb4693d776f44c16a068c
-SIZE (percona-server-5.6.45-86.1.tar.gz) = 53178072
+TIMESTAMP = 1600374476
+SHA256 (percona-server-5.6.49-89.0.tar.gz) = 279908e35cd29e64ad89a36ac49f61576b312790629ae99fddf2781b05981827
+SIZE (percona-server-5.6.49-89.0.tar.gz) = 53087825
diff --git a/databases/percona56-server/files/patch-libmysql_CMakeLists.txt b/databases/percona56-server/files/patch-libmysql_CMakeLists.txt
index c7e65526e55b..07bcdd4863bf 100644
--- a/databases/percona56-server/files/patch-libmysql_CMakeLists.txt
+++ b/databases/percona56-server/files/patch-libmysql_CMakeLists.txt
@@ -1,15 +1,15 @@
---- libmysql/CMakeLists.txt.orig	2014-03-15 18:08:38.000000000 +0100
-+++ libmysql/CMakeLists.txt	2014-03-22 19:48:26.793800547 +0100
-@@ -180,7 +180,7 @@
+--- libmysql/CMakeLists.txt.orig
++++ libmysql/CMakeLists.txt
+@@ -205,7 +205,7 @@
  ENDIF()
  
  # Merge several convenience libraries into one big perconaserverclient
--MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development)
-+MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development NOINSTALL)
+-MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS_TO_MERGE} COMPONENT Development)
++MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS_TO_MERGE} COMPONENT Development NOINSTALL)
+ TARGET_LINK_LIBRARIES(perconaserverclient ${LIBS_TO_LINK})
  
  # Visual Studio users need debug  static library for debug projects
- INSTALL_DEBUG_SYMBOLS(clientlib)
-@@ -195,6 +195,7 @@
+@@ -220,6 +220,7 @@
    SET(${out_name} ${name})
  ENDMACRO()
  
@@ -17,7 +17,7 @@
  IF(UNIX)
    MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
      SET(DOT_VERSION ".${VERSION}")
-@@ -215,13 +216,15 @@
+@@ -240,14 +241,16 @@
      ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}perconaserverclient_r.a
      ${INSTALL_LIBDIR} Development)
  ENDIF()
@@ -26,16 +26,18 @@
  IF(NOT DISABLE_SHARED)
    # Merge several convenience libraries into one big perconaserverclient
    # and link them together into shared library.
-   MERGE_LIBRARIES(libmysql SHARED ${LIBS}
+   MERGE_LIBRARIES(libmysql SHARED ${LIBS_TO_MERGE}
      EXPORTS ${CLIENT_API_FUNCTIONS}
 -    COMPONENT SharedLibraries)
 +    COMPONENT SharedLibraries NOINSTALL)
+   TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK})
 +IF(FALSE)
    IF(UNIX)
      # libtool compatability
      IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-@@ -281,3 +284,4 @@
+@@ -316,4 +319,5 @@
+         ${INSTALL_LIBDIR} SharedLibraries)
      ENDFOREACH()
    ENDIF()
- ENDIF()
 +ENDIF()
+ ENDIF()
diff --git a/databases/percona56-server/files/patch-sql_mysqld.cc b/databases/percona56-server/files/patch-sql_mysqld.cc
index e60a5adcbacf..586f267f28c6 100644
--- a/databases/percona56-server/files/patch-sql_mysqld.cc
+++ b/databases/percona56-server/files/patch-sql_mysqld.cc
@@ -17,12 +17,3 @@
  static void set_proxy()
  {
    const char *p;
-@@ -4685,7 +4695,7 @@ static void openssl_lock(int mode, opens
- static int init_ssl()
- {
- #ifdef HAVE_OPENSSL
--#ifndef HAVE_YASSL
-+#if !defined(HAVE_YASSL) && defined(OPENSSL_FIPS)
-   int fips_mode= FIPS_mode();
-   if (fips_mode != 0)
-   {
diff --git a/databases/percona56-server/files/patch-vio_viosslfactories.c b/databases/percona56-server/files/patch-vio_viosslfactories.c
index 267a2fd82d03..42a28cd67cdd 100644
--- a/databases/percona56-server/files/patch-vio_viosslfactories.c
+++ b/databases/percona56-server/files/patch-vio_viosslfactories.c
@@ -1,11 +1,20 @@
---- vio/viosslfactories.c.orig	2018-01-17 11:42:33.764076000 +0000
-+++ vio/viosslfactories.c	2018-01-17 11:43:21.072238000 +0000
-@@ -125,7 +125,7 @@
-   {
-     BIGNUM* p= BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
-     BIGNUM* g= BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
+--- vio/viosslfactories.c.orig	2020-07-21 12:31:43.000000000 +0200
++++ vio/viosslfactories.c	2020-09-17 22:38:47.837385000 +0200
+@@ -128,7 +128,7 @@
+     BIGNUM *p= BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL);
+     BIGNUM *g= BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL);
+     if (!p || !g
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined( LIBRESSL_VERSION_NUMBER )
+         || !DH_set0_pqg(dh, p, NULL, g)
+ #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
+     ) {
+@@ -136,7 +136,7 @@
+       DH_free(dh);
+       return NULL;
+     }
 -#if OPENSSL_VERSION_NUMBER < 0x10100000L
 +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined( LIBRESSL_VERSION_NUMBER )
      dh->p= p;
      dh->g= g;
-     if (! dh->p || ! dh->g)
+ #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
diff --git a/databases/percona56-server/pkg-plist b/databases/percona56-server/pkg-plist
index 02e4147fde99..5087e68c42f3 100644
--- a/databases/percona56-server/pkg-plist
+++ b/databases/percona56-server/pkg-plist
@@ -34,6 +34,7 @@ lib/mysql/plugin/auth.so
 lib/mysql/plugin/auth_test_plugin.so
 lib/mysql/plugin/connection_control.so
 lib/mysql/plugin/daemon_example.ini
+lib/mysql/plugin/ha_example.so
 %%TOKUDB%%lib/mysql/plugin/ha_tokudb.so
 lib/mysql/plugin/handlersocket.so
 %%INNODBMEMCACHED%%lib/mysql/plugin/innodb_engine.so