diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2022-02-17 14:09:54 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2022-02-17 14:09:54 +0000 |
| commit | 94df86eca53ee6a0196d010200ae3cd65e672945 (patch) | |
| tree | 77b56a2b7ef056858440901217fbd64abd6c65e4 /databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh | |
| parent | net-im/scli: Update to 0.7.0 (diff) | |
databases/mariadb104-server: Security update to 10.4.24
PR: 261969
Security: ff5606f7-8a45-11ec-8be6-d4c9ef517024
MFH: 2022Q1
Diffstat (limited to 'databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh')
| -rw-r--r-- | databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh | 6 |
1 files changed, 3 insertions, 3 deletions
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 dc45c2d238c7..3e3d42812b67 100644 --- a/databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh +++ b/databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh @@ -1,9 +1,9 @@ ---- scripts/wsrep_sst_mariabackup.sh.orig 2021-06-09 14:23:11.000000000 +0200 +--- scripts/wsrep_sst_mariabackup.sh.orig 2022-02-17 10:18:49 UTC +++ scripts/wsrep_sst_mariabackup.sh -@@ -696,7 +696,7 @@ +@@ -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" |