Date: Sat, 24 Nov 2018 19:34:58 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485786 - in branches/2018Q4/databases: mariadb102-client mariadb102-server mariadb102-server/files Message-ID: <201811241934.wAOJYwNR087531@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Sat Nov 24 19:34:58 2018 New Revision: 485786 URL: https://svnweb.freebsd.org/changeset/ports/485786 Log: MFH: r484896 databases/mariadb102-server: Update to 10.2.19 Security: ec5072b0-d43a-11e8-a6d2-b499baebfeaf Approved by: ports-secteam (miwi) Deleted: branches/2018Q4/databases/mariadb102-server/files/patch-libmariadb_plugins_connection_CMakeLists.txt branches/2018Q4/databases/mariadb102-server/files/patch-libmariadb_plugins_trace_CMakeLists.txt Modified: branches/2018Q4/databases/mariadb102-client/pkg-plist branches/2018Q4/databases/mariadb102-server/Makefile branches/2018Q4/databases/mariadb102-server/distinfo branches/2018Q4/databases/mariadb102-server/files/patch-libmariadb_CMakeLists.txt branches/2018Q4/databases/mariadb102-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/databases/mariadb102-client/pkg-plist ============================================================================== --- branches/2018Q4/databases/mariadb102-client/pkg-plist Sat Nov 24 19:25:42 2018 (r485785) +++ branches/2018Q4/databases/mariadb102-client/pkg-plist Sat Nov 24 19:34:58 2018 (r485786) @@ -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 +@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: branches/2018Q4/databases/mariadb102-server/Makefile ============================================================================== --- branches/2018Q4/databases/mariadb102-server/Makefile Sat Nov 24 19:25:42 2018 (r485785) +++ branches/2018Q4/databases/mariadb102-server/Makefile Sat Nov 24 19:34:58 2018 (r485786) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.2.17 +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,10 +164,6 @@ 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 - post-install: # Remove programs to avoid conflict with mariadb102-client # These are "client" components, so there should be a switch that @@ -213,13 +210,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: branches/2018Q4/databases/mariadb102-server/distinfo ============================================================================== --- branches/2018Q4/databases/mariadb102-server/distinfo Sat Nov 24 19:25:42 2018 (r485785) +++ branches/2018Q4/databases/mariadb102-server/distinfo Sat Nov 24 19:34:58 2018 (r485786) @@ -1,3 +1,3 @@ -TIMESTAMP = 1534231063 -SHA256 (mariadb-10.2.17.tar.gz) = e7b3078f8de874a4d451242a8a3eed49bf6f916dcd52fc3efa55886f5f35be27 -SIZE (mariadb-10.2.17.tar.gz) = 73409162 +TIMESTAMP = 1542115149 +SHA256 (mariadb-10.2.19.tar.gz) = c0e103cfd73ee96d58402073e9513f0f7b5c0bd216641faecc8d763fb6529727 +SIZE (mariadb-10.2.19.tar.gz) = 71856357 Modified: branches/2018Q4/databases/mariadb102-server/files/patch-libmariadb_CMakeLists.txt ============================================================================== --- branches/2018Q4/databases/mariadb102-server/files/patch-libmariadb_CMakeLists.txt Sat Nov 24 19:25:42 2018 (r485785) +++ branches/2018Q4/databases/mariadb102-server/files/patch-libmariadb_CMakeLists.txt Sat Nov 24 19:34:58 2018 (r485786) @@ -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: branches/2018Q4/databases/mariadb102-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt ============================================================================== --- branches/2018Q4/databases/mariadb102-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt Sat Nov 24 19:25:42 2018 (r485785) +++ branches/2018Q4/databases/mariadb102-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt Sat Nov 24 19:34:58 2018 (r485786) @@ -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()
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811241934.wAOJYwNR087531>