From nobody Sat Feb 19 13:05:58 2022 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 EBA6519DEE62; Sat, 19 Feb 2022 13:05:58 +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 4K182G6Hykz4TtN; Sat, 19 Feb 2022 13:05:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645275958; 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=pYMRlqRcTGvKY1YY7X26gNTuCuExEL5Xacwo1hWbV6c=; b=xKbDxyVHN2RyXIgLK9DbNIoD6VtZFYATaRosZx/6eBPtfra8MfaBa9JJjBQFgO1c4j2r2A YAuWqIgzF/UjH951pQXOoNn94vevZAJw1oiXxAWzRqEAmAnCZfrB+7MXyCpKNoMemesPYY /KoIoC3C+NN+CdwarRPwr9yTzk5rNOgoYqCRWo6jwgyGrks64FDJ+btF66SOiosDpaj+vZ Eem54uNhSP9JQFIvh0BSw44RKzIkzHoF8U3U3k98a0w2N3ckSzlT58dW5KEhMKTpDjyEKO kVaNazRrz5M9imQHcext2UT2vuxYnYorEPIkPwfvuj2kn8xET7II4fmolxHgiw== 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 AAA9515AD; Sat, 19 Feb 2022 13:05:58 +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 21JD5wxQ063206; Sat, 19 Feb 2022 13:05:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21JD5wm2063205; Sat, 19 Feb 2022 13:05:58 GMT (envelope-from git) Date: Sat, 19 Feb 2022 13:05:58 GMT Message-Id: <202202191305.21JD5wm2063205@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: c5990d4968fa - 2022Q1 - databases/mariadb105-server: Security update to 10.5.15 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/2022Q1 X-Git-Reftype: branch X-Git-Commit: c5990d4968fa9eda882901fd921b1b1be5f8545a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645275958; 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=pYMRlqRcTGvKY1YY7X26gNTuCuExEL5Xacwo1hWbV6c=; b=s3+oaaEuouEhMEL5lsA69uZgAU2owGn8kc8ItyFYFkMjS08Ug4thJwZtVGvm/4zxe8VTKY R6OCCGjstM5FvwE54SSYkwBRJtMwfcukupPVRoKPnvDSDrpoX0AcAGR1KXJLpAvwtrMyUy FSKvEgRt7Igc2TlWDH0RufcItyL9ziitbnKpqb3uyI2syE7RfZ7DdWFYMOwPOp5peXf8OR ioyUybNDw5yLWnoAJZh5WNeJ7S54+aP55HYwhoX+XBTO5ABW9UuCuIpgKmmV7thYE9Gku5 q4/Cm0Qy5EHur/658L72owSYoZIDO/bi07i+3vW6Ng5B0Jnh5axlDwWofR/89w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645275958; a=rsa-sha256; cv=none; b=CsjvGZI6xYxZbnaeJOXRDcMjYzTUjqh8G+e4RG4d9TfLrphVsT6bdqy1nc6wxuuzPsgbPW Z1g6b1hDAre3/aMmqOp+5nrSEEHSTuvRlICU4mQY5e1adWhoczNf2JkvFoSC9dTm9ahOrJ wRU7ztSak209doKqdiGviuxZ4G7fQUJM3Qr9gdm/y/EQrhJBfj81a1c6xK7dJi/glnfeE0 gge1ERc+HGF1wOnNBsVeGPBb7SN3MvHEXEtkA7qllfPgnq7JWhQVecAZFdKF80cBB4WPMd Iz3NHvKG6ZXWIfvOSoO/yjx7sbzPoxYY8zXryr+1czCl0ASBSWfVF+InToAN7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=c5990d4968fa9eda882901fd921b1b1be5f8545a commit c5990d4968fa9eda882901fd921b1b1be5f8545a Author: Bernard Spil AuthorDate: 2022-02-15 11:47:37 +0000 Commit: Bernard Spil CommitDate: 2022-02-19 13:05:21 +0000 databases/mariadb105-server: Security update to 10.5.15 security: ff5606f7-8a45-11ec-8be6-d4c9ef517024 MFH: 2022Q1 (cherry picked from commit 4e7a17eee56a05ef998bf35a17453da5b6c96c8b) --- databases/mariadb105-client/pkg-plist | 1 + databases/mariadb105-server/Makefile | 5 ++--- databases/mariadb105-server/distinfo | 6 +++--- .../files/patch-scripts_wsrep__sst__mariabackup.sh | 6 +++--- databases/mariadb105-server/pkg-plist | 1 + 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/databases/mariadb105-client/pkg-plist b/databases/mariadb105-client/pkg-plist index 1e24b40d271a..01ecd70b93c6 100644 --- a/databases/mariadb105-client/pkg-plist +++ b/databases/mariadb105-client/pkg-plist @@ -66,6 +66,7 @@ include/mysql/mysql/plugin_auth.h include/mysql/mysql/plugin_auth_common.h include/mysql/mysqld_error.h %%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so +lib/mysql/libmariadb.a lib/mysql/libmariadb.so lib/mysql/libmariadb.so.3 lib/mysql/libmariadbclient.a diff --git a/databases/mariadb105-server/Makefile b/databases/mariadb105-server/Makefile index a5e8c48668ad..1145faf77529 100644 --- a/databases/mariadb105-server/Makefile +++ b/databases/mariadb105-server/Makefile @@ -1,11 +1,10 @@ # Created by: Bernard Spil PORTNAME?= mariadb -PORTVERSION= 10.5.13 +PORTVERSION= 10.5.15 PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ - http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ +MASTER_SITES= 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}/ \ diff --git a/databases/mariadb105-server/distinfo b/databases/mariadb105-server/distinfo index c5d7eddf1096..ff789d036591 100644 --- a/databases/mariadb105-server/distinfo +++ b/databases/mariadb105-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1636446066 -SHA256 (mariadb-10.5.13.tar.gz) = 16f008c66831130e9263b2601265d566ffc4e890d37bacecd4dcecebfd0d1c58 -SIZE (mariadb-10.5.13.tar.gz) = 102047279 +TIMESTAMP = 1644826126 +SHA256 (mariadb-10.5.15.tar.gz) = 8980ed37f870ce3217c3c7a1b223a8362c28f277afc4d0005d1a9f1256f7db59 +SIZE (mariadb-10.5.15.tar.gz) = 102803624 diff --git a/databases/mariadb105-server/files/patch-scripts_wsrep__sst__mariabackup.sh b/databases/mariadb105-server/files/patch-scripts_wsrep__sst__mariabackup.sh index 291b11edadbe..0c2fb501b208 100644 --- a/databases/mariadb105-server/files/patch-scripts_wsrep__sst__mariabackup.sh +++ b/databases/mariadb105-server/files/patch-scripts_wsrep__sst__mariabackup.sh @@ -1,9 +1,9 @@ ---- scripts/wsrep_sst_mariabackup.sh.orig 2021-06-24 09:33:04 UTC +--- scripts/wsrep_sst_mariabackup.sh.orig 2022-02-14 08:10:09 UTC +++ scripts/wsrep_sst_mariabackup.sh -@@ -696,7 +696,7 @@ recv_joiner() +@@ -715,7 +715,7 @@ recv_joiner() local ltcmd="$tcmd" if [ $tmt -gt 0 ]; then - if [ -n "$(command -v timeout)" ]; then + if [ -n "$(commandex timeout)" ]; then - if timeout --help | grep -qw -- '-k'; then + if timeout --help 2>&1 | grep -qw -- '-k'; then ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd" diff --git a/databases/mariadb105-server/pkg-plist b/databases/mariadb105-server/pkg-plist index 2e6f8dd92eb7..42bfa4d8e6a8 100644 --- a/databases/mariadb105-server/pkg-plist +++ b/databases/mariadb105-server/pkg-plist @@ -163,6 +163,7 @@ include/mysql/server/sslopt-case.h include/mysql/server/sslopt-longopts.h include/mysql/server/sslopt-vars.h include/mysql/server/typelib.h +@comment lib/mysql/libmariadb.a @comment lib/mysql/libmariadbclient.a lib/mysql/libmariadbd.a lib/mysql/libmariadbd.so