rpms/exim/devel exim-4.69-strictaliasing.patch, NONE, 1.1 exim.init, 1.3, 1.4 exim.spec, 1.61, 1.62
Miroslav Lichvar
mlichvar at fedoraproject.org
Tue Aug 18 13:38:20 UTC 2009
- Previous message: rpms/PackageKit/F-11 .cvsignore, 1.46, 1.47 PackageKit.spec, 1.110, 1.111 sources, 1.47, 1.48
- Next message: rpms/setroubleshoot/devel .cvsignore, 1.115, 1.116 setroubleshoot.spec, 1.153, 1.154 sources, 1.128, 1.129
- 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-serv11766
Modified Files:
exim.init exim.spec
Added Files:
exim-4.69-strictaliasing.patch
Log Message:
- Move certificate generation to init script (#517013)
- Fix strict aliasing warning
exim-4.69-strictaliasing.patch:
exim.h | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE exim-4.69-strictaliasing.patch ---
diff -up exim-4.69/src/exim.h.strictaliasing exim-4.69/src/exim.h
--- exim-4.69/src/exim.h.strictaliasing 2009-08-18 15:10:42.000000000 +0200
+++ exim-4.69/src/exim.h 2009-08-18 15:16:01.000000000 +0200
@@ -484,6 +484,7 @@ union sockaddr_46 {
#if HAVE_IPV6
struct sockaddr_in6 v6;
#endif
+ struct sockaddr g;
};
/* If SUPPORT_TLS is not defined, ensure that USE_GNUTLS is also not defined
Index: exim.init
===================================================================
RCS file: /cvs/pkgs/rpms/exim/devel/exim.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- exim.init 7 Aug 2009 07:19:06 -0000 1.3
+++ exim.init 18 Aug 2009 13:38:20 -0000 1.4
@@ -28,6 +28,36 @@ fi
[ -f /usr/sbin/exim ] || exit 0
+gen_cert() {
+ if [ ! -f /etc/pki/tls/certs/exim.pem ] ; then
+ umask 077
+ FQDN=`hostname`
+ if [ "x${FQDN}" = "x" ]; then
+ FQDN=localhost.localdomain
+ fi
+ echo -n $"Generating exim certificate: "
+ cat << EOF | openssl req -new -x509 -days 365 -nodes \
+ -out /etc/pki/tls/certs/exim.pem \
+ -keyout /etc/pki/tls/private/exim.pem &>/dev/null
+--
+SomeState
+SomeCity
+SomeOrganization
+SomeOrganizationalUnit
+${FQDN}
+root@${FQDN}
+EOF
+ if [ $? -eq 0 ]; then
+ success
+ chown exim.exim /etc/pki/tls/{private,certs}/exim.pem
+ chmod 600 /etc/pki/tls/{private,certs}/exim.pem
+ else
+ failure
+ fi
+ echo
+ fi
+}
+
start() {
# check ownerships
# do this by seeing if /var/log/exim/main.log exists and is
@@ -39,6 +69,10 @@ start() {
chown -R exim:exim /var/log/exim /var/spool/exim
fi
fi
+
+ # generate certificate if doesn't exist
+ gen_cert
+
# Start daemons.
echo -n $"Starting exim: "
daemon /usr/sbin/exim $([ "$DAEMON" = yes ] && echo -bd) \
Index: exim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exim/devel/exim.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- exim.spec 12 Aug 2009 13:54:32 -0000 1.61
+++ exim.spec 18 Aug 2009 13:38:20 -0000 1.62
@@ -19,7 +19,7 @@ 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
-Requires(post): /sbin/chkconfig /sbin/service %{_sbindir}/alternatives openssl
+Requires(post): /sbin/chkconfig /sbin/service %{_sbindir}/alternatives
Requires(preun): /sbin/chkconfig /sbin/service %{_sbindir}/alternatives
Requires(pre): %{_sbindir}/groupadd, %{_sbindir}/useradd
%if 0%{?buildclam}
@@ -53,6 +53,7 @@ Patch22: exim-4.66-greylist-conf.patch
Patch23: exim-4.67-smarthost-config.patch
Patch24: exim-4.69-dynlookup.patch
Patch25: exim-4.69-dynlookup-config.patch
+Patch26: exim-4.69-strictaliasing.patch
Requires: /etc/pki/tls/certs /etc/pki/tls/private
Requires: /etc/aliases
@@ -183,6 +184,7 @@ greylisting unconditional.
%patch23 -p1 -b .smarthost
%patch24 -p1 -b .dynlookup
%patch25 -p1 -b .dynconfig
+%patch26 -p1 -b .strictaliasing
cp src/EDITME Local/Makefile
sed -i 's@^# LOOKUP_MODULE_DIR=.*@LOOKUP_MODULE_DIR=%{_libdir}/exim/%{version}-%{release}/lookups@' Local/Makefile
@@ -351,27 +353,6 @@ exit 0
--slave %{_mandir}/man1/mailq.1.gz mta-mailqman %{_mandir}/man8/exim.8.gz \
--initscript exim
-if [ ! -f /etc/pki/tls/certs/exim.pem ] ; then
- umask 077
- FQDN=`hostname`
- if [ "x${FQDN}" = "x" ]; then
- FQDN=localhost.localdomain
- fi
- cat << EOF | openssl req -new -x509 -days 365 -nodes \
- -out /etc/pki/tls/certs/exim.pem \
- -keyout /etc/pki/tls/private/exim.pem &>/dev/null
---
-SomeState
-SomeCity
-SomeOrganization
-SomeOrganizationalUnit
-${FQDN}
-root@${FQDN}
-EOF
- chown exim.exim /etc/pki/tls/{private,certs}/exim.pem
- chmod 600 /etc/pki/tls/{private,certs}/exim.pem
-fi
-
%preun
if [ $1 = 0 ]; then
/sbin/service exim stop > /dev/null 2>&1
@@ -503,8 +484,9 @@ test "$1" = 0 || %{_initrddir}/clamd.ex
%{_sysconfdir}/cron.daily/greylist-tidy.sh
%changelog
-* Wed Aug 12 2009 David Woodhouse <David.Woodhouse at intel.com>
-- Require openssl for %post
+* Tue Aug 18 2009 Miroslav Lichvar <mlichvar at redhat.com> - 4.69-14
+- Move certificate generation to init script (#517013)
+- Fix strict aliasing warning
* Wed Aug 12 2009 David Woodhouse <David.Woodhouse at intel.com> - 4.69-13
- Cope with lack of /etc/sysconfig/network (#506330)
- Previous message: rpms/PackageKit/F-11 .cvsignore, 1.46, 1.47 PackageKit.spec, 1.110, 1.111 sources, 1.47, 1.48
- Next message: rpms/setroubleshoot/devel .cvsignore, 1.115, 1.116 setroubleshoot.spec, 1.153, 1.154 sources, 1.128, 1.129
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list