From e8800090d36a77e9b4680258c148094b13b6c4e6 Mon Sep 17 00:00:00 2001 From: Randy Barlow Date: Tue, 16 Jan 2018 09:56:15 -0500 Subject: Update to 18.01 (#1516062). Also: - Require the selinux policy to be installed. - Allow port 5281 in the SELinux policy (#1494854). Signed-off-by: Randy Barlow --- .gitignore | 1 + ...rop-post_hook_configure-from-rebar.config.patch | 34 --------- ...as-the-explicit-shell-when-using-su-in-ej.patch | 34 --------- ...avatar-from-the-ejabberd.yml-since-we-don.patch | 29 -------- ejabberd.spec | 82 ++++++++++++---------- ejabberd.te | 1 + sources | 2 +- 7 files changed, 46 insertions(+), 137 deletions(-) delete mode 100644 ejabberd-0002-Drop-post_hook_configure-from-rebar.config.patch delete mode 100644 ejabberd-0005-Use-bin-sh-as-the-explicit-shell-when-using-su-in-ej.patch delete mode 100644 ejabberd-0006-Remove-mod_avatar-from-the-ejabberd.yml-since-we-don.patch diff --git a/.gitignore b/.gitignore index cd42879..00715dd 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /17.01.tar.gz /ejabberd-17.07.tar.gz /ejabberd-17.09.tar.gz +/ejabberd-18.01.tar.gz diff --git a/ejabberd-0002-Drop-post_hook_configure-from-rebar.config.patch b/ejabberd-0002-Drop-post_hook_configure-from-rebar.config.patch deleted file mode 100644 index e21d75d..0000000 --- a/ejabberd-0002-Drop-post_hook_configure-from-rebar.config.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a2c9bedb099a5e1efe3562e61679752351ef819e Mon Sep 17 00:00:00 2001 -From: Randy Barlow -Date: Sat, 11 Nov 2017 00:46:13 -0500 -Subject: [PATCH] Drop post_hook_configure from rebar.config. - -Signed-off-by: Randy Barlow ---- - rebar.config | 10 ---------- - 1 file changed, 10 deletions(-) - -diff --git a/rebar.config b/rebar.config -index 323605f2..a2159da8 100644 ---- a/rebar.config -+++ b/rebar.config -@@ -152,16 +152,6 @@ - {if_version_above, "17", {cover_enabled, true}}. - {cover_export_enabled, true}. - --{post_hook_configure, [{"fast_tls", []}, -- {"stringprep", []}, -- {"fast_yaml", []}, -- {if_var_true, sip, {"esip", []}}, -- {"fast_xml", [{if_var_true, full_xml, "--enable-full-xml"}]}, -- {if_var_true, pam, {"epam", []}}, -- {if_var_true, zlib, {"ezlib", []}}, -- {if_var_true, graphics, {"eimp", []}}, -- {if_var_true, iconv, {"iconv", []}}]}. -- - {port_env, [{"CFLAGS", "-g -O2 -Wall"}]}. - - {port_specs, [{"priv/lib/jid.so", ["c_src/jid.c"]}]}. --- -2.14.3 - diff --git a/ejabberd-0005-Use-bin-sh-as-the-explicit-shell-when-using-su-in-ej.patch b/ejabberd-0005-Use-bin-sh-as-the-explicit-shell-when-using-su-in-ej.patch deleted file mode 100644 index 3f669b4..0000000 --- a/ejabberd-0005-Use-bin-sh-as-the-explicit-shell-when-using-su-in-ej.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 12d9d97baaff3bc4bd4910647f5de3378be0cf6e Mon Sep 17 00:00:00 2001 -From: Randy Barlow -Date: Sun, 10 Dec 2017 12:52:22 -0500 -Subject: [PATCH] Use /bin/sh as the explicit shell when using su in - ejabberdctl. - -Some distributions (such as Fedora) use /sbin/nologin as the login -shell for the ejabberd user. The newer version of ejabberdctl uses -su to perform the command if the INSTALLUSER invokes the script. -This commit adjusts the call to su so that it passes /bin/sh as -the shell to use so that it will work correctly when the ejabberd -user's shell is set to nologin. - -Signed-off-by: Randy Barlow ---- - ejabberdctl.template | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ejabberdctl.template b/ejabberdctl.template -index 83637766..571b90b6 100755 ---- a/ejabberdctl.template -+++ b/ejabberdctl.template -@@ -110,7 +110,7 @@ export ERL_LIBS - exec_cmd() - { - case $EXEC_CMD in -- as_install_user) su -c '"$0" "$@"' "$INSTALLUSER" -- "$@" ;; -+ as_install_user) su -s /bin/sh -c '"$0" "$@"' "$INSTALLUSER" -- "$@" ;; - as_current_user) "$@" ;; - esac - } --- -2.14.3 - diff --git a/ejabberd-0006-Remove-mod_avatar-from-the-ejabberd.yml-since-we-don.patch b/ejabberd-0006-Remove-mod_avatar-from-the-ejabberd.yml-since-we-don.patch deleted file mode 100644 index a8b9e15..0000000 --- a/ejabberd-0006-Remove-mod_avatar-from-the-ejabberd.yml-since-we-don.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a2941a16a528ea6fb90f7a463834e565a1ef7d83 Mon Sep 17 00:00:00 2001 -From: Randy Barlow -Date: Mon, 11 Dec 2017 10:28:25 -0500 -Subject: [PATCH] Remove mod_avatar from the ejabberd.yml since we don't - support it. - -Signed-off-by: Randy Barlow ---- - ejabberd.yml.example | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/ejabberd.yml.example b/ejabberd.yml.example -index 99892823..749ed3f9 100644 ---- a/ejabberd.yml.example -+++ b/ejabberd.yml.example -@@ -769,10 +769,6 @@ modules: - mod_vcard: - search: false - mod_vcard_xupdate: {} -- ## Convert all avatars posted by Android clients from WebP to JPEG -- mod_avatar: -- convert: -- webp: jpeg - mod_version: {} - mod_stream_mgmt: {} - ## Non-SASL Authentication (XEP-0078) is now disabled by default --- -2.14.3 - diff --git a/ejabberd.spec b/ejabberd.spec index a9cb66e..8420018 100644 --- a/ejabberd.spec +++ b/ejabberd.spec @@ -4,8 +4,8 @@ Name: ejabberd -Version: 17.09 -Release: 2%{?dist} +Version: 18.01 +Release: 1%{?dist} License: GPLv2+ Summary: A distributed, fault-tolerant Jabber/XMPP server @@ -32,28 +32,24 @@ Source16: ejabberd.if # 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 -# https://github.com/processone/ejabberd/issues/1850 -Patch2: ejabberd-0002-Drop-post_hook_configure-from-rebar.config.patch # Fedora-specific 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/pull/2158 -Patch5: ejabberd-0005-Use-bin-sh-as-the-explicit-shell-when-using-su-in-ej.patch -# Remove mod_avatar from the config file since we don't have its dependency (eimp) in Fedora yet. -Patch6: ejabberd-0006-Remove-mod_avatar-from-the-ejabberd.yml-since-we-don.patch BuildRequires: elixir >= 1.4.4 -BuildRequires: erlang-cache_tab >= 1.0.11 +BuildRequires: erlang-cache_tab >= 1.0.12 BuildRequires: erlang-epam >= 1.0.3 -BuildRequires: erlang-esip >= 1.0.16 -BuildRequires: erlang-ezlib >= 1.0.2 -BuildRequires: erlang-fast_tls >= 1.0.16 -BuildRequires: erlang-fast_xml >= 1.1.24 -BuildRequires: erlang-fast_yaml >= 1.0.11 +BuildRequires: erlang-esip >= 1.0.21 +BuildRequires: erlang-ezlib >= 1.0.3 +BuildRequires: erlang-fast_tls >= 1.0.20 +BuildRequires: erlang-fast_xml >= 1.1.28 +BuildRequires: erlang-fast_yaml >= 1.0.12 +BuildRequires: erlang-fs >= 2.12.0 BuildRequires: erlang-iconv >= 1.0.6 BuildRequires: erlang-jiffy >= 0.14.8 +BuildRequires: erlang-jose >= 1.8.4 BuildRequires: erlang-lager >= 3.4.2 BuildRequires: erlang-luerl >= 0.2 BuildRequires: erlang-meck >= 0.8.4 @@ -66,8 +62,8 @@ BuildRequires: erlang-rebar BuildRequires: erlang-riak_client BuildRequires: erlang-sd_notify BuildRequires: erlang-stringprep >= 1.0.10 -BuildRequires: erlang-stun >= 1.0.15 -BuildRequires: erlang-xmpp >= 1.1.15 +BuildRequires: erlang-stun >= 1.0.20 +BuildRequires: erlang-xmpp >= 1.1.19 BuildRequires: expat-devel >= 1.95 BuildRequires: git BuildRequires: libyaml-devel >= 0.1.4 @@ -89,8 +85,30 @@ Requires(postun): systemd Provides: user(%{name}) Provides: group(%{name}) +Requires: ejabberd-selinux == %{version}-%{release} # From rebar -Requires: elixir >= 1.1.0 +Requires: elixir >= 1.4.4 +Requires: erlang-cache_tab >= 1.0.12 +Requires: erlang-epam >= 1.0.3 +Requires: erlang-esip >= 1.0.21 +Requires: erlang-ezlib >= 1.0.3 +Requires: erlang-fast_tls >= 1.0.20 +Requires: erlang-fast_xml >= 1.1.28 +Requires: erlang-fast_yaml >= 1.0.12 +Requires: erlang-fs >= 2.12.0 +Requires: erlang-iconv >= 1.0.6 +Requires: erlang-jiffy >= 0.14.8 +Requires: erlang-jose >= 1.8.4 +Requires: erlang-lager >= 3.4.2 +Requires: erlang-luerl >= 0.2 +Requires: erlang-meck >= 0.8.4 +Requires: erlang-p1_mysql >= 1.0.3 +Requires: erlang-p1_oauth2 >= 0.6.2 +Requires: erlang-p1_pgsql >= 1.1.3 +Requires: erlang-p1_utils >= 1.0.10 +Requires: erlang-stringprep >= 1.0.10 +Requires: erlang-stun >= 1.0.20 +Requires: erlang-xmpp >= 1.1.19 # We install a logrotate.d file Requires: logrotate # for /usr/bin/pkexec @@ -354,6 +372,14 @@ fi %changelog +* Sat Jan 13 2018 Randy Barlow - 18.01-1 +- Update to 18.01 (#1516062). +- https://blog.process-one.net/ejabberd-17-11-happy-birthday-ejabberd/ +- https://blog.process-one.net/ejabberd-17-12/ +- https://blog.process-one.net/ejabberd-18-01/ +- Require the selinux policy to be installed. +- Allow port 5281 in the SELinux policy (#1494854). + * Mon Dec 11 2017 Randy Barlow - 17.09-2 - Fix three issues that prevented ejabberd from starting (#1524199). @@ -393,25 +419,3 @@ fi * Fri Feb 10 2017 Fedora Release Engineering - 16.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Dec 30 2016 Randy Barlow - 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 - 16.09-5 -- Use auth_admin for all polkit default rules (#1094143). -- Drop unused BuildRequires on hevea and texlive-comment. -- Add a Requires on logrotate since we install a logrotate.d file. - -* Thu Dec 01 2016 Randy Barlow - 16.09-4 -- Drop the use of -set-cookie since it is unsafe. -- Configure the ejabberdctl script to set INSTALLUSER so it uses su to be ejabberd (#1163812). - -* Sun Nov 27 2016 Randy Barlow - 16.09-3 -- Use -set-cookie in ejabberdctl so root can attach to the node (#1163812). -- Mark ejabberdctl as executable. -- Dropped unnecessary gcc-g++ BuildRequires. diff --git a/ejabberd.te b/ejabberd.te index 4498b11..fe70d58 100644 --- a/ejabberd.te +++ b/ejabberd.te @@ -36,6 +36,7 @@ corenet_tcp_bind_generic_node(ejabberd_t) corenet_tcp_bind_generic_port(ejabberd_t) corenet_tcp_bind_jabber_client_port(ejabberd_t) corenet_tcp_bind_jabber_interserver_port(ejabberd_t) +corenet_tcp_bind_prosody_port(ejabberd_t) corenet_tcp_connect_epmd_port(ejabberd_t) corenet_tcp_connect_generic_port(ejabberd_t) corenet_tcp_connect_jabber_interserver_port(ejabberd_t) diff --git a/sources b/sources index fed0909..c697033 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ejabberd-17.09.tar.gz) = 3eb253642d6688bbe93d0a1234ac29725ed02ed929a1b87a8424e9d01b2200eb174192cd164ba2c31fb8082e92b2886e4068effa504f66025809685867ba90f0 +SHA512 (ejabberd-18.01.tar.gz) = f7cce642e567ca11b000b74dfaba3f608218ace6c07cbeee8c545776da7cbb3b0a9a97ca257a5c0fae61593d0457c6c9bf906a63ca18d7d3dfca32fdecd4c986 -- cgit