svn commit: r504495 - in head/databases: mariadb102-client/files mariadb102-server mariadb102-server/files

[Bernard Spil]

Author: brnrd
Date: Tue Jun 18 18:35:19 2019
New Revision: 504495
URL: https://svnweb.freebsd.org/changeset/ports/504495

Log:
  databases/mariadb102-server: Bugfix update to 10.2.25

Modified:
  head/databases/mariadb102-client/files/patch-CMakeLists.txt
  head/databases/mariadb102-server/Makefile
  head/databases/mariadb102-server/distinfo
  head/databases/mariadb102-server/files/patch-CMakeLists.txt
  head/databases/mariadb102-server/files/patch-plugin_auth__ed25519_CMakeLists.txt

Modified: head/databases/mariadb102-client/files/patch-CMakeLists.txt
==============================================================================
--- head/databases/mariadb102-client/files/patch-CMakeLists.txt	Tue Jun 18 18:32:41 2019	(r504494)
+++ head/databases/mariadb102-client/files/patch-CMakeLists.txt	Tue Jun 18 18:35:19 2019	(r504495)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2017-04-04 19:11:32 UTC
+--- CMakeLists.txt.orig	2019-06-14 18:29:40 UTC
 +++ CMakeLists.txt
-@@ -170,6 +170,8 @@ IF(DISABLE_SHARED)
+@@ -172,6 +172,8 @@ IF(DISABLE_SHARED)
  ENDIF()
  OPTION(ENABLED_PROFILING "Enable profiling" ON)
  OPTION(WITHOUT_SERVER "Build only the client library and clients" OFF)
@@ -9,19 +9,19 @@
  IF(UNIX)
    OPTION(WITH_VALGRIND "Valgrind instrumentation" OFF)
  ENDIF()
-@@ -454,6 +456,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
+@@ -472,6 +474,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
  )
  
 +IF(NOT WITHOUT_DOCS)
- INSTALL_DOCUMENTATION(README.md CREDITS COPYING COPYING.thirdparty
+ INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDPARTY
                        EXCEPTIONS-CLIENT COMPONENT Readme)
  
-@@ -465,6 +468,7 @@ IF(UNIX)
-   INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
+@@ -481,6 +484,7 @@ INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDP
+ 
+ IF(UNIX)
    INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme)
- ENDIF()
 +ENDIF()
+ ENDIF()
  
- INCLUDE(CPack)
- 
+ INCLUDE(build_depends)

Modified: head/databases/mariadb102-server/Makefile
==============================================================================
--- head/databases/mariadb102-server/Makefile	Tue Jun 18 18:32:41 2019	(r504494)
+++ head/databases/mariadb102-server/Makefile	Tue Jun 18 18:35:19 2019	(r504495)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.2.24
+PORTVERSION=	10.2.25
 PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \

Modified: head/databases/mariadb102-server/distinfo
==============================================================================
--- head/databases/mariadb102-server/distinfo	Tue Jun 18 18:32:41 2019	(r504494)
+++ head/databases/mariadb102-server/distinfo	Tue Jun 18 18:35:19 2019	(r504495)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1557489019
-SHA256 (mariadb-10.2.24.tar.gz) = 97f4d924e69f77abb2f650116785c2f5ef356230442534ebcbaadb51d9bb8bc4
-SIZE (mariadb-10.2.24.tar.gz) = 71965656
+TIMESTAMP = 1560710508
+SHA256 (mariadb-10.2.25.tar.gz) = face0818bb51b7dc20712ae225489c85a477d505cb6c2f6a6f6cf7d51ecfecc9
+SIZE (mariadb-10.2.25.tar.gz) = 71997847

Modified: head/databases/mariadb102-server/files/patch-CMakeLists.txt
==============================================================================
--- head/databases/mariadb102-server/files/patch-CMakeLists.txt	Tue Jun 18 18:32:41 2019	(r504494)
+++ head/databases/mariadb102-server/files/patch-CMakeLists.txt	Tue Jun 18 18:35:19 2019	(r504495)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2017-05-14 23:13:15 UTC
+--- CMakeLists.txt.orig	2019-06-14 18:29:40 UTC
 +++ CMakeLists.txt
-@@ -170,6 +170,8 @@ IF(DISABLE_SHARED)
+@@ -172,6 +172,8 @@ IF(DISABLE_SHARED)
  ENDIF()
  OPTION(ENABLED_PROFILING "Enable profiling" ON)
  OPTION(WITHOUT_SERVER "Build only the client library and clients" OFF)
@@ -9,19 +9,19 @@
  IF(UNIX)
    OPTION(WITH_VALGRIND "Valgrind instrumentation" OFF)
  ENDIF()
-@@ -452,6 +454,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
+@@ -472,6 +474,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
  )
  
 +IF(NOT WITHOUT_DOCS)
- INSTALL_DOCUMENTATION(README.md CREDITS COPYING COPYING.thirdparty
+ INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDPARTY
                        EXCEPTIONS-CLIENT COMPONENT Readme)
  
-@@ -463,6 +466,7 @@ IF(UNIX)
-   INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
+@@ -481,6 +484,7 @@ INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDP
+ 
+ IF(UNIX)
    INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme)
- ENDIF()
 +ENDIF()
+ ENDIF()
  
- INCLUDE(CPack)
- 
+ INCLUDE(build_depends)

Modified: head/databases/mariadb102-server/files/patch-plugin_auth__ed25519_CMakeLists.txt
==============================================================================
--- head/databases/mariadb102-server/files/patch-plugin_auth__ed25519_CMakeLists.txt	Tue Jun 18 18:32:41 2019	(r504494)
+++ head/databases/mariadb102-server/files/patch-plugin_auth__ed25519_CMakeLists.txt	Tue Jun 18 18:35:19 2019	(r504495)
@@ -1,14 +1,14 @@
---- plugin/auth_ed25519/CMakeLists.txt.orig	2017-05-14 23:13:17 UTC
+--- plugin/auth_ed25519/CMakeLists.txt.orig	2019-06-14 18:29:42 UTC
 +++ plugin/auth_ed25519/CMakeLists.txt
-@@ -23,9 +24,11 @@ ENDIF()
+@@ -23,9 +23,11 @@ ENDIF()
  # compiled with MYSQL_DYNAMIC_PLUGIN
  MYSQL_ADD_PLUGIN(auth_ed25519 server_ed25519.c ${REF10_SOURCES} MODULE_ONLY)
  
 +IF(NOT WITHOUT_CLIENT)
  # client plugin and unit test ed25519-t can use the library
  MYSQL_ADD_PLUGIN(client_ed25519 client_ed25519.c MODULE_ONLY
-   CLIENT LINK_LIBRARIES mysys_ssl ref10 COMPONENT ClientPlugins)
+   CLIENT LINK_LIBRARIES ref10 mysys_ssl COMPONENT ClientPlugins)
 +ENDIF()
  
  IF(WITH_UNIT_TESTS)
-   MY_ADD_TESTS(ed25519 LINK_LIBRARIES mysys ref10)
+   MY_ADD_TESTS(ed25519 LINK_LIBRARIES ref10 mysys_ssl)