Date: Wed, 15 May 2019 20:36:33 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r501746 - in head/databases: mariadb103-client mariadb103-client/files mariadb103-server mariadb103-server/files Message-ID: <201905152036.x4FKaXoU039062@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Wed May 15 20:36:32 2019 New Revision: 501746 URL: https://svnweb.freebsd.org/changeset/ports/501746 Log: databases/mariadb103-server: Security update to 10.3.15 - refactored Makefile using more OPTIONS helpers MFH: 2019Q2 Security: 4e1997e8-5de0-11e9-b95c-b499baebfeaf Deleted: head/databases/mariadb103-server/files/patch-client_CMakeLists.txt Modified: head/databases/mariadb103-client/Makefile head/databases/mariadb103-client/files/patch-CMakeLists.txt head/databases/mariadb103-client/pkg-plist head/databases/mariadb103-server/Makefile head/databases/mariadb103-server/distinfo head/databases/mariadb103-server/files/patch-CMakeLists.txt head/databases/mariadb103-server/pkg-plist Modified: head/databases/mariadb103-client/Makefile ============================================================================== --- head/databases/mariadb103-client/Makefile Wed May 15 20:28:04 2019 (r501745) +++ head/databases/mariadb103-client/Makefile Wed May 15 20:36:32 2019 (r501746) @@ -12,27 +12,6 @@ FILESDIR= ${.CURDIR}/files PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist -CMAKE_ARGS+= -DWITHOUT_SERVER=1 \ - -DCONC_WITH_UNITTEST=0 \ - -DCONC_WITH_MYSQLCOMPAT=1 \ - -DWITH_WSREP=0 - -USE_LDCONFIG= ${PREFIX}/lib/mysql - -CLIENT_ONLY= yes - CONFLICTS_INSTALL= databases/mytop - -post-configure: - ${REINPLACE_CMD} -Ee 's|(#define INCLUDE.*)"$$|\1 -I${PREFIX}/include"|' \ - -e 's|(#define LIBS .*)"$$|\1 -L${PREFIX}/lib"|' \ - ${WRKSRC}/libmariadb/mariadb_config/mariadb_config.c - -post-install: - ${RM} -r ${STAGEDIR}${DATADIR} - ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server - -post-install-GSSAPI_NONE: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so .include "${MASTERDIR}/Makefile" Modified: head/databases/mariadb103-client/files/patch-CMakeLists.txt ============================================================================== --- head/databases/mariadb103-client/files/patch-CMakeLists.txt Wed May 15 20:28:04 2019 (r501745) +++ head/databases/mariadb103-client/files/patch-CMakeLists.txt Wed May 15 20:36:32 2019 (r501746) @@ -1,11 +1,11 @@ ---- CMakeLists.txt.orig 2018-05-23 20:38:41 UTC +--- CMakeLists.txt.orig 2019-05-13 18:13:05 UTC +++ CMakeLists.txt -@@ -479,14 +479,16 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL +@@ -491,14 +491,16 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) +IF(FALSE) - INSTALL_DOCUMENTATION(README.md CREDITS COPYING COPYING.thirdparty + INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDPARTY EXCEPTIONS-CLIENT COMPONENT Readme) +ENDIF() Modified: head/databases/mariadb103-client/pkg-plist ============================================================================== --- head/databases/mariadb103-client/pkg-plist Wed May 15 20:28:04 2019 (r501745) +++ head/databases/mariadb103-client/pkg-plist Wed May 15 20:36:32 2019 (r501746) @@ -64,8 +64,8 @@ libdata/pkgconfig/libmariadb.pc @comment man/man1/galera_new_cluster.1.gz @comment man/man1/galera_recovery.1.gz @comment man/man1/innochecksum.1.gz -@comment man/man1/mariadb-service-convert.1.gz @comment man/man1/mariabackup.1.gz +@comment man/man1/mariadb-service-convert.1.gz man/man1/msql2mysql.1.gz @comment man/man1/mbstream.1.gz @comment man/man1/my_print_defaults.1.gz @@ -119,8 +119,6 @@ man/man1/replace.1.gz @comment man/man1/wsrep_sst_mysqldump.1.gz @comment man/man1/wsrep_sst_rsync.1.gz @comment man/man1/wsrep_sst_rsync_wan.1.gz -@comment man/man1/wsrep_sst_xtrabackup-v2.1.gz -@comment man/man1/wsrep_sst_xtrabackup.1.gz @comment man/man8/mysqld.8.gz @comment share/aclocal/mysql.m4 share/pkgconfig/mariadb.pc Modified: head/databases/mariadb103-server/Makefile ============================================================================== --- head/databases/mariadb103-server/Makefile Wed May 15 20:28:04 2019 (r501745) +++ head/databases/mariadb103-server/Makefile Wed May 15 20:36:32 2019 (r501746) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.3.14 +PORTVERSION= 10.3.15 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ @@ -37,7 +37,7 @@ OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_DEFAULT= GSSAPI_BASE -.if !defined(CLIENT_ONLY) +.if ${PKGNAMESUFFIX:M*-server} # MySQL-Server options OPTIONS_DEFAULT+= CONNECT_EXTRA INNOBASE SPHINX SPIDER WSREP OPTIONS_GROUP= COMPRESSION ENGINES GROONGA @@ -65,10 +65,6 @@ ZMQ_DESC= ZeroMQ support ZSTD_DESC+= Zstandard compression support (RocksDB only) .endif -GSSAPI_BASE_USES= gssapi -GSSAPI_HEIMDAL_USES= gssapi:heimdal -GSSAPI_MIT_USES= gssapi:mit - CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ -DINSTALL_INCLUDEDIR="include/mysql" \ @@ -85,24 +81,18 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_SQLBENCHDIR= \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DDEFAULT_SYSCONFDIR="${PREFIX}/etc" \ - -DWITH_JEMALLOC="system" \ - -DWITH_LIBWRAP=1 \ - -DWITH_CONNECT_WITH_MONGO="OFF" \ -DWITH_SSL="${OPENSSLBASE}" \ - -DWITH_UNIT_TESTS=0 \ - -DWITHOUT_DOCS=1 \ -DCURSES_CURSES_LIBRARY="/usr/lib/libcurses.so" \ -DCURSES_FORM_LIBRARY="/usr/lib/libform.so" \ -DCURSES_CURSES_LIBRARY="/usr/lib/libncurses.so" \ - -DICONV_LIBRARIES="${ICONV_LIB_PATH}" \ -DKRB5_CONFIG="${KRB5CONFIG}" \ -DCURSES_NCURSES_LIBRARY="${NCURSESLIB}/libncurses.so" \ - -DOPENSSL_ROOT_DIR="${OPENSSLBASE}" \ - -DOPENSSL_CRYPTO_LIBRARY="${OPENSSLBASE}/lib/libcrypto.so" \ - -DOPENSSL_SSL_LIBRARY="${OPENSSLBASE}/lib/libssl.so" \ - -DREMOTEIO_PLUGIN_TYPE="NO" \ -DCOMPILATION_COMMENT="FreeBSD Ports" \ - -DCMAKE_PREFIX_PATH=${PREFIX} + -DCMAKE_PREFIX_PATH=${PREFIX} \ +CMAKE_OFF+= CONNECT_WITH_MONGO WITH_UNIT_TESTS +CMAKE_ON+= WITH_LIBWRAP WITHOUT_DOCS +DISABLED_PLUGINS+= DAEMON_EXAMPLE DIALOG_EXAMPLES EXAMPLE \ + EXAMPLE_KEY_MANAGEMENT FTEXAMPLE DATADIR= ${PREFIX}/share/mysql @@ -112,71 +102,73 @@ CONFLICTS_INSTALL= mariadb5*-${PKGNAMESUFFIX:C/^[0-9]* mysqlwsrep* \ percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* -FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 +FASTMTX_CMAKE_BOOL= WITH_FAST_MUTEXES +GSSAPI_BASE_USES= gssapi +GSSAPI_HEIMDAL_USES= gssapi:heimdal +GSSAPI_MIT_USES= gssapi:mit +GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF OPTIONS_SUB= yes -.if defined(CLIENT_ONLY) +.if ${PKGNAMESUFFIX:M*-client} # MySQL-Client part +CMAKE_ON+= CONC_WITH_MYSQLCOMPAT WITHOUT_SERVER +CMAKE_OFF+= CONC_WITH_UNITTEST WITH_WSREP USES+= readline -GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF -.else +USE_LDCONFIG= ${PREFIX}/lib/mysql +.else # ! ${PKGNAMESUFFIX:M*-client} # MySQL-Server part USES+= mysql:103m USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql -CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" \ - -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF \ - -DCMAKE_SKIP_BUILD_RPATH:BOOL=YES \ - -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ - -DWITHOUT_CLIENT=1 +CMAKE_ON+= CMAKE_SKIP_BUILD_RPATH WITH_EMBEDDED_SERVER +CMAKE_OFF+= WITH_CLIENT .for ENGINE in ${OPTIONS_GROUP_ENGINES:NINNOBASE} ${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO ${ENGINE}_CMAKE_ON= -DPLUGIN_${ENGINE}=DYNAMIC .endfor -INNOBASE_CMAKE_OFF= -DPLUGIN_INNOBASE=NO +INNOBASE_VARS_OFF= disabled_plugins+=INNOBASE CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC CONNECT_EXTRA_USE= gnome=libxml2 CONNECT_EXTRA_USES= gnome -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 -LZ4_CMAKE_ON= -DGRN_WITH_LZ4=ON -DWITH_INNODB_LZ4=ON -DWITH_ROCKSDB_LZ4=ON +CONNECT_EXTRA_CMAKE_BOOL= CONNECT_WITH_LIBXML2 CONNECT_WITH_ODBC +GSSAPI_NONE_VARS= disabled_plugins+=AUTH_GSSAPI +LZ4_CMAKE_BOOL= GRN_WITH_LZ4 WITH_INNODB_LZ4 WITH_ROCKSDB_LZ4 LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 -LZO_CMAKE_OFF= -DWITH_INNODB_LZO=OFF -LZO_CMAKE_ON= -DWITH_INNODB_LZO=ON +LZO_CMAKE_BOOL= WITH_INNODB_LZO LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2 MROONGA_IMPLIES= LZ4 MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libJudy.so:devel/judy ROCKSDB_USES= python -SNAPPY_CMAKE_OFF= -DWITH_INNODB_SNAPPY=OFF -DWITH_ROCKSDB_snappy=OFF -SNAPPY_CMAKE_ON= -DWITH_INNODB_SNAPPY=ON -DWITH_ROCKSDB_snappy=ON +SNAPPY_CMAKE_BOOL= WITH_INNODB_SNAPPY WITH_ROCKSDB_snappy SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy TOKUDB_IMPLIES= SNAPPY TOKUDB_PORTDOCS= README.md TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi -WSREP_CMAKE_OFF= -DWITH_WSREP=OFF +WSREP_CMAKE_BOOL= WITH_WSREP WSREP_LIB_DEPENDS= libgalera.so:databases/galera ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4 -ZSTD_CMAKE_ON= -DWITH_ROCKSDB_ZSTD=ON +ZSTD_CMAKE_BOOL= WITH_ROCKSDB_ZSTD ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd .include <bsd.port.options.mk> +.for PLUGIN in ${DISABLED_PLUGINS} +CMAKE_ARGS+= -DPLUGIN_${PLUGIN}=NO +.endfor + .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" .else SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " .endif -post-install: - ${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy - ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server/private -.endif # defined(CLIENT_ONLY) +.endif # ${PKGNAMESUFFIX:M*-client} .if defined(WITH_OPENSSL_PORT) GSSAPI_BASE_IGNORE= BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system @@ -189,7 +181,7 @@ PLIST_SUB+= WSREP="@comment " .endif .if ${OPSYS} == DragonFly -CMAKE_ARGS+= -DWITHOUT_TOKUDB +CMAKE_OFF+= WITH_TOKUDB .endif post-patch: @@ -202,6 +194,11 @@ post-patch: ${WRKSRC}/cmake/os/DragonFly.cmake .endif +post-configure: + ${REINPLACE_CMD} -Ee 's|(#define INCLUDE.*)"$$|\1 -I${PREFIX}/include"|' \ + -e 's|(#define LIBS .*)"$$|\1 -L${PREFIX}/lib"|' \ + ${WRKSRC}/libmariadb/mariadb_config/mariadb_config.c + # 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|' \ @@ -209,5 +206,19 @@ post-configure-INNOBASE-on: -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 + +.if ${PKGNAMESUFFIX:M*-client} +post-install: + ${RM} -r ${STAGEDIR}${DATADIR} + ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server + +post-install-GSSAPI_NONE: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so + +.else # ! ${PKGNAMESUFFIX:M*-client} +post-install: + ${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy + ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server/private +.endif # ${PKGNAMESUFFIX:M*-client} .include <bsd.port.post.mk> Modified: head/databases/mariadb103-server/distinfo ============================================================================== --- head/databases/mariadb103-server/distinfo Wed May 15 20:28:04 2019 (r501745) +++ head/databases/mariadb103-server/distinfo Wed May 15 20:36:32 2019 (r501746) @@ -1,3 +1,3 @@ -TIMESTAMP = 1554289461 -SHA256 (mariadb-10.3.14.tar.gz) = ba1c94d92fc8ebdf9b8a1d1b93ed6aeeead33da507efbbd4afcf49f32023e054 -SIZE (mariadb-10.3.14.tar.gz) = 70771337 +TIMESTAMP = 1557908013 +SHA256 (mariadb-10.3.15.tar.gz) = 27f391a54d544f93850d4edfb3ef1b4cf24f8e27e61e51727b0e7d31bb4d6968 +SIZE (mariadb-10.3.15.tar.gz) = 70824529 Modified: head/databases/mariadb103-server/files/patch-CMakeLists.txt ============================================================================== --- head/databases/mariadb103-server/files/patch-CMakeLists.txt Wed May 15 20:28:04 2019 (r501745) +++ head/databases/mariadb103-server/files/patch-CMakeLists.txt Wed May 15 20:36:32 2019 (r501746) @@ -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) Modified: head/databases/mariadb103-server/pkg-plist ============================================================================== --- head/databases/mariadb103-server/pkg-plist Wed May 15 20:28:04 2019 (r501745) +++ head/databases/mariadb103-server/pkg-plist Wed May 15 20:36:32 2019 (r501746) @@ -163,11 +163,8 @@ lib/mysql/plugin/auth_pam.so lib/mysql/plugin/auth_socket.so lib/mysql/plugin/auth_test_plugin.so lib/mysql/plugin/caching_sha2_password.so -@comment lib/mysql/plugin/daemon_example.ini lib/mysql/plugin/debug_key_management.so @comment lib/mysql/plugin/dialog.so -lib/mysql/plugin/dialog_examples.so -lib/mysql/plugin/example_key_management.so lib/mysql/plugin/file_key_management.so lib/mysql/plugin/ha_archive.so lib/mysql/plugin/ha_blackhole.so @@ -180,12 +177,11 @@ lib/mysql/plugin/ha_federatedx.so %%SPHINX%%lib/mysql/plugin/ha_sphinx.so %%SPIDER%%lib/mysql/plugin/ha_spider.so %%TOKUDB%%lib/mysql/plugin/ha_tokudb.so +@comment lib/mysql/plugin/daemon_example.ini lib/mysql/plugin/ha_test_sql_discovery.so lib/mysql/plugin/handlersocket.so -lib/mysql/plugin/libdaemon_example.so lib/mysql/plugin/locales.so lib/mysql/plugin/metadata_lock_info.so -lib/mysql/plugin/mypluglib.so lib/mysql/plugin/qa_auth_client.so lib/mysql/plugin/qa_auth_interface.so lib/mysql/plugin/qa_auth_server.so @@ -320,3 +316,34 @@ man/man8/mysqld.8.gz %%MROONGA%%share/groonga-normalizer-mysql/README.md %%MROONGA%%share/groonga/README.md @comment share/pkgconfig/mariadb.pc +@comment bin/mariadb_config +@comment bin/mysql +@comment bin/mysqladmin +@comment bin/mysqlbinlog +@comment bin/mysqlcheck +@comment bin/mysqldump +@comment bin/mysqlimport +@comment bin/mysqlshow +@comment bin/mysqlslap +@comment include/mysql/errmsg.h +@comment include/mysql/ma_list.h +@comment include/mysql/ma_pvio.h +@comment include/mysql/ma_tls.h +@comment include/mysql/mariadb/ma_io.h +@comment include/mysql/mariadb_com.h +@comment include/mysql/mariadb_ctype.h +@comment include/mysql/mariadb_dyncol.h +@comment include/mysql/mariadb_stmt.h +@comment include/mysql/mariadb_version.h +@comment include/mysql/mysql.h +@comment include/mysql/mysql/client_plugin.h +@comment include/mysql/mysql/plugin_auth.h +@comment include/mysql/mysql/plugin_auth_common.h +@comment lib/mysql/libmariadb.so +@comment lib/mysql/libmariadb.so.3 +@comment lib/mysql/plugin/auth_gssapi_client.so +@comment lib/mysql/plugin/client_ed25519.so +@comment lib/mysql/plugin/mysql_clear_password.so +@comment lib/mysql/plugin/sha256_password.so +@comment libdata/pkgconfig/libmariadb.pc +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905152036.x4FKaXoU039062>