From nobody Tue May 24 15:54:34 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 85BFA1AEC134; Tue, 24 May 2022 15:54:35 +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 4L6zKR10pXz4vbb; Tue, 24 May 2022 15:54:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653407675; 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=RSjaPtIF8dvITTiJrrZP+nHszejg+jGceauU1T9hAFE=; b=LHWZ4fwcSrA0TspfjApEpvac5xiFhk7O2Ijmb4kUOcBPRxqs4YW4liDcgnkBHuJYvhfeh5 A42p68oPLKbJc9e/Iedm4ZWhwpMQx17Q4q2GwLAcqOMwuDpWk4gwc/EnVa9qe7ip8g+W3O h1Otpa6LBSjAH7aG6xZgZeotqEOb3nSMiPpTzxBpEcmoAH3tbp2F7teSausKYyLUPVuZds r1Asrr7XYSVpTI3ISWEoKXOti78dHnUwwZ2Vl8IWVGFk1qTw+djQdddKWUWb0f4a9QvDYP 8hihXVCC8oZvvF9f87MAWP/U8CXPdYs8I7c2Oagb0EJXujzxd3pyqhHaW0zCSw== 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 EA3F627653; Tue, 24 May 2022 15:54:34 +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 24OFsYm1028552; Tue, 24 May 2022 15:54:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24OFsYW7028551; Tue, 24 May 2022 15:54:34 GMT (envelope-from git) Date: Tue, 24 May 2022 15:54:34 GMT Message-Id: <202205241554.24OFsYW7028551@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: f194935cd9b9 - 2022Q2 - databases/mariadb103-server: Security update to 10.3.35 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: f194935cd9b9c0b5aa196b4e8a0b7fcd1dc3fd65 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653407675; 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=RSjaPtIF8dvITTiJrrZP+nHszejg+jGceauU1T9hAFE=; b=q78uJ2URuYE+QrFeoY+F6Y06xwiuEZxC+Gxbfz+g9YpUjnom/R74uHDTrn5M/Da7f+ic3z ZE/fqsNk2kQr6FNV8AmGV2B7C7olJytk1+j0Ile12FhPBN5/LzlZeMYMxoh/YG+7gi9deX UeRO0gLb5rGpwV+gmkw0Vqw1tRbhT6uREg77y9cYD7IoScTLMAnNU3k5qpi0mz5edcW430 rg5JAvcgXTVAizC9a4Ul0xJyr9j8Egtcc46NO5PZTRfDKWwiWIyW5iYbiI2978fOqHlzqK 7GZkAyzLmpaLQcImp/6LrJlMXaAFxFW8Diy9apIqhiTKRoVIismWQzr6qRbKLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653407675; a=rsa-sha256; cv=none; b=Vf+D5KB2wPymxQPbqqWLQ5/VrCK3hn2r1GqVEyTeMAhk/Ird8MW3ykw14O/hvMkb5/CRku NmY3PTyYsjrGVewRoymoF99dR1zuDcRiQj0yv7acBKfWaF1wH4gZNp8RMjtcXLjvIsQW8P 9qTOGx6F4Texdd1GxxQk+tFPjV5Xz6/ZOLgi/7wFv3yF0A2qH1i4ZEysOMTDuU+mujUZCr nNG9VHONLGMA+hRYVTGUNGi2KohMTG+BApPKgkTf8wqe0G91kUGzhkM1GrxIcQMRoHg0WB 67PZOT+QJl2NJu5yh0LSnjplL2ZSExyxJFSjZAnoXWi9w5Zvv1lsUxJ4aG87hw== 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=f194935cd9b9c0b5aa196b4e8a0b7fcd1dc3fd65 commit f194935cd9b9c0b5aa196b4e8a0b7fcd1dc3fd65 Author: Bernard Spil AuthorDate: 2022-05-24 15:40:12 +0000 Commit: Bernard Spil CommitDate: 2022-05-24 15:54:25 +0000 databases/mariadb103-server: Security update to 10.3.35 PR: 264170 Submitted by: Vincent Jancso Security: 04fecc47-dad2-11ec-8fbd-d4c9ef517024 MFH: 2022Q2 (cherry picked from commit 6202520020d9c4f553a2c522a8004521dfa20418) --- databases/mariadb103-server/Makefile | 24 +++++++++++++--------- databases/mariadb103-server/distinfo | 6 +++--- .../files/patch-scripts_wsrep__sst__mariabackup.sh | 8 ++++---- databases/mariadb103-server/pkg-plist | 1 + 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/databases/mariadb103-server/Makefile b/databases/mariadb103-server/Makefile index 3f1cd3808b50..d2291a6fcf6b 100644 --- a/databases/mariadb103-server/Makefile +++ b/databases/mariadb103-server/Makefile @@ -1,17 +1,21 @@ # Created by: Bernard Spil PORTNAME?= mariadb -PORTVERSION= 10.3.34 -PORTREVISION?= 3 +PORTVERSION= 10.3.35 +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?= 103-server MAINTAINER= brnrd@FreeBSD.org diff --git a/databases/mariadb103-server/distinfo b/databases/mariadb103-server/distinfo index 0531466b9f73..85dd7e89a589 100644 --- a/databases/mariadb103-server/distinfo +++ b/databases/mariadb103-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1645042460 -SHA256 (mariadb-10.3.34.tar.gz) = 7b7013448519d20590ec90eac54ca54e9ac9c4b7d90eaacb7451650e38be0627 -SIZE (mariadb-10.3.34.tar.gz) = 73455446 +TIMESTAMP = 1653403585 +SHA256 (mariadb-10.3.35.tar.gz) = 89a67dbb3f386533d393859106a61d1bca5eea9d9dc89e217e8d094ebc5109db +SIZE (mariadb-10.3.35.tar.gz) = 73496487 diff --git a/databases/mariadb103-server/files/patch-scripts_wsrep__sst__mariabackup.sh b/databases/mariadb103-server/files/patch-scripts_wsrep__sst__mariabackup.sh index 74b1efd3cb67..7f3ea98f52e1 100644 --- a/databases/mariadb103-server/files/patch-scripts_wsrep__sst__mariabackup.sh +++ b/databases/mariadb103-server/files/patch-scripts_wsrep__sst__mariabackup.sh @@ -1,11 +1,11 @@ ---- scripts/wsrep_sst_mariabackup.sh.orig 2022-02-16 20:18:40 UTC +--- scripts/wsrep_sst_mariabackup.sh.orig 2022-05-24 14:46:36 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/mariadb103-server/pkg-plist b/databases/mariadb103-server/pkg-plist index 1fc101501ad0..2911a72f9f0d 100644 --- a/databases/mariadb103-server/pkg-plist +++ b/databases/mariadb103-server/pkg-plist @@ -44,6 +44,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