From nobody Tue May 24 15:49:53 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 928A21AEA619; Tue, 24 May 2022 15:49:53 +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 4L6zD13JRjz4tqF; Tue, 24 May 2022 15:49:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653407393; 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=ez1R2xZxQEoDZXdR1VO4iV582diRblov9qGUH2t8jWo=; b=sRh0Tr2BPFvGFajabhzARM99rxxMOlcGF9Y7jNO/mUfFgJknz1GsxT08uhB6Oo4nQM7Jvx uDrpxIpJ99mbtu+H4KPQ371WGq63muhrnbEw/1w6ef50AtHv4LcAyugpDJa+l2DuVx1VP+ y6eTwZV33r62wUGZDO6lAtdrF8hJb5/VKtQ7DRABhZ3OAT0Vglgj8fd0DwmJGXb37EqCdo cwbN9U374VeAFbsmT27lq/EEk1ntfkOOhHYEjD9WMKXbaw4EVuBkM4h03pwlhKwaMI6GtM +F8UKKHx5kyaYCdH0inkUR9aXH4w1u6EndnYXba0tq1FetwbNT45VMLJbvZclQ== 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 4738727680; Tue, 24 May 2022 15:49:53 +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 24OFnrhe015476; Tue, 24 May 2022 15:49:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24OFnr1e015475; Tue, 24 May 2022 15:49:53 GMT (envelope-from git) Date: Tue, 24 May 2022 15:49:53 GMT Message-Id: <202205241549.24OFnr1e015475@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: 394caeee0711 - 2022Q2 - databases/mariadb105-server: Security update to 10.5.16 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: 394caeee071133239580dcfae79b1d678269a86d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653407393; 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=ez1R2xZxQEoDZXdR1VO4iV582diRblov9qGUH2t8jWo=; b=G/q5AnZTJHXYmEuhOwmlDvnkLz9F7D2S7wcZSprsvFNRDoJDD1u8W4MjFFVPeKFMHchI4V 2+mkP+1E2I8hMmqaqXdL5z1vWaC1gwSjV5GHsdvKw0hyIuKhbnpq1deMGHqB0RX32TYGH5 xrTJzxK4qY3lekNTQG1/Pr1TeMua4FIkJL0Or2FHGL/7fJXa7bMCEYPIi968Fyq1Tg07Z6 0PbFyfIwpYZY57kPSmPN9fwUSJTLV0v6CbfOTZYRcDsQQ2CET/AzjIVxtJb+ZAFTr7FkiX 8VUExEL8vD+nkZO4Pwu6QAQ+hzjAY5rvBIeBDyetV6HGh1rj4WDMhFVUOyMmiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653407393; a=rsa-sha256; cv=none; b=o78FZjDnrvCa201oCdzxBp++EJL7Sx9nTShYtcjvrogR89AoqzyIw7KCYVWeZYch1jJTJW jwDSO7XrYx/XUauq4bJJPt3kNoF/l4Lm92u2yRDKs3UK5oxwULJf0pgbOU6klZLHbouRvN areYxgjPBtUyq+PvuW7KQmls3gDY/sCYI8qJ8uioX4ayzCsI4x9dyLqjlk49LEPHXI2qgQ CvOVjYapDKRfdQt84nFt5oqfUwcRBNDTMAFGVgDvXhaMWGDz+jg5BIFz9P2bXR2DYtkQf4 NC1EmOLbQq/R19hXkb0IKQytOm1CqALkywkyRNesBlvFlgElFYATkx1hfzW12w== 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=394caeee071133239580dcfae79b1d678269a86d commit 394caeee071133239580dcfae79b1d678269a86d Author: Bernard Spil AuthorDate: 2022-05-24 12:47:20 +0000 Commit: Bernard Spil CommitDate: 2022-05-24 15:49:32 +0000 databases/mariadb105-server: Security update to 10.5.16 Security: 04fecc47-dad2-11ec-8fbd-d4c9ef517024 MFH: 2022Q2 (cherry picked from commit 17d4dfa6889d9899bd2b938bd45ea5d2238b6da3) --- databases/mariadb105-server/Makefile | 24 ++++++++++++++-------- databases/mariadb105-server/distinfo | 6 +++--- .../files/patch-scripts_wsrep__sst__mariabackup.sh | 11 ---------- databases/mariadb105-server/pkg-plist | 3 +++ 4 files changed, 21 insertions(+), 23 deletions(-) diff --git a/databases/mariadb105-server/Makefile b/databases/mariadb105-server/Makefile index c24577943a5d..1504557ec493 100644 --- a/databases/mariadb105-server/Makefile +++ b/databases/mariadb105-server/Makefile @@ -1,16 +1,22 @@ # Created by: Bernard Spil PORTNAME?= mariadb -PORTVERSION= 10.5.15 -PORTREVISION?= 3 +PORTVERSION= 10.5.16 +PORTREVISION?= 0 CATEGORIES= databases -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}/ \ - 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?= 105-server MAINTAINER= brnrd@FreeBSD.org diff --git a/databases/mariadb105-server/distinfo b/databases/mariadb105-server/distinfo index ff789d036591..680786683170 100644 --- a/databases/mariadb105-server/distinfo +++ b/databases/mariadb105-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1644826126 -SHA256 (mariadb-10.5.15.tar.gz) = 8980ed37f870ce3217c3c7a1b223a8362c28f277afc4d0005d1a9f1256f7db59 -SIZE (mariadb-10.5.15.tar.gz) = 102803624 +TIMESTAMP = 1653332795 +SHA256 (mariadb-10.5.16.tar.gz) = c13e87258d9b70d5dcc8ce81c4d4b912bb775330a4c3bff74f1aab30693cd2a6 +SIZE (mariadb-10.5.16.tar.gz) = 105798374 diff --git a/databases/mariadb105-server/files/patch-scripts_wsrep__sst__mariabackup.sh b/databases/mariadb105-server/files/patch-scripts_wsrep__sst__mariabackup.sh deleted file mode 100644 index 0c2fb501b208..000000000000 --- a/databases/mariadb105-server/files/patch-scripts_wsrep__sst__mariabackup.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- scripts/wsrep_sst_mariabackup.sh.orig 2022-02-14 08:10:09 UTC -+++ scripts/wsrep_sst_mariabackup.sh -@@ -715,7 +715,7 @@ recv_joiner() - local ltcmd="$tcmd" - if [ $tmt -gt 0 ]; 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" - else - ltcmd="timeout -s9 $tmt $tcmd" diff --git a/databases/mariadb105-server/pkg-plist b/databases/mariadb105-server/pkg-plist index 42bfa4d8e6a8..93ad5a237622 100644 --- a/databases/mariadb105-server/pkg-plist +++ b/databases/mariadb105-server/pkg-plist @@ -49,6 +49,7 @@ bin/resolve_stack_dump bin/resolveip %%ROCKSDB%%bin/sst_dump @comment bin/test-connect-t +%%WSREP%%bin/wsrep_sst_backup %%WSREP%%bin/wsrep_sst_common %%WSREP%%bin/wsrep_sst_mariabackup %%WSREP%%bin/wsrep_sst_mysqldump @@ -270,6 +271,7 @@ man/man8/mariadbd.8.gz man/man8/mysqld.8.gz @comment share/aclocal/mysql.m4 %%DATADIR%%/binary-configure +%%DATADIR%%/bulgarian/errmsg.sys %%DATADIR%%/charsets/Index.xml %%DATADIR%%/charsets/README %%DATADIR%%/charsets/armscii8.xml @@ -296,6 +298,7 @@ man/man8/mysqld.8.gz %%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