| 1 |
wschlich 07/12/09 02:22:07 |
| 2 |
|
| 3 |
Modified: ChangeLog dovecot-1.0.8.ebuild |
| 4 |
Log: |
| 5 |
fix bug #201686 |
| 6 |
(Portage version: 2.1.4_rc8) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.128 net-mail/dovecot/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/dovecot/ChangeLog?rev=1.128&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/dovecot/ChangeLog?rev=1.128&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/dovecot/ChangeLog?r1=1.127&r2=1.128 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v |
| 18 |
retrieving revision 1.127 |
| 19 |
retrieving revision 1.128 |
| 20 |
diff -u -r1.127 -r1.128 |
| 21 |
--- ChangeLog 8 Dec 2007 11:35:02 -0000 1.127 |
| 22 |
+++ ChangeLog 9 Dec 2007 02:22:06 -0000 1.128 |
| 23 |
@@ -1,6 +1,9 @@ |
| 24 |
# ChangeLog for net-mail/dovecot |
| 25 |
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.127 2007/12/08 11:35:02 wschlich Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.128 2007/12/09 02:22:06 wschlich Exp $ |
| 28 |
+ |
| 29 |
+ 09 Dec 2007; Wolfram Schlich <wschlich@g.o> dovecot-1.0.8.ebuild: |
| 30 |
+ fix bug #201686 |
| 31 |
|
| 32 |
*dovecot-1.0.8 (08 Dec 2007) |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.3 net-mail/dovecot/dovecot-1.0.8.ebuild |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/dovecot/dovecot-1.0.8.ebuild?rev=1.3&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/dovecot/dovecot-1.0.8.ebuild?rev=1.3&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/dovecot/dovecot-1.0.8.ebuild?r1=1.2&r2=1.3 |
| 42 |
|
| 43 |
Index: dovecot-1.0.8.ebuild |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.0.8.ebuild,v |
| 46 |
retrieving revision 1.2 |
| 47 |
retrieving revision 1.3 |
| 48 |
diff -u -r1.2 -r1.3 |
| 49 |
--- dovecot-1.0.8.ebuild 8 Dec 2007 23:02:46 -0000 1.2 |
| 50 |
+++ dovecot-1.0.8.ebuild 9 Dec 2007 02:22:06 -0000 1.3 |
| 51 |
@@ -1,6 +1,6 @@ |
| 52 |
# Copyright 1999-2007 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.0.8.ebuild,v 1.2 2007/12/08 23:02:46 mr_bones_ Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.0.8.ebuild,v 1.3 2007/12/09 02:22:06 wschlich Exp $ |
| 56 |
|
| 57 |
inherit autotools eutils ssl-cert |
| 58 |
|
| 59 |
@@ -141,15 +141,6 @@ |
| 60 |
sed -i -e 's,^#ssl_cert_file =.*,ssl_cert_file = /etc/ssl/dovecot/server.pem,' \ |
| 61 |
-e 's,^#ssl_key_file =.*,ssl_key_file = /etc/ssl/dovecot/server.key,' \ |
| 62 |
"${conf}" || die "failed to update SSL settings in dovecot.conf" |
| 63 |
- |
| 64 |
- # Let's not make a new certificate if we already have one |
| 65 |
- if ! [[ -e "${ROOT:-/}"etc/ssl/dovecot/server.pem && \ |
| 66 |
- -e "${ROOT:-/}"etc/ssl/dovecot/server.key ]]; then |
| 67 |
- SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}" |
| 68 |
- insinto "${ROOT:-/}"etc/ssl/dovecot |
| 69 |
- docert server |
| 70 |
- fowners dovecot:mail /etc/ssl/dovecot/server.{key,pem} |
| 71 |
- fi |
| 72 |
fi |
| 73 |
|
| 74 |
# Install SQL configuration |
| 75 |
@@ -194,31 +185,34 @@ |
| 76 |
} |
| 77 |
|
| 78 |
pkg_postinst() { |
| 79 |
- # Touch ssl certs so that they are modified outisde of src_install |
| 80 |
- # We do this so portage does't unmerge them - silly portage |
| 81 |
- if use ssl; then |
| 82 |
- touch "${ROOT:-/}"/etc/ssl/dovecot/server.{key,pem} |
| 83 |
- fi |
| 84 |
- |
| 85 |
elog "The Dovecot configuration has vastly changed since 0.99." |
| 86 |
elog "You are encouraged to start afresh with a new configuration file." |
| 87 |
elog "see http://wiki.dovecot.org/ for configuration examples." |
| 88 |
|
| 89 |
if [[ -e "${ROOT:-/}"etc/dovecot.conf ]]; then |
| 90 |
- ewarn |
| 91 |
+ echo |
| 92 |
ewarn "The Dovecot configuration now resides in ${ROOT:-/}etc/dovecot" |
| 93 |
fi |
| 94 |
|
| 95 |
local base_dir="$(get_config_var base_dir)" |
| 96 |
base_dir="${base_dir:-/var/run/dovecot}" |
| 97 |
- if use ssl \ |
| 98 |
- && [[ ! -e "${ROOT:-/}${base_dir}/login/ssl-parameters.dat" ]]; then |
| 99 |
- elog |
| 100 |
- elog "Dovecot requires DH SSL Parameters if you use SSL connections" |
| 101 |
- elog "These take some time to make, and dovecot will create them before" |
| 102 |
- elog "it allows any SSL connections." |
| 103 |
- elog "You can create them now before starting dovecot like so" |
| 104 |
- elog " emerge --config =${PF}" |
| 105 |
+ if use ssl; then |
| 106 |
+ # Let's not make a new certificate if we already have one |
| 107 |
+ if ! [[ -e "${ROOT:-/}"etc/ssl/dovecot/server.pem && \ |
| 108 |
+ -e "${ROOT:-/}"etc/ssl/dovecot/server.key ]]; then |
| 109 |
+ einfo "Creating SSL certificate" |
| 110 |
+ SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}" |
| 111 |
+ install_cert "${ROOT:-/}"etc/ssl/dovecot/server |
| 112 |
+ chown dovecot:mail "${ROOT:-/}"etc/ssl/dovecot/server.{key,pem} |
| 113 |
+ fi |
| 114 |
+ if [[ ! -e "${ROOT:-/}${base_dir}/login/ssl-parameters.dat" ]]; then |
| 115 |
+ echo |
| 116 |
+ elog "Dovecot requires DH SSL Parameters if you use SSL connections" |
| 117 |
+ elog "These take some time to make, and dovecot will create them before" |
| 118 |
+ elog "it allows any SSL connections." |
| 119 |
+ elog "You can create them now before starting dovecot like so" |
| 120 |
+ elog " emerge --config =${PF}" |
| 121 |
+ fi |
| 122 |
fi |
| 123 |
} |
| 124 |
|
| 125 |
|
| 126 |
|
| 127 |
|
| 128 |
-- |
| 129 |
gentoo-commits@g.o mailing list |
Archives