From 9bb50ac0bc6ccf7435885c70ce091b3ca94eeed0 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:03:39 +0300
Subject: [PATCH] =?UTF-8?q?sys-apps/calculate-server:=20=D0=BF=D0=BE=D0=B4?=
 =?UTF-8?q?=D0=B4=D0=B5=D1=80=D0=B6=D0=BA=D0=B0=20ejabberd-20.04=20(fixup)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...6.ebuild => calculate-server-2.1.19-r17.ebuild} |  0
 ...calculate-server-2.1.19-fix_ejabber_20.04.patch | 14 +++++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)
 rename sys-apps/calculate-server/{calculate-server-2.1.19-r16.ebuild => calculate-server-2.1.19-r17.ebuild} (100%)

diff --git a/sys-apps/calculate-server/calculate-server-2.1.19-r16.ebuild b/sys-apps/calculate-server/calculate-server-2.1.19-r17.ebuild
similarity index 100%
rename from sys-apps/calculate-server/calculate-server-2.1.19-r16.ebuild
rename to sys-apps/calculate-server/calculate-server-2.1.19-r17.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 ab0687cad..027be8a6c 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
@@ -1,12 +1,12 @@
 diff --git a/profile/jabber/etc/jabber/ejabberd.yml b/profile/jabber/etc/jabber/ejabberd.yml
-index 6706b1e..e4e44c2 100644
+index 6706b1e..3bad236 100644
 --- a/profile/jabber/etc/jabber/ejabberd.yml
 +++ b/profile/jabber/etc/jabber/ejabberd.yml
 @@ -58,6 +58,35 @@ acl:
    local: 
      user_regexp: 
        - ""
-+#?pkg(ejabber)>=20.04#
++#?pkg(ejabberd)>=20.04#
 +access: 
 +  announce: 
 +    - allow: admin
@@ -34,7 +34,7 @@ index 6706b1e..e4e44c2 100644
 +      register: 
 +        - deny
 +#pkg#
-+#?pkg(ejabber)<20.04#
++#?pkg(ejabberd)<20.04#
  access: 
    announce: 
      admin: allow
@@ -46,12 +46,16 @@ index 6706b1e..e4e44c2 100644
  language: "en"
  modules: 
    mod_adhoc: []
-@@ -122,7 +152,7 @@ modules:
+@@ -122,7 +152,12 @@ modules:
    mod_pubsub: 
      access_createnode: pubsub_createnode
      plugins: 
--      - "default"
++#?pkg(ejabberd)>=20.04#
 +      - "flat"
++#pkg#
++#?pkg(ejabberd)<20.04#
+       - "default"
++#pkg#
        - "pep"
    mod_register: 
      welcome_message: