From nobody Sun Feb 19 19:46:39 2023 X-Original-To: dev-commits-ports-main@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 4PKbf82QjTz3rvRl; Sun, 19 Feb 2023 19:46:40 +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 4PKbf80bsxz41bd; Sun, 19 Feb 2023 19:46:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676836000; 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=2ZcAzCmC/z31LhoUEpSqRy+0Y1PsG+xnmNmGRaG/N5c=; b=v51SzDi9bqkwOevcBxa882eZa+tmCFR9WeZg3uCm2hzhQxmgNHGiU/bwPBNlOvrYhauwpJ HjVlFkXGBWFCUCm9kdIE7XSjhIalTKFgRHmbh26LTqO/Mjv8q+pzNrLZsQ8DVyC/fckzdG jS69tyWgkGRjIuiJWfiD64FJsgFss6hgyEMh3tzIFeZQmikIKF570iMtWMy2mk9PHZkjCY 6WXee6Qtugc99QIU94TCni5ccQ5CJp/yUQq9IBRXxpB2z8QeDGxEYqr5tWJIQTsxhSX7HZ mpnqdwHlPgB5oGWBs5s310F/PgoMLggmy9ks7IPoebdYb4OvZ8f1LA6+yaiUKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676836000; 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=2ZcAzCmC/z31LhoUEpSqRy+0Y1PsG+xnmNmGRaG/N5c=; b=DyuGwWOxrWY+ta/HMai2BZknJze0d45fktLJXtM8W+B2LcPXkSnoZxyMw2fDXzla5sXdN5 lzqJkb77JLEDCQpc0ncKHTGSe68dyTqOR25zMrTN8mDCWE4AFAP/CkaXme7VVNC4l7JMGE 0nL0KNccgbCBIeryAsd4oIfXoErWzGHESf83GzMwWADlsDYg+hb9tpUVatMWMTo205W05F zwODmglhQyKVyiSaD85xfpM5+2vgiEsv2U7k1ElcL19Sb/j3cYyFyiXZX3qzJtjD63pXho C5mE3p4fbWHsh+59l5AD9eDuBjiFhLYe07Gue5y9QLuQh9z0974Pmv6VNPVANg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676836000; a=rsa-sha256; cv=none; b=nYc6QrbBDj92aQyZUR/RHu4u6usfidOZzTjtxmUmh51MZiIey8fzJoZQnQ47/ArQWWVokb egG9Y4SjiVrSq/x6bDqg7he8lPz9M3Q7USUpSKjj1YQOr4mtko7dG3N19klywoJKH2butn 1v0DkLfoBW1KXSxtaafYxjRb1EX8len5Kf8OInNBfOOcPx3qB/9exZ3KU6EOZFVEPQHPWU BMavt+X2I4rAf3CG2py8YrXT3pvxjmJXqqNWEE4KOy7yyHayqyENSeC6GFoZRAxHEIodk6 Y7SSZkfPojBWQLMlxhPQwA1Z33CMF/2kb/SwkB6IzM9Bwrgl0cA5dnNefsVtqw== 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 4PKbf76XK3z1CjP; Sun, 19 Feb 2023 19:46:39 +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 31JJkdXn094324; Sun, 19 Feb 2023 19:46:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31JJkdUH094323; Sun, 19 Feb 2023 19:46:39 GMT (envelope-from git) Date: Sun, 19 Feb 2023 19:46:39 GMT Message-Id: <202302191946.31JJkdUH094323@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: 7817c5e1b92e - main - databases/mariadb106-server: Update to 10.6.12 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 7817c5e1b92ed3ad496e2397dda57810f4ab6ac1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=7817c5e1b92ed3ad496e2397dda57810f4ab6ac1 commit 7817c5e1b92ed3ad496e2397dda57810f4ab6ac1 Author: Bernard Spil AuthorDate: 2023-02-19 19:40:19 +0000 Commit: Bernard Spil CommitDate: 2023-02-19 19:46:34 +0000 databases/mariadb106-server: Update to 10.6.12 * 267386 Fixes broken symlink * 269654 Fixes issue in mysql_config patch PR: 269457, 267386 [1], 269654 [2] Reported by: Ivan Rozhuk [1], Oleg Sidorkin [2] --- databases/mariadb106-server/Makefile | 3 ++- databases/mariadb106-server/distinfo | 6 +++--- databases/mariadb106-server/files/patch-scripts_mysql__config.sh | 2 +- databases/mariadb106-server/pkg-plist | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/databases/mariadb106-server/Makefile b/databases/mariadb106-server/Makefile index 62d88db75701..26def325d2f8 100644 --- a/databases/mariadb106-server/Makefile +++ b/databases/mariadb106-server/Makefile @@ -1,5 +1,5 @@ PORTNAME?= mariadb -PORTVERSION= 10.6.11 +PORTVERSION= 10.6.12 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= https://mirror.nodesdirect.com/${SITESDIR}/ \ @@ -266,6 +266,7 @@ post-install: ${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy \ ${STAGEDIR}${PREFIX}/include/mysql/server/private \ ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig \ + ${STAGEDIR}${PREFIX}/libexec/rcmysql \ ${STAGEDIR}/suite \ ${STAGEDIR}${ETCDIR}/init.d \ ${STAGEDIR}${ETCDIR}/logrotate.d \ diff --git a/databases/mariadb106-server/distinfo b/databases/mariadb106-server/distinfo index f1bc2c18198b..e96a17eea53d 100644 --- a/databases/mariadb106-server/distinfo +++ b/databases/mariadb106-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1669463174 -SHA256 (mariadb-10.6.11.tar.gz) = 5784ba4c5d8793badba58348576824d9849ec152e9cbee47a1765161d840c94a -SIZE (mariadb-10.6.11.tar.gz) = 94742041 +TIMESTAMP = 1675594941 +SHA256 (mariadb-10.6.12.tar.gz) = 3ed2eb7429c2fae5423ca55c661742d107e35246f1ab0c107096f0c4b839463a +SIZE (mariadb-10.6.12.tar.gz) = 95085449 diff --git a/databases/mariadb106-server/files/patch-scripts_mysql__config.sh b/databases/mariadb106-server/files/patch-scripts_mysql__config.sh index f8321be63ecc..31b54bf148c5 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="$embedded_libs -%%LOCALBASE%%/lib " ++embedded_libs="-L$embedded_libs -%%LOCALBASE%%/lib " include="-I$pkgincludedir" if [ "$basedir" != "/usr" ]; then diff --git a/databases/mariadb106-server/pkg-plist b/databases/mariadb106-server/pkg-plist index 748c0e8dcb89..c1457ba63b3c 100644 --- a/databases/mariadb106-server/pkg-plist +++ b/databases/mariadb106-server/pkg-plist @@ -79,6 +79,7 @@ include/mysql/server/little_endian.h include/mysql/server/m_ctype.h include/mysql/server/m_string.h include/mysql/server/ma_dyncol.h +include/mysql/server/mariadb_capi_rename.h include/mysql/server/my_alloc.h include/mysql/server/my_attribute.h include/mysql/server/my_byteorder.h @@ -212,7 +213,6 @@ lib/mysql/plugin/type_test.so lib/mysql/plugin/zstd.so libexec/mariadbd libexec/mysqld -libexec/rcmysql @comment share/man/man1/aria_chk.1.gz @comment share/man/man1/aria_dump_log.1.gz @comment share/man/man1/aria_ftdump.1.gz