diff options
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mariadb103-client/pkg-plist | 3 | ||||
| -rw-r--r-- | databases/mariadb103-server/Makefile | 2 | ||||
| -rw-r--r-- | databases/mariadb103-server/distinfo | 6 | ||||
| -rw-r--r-- | databases/mariadb103-server/files/patch-client_CMakeLists.txt | 27 | ||||
| -rw-r--r-- | databases/mariadb103-server/pkg-plist | 2 |
5 files changed, 19 insertions, 21 deletions
diff --git a/databases/mariadb103-client/pkg-plist b/databases/mariadb103-client/pkg-plist index 23c2700af704..fe530b39d7bc 100644 --- a/databases/mariadb103-client/pkg-plist +++ b/databases/mariadb103-client/pkg-plist @@ -49,7 +49,8 @@ lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so -@comment lib/mysql/plugin/client_ed25519.so +@comment lib/mysql/plugin/caching_sha2_password.so +lib/mysql/plugin/client_ed25519.so lib/mysql/plugin/daemon_example.ini lib/mysql/plugin/dialog.so lib/mysql/plugin/mysql_clear_password.so diff --git a/databases/mariadb103-server/Makefile b/databases/mariadb103-server/Makefile index aac9b6e564a4..cd360e4a3cff 100644 --- a/databases/mariadb103-server/Makefile +++ b/databases/mariadb103-server/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.3.12 +PORTVERSION= 10.3.13 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ diff --git a/databases/mariadb103-server/distinfo b/databases/mariadb103-server/distinfo index 97b807343d59..dbcd163d3e06 100644 --- a/databases/mariadb103-server/distinfo +++ b/databases/mariadb103-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1547313088 -SHA256 (mariadb-10.3.12.tar.gz) = f7449a34c25e0455928d7983dae83fd2069fe1f16c4c5f4aeed9ed9d3f081ff6 -SIZE (mariadb-10.3.12.tar.gz) = 70666408 +TIMESTAMP = 1550839720 +SHA256 (mariadb-10.3.13.tar.gz) = b2aa857ef5b84f85a7ea60a1eac7b34c0ca5151c71a0d44ce2d7fb028d71459a +SIZE (mariadb-10.3.13.tar.gz) = 70745600 diff --git a/databases/mariadb103-server/files/patch-client_CMakeLists.txt b/databases/mariadb103-server/files/patch-client_CMakeLists.txt index fa4b8a378b30..7762882e8095 100644 --- a/databases/mariadb103-server/files/patch-client_CMakeLists.txt +++ b/databases/mariadb103-server/files/patch-client_CMakeLists.txt @@ -1,6 +1,6 @@ ---- client/CMakeLists.txt.orig 2017-05-14 23:13:15 UTC +--- client/CMakeLists.txt.orig 2019-02-20 07:59:09 UTC +++ client/CMakeLists.txt -@@ -35,6 +35,8 @@ COPY_OPENSSL_DLLS(copy_openssl_client) +@@ -36,6 +36,8 @@ COPY_OPENSSL_DLLS(copy_openssl_client) SET(CLIENT_LIB mariadbclient mysys) ADD_DEFINITIONS(${SSL_DEFINES}) @@ -9,19 +9,20 @@ MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ${CMAKE_SOURCE_DIR}/sql/sql_string.cc) TARGET_LINK_LIBRARIES(mysql ${CLIENT_LIB}) -@@ -43,11 +45,6 @@ IF(UNIX) +@@ -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} pcre pcreposix) +-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}) -@@ -60,16 +57,6 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlim + +@@ -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}) @@ -38,7 +39,7 @@ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) TARGET_LINK_LIBRARIES(mysqlbinlog ${CLIENT_LIB}) -@@ -89,14 +76,34 @@ ENDIF(WIN32) +@@ -90,12 +77,32 @@ ENDIF(WIN32) ADD_EXECUTABLE(async_example async_example.c) TARGET_LINK_LIBRARIES(async_example ${CLIENT_LIB}) @@ -50,9 +51,9 @@ -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() - ++ ADD_DEPENDENCIES(${t} GenError ${CLIENT_LIB}) ++ENDFOREACH() ++ +ENDIF() + +MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) @@ -71,8 +72,6 @@ +PROPERTIES HAS_CXX TRUE) + +FOREACH(t mysqltest mysql_plugin mysql_upgrade) -+ ADD_DEPENDENCIES(${t} GenError ${CLIENT_LIB}) -+ENDFOREACH() -+ - ADD_DEFINITIONS(-DHAVE_DLOPEN) + ADD_DEPENDENCIES(${t} GenError ${CLIENT_LIB}) + ENDFOREACH() diff --git a/databases/mariadb103-server/pkg-plist b/databases/mariadb103-server/pkg-plist index 93c46db4839e..1b96c9716cee 100644 --- a/databases/mariadb103-server/pkg-plist +++ b/databases/mariadb103-server/pkg-plist @@ -239,8 +239,6 @@ man/man1/resolveip.1.gz %%WSREP%%man/man1/wsrep_sst_mysqldump.1.gz %%WSREP%%man/man1/wsrep_sst_rsync.1.gz %%WSREP%%man/man1/wsrep_sst_rsync_wan.1.gz -%%WSREP%%man/man1/wsrep_sst_xtrabackup-v2.1.gz -%%WSREP%%man/man1/wsrep_sst_xtrabackup.1.gz man/man8/mysqld.8.gz %%DATADIR%%/binary-configure %%DATADIR%%/fill_help_tables.sql |