Hi,

I've attached an updated patch (for 1.0.5) for the SSL snakeoil certificate.
It's been adapted from 1:1.0.5-1ubuntu2.

--
Mathias
diff -uNr dovecot-1.0.5/debian/control dovecot-1.0.5.ssl/debian/control
--- dovecot-1.0.5/debian/control	2007-10-18 16:52:15.000000000 -0400
+++ dovecot-1.0.5.ssl/debian/control	2007-10-18 16:53:23.000000000 -0400
@@ -9,7 +9,7 @@
 
 Package: dovecot-common
 Architecture: any
-Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-13.1), openssl, adduser, ucf (>= 2.0020)
+Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-13.1), openssl, adduser, ucf (>= 2.0020), ssl-cert (>= 1.0-11)
 Replaces: dovecot
 Description: secure mail server that supports mbox and maildir mailboxes
  Dovecot is a mail server whose major goals are security and extreme
diff -uNr dovecot-1.0.5/debian/dovecot-common.postinst dovecot-1.0.5.ssl/debian/dovecot-common.postinst
--- dovecot-1.0.5/debian/dovecot-common.postinst	2007-10-18 16:52:15.000000000 -0400
+++ dovecot-1.0.5.ssl/debian/dovecot-common.postinst	2007-10-18 16:51:45.000000000 -0400
@@ -30,9 +30,8 @@
   
   ## SSL Certs
   # Certs and key file
-  SSL_CERT="/etc/ssl/certs/dovecot.pem"
-  SSL_KEY=/etc/ssl/private/dovecot.pem
-
+  SSL_CERT=$( (grep "ssl_cert_file" /etc/dovecot/dovecot.conf  || echo '/etc/ssl/certs/dovecot.pem') | cut -d'=' -f2)
+  SSL_KEY=$( (grep "ssl_key_file" /etc/dovecot/dovecot.conf || echo '/etc/ssl/private/dovecot.pem') | cut -d'=' -f2)
   
   # Generate new certs if needed
   if [ -e $SSL_CERT ] && [ -e $SSL_KEY ]; then
diff -uNr dovecot-1.0.5/debian/patches/00list dovecot-1.0.5.ssl/debian/patches/00list
--- dovecot-1.0.5/debian/patches/00list	2007-10-18 16:52:15.000000000 -0400
+++ dovecot-1.0.5.ssl/debian/patches/00list	2007-10-18 16:50:49.000000000 -0400
@@ -2,5 +2,6 @@
 dovecot-sql
 dovecot-drac
 postgres_configure
+ssl-cert-snakeoil
 quota_mountpoint
 quota_v2
diff -uNr dovecot-1.0.5/debian/patches/ssl-cert-snakeoil.dpatch dovecot-1.0.5.ssl/debian/patches/ssl-cert-snakeoil.dpatch
--- dovecot-1.0.5/debian/patches/ssl-cert-snakeoil.dpatch	1969-12-31 19:00:00.000000000 -0500
+++ dovecot-1.0.5.ssl/debian/patches/ssl-cert-snakeoil.dpatch	2007-10-18 16:50:38.000000000 -0400
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ssl-cert-snakeoil.dpatch by  <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
[EMAIL PROTECTED]@
+diff -urNad dovecot-1.0.rc1~/dovecot-example.conf dovecot-1.0.rc1/dovecot-example.conf
+--- dovecot-1.0.rc1~/dovecot-example.conf	2006-06-30 15:33:41.000000000 +0200
++++ dovecot-1.0.rc1/dovecot-example.conf	2006-06-30 15:33:41.000000000 +0200
+@@ -86,8 +86,8 @@
+ # PEM encoded X.509 SSL/TLS certificate and private key. They're opened before
+ # dropping root privileges, so keep the key file unreadable by anyone but
+ # root.
+-#ssl_cert_file = /etc/ssl/certs/dovecot.pem
+-#ssl_key_file = /etc/ssl/private/dovecot.pem
++#ssl_cert_file = /etc/ssl/certs/ssl-cert-snakeoil.pem
++#ssl_key_file = /etc/ssl/private/ssl-cert-snakeoil.key
+ 
+ # If key file is password protected, give the password here. Alternatively
+ # give it when starting dovecot with -p parameter.
+diff -urNad dovecot-1.0.rc1~/src/master/master-settings.c dovecot-1.0.rc1/src/master/master-settings.c
+--- dovecot-1.0.rc1~/src/master/master-settings.c	2006-06-17 18:49:04.000000000 +0200
++++ dovecot-1.0.rc1/src/master/master-settings.c	2006-06-30 15:34:50.000000000 +0200
+@@ -273,8 +273,8 @@
+ 
+ 	MEMBER(ssl_disable) FALSE,
+ 	MEMBER(ssl_ca_file) "",
+-	MEMBER(ssl_cert_file) SSLDIR"/certs/dovecot.pem",
+-	MEMBER(ssl_key_file) SSLDIR"/private/dovecot.pem",
++ 	MEMBER(ssl_cert_file) SSLDIR"/certs/ssl-cert-snakeoil.pem",
++ 	MEMBER(ssl_key_file) SSLDIR"/private/ssl-cert-snakeoil.key",
+ 	MEMBER(ssl_key_password) "",
+ 	MEMBER(ssl_parameters_regenerate) 168,
+ 	MEMBER(ssl_cipher_list) "",

Reply via email to