From nobody Tue Feb 15 11:48:27 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 F1B5719C98A5; Tue, 15 Feb 2022 11:48:27 +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 4JyfVg6L3xz4gw4; Tue, 15 Feb 2022 11:48:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644925707; 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=BiVnWw9qYPegOQj5hZ1YYeVmH9fwSce9MvFexrg338E=; b=sOF+/iiZJ7ukRHgrgPbXOn8//ff7n/4QOpGdiqmImn7D66/jdnZY7DBEyGL5h4+judfY3v iVTVbRfmpNUmZdm7ycAosbZ317+TPkf93oJpjDzysrpU1FVDjIULB74rS0AdATEz6uu3iy Y7LXOmCitYddqR/n4RtjmReyxICrhOQKdWvdYJm4htp2MjyOlpbqE8PIKzgs0YR5owOYbH jMOlvBjwg4hjGegpP2IgZTIZ/G587Gxo1S1M+wEs+/RJzcYShgN67hDDNFKgPbfqtmw1Sx ndnpAyvHgH9gGlwzm65Ki58WCOSRYUBHu2dv0RjjQAv+xuSAcSQa5TyChS3bwA== 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 B1040219D1; Tue, 15 Feb 2022 11:48:27 +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 21FBmR8f023435; Tue, 15 Feb 2022 11:48:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21FBmRdD023434; Tue, 15 Feb 2022 11:48:27 GMT (envelope-from git) Date: Tue, 15 Feb 2022 11:48:27 GMT Message-Id: <202202151148.21FBmRdD023434@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: 4e7a17eee56a - main - 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/main X-Git-Reftype: branch X-Git-Commit: 4e7a17eee56a05ef998bf35a17453da5b6c96c8b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644925707; 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=BiVnWw9qYPegOQj5hZ1YYeVmH9fwSce9MvFexrg338E=; b=Qm3W2CVMXSamDu2c6u/gTkWGNARC6t39I2/mE1Yd9jNW9Xz6yEiQ0k7b1LO4832aBGCGZN XfWgBO1FZdOHQx/9GqjNpMK9L/S6n4Oo2zEihyYLkDUOLkDLHue2KH2X5cgPbw6lH1vX1p TW7PMWL5cYieXBCBQ7d+JL/jscnM/tW8Uig+nwDCcLuInmucb93ZEImA+Lbmrpe/1Yzf3f ZHSWNuOPAzmNdL0yNymSf3avpRiI1rvYh6kPdPPKi/KO8OuiVTNVMc/eWqsflGMPQOiN9a ncQcHVhMd0AfBoz6OfdfP7nRixhVMClFzT7Vu/tTvInA2vhFnOFm0mDR8YMk7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644925707; a=rsa-sha256; cv=none; b=mMwDYxlaNW7uyyAJZPAOPM6DMOpnsGJfqFe/Z5czBYTp9FXa2798oegGq3EkBlFQUMLvM8 S++w4P1jabRj0BIidkcWSl/GNmVIet2WDPrRv4a3TYRv3GfL/NliTFes2Kmxd2C6UWCO0R Er33WSxeJ8aH4C1uww9ynU9uS8VquqM7RNoZ8FDZQf7l56G0/GbFMffUCzDhSzAQehTKC5 Usel4TagC/JaHvmEJkSJxazl7O4oVDOQ2MG8zhRIRThjGx2vt9BWFTsuaGKFoIXHcq/GbF HIPn/Kbr7MMh/a6wIcGB1QCweTZMqTAOJ51f5YxULJXIf7GIB7f+N7U8/hJhow== 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=4e7a17eee56a05ef998bf35a17453da5b6c96c8b commit 4e7a17eee56a05ef998bf35a17453da5b6c96c8b Author: Bernard Spil AuthorDate: 2022-02-15 11:47:37 +0000 Commit: Bernard Spil CommitDate: 2022-02-15 11:47:37 +0000 databases/mariadb105-server: Security update to 10.5.15 security: ff5606f7-8a45-11ec-8be6-d4c9ef517024 MFH: 2022Q1 --- 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