1 |
eras 12/01/06 22:25:52 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: dovecot-2.1_rc3.ebuild |
5 |
Removed: dovecot-2.1_rc1.ebuild |
6 |
Log: |
7 |
version bump |
8 |
|
9 |
(Portage version: 2.1.10.44/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.336 net-mail/dovecot/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/dovecot/ChangeLog?rev=1.336&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/dovecot/ChangeLog?rev=1.336&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/dovecot/ChangeLog?r1=1.335&r2=1.336 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v |
21 |
retrieving revision 1.335 |
22 |
retrieving revision 1.336 |
23 |
diff -u -r1.335 -r1.336 |
24 |
--- ChangeLog 6 Jan 2012 21:46:27 -0000 1.335 |
25 |
+++ ChangeLog 6 Jan 2012 22:25:52 -0000 1.336 |
26 |
@@ -1,6 +1,12 @@ |
27 |
# ChangeLog for net-mail/dovecot |
28 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.335 2012/01/06 21:46:27 eras Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.336 2012/01/06 22:25:52 eras Exp $ |
31 |
+ |
32 |
+*dovecot-2.1_rc3 (06 Jan 2012) |
33 |
+ |
34 |
+ 06 Jan 2012; Eray Aslan <eras@g.o> -dovecot-2.1_rc1.ebuild, |
35 |
+ +dovecot-2.1_rc3.ebuild, -files/SnowballAnalyzer.h, -files/SnowballFilter.h: |
36 |
+ version bump |
37 |
|
38 |
*dovecot-2.0.17 (06 Jan 2012) |
39 |
|
40 |
|
41 |
|
42 |
|
43 |
1.1 net-mail/dovecot/dovecot-2.1_rc3.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/dovecot/dovecot-2.1_rc3.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/dovecot/dovecot-2.1_rc3.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: dovecot-2.1_rc3.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2012 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.1_rc3.ebuild,v 1.1 2012/01/06 22:25:52 eras Exp $ |
53 |
|
54 |
EAPI=4 |
55 |
|
56 |
inherit eutils versionator ssl-cert autotools |
57 |
|
58 |
MY_P="${P/_/.}" |
59 |
major_minor="$( get_version_component_range 1-2 )" |
60 |
major_dash_minor="$( replace_version_separator 1 - ${major_minor} )" |
61 |
sieve_version="0.3.0" |
62 |
sieve_snapshot="d17f4a699ad2" |
63 |
SRC_URI="http://www.dovecot.org/releases/${major_minor}/rc/${MY_P}.tar.gz |
64 |
sieve? ( |
65 |
http://hg.rename-it.nl/${PN}-${major_minor}-pigeonhole/archive/${sieve_snapshot}.tar.bz2 \ |
66 |
-> ${PN}-${major_minor}-pigeonhole-${sieve_snapshot}.tar.bz2 |
67 |
) |
68 |
managesieve? ( |
69 |
http://hg.rename-it.nl/${PN}-${major_minor}-pigeonhole/archive/${sieve_snapshot}.tar.bz2 \ |
70 |
-> ${PN}-${major_minor}-pigeonhole-${sieve_snapshot}.tar.bz2 |
71 |
) " |
72 |
DESCRIPTION="An IMAP and POP3 server written with security primarily in mind" |
73 |
HOMEPAGE="http://www.dovecot.org/" |
74 |
|
75 |
SLOT="0" |
76 |
LICENSE="LGPL-2.1 MIT" |
77 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~s390 ~sparc ~x86 ~x86-fbsd" |
78 |
|
79 |
IUSE="bzip2 caps cydir sdbox doc ipv6 imapc kerberos ldap lucene +maildir managesieve mbox |
80 |
mdbox mysql pam postgres sieve sqlite +ssl static-libs suid vpopmail zlib" |
81 |
|
82 |
DEPEND="caps? ( sys-libs/libcap ) |
83 |
kerberos? ( virtual/krb5 ) |
84 |
ldap? ( net-nds/openldap ) |
85 |
lucene? ( >=dev-cpp/clucene-2.3 ) |
86 |
mysql? ( virtual/mysql ) |
87 |
pam? ( virtual/pam ) |
88 |
postgres? ( dev-db/postgresql-base ) |
89 |
sqlite? ( dev-db/sqlite ) |
90 |
ssl? ( dev-libs/openssl ) |
91 |
vpopmail? ( net-mail/vpopmail ) |
92 |
virtual/libiconv" |
93 |
|
94 |
RDEPEND="${DEPEND} |
95 |
>=net-mail/mailbase-0.00-r8" |
96 |
|
97 |
S=${WORKDIR}/${MY_P} |
98 |
|
99 |
pkg_setup() { |
100 |
elog "${PN}-${major_minor}-pigeonhole-${sieve_snapshot}.tar.bz2" |
101 |
if use managesieve && ! use sieve; then |
102 |
ewarn "managesieve USE flag selected but sieve USE flag unselected" |
103 |
ewarn "sieve USE flag will be turned on" |
104 |
fi |
105 |
|
106 |
# Add user and group for login process (same as for fedora/redhat) |
107 |
# default internal user |
108 |
enewgroup dovecot 97 |
109 |
enewuser dovecot 97 -1 /dev/null dovecot |
110 |
# add "mail" group for suid'ing. Better security isolation. |
111 |
if use suid; then |
112 |
enewgroup mail |
113 |
fi |
114 |
# default login user |
115 |
enewuser dovenull -1 -1 /dev/null |
116 |
} |
117 |
|
118 |
src_prepare() { |
119 |
if use sieve || use managesieve ; then |
120 |
cd "../dovecot-${major_dash_minor}-pigeonhole-${sieve_snapshot}" \ |
121 |
|| die "cd failed" |
122 |
eautoreconf |
123 |
fi |
124 |
} |
125 |
|
126 |
src_configure() { |
127 |
local conf="" |
128 |
|
129 |
if use postgres || use mysql || use sqlite; then |
130 |
conf="${conf} --with-sql" |
131 |
fi |
132 |
|
133 |
local storages="" |
134 |
for storage in cydir sdbox mdbox maildir mbox imapc; do |
135 |
use ${storage} && storages="${storage} ${storages}" |
136 |
done |
137 |
[ "${storages}" ] || storages="maildir" |
138 |
|
139 |
# turn valgrind tests off. Bug #340791 |
140 |
VALGRIND=no econf \ |
141 |
--localstatedir="${EPREFIX}/var" \ |
142 |
--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \ |
143 |
$( use_with bzip2 bzlib ) \ |
144 |
$( use_with caps libcap ) \ |
145 |
$( use_with kerberos gssapi ) \ |
146 |
$( use_with ldap ) \ |
147 |
$( use_with lucene ) \ |
148 |
--without-stemmer \ |
149 |
$( use_with mysql ) \ |
150 |
$( use_with pam ) \ |
151 |
$( use_with postgres pgsql ) \ |
152 |
$( use_with sqlite ) \ |
153 |
$( use_with ssl ) \ |
154 |
$( use_with vpopmail ) \ |
155 |
$( use_with zlib ) \ |
156 |
$( use_enable static-libs static ) \ |
157 |
--with-storages="${storages}" \ |
158 |
--disable-rpath \ |
159 |
--without-systemdsystemunitdir \ |
160 |
${conf} |
161 |
|
162 |
if use sieve || use managesieve ; then |
163 |
# The sieve plugin needs this file to be build to determine the plugin |
164 |
# directory and the list of libraries to link to. |
165 |
emake dovecot-config || die "emake dovecot-config failed" |
166 |
cd "../dovecot-${major_dash_minor}-pigeonhole-${sieve_snapshot}" || die "cd failed" |
167 |
econf \ |
168 |
$( use_enable static-libs static ) \ |
169 |
--localstatedir="${EPREFIX}/var" \ |
170 |
--enable-shared \ |
171 |
--with-dovecot="../${MY_P}" \ |
172 |
$( use_with managesieve ) |
173 |
fi |
174 |
} |
175 |
|
176 |
src_compile() { |
177 |
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" |
178 |
|
179 |
if use sieve || use managesieve ; then |
180 |
cd "../dovecot-${major_dash_minor}-pigeonhole-${sieve_snapshot}" || die "cd failed" |
181 |
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" |
182 |
fi |
183 |
} |
184 |
|
185 |
src_test() { |
186 |
default_src_test |
187 |
if use sieve || use managesieve ; then |
188 |
cd "../dovecot-${major_dash_minor}-pigeonhole-${sieve_snapshot}" || die "cd failed" |
189 |
default_src_test |
190 |
fi |
191 |
} |
192 |
|
193 |
src_install () { |
194 |
emake DESTDIR="${ED}" install |
195 |
|
196 |
# insecure: |
197 |
# use suid && fperms u+s /usr/libexec/dovecot/deliver |
198 |
# better: |
199 |
if use suid;then |
200 |
einfo "Changing perms to allow deliver to be suided" |
201 |
fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda" |
202 |
fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda" |
203 |
fi |
204 |
|
205 |
newinitd "${FILESDIR}"/dovecot.init-r3 dovecot |
206 |
|
207 |
rm -rf "${ED}"/usr/share/doc/dovecot |
208 |
|
209 |
dodoc AUTHORS NEWS README TODO |
210 |
dodoc doc/*.{txt,cnf,xml,sh} |
211 |
docinto example-config |
212 |
dodoc doc/example-config/*.{conf,ext} |
213 |
docinto example-config/conf.d |
214 |
dodoc doc/example-config/conf.d/*.{conf,ext} |
215 |
docinto wiki |
216 |
dodoc doc/wiki/* |
217 |
doman doc/man/*.{1,7} |
218 |
|
219 |
# Create the dovecot.conf file from the dovecot-example.conf file that |
220 |
# the dovecot folks nicely left for us.... |
221 |
local conf="${ED}/etc/dovecot/dovecot.conf" |
222 |
local confd="${ED}/etc/dovecot/conf.d" |
223 |
|
224 |
insinto /etc/dovecot |
225 |
doins doc/example-config/*.{conf,ext} |
226 |
insinto /etc/dovecot/conf.d |
227 |
doins doc/example-config/conf.d/*.{conf,ext} |
228 |
fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext |
229 |
rm -f "${confd}/../README" |
230 |
|
231 |
# .maildir is the Gentoo default |
232 |
local mail_location="maildir:~/.maildir" |
233 |
if ! use maildir; then |
234 |
if use mbox; then |
235 |
mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u" |
236 |
keepdir /var/dovecot |
237 |
sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \ |
238 |
"${confd}/10-mail.conf" || die "sed failed" |
239 |
elif use sdbox ; then |
240 |
mail_location="sdbox:~/.sdbox" |
241 |
elif use mdbox ; then |
242 |
mail_location="mdbox:~/.mdbox" |
243 |
fi |
244 |
fi |
245 |
sed -i -e \ |
246 |
"s|#mail_location =|mail_location = ${mail_location}|" \ |
247 |
"${confd}/10-mail.conf" \ |
248 |
|| die "failed to update mail location settings in 10-mail.conf" |
249 |
|
250 |
# We're using pam files (imap and pop3) provided by mailbase |
251 |
if use pam; then |
252 |
sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \ |
253 |
"${confd}/auth-system.conf.ext" \ |
254 |
|| die "failed to update PAM settings in auth-system.conf.ext" |
255 |
# mailbase does not provide a sieve pam file |
256 |
use managesieve && dosym imap /etc/pam.d/sieve |
257 |
sed -i -e \ |
258 |
's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \ |
259 |
"${confd}/10-auth.conf" \ |
260 |
|| die "failed to update PAM settings in 10-auth.conf" |
261 |
fi |
262 |
|
263 |
# Disable ipv6 if necessary |
264 |
if ! use ipv6; then |
265 |
sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \ |
266 |
|| die "failed to update listen settings in dovecot.conf" |
267 |
fi |
268 |
|
269 |
# Update ssl cert locations |
270 |
if use ssl; then |
271 |
sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \ |
272 |
|| die "ssl conf failed" |
273 |
sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \ |
274 |
-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \ |
275 |
"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf" |
276 |
fi |
277 |
|
278 |
# Install SQL configuration |
279 |
if use mysql || use postgres; then |
280 |
sed -i -e \ |
281 |
's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \ |
282 |
"${confd}/10-auth.conf" || die "failed to update SQL settings in \ |
283 |
10-auth.conf" |
284 |
fi |
285 |
|
286 |
# Install LDAP configuration |
287 |
if use ldap; then |
288 |
sed -i -e \ |
289 |
's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \ |
290 |
"${confd}/10-auth.conf" \ |
291 |
|| die "failed to update ldap settings in 10-auth.conf" |
292 |
fi |
293 |
|
294 |
if use vpopmail; then |
295 |
sed -i -e \ |
296 |
's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \ |
297 |
"${confd}/10-auth.conf" \ |
298 |
|| die "failed to update vpopmail settings in 10-auth.conf" |
299 |
fi |
300 |
|
301 |
if use sieve || use managesieve ; then |
302 |
cd "../dovecot-${major_dash_minor}-pigeonhole-${sieve_snapshot}" || die "cd failed" |
303 |
emake DESTDIR="${ED}" install |
304 |
sed -i -e \ |
305 |
's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \ |
306 |
|| die "failed to update sieve settings in 15-lda.conf" |
307 |
rm -rf "${ED}"/usr/share/doc/dovecot |
308 |
dodoc doc/*.txt |
309 |
docinto example-config/conf.d |
310 |
dodoc doc/example-config/conf.d/*.conf |
311 |
insinto /etc/dovecot/conf.d |
312 |
doins doc/example-config/conf.d/90-sieve.conf |
313 |
use managesieve && doins doc/example-config/conf.d/20-managesieve.conf |
314 |
docinto sieve/rfc |
315 |
dodoc doc/rfc/*.txt |
316 |
docinto sieve/devel |
317 |
dodoc doc/devel/DESIGN |
318 |
doman doc/man/*.{1,7} |
319 |
fi |
320 |
|
321 |
use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete |
322 |
} |
323 |
|
324 |
pkg_preinst() { |
325 |
if has_version "<${CATEGORY}/${PN}-2" ; then |
326 |
elog "There are a lot of changes in configuration files in dovecot-2.0." |
327 |
elog "Please read http://wiki.dovecot.org/Upgrading and" |
328 |
elog "check the conf files in ${ROOT}etc/dovecot." |
329 |
elog "You can also run doveconf -n before running etc-update or" |
330 |
elog "dispatch-conf to get an idea about what needs to be changed." |
331 |
ewarn "\nDo NOT {re}start dovecot without checking your conf files" |
332 |
ewarn "and making the necessary changes.\n" |
333 |
fi |
334 |
} |
335 |
|
336 |
pkg_postinst() { |
337 |
if use ssl; then |
338 |
# Let's not make a new certificate if we already have one |
339 |
if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \ |
340 |
-e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then |
341 |
einfo "Creating SSL certificate" |
342 |
SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}" |
343 |
install_cert /etc/ssl/dovecot/server |
344 |
fi |
345 |
fi |
346 |
} |