[rpms/ejabberd] f45: Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/ejabberd

[rpms/ejabberd] f45: Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/ejabberd

[Randy Barlow]

A new commit has been pushed.

Repo   : rpms/ejabberd
Branch : f45
Commit : ee2a88261cb2e9b0b716981af945b63235ff38d9
Author : Randy Barlow <randy@electronsweatshop.com>
Date   : 2017-09-23T12:57:23-04:00
Stats  : +15/-25 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/ejabberd/c/ee2a88261cb2e9b0b716981af945b63235ff38d9?branch=f45

Log:
Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/ejabberd

---
diff --git a/ejabberd.spec b/ejabberd.spec
index cba47da..58187a0 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -5,7 +5,7 @@
 
 Name:           ejabberd
 Version:        17.01
-Release:        3%{?dist}
+Release:        5%{?dist}
 
 License:        GPLv2+
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
@@ -297,10 +297,16 @@ fi)
 
 
 %changelog
-* Sat Sep 23 2017 Randy Barlow <bowlofeggs@fedoraproject.org> - 17.01-3
+* Sat Sep 23 2017 Randy Barlow <bowlofeggs@fedoraproject.org> - 17.01-5
 - Run ejabberd directly in the unit file so it gets the correct SELinux context (#1424823).
 - Don't run ejabberdctl through polkit, as it doesn't play nice with the SELinux policy.
 
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 17.01-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 17.01-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Sun Feb 19 2017 Randy Barlow <bowlofeggs@fedoraproject.org> - 17.01-2
 - Stop shipping the unneeded /usr/lib/tmpfiles.d/ejabberd.conf (#1186674).
 - Stop putting a folder in /var/lock since that's a tmpfs.

diff --git a/ejabberd-0002-Enable-polkit-support.patch b/ejabberd-0002-Enable-polkit-support.patch
deleted file mode 100644
index f3a2335..0000000
--- a/ejabberd-0002-Enable-polkit-support.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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.service b/ejabberd.service
index 9a6afe5..8d61797 100644
--- a/ejabberd.service
+++ b/ejabberd.service
@@ -10,17 +10,16 @@ User=ejabberd
 Group=ejabberd
 LimitNOFILE=16000
 RestartSec=5
-ExecStart=/usr/bin/bash /usr/bin/ejabberdctl \
+ExecStart=/usr/bin/ejabberdctl \
 		--config /etc/ejabberd/ejabberd.yml \
 		--ctl-config /etc/ejabberd/ejabberdctl.cfg \
 		--logs "/var/log/ejabberd" \
 		--spool "/var/lib/ejabberd" start
-ExecStop=/usr/bin/bash /usr/bin/ejabberdctl stop
+ExecStop=/usr/bin/ejabberdctl stop
 RemainAfterExit=yes
 # The CAP_DAC_OVERRIDE capability is required for pam authentication to work
 CapabilityBoundingSet=CAP_DAC_OVERRIDE
 PrivateTmp=true
-PrivateDevices=true
 ProtectHome=true
 ProtectSystem=full
 

diff --git a/ejabberd.spec b/ejabberd.spec
index ce56c76..58187a0 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -5,7 +5,7 @@
 
 Name:           ejabberd
 Version:        17.01
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 License:        GPLv2+
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
@@ -28,8 +28,6 @@ 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
-# polkit support
-Patch2: ejabberd-0002-Enable-polkit-support.patch
 # Fedora-specific
 Patch3: ejabberd-0003-Install-into-BINDIR-instead-of-SBINDIR.patch
 # Fedora-specific
@@ -104,7 +102,6 @@ Windows NT/2000/XP).
 %setup -q
 
 %patch1 -p1 -b .pam_name
-%patch2 -p1 -b .use_polkit
 %patch3 -p1 -b .use_bindir
 %patch4 -p1 -b .enable_sd_notify
 %patch5 -p1 -b .su_with_bash
@@ -300,6 +297,10 @@ fi)
 
 
 %changelog
+* Sat Sep 23 2017 Randy Barlow <bowlofeggs@fedoraproject.org> - 17.01-5
+- Run ejabberd directly in the unit file so it gets the correct SELinux context (#1424823).
+- Don't run ejabberdctl through polkit, as it doesn't play nice with the SELinux policy.
+
 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 17.01-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild