diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2022-05-24 15:40:12 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2022-05-24 15:42:48 +0000 |
| commit | 6202520020d9c4f553a2c522a8004521dfa20418 (patch) | |
| tree | 94e5e1582b89e1a83b5af0f788c4217891d51b27 | |
| parent | be54a31d4abb841c61e50f2478ec2127dcb18e75 (diff) | |
| download | ports-6202520020d9c4f553a2c522a8004521dfa20418.tar.gz ports-6202520020d9c4f553a2c522a8004521dfa20418.zip | |
databases/mariadb103-server: Security update to 10.3.35
PR: 264170
Submitted by: Vincent Jancso <vincent jancso outlook com>
Security: 04fecc47-dad2-11ec-8fbd-d4c9ef517024
MFH: 2022Q2
| -rw-r--r-- | databases/mariadb103-server/Makefile | 10 | ||||
| -rw-r--r-- | databases/mariadb103-server/distinfo | 6 | ||||
| -rw-r--r-- | databases/mariadb103-server/files/patch-scripts_wsrep__sst__mariabackup.sh | 8 | ||||
| -rw-r--r-- | databases/mariadb103-server/pkg-plist | 1 |
4 files changed, 13 insertions, 12 deletions
diff --git a/databases/mariadb103-server/Makefile b/databases/mariadb103-server/Makefile index 1d7e9d92d3b6..1aafc94ffa32 100644 --- a/databases/mariadb103-server/Makefile +++ b/databases/mariadb103-server/Makefile @@ -1,11 +1,10 @@ # Created by: Bernard Spil <brnrd@FreeBSD.org> PORTNAME?= mariadb -PORTVERSION= 10.3.34 -PORTREVISION?= 3 +PORTVERSION= 10.3.35 +PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= https://downloads.mariadb.org/rest-api/mariadb/${PORTVERSION}/ \ - https://mirror.nodesdirect.com/${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}/ \ @@ -15,7 +14,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?= 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 ee4b433e621c..7219ce2d1bb1 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 |