databases/mariadb103-server: Security update to 10.3.15

 - refactored Makefile using more OPTIONS helpers

MFH:		2019Q2
Security:	4e1997e8-5de0-11e9-b95c-b499baebfeaf

2 files changed, 11 insertions, 95 deletions

diff --git a/databases/mariadb103-server/files/patch-CMakeLists.txt b/databases/mariadb103-server/files/patch-CMakeLists.txt
index f7ca1515e95c..29db2065e7cb 100644
--- a/databases/mariadb103-server/files/patch-CMakeLists.txt
+++ b/databases/mariadb103-server/files/patch-CMakeLists.txt
@@ -1,27 +1,20 @@
---- CMakeLists.txt.orig	2017-05-14 23:13:15 UTC
+--- CMakeLists.txt.orig	2019-05-13 18:13:05 UTC
 +++ CMakeLists.txt
-@@ -170,6 +170,8 @@ IF(DISABLE_SHARED)
- ENDIF()
- OPTION(ENABLED_PROFILING "Enable profiling" ON)
- OPTION(WITHOUT_SERVER "Build only the client library and clients" OFF)
-+OPTION(WITHOUT_CLIENT "Build only the server components" OFF)
-+OPTION(WITHOUT_DOCS   "Do not install documentation" OFF)
- IF(UNIX)
-   OPTION(WITH_VALGRIND "Valgrind instrumentation" OFF)
- ENDIF()
-@@ -452,6 +454,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
+@@ -491,14 +491,16 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
  )
  
-+IF(NOT WITHOUT_DOCS)
- INSTALL_DOCUMENTATION(README.md CREDITS COPYING COPYING.thirdparty
++IF(FALSE)
+ INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDPARTY
                        EXCEPTIONS-CLIENT COMPONENT Readme)
++ENDIF()
  
-@@ -463,6 +466,7 @@ IF(UNIX)
-   INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
+ # MDEV-6526 these files are not installed anymore
+ #INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
+ #                      ${CMAKE_BINARY_DIR}/Docs/INFO_BIN)
+ 
+-IF(UNIX)
++IF(FALSE)
    INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme)
  ENDIF()
-+ENDIF()
- 
- INCLUDE(CPack)
  
diff --git a/databases/mariadb103-server/files/patch-client_CMakeLists.txt b/databases/mariadb103-server/files/patch-client_CMakeLists.txt
deleted file mode 100644
index 7762882e8095..000000000000
--- a/databases/mariadb103-server/files/patch-client_CMakeLists.txt
+++ /dev/null
@@ -1,77 +0,0 @@
---- client/CMakeLists.txt.orig	2019-02-20 07:59:09 UTC
-+++ client/CMakeLists.txt
-@@ -36,6 +36,8 @@ COPY_OPENSSL_DLLS(copy_openssl_client)
- SET(CLIENT_LIB mariadbclient mysys)
- 
- ADD_DEFINITIONS(${SSL_DEFINES})
-+
-+IF(NOT WITHOUT_CLIENT)
- MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc
-                            ${CMAKE_SOURCE_DIR}/sql/sql_string.cc)
- TARGET_LINK_LIBRARIES(mysql ${CLIENT_LIB})
-@@ -44,12 +46,7 @@ IF(UNIX)
-   SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE)
- ENDIF(UNIX)
- 
--MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
--SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
--TARGET_LINK_LIBRARIES(mysqltest  ${CLIENT_LIB} pcreposix pcre)
--SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
- 
--
- MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
- TARGET_LINK_LIBRARIES(mysqlcheck ${CLIENT_LIB})
- 
-@@ -61,16 +58,6 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
- SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqlimport ${CLIENT_LIB})
- 
--MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server)
--TARGET_LINK_LIBRARIES(mysql_upgrade ${CLIENT_LIB})
--ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
--
--MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
--TARGET_LINK_LIBRARIES(mysqlshow ${CLIENT_LIB})
--
--MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
--TARGET_LINK_LIBRARIES(mysql_plugin ${CLIENT_LIB})
--
- MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
- TARGET_LINK_LIBRARIES(mysqlbinlog ${CLIENT_LIB})
- 
-@@ -90,12 +77,32 @@ ENDIF(WIN32)
- ADD_EXECUTABLE(async_example async_example.c)
- TARGET_LINK_LIBRARIES(async_example ${CLIENT_LIB})
- 
--SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example
-+SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap async_example
- PROPERTIES HAS_CXX TRUE)
- 
--
--FOREACH(t mysql mysqltest mysqltest mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysql_plugin mysqlbinlog
-+FOREACH(t mysql mysqlcheck mysqldump mysqlimport mysqlshow mysqlbinlog
-   mysqladmin mysqlslap async_example)
-+  ADD_DEPENDENCIES(${t} GenError ${CLIENT_LIB})
-+ENDFOREACH()
-+
-+ENDIF()
-+
-+MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
-+SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
-+TARGET_LINK_LIBRARIES(mysqltest  ${CLIENT_LIB} pcre pcreposix)
-+SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
-+
-+MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server)
-+TARGET_LINK_LIBRARIES(mysql_upgrade ${CLIENT_LIB})
-+ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
-+
-+MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
-+TARGET_LINK_LIBRARIES(mysql_plugin ${CLIENT_LIB})
-+
-+SET_TARGET_PROPERTIES (mysql_upgrade mysql_plugin
-+PROPERTIES HAS_CXX TRUE)
-+
-+FOREACH(t mysqltest mysql_plugin mysql_upgrade)
-   ADD_DEPENDENCIES(${t} GenError ${CLIENT_LIB})
- ENDFOREACH()
-