rpms/mariadb
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Resolves: #2081414 add MDEV-30402 patch missing from prev commit

Browse Source
This commit is contained in:
Anton Bobrov 2023-08-11 12:13:38 +02:00
parent 3cdcdbba5f
commit 41909e5e12
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mariadb-mdev-30402.patch Normal file
View File

@ -0,0 +1,12 @@
--- mariadb-10.3.39/scripts/wsrep_sst_mariabackup.sh 2023-08-11 11:31:40.415022889 +0200
+++ ../../mariadb-10.3.39/scripts/wsrep_sst_mariabackup.sh 2023-08-11 11:32:01.924161077 +0200
@@ -340,6 +340,9 @@ get_transfer()
"Use workaround for socat $SOCAT_VERSION bug"
fi
fi
+ if check_for_version "$SOCAT_VERSION" '1.7.4'; then
+ tcmd="$tcmd,no-sni=1"
+ fi
fi
if [ "${sockopt#*,dhparam=}" = "$sockopt" ]; then

3
mariadb.spec
View File

@ -192,6 +192,8 @@ Patch10: %{pkgnamepatch}-annocheck.patch
Patch12: %{pkgnamepatch}-pcdir.patch Patch12: %{pkgnamepatch}-pcdir.patch
# Patch13: Fix failing 10.3.39 ssl and disks tests # Patch13: Fix failing 10.3.39 ssl and disks tests
Patch13: %{pkgnamepatch}-10.3.39-tests.patch Patch13: %{pkgnamepatch}-10.3.39-tests.patch
# Patch14: Backport MDEV-30402 socat patch
Patch14: %{pkgnamepatch}-mdev-30402.patch
BuildRequires: cmake gcc-c++ BuildRequires: cmake gcc-c++
BuildRequires: multilib-rpm-config BuildRequires: multilib-rpm-config
@ -697,6 +699,7 @@ find . -name "*.jar" -type f -exec rm --verbose -f {} \;
%patch10 -p1 %patch10 -p1
%patch12 -p1 %patch12 -p1
%patch13 -p1 %patch13 -p1
%patch14 -p1
# workaround for upstream bug #56342 # workaround for upstream bug #56342
#rm mysql-test/t/ssl_8k_key-master.opt #rm mysql-test/t/ssl_8k_key-master.opt