From owner-svn-ports-all@freebsd.org Thu May 21 19:08:53 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A63602F1711; Thu, 21 May 2020 19:08:53 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49SfKx3vYxz48n1; Thu, 21 May 2020 19:08:53 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 810C7122D2; Thu, 21 May 2020 19:08:53 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04LJ8rQt002908; Thu, 21 May 2020 19:08:53 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04LJ8qne002904; Thu, 21 May 2020 19:08:52 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <202005211908.04LJ8qne002904@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Thu, 21 May 2020 19:08:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r536143 - in head/databases/mariadb104-server: . files X-SVN-Group: ports-head X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: in head/databases/mariadb104-server: . files X-SVN-Commit-Revision: 536143 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 May 2020 19:08:53 -0000 Author: brnrd Date: Thu May 21 19:08:52 2020 New Revision: 536143 URL: https://svnweb.freebsd.org/changeset/ports/536143 Log: databases/mariadb104-server: Fix galera clustering * Fix clustering script [1] * Fix clustering dependencies [1] * Remove no-op REINPLACECMD [2] * Fix paths on pam_user_map and its config [3] Submitted by: Peter M. Hauesen [1], mfechner [2], mat [3] MFH: 2020Q2 Added: head/databases/mariadb104-server/files/patch-cmake_install__layout.cmake (contents, props changed) head/databases/mariadb104-server/files/patch-scripts_wsrep__sst__rsync.sh (contents, props changed) Modified: head/databases/mariadb104-server/Makefile head/databases/mariadb104-server/pkg-plist Modified: head/databases/mariadb104-server/Makefile ============================================================================== --- head/databases/mariadb104-server/Makefile Thu May 21 18:51:18 2020 (r536142) +++ head/databases/mariadb104-server/Makefile Thu May 21 19:08:52 2020 (r536143) @@ -3,7 +3,7 @@ PORTNAME?= mariadb PORTVERSION= 10.4.13 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= databases MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ @@ -150,6 +150,7 @@ MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libJudy.so:devel/judy ROCKSDB_USES= python +ROCKSDB_CMAKE_ON= -DPYTHON_SHEBANG=${PYTHON_CMD} SNAPPY_CMAKE_ON= -DWITH_INNODB_SNAPPY=ON -DWITH_ROCKSDB_snappy=ON SNAPPY_CMAKE_OFF= -DWITH_INNODB_SNAPPY=OFF -DWITH_ROCKSDB_snappy=OFF SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy @@ -158,6 +159,10 @@ TOKUDB_PORTDOCS= README.md TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi WSREP_CMAKE_BOOL= WITH_WSREP WSREP_LIB_DEPENDS= libgalera.so:databases/galera26 +WSREP_RUN_DEPENDS= bash:shells/bash \ + rsync:net/rsync \ + #stunnel:security/stunnel +WSREP_SHEBANG_FILES= bin/wsrep_sst_rsync ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4 ZSTD_CMAKE_ON= -DWITH_ROCKSDB_zstd=ON ZSTD_CMAKE_OFF= -DWITH_ROCKSDB_zstd=OFF @@ -192,9 +197,7 @@ CMAKE_OFF+= WITH_TOKUDB .endif post-patch: - ${REINPLACE_CMD} 's|/usr/bin/env python|${PYTHON_CMD}|' ${WRKSRC}/CMakeLists.txt - ${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c - ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh \ + ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake ${MV} ${WRKSRC}/storage/mroonga/version ${WRKSRC}/storage/mroonga/version_txt .if ${OPSYS} == DragonFly @@ -207,20 +210,13 @@ post-configure: -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|' \ - -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 - .if ${PKGNAMESUFFIX:M*-client} post-install: ${RM} -r ${STAGEDIR}${DATADIR} ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server ${MV} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig/mariadb.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/mariadb.pc + ${RMDIR} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig post-install-GSSAPI_NONE-off: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so @@ -230,6 +226,8 @@ post-install: ${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server/private ${RM} -r ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig + ${MV} ${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf \ + ${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf.sample .endif # ${PKGNAMESUFFIX:M*-client} .include Added: head/databases/mariadb104-server/files/patch-cmake_install__layout.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mariadb104-server/files/patch-cmake_install__layout.cmake Thu May 21 19:08:52 2020 (r536143) @@ -0,0 +1,13 @@ +--- cmake/install_layout.cmake.orig 2020-05-09 19:27:56 UTC ++++ cmake/install_layout.cmake +@@ -128,8 +128,8 @@ SET(INSTALL_SUPPORTFILESDIR_STANDALONE "support-files + SET(INSTALL_MYSQLDATADIR_STANDALONE "data") + + SET(INSTALL_UNIX_ADDRDIR_STANDALONE "/tmp/mysql.sock") +-SET(INSTALL_PAMDIR_STANDALONE "share") +-SET(INSTALL_PAMDATADIR_STANDALONE "share") ++SET(INSTALL_PAMDIR_STANDALONE "lib/mysql/plugin") ++SET(INSTALL_PAMDATADIR_STANDALONE "etc/mysql") + # + # RPM layout + # Added: head/databases/mariadb104-server/files/patch-scripts_wsrep__sst__rsync.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mariadb104-server/files/patch-scripts_wsrep__sst__rsync.sh Thu May 21 19:08:52 2020 (r536143) @@ -0,0 +1,18 @@ +--- scripts/wsrep_sst_rsync.sh.orig 2020-05-09 19:28:00 UTC ++++ scripts/wsrep_sst_rsync.sh +@@ -390,7 +390,14 @@ EOF + + elif [ "$WSREP_SST_OPT_ROLE" = "joiner" ] + then +- wsrep_check_programs lsof ++ case $OS in ++ FreeBSD) ++ wsrep_check_programs sockstat ++ ;; ++ *) ++ wsrep_check_programs lsof ++ ;; ++ esac + + touch $SST_PROGRESS_FILE + MYSQLD_PID=$WSREP_SST_OPT_PARENT Modified: head/databases/mariadb104-server/pkg-plist ============================================================================== --- head/databases/mariadb104-server/pkg-plist Thu May 21 18:51:18 2020 (r536142) +++ head/databases/mariadb104-server/pkg-plist Thu May 21 19:08:52 2020 (r536143) @@ -53,6 +53,7 @@ bin/resolveip %%WSREP%%bin/wsrep_sst_mysqldump %%WSREP%%bin/wsrep_sst_rsync %%WSREP%%bin/wsrep_sst_rsync_wan +@sample etc/mysql/user_map.conf.sample @comment data/test/db.opt include/mysql/server/big_endian.h include/mysql/server/byte_order_generic.h @@ -175,6 +176,7 @@ lib/mysql/plugin/ha_test_sql_discovery.so lib/mysql/plugin/handlersocket.so lib/mysql/plugin/locales.so lib/mysql/plugin/metadata_lock_info.so +lib/mysql/plugin/pam_user_map.so lib/mysql/plugin/qa_auth_client.so lib/mysql/plugin/qa_auth_interface.so lib/mysql/plugin/qa_auth_server.so @@ -318,8 +320,6 @@ man/man8/mysqld.8.gz @comment share/mysql/mroonga/COPYING %%MROONGA%%share/groonga-normalizer-mysql/README.md %%MROONGA%%share/groonga/README.md -share/pam_user_map.so -share/user_map.conf @comment bin/mariadb @comment bin/mariadb-access @comment bin/mariadb-admin