Magellan Linux

Annotation of /trunk/dovecot/patches/dovecot-1.0.5-ssl-fixes.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 378 - (hide annotations) (download)
Tue Oct 16 00:16:11 2007 UTC (16 years, 7 months ago) by niro
File size: 1046 byte(s)
-added ssl-fixes patch

1 niro 378 diff -Naur dovecot-1.0.5/doc/mkcert.sh dovecot-1.0.5-magellan/doc/mkcert.sh
2     --- dovecot-1.0.5/doc/mkcert.sh 2007-05-19 13:14:04.000000000 +0200
3     +++ dovecot-1.0.5-magellan/doc/mkcert.sh 2007-10-16 02:16:56.000000000 +0200
4     @@ -4,14 +4,14 @@
5     # Edit dovecot-openssl.cnf before running this.
6    
7     OPENSSL=${OPENSSL-openssl}
8     -SSLDIR=${SSLDIR-/etc/ssl}
9     -OPENSSLCONFIG=${OPENSSLCONFIG-dovecot-openssl.cnf}
10     +SSLDIR=${SSLDIR-/etc/dovecot/ssl}
11     +OPENSSLCONFIG=${OPENSSLCONFIG-/etc/dovecot/ssl/dovecot-openssl.cnf}
12    
13     -CERTDIR=$SSLDIR/certs
14     -KEYDIR=$SSLDIR/private
15     +CERTDIR=$SSLDIR
16     +KEYDIR=$SSLDIR
17    
18     CERTFILE=$CERTDIR/dovecot.pem
19     -KEYFILE=$KEYDIR/dovecot.pem
20     +KEYFILE=$KEYDIR/dovecot.key
21    
22     if [ ! -d $CERTDIR ]; then
23     echo "$SSLDIR/certs directory doesn't exist"
24     @@ -34,6 +34,7 @@
25     fi
26    
27     $OPENSSL req -new -x509 -nodes -config $OPENSSLCONFIG -out $CERTFILE -keyout $KEYFILE -days 365 || exit 2
28     -chmod 0600 $KEYFILE
29     +chown root:root $CERTFILE $KEYFILE
30     +chmod 0600 $CERTFILE $KEYFILE
31     echo
32     $OPENSSL x509 -subject -fingerprint -noout -in $CERTFILE || exit 2