From nobody Tue May 24 15:54:33 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 BD6F41AEBF71; Tue, 24 May 2022 15:54:34 +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 4L6zKQ1DSCz4vwj; Tue, 24 May 2022 15:54:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653407674; 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=lOoDFMZIwAb1lQ9NyC9/MuPwcHYMPrTZIaseGgFVc1c=; b=V3Q4TJMGPuddcqR67qEQA++QVe/V5JQaS2ninDz0UnRl9ZlswJw/ntPLwAJlTdU4e1iW0e hHx9Kt2XnqsEn8JOxd4CUtwX9y12elM33HilGQ8LeZAWnhph0W++WnKp6mUsvQOn6sq+aF 7dV7HE8eSkA3NyTT+mT4Npg1x2Pvh1WgKUIwjtlgIoPCVd0LsXgG9qavsFtfU63vYNjiLU j+/vRrGgTZFGY3+/lqZNak9H3PbUakfyitpd3/HXBhfltaLZXLJWWeWLJWiz6iMf/1rFoG F33x1PGwngeCMBe82Z/DMFtbedJHceWTfSiN4E/39YmSY/Ae8OhNMQmzJmRo4w== 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 C6EAF26E7C; Tue, 24 May 2022 15:54:33 +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 24OFsXhV028528; Tue, 24 May 2022 15:54:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24OFsXjg028527; Tue, 24 May 2022 15:54:33 GMT (envelope-from git) Date: Tue, 24 May 2022 15:54:33 GMT Message-Id: <202205241554.24OFsXjg028527@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: 403d9a8d740d - 2022Q2 - databases/mariadb104-server: Security update to 10.4.25 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: 403d9a8d740dc8f8ff234c4a8ac93dc43e4eacc1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653407674; 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=lOoDFMZIwAb1lQ9NyC9/MuPwcHYMPrTZIaseGgFVc1c=; b=rsHVWX5A3zYpBnBZ9VuPCGcFbWN4Jv1v2OKY4L3To+OT26LbvqHUW5oqrtTicbO0nBuFdM 6S7H/RLpGvYJUwlVNabtucorORV1ShNz/Bc4NVXSjGht3qtQExM/j9M9cbaBLwpw7ah3QX 5vparyFLMWsCHXDUp61h7w09ZqFW+Q6z9gL7TxXDVobTQgu0zcHs1OnKDChfpqvV1N0kZK BDGTZ9KbU9+P+qhOgXNQJIxK7lJC1zvzDainAwhqElD9Ayl4r9ypzoCh8SC+IfKmYh2HfD oVnLq/1WjFWcr9nlVuo2JcFBFtCtwE/qa3NNHtJ1xkvnxO3yJf/0kWnD9OagmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653407674; a=rsa-sha256; cv=none; b=sbOX451s3vPvgt6YKeZ5XiizUhiuztIFzbqjLP6Pkhr9pv5LPGpnjKYPDNBFhjdaj1mYQ0 g8escNzdwdY5bf+17lLLL4ljpziL7kTBIdoJsOgEcfm/eL6kCc/rOoU6eou1L0SedhlMYB Cp+9hTbZwMu19MoR9/cWSCv+/EF3hvil1hsPsZ6XolECxv2CTsyOiLUnMzQ2hS0K4BgLvk yk3Db5SVS0BkMZc/EL6OeHN2eCxPP3Zp+/d74HO/1XyskQ3HQQepLkpc+Cex4iIpRlKdJp Bb6vosxRMdPRhnW9NukGJWadQI7dgg8WGqNznABYNZc8jVwg007LrZ9PE0MQxQ== 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=403d9a8d740dc8f8ff234c4a8ac93dc43e4eacc1 commit 403d9a8d740dc8f8ff234c4a8ac93dc43e4eacc1 Author: Bernard Spil AuthorDate: 2022-05-24 14:43:33 +0000 Commit: Bernard Spil CommitDate: 2022-05-24 15:51:06 +0000 databases/mariadb104-server: Security update to 10.4.25 Security: 04fecc47-dad2-11ec-8fbd-d4c9ef517024 MFH: 2022Q2 (cherry picked from commit be54a31d4abb841c61e50f2478ec2127dcb18e75) --- databases/mariadb104-server/Makefile | 24 +++++++++++++--------- databases/mariadb104-server/distinfo | 6 +++--- .../files/patch-scripts_wsrep__sst__mariabackup.sh | 8 ++++---- databases/mariadb104-server/pkg-plist | 3 +++ 4 files changed, 24 insertions(+), 17 deletions(-) diff --git a/databases/mariadb104-server/Makefile b/databases/mariadb104-server/Makefile index d55d7a7b671f..c140b714813f 100644 --- a/databases/mariadb104-server/Makefile +++ b/databases/mariadb104-server/Makefile @@ -1,17 +1,21 @@ # Created by: Bernard Spil PORTNAME?= mariadb -PORTVERSION= 10.4.24 -PORTREVISION?= 3 +PORTVERSION= 10.4.25 +PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= http://ftp.nluug.nl/db/${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?= 104-server MAINTAINER= brnrd@FreeBSD.org diff --git a/databases/mariadb104-server/distinfo b/databases/mariadb104-server/distinfo index 28d88b848050..822ff7862035 100644 --- a/databases/mariadb104-server/distinfo +++ b/databases/mariadb104-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1645092859 -SHA256 (mariadb-10.4.24.tar.gz) = fe975551b37f095640ea5e380eb896a37e331caf113dbe5d05564714338df846 -SIZE (mariadb-10.4.24.tar.gz) = 85669405 +TIMESTAMP = 1653396574 +SHA256 (mariadb-10.4.25.tar.gz) = ff963c4e11bc06b775f66f2b1ddef184996208fb4b23cfdb50d95fb02eaa7ef8 +SIZE (mariadb-10.4.25.tar.gz) = 88680777 diff --git a/databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh b/databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh index 3e3d42812b67..0b4dc528c293 100644 --- a/databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh +++ b/databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh @@ -1,11 +1,11 @@ ---- scripts/wsrep_sst_mariabackup.sh.orig 2022-02-17 10:18:49 UTC +--- scripts/wsrep_sst_mariabackup.sh.orig 2022-05-24 12:49:43 UTC +++ scripts/wsrep_sst_mariabackup.sh -@@ -715,7 +715,7 @@ recv_joiner() +@@ -725,7 +725,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 +- if timeout --help | grep -qw -F -- '-k'; then ++ if timeout --help 2>&1 | grep -qw -F -- '-k'; then ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd" else ltcmd="timeout -s9 $tmt $tcmd" diff --git a/databases/mariadb104-server/pkg-plist b/databases/mariadb104-server/pkg-plist index 7a65cd836c1d..34e0809f8d96 100644 --- a/databases/mariadb104-server/pkg-plist +++ b/databases/mariadb104-server/pkg-plist @@ -48,6 +48,7 @@ bin/resolveip @comment bin/test-connect-t %%TOKUDB%%bin/tokuft_logprint %%TOKUDB%%bin/tokuftdump +%%WSREP%%bin/wsrep_sst_backup %%WSREP%%bin/wsrep_sst_common %%WSREP%%bin/wsrep_sst_mariabackup %%WSREP%%bin/wsrep_sst_mysqldump @@ -244,6 +245,7 @@ man/man1/resolveip.1.gz man/man8/mariadbd.8.gz man/man8/mysqld.8.gz %%DATADIR%%/binary-configure +%%DATADIR%%/bulgarian/errmsg.sys %%DATADIR%%/charsets/Index.xml %%DATADIR%%/charsets/README %%DATADIR%%/charsets/armscii8.xml @@ -270,6 +272,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