From a0cd1d0c2cd380bff23a6576b432acef06194f32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?=
 =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= <mh@calculate.ru>
Date: Tue, 17 Nov 2020 15:07:30 +0300
Subject: [PATCH] =?UTF-8?q?sys-apps/calculate-server:=20=D0=B8=D1=81=D0=BF?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=B3=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B5=D1=80=D0=B0=D1=86=D0=B8=D1=8F=20=D1=81=D0=B5=D1=80=D1=82?=
 =?UTF-8?q?=D0=B8=D1=84=D0=B8=D0=BA=D0=B0=D1=82=D0=B0=20=D0=B4=D0=BB=D1=8F?=
 =?UTF-8?q?=20jabber?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ild => calculate-server-2.1.19-r18.ebuild} |  0
 ...late-server-2.1.19-fix_ejabber_20.04.patch | 20 +++++++++++++++++++
 2 files changed, 20 insertions(+)
 rename sys-apps/calculate-server/{calculate-server-2.1.19-r17.ebuild => calculate-server-2.1.19-r18.ebuild} (100%)

diff --git a/sys-apps/calculate-server/calculate-server-2.1.19-r17.ebuild b/sys-apps/calculate-server/calculate-server-2.1.19-r18.ebuild
similarity index 100%
rename from sys-apps/calculate-server/calculate-server-2.1.19-r17.ebuild
rename to sys-apps/calculate-server/calculate-server-2.1.19-r18.ebuild
diff --git a/sys-apps/calculate-server/files/calculate-server-2.1.19-fix_ejabber_20.04.patch b/sys-apps/calculate-server/files/calculate-server-2.1.19-fix_ejabber_20.04.patch
index 027be8a6c..59e8e02ac 100644
--- a/sys-apps/calculate-server/files/calculate-server-2.1.19-fix_ejabber_20.04.patch
+++ b/sys-apps/calculate-server/files/calculate-server-2.1.19-fix_ejabber_20.04.patch
@@ -59,3 +59,23 @@ index 6706b1e..3bad236 100644
        - "pep"
    mod_register: 
      welcome_message: 
+diff --git a/pym/cl_ldap.py b/pym/cl_ldap.py
+index 00279a2..f07b3e4 100644
+--- a/pym/cl_ldap.py
++++ b/pym/cl_ldap.py
+@@ -1836,6 +1836,7 @@ This command is not allowed."))
+             return self.dialogYesNo(message)
+ 
+     def createJabberCertificate(self):
++        hostname = self.clVars.Get("sr_jabber_host")
+         # создаем сертификат если есть используем прежний
+         if not os.path.exists("/etc/jabber/ssl.pem"):
+             if os.path.exists("/etc/jabber/self-cert.sh"):
+@@ -1846,6 +1847,7 @@ This command is not allowed."))
+                                      "Automatically-generated ejabberd SSL key",
+                                               userName="jabber",
+                                               groupName="jabber",
++                                              sslCommonName=hostname,
+                                               certFile="/etc/jabber/ssl.pem",
+                                               genDH=True):
+                     return False