svn commit: r484896 - in head/databases: mariadb102-client mariadb102-server mariadb102-server/files
Bernard Spil
brnrd at FreeBSD.org
Tue Nov 13 18:50:30 UTC 2018
Author: brnrd
Date: Tue Nov 13 18:50:28 2018
New Revision: 484896
URL: https://svnweb.freebsd.org/changeset/ports/484896
Log:
databases/mariadb102-server: Update to 10.2.19
MFH: 2018Q4
Security: ec5072b0-d43a-11e8-a6d2-b499baebfeaf
Deleted:
head/databases/mariadb102-server/files/patch-libmariadb_plugins_connection_CMakeLists.txt
head/databases/mariadb102-server/files/patch-libmariadb_plugins_trace_CMakeLists.txt
Modified:
head/databases/mariadb102-client/pkg-plist
head/databases/mariadb102-server/Makefile
head/databases/mariadb102-server/distinfo
head/databases/mariadb102-server/files/patch-libmariadb_CMakeLists.txt
head/databases/mariadb102-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt
Modified: head/databases/mariadb102-client/pkg-plist
==============================================================================
--- head/databases/mariadb102-client/pkg-plist Tue Nov 13 18:48:22 2018 (r484895)
+++ head/databases/mariadb102-client/pkg-plist Tue Nov 13 18:50:28 2018 (r484896)
@@ -46,6 +46,7 @@ lib/mysql/plugin/daemon_example.ini
lib/mysql/plugin/dialog.so
lib/mysql/plugin/mysql_clear_password.so
lib/mysql/plugin/sha256_password.so
+libdata/pkgconfig/libmariadb.pc
%%DATADIR%%/charsets/Index.xml
%%DATADIR%%/charsets/README
%%DATADIR%%/charsets/armscii8.xml
@@ -75,6 +76,7 @@ lib/mysql/plugin/sha256_password.so
man/man1/msql2mysql.1.gz
man/man1/mysql.1.gz
man/man1/mysql_config.1.gz
+ at comment man/man1/mysql_embedded.1.gz
man/man1/mysql_find_rows.1.gz
man/man1/mysql_plugin.1.gz
man/man1/mysql_waitpid.1.gz
Modified: head/databases/mariadb102-server/Makefile
==============================================================================
--- head/databases/mariadb102-server/Makefile Tue Nov 13 18:48:22 2018 (r484895)
+++ head/databases/mariadb102-server/Makefile Tue Nov 13 18:50:28 2018 (r484896)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME?= mariadb
-PORTVERSION= 10.2.18
+PORTVERSION= 10.2.19
PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \
@@ -140,6 +140,7 @@ ${ENGINE}_CMAKE_ON= -DPLUGIN_${ENGINE}=DYNAMIC
INNOBASE_CMAKE_OFF= -DPLUGIN_INNOBASE=NO -DWITHOUT_INNOBASE=1
CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC
+CONNECT_EXTRA_USES= gnome
CONNECT_EXTRA_USE= gnome=libxml2
GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI=NO -DPLUGIN_AUTH_GSSAPI_CLIENT=NO
LZ4_CMAKE_OFF= -DGRN_WITH_LZ4=OFF -DWITH_INNODB_LZ4=OFF -DWITH_ROCKSDB_LZ4=OFF
@@ -163,9 +164,9 @@ ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4
ZSTD_CMAKE_ON= -DWITH_ROCKSDB_ZSTD=ON
ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd
-NOT_FOR_ARCHS= i386
-NOT_FOR_ARCHS_REASON= currently does not compile on i386, see \
- https://jira.mariadb.org/browse/MDEV-9627
+#NOT_FOR_ARCHS= i386
+#NOT_FOR_ARCHS_REASON= currently does not compile on i386, see \
+# https://jira.mariadb.org/browse/MDEV-9627
post-install:
# Remove programs to avoid conflict with mariadb102-client
@@ -213,13 +214,5 @@ post-patch:
${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \
${WRKSRC}/cmake/os/DragonFly.cmake
.endif
-
-# Fix build failure in mbstream, see https://jira.mariadb.org/browse/MDEV-14072
-post-configure-INNOBASE-on:
- ${REINPLACE_CMD} -e 's| ${PREFIX}/lib/liblz4.so\(.* ${PREFIX}/lib/liblz4.so.*\)|\1|' \
- -e 's| ${PREFIX}/lib/liblzo2.so\(.* ${PREFIX}/lib/liblzo2.so.*\)|\1|' \
- -e 's| ${PREFIX}/lib/libsnappy.so\(.* ${PREFIX}/lib/libsnappy.so\)|\1|' \
- -e 's| -llzma\(.* -llzma\)|\1|;s| -lbz2\(.* -lbz2\)|\1|;' \
- ${WRKSRC}/extra/mariabackup/CMakeFiles/mbstream.dir/link.txt
.include <bsd.port.post.mk>
Modified: head/databases/mariadb102-server/distinfo
==============================================================================
--- head/databases/mariadb102-server/distinfo Tue Nov 13 18:48:22 2018 (r484895)
+++ head/databases/mariadb102-server/distinfo Tue Nov 13 18:50:28 2018 (r484896)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1538065245
-SHA256 (mariadb-10.2.18.tar.gz) = 24cef69a81deb7c778de6b226cfedf84193133c49b22e4a37b6a454ec401fc78
-SIZE (mariadb-10.2.18.tar.gz) = 71715758
+TIMESTAMP = 1542115149
+SHA256 (mariadb-10.2.19.tar.gz) = c0e103cfd73ee96d58402073e9513f0f7b5c0bd216641faecc8d763fb6529727
+SIZE (mariadb-10.2.19.tar.gz) = 71856357
Modified: head/databases/mariadb102-server/files/patch-libmariadb_CMakeLists.txt
==============================================================================
--- head/databases/mariadb102-server/files/patch-libmariadb_CMakeLists.txt Tue Nov 13 18:48:22 2018 (r484895)
+++ head/databases/mariadb102-server/files/patch-libmariadb_CMakeLists.txt Tue Nov 13 18:50:28 2018 (r484896)
@@ -1,9 +1,9 @@
---- libmariadb/CMakeLists.txt.orig 2017-05-28 18:41:39 UTC
+--- libmariadb/CMakeLists.txt.orig 2018-11-12 16:32:38 UTC
+++ libmariadb/CMakeLists.txt
-@@ -360,7 +360,7 @@ ENDIF()
+@@ -381,7 +381,7 @@ ENDIF()
+ INCLUDE(${CC_SOURCE_DIR}/plugins/CMakeLists.txt)
ADD_SUBDIRECTORY(include)
ADD_SUBDIRECTORY(libmariadb)
- ADD_SUBDIRECTORY(plugins)
-IF(NOT WIN32)
+IF(NOT WIN32 AND NOT WITHOUT_CLIENT)
ADD_SUBDIRECTORY(mariadb_config)
Modified: head/databases/mariadb102-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt
==============================================================================
--- head/databases/mariadb102-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt Tue Nov 13 18:48:22 2018 (r484895)
+++ head/databases/mariadb102-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt Tue Nov 13 18:50:28 2018 (r484896)
@@ -1,31 +1,31 @@
---- libmariadb/plugins/auth/CMakeLists.txt.orig 2017-05-14 23:13:15 UTC
+--- libmariadb/plugins/auth/CMakeLists.txt.orig 2018-11-12 16:32:38 UTC
+++ libmariadb/plugins/auth/CMakeLists.txt
-@@ -26,6 +26,7 @@ IF(AUTH_DIALOG_PLUGIN_TYPE MATCHES "DYNA
- INSTALL_PLUGIN(dialog ${CC_BINARY_DIR}/plugins/auth)
- ENDIF()
+@@ -18,6 +18,7 @@ REGISTER_PLUGIN(TARGET dialog
+ SOURCES ${CC_SOURCE_DIR}/plugins/auth/dialog.c
+ ${CC_SOURCE_DIR}/libmariadb/get_password.c)
+IF(NOT WITHOUT_CLIENT)
- # SHA256 plugin
- IF(AUTH_SHA256PW_PLUGIN_TYPE MATCHES "DYNAMIC")
- ADD_DEFINITIONS(-DHAVE_SHA256PW_DYNAMIC=1)
-@@ -51,6 +52,7 @@ IF(AUTH_SHA256PW_PLUGIN_TYPE MATCHES "DY
- SIGN_TARGET(sha256_password)
- INSTALL_PLUGIN(sha256_password ${CC_BINARY_DIR}/plugins/auth)
+ #GSSAPI client authentication plugin
+ IF(NOT WIN32)
+ INCLUDE(${CC_SOURCE_DIR}/cmake/FindGSSAPI.cmake)
+@@ -51,6 +52,7 @@ IF(${WITH_SSL} STREQUAL "OPENSSL" OR ${W
+ SOURCES ${AUTH_DIR}/sha256_pw.c
+ LIBRARIES ${SHA256_LIBS})
ENDIF()
+ENDIF()
# old_password plugin
- IF(AUTH_OLDPASSWORD_PLUGIN_TYPE MATCHES "DYNAMIC")
-@@ -72,6 +74,7 @@ IF(AUTH_OLDPASSWORD_PLUGIN_TYPE MATCHES
- SIGN_TARGET(mysql_old_password)
- ENDIF()
+ REGISTER_PLUGIN(TARGET mysql_old_password
+@@ -60,10 +62,11 @@ REGISTER_PLUGIN(TARGET mysql_old_passwor
+ SOURCES ${AUTH_DIR}/old_password.c)
+
+IF(NOT WITHOUT_CLIENT)
# Cleartext
- IF(AUTH_CLEARTEXT_PLUGIN_TYPE MATCHES "DYNAMIC")
- ADD_DEFINITIONS(-DHAVE_CLEARTEXT_DYNAMIC=1)
-@@ -124,3 +127,4 @@ IF(${AUTH_GSSAPI_PLUGIN_TYPE} MATCHES "D
- INSTALL_PLUGIN(auth_gssapi_client ${CC_BINARY_DIR}/plugins/auth)
- ENDIF()
- ENDIF()
+ REGISTER_PLUGIN(TARGET mysql_clear_password
+ TYPE MARIADB_CLIENT_PLUGIN_AUTH
+ CONFIGURATIONS DYNAMIC STATIC OFF
+ DEFAULT DYNAMIC
+ SOURCES ${AUTH_DIR}/mariadb_cleartext.c)
+-
+ENDIF()
More information about the svn-ports-head
mailing list