1 |
wschlich 07/12/09 22:36:44 |
2 |
|
3 |
Modified: ChangeLog dovecot-1.0.8.ebuild |
4 |
Log: |
5 |
ROOT fixes |
6 |
(Portage version: 2.1.4_rc9) |
7 |
|
8 |
Revision Changes Path |
9 |
1.129 net-mail/dovecot/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/dovecot/ChangeLog?rev=1.129&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/dovecot/ChangeLog?rev=1.129&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/dovecot/ChangeLog?r1=1.128&r2=1.129 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v |
18 |
retrieving revision 1.128 |
19 |
retrieving revision 1.129 |
20 |
diff -u -r1.128 -r1.129 |
21 |
--- ChangeLog 9 Dec 2007 02:22:06 -0000 1.128 |
22 |
+++ ChangeLog 9 Dec 2007 22:36:43 -0000 1.129 |
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.128 2007/12/09 02:22:06 wschlich Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.129 2007/12/09 22:36:43 wschlich Exp $ |
28 |
+ |
29 |
+ 09 Dec 2007; Wolfram Schlich <wschlich@g.o> dovecot-1.0.8.ebuild: |
30 |
+ ROOT fixes |
31 |
|
32 |
09 Dec 2007; Wolfram Schlich <wschlich@g.o> dovecot-1.0.8.ebuild: |
33 |
fix bug #201686 |
34 |
|
35 |
|
36 |
|
37 |
1.4 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.4&view=markup |
40 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/dovecot/dovecot-1.0.8.ebuild?rev=1.4&content-type=text/plain |
41 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/dovecot/dovecot-1.0.8.ebuild?r1=1.3&r2=1.4 |
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.3 |
47 |
retrieving revision 1.4 |
48 |
diff -u -r1.3 -r1.4 |
49 |
--- dovecot-1.0.8.ebuild 9 Dec 2007 02:22:06 -0000 1.3 |
50 |
+++ dovecot-1.0.8.ebuild 9 Dec 2007 22:36:43 -0000 1.4 |
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.3 2007/12/09 02:22:06 wschlich Exp $ |
55 |
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.0.8.ebuild,v 1.4 2007/12/09 22:36:43 wschlich Exp $ |
56 |
|
57 |
inherit autotools eutils ssl-cert |
58 |
|
59 |
@@ -181,7 +181,7 @@ |
60 |
die "${FUNCNAME}: variable name missing" |
61 |
fi |
62 |
sed -n 's/^[[:space:]]\?'"${varname}"'[[:space:]]*="*\([^#"]\+\)"*/\1/p' \ |
63 |
- "${ROOT:-/}"etc/dovecot/dovecot.conf |
64 |
+ "${ROOT}"/etc/dovecot/dovecot.conf |
65 |
} |
66 |
|
67 |
pkg_postinst() { |
68 |
@@ -189,23 +189,23 @@ |
69 |
elog "You are encouraged to start afresh with a new configuration file." |
70 |
elog "see http://wiki.dovecot.org/ for configuration examples." |
71 |
|
72 |
- if [[ -e "${ROOT:-/}"etc/dovecot.conf ]]; then |
73 |
+ if [[ -e "${ROOT}"/etc/dovecot.conf ]]; then |
74 |
echo |
75 |
- ewarn "The Dovecot configuration now resides in ${ROOT:-/}etc/dovecot" |
76 |
+ ewarn "The Dovecot configuration now resides in ${ROOT}/etc/dovecot" |
77 |
fi |
78 |
|
79 |
local base_dir="$(get_config_var base_dir)" |
80 |
base_dir="${base_dir:-/var/run/dovecot}" |
81 |
if use ssl; then |
82 |
# Let's not make a new certificate if we already have one |
83 |
- if ! [[ -e "${ROOT:-/}"etc/ssl/dovecot/server.pem && \ |
84 |
- -e "${ROOT:-/}"etc/ssl/dovecot/server.key ]]; then |
85 |
+ if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \ |
86 |
+ -e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then |
87 |
einfo "Creating SSL certificate" |
88 |
SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}" |
89 |
- install_cert "${ROOT:-/}"etc/ssl/dovecot/server |
90 |
- chown dovecot:mail "${ROOT:-/}"etc/ssl/dovecot/server.{key,pem} |
91 |
+ install_cert /etc/ssl/dovecot/server |
92 |
+ chown dovecot:mail "${ROOT}"/etc/ssl/dovecot/server.{key,pem} |
93 |
fi |
94 |
- if [[ ! -e "${ROOT:-/}${base_dir}/login/ssl-parameters.dat" ]]; then |
95 |
+ if [[ ! -e "${ROOT}${base_dir}/login/ssl-parameters.dat" ]]; then |
96 |
echo |
97 |
elog "Dovecot requires DH SSL Parameters if you use SSL connections" |
98 |
elog "These take some time to make, and dovecot will create them before" |
99 |
@@ -222,6 +222,6 @@ |
100 |
|
101 |
if use ssl; then |
102 |
einfo "Regenerating SSL parameters. This will take some time." |
103 |
- "${ROOT:-/}"usr/libexec/dovecot/ssl-build-param "${base_dir}/login/ssl-parameters.dat" |
104 |
+ "${ROOT}"/usr/libexec/dovecot/ssl-build-param "${base_dir}/login/ssl-parameters.dat" |
105 |
fi |
106 |
} |
107 |
|
108 |
|
109 |
|
110 |
-- |
111 |
gentoo-commits@g.o mailing list |