diff --git a/.gitignore b/.gitignore index 34673c7..0b812ed 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /ejabberd-18.04.tar.gz /ejabberd-18.06.tar.gz /ejabberd-18.09.tar.gz +/ejabberd-18.12.1.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 bf284d5..edb32f7 100644 --- a/ejabberd-0003-Install-into-BINDIR-instead-of-SBINDIR.patch +++ b/ejabberd-0003-Install-into-BINDIR-instead-of-SBINDIR.patch @@ -1,14 +1,15 @@ -From e5599c8292d4e779167be565c89de84bd23d5c01 Mon Sep 17 00:00:00 2001 +From 81d881318ed7e4966ed9f9f00521066660ed7191 Mon Sep 17 00:00:00 2001 From: Randy Barlow -Date: Mon, 2 Jan 2017 22:35:03 -0500 -Subject: [PATCH] Install into BINDIR instead of SBINDIR. +Date: Tue, 8 Jan 2019 11:56:28 -0500 +Subject: [PATCH] Install to bindir instead of sbindir. +Signed-off-by: Randy Barlow --- Makefile.in | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 5ff3efe0..b7bf0c4b 100644 +index d3bcb282..ffd89c2a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -14,9 +14,6 @@ ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd @@ -21,7 +22,7 @@ index 5ff3efe0..b7bf0c4b 100644 # /lib/ LIBDIR = $(DESTDIR)@libdir@ -@@ -189,8 +186,8 @@ install: all copy-files +@@ -221,8 +218,8 @@ install: all copy-files $(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc # # Administration script @@ -32,7 +33,7 @@ index 5ff3efe0..b7bf0c4b 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 -@@ -198,13 +195,13 @@ install: all copy-files +@@ -230,13 +227,13 @@ install: all copy-files [ -f deps/elixir/bin/mix ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/mix $(BINDIR)/mix || true # # Init script @@ -48,7 +49,7 @@ index 5ff3efe0..b7bf0c4b 100644 > ejabberd.service chmod 644 ejabberd.service # -@@ -234,7 +231,7 @@ install: all copy-files +@@ -266,7 +263,7 @@ install: all copy-files uninstall: uninstall-binary uninstall-binary: @@ -58,5 +59,5 @@ index 5ff3efe0..b7bf0c4b 100644 rm -f $(BINDIR)/elixir rm -f $(BINDIR)/mix -- -2.11.0 +2.20.1 diff --git a/ejabberd-0004-Enable-systemd-notification-if-available.patch b/ejabberd-0004-Enable-systemd-notification-if-available.patch index e8648dc..b350131 100644 --- a/ejabberd-0004-Enable-systemd-notification-if-available.patch +++ b/ejabberd-0004-Enable-systemd-notification-if-available.patch @@ -1,10 +1,10 @@ -From 2e333a11a360cf430fc39907f5fe9d19f42b34b6 Mon Sep 17 00:00:00 2001 +From d0eb963c45f6e0afc4bd0d7ed0475944e322cdf0 Mon Sep 17 00:00:00 2001 From: Randy Barlow -Date: Sun, 29 Jul 2018 20:51:13 -0400 +Date: Tue, 8 Jan 2019 11:59:33 -0500 Subject: [PATCH] Enable systemd notification if available. This patch was originally written by Peter Lemenkov, and was -adapted for ejabberd 18.06. +adapted for ejabberd 18.12.1. Signed-off-by: Randy Barlow --- @@ -12,17 +12,17 @@ Signed-off-by: Randy Barlow 1 file changed, 1 insertion(+) diff --git a/src/ejabberd_app.erl b/src/ejabberd_app.erl -index 284be384..cad88ab4 100644 +index 90c36a59..2cbf8f30 100644 --- a/src/ejabberd_app.erl +++ b/src/ejabberd_app.erl @@ -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"), ++ {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), + ejabberd_hooks:run(ejabberd_started, []), {T2, _} = statistics(wall_clock), - ?INFO_MSG("ejabberd ~s is started in the node ~p in ~.2fs", -- -2.18.0 +2.20.1 diff --git a/ejabberd.spec b/ejabberd.spec index 75d1b2a..b3ccb9f 100644 --- a/ejabberd.spec +++ b/ejabberd.spec @@ -3,23 +3,24 @@ # Since we require the version in both BuildRequires and Requires, let's make these variables for # easier maintenance. -%global cache_tab_ver 1.0.16 -%global eimp_ver 1.0.8 +%global cache_tab_ver 1.0.17 +%global eimp_ver 1.0.9 %global epam_ver 1.0.4 -%global esip_ver 1.0.26 +%global esip_ver 1.0.27 %global ezlib_ver 1.0.4 -%global fast_tls_ver 1.0.25 +%global fast_tls_ver 1.0.26 %global fast_xml_ver 1.1.34 %global fast_yaml_ver 1.0.17 %global iconv_ver 1.0.10 %global luerl_ver 0.3 -%global p1_mysql_ver 1.0.7 +%global p1_mysql_ver 1.0.8 %global p1_oauth2_ver 0.6.3 %global p1_pgsql_ver 1.1.6 %global p1_utils_ver 1.0.13 +%global pkix_ver 1.0.0 %global stringprep_ver 1.0.14 -%global stun_ver 1.0.25 -%global xmpp_ver 1.2.5 +%global stun_ver 1.0.26 +%global xmpp_ver 1.2.8 # Define SELinux policy variables %global selinuxtype targeted @@ -29,8 +30,8 @@ Name: ejabberd -Version: 18.09 -Release: 3%{?dist} +Version: 18.12.1 +Release: 1%{?dist} BuildArch: noarch License: GPLv2+ @@ -60,8 +61,6 @@ 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 @@ -76,14 +75,15 @@ BuildRequires: erlang-fast_yaml >= %{fast_yaml_ver} BuildRequires: erlang-iconv >= %{iconv_ver} BuildRequires: erlang-jiffy >= 0.14.8 BuildRequires: erlang-jose >= 1.8.4 -BuildRequires: erlang-lager >= 3.4.2 +BuildRequires: erlang-lager >= 3.6 BuildRequires: erlang-luerl >= %{luerl_ver} -BuildRequires: erlang-meck >= 0.8.4 +BuildRequires: erlang-meck >= 0.8.12 BuildRequires: erlang-odbc BuildRequires: erlang-p1_mysql >= %{p1_mysql_ver} BuildRequires: erlang-p1_oauth2 >= %{p1_oauth2_ver} BuildRequires: erlang-p1_pgsql >= %{p1_pgsql_ver} BuildRequires: erlang-p1_utils >= %{p1_utils_ver} +BuildRequires: erlang-pkix >= %{pkix_ver} BuildRequires: erlang-rebar BuildRequires: erlang-riak_client BuildRequires: erlang-sd_notify @@ -125,14 +125,15 @@ Requires: erlang-fast_yaml >= %{fast_yaml_ver} Requires: erlang-iconv >= %{iconv_ver} Requires: erlang-jiffy >= 0.14.8 Requires: erlang-jose >= 1.8.4 -Requires: erlang-lager >= 3.4.2 +Requires: erlang-lager >= 3.6 Requires: erlang-luerl >= %{luerl_ver} -Requires: erlang-meck >= 0.8.4 +Requires: erlang-meck >= 0.8.12 Requires: erlang-os_mon Requires: erlang-p1_mysql >= %{p1_mysql_ver} Requires: erlang-p1_oauth2 >= %{p1_oauth2_ver} Requires: erlang-p1_pgsql >= %{p1_pgsql_ver} Requires: erlang-p1_utils >= %{p1_utils_ver} +Requires: erlang-pkix >= %{pkix_ver} Requires: erlang-stringprep >= %{stringprep_ver} Requires: erlang-stun >= %{stun_ver} Requires: erlang-xmpp >= %{xmpp_ver} @@ -374,7 +375,7 @@ fi %files %license COPYING -%doc README README.md +%doc CHANGELOG.md CONTRIBUTING.md CONTRIBUTORS.md README.md %attr(750,ejabberd,ejabberd) %dir %{_sysconfdir}/ejabberd %attr(640,ejabberd,ejabberd) %config(noreplace) %{_sysconfdir}/ejabberd/ejabberd.yml @@ -402,6 +403,10 @@ fi %changelog +* Fri Dec 28 2018 Randy Barlow - 18.12.1-1 +- Update to 18.12.1. +- https://blog.process-one.net/ejabberd-18-12-1/ + * Sun Dec 09 2018 Randy Barlow - 18.09-3 - Include CSS, image, JavaScript, and Lua files (#1651809). diff --git a/sources b/sources index 30b074f..aeafb39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ejabberd-18.09.tar.gz) = 458d418b76e896602e784f921dfe3e6415520a13b53d3dbba895d086f909bc80483a89ba321632e7448aac65eef7ae541c62d47b743cfe16e73cdba2eab11907 +SHA512 (ejabberd-18.12.1.tar.gz) = d97a231b6eee7a73ff016ac21d7deea91065dec1bcc903c7b7b20d380537a80f8d2288a91d6845382b422d1e21ea3e52b286fa9e068a29d0d17fa790b3591148