Update to 16.12 (#1400097).

Also:
- Rebase two patches.
- Add new erlang-xmpp dependency.
- Use sed to fix include statements on fast_xml and xmpp so they
  can be found from the system.
- Run the test suite.

5 files changed, 72 insertions, 34 deletions

diff --git a/.gitignore b/.gitignore
index 9666b3f..b907b2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /16.06.1.tar.gz
 /16.08.tar.gz
 /16.09.tar.gz
+/16.12.tar.gz
diff --git a/ejabberd-0003-Install-into-BINDIR-instead-of-SBINDIR.patch b/ejabberd-0003-Install-into-BINDIR-instead-of-SBINDIR.patch
index 9d0e324..bf284d5 100644
--- a/ejabberd-0003-Install-into-BINDIR-instead-of-SBINDIR.patch
+++ b/ejabberd-0003-Install-into-BINDIR-instead-of-SBINDIR.patch
@@ -1,11 +1,14 @@
-From: Peter Lemenkov <lemenkov@gmail.com>
-Date: Wed, 17 Jul 2013 14:53:49 +0400
-Subject: [PATCH] Install into BINDIR instead of SBINDIR
+From e5599c8292d4e779167be565c89de84bd23d5c01 Mon Sep 17 00:00:00 2001
+From: Randy Barlow <randy@electronsweatshop.com>
+Date: Mon, 2 Jan 2017 22:35:03 -0500
+Subject: [PATCH] Install into BINDIR instead of SBINDIR.
 
-Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+---
+ Makefile.in | 13 +++++--------
+ 1 file changed, 5 insertions(+), 8 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index eb14749..75f7850 100644
+index 5ff3efe0..b7bf0c4b 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -14,9 +14,6 @@ ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
@@ -18,7 +21,7 @@ index eb14749..75f7850 100644
  # /lib/
  LIBDIR =  $(DESTDIR)@libdir@
  
-@@ -193,8 +190,8 @@ install: all copy-files
+@@ -189,8 +186,8 @@ install: all copy-files
  	$(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc
  	#
  	# Administration script
@@ -29,16 +32,23 @@ index eb14749..75f7850 100644
  	# Elixir binaries
  	[ -d $(BINDIR) ] || $(INSTALL) -d -m 755 $(BINDIR)
  	[ -f deps/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/iex $(BINDIR)/iex || true
-@@ -202,7 +199,7 @@ install: all copy-files
+@@ -198,13 +195,13 @@ install: all copy-files
  	[ -f deps/elixir/bin/mix ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/mix $(BINDIR)/mix || true
  	#
  	# Init script
--	$(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*" \
-+	$(SED) -e "s*@ctlscriptpath@*$(BINDIR)*" \
- 		-e "s*@installuser@*$(INIT_USER)*" ejabberd.init.template \
+-	$(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" \
++	$(SED) -e "s*@ctlscriptpath@*$(BINDIR)*g" \
+ 		-e "s*@installuser@*$(INIT_USER)*g" ejabberd.init.template \
  		> ejabberd.init
  	chmod 755 ejabberd.init
-@@ -233,7 +230,7 @@ install: all copy-files
+ 	#
+ 	# Service script
+-	$(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" ejabberd.service.template \
++	$(SED) -e "s*@ctlscriptpath@*$(BINDIR)*g" ejabberd.service.template \
+ 		> ejabberd.service
+ 	chmod 644 ejabberd.service
+ 	#
+@@ -234,7 +231,7 @@ install: all copy-files
  uninstall: uninstall-binary
  
  uninstall-binary:
@@ -47,3 +57,6 @@ index eb14749..75f7850 100644
  	rm -f  $(BINDIR)/iex
  	rm -f  $(BINDIR)/elixir
  	rm -f  $(BINDIR)/mix
+-- 
+2.11.0
+
diff --git a/ejabberd-0004-Enable-systemd-notification-if-available.patch b/ejabberd-0004-Enable-systemd-notification-if-available.patch
index cb7acba..35b8a51 100644
--- a/ejabberd-0004-Enable-systemd-notification-if-available.patch
+++ b/ejabberd-0004-Enable-systemd-notification-if-available.patch
@@ -1,26 +1,26 @@
-From c5180dbdef213ab19530e18c3e701c30cafc5ef0 Mon Sep 17 00:00:00 2001
+From 21a36b3b32ce384b686236a0193f0fb3440a8243 Mon Sep 17 00:00:00 2001
 From: Randy Barlow <randy@electronsweatshop.com>
-Date: Fri, 16 Sep 2016 12:44:37 -0400
+Date: Mon, 2 Jan 2017 22:40:27 -0500
 Subject: [PATCH] Enable systemd notification if available.
 
 This patch was originally written by Peter Lemenkov, and was
-adapted for ejabberd 16.09.
+adapted for ejabberd 16.12.
 ---
  src/ejabberd_app.erl | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/src/ejabberd_app.erl b/src/ejabberd_app.erl
-index 890ab6f..9fec117 100644
+index e4333c81..3ab6d4ba 100644
 --- a/src/ejabberd_app.erl
 +++ b/src/ejabberd_app.erl
-@@ -78,6 +78,7 @@ start(normal, _Args) ->
+@@ -77,6 +77,7 @@ start(normal, _Args) ->
+     gen_mod:start_modules(),
      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
+2.11.0
 
diff --git a/ejabberd.spec b/ejabberd.spec
index 0d09ced..9019832 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -4,11 +4,11 @@
 
 
 Name:           ejabberd
-Version:        16.09
-Release:        5%{?dist}
+Version:        16.12
+Release:        1%{?dist}
 
-Summary:        A distributed, fault-tolerant Jabber/XMPP server
 License:        GPLv2+
+Summary:        A distributed, fault-tolerant Jabber/XMPP server
 URL:            http://www.ejabberd.im/
 VCS:            scm:git:https://github.com/processone/ejabberd.git
 Source0:        https://github.com/processone/%{name}/archive/%{version}.tar.gz
@@ -41,28 +41,29 @@ Patch4: ejabberd-0004-Enable-systemd-notification-if-available.patch
 Patch5: ejabberd-0005-ejabberdctl-should-not-try-to-create-the-ejabberd-us.patch
 
 BuildRequires:  elixir >= 1.2.6
-BuildRequires:  erlang-cache_tab >= 1.0.4
-BuildRequires:  erlang-esip >= 1.0.8
+BuildRequires:  erlang-cache_tab >= 1.0.5
+BuildRequires:  erlang-esip >= 1.0.10
 BuildRequires:  erlang-ezlib >= 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-fast_tls >= 1.0.9
+BuildRequires:  erlang-fast_xml >= 1.1.18
+BuildRequires:  erlang-fast_yaml >= 1.0.7
+BuildRequires:  erlang-iconv >= 1.0.3
+BuildRequires:  erlang-jiffy >= 0.14.8
 BuildRequires:  erlang-lager >= 3.2.1
 BuildRequires:  erlang-luerl >= 0.2
 BuildRequires:  erlang-meck >= 0.8.4
 BuildRequires:  erlang-odbc
-BuildRequires:  erlang-p1_mysql >= 1.0.1
+BuildRequires:  erlang-p1_mysql >= 1.0.2
 BuildRequires:  erlang-p1_oauth2 >= 0.6.1
 BuildRequires:  erlang-p1_pam >= 1.0.0
-BuildRequires:  erlang-p1_pgsql >= 1.1.0
-BuildRequires:  erlang-p1_utils >= 1.0.5
+BuildRequires:  erlang-p1_pgsql >= 1.1.1
+BuildRequires:  erlang-p1_utils >= 1.0.6
 BuildRequires:  erlang-rebar
 BuildRequires:  erlang-riak_client
 BuildRequires:  erlang-sd_notify
-BuildRequires:  erlang-stringprep >= 1.0.6
-BuildRequires:  erlang-stun >= 1.0.7
+BuildRequires:  erlang-stringprep >= 1.0.7
+BuildRequires:  erlang-stun >= 1.0.9
+BuildRequires:  erlang-xmpp >= 1.1.4
 BuildRequires:  expat-devel >= 1.95
 BuildRequires:  git
 BuildRequires:  libyaml-devel >= 0.1.4
@@ -109,6 +110,17 @@ Windows NT/2000/XP).
 %patch4 -p1 -b .enable_sd_notify
 %patch5 -p1 -b .su_with_bash
 
+# Upstream seems to import erlang-xmpp and erlang-fast_xml in a way that isn't compatible with them
+# being system libraries. We need to patch the include statements to fix this.
+# https://github.com/processone/ejabberd/pull/1446/
+find . -name "*.hrl" | xargs sed -i \
+    "s/include(\"fxml.hrl/include_lib(\"fast_xml\/include\/fxml.hrl/"
+find . -name "*.erl" | xargs sed -i "s/include(\"jid.hrl/include_lib(\"xmpp\/include\/jid.hrl/"
+find . -name "*.hrl" | xargs sed -i "s/include(\"ns.hrl/include_lib(\"xmpp\/include\/ns.hrl/"
+find . -name "*.erl" | xargs sed -i "s/include(\"xmpp.hrl/include_lib(\"xmpp\/include\/xmpp.hrl/"
+find . -name "*.hrl" | xargs sed -i \
+    "s/include(\"xmpp_codec.hrl/include_lib(\"xmpp\/include\/xmpp_codec.hrl/"
+
 
 %build
 autoreconf -ivf
@@ -178,6 +190,10 @@ install -D -p -m 0644 %{S:12} %{buildroot}%{_datadir}/polkit-1/actions/ejabberdc
 install -D -p -m 0644 %{S:13} %{buildroot}%{_datadir}/polkit-1/rules.d/51-ejabberdctl.rules
 
 
+%check
+%{rebar_eunit}
+
+
 %pre
 getent group %{name} >/dev/null || groupadd -r %{name}
 getent passwd %{name} >/dev/null || \
@@ -288,6 +304,14 @@ fi)
 
 
 %changelog
+* Fri Dec 30 2016 Randy Barlow <bowlofeggs@fedoraproject.org> - 16.12-1
+- Update to 16.12 (#1400097).
+- Rebase two patches.
+- Add new erlang-xmpp dependency.
+- Use sed to fix include statements on fast_xml and xmpp so they can be
+  found from the system.
+- Run the test suite.
+
 * Sun Dec 25 2016 Randy Barlow <bowlofeggs@fedoraproject.org> - 16.09-5
 - Use auth_admin for all polkit default rules (#1094143).
 - Drop unused BuildRequires on hevea and texlive-comment.
diff --git a/sources b/sources
index a1c14bf..5bc2bdd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6541f96b6943320dcde7176edac931d9  16.09.tar.gz
+SHA512 (16.12.tar.gz) = 6e6f35aa266eea055d94fddc3edebf814bd53514a82c4544413bd88397d0372a05bbe9e922f1d8b808f3da9f8a0a14bdbfcfc052dbf6053d697252086306f71f