Build 16.08-2

- Reenable systemd notification
- Drop outdated dependency - p1_xmlrpc
- Add missing dependency - erlang-odbc
- Rearrange patches

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>

12 files changed, 114 insertions, 152 deletions

diff --git a/0013-Do-not-manage-deps-during-build.patch b/0013-Do-not-manage-deps-during-build.patch
deleted file mode 100644
index f0f72b4..0000000
--- a/0013-Do-not-manage-deps-during-build.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 38d84555d5df2e8dd976981e56f77b825e4bed9d Mon Sep 17 00:00:00 2001
-From: Randy Barlow <randy@electronsweatshop.com>
-Date: Mon, 15 Feb 2016 22:48:59 -0500
-Subject: [PATCH] Don't manage dependencies.
-
----
- Makefile.in | 18 ++++--------------
- 1 file changed, 4 insertions(+), 14 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 08cd837..500b895 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -77,20 +77,10 @@ else
-   INIT_USER=$(INSTALLUSER)
- endif
- 
--all: deps src
-+all: src
- 
--deps: deps/.got
--
--deps/.got:
--	rm -rf deps/.got
--	rm -rf deps/.built
--	$(REBAR) get-deps && :> deps/.got
--
--deps/.built: deps/.got
--	$(REBAR) compile && :> deps/.built
--
--src: deps/.built
--	$(REBAR) skip_deps=true compile
-+src:
-+	$(REBAR) compile
- 
- update:
- 	rm -rf deps/.got
-@@ -337,5 +327,5 @@ quicktest:
- 	$(REBAR) skip_deps=true ct suites=elixir
- 
- .PHONY: src edoc dialyzer Makefile TAGS clean clean-rel distclean rel \
--	install uninstall uninstall-binary uninstall-all translations deps test spec \
-+	install uninstall uninstall-binary uninstall-all translations test spec \
- 	quicktest erlang_plt deps_plt ejabberd_plt
--- 
-2.7.1
-
diff --git a/ejabberd-0001-Fix-PAM-service-example-name-to-match-actual-one.patch b/ejabberd-0001-Fix-PAM-service-example-name-to-match-actual-one.patch
index 1816b94..6099db0 100644
--- a/ejabberd-0001-Fix-PAM-service-example-name-to-match-actual-one.patch
+++ b/ejabberd-0001-Fix-PAM-service-example-name-to-match-actual-one.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix PAM service example name to match actual one
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 
 diff --git a/ejabberd.yml.example b/ejabberd.yml.example
-index ad5ca9e..028704b 100644
+index 72439e5..1acad78 100644
 --- a/ejabberd.yml.example
 +++ b/ejabberd.yml.example
-@@ -245,7 +245,7 @@ auth_method: internal
+@@ -263,7 +263,7 @@ auth_method: internal
  ## Authentication using PAM
  ##
  ## auth_method: pam
diff --git a/ejabberd-0002-Enable-polkit-support.patch b/ejabberd-0002-Enable-polkit-support.patch
new file mode 100644
index 0000000..f3a2335
--- /dev/null
+++ b/ejabberd-0002-Enable-polkit-support.patch
@@ -0,0 +1,16 @@
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Wed, 17 Jul 2013 14:51:04 +0400
+Subject: [PATCH] Enable polkit support
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+
+diff --git a/ejabberdctl.template b/ejabberdctl.template
+index 5b34ebe..0598b65 100755
+--- a/ejabberdctl.template
++++ b/ejabberdctl.template
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/pkexec /bin/sh
+ 
+ # define default configuration
+ POLL=true
diff --git a/ejabberd-0003-Fedora-specific-changes-to-ejabberdctl.patch b/ejabberd-0003-Fedora-specific-changes-to-ejabberdctl.patch
deleted file mode 100644
index f9cf331..0000000
--- a/ejabberd-0003-Fedora-specific-changes-to-ejabberdctl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Peter Lemenkov <lemenkov@gmail.com>
-Date: Tue, 16 Feb 2010 16:30:05 +0300
-Subject: [PATCH] Fedora-specific changes to ejabberdctl
-
-Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
-
-diff --git a/ejabberdctl.template b/ejabberdctl.template
-index a86694f..09b9947 100755
---- a/ejabberdctl.template
-+++ b/ejabberdctl.template
-@@ -22,7 +22,7 @@ if [ "$INSTALLUSER" != "" ] ; then
-     EXEC_CMD="false"
-     for GID in `id -G`; do
-         if [ $GID -eq 0 ] ; then
--            EXEC_CMD="su $INSTALLUSER -p -c"
-+            EXEC_CMD="/sbin/runuser -s /bin/bash -p ejabberd -c"
-         fi
-     done
-     if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then
diff --git a/ejabberd-0007-Install-into-BINDIR-instead-of-SBINDIR.patch b/ejabberd-0003-Install-into-BINDIR-instead-of-SBINDIR.patch
index 11c057d..9d0e324 100644
--- a/ejabberd-0007-Install-into-BINDIR-instead-of-SBINDIR.patch
+++ b/ejabberd-0003-Install-into-BINDIR-instead-of-SBINDIR.patch
@@ -1,6 +1,14 @@
---- b/Makefile.in	2015-12-25 23:25:50.462000000 -0500
-+++ a/Makefile.in	2015-12-26 00:03:06.226000000 -0500
-@@ -14,9 +14,6 @@
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Wed, 17 Jul 2013 14:53:49 +0400
+Subject: [PATCH] Install into BINDIR instead of SBINDIR
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+
+diff --git a/Makefile.in b/Makefile.in
+index eb14749..75f7850 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -14,9 +14,6 @@ ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
  # /bin/
  BINDIR = $(DESTDIR)@bindir@
  
@@ -10,18 +18,18 @@
  # /lib/
  LIBDIR =  $(DESTDIR)@libdir@
  
-@@ -159,8 +156,8 @@
+@@ -193,8 +190,8 @@ install: all copy-files
  	$(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc
  	#
  	# Administration script
 -	[ -d $(SBINDIR) ] || $(INSTALL) -d -m 755 $(SBINDIR)
 -	$(INSTALL) -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
 +	[ -d $(BINDIR) ] || $(INSTALL) -d -m 755 $(BINDIR)
-+	$(INSTALL) -m 755 $(G_USER) ejabberdctl.example $(BINDIR)/ejabberdctl
++	$(INSTALL) -m 550 $(G_USER) ejabberdctl.example $(BINDIR)/ejabberdctl
  	# 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
-@@ -168,7 +165,7 @@
+@@ -202,7 +199,7 @@ install: all copy-files
  	[ -f deps/elixir/bin/mix ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/mix $(BINDIR)/mix || true
  	#
  	# Init script
@@ -30,7 +38,7 @@
  		-e "s*@installuser@*$(INIT_USER)*" ejabberd.init.template \
  		> ejabberd.init
  	chmod 755 ejabberd.init
-@@ -211,7 +208,7 @@
+@@ -233,7 +230,7 @@ install: all copy-files
  uninstall: uninstall-binary
  
  uninstall-binary:
diff --git a/ejabberd-0010-Enable-systemd-notification-if-available.patch b/ejabberd-0004-Enable-systemd-notification-if-available.patch
index 8a04f37..a9a7fed 100644
--- a/ejabberd-0010-Enable-systemd-notification-if-available.patch
+++ b/ejabberd-0004-Enable-systemd-notification-if-available.patch
@@ -5,14 +5,14 @@ Subject: [PATCH] Enable systemd notification if available
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 
 diff --git a/src/ejabberd_app.erl b/src/ejabberd_app.erl
-index 379f728..9aa6801 100644
+index 6f0b97f..318a144 100644
 --- a/src/ejabberd_app.erl
 +++ b/src/ejabberd_app.erl
-@@ -66,6 +66,7 @@ start(normal, _Args) ->
-     maybe_add_nameservers(),
-     start_modules(),
+@@ -75,6 +75,7 @@ start(normal, _Args) ->
+     ejabberd_oauth:start(),
+     gen_mod:start_modules(),
      ejabberd_listener:start_listeners(),
-+    {module, sd_notify} == code:load_file(sd_notify) andalso sd_notify:sd_notify(0, "READY=1"),
++    {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(_, _) ->
diff --git a/ejabberd-0005-Remove-no-longer-necessary-p1_xmlrpc.patch b/ejabberd-0005-Remove-no-longer-necessary-p1_xmlrpc.patch
new file mode 100644
index 0000000..cc311bc
--- /dev/null
+++ b/ejabberd-0005-Remove-no-longer-necessary-p1_xmlrpc.patch
@@ -0,0 +1,55 @@
+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-0006-Enable-polkit-support.patch b/ejabberd-0006-Enable-polkit-support.patch
deleted file mode 100644
index b203ead..0000000
--- a/ejabberd-0006-Enable-polkit-support.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 561da3443e0d09029b3e60d1bd1aa9cfacf0c53d Mon Sep 17 00:00:00 2001
-From: Randy Barlow <randy@electronsweatshop.com>
-Date: Sun, 6 Mar 2016 19:53:05 -0500
-Subject: [PATCH] Enable polkit support
-
-Patch originally by Peter Lemenkov <lemenkov@gmail.com>.
----
- ejabberdctl.template | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ejabberdctl.template b/ejabberdctl.template
-index 07395aa..b5bcbb0 100755
---- a/ejabberdctl.template
-+++ b/ejabberdctl.template
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/pkexec /bin/sh
- 
- # define default configuration
- POLL=true
--- 
-2.7.2
-
diff --git a/ejabberd-0009-Fix-permissions-for-captcha-script.patch b/ejabberd-0009-Fix-permissions-for-captcha-script.patch
deleted file mode 100644
index d694c57..0000000
--- a/ejabberd-0009-Fix-permissions-for-captcha-script.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Peter Lemenkov <lemenkov@gmail.com>
-Date: Sun, 31 Aug 2014 13:21:48 +0400
-Subject: [PATCH] Fix permissions for captcha script
-
-Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
-
-diff --git a/Makefile.in b/Makefile.in
-index 037d2ff..d972c98 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -150,7 +150,7 @@ install: all
- 	#
- 	# Binary C programs
- 	$(INSTALL) -d $(PBINDIR)
--	$(INSTALL) -m 750 $(O_USER) tools/captcha.sh $(PBINDIR)
-+	$(INSTALL) -m 755 $(O_USER) tools/captcha.sh $(PBINDIR)
- 	-[ -f deps/p1_pam/priv/bin/epam ] \
- 		&& $(INSTALL) -m 750 $(O_USER) deps/p1_pam/priv/bin/epam $(PBINDIR)
- 	#
diff --git a/ejabberd-0011-aarch64.patch b/ejabberd-0011-aarch64.patch
deleted file mode 100644
index 070d86d..0000000
--- a/ejabberd-0011-aarch64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/c_src/double-conversion/utils.h b/c_src/double-conversion/utils.h
-index 9ebb9ee..8aebce0 100644
---- a/deps/jiffy/c_src/double-conversion/utils.h
-+++ b/deps/jiffy/c_src/double-conversion/utils.h
-@@ -57,7 +57,7 @@
-     defined(__hppa__) || defined(__ia64__) || \
-     defined(__mips__) || defined(__powerpc__) || \
-     defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
--    defined(__SH4__) || defined(__alpha__) || \
-+    defined(__SH4__) || defined(__alpha__) || defined(__aarch64__) || \
-     defined(_MIPS_ARCH_MIPS32R2)
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
- #elif defined(_M_IX86) || defined(__i386__) || defined(__i386)
diff --git a/ejabberd.service b/ejabberd.service
index e562425..0f972d0 100644
--- a/ejabberd.service
+++ b/ejabberd.service
@@ -4,7 +4,8 @@ Requires=network-online.target
 After=network-online.target
 
 [Service]
-Type=oneshot
+Type=notify
+NotifyAccess=all
 User=ejabberd
 Group=ejabberd
 LimitNOFILE=16000
diff --git a/ejabberd.spec b/ejabberd.spec
index a7ea837..f4fc60b 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -4,7 +4,7 @@
 
 Name:           ejabberd
 Version:        16.08
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 License:        GPLv2+
@@ -28,21 +28,15 @@ Source13:       ejabberdctl.polkit.rules
 
 # Use ejabberd as an example for PAM service name (fedora/epel-specific)
 Patch1: ejabberd-0001-Fix-PAM-service-example-name-to-match-actual-one.patch
-# BZ# 439583, 452326, 451554, 465196, 502361 (fedora/epel-specific)
-# rbarlow: i'm not sure what this patch is for, but it does not apply cleanly
-#Patch3: ejabberd-0003-Fedora-specific-changes-to-ejabberdctl.patch
 # polkit support
-Patch6: ejabberd-0006-Enable-polkit-support.patch
+Patch2: ejabberd-0002-Enable-polkit-support.patch
 # Fedora-specific
-Patch7: ejabberd-0007-Install-into-BINDIR-instead-of-SBINDIR.patch
+Patch3: ejabberd-0003-Install-into-BINDIR-instead-of-SBINDIR.patch
 # Fedora-specific
-# rbarlow: This patch failed to apply
-# Patch9: ejabberd-0009-Fix-permissions-for-captcha-script.patch
-# Fedora-specific
-Patch10:ejabberd-0010-Enable-systemd-notification-if-available.patch
-
-#Patch11: ejabberd-0011-aarch64.patch
-Patch13: 0013-Do-not-manage-deps-during-build.patch
+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
@@ -56,14 +50,15 @@ BuildRequires:  erlang-jiffy >= 0.14.7
 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_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_xmlrpc >= 1.15.1
 BuildRequires:  erlang-rebar
 BuildRequires:  erlang-riak_client
+BuildRequires:  erlang-sd_notify
 BuildRequires:  erlang-stringprep >= 1.0.5
 BuildRequires:  erlang-stun >= 1.0.6
 BuildRequires:  expat-devel >= 1.95
@@ -108,8 +103,10 @@ Windows NT/2000/XP).
 %setup -q
 
 %patch1 -p1 -b .pam_name
-%patch6 -p1 -b .use_polkit
-%patch7 -p1 -b .use_bindir
+%patch2 -p1 -b .use_polkit
+%patch3 -p1 -b .use_bindir
+%patch4 -p1 -b .enable_sd_notify
+%patch5 -p1 -b .remove_p1_xmlrpc
 
 
 %build
@@ -274,6 +271,12 @@ fi)
 
 
 %changelog
+* Thu Aug 18 2016 Peter Lemenkov <lemenkov@gmail.com> - 16.08-2
+- Reenable systemd notification
+- Drop outdated dependency - p1_xmlrpc
+- Add missing dependency - erlang-odbc
+- Rearrange patches
+
 * Sun Aug 07 2016 Randy Barlow <randy@electronsweatshop.com> - 16.08-1
 - Update to 16.08.
 - Drop the R19 patch since it is included upstream now.