rpms/exim/F-13 .cvsignore, 1.16, 1.17 exim.init, 1.4, 1.5 exim.spec, 1.72, 1.73 sources, 1.16, 1.17
David Woodhouse
dwmw2 at fedoraproject.org
Thu Jun 3 23:02:35 UTC 2010
- Previous message: rpms/R-multcomp/devel .cvsignore, 1.13, 1.14 R-multcomp.spec, 1.23, 1.24 sources, 1.13, 1.14
- Next message: rpms/krusader/F-11 krusader-2.2.0-beta1-rename-selects-ext-regression.patch, 1.1, 1.2 krusader.spec, 1.30, 1.31
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dwmw2
Update of /cvs/pkgs/rpms/exim/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14335
Modified Files:
.cvsignore exim.init exim.spec sources
Log Message:
4.72
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/exim/F-13/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore 24 Dec 2009 20:11:02 -0000 1.16
+++ .cvsignore 3 Jun 2010 23:02:34 -0000 1.17
@@ -1,2 +1,2 @@
sa-exim-4.2.tar.gz
-exim-4.71.tar.bz2
+exim-4.72.tar.bz2
Index: exim.init
===================================================================
RCS file: /cvs/pkgs/rpms/exim/F-13/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 3 Jun 2010 23:02:35 -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/F-13/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 3 Jun 2010 23:02:35 -0000 1.73
@@ -11,14 +11,13 @@
Summary: The exim mail transfer agent
Name: exim
-Version: 4.71
-Release: 2%{?dist}
+Version: 4.72
+Release: 1%{?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,14 @@ test "$1" = 0 || %{_initrddir}/clamd.ex
%{_sysconfdir}/cron.daily/greylist-tidy.sh
%changelog
+* Thu Jun 03 2010 David Woodhouse <David.Woodhouse at intel.com> - 4.72-1
+- Update to 4.72 (fixes CVE-2010-2023, CVS-2010-2024)
+
+* 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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/exim/F-13/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources 24 Dec 2009 20:11:03 -0000 1.16
+++ sources 3 Jun 2010 23:02:35 -0000 1.17
@@ -1,2 +1,2 @@
ad76f73c6b3d01caa88078e3e622745a sa-exim-4.2.tar.gz
-f9c5a2d94b5bb132d06e2fff85bef75e exim-4.71.tar.bz2
+ccc937b533568e5e8340f181a3b3d2ff exim-4.72.tar.bz2
- Previous message: rpms/R-multcomp/devel .cvsignore, 1.13, 1.14 R-multcomp.spec, 1.23, 1.24 sources, 1.13, 1.14
- Next message: rpms/krusader/F-11 krusader-2.2.0-beta1-rename-selects-ext-regression.patch, 1.1, 1.2 krusader.spec, 1.30, 1.31
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list