diff options
| author | Randy Barlow <randy@electronsweatshop.com> | 2016-12-25 12:57:58 -0500 |
|---|---|---|
| committer | Randy Barlow <randy@electronsweatshop.com> | 2016-12-25 12:57:58 -0500 |
| commit | a071f0d32128b3edbf3a18677224be1a00b14ffb (patch) | |
| tree | 4335ed8986779467ce50b05db6b8cb4cdf01bc4d | |
| parent | a371d5c070eed365bbcdf2ffc346b6456084ff48 (diff) | |
| download | ejabberd-a071f0d32128b3edbf3a18677224be1a00b14ffb.tar.gz ejabberd-a071f0d32128b3edbf3a18677224be1a00b14ffb.tar.xz ejabberd-a071f0d32128b3edbf3a18677224be1a00b14ffb.zip | |
Use auth_admin for all polkit default rules (#1094143).
Also,
- Drop unused BuildRequires on hevea and texlive-comment.
- Add a Requires on logrotate since we install a logrotate.d file.
| -rw-r--r-- | ejabberd.spec | 12 | ||||
| -rw-r--r-- | ejabberdctl.polkit.actions | 6 |
2 files changed, 12 insertions, 6 deletions
diff --git a/ejabberd.spec b/ejabberd.spec index 69111b8..0d09ced 100644 --- a/ejabberd.spec +++ b/ejabberd.spec @@ -5,7 +5,7 @@ Name: ejabberd Version: 16.09 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A distributed, fault-tolerant Jabber/XMPP server License: GPLv2+ @@ -69,8 +69,6 @@ BuildRequires: libyaml-devel >= 0.1.4 BuildRequires: openssl-devel >= 1.0.0 BuildRequires: pam-devel -BuildRequires: hevea -BuildRequires: texlive-comment BuildRequires: autoconf BuildRequires: automake @@ -87,6 +85,8 @@ Provides: group(%{name}) # From rebar Requires: elixir >= 1.1.0 +# We install a logrotate.d file +Requires: logrotate # for /usr/bin/pkexec Requires: polkit # for flock in ejabberdctl @@ -273,6 +273,7 @@ fi) %dir %{_erllibdir}/%{name}-%{version}/priv %dir %{_erllibdir}/%{name}-%{version}/priv/bin %dir %{_erllibdir}/%{name}-%{version}/priv/msgs +%dir %{_erllibdir}/%{name}-%{version}/priv/sql %{_erllibdir}/%{name}-%{version}/ebin/*.app %{_erllibdir}/%{name}-%{version}/ebin/*.beam @@ -287,6 +288,11 @@ fi) %changelog +* 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. +- Add a Requires on logrotate since we install a logrotate.d file. + * Thu Dec 01 2016 Randy Barlow <bowlofeggs@fedoraproject.org> - 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). diff --git a/ejabberdctl.polkit.actions b/ejabberdctl.polkit.actions index f3ef4f4..7232718 100644 --- a/ejabberdctl.polkit.actions +++ b/ejabberdctl.polkit.actions @@ -7,9 +7,9 @@ <_description>Run ejabberd control script</_description> <_message>Authentication is required for running ejabberdctl</_message> <defaults> - <allow_any>no</allow_any> - <allow_inactive>auth_self</allow_inactive> - <allow_active>auth_self</allow_active> + <allow_any>auth_admin</allow_any> + <allow_inactive>auth_admin</allow_inactive> + <allow_active>auth_admin</allow_active> </defaults> <annotate key="org.freedesktop.policykit.exec.path">/bin/sh</annotate> <annotate key="org.freedesktop.policykit.exec.argv1">/usr/bin/ejabberdctl</annotate> |