1 |
commit: c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d |
2 |
Author: Eray Aslan <eras <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 24 15:49:00 2015 +0000 |
4 |
Commit: Eray Aslan <eras <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 24 15:49:00 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8abcbe8 |
7 |
|
8 |
net-mail/dovecot: remove old |
9 |
|
10 |
Package-Manager: portage-2.2.25 |
11 |
|
12 |
net-mail/dovecot/Manifest | 4 - |
13 |
net-mail/dovecot/dovecot-2.2.16-r1.ebuild | 297 ---------------------------- |
14 |
net-mail/dovecot/dovecot-2.2.18-r1.ebuild | 306 ----------------------------- |
15 |
net-mail/dovecot/dovecot-2.2.18.ebuild | 303 ---------------------------- |
16 |
net-mail/dovecot/files/CVE-2015-3420.patch | 52 ----- |
17 |
5 files changed, 962 deletions(-) |
18 |
|
19 |
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest |
20 |
index d61599c..b2b6f52 100644 |
21 |
--- a/net-mail/dovecot/Manifest |
22 |
+++ b/net-mail/dovecot/Manifest |
23 |
@@ -1,6 +1,2 @@ |
24 |
-DIST dovecot-2.2-pigeonhole-0.4.7.tar.gz 1271959 SHA256 04a13ec11652cbff812519eacf4db7dda648ab5c4c5f63b43a437d1fb0cc8d2a SHA512 df1b4c5591ce36dc99a9e5fb0281d1d11e95b7bf37594910c5730ac611dafb744f057dc87416ff638d582191376d210bca63cc548bf34612144cae2ac6e9448d WHIRLPOOL 76b500f935ae2133e70affaf12a3fd3c158b60bd5903b160f7f3a63478b092b57cee6046d0b9afb10bf83ec4b869592ea632031cca75c4bff00f5c58b7fe23f6 |
25 |
-DIST dovecot-2.2-pigeonhole-0.4.8.tar.gz 1567528 SHA256 d73c1c5a11cdfdcb58304a1c1272cce6c8e1868e3f61d393b3b8a725f3bf665b SHA512 34b0bbe2015f8a9558daa9ae8feebfb42437f99578b551cc15d0d5ac04cafc15bf9c5a8395d6903a013639936a5868e39bbebe6432a989da1411b3dfab351c32 WHIRLPOOL a6ba9fdf03c6c80e3e03c79475a283d4c99011c9763869894e53e84d4f556f1484d6eac9d6482f31972f12b7261afa89e21ea432bf01f9407fa50cf0f7543b4c |
26 |
DIST dovecot-2.2-pigeonhole-0.4.9.tar.gz 1577127 SHA256 82892f876d26008a076973dfddf1cffaf5a0451825fd44e06287e94b89078649 SHA512 9e7a18b43d59ed955b142d16696ca221822a547ea59ac70c1bb374eedb28b6ed99ea49f34ead1f9a16ded4573605e410a5cc8e038e1bdf5f943a65588b5d3af2 WHIRLPOOL be309436b43af82a7cb8eff205e1638b2c59751927fdab187e6fde72330e4abd99878cbfa94ca50440ec8de1f9b569bf334d426891ddc73d5f647ee2040c193f |
27 |
-DIST dovecot-2.2.16.tar.gz 4830169 SHA256 56ce1287a17fa88a2083116db00200deff1a5390af5eac1c8ae3f59a2079cff0 SHA512 7e910a58cae6d215169a815423bffd1677663ccb1eb400f7f1e733167c29989f3c6786a2d6cea0ef07e64cb08aa1402adb451e0adbbb999f57b3754c0962dbf8 WHIRLPOOL 22b3911e7efa336da792c2af0dde4e556d6c398d9b9f8127e53b13081777b40846a0324b92bc0b41bfd66b6957c6baaeb4e79bd39bf9ba6e91f9e2726a9575a4 |
28 |
-DIST dovecot-2.2.18.tar.gz 5100040 SHA256 b6d8468cea47f1227f47b80618f7fb872e2b2e9d3302adc107a005dd083865bb SHA512 227fa9c55070ce305d41faebb0fe15df86cb70427dd4043a01837095228b5504121fccaecfbf47fab3426334449b637bffdfe9a93ee2322bb8ff8d69de4967c7 WHIRLPOOL 117116bd436690613adaf51031fb371a82c55818a9d32f58d098c9d53fe52d27ecfe7466a3ce51ab8cd29c952b72b55586f3cd41e13784a7d614a23eabecab9c |
29 |
DIST dovecot-2.2.19.tar.gz 5256627 SHA256 759e1e3f9d907cdaabad1f5fbacc793ca191d234c084bec3bba42966952a4e9f SHA512 1b9d605a6a5862ade9d1ca634a9e0171b7c212ab025fc2059051c3795470685b66516fa9fbe5ad91d84388268ea15795f2dcd70ffdf81736ce4d80fd284835e9 WHIRLPOOL 30dbe70bfeef10dbe414ebf3f091041ad66926a8748cd401ecaf9ed5c7602939e86943d98bfb839f32c0aa1d0081ab71adacf23bb4adba34e828ee296e9a7278 |
30 |
|
31 |
diff --git a/net-mail/dovecot/dovecot-2.2.16-r1.ebuild b/net-mail/dovecot/dovecot-2.2.16-r1.ebuild |
32 |
deleted file mode 100644 |
33 |
index f8811a9..0000000 |
34 |
--- a/net-mail/dovecot/dovecot-2.2.16-r1.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,297 +0,0 @@ |
37 |
-# Copyright 1999-2015 Gentoo Foundation |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
-# $Id$ |
40 |
- |
41 |
-EAPI=5 |
42 |
-inherit eutils multilib ssl-cert systemd user versionator |
43 |
- |
44 |
-MY_P="${P/_/.}" |
45 |
-major_minor="$(get_version_component_range 1-2)" |
46 |
-sieve_version="0.4.7" |
47 |
-if [[ ${PV} == *_rc* ]] ; then |
48 |
- rc_dir="rc/" |
49 |
-else |
50 |
- rc_dir="" |
51 |
-fi |
52 |
-SRC_URI="http://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz |
53 |
- sieve? ( |
54 |
- http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz |
55 |
- ) |
56 |
- managesieve? ( |
57 |
- http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz |
58 |
- ) " |
59 |
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind" |
60 |
-HOMEPAGE="http://www.dovecot.org/" |
61 |
- |
62 |
-SLOT="0" |
63 |
-LICENSE="LGPL-2.1 MIT" |
64 |
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86" |
65 |
- |
66 |
-IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail" |
67 |
-IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox" |
68 |
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib" |
69 |
-IUSE_DOVECOT_OTHER="caps doc ipv6 lucene managesieve selinux sieve solr +ssl static-libs suid tcpd" |
70 |
- |
71 |
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}" |
72 |
- |
73 |
-DEPEND="bzip2? ( app-arch/bzip2 ) |
74 |
- caps? ( sys-libs/libcap ) |
75 |
- kerberos? ( virtual/krb5 ) |
76 |
- ldap? ( net-nds/openldap ) |
77 |
- lucene? ( >=dev-cpp/clucene-2.3 ) |
78 |
- lzma? ( app-arch/xz-utils ) |
79 |
- lz4? ( app-arch/lz4 ) |
80 |
- mysql? ( virtual/mysql ) |
81 |
- pam? ( virtual/pam ) |
82 |
- postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) |
83 |
- selinux? ( sec-policy/selinux-dovecot ) |
84 |
- solr? ( net-misc/curl dev-libs/expat ) |
85 |
- sqlite? ( dev-db/sqlite:* ) |
86 |
- ssl? ( dev-libs/openssl:* ) |
87 |
- tcpd? ( sys-apps/tcp-wrappers ) |
88 |
- vpopmail? ( net-mail/vpopmail ) |
89 |
- zlib? ( sys-libs/zlib ) |
90 |
- virtual/libiconv" |
91 |
- |
92 |
-RDEPEND="${DEPEND} |
93 |
- net-mail/mailbase" |
94 |
- |
95 |
-S=${WORKDIR}/${MY_P} |
96 |
- |
97 |
-pkg_setup() { |
98 |
- if use managesieve && ! use sieve; then |
99 |
- ewarn "managesieve USE flag selected but sieve USE flag unselected" |
100 |
- ewarn "sieve USE flag will be turned on" |
101 |
- fi |
102 |
- # default internal user |
103 |
- enewgroup dovecot 97 |
104 |
- enewuser dovecot 97 -1 /dev/null dovecot |
105 |
- # default login user |
106 |
- enewuser dovenull -1 -1 /dev/null |
107 |
- # add "mail" group for suid'ing. Better security isolation. |
108 |
- if use suid; then |
109 |
- enewgroup mail |
110 |
- fi |
111 |
-} |
112 |
- |
113 |
-src_prepare() { |
114 |
- epatch "${FILESDIR}/CVE-2015-3420.patch" |
115 |
- epatch "${FILESDIR}/${PN}-10-ssl.patch" |
116 |
- |
117 |
- epatch_user |
118 |
-} |
119 |
- |
120 |
-src_configure() { |
121 |
- local conf="" |
122 |
- |
123 |
- if use postgres || use mysql || use sqlite; then |
124 |
- conf="${conf} --with-sql" |
125 |
- fi |
126 |
- |
127 |
- local storages="" |
128 |
- for storage in ${IUSE_DOVECOT_STORAGE//+/}; do |
129 |
- use ${storage} && storages="${storage} ${storages}" |
130 |
- done |
131 |
- [ "${storages}" ] || storages="maildir" |
132 |
- |
133 |
- # turn valgrind tests off. Bug #340791 |
134 |
- VALGRIND=no econf \ |
135 |
- --localstatedir="${EPREFIX}/var" \ |
136 |
- --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \ |
137 |
- --without-stemmer \ |
138 |
- --with-storages="${storages}" \ |
139 |
- --disable-rpath \ |
140 |
- $( systemd_with_unitdir ) \ |
141 |
- $( use_with bzip2 bzlib ) \ |
142 |
- $( use_with caps libcap ) \ |
143 |
- $( use_with kerberos gssapi ) \ |
144 |
- $( use_with ldap ) \ |
145 |
- $( use_with lucene ) \ |
146 |
- $( use_with lz4 ) \ |
147 |
- $( use_with lzma ) \ |
148 |
- $( use_with mysql ) \ |
149 |
- $( use_with pam ) \ |
150 |
- $( use_with postgres pgsql ) \ |
151 |
- $( use_with sqlite ) \ |
152 |
- $( use_with solr ) \ |
153 |
- $( use_with ssl ) \ |
154 |
- $( use_with tcpd libwrap ) \ |
155 |
- $( use_with vpopmail ) \ |
156 |
- $( use_with zlib ) \ |
157 |
- $( use_enable static-libs static ) \ |
158 |
- ${conf} |
159 |
- |
160 |
- if use sieve || use managesieve ; then |
161 |
- # The sieve plugin needs this file to be build to determine the plugin |
162 |
- # directory and the list of libraries to link to. |
163 |
- emake dovecot-config |
164 |
- cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" |
165 |
- econf \ |
166 |
- $( use_enable static-libs static ) \ |
167 |
- --localstatedir="${EPREFIX}/var" \ |
168 |
- --enable-shared \ |
169 |
- --with-dovecot="../${MY_P}" \ |
170 |
- $( use_with managesieve ) |
171 |
- fi |
172 |
-} |
173 |
- |
174 |
-src_compile() { |
175 |
- default |
176 |
- if use sieve || use managesieve ; then |
177 |
- cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" |
178 |
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" |
179 |
- fi |
180 |
-} |
181 |
- |
182 |
-src_test() { |
183 |
- default |
184 |
- if use sieve || use managesieve ; then |
185 |
- cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" |
186 |
- default |
187 |
- fi |
188 |
-} |
189 |
- |
190 |
-src_install () { |
191 |
- default |
192 |
- |
193 |
- # insecure: |
194 |
- # use suid && fperms u+s /usr/libexec/dovecot/deliver |
195 |
- # better: |
196 |
- if use suid;then |
197 |
- einfo "Changing perms to allow deliver to be suided" |
198 |
- fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda" |
199 |
- fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda" |
200 |
- fi |
201 |
- |
202 |
- newinitd "${FILESDIR}"/dovecot.init-r4 dovecot |
203 |
- |
204 |
- rm -rf "${ED}"/usr/share/doc/dovecot |
205 |
- |
206 |
- dodoc AUTHORS NEWS README TODO |
207 |
- dodoc doc/*.{txt,cnf,xml,sh} |
208 |
- docinto example-config |
209 |
- dodoc doc/example-config/*.{conf,ext} |
210 |
- docinto example-config/conf.d |
211 |
- dodoc doc/example-config/conf.d/*.{conf,ext} |
212 |
- docinto wiki |
213 |
- dodoc doc/wiki/* |
214 |
- doman doc/man/*.{1,7} |
215 |
- |
216 |
- # Create the dovecot.conf file from the dovecot-example.conf file that |
217 |
- # the dovecot folks nicely left for us.... |
218 |
- local conf="${ED}/etc/dovecot/dovecot.conf" |
219 |
- local confd="${ED}/etc/dovecot/conf.d" |
220 |
- |
221 |
- insinto /etc/dovecot |
222 |
- doins doc/example-config/*.{conf,ext} |
223 |
- insinto /etc/dovecot/conf.d |
224 |
- doins doc/example-config/conf.d/*.{conf,ext} |
225 |
- fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext |
226 |
- rm -f "${confd}/../README" |
227 |
- |
228 |
- # .maildir is the Gentoo default |
229 |
- local mail_location="maildir:~/.maildir" |
230 |
- if ! use maildir; then |
231 |
- if use mbox; then |
232 |
- mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u" |
233 |
- keepdir /var/dovecot |
234 |
- sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \ |
235 |
- "${confd}/10-mail.conf" || die "sed failed" |
236 |
- elif use mdbox ; then |
237 |
- mail_location="mdbox:~/.mdbox" |
238 |
- elif use sdbox ; then |
239 |
- mail_location="sdbox:~/.sdbox" |
240 |
- fi |
241 |
- fi |
242 |
- sed -i -e \ |
243 |
- "s|#mail_location =|mail_location = ${mail_location}|" \ |
244 |
- "${confd}/10-mail.conf" \ |
245 |
- || die "failed to update mail location settings in 10-mail.conf" |
246 |
- |
247 |
- # We're using pam files (imap and pop3) provided by mailbase |
248 |
- if use pam; then |
249 |
- sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \ |
250 |
- "${confd}/auth-system.conf.ext" \ |
251 |
- || die "failed to update PAM settings in auth-system.conf.ext" |
252 |
- # mailbase does not provide a sieve pam file |
253 |
- use managesieve && dosym imap /etc/pam.d/sieve |
254 |
- sed -i -e \ |
255 |
- 's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \ |
256 |
- "${confd}/10-auth.conf" \ |
257 |
- || die "failed to update PAM settings in 10-auth.conf" |
258 |
- fi |
259 |
- |
260 |
- # Disable ipv6 if necessary |
261 |
- if ! use ipv6; then |
262 |
- sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \ |
263 |
- || die "failed to update listen settings in dovecot.conf" |
264 |
- fi |
265 |
- |
266 |
- # Update ssl cert locations |
267 |
- if use ssl; then |
268 |
- sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \ |
269 |
- || die "ssl conf failed" |
270 |
- sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \ |
271 |
- -e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \ |
272 |
- "${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf" |
273 |
- fi |
274 |
- |
275 |
- # Install SQL configuration |
276 |
- if use mysql || use postgres; then |
277 |
- sed -i -e \ |
278 |
- 's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \ |
279 |
- "${confd}/10-auth.conf" || die "failed to update SQL settings in \ |
280 |
- 10-auth.conf" |
281 |
- fi |
282 |
- |
283 |
- # Install LDAP configuration |
284 |
- if use ldap; then |
285 |
- sed -i -e \ |
286 |
- 's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \ |
287 |
- "${confd}/10-auth.conf" \ |
288 |
- || die "failed to update ldap settings in 10-auth.conf" |
289 |
- fi |
290 |
- |
291 |
- if use vpopmail; then |
292 |
- sed -i -e \ |
293 |
- 's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \ |
294 |
- "${confd}/10-auth.conf" \ |
295 |
- || die "failed to update vpopmail settings in 10-auth.conf" |
296 |
- fi |
297 |
- |
298 |
- if use sieve || use managesieve ; then |
299 |
- cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" |
300 |
- emake DESTDIR="${ED}" install |
301 |
- sed -i -e \ |
302 |
- 's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \ |
303 |
- || die "failed to update sieve settings in 15-lda.conf" |
304 |
- rm -rf "${ED}"/usr/share/doc/dovecot |
305 |
- dodoc doc/*.txt |
306 |
- docinto example-config/conf.d |
307 |
- dodoc doc/example-config/conf.d/*.conf |
308 |
- insinto /etc/dovecot/conf.d |
309 |
- doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf |
310 |
- use managesieve && doins doc/example-config/conf.d/20-managesieve.conf |
311 |
- docinto sieve/rfc |
312 |
- dodoc doc/rfc/*.txt |
313 |
- docinto sieve/devel |
314 |
- dodoc doc/devel/DESIGN |
315 |
- doman doc/man/*.{1,7} |
316 |
- fi |
317 |
- |
318 |
- use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete |
319 |
-} |
320 |
- |
321 |
-pkg_postinst() { |
322 |
- if use ssl; then |
323 |
- # Let's not make a new certificate if we already have one |
324 |
- if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \ |
325 |
- -e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then |
326 |
- einfo "Creating SSL certificate" |
327 |
- SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}" |
328 |
- install_cert /etc/ssl/dovecot/server |
329 |
- fi |
330 |
- fi |
331 |
- |
332 |
- elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes." |
333 |
-} |
334 |
|
335 |
diff --git a/net-mail/dovecot/dovecot-2.2.18-r1.ebuild b/net-mail/dovecot/dovecot-2.2.18-r1.ebuild |
336 |
deleted file mode 100644 |
337 |
index 5b195cb..0000000 |
338 |
--- a/net-mail/dovecot/dovecot-2.2.18-r1.ebuild |
339 |
+++ /dev/null |
340 |
@@ -1,306 +0,0 @@ |
341 |
-# Copyright 1999-2015 Gentoo Foundation |
342 |
-# Distributed under the terms of the GNU General Public License v2 |
343 |
-# $Id$ |
344 |
- |
345 |
-EAPI=5 |
346 |
-inherit eutils multilib ssl-cert systemd user versionator |
347 |
- |
348 |
-MY_P="${P/_/.}" |
349 |
-major_minor="$(get_version_component_range 1-2)" |
350 |
-sieve_version="0.4.8" |
351 |
-if [[ ${PV} == *_rc* ]] ; then |
352 |
- rc_dir="rc/" |
353 |
-else |
354 |
- rc_dir="" |
355 |
-fi |
356 |
-SRC_URI="http://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz |
357 |
- sieve? ( |
358 |
- http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz |
359 |
- ) |
360 |
- managesieve? ( |
361 |
- http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz |
362 |
- ) " |
363 |
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind" |
364 |
-HOMEPAGE="http://www.dovecot.org/" |
365 |
- |
366 |
-SLOT="0" |
367 |
-LICENSE="LGPL-2.1 MIT" |
368 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86" |
369 |
- |
370 |
-IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail" |
371 |
-IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox" |
372 |
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib" |
373 |
-IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd" |
374 |
- |
375 |
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}" |
376 |
- |
377 |
-DEPEND="bzip2? ( app-arch/bzip2 ) |
378 |
- caps? ( sys-libs/libcap ) |
379 |
- kerberos? ( virtual/krb5 ) |
380 |
- ldap? ( net-nds/openldap ) |
381 |
- lucene? ( >=dev-cpp/clucene-2.3 ) |
382 |
- lzma? ( app-arch/xz-utils ) |
383 |
- lz4? ( app-arch/lz4 ) |
384 |
- mysql? ( virtual/mysql ) |
385 |
- pam? ( virtual/pam ) |
386 |
- postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) |
387 |
- selinux? ( sec-policy/selinux-dovecot ) |
388 |
- solr? ( net-misc/curl dev-libs/expat ) |
389 |
- sqlite? ( dev-db/sqlite:* ) |
390 |
- ssl? ( |
391 |
- !libressl? ( dev-libs/openssl:0 ) |
392 |
- libressl? ( dev-libs/libressl ) |
393 |
- ) |
394 |
- tcpd? ( sys-apps/tcp-wrappers ) |
395 |
- vpopmail? ( net-mail/vpopmail ) |
396 |
- zlib? ( sys-libs/zlib ) |
397 |
- virtual/libiconv |
398 |
- dev-libs/icu:=" |
399 |
- |
400 |
-RDEPEND="${DEPEND} |
401 |
- net-mail/mailbase" |
402 |
- |
403 |
-S=${WORKDIR}/${MY_P} |
404 |
- |
405 |
-pkg_setup() { |
406 |
- if use managesieve && ! use sieve; then |
407 |
- ewarn "managesieve USE flag selected but sieve USE flag unselected" |
408 |
- ewarn "sieve USE flag will be turned on" |
409 |
- fi |
410 |
- # default internal user |
411 |
- enewgroup dovecot 97 |
412 |
- enewuser dovecot 97 -1 /dev/null dovecot |
413 |
- # default login user |
414 |
- enewuser dovenull -1 -1 /dev/null |
415 |
- # add "mail" group for suid'ing. Better security isolation. |
416 |
- if use suid; then |
417 |
- enewgroup mail |
418 |
- fi |
419 |
-} |
420 |
- |
421 |
-src_prepare() { |
422 |
- epatch "${FILESDIR}/${PN}-10-ssl.patch" |
423 |
- |
424 |
- epatch_user |
425 |
-} |
426 |
- |
427 |
-src_configure() { |
428 |
- local conf="" |
429 |
- |
430 |
- if use postgres || use mysql || use sqlite; then |
431 |
- conf="${conf} --with-sql" |
432 |
- fi |
433 |
- |
434 |
- local storages="" |
435 |
- for storage in ${IUSE_DOVECOT_STORAGE//+/}; do |
436 |
- use ${storage} && storages="${storage} ${storages}" |
437 |
- done |
438 |
- [ "${storages}" ] || storages="maildir" |
439 |
- |
440 |
- # turn valgrind tests off. Bug #340791 |
441 |
- VALGRIND=no econf \ |
442 |
- --localstatedir="${EPREFIX}/var" \ |
443 |
- --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \ |
444 |
- --without-stemmer \ |
445 |
- --with-storages="${storages}" \ |
446 |
- --disable-rpath \ |
447 |
- --with-icu \ |
448 |
- $( systemd_with_unitdir ) \ |
449 |
- $( use_with bzip2 bzlib ) \ |
450 |
- $( use_with caps libcap ) \ |
451 |
- $( use_with kerberos gssapi ) \ |
452 |
- $( use_with ldap ) \ |
453 |
- $( use_with lucene ) \ |
454 |
- $( use_with lz4 ) \ |
455 |
- $( use_with lzma ) \ |
456 |
- $( use_with mysql ) \ |
457 |
- $( use_with pam ) \ |
458 |
- $( use_with postgres pgsql ) \ |
459 |
- $( use_with sqlite ) \ |
460 |
- $( use_with solr ) \ |
461 |
- $( use_with ssl ) \ |
462 |
- $( use_with tcpd libwrap ) \ |
463 |
- $( use_with vpopmail ) \ |
464 |
- $( use_with zlib ) \ |
465 |
- $( use_enable static-libs static ) \ |
466 |
- ${conf} |
467 |
- |
468 |
- if use sieve || use managesieve ; then |
469 |
- # The sieve plugin needs this file to be build to determine the plugin |
470 |
- # directory and the list of libraries to link to. |
471 |
- emake dovecot-config |
472 |
- cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" |
473 |
- econf \ |
474 |
- $( use_enable static-libs static ) \ |
475 |
- --localstatedir="${EPREFIX}/var" \ |
476 |
- --enable-shared \ |
477 |
- --with-dovecot="../${MY_P}" \ |
478 |
- $( use_with managesieve ) |
479 |
- fi |
480 |
-} |
481 |
- |
482 |
-src_compile() { |
483 |
- default |
484 |
- if use sieve || use managesieve ; then |
485 |
- cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" |
486 |
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" |
487 |
- fi |
488 |
-} |
489 |
- |
490 |
-src_test() { |
491 |
- default |
492 |
- if use sieve || use managesieve ; then |
493 |
- cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" |
494 |
- default |
495 |
- fi |
496 |
-} |
497 |
- |
498 |
-src_install () { |
499 |
- default |
500 |
- |
501 |
- # insecure: |
502 |
- # use suid && fperms u+s /usr/libexec/dovecot/deliver |
503 |
- # better: |
504 |
- if use suid;then |
505 |
- einfo "Changing perms to allow deliver to be suided" |
506 |
- fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda" |
507 |
- fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda" |
508 |
- fi |
509 |
- |
510 |
- newinitd "${FILESDIR}"/dovecot.init-r4 dovecot |
511 |
- |
512 |
- rm -rf "${ED}"/usr/share/doc/dovecot |
513 |
- |
514 |
- dodoc AUTHORS NEWS README TODO |
515 |
- dodoc doc/*.{txt,cnf,xml,sh} |
516 |
- docinto example-config |
517 |
- dodoc doc/example-config/*.{conf,ext} |
518 |
- docinto example-config/conf.d |
519 |
- dodoc doc/example-config/conf.d/*.{conf,ext} |
520 |
- docinto wiki |
521 |
- dodoc doc/wiki/* |
522 |
- doman doc/man/*.{1,7} |
523 |
- |
524 |
- # Create the dovecot.conf file from the dovecot-example.conf file that |
525 |
- # the dovecot folks nicely left for us.... |
526 |
- local conf="${ED}/etc/dovecot/dovecot.conf" |
527 |
- local confd="${ED}/etc/dovecot/conf.d" |
528 |
- |
529 |
- insinto /etc/dovecot |
530 |
- doins doc/example-config/*.{conf,ext} |
531 |
- insinto /etc/dovecot/conf.d |
532 |
- doins doc/example-config/conf.d/*.{conf,ext} |
533 |
- fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext |
534 |
- rm -f "${confd}/../README" |
535 |
- |
536 |
- # .maildir is the Gentoo default |
537 |
- local mail_location="maildir:~/.maildir" |
538 |
- if ! use maildir; then |
539 |
- if use mbox; then |
540 |
- mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u" |
541 |
- keepdir /var/dovecot |
542 |
- sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \ |
543 |
- "${confd}/10-mail.conf" || die "sed failed" |
544 |
- elif use mdbox ; then |
545 |
- mail_location="mdbox:~/.mdbox" |
546 |
- elif use sdbox ; then |
547 |
- mail_location="sdbox:~/.sdbox" |
548 |
- fi |
549 |
- fi |
550 |
- sed -i -e \ |
551 |
- "s|#mail_location =|mail_location = ${mail_location}|" \ |
552 |
- "${confd}/10-mail.conf" \ |
553 |
- || die "failed to update mail location settings in 10-mail.conf" |
554 |
- |
555 |
- # We're using pam files (imap and pop3) provided by mailbase |
556 |
- if use pam; then |
557 |
- sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \ |
558 |
- "${confd}/auth-system.conf.ext" \ |
559 |
- || die "failed to update PAM settings in auth-system.conf.ext" |
560 |
- # mailbase does not provide a sieve pam file |
561 |
- use managesieve && dosym imap /etc/pam.d/sieve |
562 |
- sed -i -e \ |
563 |
- 's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \ |
564 |
- "${confd}/10-auth.conf" \ |
565 |
- || die "failed to update PAM settings in 10-auth.conf" |
566 |
- fi |
567 |
- |
568 |
- # Disable ipv6 if necessary |
569 |
- if ! use ipv6; then |
570 |
- sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \ |
571 |
- || die "failed to update listen settings in dovecot.conf" |
572 |
- fi |
573 |
- |
574 |
- # Update ssl cert locations |
575 |
- if use ssl; then |
576 |
- sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \ |
577 |
- || die "ssl conf failed" |
578 |
- sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \ |
579 |
- -e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \ |
580 |
- "${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf" |
581 |
- fi |
582 |
- |
583 |
- # Install SQL configuration |
584 |
- if use mysql || use postgres; then |
585 |
- sed -i -e \ |
586 |
- 's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \ |
587 |
- "${confd}/10-auth.conf" || die "failed to update SQL settings in \ |
588 |
- 10-auth.conf" |
589 |
- fi |
590 |
- |
591 |
- # Install LDAP configuration |
592 |
- if use ldap; then |
593 |
- sed -i -e \ |
594 |
- 's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \ |
595 |
- "${confd}/10-auth.conf" \ |
596 |
- || die "failed to update ldap settings in 10-auth.conf" |
597 |
- fi |
598 |
- |
599 |
- if use vpopmail; then |
600 |
- sed -i -e \ |
601 |
- 's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \ |
602 |
- "${confd}/10-auth.conf" \ |
603 |
- || die "failed to update vpopmail settings in 10-auth.conf" |
604 |
- fi |
605 |
- |
606 |
- if use sieve || use managesieve ; then |
607 |
- cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" |
608 |
- emake DESTDIR="${ED}" install |
609 |
- sed -i -e \ |
610 |
- 's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \ |
611 |
- || die "failed to update sieve settings in 15-lda.conf" |
612 |
- rm -rf "${ED}"/usr/share/doc/dovecot |
613 |
- docinto example-config/conf.d |
614 |
- dodoc doc/example-config/conf.d/*.conf |
615 |
- insinto /etc/dovecot/conf.d |
616 |
- doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf |
617 |
- use managesieve && doins doc/example-config/conf.d/20-managesieve.conf |
618 |
- docinto sieve/rfc |
619 |
- dodoc doc/rfc/*.txt |
620 |
- docinto sieve/devel |
621 |
- dodoc doc/devel/DESIGN |
622 |
- docinto plugins |
623 |
- dodoc doc/plugins/*.txt |
624 |
- docinto extensions |
625 |
- dodoc doc/extensions/*.txt |
626 |
- docinto locations |
627 |
- dodoc doc/locations/*.txt |
628 |
- doman doc/man/*.{1,7} |
629 |
- fi |
630 |
- |
631 |
- use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete |
632 |
-} |
633 |
- |
634 |
-pkg_postinst() { |
635 |
- if use ssl; then |
636 |
- # Let's not make a new certificate if we already have one |
637 |
- if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \ |
638 |
- -e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then |
639 |
- einfo "Creating SSL certificate" |
640 |
- SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}" |
641 |
- install_cert /etc/ssl/dovecot/server |
642 |
- fi |
643 |
- fi |
644 |
- |
645 |
- elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes." |
646 |
-} |
647 |
|
648 |
diff --git a/net-mail/dovecot/dovecot-2.2.18.ebuild b/net-mail/dovecot/dovecot-2.2.18.ebuild |
649 |
deleted file mode 100644 |
650 |
index 90bfebf..0000000 |
651 |
--- a/net-mail/dovecot/dovecot-2.2.18.ebuild |
652 |
+++ /dev/null |
653 |
@@ -1,303 +0,0 @@ |
654 |
-# Copyright 1999-2015 Gentoo Foundation |
655 |
-# Distributed under the terms of the GNU General Public License v2 |
656 |
-# $Id$ |
657 |
- |
658 |
-EAPI=5 |
659 |
-inherit eutils multilib ssl-cert systemd user versionator |
660 |
- |
661 |
-MY_P="${P/_/.}" |
662 |
-major_minor="$(get_version_component_range 1-2)" |
663 |
-sieve_version="0.4.8" |
664 |
-if [[ ${PV} == *_rc* ]] ; then |
665 |
- rc_dir="rc/" |
666 |
-else |
667 |
- rc_dir="" |
668 |
-fi |
669 |
-SRC_URI="http://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz |
670 |
- sieve? ( |
671 |
- http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz |
672 |
- ) |
673 |
- managesieve? ( |
674 |
- http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz |
675 |
- ) " |
676 |
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind" |
677 |
-HOMEPAGE="http://www.dovecot.org/" |
678 |
- |
679 |
-SLOT="0" |
680 |
-LICENSE="LGPL-2.1 MIT" |
681 |
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86" |
682 |
- |
683 |
-IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail" |
684 |
-IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox" |
685 |
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib" |
686 |
-IUSE_DOVECOT_OTHER="caps doc ipv6 lucene managesieve selinux sieve solr +ssl static-libs suid tcpd" |
687 |
- |
688 |
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}" |
689 |
- |
690 |
-DEPEND="bzip2? ( app-arch/bzip2 ) |
691 |
- caps? ( sys-libs/libcap ) |
692 |
- kerberos? ( virtual/krb5 ) |
693 |
- ldap? ( net-nds/openldap ) |
694 |
- lucene? ( >=dev-cpp/clucene-2.3 ) |
695 |
- lzma? ( app-arch/xz-utils ) |
696 |
- lz4? ( app-arch/lz4 ) |
697 |
- mysql? ( virtual/mysql ) |
698 |
- pam? ( virtual/pam ) |
699 |
- postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) |
700 |
- selinux? ( sec-policy/selinux-dovecot ) |
701 |
- solr? ( net-misc/curl dev-libs/expat ) |
702 |
- sqlite? ( dev-db/sqlite:* ) |
703 |
- ssl? ( dev-libs/openssl:* ) |
704 |
- tcpd? ( sys-apps/tcp-wrappers ) |
705 |
- vpopmail? ( net-mail/vpopmail ) |
706 |
- zlib? ( sys-libs/zlib ) |
707 |
- virtual/libiconv |
708 |
- dev-libs/icu:=" |
709 |
- |
710 |
-RDEPEND="${DEPEND} |
711 |
- net-mail/mailbase" |
712 |
- |
713 |
-S=${WORKDIR}/${MY_P} |
714 |
- |
715 |
-pkg_setup() { |
716 |
- if use managesieve && ! use sieve; then |
717 |
- ewarn "managesieve USE flag selected but sieve USE flag unselected" |
718 |
- ewarn "sieve USE flag will be turned on" |
719 |
- fi |
720 |
- # default internal user |
721 |
- enewgroup dovecot 97 |
722 |
- enewuser dovecot 97 -1 /dev/null dovecot |
723 |
- # default login user |
724 |
- enewuser dovenull -1 -1 /dev/null |
725 |
- # add "mail" group for suid'ing. Better security isolation. |
726 |
- if use suid; then |
727 |
- enewgroup mail |
728 |
- fi |
729 |
-} |
730 |
- |
731 |
-src_prepare() { |
732 |
- epatch "${FILESDIR}/${PN}-10-ssl.patch" |
733 |
- |
734 |
- epatch_user |
735 |
-} |
736 |
- |
737 |
-src_configure() { |
738 |
- local conf="" |
739 |
- |
740 |
- if use postgres || use mysql || use sqlite; then |
741 |
- conf="${conf} --with-sql" |
742 |
- fi |
743 |
- |
744 |
- local storages="" |
745 |
- for storage in ${IUSE_DOVECOT_STORAGE//+/}; do |
746 |
- use ${storage} && storages="${storage} ${storages}" |
747 |
- done |
748 |
- [ "${storages}" ] || storages="maildir" |
749 |
- |
750 |
- # turn valgrind tests off. Bug #340791 |
751 |
- VALGRIND=no econf \ |
752 |
- --localstatedir="${EPREFIX}/var" \ |
753 |
- --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \ |
754 |
- --without-stemmer \ |
755 |
- --with-storages="${storages}" \ |
756 |
- --disable-rpath \ |
757 |
- --with-icu \ |
758 |
- $( systemd_with_unitdir ) \ |
759 |
- $( use_with bzip2 bzlib ) \ |
760 |
- $( use_with caps libcap ) \ |
761 |
- $( use_with kerberos gssapi ) \ |
762 |
- $( use_with ldap ) \ |
763 |
- $( use_with lucene ) \ |
764 |
- $( use_with lz4 ) \ |
765 |
- $( use_with lzma ) \ |
766 |
- $( use_with mysql ) \ |
767 |
- $( use_with pam ) \ |
768 |
- $( use_with postgres pgsql ) \ |
769 |
- $( use_with sqlite ) \ |
770 |
- $( use_with solr ) \ |
771 |
- $( use_with ssl ) \ |
772 |
- $( use_with tcpd libwrap ) \ |
773 |
- $( use_with vpopmail ) \ |
774 |
- $( use_with zlib ) \ |
775 |
- $( use_enable static-libs static ) \ |
776 |
- ${conf} |
777 |
- |
778 |
- if use sieve || use managesieve ; then |
779 |
- # The sieve plugin needs this file to be build to determine the plugin |
780 |
- # directory and the list of libraries to link to. |
781 |
- emake dovecot-config |
782 |
- cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" |
783 |
- econf \ |
784 |
- $( use_enable static-libs static ) \ |
785 |
- --localstatedir="${EPREFIX}/var" \ |
786 |
- --enable-shared \ |
787 |
- --with-dovecot="../${MY_P}" \ |
788 |
- $( use_with managesieve ) |
789 |
- fi |
790 |
-} |
791 |
- |
792 |
-src_compile() { |
793 |
- default |
794 |
- if use sieve || use managesieve ; then |
795 |
- cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" |
796 |
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" |
797 |
- fi |
798 |
-} |
799 |
- |
800 |
-src_test() { |
801 |
- default |
802 |
- if use sieve || use managesieve ; then |
803 |
- cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" |
804 |
- default |
805 |
- fi |
806 |
-} |
807 |
- |
808 |
-src_install () { |
809 |
- default |
810 |
- |
811 |
- # insecure: |
812 |
- # use suid && fperms u+s /usr/libexec/dovecot/deliver |
813 |
- # better: |
814 |
- if use suid;then |
815 |
- einfo "Changing perms to allow deliver to be suided" |
816 |
- fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda" |
817 |
- fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda" |
818 |
- fi |
819 |
- |
820 |
- newinitd "${FILESDIR}"/dovecot.init-r4 dovecot |
821 |
- |
822 |
- rm -rf "${ED}"/usr/share/doc/dovecot |
823 |
- |
824 |
- dodoc AUTHORS NEWS README TODO |
825 |
- dodoc doc/*.{txt,cnf,xml,sh} |
826 |
- docinto example-config |
827 |
- dodoc doc/example-config/*.{conf,ext} |
828 |
- docinto example-config/conf.d |
829 |
- dodoc doc/example-config/conf.d/*.{conf,ext} |
830 |
- docinto wiki |
831 |
- dodoc doc/wiki/* |
832 |
- doman doc/man/*.{1,7} |
833 |
- |
834 |
- # Create the dovecot.conf file from the dovecot-example.conf file that |
835 |
- # the dovecot folks nicely left for us.... |
836 |
- local conf="${ED}/etc/dovecot/dovecot.conf" |
837 |
- local confd="${ED}/etc/dovecot/conf.d" |
838 |
- |
839 |
- insinto /etc/dovecot |
840 |
- doins doc/example-config/*.{conf,ext} |
841 |
- insinto /etc/dovecot/conf.d |
842 |
- doins doc/example-config/conf.d/*.{conf,ext} |
843 |
- fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext |
844 |
- rm -f "${confd}/../README" |
845 |
- |
846 |
- # .maildir is the Gentoo default |
847 |
- local mail_location="maildir:~/.maildir" |
848 |
- if ! use maildir; then |
849 |
- if use mbox; then |
850 |
- mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u" |
851 |
- keepdir /var/dovecot |
852 |
- sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \ |
853 |
- "${confd}/10-mail.conf" || die "sed failed" |
854 |
- elif use mdbox ; then |
855 |
- mail_location="mdbox:~/.mdbox" |
856 |
- elif use sdbox ; then |
857 |
- mail_location="sdbox:~/.sdbox" |
858 |
- fi |
859 |
- fi |
860 |
- sed -i -e \ |
861 |
- "s|#mail_location =|mail_location = ${mail_location}|" \ |
862 |
- "${confd}/10-mail.conf" \ |
863 |
- || die "failed to update mail location settings in 10-mail.conf" |
864 |
- |
865 |
- # We're using pam files (imap and pop3) provided by mailbase |
866 |
- if use pam; then |
867 |
- sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \ |
868 |
- "${confd}/auth-system.conf.ext" \ |
869 |
- || die "failed to update PAM settings in auth-system.conf.ext" |
870 |
- # mailbase does not provide a sieve pam file |
871 |
- use managesieve && dosym imap /etc/pam.d/sieve |
872 |
- sed -i -e \ |
873 |
- 's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \ |
874 |
- "${confd}/10-auth.conf" \ |
875 |
- || die "failed to update PAM settings in 10-auth.conf" |
876 |
- fi |
877 |
- |
878 |
- # Disable ipv6 if necessary |
879 |
- if ! use ipv6; then |
880 |
- sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \ |
881 |
- || die "failed to update listen settings in dovecot.conf" |
882 |
- fi |
883 |
- |
884 |
- # Update ssl cert locations |
885 |
- if use ssl; then |
886 |
- sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \ |
887 |
- || die "ssl conf failed" |
888 |
- sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \ |
889 |
- -e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \ |
890 |
- "${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf" |
891 |
- fi |
892 |
- |
893 |
- # Install SQL configuration |
894 |
- if use mysql || use postgres; then |
895 |
- sed -i -e \ |
896 |
- 's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \ |
897 |
- "${confd}/10-auth.conf" || die "failed to update SQL settings in \ |
898 |
- 10-auth.conf" |
899 |
- fi |
900 |
- |
901 |
- # Install LDAP configuration |
902 |
- if use ldap; then |
903 |
- sed -i -e \ |
904 |
- 's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \ |
905 |
- "${confd}/10-auth.conf" \ |
906 |
- || die "failed to update ldap settings in 10-auth.conf" |
907 |
- fi |
908 |
- |
909 |
- if use vpopmail; then |
910 |
- sed -i -e \ |
911 |
- 's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \ |
912 |
- "${confd}/10-auth.conf" \ |
913 |
- || die "failed to update vpopmail settings in 10-auth.conf" |
914 |
- fi |
915 |
- |
916 |
- if use sieve || use managesieve ; then |
917 |
- cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" |
918 |
- emake DESTDIR="${ED}" install |
919 |
- sed -i -e \ |
920 |
- 's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \ |
921 |
- || die "failed to update sieve settings in 15-lda.conf" |
922 |
- rm -rf "${ED}"/usr/share/doc/dovecot |
923 |
- docinto example-config/conf.d |
924 |
- dodoc doc/example-config/conf.d/*.conf |
925 |
- insinto /etc/dovecot/conf.d |
926 |
- doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf |
927 |
- use managesieve && doins doc/example-config/conf.d/20-managesieve.conf |
928 |
- docinto sieve/rfc |
929 |
- dodoc doc/rfc/*.txt |
930 |
- docinto sieve/devel |
931 |
- dodoc doc/devel/DESIGN |
932 |
- docinto plugins |
933 |
- dodoc doc/plugins/*.txt |
934 |
- docinto extensions |
935 |
- dodoc doc/extensions/*.txt |
936 |
- docinto locations |
937 |
- dodoc doc/locations/*.txt |
938 |
- doman doc/man/*.{1,7} |
939 |
- fi |
940 |
- |
941 |
- use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete |
942 |
-} |
943 |
- |
944 |
-pkg_postinst() { |
945 |
- if use ssl; then |
946 |
- # Let's not make a new certificate if we already have one |
947 |
- if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \ |
948 |
- -e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then |
949 |
- einfo "Creating SSL certificate" |
950 |
- SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}" |
951 |
- install_cert /etc/ssl/dovecot/server |
952 |
- fi |
953 |
- fi |
954 |
- |
955 |
- elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes." |
956 |
-} |
957 |
|
958 |
diff --git a/net-mail/dovecot/files/CVE-2015-3420.patch b/net-mail/dovecot/files/CVE-2015-3420.patch |
959 |
deleted file mode 100644 |
960 |
index 9bf389c..0000000 |
961 |
--- a/net-mail/dovecot/files/CVE-2015-3420.patch |
962 |
+++ /dev/null |
963 |
@@ -1,52 +0,0 @@ |
964 |
---- a/src/login-common/ssl-proxy-openssl.c Sat Apr 25 12:16:07 2015 +0300 |
965 |
-+++ b/src/login-common/ssl-proxy-openssl.c Tue Apr 28 11:27:04 2015 +0200 |
966 |
-@@ -80,6 +80,7 @@ |
967 |
- unsigned int cert_broken:1; |
968 |
- unsigned int client_proxy:1; |
969 |
- unsigned int flushing:1; |
970 |
-+ unsigned int failed:1; |
971 |
- }; |
972 |
- |
973 |
- struct ssl_parameters { |
974 |
-@@ -131,6 +132,12 @@ |
975 |
- static int ssl_proxy_ctx_get_pkey_ec_curve_name(const struct master_service_ssl_settings *set); |
976 |
- #endif |
977 |
- |
978 |
-+static void ssl_proxy_destroy_failed(struct ssl_proxy *proxy) |
979 |
-+{ |
980 |
-+ proxy->failed = TRUE; |
981 |
-+ ssl_proxy_destroy(proxy); |
982 |
-+} |
983 |
-+ |
984 |
- static unsigned int ssl_server_context_hash(const struct ssl_server_context *ctx) |
985 |
- { |
986 |
- unsigned int i, g, h = 0; |
987 |
-@@ -462,7 +469,7 @@ |
988 |
- |
989 |
- if (errstr != NULL) { |
990 |
- proxy->last_error = i_strdup(errstr); |
991 |
-- ssl_proxy_destroy(proxy); |
992 |
-+ ssl_proxy_destroy_failed(proxy); |
993 |
- } |
994 |
- ssl_proxy_unref(proxy); |
995 |
- } |
996 |
-@@ -492,7 +499,7 @@ |
997 |
- |
998 |
- if (proxy->handshake_callback != NULL) { |
999 |
- if (proxy->handshake_callback(proxy->handshake_context) < 0) |
1000 |
-- ssl_proxy_destroy(proxy); |
1001 |
-+ ssl_proxy_destroy_failed(proxy); |
1002 |
- } |
1003 |
- } |
1004 |
- |
1005 |
-@@ -822,7 +829,8 @@ |
1006 |
- if (proxy->destroyed || proxy->flushing) |
1007 |
- return; |
1008 |
- proxy->flushing = TRUE; |
1009 |
-- ssl_proxy_flush(proxy); |
1010 |
-+ if (!proxy->failed && proxy->handshaked) |
1011 |
-+ ssl_proxy_flush(proxy); |
1012 |
- proxy->destroyed = TRUE; |
1013 |
- |
1014 |
- ssl_proxy_count--; |
1015 |
- |