[rpms/ejabberd] f45: Add upstream patch to fix missing stun module options in conf validator

[rpms/ejabberd] f45: Add upstream patch to fix missing stun module options in conf validator

[Xavier Bachelot]

A new commit has been pushed.

Repo   : rpms/ejabberd
Branch : f45
Commit : 2def53699cd0447fa00cb7a3e59671c001e1e9f3
Author : Xavier Bachelot <xavier@bachelot.org>
Date   : 2018-12-04T18:31:43-05:00
Stats  : +29/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/ejabberd/c/2def53699cd0447fa00cb7a3e59671c001e1e9f3?branch=f45

Log:
Add upstream patch to fix missing stun module options in conf validator

---
diff --git a/ejabberd-18.09-fix_stun_options.patch b/ejabberd-18.09-fix_stun_options.patch
new file mode 100644
index 0000000..1cfe2d5
--- /dev/null
+++ b/ejabberd-18.09-fix_stun_options.patch
@@ -0,0 +1,23 @@
+From 73af98a8dc091f1d8eefbcce3dfc18ce20980a38 Mon Sep 17 00:00:00 2001
+From: Evgeny Khramtsov <ekhramtsov@process-one.net>
+Date: Sat, 29 Sep 2018 23:05:41 +0300
+Subject: [PATCH] Add forgotten TURN options to validator
+
+Fixes #2621
+---
+ src/ejabberd_stun.erl | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/ejabberd_stun.erl b/src/ejabberd_stun.erl
+index ef1d46f40e..1e00c85f5e 100644
+--- a/src/ejabberd_stun.erl
++++ b/src/ejabberd_stun.erl
+@@ -168,6 +168,8 @@ listen_opt_type(server_name) ->
+ 
+ listen_options() ->
+     [{shaper, none},
++     {use_turn, false},
++     {turn_ip, undefined},
+      {auth_type, user},
+      {auth_realm, undefined},
+      {tls, false},

diff --git a/ejabberd.spec b/ejabberd.spec
index d168036..ab4f6de 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -30,7 +30,7 @@
 
 Name:           ejabberd
 Version:        18.09
-Release:        1%{?dist}
+Release:        2%{?dist}
 BuildArch:      noarch
 
 License:        GPLv2+
@@ -60,6 +60,8 @@ Source16:       ejabberd.if
 Patch3: ejabberd-0003-Install-into-BINDIR-instead-of-SBINDIR.patch
 # Fedora-specific
 Patch4: ejabberd-0004-Enable-systemd-notification-if-available.patch
+# https://github.com/processone/ejabberd/commit/73af98a8dc091f1d8eefbcce3dfc18ce20980a38
+Patch5: ejabberd-18.09-fix_stun_options.patch
 
 
 BuildRequires:  elixir >= 1.4.4
@@ -401,6 +403,9 @@ fi
 
 
 %changelog
+* Tue Dec 04 2018 Xavier Bachelot <xavier@bachelot.org> - 18.09-2
+- Add upstream patch to fix missing stun module options in conf validator.
+
 * Sun Oct 14 2018 Randy Barlow <bowlofeggs@fedoraproject.org> - 18.09-1
 - Upgrade to 18.09.
 - https://blog.process-one.net/ejabberd-18-09/