From nobody Tue May 24 14:39:01 2022 X-Original-To: dev-commits-ports-main@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 202D31B42745; Tue, 24 May 2022 14:39:02 +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 4L6xfG0MXqz4hlM; Tue, 24 May 2022 14:39:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653403142; 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=8wewSVgvFtbKdXYhNLW5JdXcgiG4piesx57Z7M7JCAE=; b=UMRQ5WKYH+bPz8c3s0Yfd6vnO75JvcCuQRTjA6xv0JDJa0bTrigaIcjNnZmz8/O5sXnSsT vFf9JltXeWGUgbVMgK2aeyhS3W9HxwK/9L4hNyVL3qWIBGiZqmGeOWXWBuNCdkunc9wRj7 JYhSA4o/3JDhSgXgiWs8y/Fc2xFgtalJiKQ182oV1T82l1z94kGoqJUUddX1FXB7n9hrOo 8YIO0mGAt9VpQoYGguCCKYwcvC2v0zlZgpONMersPd5HCvd9Gb0qktmCUbe9AfnB7wixLG DZ1aXG1/raYzOO79aXvVUvU8o+RGyEMdefM5QmE5OW/eaadih00vKbYWbqX1Ew== 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 E0C7326528; Tue, 24 May 2022 14:39:01 +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 24OEd1RA020477; Tue, 24 May 2022 14:39:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24OEd1lU020476; Tue, 24 May 2022 14:39:01 GMT (envelope-from git) Date: Tue, 24 May 2022 14:39:01 GMT Message-Id: <202205241439.24OEd1lU020476@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: 17d4dfa6889d - main - databases/mariadb105-server: Security update to 10.5.16 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 17d4dfa6889d9899bd2b938bd45ea5d2238b6da3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653403142; 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=8wewSVgvFtbKdXYhNLW5JdXcgiG4piesx57Z7M7JCAE=; b=v4pSAMuNBg6Ze5qI3Dj2hE8TczdU4SUt4cYevH27cL375d1vvS9rw/9MJkcvKEafcTOVLr riPVEwhzn66QzJSwb6UrxHDHpCdqu1poAWI+8H+o0nAIQJ3COKYejyZ6UDka+/ZcWCla8E sTpHUKI9lLKUtxPcvuuNciQ3NlJh5LMMmVhi7b1XXJ8DTirggHCxlHOm/k77JWMGezpdHH X9x6Cg0hzP/smuUaGLC/9GrYLlhFHJcdpbpBZyGf3nPHvOyExT86TJNuI2Xt8nwTG05fns tQUsIcc56WafaTy4T2+fDyfC5lxIbT40DszgGCRifnvMD9Hsui/vatnXMNpDSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653403142; a=rsa-sha256; cv=none; b=gnx8hmn1JpVR4ZscjIrpCTOYgL4onWcpQcVQI6oKSRu58hU9Ex9YAhKLQWjMpuEbRBtkpK WMpbCNKD13hu9zglMLEg05x4rF1u6xNTr/M4K7fi18zfQYPunm9/9DWq6Bzy7/eCPHKBTU C0Wkk+0XEuUiE34MC7OUDbQhB3bY93gnfis+ALqeuQbIslZXt36BhTXQsBhWGmxwcuZKcf auCnkLSC4iOH2QLQsCFX669/DGIV76nVzrbaEfAlkL+AK+skSIVlT/v5YFBCGDghYxELjO yVxnAksmHNGKJALi1WIwRjzgXehkM7DywWqvHuSR2jAPEf7sZszBUywrujsMJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=17d4dfa6889d9899bd2b938bd45ea5d2238b6da3 commit 17d4dfa6889d9899bd2b938bd45ea5d2238b6da3 Author: Bernard Spil AuthorDate: 2022-05-24 12:47:20 +0000 Commit: Bernard Spil CommitDate: 2022-05-24 14:38:32 +0000 databases/mariadb105-server: Security update to 10.5.16 Security: 04fecc47-dad2-11ec-8fbd-d4c9ef517024 MFH: 2022Q2 --- databases/mariadb105-server/Makefile | 9 +++++---- databases/mariadb105-server/distinfo | 6 +++--- .../files/patch-scripts_wsrep__sst__mariabackup.sh | 11 ----------- databases/mariadb105-server/pkg-plist | 3 +++ 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/databases/mariadb105-server/Makefile b/databases/mariadb105-server/Makefile index 15656e403f16..6f080e30b399 100644 --- a/databases/mariadb105-server/Makefile +++ b/databases/mariadb105-server/Makefile @@ -1,10 +1,10 @@ # Created by: Bernard Spil PORTNAME?= mariadb -PORTVERSION= 10.5.15 -PORTREVISION?= 3 +PORTVERSION= 10.5.16 +PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= https://downloads.mariadb.org/rest-api/mariadb/${PORTVERSION}/ \ +MASTER_SITES= \ https://mirror.nodesdirect.com/${SITESDIR}/ \ https://mirror.one.com/${SITESDIR}/ \ https://ftp.nluug.nl/db/${SITESDIR}/ \ @@ -15,7 +15,8 @@ MASTER_SITES= https://downloads.mariadb.org/rest-api/mariadb/${PORTVERSION}/ \ 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://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 7791e674e5f5..05d4618eb252 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 @@ share/man/man8/mariadbd.8.gz share/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 @@ share/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