From nobody Tue May 24 15:48:12 2022 X-Original-To: dev-commits-ports-branches@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 320251AEA015; Tue, 24 May 2022 15:48:13 +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 4L6zB50hlDz4t6t; Tue, 24 May 2022 15:48:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653407293; 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=+UQvVzRVFoxTjNVQjWOMwRPhGjTtVMyzPkUawJUVkmc=; b=cr4IyMuOEPnZZKjrYDF/ux/mmqIZlFg14EeVG/+dm93Bzu6L3iIlRJ1aQNeLVeuz7cRO0I geJ0EnD0009eGStwAOvfuT+wiVqrpXiCR7mSWZ4fQshcH6/EmpZoQvxCrpJXFqWvNUQWAA hrl9Xw7BJYlCCLhqYSfoJvs/nkfKvxVegMSFP40ZJK9O2YwFxb6h8CctgPYeeviq+JkwXf yOM1kMu9ts/OMdFY9iCGN//NCoXH+e2grjXuTYN+6eyf20W20j2FFFPAbCCmzijB/eXvDF 6QoctS+Ia7OxIsbXSgP98PGTHPCL7lZlhBYxcVCArak+vKu7f3Yb1snlg0x1nA== 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 ED5E8274B4; Tue, 24 May 2022 15:48:12 +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 24OFmCNS015123; Tue, 24 May 2022 15:48:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24OFmC7d015122; Tue, 24 May 2022 15:48:12 GMT (envelope-from git) Date: Tue, 24 May 2022 15:48:12 GMT Message-Id: <202205241548.24OFmC7d015122@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: 07f6288b0223 - 2022Q2 - databases/mariadb106-server: Security update to 10.6.8 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2022Q2 X-Git-Reftype: branch X-Git-Commit: 07f6288b0223291ccdc6b93edb64444914398173 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653407293; 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=+UQvVzRVFoxTjNVQjWOMwRPhGjTtVMyzPkUawJUVkmc=; b=VNaBSWMX5D/Annpujj0FHGyEqJYVLU27PBwxu1hMZm5ODTp8f9BnSd/14ddob0vgb3WWbN +f2+e9MZ8cGqbnUd+7bmJmkg8LodSTsAxe9taMYneE3FmdtNN115CROa0Cves6/nbIC7mq FVg8+8Bgb7Dg6zePyaDLbUljF9WsKFrasNLZhE85HV89fLv2nO1C7JQxqpdK5MFqz3B1jZ rPIHerSr29E1Re4BNFCs7wBJ46V/UiHs3ENh0DgGyp2AjYyGKWGlGF9iOo4B1JWnONdbEe XMgQYa1CQAAl9PxyElWq5ZW79VS8vohruQBhvt9sCbrrjacBVLTCl1HzrdnEJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653407293; a=rsa-sha256; cv=none; b=Y4a8sMYeDJgy/h5S2xV0OXDx+WFtRTYOnzvx4jsNRBLfJztWCgc3TQXQzLK8OkzSJxhaV7 SFTR+mDcCIio0SSNwNVm7sjaVm8n/n0jBIiLnEPwc2XHxIFheCiD9WUuRLBfOqjSTojeBB miohZYMabAJXw+wiVs5zxQ3Y4gchPusSNHe0jyD9GXsyJeZatPYsIl63upkUJerq+Px5LN 3ml4VLgcPSBs2GxwcDhoYCFZQL/tnjynaUCuerngMXB6auPfXgjXCIFyQnnVmGsxwzrjFs /FeZDKIZz8VM6WQgPDkhAL+KoyZm8HBqbvoHf3WqhWtra9PlYAc73rrhNN3irQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=07f6288b0223291ccdc6b93edb64444914398173 commit 07f6288b0223291ccdc6b93edb64444914398173 Author: Bernard Spil AuthorDate: 2022-05-23 20:18:04 +0000 Commit: Bernard Spil CommitDate: 2022-05-24 15:47:32 +0000 databases/mariadb106-server: Security update to 10.6.8 Security: 04fecc47-dad2-11ec-8fbd-d4c9ef517024 MFH: 2022Q2 (cherry picked from commit 6b0d6cbbfacf1e3a82847ef03df8d9e184318a77) --- databases/mariadb106-server/Makefile | 24 +++++++++++-------- databases/mariadb106-server/distinfo | 6 ++--- ...store_columnstore_utils_common_threadnaming.cpp | 28 +++++++++++----------- databases/mariadb106-server/pkg-plist | 3 +++ 4 files changed, 34 insertions(+), 27 deletions(-) diff --git a/databases/mariadb106-server/Makefile b/databases/mariadb106-server/Makefile index 52c6ce135ce9..7cd8ea6ef517 100644 --- a/databases/mariadb106-server/Makefile +++ b/databases/mariadb106-server/Makefile @@ -1,17 +1,21 @@ # Created by: Bernard Spil PORTNAME?= mariadb -PORTVERSION= 10.6.7 -PORTREVISION?= 3 +PORTVERSION= 10.6.8 +PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ - http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ - http://gd.tuwien.ac.at/db/${SITESDIR}/ \ - http://mirrors.fe.up.pt/pub/${SITESDIR}/ \ - http://mirror.de.gsnw.de:56431/${SITESDIR}/ \ - http://mirror.layerjet.com/${SITESDIR}/ \ - http://mirror.switch.ch/mirror/${SITESDIR}/ \ - http://ftp.osuosl.org/pub/${SITESDIR}/ +MASTER_SITES= https://mirror.nodesdirect.com/${SITESDIR}/ \ + https://mirror.one.com/${SITESDIR}/ \ + https://ftp.nluug.nl/db/${SITESDIR}/ \ + https://ftp.icm.edu.pl/pub/unix/database/${SITESDIR}/ \ + https://mirror.truenetwork.ru/${SITESDIR}/ \ + https://mirrors.aliyun.com/${SITESDIR}/ \ + https://ftp.ubuntu-tw.org/mirror/${SITESDIR}/ \ + https://mirror.kku.ac.th/${SITESDIR}/ \ + https://espejito.fder.edu.uy/${SITESDIR}/ \ + https://mirror1.cl.netactuate.com/${SITESDIR}/ \ + https://ftp.osuosl.org/pub/${SITESDIR}/ \ + https://downloads.mariadb.org/rest-api/mariadb/${PORTVERSION}/ PKGNAMESUFFIX?= 106-server MAINTAINER= brnrd@FreeBSD.org diff --git a/databases/mariadb106-server/distinfo b/databases/mariadb106-server/distinfo index f825cab9228e..3d6ae5474293 100644 --- a/databases/mariadb106-server/distinfo +++ b/databases/mariadb106-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1645292669 -SHA256 (mariadb-10.6.7.tar.gz) = 75ee0f1f865a765fc461ab165419417a719e308faba784b2c97ecbe9e4b4b2c5 -SIZE (mariadb-10.6.7.tar.gz) = 85882896 +TIMESTAMP = 1653247917 +SHA256 (mariadb-10.6.8.tar.gz) = 57a9488559ccbdfb8506b781089a7a08d8e0e1b647cffb8f2706af06f69ed438 +SIZE (mariadb-10.6.8.tar.gz) = 88794744 diff --git a/databases/mariadb106-server/files/patch-storage_columnstore_columnstore_utils_common_threadnaming.cpp b/databases/mariadb106-server/files/patch-storage_columnstore_columnstore_utils_common_threadnaming.cpp index da71156da758..26ea3d16ecd7 100644 --- a/databases/mariadb106-server/files/patch-storage_columnstore_columnstore_utils_common_threadnaming.cpp +++ b/databases/mariadb106-server/files/patch-storage_columnstore_columnstore_utils_common_threadnaming.cpp @@ -1,24 +1,24 @@ ---- storage/columnstore/columnstore/utils/common/threadnaming.cpp.orig 2021-08-04 18:07:21 UTC +--- storage/columnstore/columnstore/utils/common/threadnaming.cpp.orig 2022-05-18 08:34:17 UTC +++ storage/columnstore/columnstore/utils/common/threadnaming.cpp @@ -22,13 +22,21 @@ namespace utils { - void setThreadName(const char *threadName) - { + void setThreadName(const char* threadName) + { +#ifdef __FreeBSD__ -+ pthread_set_name_np(pthread_self(), threadName); ++ pthread_set_name_np(pthread_self(), threadName); +#else - prctl(PR_SET_NAME, threadName, 0, 0, 0); + prctl(PR_SET_NAME, threadName, 0, 0, 0); +#endif - } + } - std::string getThreadName() - { - char buf[32]; + std::string getThreadName() + { + char buf[32]; +#ifdef __FreeBSD__ -+ pthread_get_name_np(pthread_self(), buf, sizeof(buf)); ++ pthread_get_name_np(pthread_self(), buf, sizeof(buf)); +#else - prctl(PR_GET_NAME, buf, 0, 0, 0); + prctl(PR_GET_NAME, buf, 0, 0, 0); +#endif - return std::string(buf); - } - } // end of namespace + return std::string(buf); + } + } // namespace utils diff --git a/databases/mariadb106-server/pkg-plist b/databases/mariadb106-server/pkg-plist index 6bb2ac4797c9..8dc19025abb9 100644 --- a/databases/mariadb106-server/pkg-plist +++ b/databases/mariadb106-server/pkg-plist @@ -54,6 +54,7 @@ bin/test-connect-t %%WSREP%%bin/wsrep_sst_mysqldump %%WSREP%%bin/wsrep_sst_rsync %%WSREP%%bin/wsrep_sst_rsync_wan +%%WSREP%%bin/wsrep_sst_backup @comment %%ETCDIR%%/conf.d/client.cnf %%ETCDIR%%/conf.d/enable_encryption.preset %%ETCDIR%%/conf.d/mysql-clients.cnf @@ -274,6 +275,7 @@ share/aclocal/mysql.m4 %%MROONGA%%share/groonga-normalizer-mysql/README.md %%MROONGA%%share/groonga-normalizer-mysql/lgpl-2.0.txt %%DATADIR%%/binary-configure +%%DATADIR%%/bulgarian/errmsg.sys %%DATADIR%%/charsets/Index.xml %%DATADIR%%/charsets/README %%DATADIR%%/charsets/armscii8.xml @@ -300,6 +302,7 @@ share/aclocal/mysql.m4 %%DATADIR%%/charsets/macce.xml %%DATADIR%%/charsets/macroman.xml %%DATADIR%%/charsets/swe7.xml +%%DATADIR%%/chinese/errmsg.sys %%DATADIR%%/czech/errmsg.sys %%DATADIR%%/danish/errmsg.sys %%DATADIR%%/dutch/errmsg.sys