[jabberd] added README.fedora which describes what to change

Adrian Reber adrian at fedoraproject.org
Thu Jan 31 11:14:04 UTC 2013


commit 567e8b9e7ca7a1d0cdab3928e7273a474e9edb34
Author: Adrian Reber <adrian at lisas.de>
Date:   Thu Jan 31 12:13:12 2013 +0100

    added README.fedora which describes what to change
    
      for authentication with PAM (#896575)

 README.fedora |    9 +++++++++
 jabberd.spec  |   12 ++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)
---
diff --git a/README.fedora b/README.fedora
new file mode 100644
index 0000000..fae30a7
--- /dev/null
+++ b/README.fedora
@@ -0,0 +1,9 @@
+To make the authentication against PAM actually work one of the systemd
+service files needs to altered. The c2s part of jabberd needs to run as
+root to be able to read /etc/shadow. One way to accomplish this is to
+create a jabberd-c2s.service file in /etc/systemd/system with
+following content:
+
+.include /usr/lib/systemd/system/jabberd-c2s.service
+[Service]
+User=root
diff --git a/jabberd.spec b/jabberd.spec
index 733a96a..2855654 100644
--- a/jabberd.spec
+++ b/jabberd.spec
@@ -1,7 +1,7 @@
 Summary:        OpenSource server implementation of the Jabber protocols
 Name:           jabberd
 Version:        2.2.17
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+
 Group:          System Environment/Daemons
 Source0:        https://github.com/downloads/Jabberd2/jabberd2/jabberd-%{version}.tar.xz
@@ -10,6 +10,7 @@ Source2:        jabberd-c2s.service
 Source3:        jabberd-s2s.service
 Source4:        jabberd-sm.service
 Source5:        jabberd-router.service
+Source6:        README.fedora
 URL:            http://jabberd2.org/
 BuildRequires:  openssl-devel libidn-devel expat-devel
 BuildRequires:  systemd-units cppunit-devel
@@ -132,6 +133,9 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/jabberd
 # we have our own start script
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/jabberd.cfg*
 
+# README.fedora
+cp %{SOURCE6} .
+
 %pre
 #creating jabber user
 getent group jabber >/dev/null || groupadd -r jabber
@@ -186,7 +190,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO UPGRADE
+%doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO UPGRADE README.fedora
 %{_mandir}/man8/*
 %{_bindir}/*
 %{_unitdir}/*
@@ -202,6 +206,10 @@ fi
 %attr(700, jabber, jabber) %{_var}/lib/%{name}
 
 %changelog
+* Thu Jan 31 2013 Adrian Reber <adrian at lisas.de> - 2.2.17-2
+- added README.fedora which describes what to change
+  for authentication with PAM (#896575)
+
 * Mon Aug 27 2012 Adrian Reber <adrian at lisas.de> - 2.2.17-1
 - updated to 2.2.17
 - removed all three patches which are now included


More information about the scm-commits mailing list