Update to 16.09 (#1376238).

5 files changed, 40 insertions, 87 deletions

diff --git a/.gitignore b/.gitignore
index a629882..9666b3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /16.06.1.tar.gz
 /16.08.tar.gz
+/16.09.tar.gz
diff --git a/ejabberd-0004-Enable-systemd-notification-if-available.patch b/ejabberd-0004-Enable-systemd-notification-if-available.patch
index a9a7fed..cb7acba 100644
--- a/ejabberd-0004-Enable-systemd-notification-if-available.patch
+++ b/ejabberd-0004-Enable-systemd-notification-if-available.patch
@@ -1,18 +1,26 @@
-From: Peter Lemenkov <lemenkov@gmail.com>
-Date: Sun, 31 Aug 2014 16:08:17 +0400
-Subject: [PATCH] Enable systemd notification if available
+From c5180dbdef213ab19530e18c3e701c30cafc5ef0 Mon Sep 17 00:00:00 2001
+From: Randy Barlow <randy@electronsweatshop.com>
+Date: Fri, 16 Sep 2016 12:44:37 -0400
+Subject: [PATCH] Enable systemd notification if available.
 
-Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+This patch was originally written by Peter Lemenkov, and was
+adapted for ejabberd 16.09.
+---
+ src/ejabberd_app.erl | 1 +
+ 1 file changed, 1 insertion(+)
 
 diff --git a/src/ejabberd_app.erl b/src/ejabberd_app.erl
-index 6f0b97f..318a144 100644
+index 890ab6f..9fec117 100644
 --- a/src/ejabberd_app.erl
 +++ b/src/ejabberd_app.erl
-@@ -75,6 +75,7 @@ start(normal, _Args) ->
-     ejabberd_oauth:start(),
-     gen_mod:start_modules(),
+@@ -78,6 +78,7 @@ start(normal, _Args) ->
      ejabberd_listener:start_listeners(),
+     ejabberd_service: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"),
      ?INFO_MSG("ejabberd ~s is started in the node ~p", [?VERSION, node()]),
      Sup;
  start(_, _) ->
+-- 
+2.10.0
+
diff --git a/ejabberd-0005-Remove-no-longer-necessary-p1_xmlrpc.patch b/ejabberd-0005-Remove-no-longer-necessary-p1_xmlrpc.patch
deleted file mode 100644
index cc311bc..0000000
--- a/ejabberd-0005-Remove-no-longer-necessary-p1_xmlrpc.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From: Peter Lemenkov <lemenkov@gmail.com>
-Date: Wed, 17 Aug 2016 18:29:24 +0300
-Subject: [PATCH] Remove no longer necessary p1_xmlrpc
-
-Ths module was superceded by fast_xml in commit
-processone/ejabberd@dfc29ea03ca91e1eb5387d93612e2ac4b4b496da. So let's remove it entirely to
-avoid any confusion.
-
-Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
-
-diff --git a/mix.exs b/mix.exs
-index 7453ea4..d3c2566 100644
---- a/mix.exs
-+++ b/mix.exs
-@@ -29,7 +29,7 @@ defmodule Ejabberd.Mixfile do
-      included_applications: [:lager, :mnesia, :p1_utils, :cache_tab,
-                              :fast_tls, :stringprep, :fast_xml,
-                              :stun, :fast_yaml, :ezlib, :iconv,
--                             :esip, :jiffy, :p1_oauth2, :p1_xmlrpc, :eredis,
-+                             :esip, :jiffy, :p1_oauth2, :eredis,
-                              :p1_mysql, :p1_pgsql, :sqlite3]]
-   end
- 
-@@ -51,7 +51,6 @@ defmodule Ejabberd.Mixfile do
-      {:esip, "~> 1.0"},
-      {:jiffy, "~> 0.14.7"},
-      {:p1_oauth2, "~> 0.6.1"},
--     {:p1_xmlrpc, "~> 1.15"},
-      {:p1_mysql, "~> 1.0"},
-      {:p1_pgsql, "~> 1.1"},
-      {:sqlite3, "~> 1.1"},
-diff --git a/mix.lock b/mix.lock
-index 467f142..49f93f6 100644
---- a/mix.lock
-+++ b/mix.lock
-@@ -20,7 +20,6 @@
-   "p1_oauth2": {:hex, :p1_oauth2, "0.6.1", "4e021250cc198c538b097393671a41e7cebf463c248980320e038fe0316eb56b", [:rebar3], []},
-   "p1_pgsql": {:hex, :p1_pgsql, "1.1.0", "ca525c42878eac095e5feb19563acc9915c845648f48fdec7ba6266c625d4ac7", [:rebar3], []},
-   "p1_utils": {:hex, :p1_utils, "1.0.4", "7face65db102b5d1ebe7ad3c7517c5ee8cfbe174c6658e3affbb00eb66e06787", [:rebar3], []},
--  "p1_xmlrpc": {:hex, :p1_xmlrpc, "1.15.1", "a382b62dc21bb372281c2488f99294d84f2b4020ed0908a1c4ad710ace3cf35a", [:rebar3], []},
-   "providers": {:hex, :providers, "1.6.0", "db0e2f9043ae60c0155205fcd238d68516331d0e5146155e33d1e79dc452964a", [:rebar3], [{:getopt, "0.8.2", [hex: :getopt, optional: false]}]},
-   "relx": {:hex, :relx, "3.19.0", "286dd5244b4786f56aac75d5c8e2d1fb4cfd306810d4ec8548f3ae1b3aadb8f7", [:rebar3], [{:bbmustache, "1.0.4", [hex: :bbmustache, optional: false]}, {:cf, "0.2.1", [hex: :cf, optional: false]}, {:erlware_commons, "0.19.0", [hex: :erlware_commons, optional: false]}, {:getopt, "0.8.2", [hex: :getopt, optional: false]}, {:providers, "1.6.0", [hex: :providers, optional: false]}]},
-   "samerlib": {:git, "https://github.com/processone/samerlib", "9158f65d18ec63f8b409543b6fb46dd5fce46160", [tag: "0.8.0b"]},
-diff --git a/rebar.config b/rebar.config
-index 693f4f5..a8e2a79 100644
---- a/rebar.config
-+++ b/rebar.config
-@@ -18,7 +18,6 @@
-         {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.5"}}},
-         {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.7"}}},
-         {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.1"}}},
--        {p1_xmlrpc, ".*", {git, "https://github.com/processone/p1_xmlrpc", {tag, "1.15.1"}}},
-         {luerl, ".*", {git, "https://github.com/rvirding/luerl", {tag, "v0.2"}}},
-         {if_var_true, mysql, {p1_mysql, ".*", {git, "https://github.com/processone/p1_mysql",
-                                                {tag, "1.0.1"}}}},
diff --git a/ejabberd.spec b/ejabberd.spec
index 0c45a18..2c91d7a 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -4,8 +4,8 @@
 
 
 Name:           ejabberd
-Version:        16.08
-Release:        3%{?dist}
+Version:        16.09
+Release:        1%{?dist}
 
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 License:        GPLv2+
@@ -35,18 +35,15 @@ Patch2: ejabberd-0002-Enable-polkit-support.patch
 Patch3: ejabberd-0003-Install-into-BINDIR-instead-of-SBINDIR.patch
 # Fedora-specific
 Patch4: ejabberd-0004-Enable-systemd-notification-if-available.patch
-# Remove outdated dependency
-# See this PR - https://github.com/processone/ejabberd/pull/1254
-Patch5: ejabberd-0005-Remove-no-longer-necessary-p1_xmlrpc.patch
 
 BuildRequires:  elixir >= 1.2.6
-BuildRequires:  erlang-cache_tab >= 1.0.3
-BuildRequires:  erlang-esip >= 1.0.7
+BuildRequires:  erlang-cache_tab >= 1.0.4
+BuildRequires:  erlang-esip >= 1.0.8
 BuildRequires:  erlang-ezlib >= 1.0.1
-BuildRequires:  erlang-fast_tls >= 1.0.6
-BuildRequires:  erlang-fast_xml >= 1.1.14
-BuildRequires:  erlang-fast_yaml >= 1.0.5
-BuildRequires:  erlang-iconv >= 1.0.1
+BuildRequires:  erlang-fast_tls >= 1.0.7
+BuildRequires:  erlang-fast_xml >= 1.1.15
+BuildRequires:  erlang-fast_yaml >= 1.0.6
+BuildRequires:  erlang-iconv >= 1.0.2
 BuildRequires:  erlang-jiffy >= 0.14.7
 BuildRequires:  erlang-lager >= 3.2.1
 BuildRequires:  erlang-luerl >= 0.2
@@ -60,8 +57,8 @@ BuildRequires:  erlang-p1_utils >= 1.0.5
 BuildRequires:  erlang-rebar
 BuildRequires:  erlang-riak_client
 BuildRequires:  erlang-sd_notify
-BuildRequires:  erlang-stringprep >= 1.0.5
-BuildRequires:  erlang-stun >= 1.0.6
+BuildRequires:  erlang-stringprep >= 1.0.6
+BuildRequires:  erlang-stun >= 1.0.7
 BuildRequires:  expat-devel >= 1.95
 BuildRequires:  git
 BuildRequires:  libyaml-devel >= 0.1.4
@@ -107,7 +104,6 @@ Windows NT/2000/XP).
 %patch2 -p1 -b .use_polkit
 %patch3 -p1 -b .use_bindir
 %patch4 -p1 -b .enable_sd_notify
-%patch5 -p1 -b .remove_p1_xmlrpc
 
 
 %build
@@ -123,15 +119,15 @@ autoreconf -ivf
 %install
 %{erlang_install}
 
-sed 	-e "s*{{rootdir}}*%{_prefix}*" \
-	-e "s*{{installuser}}**" \
-	-e "s*{{bindir}}*%{_bindir}*" \
-	-e "s*{{libdir}}*%{_erllibdir}*" \
-	-e "s*{{sysconfdir}}*%{_sysconfdir}*" \
-	-e "s*{{localstatedir}}*/var*" \
-	-e "s*{{docdir}}*%{_datadir}/doc/%{name}*" \
-	-e "s*{{erl}}*%{_erllibdir}/bin/erl*" \
-	-e "s*{{epmd}}*%{_erllibdir}/bin/epmd*" ejabberdctl.template \
+sed -e "s*{{rootdir}}*%{_prefix}*" \
+    -e "s*{{installuser}}**" \
+    -e "s*{{bindir}}*%{_bindir}*" \
+    -e "s*{{libdir}}*%{_erllibdir}*" \
+    -e "s*{{sysconfdir}}*%{_sysconfdir}*" \
+    -e "s*{{localstatedir}}*/var*" \
+    -e "s*{{docdir}}*%{_datadir}/doc/%{name}*" \
+    -e "s*{{erl}}*%{_erllibdir}/bin/erl*" \
+    -e "s*{{epmd}}*%{_erllibdir}/bin/epmd*" ejabberdctl.template \
 > ejabberdctl.example
 
 install -d -m 0750 %{buildroot}%{_sysconfdir}/%{name}
@@ -287,6 +283,9 @@ fi)
 
 
 %changelog
+* Mon Oct 17 2016 Randy Barlow <randy@electronsweatshop.com> - 16.09-1
+- Update to 16.09 (#1376238).
+
 * Mon Oct 17 2016 Peter Lemenkov <lemenkov@gmail.com> - 16.08-3
 - Fix FTBFS in Rawhide
 
diff --git a/sources b/sources
index 91051d8..a1c14bf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9b977580eda44b68d2b14e2f2842894d  16.08.tar.gz
+6541f96b6943320dcde7176edac931d9  16.09.tar.gz