rpms/exim/devel exim.init,1.4,1.5 exim.spec,1.72,1.73
Miroslav Lichvar
mlichvar at fedoraproject.org
Thu Mar 18 15:46:05 UTC 2010
- Previous message: File glibc-2.11.1-4-g11c19d3.tar.bz2 uploaded to lookaside cache by schwab
- Next message: rpms/selinux-policy/devel .cvsignore, 1.197, 1.198 booleans-targeted.conf, 1.56, 1.57 modules-minimum.conf, 1.52, 1.53 modules-mls.conf, 1.67, 1.68 modules-targeted.conf, 1.161, 1.162 nsadiff, 1.33, 1.34 policy-F13.patch, 1.52, 1.53 securetty_types-minimum, 1.1, 1.2 securetty_types-mls, 1.1, 1.2 securetty_types-targeted, 1.2, 1.3 selinux-policy.spec, 1.969, 1.970 sources, 1.216, 1.217
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mlichvar
Update of /cvs/pkgs/rpms/exim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32442
Modified Files:
exim.init exim.spec
Log Message:
- follow guidelines for alternatives (#570800)
- fix init script LSB compliance (#523238)
- handle undefined NETWORKING in init script (#483528)
Index: exim.init
===================================================================
RCS file: /cvs/pkgs/rpms/exim/devel/exim.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- exim.init 18 Aug 2009 13:38:20 -0000 1.4
+++ exim.init 18 Mar 2010 15:46:04 -0000 1.5
@@ -23,11 +23,6 @@ else
QUEUE=1h
fi
-# Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
-
-[ -f /usr/sbin/exim ] || exit 0
-
gen_cert() {
if [ ! -f /etc/pki/tls/certs/exim.pem ] ; then
umask 077
@@ -59,6 +54,10 @@ EOF
}
start() {
+ [ "$EUID" != "0" ] && exit 4
+ [ "${NETWORKING}" = "no" ] && exit 1
+ [ -f /usr/sbin/exim ] || exit 5
+
# check ownerships
# do this by seeing if /var/log/exim/main.log exists and is
# owned by exim - if owned by someone else we fix it up
@@ -83,6 +82,7 @@ start() {
}
stop() {
+ [ "$EUID" != "0" ] && exit 4
# Stop daemons.
echo -n $"Shutting down exim: "
killproc exim
@@ -107,22 +107,22 @@ case "$1" in
restart)
restart
;;
- reload)
- if [ -f /var/lock/subsys/exim ]; then
- echo -n $"Reloading exim:"
- killproc exim -HUP
- echo
- fi
+ reload|force-reload)
+ status exim > /dev/null || exit 7
+ echo -n $"Reloading exim:"
+ killproc exim -HUP
+ echo
;;
- condrestart)
- [ -f /var/lock/subsys/exim ] && restart || :
+ condrestart|try-restart)
+ status exim > /dev/null || exit 0
+ restart
;;
status)
status exim
;;
*)
- echo $"Usage: $0 {start|stop|restart|reload|status|condrestart}"
- exit 1
+ echo $"Usage: $0 {start|stop|restart|reload|force-reload|status|condrestart|try-restart}"
+ exit 2
esac
exit $RETVAL
Index: exim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exim/devel/exim.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- exim.spec 9 Feb 2010 22:46:09 -0000 1.72
+++ exim.spec 18 Mar 2010 15:46:04 -0000 1.73
@@ -12,13 +12,12 @@
Summary: The exim mail transfer agent
Name: exim
Version: 4.71
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Url: http://www.exim.org/
Group: System Environment/Daemons
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Provides: MTA smtpd smtpdaemon server(smtp) /usr/bin/newaliases
-Provides: /usr/sbin/sendmail /usr/bin/mailq /usr/bin/rmail
+Provides: MTA smtpd smtpdaemon server(smtp)
Requires(post): /sbin/chkconfig /sbin/service %{_sbindir}/alternatives
Requires(preun): /sbin/chkconfig /sbin/service %{_sbindir}/alternatives
Requires(pre): %{_sbindir}/groupadd, %{_sbindir}/useradd
@@ -292,6 +291,14 @@ mkdir -p $RPM_BUILD_ROOT/etc/pki/tls/{ce
touch $RPM_BUILD_ROOT/etc/pki/tls/{certs,private}/exim.pem
chmod 600 $RPM_BUILD_ROOT/etc/pki/tls/{certs,private}/exim.pem
+# generate alternatives ghosts
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+for i in %{_sbindir}/sendmail %{_bindir}/{mailq,runq,rsmtp,rmail,newaliases} \
+ /usr/lib/sendmail %{_sysconfdir}/pam.d/smtp %{_mandir}/man1/mailq.1.gz
+do
+ touch $RPM_BUILD_ROOT$i
+done
+
%if 0%{?buildclam}
# Munge the clamav init and config files from clamav-devel. This really ought
# to be a subpackage of clamav, but this hack will have to do for now.
@@ -430,6 +437,16 @@ fi
%attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) /etc/pki/tls/certs/exim.pem
%attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) /etc/pki/tls/private/exim.pem
+%attr(0755,root,root) %ghost %{_sbindir}/sendmail
+%attr(0755,root,root) %ghost %{_bindir}/mailq
+%attr(0755,root,root) %ghost %{_bindir}/runq
+%attr(0755,root,root) %ghost %{_bindir}/rsmtp
+%attr(0755,root,root) %ghost %{_bindir}/rmail
+%attr(0755,root,root) %ghost %{_bindir}/newaliases
+%attr(0755,root,root) %ghost /usr/lib/sendmail
+%ghost %{_sysconfdir}/pam.d/smtp
+%ghost %{_mandir}/man1/mailq.1.gz
+
%files mysql
%defattr(-,root,root,-)
%{_libdir}/exim/%{version}-%{release}/lookups/mysql.so
@@ -484,6 +501,11 @@ test "$1" = 0 || %{_initrddir}/clamd.ex
%{_sysconfdir}/cron.daily/greylist-tidy.sh
%changelog
+* Thu Mar 18 2010 Miroslav Lichvar <mlichvar at redhat.com> - 4.71-3
+- follow guidelines for alternatives (#570800)
+- fix init script LSB compliance (#523238)
+- handle undefined NETWORKING in init script (#483528)
+
* Tue Feb 09 2010 Adam Jackson <ajax at redhat.com> 4.71-2
- Fix FTBFS with --no-add-needed
- Previous message: File glibc-2.11.1-4-g11c19d3.tar.bz2 uploaded to lookaside cache by schwab
- Next message: rpms/selinux-policy/devel .cvsignore, 1.197, 1.198 booleans-targeted.conf, 1.56, 1.57 modules-minimum.conf, 1.52, 1.53 modules-mls.conf, 1.67, 1.68 modules-targeted.conf, 1.161, 1.162 nsadiff, 1.33, 1.34 policy-F13.patch, 1.52, 1.53 securetty_types-minimum, 1.1, 1.2 securetty_types-mls, 1.1, 1.2 securetty_types-targeted, 1.2, 1.3 selinux-policy.spec, 1.969, 1.970 sources, 1.216, 1.217
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list