[rpms/ejabberd] f45: Update to 18.06 (#1596197).

[Randy Barlow <randy@electronsweatshop.com>]

            A new commit has been pushed.

            Repo   : rpms/ejabberd
            Branch : f45
            Commit : 3331f7f3c84a0d5316dce9860b064dd7f8be51d1
            Author : Randy Barlow <randy@electronsweatshop.com>
            Date   : 2018-07-29T21:44:06-04:00
            Stats  : +34/-29 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/ejabberd/c/3331f7f3c84a0d5316dce9860b064dd7f8be51d1?branch=f45

            Log:
            Update to 18.06 (#1596197).

Signed-off-by: Randy Barlow <randy@electronsweatshop.com>

---
diff --git a/.gitignore b/.gitignore
index 93dedc7..ee83f8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /ejabberd-18.1.0.tar.gz
 /ejabberd-18.03.tar.gz
 /ejabberd-18.04.tar.gz
+/ejabberd-18.06.tar.gz

diff --git a/ejabberd-0004-Enable-systemd-notification-if-available.patch b/ejabberd-0004-Enable-systemd-notification-if-available.patch
index cac0873..e8648dc 100644
--- a/ejabberd-0004-Enable-systemd-notification-if-available.patch
+++ b/ejabberd-0004-Enable-systemd-notification-if-available.patch
@@ -1,10 +1,10 @@
-From 026f1819fc45d8945f811173b48265f0af772b5c Mon Sep 17 00:00:00 2001
+From 2e333a11a360cf430fc39907f5fe9d19f42b34b6 Mon Sep 17 00:00:00 2001
 From: Randy Barlow <randy@electronsweatshop.com>
-Date: Sat, 11 Nov 2017 00:48:30 -0500
+Date: Sun, 29 Jul 2018 20:51:13 -0400
 Subject: [PATCH] Enable systemd notification if available.
 
 This patch was originally written by Peter Lemenkov, and was
-adapted for ejabberd 17.09.
+adapted for ejabberd 18.06.
 
 Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
 ---
@@ -12,17 +12,17 @@ Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/src/ejabberd_app.erl b/src/ejabberd_app.erl
-index 56f22522..b0796afb 100644
+index 284be384..cad88ab4 100644
 --- a/src/ejabberd_app.erl
 +++ b/src/ejabberd_app.erl
-@@ -53,6 +53,7 @@ start(normal, _Args) ->
-     case ejabberd_sup:start_link() of
- 	{ok, SupPid} ->
- 	    register_elixir_config_hooks(),
-+        {module, sd_notify} == code:load_file(sd_notify) andalso sd_notify:sd_notify(0, "READY=1\nSTATUS=Initialized\nMAINPID=" ++ os:getpid() ++ "\n"),
- 	    ejabberd_cluster:wait_for_sync(infinity),
- 	    {T2, _} = statistics(wall_clock),
- 	    ?INFO_MSG("ejabberd ~s is started in the node ~p in ~.2fs",
+@@ -54,6 +54,7 @@ start(normal, _Args) ->
+ 		{ok, SupPid} ->
+ 		    ejabberd_system_monitor:start(),
+ 		    register_elixir_config_hooks(),
++            {module, sd_notify} == code:load_file(sd_notify) andalso sd_notify:sd_notify(0, "READY=1\nSTATUS=Initialized\nMAINPID=" ++ os:getpid() ++ "\n"),
+ 		    ejabberd_cluster:wait_for_sync(infinity),
+ 		    {T2, _} = statistics(wall_clock),
+ 		    ?INFO_MSG("ejabberd ~s is started in the node ~p in ~.2fs",
 -- 
-2.14.3
+2.18.0
 

diff --git a/ejabberd.spec b/ejabberd.spec
index 2d73c00..1b68d64 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -3,28 +3,28 @@
 
 # Since we require the version in both BuildRequires and Requires, let's make these variables for
 # easier maintenance.
-%global cache_tab_ver 1.0.13
-%global eimp_ver 1.0.5
+%global cache_tab_ver 1.0.14
+%global eimp_ver 1.0.6
 %global epam_ver 1.0.4
-%global esip_ver 1.0.23
+%global esip_ver 1.0.24
 %global ezlib_ver 1.0.4
-%global fast_tls_ver 1.0.22
-%global fast_xml_ver 1.1.30
-%global fast_yaml_ver 1.0.14
-%global iconv_ver 1.0.7
+%global fast_tls_ver 1.0.23
+%global fast_xml_ver 1.1.31
+%global fast_yaml_ver 1.0.15
+%global iconv_ver 1.0.8
 %global luerl_ver 0.3
-%global p1_mysql_ver 1.0.5
+%global p1_mysql_ver 1.0.6
 %global p1_oauth2_ver 0.6.3
-%global p1_pgsql_ver 1.1.5
-%global p1_utils_ver 1.0.11
-%global stringprep_ver 1.0.11
-%global stun_ver 1.0.22
-%global xmpp_ver 1.1.21
+%global p1_pgsql_ver 1.1.6
+%global p1_utils_ver 1.0.12
+%global stringprep_ver 1.0.12
+%global stun_ver 1.0.23
+%global xmpp_ver 1.2.1
 
 
 Name:           ejabberd
-Version:        18.04
-Release:        3%{?dist}
+Version:        18.06
+Release:        1%{?dist}
 BuildArch:      noarch
 
 License:        GPLv2+
@@ -393,6 +393,10 @@ fi
 
 
 %changelog
+* Sun Jul 29 2018 Randy Barlow <bowlofeggs@fedoraproject.org> - 18.06-1
+- Update to 18.06 (#1596197).
+- https://blog.process-one.net/ejabberd-18-06/
+
 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 18.04-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

diff --git a/sources b/sources
index 254dadb..2ab45fd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ejabberd-18.04.tar.gz) = a0619a7f1b2e47f683ebba776c36276e0e57790f24ed833ce807c6c0709540f6f229c38be49288f4e461590cac880c53ad9aec7aa03b897da568c3e71a1bf14b
+SHA512 (ejabberd-18.06.tar.gz) = 357f09b0aa7da95ec196ca47328535bc52eb1de8f1de56766767bf0c4fda88667f57e445ebd3eefccc28bc5b2089ea17fe9ca2f50855e285f8c2f78708166056