From nobody Wed May 31 12:03:09 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QWSZk0vtgz4YZm3; Wed, 31 May 2023 12:03:10 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QWSZk0N7bz3xDn; Wed, 31 May 2023 12:03:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685534590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RnFptUUjF/XjXygDmOC+NP8Pc7C4CwAIooPH2m0Cq88=; b=Jy4Qhib4BAx9mVbpj6KEZ1UPGHHvlHrjTgdepX+7vr1pI8iWPUisYd7LY/4JFCil0PsGb2 ayP+uVgGsyXRmhI0sMYJNueSrqdFioR0sjUNDBc1/bGmzLurYv4YYTmwECh02gCLLmLH1w JY7392tjutU+h+GuyOyELLIstGrTD2OmN4+W63S4XJHKt3j98Aco4/31gXPi6Ei99TWYOR q/XADJO0P760ba8/AQbkdPszUhtHJub82d6+v+oa/KT+ra+ZXY2KXsyhuWHtMx2QtuWQmi H6ze6DmYwkiU8cavyNyMBNP7M5fCgb+TFW5UykXGntCOYjtWf3gbwQWxw3yuVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685534590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RnFptUUjF/XjXygDmOC+NP8Pc7C4CwAIooPH2m0Cq88=; b=SgmpF8V+TRs54vTUKk/6mNy3ykQKBX8AMjxY7Muv4oguzkVnUHbBteaRak8hEK+akvmTsC hP3Ri9sEOvk01+euCQnI4XfvMVuDwzxOdVBEKr1xE9Bbr/Cq45F1XszadvfoMO9d2JCEHm SzZEOAD8TbwgaboTB3gBVAOkssJt4U6EmRU4GzkxEnSQELhe1ww//0eiyRnJ/9lHff2dB5 eVhCbuNho8VVJBobWUnX9cK+3dVBoSEMUaHNaQdLf39xpcgPj2XRaD6F3k9Hwsj1xyDGm8 IE2C1lK553MSwLghQ+VbqvKEYPvMSqImRLEot/d8ZuqzDh/+8qWQZhZ8zQD3yA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685534590; a=rsa-sha256; cv=none; b=jqof3HcqmSA4rsfWX2S2Uap6/MAHUzVVwU1g1aJ6Jj6s8ypzd0e56zF9wI1l8eRD2kgZAD u/+vZQh6aCUR1sT7QiIUUrQZBa6RQOaxNyL0eDFCAICEjC3wRi1/0MAFh3Uyhhh10hen4o vsClCiy8+YqGVeH5MLKWx79SFr/YpwXyi2gUGRh8Z0rLWl4RHa9bpngFgHe25W9qy6p7z9 amIg7TvyciS7FJpB8TRnTbqqa1SxQLJN8rsEGq8UHUzVr57h9bNdccYYr5Rc+bMKshNCOk 7Il/U8Ow9vFmwrCerTDTbT/sAms7C/mKnSfRtd2tJpWcPK1ZuvLaWPn8WtCsgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QWSZj6Xk5zZCT; Wed, 31 May 2023 12:03:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34VC39Ec094014; Wed, 31 May 2023 12:03:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34VC39IW094013; Wed, 31 May 2023 12:03:09 GMT (envelope-from git) Date: Wed, 31 May 2023 12:03:09 GMT Message-Id: <202305311203.34VC39IW094013@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Bernard Spil Subject: git: 41383e28e9d1 - 2023Q2 - databases/mariadb106-server: Bugfixes List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: 41383e28e9d17d1d2de370170e27bab4188da488 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=41383e28e9d17d1d2de370170e27bab4188da488 commit 41383e28e9d17d1d2de370170e27bab4188da488 Author: Bernard Spil AuthorDate: 2023-04-10 11:32:31 +0000 Commit: Bernard Spil CommitDate: 2023-05-31 12:03:00 +0000 databases/mariadb106-server: Bugfixes * Don't override bind-address when WSREP is enabled [1] * Fix typo in mysql_config patch [2] * Update CONFLICTS after MariaDB 10.0.11 port creation PR: 264999[1], 269654[2] Reported by: ingenium [1], Oleg Sidorkin (cherry picked from commit c55765750a896182a2774ced7217145fa746cdba) --- databases/mariadb106-server/Makefile | 1 + databases/mariadb106-server/files/patch-scripts_mysql__config.sh | 2 +- databases/mariadb106-server/files/pkg-message.in | 4 ++++ databases/mariadb106-server/pkg-plist | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/databases/mariadb106-server/Makefile b/databases/mariadb106-server/Makefile index 26def325d2f8..83fffd842974 100644 --- a/databases/mariadb106-server/Makefile +++ b/databases/mariadb106-server/Makefile @@ -120,6 +120,7 @@ DATADIR= ${PREFIX}/share/mysql ETCDIR= ${PREFIX}/etc/mysql CONFLICTS_INSTALL= mariadb10[0-57-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ + mariadb1011-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysqlwsrep* \ percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* diff --git a/databases/mariadb106-server/files/patch-scripts_mysql__config.sh b/databases/mariadb106-server/files/patch-scripts_mysql__config.sh index 31b54bf148c5..f8321be63ecc 100644 --- a/databases/mariadb106-server/files/patch-scripts_mysql__config.sh +++ b/databases/mariadb106-server/files/patch-scripts_mysql__config.sh @@ -4,7 +4,7 @@ # Create options libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@" embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@" -+embedded_libs="-L$embedded_libs -%%LOCALBASE%%/lib " ++embedded_libs="$embedded_libs -%%LOCALBASE%%/lib " include="-I$pkgincludedir" if [ "$basedir" != "/usr" ]; then diff --git a/databases/mariadb106-server/files/pkg-message.in b/databases/mariadb106-server/files/pkg-message.in index 189a27624f5d..19d0db2a69df 100644 --- a/databases/mariadb106-server/files/pkg-message.in +++ b/databases/mariadb106-server/files/pkg-message.in @@ -12,6 +12,10 @@ nor /var/db/mysql for logs and PID-file. This port does NOT include the mytop perl script, this is included in the MariaDB tarball but the most recent version can be found in the databases/mytop port + +%%WSREP%%Using wsrep clustering requires adding a configuration file. +%%WSREP%%Copy %%PREFIX%%/etc/mysql/conf.d/wsrep.conf.sample to +%%WSREP%%%%PREFIX%%/etc/mysql/conf.d/wsrep.conf and change what you need there. EOM } { type: upgrade diff --git a/databases/mariadb106-server/pkg-plist b/databases/mariadb106-server/pkg-plist index 96f3a8a38b83..9867f566ebf2 100644 --- a/databases/mariadb106-server/pkg-plist +++ b/databases/mariadb106-server/pkg-plist @@ -62,7 +62,7 @@ bin/test-connect-t @comment %%ETCDIR%%/server.cnf @sample %%ETCDIR%%/conf.d/server.cnf.sample %%SPIDER%%@sample %%ETCDIR%%/conf.d/spider.cnf.sample -%%WSREP%%@sample %%ETCDIR%%/conf.d/wsrep.cnf.sample +%%WSREP%%%%ETCDIR%%/conf.d/wsrep.cnf.sample @comment %%ETCDIR%%/my.cnf @sample %%ETCDIR%%/user_map.conf.sample include/mysql/server/big_endian.h