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