Attachment 226049 Details for Bug 256827 – patch file for 10.3.30

[patch] patch file for 10.3.30

mariadb-10.3.30.patch (text/plain), 1.78 KB, created by vincent.jancso on 2021-06-25 12:12:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: vincent.jancso

Created: 2021-06-25 12:12:29 UTC

Size: 1.78 KB

patch

obsolete

>--- databases/mariadb103-server/Makefile
>+++ databases/mariadb103-server/Makefile
>@@ -1,7 +1,7 @@
> # Created by: Bernard Spil <brnrd@FreeBSD.org>
> 
> PORTNAME?=	mariadb
>-PORTVERSION=	10.3.29
>+PORTVERSION=	10.3.30
> PORTREVISION?=	0
> CATEGORIES=	databases
> MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \
>--- databases/mariadb103-server/distinfo
>+++ databases/mariadb103-server/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1620455361
>-SHA256 (mariadb-10.3.29.tar.gz) = 304a9e94c50636b591ac7cbfe459cb341d345c4bd0ef5e45fb9a692268e6db38
>-SIZE (mariadb-10.3.29.tar.gz) = 73261682
>+TIMESTAMP = 1624605956
>+SHA256 (mariadb-10.3.30.tar.gz) = bd8735c65bdb7ebcd5d779fb9d3de3f2fcd319ad6482278d73dfe7301ad4ae1b
>+SIZE (mariadb-10.3.30.tar.gz) = 73266479
>--- databases/mariadb103-server/files/patch-scripts_wsrep__sst__mariabackup.sh
>+++ databases/mariadb103-server/files/patch-scripts_wsrep__sst__mariabackup.sh
>@@ -1,11 +1,11 @@
>---- scripts/wsrep_sst_mariabackup.sh.orig	2019-12-11 19:29:57 UTC
>+--- scripts/wsrep_sst_mariabackup.sh.orig	2021-06-09 14:23:11.000000000 +0200
> +++ scripts/wsrep_sst_mariabackup.sh
>-@@ -605,7 +605,7 @@ recv_joiner()
>-     set +e
>- 
>-     if [[ $tmt -gt 0 ]] && command -v timeout >/dev/null;then
>--        if timeout --help | grep -q -- '-k';then 
>-+        if timeout --help 2>&1 | grep -q -- '-k';then 
>-             ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd"
>-         else 
>-             ltcmd="timeout -s9 $tmt $tcmd"
>+@@ -696,7 +696,7 @@
>+     local ltcmd="$tcmd"
>+     if [ $tmt -gt 0 ]; then
>+         if [ -n "$(command -v 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"

Actions: View | Diff

Attachments on bug 256827: 226049