rpms/dovecot/devel dovecot-0.99.10.4-conf.patch, 1.4, 1.5 dovecot-configfile.patch, 1.4, 1.5 dovecot.spec, 1.28, 1.29
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Apr 22 21:01:52 UTC 2005
Update of /cvs/dist/rpms/dovecot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20619
Modified Files:
dovecot-0.99.10.4-conf.patch dovecot-configfile.patch
dovecot.spec
Log Message:
move ssl certs from /usr/share/ssl to /etc/pki/dovecot
dovecot-0.99.10.4-conf.patch:
dovecot-example.conf | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
Index: dovecot-0.99.10.4-conf.patch
===================================================================
RCS file: /cvs/dist/rpms/dovecot/devel/dovecot-0.99.10.4-conf.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dovecot-0.99.10.4-conf.patch 30 Sep 2004 20:55:24 -0000 1.4
+++ dovecot-0.99.10.4-conf.patch 22 Apr 2005 21:01:48 -0000 1.5
@@ -5,7 +5,7 @@
# with real defaults being based on configure options. The paths listed here
# are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-# --with-ssldir=/etc/ssl
-+# --with-ssldir=/usr/share/ssl
++# --with-ssldir=/etc/pki/dovecot
# Base directory where to store runtime data.
#base_dir = /var/run/dovecot/
@@ -26,8 +26,8 @@
# certificate, just make sure to update the domains in dovecot-openssl.cnf
-#ssl_cert_file = /etc/ssl/certs/dovecot.pem
-#ssl_key_file = /etc/ssl/private/dovecot.pem
-+#ssl_cert_file = /usr/share/ssl/certs/dovecot.pem
-+#ssl_key_file = /usr/share/ssl/private/dovecot.pem
++#ssl_cert_file = /etc/pki/dovecot/dovecot.pem
++#ssl_key_file = /etc/pki/dovecot/private/dovecot.pem
# SSL parameter file. Master process generates this file for login processes.
# It contains Diffie Hellman and RSA parameters.
dovecot-configfile.patch:
dovecot-0.99.11/doc/mkcert.sh | 12 +++++++-----
dovecot-0.99.13/dovecot.conf | 24 +++++++++---------------
2 files changed, 16 insertions(+), 20 deletions(-)
Index: dovecot-configfile.patch
===================================================================
RCS file: /cvs/dist/rpms/dovecot/devel/dovecot-configfile.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dovecot-configfile.patch 17 Jan 2005 20:12:57 -0000 1.4
+++ dovecot-configfile.patch 22 Apr 2005 21:01:48 -0000 1.5
@@ -42,8 +42,8 @@
# certificate, just make sure to update the domains in dovecot-openssl.cnf
-#ssl_cert_file = /etc/ssl/certs/dovecot.pem
-#ssl_key_file = /etc/ssl/private/dovecot.pem
-+ssl_cert_file = /usr/share/ssl/certs/dovecot.pem
-+ssl_key_file = /usr/share/ssl/private/dovecot.pem
++ssl_cert_file = /etc/pki/dovecot/dovecot.pem
++ssl_key_file = /etc/pki/dovecot/private/dovecot.pem
# SSL parameter file. Master process generates this file for login processes.
# It contains Diffie Hellman and RSA parameters.
@@ -74,13 +74,13 @@
OPENSSL=${OPENSSL-openssl}
-SSLDIR=${SSLDIR-/etc/ssl}
-OPENSSLCONFIG=${OPENSSLCONFIG-dovecot-openssl.cnf}
-+SSLDIR=${SSLDIR-/usr/share/ssl}
++SSLDIR=${SSLDIR-/etc/pki/dovecot}
+OPENSSLCONFIG=${OPENSSLCONFIG-$SSLDIR/dovecot-openssl.cnf}
+CERTNAME=${CERTNAME-dovecot}
-CERTFILE=$SSLDIR/certs/imapd.pem
-KEYFILE=$SSLDIR/private/imapd.pem
-+CERTFILE=$SSLDIR/certs/$CERTNAME.pem
++CERTFILE=$SSLDIR/$CERTNAME.pem
+KEYFILE=$SSLDIR/private/$CERTNAME.pem
if [ ! -d $SSLDIR/certs ]; then
Index: dovecot.spec
===================================================================
RCS file: /cvs/dist/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- dovecot.spec 13 Apr 2005 03:46:09 -0000 1.28
+++ dovecot.spec 22 Apr 2005 21:01:48 -0000 1.29
@@ -1,7 +1,7 @@
Summary: Dovecot Secure imap server
Name: dovecot
Version: 0.99.14
-Release: 3.fc4
+Release: 4.fc4
License: LGPL
Group: System Environment/Daemons
@@ -32,7 +32,7 @@
# gettext-devel is needed for running autoconf because of the
# presence of AM_ICONV
BuildRequires: gettext-devel
-Prereq: openssl, /sbin/chkconfig, /usr/sbin/useradd
+Prereq: openssl >= 0.9.7f-4, /sbin/chkconfig, /usr/sbin/useradd
%if %{build_postgres}
BuildRequires: postgresql-devel
@@ -43,7 +43,7 @@
%endif
%define docdir %{_docdir}/%{name}-%{version}
-%define ssldir /usr/share/ssl
+%define ssldir /etc/pki/%{name}
%define restart_flag /tmp/%{name}-restart-after-rpm-install
%define dovecot_uid 97
%define dovecot_gid 97
@@ -93,9 +93,11 @@
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/dovecot
# generate ghost .pem file
-mkdir -p $RPM_BUILD_ROOT/%{ssldir}/{certs,private}
-touch $RPM_BUILD_ROOT/%{ssldir}/{certs,private}/dovecot.pem
-chmod 600 $RPM_BUILD_ROOT/%{ssldir}/{certs,private}/dovecot.pem
+mkdir -p $RPM_BUILD_ROOT/%{ssldir}/private
+touch $RPM_BUILD_ROOT/%{ssldir}/dovecot.pem
+chmod 600 $RPM_BUILD_ROOT/%{ssldir}/dovecot.pem
+touch $RPM_BUILD_ROOT/%{ssldir}/private/dovecot.pem
+chmod 600 $RPM_BUILD_ROOT/%{ssldir}/private/dovecot.pem
mkdir -p $RPM_BUILD_ROOT/var/run/dovecot
chmod 700 $RPM_BUILD_ROOT/var/run/dovecot
@@ -124,7 +126,13 @@
%post
/sbin/chkconfig --add %{name}
# create a ssl cert
-if [ ! -f %{ssldir}/certs/%{name}.pem ]; then
+if [ -f /usr/share/ssl/certs/dovecot.pem -a ! -f %{ssldir}/%{name}.pem ]; then
+mv /usr/share/ssl/certs/dovecot.pem %{ssldir}/%{name}.pem
+fi
+if [ -f /usr/share/ssl/private/dovecot.pem -a ! -f %{ssldir}/private/%{name}.pem ]; then
+mv /usr/share/ssl/private/dovecot.pem %{ssldir}/private/%{name}.pem
+fi
+if [ ! -f %{ssldir}/%{name}.pem ]; then
%{docdir}/examples/mkcert.sh &> /dev/null
fi
# Restart if it had been running before installation
@@ -153,7 +161,7 @@
%config %{_sysconfdir}/rc.d/init.d/dovecot
%config %{_sysconfdir}/pam.d/dovecot
%config(noreplace) %{ssldir}/dovecot-openssl.cnf
-%attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{ssldir}/certs/dovecot.pem
+%attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{ssldir}/dovecot.pem
%attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{ssldir}/private/dovecot.pem
%dir %{_libexecdir}/%{name}
%{_libexecdir}/%{name}/*
@@ -164,6 +172,9 @@
%changelog
+* Fri Apr 22 2005 John Dennis <jdennis at redhat.com> - 0.99.14-4.fc4
+- openssl moved its certs, CA, etc. from /usr/share/ssl to /etc/pki
+
* Tue Apr 12 2005 Tom Lane <tgl at redhat.com> 0.99.14-3.fc4
- Rebuild for Postgres 8.0.2 (new libpq major version).
More information about the fedora-cvs-commits
mailing list