From 41909e5e127f518b0e50dc24e71771c190154c65 Mon Sep 17 00:00:00 2001
From: Anton Bobrov <abobrov@redhat.com>
Date: Fri, 11 Aug 2023 12:13:38 +0200
Subject: [PATCH] Resolves: #2081414 add MDEV-30402 patch missing from prev
 commit

---
 mariadb-mdev-30402.patch | 12 ++++++++++++
 mariadb.spec             |  3 +++
 2 files changed, 15 insertions(+)
 create mode 100644 mariadb-mdev-30402.patch

diff --git a/mariadb-mdev-30402.patch b/mariadb-mdev-30402.patch
new file mode 100644
index 0000000..069bf76
--- /dev/null
+++ b/mariadb-mdev-30402.patch
@@ -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
diff --git a/mariadb.spec b/mariadb.spec
index ffc561f..dc72386 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -192,6 +192,8 @@ Patch10:          %{pkgnamepatch}-annocheck.patch
 Patch12:          %{pkgnamepatch}-pcdir.patch
 #   Patch13: Fix failing 10.3.39 ssl and disks tests
 Patch13:          %{pkgnamepatch}-10.3.39-tests.patch
+#   Patch14: Backport MDEV-30402 socat patch
+Patch14:          %{pkgnamepatch}-mdev-30402.patch
 
 BuildRequires:    cmake gcc-c++
 BuildRequires:    multilib-rpm-config
@@ -697,6 +699,7 @@ find . -name "*.jar" -type f -exec rm --verbose -f {} \;
 %patch10 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 # workaround for upstream bug #56342
 #rm mysql-test/t/ssl_8k_key-master.opt