rpms/cyrus-sasl
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove tmpfiles.d and use RuntimeDirectory instead

Browse Source
This commit is contained in:
Jakub Jelen 2015-07-14 14:23:39 +02:00
parent 04da2a5e8f
commit 15bacb64aa
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cyrus-sasl.spec
View File

@ -20,7 +20,6 @@ Source7: sasl-mechlist.c
Source8: sasl-checkpass.c Source8: sasl-checkpass.c
Source9: saslauthd.sysconfig Source9: saslauthd.sysconfig
Source10: make-no-dlcompatorsrp-tarball.sh Source10: make-no-dlcompatorsrp-tarball.sh
Source11: saslauthd.tmpfiles
URL: http://asg.web.cmu.edu/sasl/sasl-library.html URL: http://asg.web.cmu.edu/sasl/sasl-library.html
Requires: %{name}-lib%{?_isa} = %{version}-%{release} Requires: %{name}-lib%{?_isa} = %{version}-%{release}
Patch11: cyrus-sasl-2.1.25-no_rpath.patch Patch11: cyrus-sasl-2.1.25-no_rpath.patch
@ -328,8 +327,6 @@ install -m755 -d $RPM_BUILD_ROOT/etc/rc.d/init.d $RPM_BUILD_ROOT/etc/sysconfig
install -d -m755 $RPM_BUILD_ROOT/%{_unitdir} install -d -m755 $RPM_BUILD_ROOT/%{_unitdir}
install -m644 -p %{SOURCE5} $RPM_BUILD_ROOT/%{_unitdir}/saslauthd.service install -m644 -p %{SOURCE5} $RPM_BUILD_ROOT/%{_unitdir}/saslauthd.service
install -m644 -p %{SOURCE9} $RPM_BUILD_ROOT/etc/sysconfig/saslauthd install -m644 -p %{SOURCE9} $RPM_BUILD_ROOT/etc/sysconfig/saslauthd
install -m755 -d $RPM_BUILD_ROOT/%{_tmpfilesdir}
install -m644 -p %{SOURCE11} $RPM_BUILD_ROOT/%{_tmpfilesdir}/saslauthd.conf
# Install the config dirs if they're not already there. # Install the config dirs if they're not already there.
install -m755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/sasl2 install -m755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/sasl2
@ -380,8 +377,7 @@ getent passwd %{username} >/dev/null || useradd -r -g %{username} -d %{homedir}
%{_sbindir}/testsaslauthd %{_sbindir}/testsaslauthd
%config(noreplace) /etc/sysconfig/saslauthd %config(noreplace) /etc/sysconfig/saslauthd
%{_unitdir}/saslauthd.service %{_unitdir}/saslauthd.service
%{_tmpfilesdir}/saslauthd.conf %dir %attr(0755, root, root) /run/saslauthd
%dir %attr(0775, root, saslauth) /run/saslauthd
%files lib %files lib
%defattr(-,root,root) %defattr(-,root,root)

1
saslauthd.service
View File

@ -6,6 +6,7 @@ Type=forking
PIDFile=/run/saslauthd/saslauthd.pid PIDFile=/run/saslauthd/saslauthd.pid
EnvironmentFile=/etc/sysconfig/saslauthd EnvironmentFile=/etc/sysconfig/saslauthd
ExecStart=/usr/sbin/saslauthd -m $SOCKETDIR -a $MECH $FLAGS ExecStart=/usr/sbin/saslauthd -m $SOCKETDIR -a $MECH $FLAGS
RuntimeDirectory=saslauthd
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

1
saslauthd.tmpfiles
View File

@ -1 +0,0 @@
d /run/saslauthd 0775 root saslauth -