Gentoo Archives: gentoo-commits

From: Eray Aslan <eras@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-mail/dovecot/
Date: Sat, 20 Apr 2019 23:20:27
Message-Id: 1555654053.6cbfcf8f7ca43a02c3f165441745778eb046cd63.eras@gentoo
1 commit: 6cbfcf8f7ca43a02c3f165441745778eb046cd63
2 Author: Eray Aslan <eras <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 19 06:07:33 2019 +0000
4 Commit: Eray Aslan <eras <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 19 06:07:33 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cbfcf8f
7
8 net-mail/dovecot: remove vulnerable
9
10 Package-Manager: Portage-2.3.63, Repoman-2.3.12
11 Signed-off-by: Eray Aslan <eras <AT> gentoo.org>
12
13 net-mail/dovecot/Manifest | 12 --
14 net-mail/dovecot/dovecot-2.2.34.ebuild | 290 ------------------------------
15 net-mail/dovecot/dovecot-2.2.36.ebuild | 290 ------------------------------
16 net-mail/dovecot/dovecot-2.3.2.1.ebuild | 291 ------------------------------
17 net-mail/dovecot/dovecot-2.3.3-r1.ebuild | 294 -------------------------------
18 net-mail/dovecot/dovecot-2.3.3.ebuild | 291 ------------------------------
19 net-mail/dovecot/dovecot-2.3.4.1.ebuild | 293 ------------------------------
20 net-mail/dovecot/dovecot-2.3.4.ebuild | 293 ------------------------------
21 net-mail/dovecot/dovecot-2.3.5.ebuild | 294 -------------------------------
22 9 files changed, 2348 deletions(-)
23
24 diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
25 index 04e2d3f047d..59eff380a2d 100644
26 --- a/net-mail/dovecot/Manifest
27 +++ b/net-mail/dovecot/Manifest
28 @@ -1,16 +1,4 @@
29 -DIST dovecot-2.2-pigeonhole-0.4.21.tar.gz 1774887 BLAKE2B ebf2601e7b087d655713f985b72442496e36543ec32881d3bc84d2c6b132f58082aee6c5fae3747f756b72a3c9a2e11f78350bc34c398214de13dfc83cffdef1 SHA512 4751f449ede1b05173c706b414ebf9f7f670ff78589ce6f0b687c32c9abe6dae8b3064ed1b20e893d9ec0147b0139ce479e1d74ebe94747c33f2d8ca177912de
30 -DIST dovecot-2.2-pigeonhole-0.4.24.tar.gz 1808131 BLAKE2B e8a19b5c3b4876e71556e52ba6a984f6ed0abe93a222f692303fd41cd7a1e6e4e8fd0e5ab0821e9e179b595694752813689a07b428b2590582c3ca7dbb99a08f SHA512 2e21c95ece475ffcb78e5b5d4efa29e61471faf90b80b44a49963fb287de2784ebfb4c2b7ddfc66732fd073e9f02995d5950840336f6babe618b3d7d5166059f
31 DIST dovecot-2.2-pigeonhole-0.4.9.tar.gz 1577127 BLAKE2B 7e6f11bf74d56887b640ab5ebffd6e2ad7878d47da808f81b2f21ab4de02495f6ca79453ab5867568afee7f2d9a0915601ceccf5c6a9581d38994c4d35f692e7 SHA512 9e7a18b43d59ed955b142d16696ca221822a547ea59ac70c1bb374eedb28b6ed99ea49f34ead1f9a16ded4573605e410a5cc8e038e1bdf5f943a65588b5d3af2
32 DIST dovecot-2.2.19.tar.gz 5256627 BLAKE2B 0b7fe57ced1b1f7eb5e29e8d6723d237cc107752286995d8e5f6857f24b45ab40c4a38b03935b228e8530c3b254509124a7b6ce4e0a8a9be0ea87f0c529db935 SHA512 1b9d605a6a5862ade9d1ca634a9e0171b7c212ab025fc2059051c3795470685b66516fa9fbe5ad91d84388268ea15795f2dcd70ffdf81736ce4d80fd284835e9
33 -DIST dovecot-2.2.34.tar.gz 6181270 BLAKE2B dfdb1e6812574e79595202e830167400569adf61155aa5ddaae443e798c4a05ccec2acd2975e00e9e7ffc63ee1dcf7e4e2a9288b1e6e1e1427d1e89790a8fa13 SHA512 9f08a7116a08a08495aa0e7b4cb6b11a924ea61006970487946e338bc79bba7fd7619c345cbf278a74de285d548af04fc66eaaee508185b8b9d7335cf5612055
34 -DIST dovecot-2.2.36.tar.gz 6239707 BLAKE2B 702bb24265b5fefec9c484b3cca890fb1536ff94d1f2d6c99ee8c294ee4e38091eef5a727f0d4bd03700263286361f55747a22fa74def350710f9e49a4b10580 SHA512 327c50971e276f6013ca7f7bb59498ee88d76c9f8419bd18ee531cf10142214350fb81c6d64eaef73ee01765dd0fcf4142ab146ed67d9d7d86d5a58d41cf8db5
35 -DIST dovecot-2.3-pigeonhole-0.5.2.tar.gz 1814618 BLAKE2B b1187021673429bee1b45a1f657bea995e9881257919ff55bac63106d65963294ee2b3829167c6d50e351c4bc3c7e88a5ccfb757308d2500c5d4146246145074 SHA512 6bc24d9241f94db795a012346d9bc94b5cc7d7ce0175c03213c2b5d179d80dec95e9bdbd50bed628c8f9f7c51639e692ba5e429212a3b4a654c1e4764ac4f11c
36 -DIST dovecot-2.3-pigeonhole-0.5.3.tar.gz 1827329 BLAKE2B 0d484906022217b1082233e6a3a20c17bafc68b90ce1c5c956c714d111ffb9ab49a3794e199695bb61a1f3ad6bd46e56e63ee3c140cb01eaa7589ef7bd754b19 SHA512 8403b1976a915836ba875b96825446d46e0d8c7ff245ed1f2b014347fdc78a81f9ed6dbd05bd3b4f1f7072edc5e9a302201cdb375de44436adcbb83919f203f5
37 -DIST dovecot-2.3-pigeonhole-0.5.4.tar.gz 1831570 BLAKE2B d3e7dea3cdcc2b44476401046f6bd6a110a026d523ada2a898b5c99f509cfe37771dcfd31990139f5f4c1c6b405a9f27359cfd27a6e95525515a3aabb71538f8 SHA512 9c82cce7540f8ab66e2e370e0220c99048d6ac53ed680cd763e0b03d0200e2451cee4303ef97b87a16e7248e1c73b92ba91b47a2a20c75cb2cd62695a28046f3
38 DIST dovecot-2.3-pigeonhole-0.5.5.tar.gz 1847487 BLAKE2B 9574388566778a4011ce6546021675ed9e07ba0d874dc4163e4cea10096f3bb8a434f198c3bb446b628ee18402afe94bd90b7123b3cf4d47e4095ddad12d9bfc SHA512 21519fc9b1152a947b64ce4251e1a4bdbe003b48233b1856a32696f9c1e29f730268c56eb38f9431bbfac345e6cd42e8c78c87d0702f39ebf20c6d326dcdbb94
39 -DIST dovecot-2.3.2.1.tar.gz 6797491 BLAKE2B 92b88fd0f0cb8ed6c418bf27c2e1fc4efe13f1ccfb4948ce5eed1a4e76a4e96f0d6770d9841026ec5a515310ebaa4b335063e3516de454db8ba06cc4ee5a00ec SHA512 c085a0d04925485423086736a3c7d919ad0ca9efeff005890382da5333edb68c7d23ccb89fbe2ac44f8f016fc993bf2c669e450794c3ab13463676cbb47c7bf7
40 -DIST dovecot-2.3.3.tar.gz 6851107 BLAKE2B 87d6e11c8ff59cfe0b49d3561c307535efb09296af617530a4d5a89b4fc12055d006d1b283a4de076f27d59deb64324b96f28620958ad85c38197710c5decdf7 SHA512 8666c4f92f7df883067540f85be9d03dbe6815b58a7f5de55b4292e986e9a2a1ef52c7e0c72dde2bc781fe40d57488b78a99b6b813745b8e4683f1a2fdc1f2ff
41 -DIST dovecot-2.3.4.1.tar.gz 6925073 BLAKE2B d8143bad01c107b68525d0cfc110e5bf4e3ffa0af49e7cafdfef263374e146a7ef6ed7107a7c5216c4b52da3640d7a9a80931c01d125d3852fa265171e4d4e09 SHA512 ff21aa0f0cae17dfa66617291688856727412defa48bad2b6be057cb509fbec1c2e134afbfee69929d06b8692a0fcbd8451671ba02860e1673ae1c9483c2c17e
42 -DIST dovecot-2.3.4.tar.gz 6924178 BLAKE2B 13e52a1b04036d58e68d762c9330dd5efedbf2421d658a8b657ca59e311b899a9b4a84fd754678ee67cd5b60f47b5a5ccd6a3fa08fafca7413c8b1e6ecd2fb51 SHA512 9e97eb08c319c417e8abcb430b3e6c87ed5aa820d6288656fdfd958ff34664f67202a66e4846763bfc85b309b116cea8012e49dab98b478c57974cc178a37a5a
43 DIST dovecot-2.3.5.1.tar.gz 6953150 BLAKE2B 04484325e7b87f78c0aa6e3c769bc921e9dc62562cd8705b99166b7291b794f434b088dcf6512bc21c96d8937475cafa4d49c6ac611cb07f74a0d20e15e185c7 SHA512 e87754461fb0b065acd0ff10dc955000a2fe5baffed69efaf328ce9268f90140e9de444bc68e0bd48b565c7622885a79b1f90ff3dd2335c0c2362d05d9e73e8a
44 -DIST dovecot-2.3.5.tar.gz 6970480 BLAKE2B 006f64ce87e3eff04f3df7689ba9caed0b6b4f83eef28ee8fc2bafcf4a90b0255bf3d0d5d6b32571de8eb339f720a4d7b6de7dd5e3bcf6d03ecc5d6fa679799c SHA512 10513c371aeadd52184daaf8dbb9a7559c6db55e34182bbb2c9539dae0897ddcc76f6fe2ce6a81c7ce0cb94c7f79438ae3bb0e7db8ed46615feb337b4078ecc6
45
46 diff --git a/net-mail/dovecot/dovecot-2.2.34.ebuild b/net-mail/dovecot/dovecot-2.2.34.ebuild
47 deleted file mode 100644
48 index 653f87bf402..00000000000
49 --- a/net-mail/dovecot/dovecot-2.2.34.ebuild
50 +++ /dev/null
51 @@ -1,290 +0,0 @@
52 -# Copyright 1999-2018 Gentoo Foundation
53 -# Distributed under the terms of the GNU General Public License v2
54 -
55 -EAPI=6
56 -inherit ssl-cert systemd user versionator
57 -
58 -MY_P="${P/_/.}"
59 -major_minor="$(get_version_component_range 1-2)"
60 -sieve_version="0.4.21"
61 -if [[ ${PV} == *_rc* ]] ; then
62 - rc_dir="rc/"
63 -else
64 - rc_dir=""
65 -fi
66 -SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
67 - sieve? (
68 - https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
69 - )
70 - managesieve? (
71 - https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
72 - ) "
73 -DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
74 -HOMEPAGE="https://www.dovecot.org/"
75 -
76 -SLOT="0"
77 -LICENSE="LGPL-2.1 MIT"
78 -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sparc x86"
79 -
80 -IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
81 -IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
82 -IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd textcat"
83 -
84 -IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
85 -
86 -DEPEND="bzip2? ( app-arch/bzip2 )
87 - caps? ( sys-libs/libcap )
88 - kerberos? ( virtual/krb5 )
89 - ldap? ( net-nds/openldap )
90 - lucene? ( >=dev-cpp/clucene-2.3 )
91 - lzma? ( app-arch/xz-utils )
92 - lz4? ( app-arch/lz4 )
93 - mysql? ( virtual/mysql )
94 - pam? ( virtual/pam )
95 - postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
96 - selinux? ( sec-policy/selinux-dovecot )
97 - solr? ( net-misc/curl dev-libs/expat )
98 - sqlite? ( dev-db/sqlite:* )
99 - ssl? (
100 - !libressl? ( dev-libs/openssl:0 )
101 - libressl? ( dev-libs/libressl )
102 - )
103 - tcpd? ( sys-apps/tcp-wrappers )
104 - textcat? ( app-text/libexttextcat )
105 - vpopmail? ( net-mail/vpopmail )
106 - zlib? ( sys-libs/zlib )
107 - virtual/libiconv
108 - dev-libs/icu:="
109 -
110 -RDEPEND="${DEPEND}
111 - net-mail/mailbase"
112 -
113 -# Dovecot does not support building without ssl. Force it for now
114 -REQUIRED_USE="ssl"
115 -
116 -S=${WORKDIR}/${MY_P}
117 -
118 -pkg_setup() {
119 - if use managesieve && ! use sieve; then
120 - ewarn "managesieve USE flag selected but sieve USE flag unselected"
121 - ewarn "sieve USE flag will be turned on"
122 - fi
123 - # default internal user
124 - enewgroup dovecot 97
125 - enewuser dovecot 97 -1 /dev/null dovecot
126 - # default login user
127 - enewuser dovenull -1 -1 /dev/null
128 - # add "mail" group for suid'ing. Better security isolation.
129 - if use suid; then
130 - enewgroup mail
131 - fi
132 -}
133 -
134 -src_prepare() {
135 - eapply -p0 "${FILESDIR}/${PN}-10-ssl.patch"
136 - eapply_user
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 - # turn valgrind tests off. Bug #340791
147 - VALGRIND=no econf \
148 - --localstatedir="${EPREFIX}/var" \
149 - --runstatedir="${EPREFIX}/run" \
150 - --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
151 - --without-stemmer \
152 - --disable-rpath \
153 - --with-icu \
154 - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
155 - $( use_with bzip2 bzlib ) \
156 - $( use_with caps libcap ) \
157 - $( use_with kerberos gssapi ) \
158 - $( use_with ldap ) \
159 - $( use_with lucene ) \
160 - $( use_with lz4 ) \
161 - $( use_with lzma ) \
162 - $( use_with mysql ) \
163 - $( use_with pam ) \
164 - $( use_with postgres pgsql ) \
165 - $( use_with sqlite ) \
166 - $( use_with solr ) \
167 - $( use_with ssl ) \
168 - $( use_with tcpd libwrap ) \
169 - $( use_with textcat ) \
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-r4 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 - 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_minor}-pigeonhole-${sieve_version}" || 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 - docinto example-config/conf.d
309 - dodoc doc/example-config/conf.d/*.conf
310 - insinto /etc/dovecot/conf.d
311 - doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
312 - use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
313 - docinto sieve/rfc
314 - dodoc doc/rfc/*.txt
315 - docinto sieve/devel
316 - dodoc doc/devel/DESIGN
317 - docinto plugins
318 - dodoc doc/plugins/*.txt
319 - docinto extensions
320 - dodoc doc/extensions/*.txt
321 - docinto locations
322 - dodoc doc/locations/*.txt
323 - doman doc/man/*.{1,7}
324 - fi
325 -
326 - use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
327 -}
328 -
329 -pkg_postinst() {
330 - if use ssl; then
331 - # Let's not make a new certificate if we already have one
332 - if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
333 - -e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then
334 - einfo "Creating SSL certificate"
335 - SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
336 - install_cert /etc/ssl/dovecot/server
337 - fi
338 - fi
339 -
340 - elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
341 -}
342
343 diff --git a/net-mail/dovecot/dovecot-2.2.36.ebuild b/net-mail/dovecot/dovecot-2.2.36.ebuild
344 deleted file mode 100644
345 index 86321f4a85d..00000000000
346 --- a/net-mail/dovecot/dovecot-2.2.36.ebuild
347 +++ /dev/null
348 @@ -1,290 +0,0 @@
349 -# Copyright 1999-2018 Gentoo Foundation
350 -# Distributed under the terms of the GNU General Public License v2
351 -
352 -EAPI=6
353 -inherit ssl-cert systemd user versionator
354 -
355 -MY_P="${P/_/.}"
356 -major_minor="$(get_version_component_range 1-2)"
357 -sieve_version="0.4.24"
358 -if [[ ${PV} == *_rc* ]] ; then
359 - rc_dir="rc/"
360 -else
361 - rc_dir=""
362 -fi
363 -SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
364 - sieve? (
365 - https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
366 - )
367 - managesieve? (
368 - https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
369 - ) "
370 -DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
371 -HOMEPAGE="https://www.dovecot.org/"
372 -
373 -SLOT="0"
374 -LICENSE="LGPL-2.1 MIT"
375 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
376 -
377 -IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
378 -IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
379 -IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd textcat"
380 -
381 -IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
382 -
383 -DEPEND="bzip2? ( app-arch/bzip2 )
384 - caps? ( sys-libs/libcap )
385 - kerberos? ( virtual/krb5 )
386 - ldap? ( net-nds/openldap )
387 - lucene? ( >=dev-cpp/clucene-2.3 )
388 - lzma? ( app-arch/xz-utils )
389 - lz4? ( app-arch/lz4 )
390 - mysql? ( virtual/mysql )
391 - pam? ( virtual/pam )
392 - postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
393 - selinux? ( sec-policy/selinux-dovecot )
394 - solr? ( net-misc/curl dev-libs/expat )
395 - sqlite? ( dev-db/sqlite:* )
396 - ssl? (
397 - !libressl? ( dev-libs/openssl:0 )
398 - libressl? ( dev-libs/libressl )
399 - )
400 - tcpd? ( sys-apps/tcp-wrappers )
401 - textcat? ( app-text/libexttextcat )
402 - vpopmail? ( net-mail/vpopmail )
403 - zlib? ( sys-libs/zlib )
404 - virtual/libiconv
405 - dev-libs/icu:="
406 -
407 -RDEPEND="${DEPEND}
408 - net-mail/mailbase"
409 -
410 -# Dovecot does not support building without ssl. Force it for now
411 -REQUIRED_USE="ssl"
412 -
413 -S=${WORKDIR}/${MY_P}
414 -
415 -pkg_setup() {
416 - if use managesieve && ! use sieve; then
417 - ewarn "managesieve USE flag selected but sieve USE flag unselected"
418 - ewarn "sieve USE flag will be turned on"
419 - fi
420 - # default internal user
421 - enewgroup dovecot 97
422 - enewuser dovecot 97 -1 /dev/null dovecot
423 - # default login user
424 - enewuser dovenull -1 -1 /dev/null
425 - # add "mail" group for suid'ing. Better security isolation.
426 - if use suid; then
427 - enewgroup mail
428 - fi
429 -}
430 -
431 -src_prepare() {
432 - eapply -p0 "${FILESDIR}/${PN}-10-ssl.patch"
433 - eapply_user
434 -}
435 -
436 -src_configure() {
437 - local conf=""
438 -
439 - if use postgres || use mysql || use sqlite; then
440 - conf="${conf} --with-sql"
441 - fi
442 -
443 - # turn valgrind tests off. Bug #340791
444 - VALGRIND=no econf \
445 - --with-statedir="${EPREFIX}/var/lib/dovecot" \
446 - --with-rundir="${EPREFIX}/run/dovecot" \
447 - --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
448 - --without-stemmer \
449 - --disable-rpath \
450 - --with-icu \
451 - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
452 - $( use_with bzip2 bzlib ) \
453 - $( use_with caps libcap ) \
454 - $( use_with kerberos gssapi ) \
455 - $( use_with ldap ) \
456 - $( use_with lucene ) \
457 - $( use_with lz4 ) \
458 - $( use_with lzma ) \
459 - $( use_with mysql ) \
460 - $( use_with pam ) \
461 - $( use_with postgres pgsql ) \
462 - $( use_with sqlite ) \
463 - $( use_with solr ) \
464 - $( use_with ssl ) \
465 - $( use_with tcpd libwrap ) \
466 - $( use_with textcat ) \
467 - $( use_with vpopmail ) \
468 - $( use_with zlib ) \
469 - $( use_enable static-libs static ) \
470 - ${conf}
471 -
472 - if use sieve || use managesieve ; then
473 - # The sieve plugin needs this file to be build to determine the plugin
474 - # directory and the list of libraries to link to.
475 - emake dovecot-config
476 - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
477 - econf \
478 - $( use_enable static-libs static ) \
479 - --localstatedir="${EPREFIX}/var" \
480 - --enable-shared \
481 - --with-dovecot="../${MY_P}" \
482 - $( use_with managesieve )
483 - fi
484 -}
485 -
486 -src_compile() {
487 - default
488 - if use sieve || use managesieve ; then
489 - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
490 - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
491 - fi
492 -}
493 -
494 -src_test() {
495 - default
496 - if use sieve || use managesieve ; then
497 - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
498 - default
499 - fi
500 -}
501 -
502 -src_install () {
503 - default
504 -
505 - # insecure:
506 - # use suid && fperms u+s /usr/libexec/dovecot/deliver
507 - # better:
508 - if use suid;then
509 - einfo "Changing perms to allow deliver to be suided"
510 - fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
511 - fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
512 - fi
513 -
514 - newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
515 -
516 - rm -rf "${ED}"/usr/share/doc/dovecot
517 -
518 - dodoc AUTHORS NEWS README TODO
519 - dodoc doc/*.{txt,cnf,xml,sh}
520 - docinto example-config
521 - dodoc doc/example-config/*.{conf,ext}
522 - docinto example-config/conf.d
523 - dodoc doc/example-config/conf.d/*.{conf,ext}
524 - docinto wiki
525 - dodoc doc/wiki/*
526 - doman doc/man/*.{1,7}
527 -
528 - # Create the dovecot.conf file from the dovecot-example.conf file that
529 - # the dovecot folks nicely left for us....
530 - local conf="${ED}/etc/dovecot/dovecot.conf"
531 - local confd="${ED}/etc/dovecot/conf.d"
532 -
533 - insinto /etc/dovecot
534 - doins doc/example-config/*.{conf,ext}
535 - insinto /etc/dovecot/conf.d
536 - doins doc/example-config/conf.d/*.{conf,ext}
537 - fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
538 - rm -f "${confd}/../README"
539 -
540 - # .maildir is the Gentoo default
541 - local mail_location="maildir:~/.maildir"
542 - sed -i -e \
543 - "s|#mail_location =|mail_location = ${mail_location}|" \
544 - "${confd}/10-mail.conf" \
545 - || die "failed to update mail location settings in 10-mail.conf"
546 -
547 - # We're using pam files (imap and pop3) provided by mailbase
548 - if use pam; then
549 - sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
550 - "${confd}/auth-system.conf.ext" \
551 - || die "failed to update PAM settings in auth-system.conf.ext"
552 - # mailbase does not provide a sieve pam file
553 - use managesieve && dosym imap /etc/pam.d/sieve
554 - sed -i -e \
555 - 's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
556 - "${confd}/10-auth.conf" \
557 - || die "failed to update PAM settings in 10-auth.conf"
558 - fi
559 -
560 - # Disable ipv6 if necessary
561 - if ! use ipv6; then
562 - sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
563 - || die "failed to update listen settings in dovecot.conf"
564 - fi
565 -
566 - # Update ssl cert locations
567 - if use ssl; then
568 - sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
569 - || die "ssl conf failed"
570 - sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
571 - -e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
572 - "${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
573 - fi
574 -
575 - # Install SQL configuration
576 - if use mysql || use postgres; then
577 - sed -i -e \
578 - 's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
579 - "${confd}/10-auth.conf" || die "failed to update SQL settings in \
580 - 10-auth.conf"
581 - fi
582 -
583 - # Install LDAP configuration
584 - if use ldap; then
585 - sed -i -e \
586 - 's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
587 - "${confd}/10-auth.conf" \
588 - || die "failed to update ldap settings in 10-auth.conf"
589 - fi
590 -
591 - if use vpopmail; then
592 - sed -i -e \
593 - 's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
594 - "${confd}/10-auth.conf" \
595 - || die "failed to update vpopmail settings in 10-auth.conf"
596 - fi
597 -
598 - if use sieve || use managesieve ; then
599 - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
600 - emake DESTDIR="${ED}" install
601 - sed -i -e \
602 - 's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
603 - || die "failed to update sieve settings in 15-lda.conf"
604 - rm -rf "${ED}"/usr/share/doc/dovecot
605 - docinto example-config/conf.d
606 - dodoc doc/example-config/conf.d/*.conf
607 - insinto /etc/dovecot/conf.d
608 - doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
609 - use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
610 - docinto sieve/rfc
611 - dodoc doc/rfc/*.txt
612 - docinto sieve/devel
613 - dodoc doc/devel/DESIGN
614 - docinto plugins
615 - dodoc doc/plugins/*.txt
616 - docinto extensions
617 - dodoc doc/extensions/*.txt
618 - docinto locations
619 - dodoc doc/locations/*.txt
620 - doman doc/man/*.{1,7}
621 - fi
622 -
623 - use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
624 -}
625 -
626 -pkg_postinst() {
627 - if use ssl; then
628 - # Let's not make a new certificate if we already have one
629 - if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
630 - -e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then
631 - einfo "Creating SSL certificate"
632 - SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
633 - install_cert /etc/ssl/dovecot/server
634 - fi
635 - fi
636 -
637 - elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
638 -}
639
640 diff --git a/net-mail/dovecot/dovecot-2.3.2.1.ebuild b/net-mail/dovecot/dovecot-2.3.2.1.ebuild
641 deleted file mode 100644
642 index 34b3f7e9aae..00000000000
643 --- a/net-mail/dovecot/dovecot-2.3.2.1.ebuild
644 +++ /dev/null
645 @@ -1,291 +0,0 @@
646 -# Copyright 1999-2019 Gentoo Authors
647 -# Distributed under the terms of the GNU General Public License v2
648 -
649 -EAPI=6
650 -# do not add a ssl USE flag. ssl is mandatory
651 -SSL_DEPS_SKIP=1
652 -inherit autotools ssl-cert systemd user versionator
653 -
654 -MY_P="${P/_/.}"
655 -#MY_S="${PN}-ce-${PV}"
656 -major_minor="$(get_version_component_range 1-2)"
657 -sieve_version="0.5.2"
658 -if [[ ${PV} == *_rc* ]] ; then
659 - rc_dir="rc/"
660 -else
661 - rc_dir=""
662 -fi
663 -SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
664 - sieve? (
665 - https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
666 - )
667 - managesieve? (
668 - https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
669 - ) "
670 -DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
671 -HOMEPAGE="https://www.dovecot.org/"
672 -
673 -SLOT="0"
674 -LICENSE="LGPL-2.1 MIT"
675 -KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 ~sparc x86"
676 -
677 -IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
678 -IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
679 -IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat"
680 -
681 -IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
682 -
683 -DEPEND="argon2? ( dev-libs/libsodium )
684 - bzip2? ( app-arch/bzip2 )
685 - caps? ( sys-libs/libcap )
686 - kerberos? ( virtual/krb5 )
687 - ldap? ( net-nds/openldap )
688 - lua? ( dev-lang/lua:* )
689 - lucene? ( >=dev-cpp/clucene-2.3 )
690 - lzma? ( app-arch/xz-utils )
691 - lz4? ( app-arch/lz4 )
692 - mysql? ( virtual/mysql )
693 - pam? ( virtual/pam )
694 - postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
695 - selinux? ( sec-policy/selinux-dovecot )
696 - solr? ( net-misc/curl dev-libs/expat )
697 - sqlite? ( dev-db/sqlite:* )
698 - !libressl? ( dev-libs/openssl:0 )
699 - libressl? ( dev-libs/libressl )
700 - tcpd? ( sys-apps/tcp-wrappers )
701 - textcat? ( app-text/libexttextcat )
702 - vpopmail? ( net-mail/vpopmail )
703 - zlib? ( sys-libs/zlib )
704 - virtual/libiconv
705 - dev-libs/icu:="
706 -
707 -RDEPEND="${DEPEND}
708 - net-mail/mailbase"
709 -
710 -PATCHES=( "${FILESDIR}/${PN}-glibc226.patch" )
711 -
712 -pkg_setup() {
713 - if use managesieve && ! use sieve; then
714 - ewarn "managesieve USE flag selected but sieve USE flag unselected"
715 - ewarn "sieve USE flag will be turned on"
716 - fi
717 - # default internal user
718 - enewgroup dovecot 97
719 - enewuser dovecot 97 -1 /dev/null dovecot
720 - # default login user
721 - enewuser dovenull -1 -1 /dev/null
722 - # add "mail" group for suid'ing. Better security isolation.
723 - if use suid; then
724 - enewgroup mail
725 - fi
726 -}
727 -
728 -src_prepare() {
729 - default
730 - # bug 657108
731 - # elibtoolize
732 - eautoreconf
733 -}
734 -
735 -src_configure() {
736 - local conf=""
737 -
738 - if use postgres || use mysql || use sqlite; then
739 - conf="${conf} --with-sql"
740 - fi
741 -
742 - # turn valgrind tests off. Bug #340791
743 - VALGRIND=no econf \
744 - --with-rundir="${EPREFIX}/run/dovecot" \
745 - --with-statedir="${EPREFIX}/var/lib/dovecot" \
746 - --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
747 - --without-stemmer \
748 - --disable-rpath \
749 - --without-libbsd \
750 - --with-icu \
751 - --with-ssl \
752 - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
753 - $( use_with argon2 sodium ) \
754 - $( use_with bzip2 bzlib ) \
755 - $( use_with caps libcap ) \
756 - $( use_with kerberos gssapi ) \
757 - $( use_with lua ) \
758 - $( use_with ldap ) \
759 - $( use_with lucene ) \
760 - $( use_with lz4 ) \
761 - $( use_with lzma ) \
762 - $( use_with mysql ) \
763 - $( use_with pam ) \
764 - $( use_with postgres pgsql ) \
765 - $( use_with sqlite ) \
766 - $( use_with solr ) \
767 - $( use_with tcpd libwrap ) \
768 - $( use_with textcat ) \
769 - $( use_with vpopmail ) \
770 - $( use_with zlib ) \
771 - $( use_enable static-libs static ) \
772 - ${conf}
773 -
774 - if use sieve || use managesieve ; then
775 - # The sieve plugin needs this file to be build to determine the plugin
776 - # directory and the list of libraries to link to.
777 - emake dovecot-config
778 - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
779 - econf \
780 - $( use_enable static-libs static ) \
781 - --localstatedir="${EPREFIX%/}/var" \
782 - --enable-shared \
783 - --with-dovecot="${S}" \
784 - $( use_with managesieve )
785 - fi
786 -}
787 -
788 -src_compile() {
789 - default
790 - if use sieve || use managesieve ; then
791 - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
792 - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
793 - fi
794 -}
795 -
796 -src_test() {
797 - default
798 - if use sieve || use managesieve ; then
799 - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
800 - default
801 - fi
802 -}
803 -
804 -src_install () {
805 - default
806 -
807 - # insecure:
808 - # use suid && fperms u+s /usr/libexec/dovecot/deliver
809 - # better:
810 - if use suid;then
811 - einfo "Changing perms to allow deliver to be suided"
812 - fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
813 - fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
814 - fi
815 -
816 - newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
817 -
818 - rm -rf "${ED}"/usr/share/doc/dovecot
819 -
820 - dodoc AUTHORS NEWS README TODO
821 - dodoc doc/*.{txt,cnf,xml,sh}
822 - docinto example-config
823 - dodoc doc/example-config/*.{conf,ext}
824 - docinto example-config/conf.d
825 - dodoc doc/example-config/conf.d/*.{conf,ext}
826 - docinto wiki
827 - dodoc doc/wiki/*
828 - doman doc/man/*.{1,7}
829 -
830 - # Create the dovecot.conf file from the dovecot-example.conf file that
831 - # the dovecot folks nicely left for us....
832 - local conf="${ED}/etc/dovecot/dovecot.conf"
833 - local confd="${ED}/etc/dovecot/conf.d"
834 -
835 - insinto /etc/dovecot
836 - doins doc/example-config/*.{conf,ext}
837 - insinto /etc/dovecot/conf.d
838 - doins doc/example-config/conf.d/*.{conf,ext}
839 - fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
840 - rm -f "${confd}/../README"
841 -
842 - # .maildir is the Gentoo default
843 - local mail_location="maildir:~/.maildir"
844 - sed -i -e \
845 - "s|#mail_location =|mail_location = ${mail_location}|" \
846 - "${confd}/10-mail.conf" \
847 - || die "failed to update mail location settings in 10-mail.conf"
848 -
849 - # We're using pam files (imap and pop3) provided by mailbase
850 - if use pam; then
851 - sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
852 - "${confd}/auth-system.conf.ext" \
853 - || die "failed to update PAM settings in auth-system.conf.ext"
854 - # mailbase does not provide a sieve pam file
855 - use managesieve && dosym imap /etc/pam.d/sieve
856 - sed -i -e \
857 - 's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
858 - "${confd}/10-auth.conf" \
859 - || die "failed to update PAM settings in 10-auth.conf"
860 - fi
861 -
862 - # Disable ipv6 if necessary
863 - if ! use ipv6; then
864 - sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
865 - || die "failed to update listen settings in dovecot.conf"
866 - fi
867 -
868 - # Update ssl cert locations
869 - sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
870 - || die "ssl conf failed"
871 - sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
872 - -e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
873 - "${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
874 -
875 - # Install SQL configuration
876 - if use mysql || use postgres; then
877 - sed -i -e \
878 - 's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
879 - "${confd}/10-auth.conf" || die "failed to update SQL settings in \
880 - 10-auth.conf"
881 - fi
882 -
883 - # Install LDAP configuration
884 - if use ldap; then
885 - sed -i -e \
886 - 's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
887 - "${confd}/10-auth.conf" \
888 - || die "failed to update ldap settings in 10-auth.conf"
889 - fi
890 -
891 - if use vpopmail; then
892 - sed -i -e \
893 - 's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
894 - "${confd}/10-auth.conf" \
895 - || die "failed to update vpopmail settings in 10-auth.conf"
896 - fi
897 -
898 - if use sieve || use managesieve ; then
899 - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
900 - emake DESTDIR="${ED}" install
901 - sed -i -e \
902 - 's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
903 - || die "failed to update sieve settings in 15-lda.conf"
904 - rm -rf "${ED}"/usr/share/doc/dovecot
905 - docinto example-config/conf.d
906 - dodoc doc/example-config/conf.d/*.conf
907 - insinto /etc/dovecot/conf.d
908 - doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
909 - use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
910 - docinto sieve/rfc
911 - dodoc doc/rfc/*.txt
912 - docinto sieve/devel
913 - dodoc doc/devel/DESIGN
914 - docinto plugins
915 - dodoc doc/plugins/*.txt
916 - docinto extensions
917 - dodoc doc/extensions/*.txt
918 - docinto locations
919 - dodoc doc/locations/*.txt
920 - doman doc/man/*.{1,7}
921 - fi
922 -
923 - use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
924 -}
925 -
926 -pkg_postinst() {
927 - # Let's not make a new certificate if we already have one
928 - if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
929 - -e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then
930 - einfo "Creating SSL certificate"
931 - SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
932 - install_cert /etc/ssl/dovecot/server
933 - fi
934 -
935 - elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
936 -}
937
938 diff --git a/net-mail/dovecot/dovecot-2.3.3-r1.ebuild b/net-mail/dovecot/dovecot-2.3.3-r1.ebuild
939 deleted file mode 100644
940 index 120949b5d43..00000000000
941 --- a/net-mail/dovecot/dovecot-2.3.3-r1.ebuild
942 +++ /dev/null
943 @@ -1,294 +0,0 @@
944 -# Copyright 1999-2018 Gentoo Authors
945 -# Distributed under the terms of the GNU General Public License v2
946 -
947 -EAPI=6
948 -# do not add a ssl USE flag. ssl is mandatory
949 -SSL_DEPS_SKIP=1
950 -inherit autotools ssl-cert systemd user versionator
951 -
952 -MY_P="${P/_/.}"
953 -#MY_S="${PN}-ce-${PV}"
954 -major_minor="$(get_version_component_range 1-2)"
955 -sieve_version="0.5.3"
956 -if [[ ${PV} == *_rc* ]] ; then
957 - rc_dir="rc/"
958 -else
959 - rc_dir=""
960 -fi
961 -SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
962 - sieve? (
963 - https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
964 - )
965 - managesieve? (
966 - https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
967 - ) "
968 -DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
969 -HOMEPAGE="https://www.dovecot.org/"
970 -
971 -SLOT="0"
972 -LICENSE="LGPL-2.1 MIT"
973 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
974 -
975 -IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
976 -IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
977 -IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat"
978 -
979 -IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
980 -
981 -DEPEND="argon2? ( dev-libs/libsodium )
982 - bzip2? ( app-arch/bzip2 )
983 - caps? ( sys-libs/libcap )
984 - kerberos? ( virtual/krb5 )
985 - ldap? ( net-nds/openldap )
986 - lua? ( dev-lang/lua:* )
987 - lucene? ( >=dev-cpp/clucene-2.3 )
988 - lzma? ( app-arch/xz-utils )
989 - lz4? ( app-arch/lz4 )
990 - mysql? ( virtual/mysql )
991 - pam? ( virtual/pam )
992 - postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
993 - selinux? ( sec-policy/selinux-dovecot )
994 - solr? ( net-misc/curl dev-libs/expat )
995 - sqlite? ( dev-db/sqlite:* )
996 - !libressl? ( dev-libs/openssl:0 )
997 - libressl? ( dev-libs/libressl )
998 - tcpd? ( sys-apps/tcp-wrappers )
999 - textcat? ( app-text/libexttextcat )
1000 - vpopmail? ( net-mail/vpopmail )
1001 - zlib? ( sys-libs/zlib )
1002 - virtual/libiconv
1003 - dev-libs/icu:="
1004 -
1005 -RDEPEND="${DEPEND}
1006 - net-mail/mailbase"
1007 -
1008 -PATCHES=(
1009 - "${FILESDIR}/${PN}-glibc228.patch"
1010 - "${FILESDIR}/${PN}-userdb-passwd-fix.patch"
1011 -)
1012 -
1013 -pkg_setup() {
1014 - if use managesieve && ! use sieve; then
1015 - ewarn "managesieve USE flag selected but sieve USE flag unselected"
1016 - ewarn "sieve USE flag will be turned on"
1017 - fi
1018 - # default internal user
1019 - enewgroup dovecot 97
1020 - enewuser dovecot 97 -1 /dev/null dovecot
1021 - # default login user
1022 - enewuser dovenull -1 -1 /dev/null
1023 - # add "mail" group for suid'ing. Better security isolation.
1024 - if use suid; then
1025 - enewgroup mail
1026 - fi
1027 -}
1028 -
1029 -src_prepare() {
1030 - default
1031 - # bug 657108
1032 - # elibtoolize
1033 - eautoreconf
1034 -}
1035 -
1036 -src_configure() {
1037 - local conf=""
1038 -
1039 - if use postgres || use mysql || use sqlite; then
1040 - conf="${conf} --with-sql"
1041 - fi
1042 -
1043 - # turn valgrind tests off. Bug #340791
1044 - VALGRIND=no econf \
1045 - --with-rundir="${EPREFIX}/run/dovecot" \
1046 - --with-statedir="${EPREFIX}/var/lib/dovecot" \
1047 - --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
1048 - --without-stemmer \
1049 - --disable-rpath \
1050 - --without-libbsd \
1051 - --with-icu \
1052 - --with-ssl \
1053 - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
1054 - $( use_with argon2 sodium ) \
1055 - $( use_with bzip2 bzlib ) \
1056 - $( use_with caps libcap ) \
1057 - $( use_with kerberos gssapi ) \
1058 - $( use_with lua ) \
1059 - $( use_with ldap ) \
1060 - $( use_with lucene ) \
1061 - $( use_with lz4 ) \
1062 - $( use_with lzma ) \
1063 - $( use_with mysql ) \
1064 - $( use_with pam ) \
1065 - $( use_with postgres pgsql ) \
1066 - $( use_with sqlite ) \
1067 - $( use_with solr ) \
1068 - $( use_with tcpd libwrap ) \
1069 - $( use_with textcat ) \
1070 - $( use_with vpopmail ) \
1071 - $( use_with zlib ) \
1072 - $( use_enable static-libs static ) \
1073 - ${conf}
1074 -
1075 - if use sieve || use managesieve ; then
1076 - # The sieve plugin needs this file to be build to determine the plugin
1077 - # directory and the list of libraries to link to.
1078 - emake dovecot-config
1079 - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
1080 - econf \
1081 - $( use_enable static-libs static ) \
1082 - --localstatedir="${EPREFIX%/}/var" \
1083 - --enable-shared \
1084 - --with-dovecot="${S}" \
1085 - $( use_with managesieve )
1086 - fi
1087 -}
1088 -
1089 -src_compile() {
1090 - default
1091 - if use sieve || use managesieve ; then
1092 - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
1093 - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
1094 - fi
1095 -}
1096 -
1097 -src_test() {
1098 - default
1099 - if use sieve || use managesieve ; then
1100 - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
1101 - default
1102 - fi
1103 -}
1104 -
1105 -src_install () {
1106 - default
1107 -
1108 - # insecure:
1109 - # use suid && fperms u+s /usr/libexec/dovecot/deliver
1110 - # better:
1111 - if use suid;then
1112 - einfo "Changing perms to allow deliver to be suided"
1113 - fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
1114 - fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
1115 - fi
1116 -
1117 - newinitd "${FILESDIR}"/dovecot.init-r5 dovecot
1118 -
1119 - rm -rf "${ED}"/usr/share/doc/dovecot
1120 -
1121 - dodoc AUTHORS NEWS README TODO
1122 - dodoc doc/*.{txt,cnf,xml,sh}
1123 - docinto example-config
1124 - dodoc doc/example-config/*.{conf,ext}
1125 - docinto example-config/conf.d
1126 - dodoc doc/example-config/conf.d/*.{conf,ext}
1127 - docinto wiki
1128 - dodoc doc/wiki/*
1129 - doman doc/man/*.{1,7}
1130 -
1131 - # Create the dovecot.conf file from the dovecot-example.conf file that
1132 - # the dovecot folks nicely left for us....
1133 - local conf="${ED}/etc/dovecot/dovecot.conf"
1134 - local confd="${ED}/etc/dovecot/conf.d"
1135 -
1136 - insinto /etc/dovecot
1137 - doins doc/example-config/*.{conf,ext}
1138 - insinto /etc/dovecot/conf.d
1139 - doins doc/example-config/conf.d/*.{conf,ext}
1140 - fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
1141 - rm -f "${confd}/../README"
1142 -
1143 - # .maildir is the Gentoo default
1144 - local mail_location="maildir:~/.maildir"
1145 - sed -i -e \
1146 - "s|#mail_location =|mail_location = ${mail_location}|" \
1147 - "${confd}/10-mail.conf" \
1148 - || die "failed to update mail location settings in 10-mail.conf"
1149 -
1150 - # We're using pam files (imap and pop3) provided by mailbase
1151 - if use pam; then
1152 - sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
1153 - "${confd}/auth-system.conf.ext" \
1154 - || die "failed to update PAM settings in auth-system.conf.ext"
1155 - # mailbase does not provide a sieve pam file
1156 - use managesieve && dosym imap /etc/pam.d/sieve
1157 - sed -i -e \
1158 - 's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
1159 - "${confd}/10-auth.conf" \
1160 - || die "failed to update PAM settings in 10-auth.conf"
1161 - fi
1162 -
1163 - # Disable ipv6 if necessary
1164 - if ! use ipv6; then
1165 - sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
1166 - || die "failed to update listen settings in dovecot.conf"
1167 - fi
1168 -
1169 - # Update ssl cert locations
1170 - sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
1171 - || die "ssl conf failed"
1172 - sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
1173 - -e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
1174 - "${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
1175 -
1176 - # Install SQL configuration
1177 - if use mysql || use postgres; then
1178 - sed -i -e \
1179 - 's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
1180 - "${confd}/10-auth.conf" || die "failed to update SQL settings in \
1181 - 10-auth.conf"
1182 - fi
1183 -
1184 - # Install LDAP configuration
1185 - if use ldap; then
1186 - sed -i -e \
1187 - 's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
1188 - "${confd}/10-auth.conf" \
1189 - || die "failed to update ldap settings in 10-auth.conf"
1190 - fi
1191 -
1192 - if use vpopmail; then
1193 - sed -i -e \
1194 - 's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
1195 - "${confd}/10-auth.conf" \
1196 - || die "failed to update vpopmail settings in 10-auth.conf"
1197 - fi
1198 -
1199 - if use sieve || use managesieve ; then
1200 - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
1201 - emake DESTDIR="${ED}" install
1202 - sed -i -e \
1203 - 's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
1204 - || die "failed to update sieve settings in 15-lda.conf"
1205 - rm -rf "${ED}"/usr/share/doc/dovecot
1206 - docinto example-config/conf.d
1207 - dodoc doc/example-config/conf.d/*.conf
1208 - insinto /etc/dovecot/conf.d
1209 - doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
1210 - use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
1211 - docinto sieve/rfc
1212 - dodoc doc/rfc/*.txt
1213 - docinto sieve/devel
1214 - dodoc doc/devel/DESIGN
1215 - docinto plugins
1216 - dodoc doc/plugins/*.txt
1217 - docinto extensions
1218 - dodoc doc/extensions/*.txt
1219 - docinto locations
1220 - dodoc doc/locations/*.txt
1221 - doman doc/man/*.{1,7}
1222 - fi
1223 -
1224 - use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
1225 -}
1226 -
1227 -pkg_postinst() {
1228 - # Let's not make a new certificate if we already have one
1229 - if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
1230 - -e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then
1231 - einfo "Creating SSL certificate"
1232 - SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
1233 - install_cert /etc/ssl/dovecot/server
1234 - fi
1235 -
1236 - elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
1237 -}
1238
1239 diff --git a/net-mail/dovecot/dovecot-2.3.3.ebuild b/net-mail/dovecot/dovecot-2.3.3.ebuild
1240 deleted file mode 100644
1241 index 9d28a2916e9..00000000000
1242 --- a/net-mail/dovecot/dovecot-2.3.3.ebuild
1243 +++ /dev/null
1244 @@ -1,291 +0,0 @@
1245 -# Copyright 1999-2018 Gentoo Authors
1246 -# Distributed under the terms of the GNU General Public License v2
1247 -
1248 -EAPI=6
1249 -# do not add a ssl USE flag. ssl is mandatory
1250 -SSL_DEPS_SKIP=1
1251 -inherit autotools ssl-cert systemd user versionator
1252 -
1253 -MY_P="${P/_/.}"
1254 -#MY_S="${PN}-ce-${PV}"
1255 -major_minor="$(get_version_component_range 1-2)"
1256 -sieve_version="0.5.3"
1257 -if [[ ${PV} == *_rc* ]] ; then
1258 - rc_dir="rc/"
1259 -else
1260 - rc_dir=""
1261 -fi
1262 -SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
1263 - sieve? (
1264 - https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
1265 - )
1266 - managesieve? (
1267 - https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
1268 - ) "
1269 -DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
1270 -HOMEPAGE="https://www.dovecot.org/"
1271 -
1272 -SLOT="0"
1273 -LICENSE="LGPL-2.1 MIT"
1274 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
1275 -
1276 -IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
1277 -IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
1278 -IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat"
1279 -
1280 -IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
1281 -
1282 -DEPEND="argon2? ( dev-libs/libsodium )
1283 - bzip2? ( app-arch/bzip2 )
1284 - caps? ( sys-libs/libcap )
1285 - kerberos? ( virtual/krb5 )
1286 - ldap? ( net-nds/openldap )
1287 - lua? ( dev-lang/lua:* )
1288 - lucene? ( >=dev-cpp/clucene-2.3 )
1289 - lzma? ( app-arch/xz-utils )
1290 - lz4? ( app-arch/lz4 )
1291 - mysql? ( virtual/mysql )
1292 - pam? ( virtual/pam )
1293 - postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
1294 - selinux? ( sec-policy/selinux-dovecot )
1295 - solr? ( net-misc/curl dev-libs/expat )
1296 - sqlite? ( dev-db/sqlite:* )
1297 - !libressl? ( dev-libs/openssl:0 )
1298 - libressl? ( dev-libs/libressl )
1299 - tcpd? ( sys-apps/tcp-wrappers )
1300 - textcat? ( app-text/libexttextcat )
1301 - vpopmail? ( net-mail/vpopmail )
1302 - zlib? ( sys-libs/zlib )
1303 - virtual/libiconv
1304 - dev-libs/icu:="
1305 -
1306 -RDEPEND="${DEPEND}
1307 - net-mail/mailbase"
1308 -
1309 -PATCHES=( "${FILESDIR}/${PN}-glibc228.patch" )
1310 -
1311 -pkg_setup() {
1312 - if use managesieve && ! use sieve; then
1313 - ewarn "managesieve USE flag selected but sieve USE flag unselected"
1314 - ewarn "sieve USE flag will be turned on"
1315 - fi
1316 - # default internal user
1317 - enewgroup dovecot 97
1318 - enewuser dovecot 97 -1 /dev/null dovecot
1319 - # default login user
1320 - enewuser dovenull -1 -1 /dev/null
1321 - # add "mail" group for suid'ing. Better security isolation.
1322 - if use suid; then
1323 - enewgroup mail
1324 - fi
1325 -}
1326 -
1327 -src_prepare() {
1328 - default
1329 - # bug 657108
1330 - # elibtoolize
1331 - eautoreconf
1332 -}
1333 -
1334 -src_configure() {
1335 - local conf=""
1336 -
1337 - if use postgres || use mysql || use sqlite; then
1338 - conf="${conf} --with-sql"
1339 - fi
1340 -
1341 - # turn valgrind tests off. Bug #340791
1342 - VALGRIND=no econf \
1343 - --with-rundir="${EPREFIX}/run/dovecot" \
1344 - --with-statedir="${EPREFIX}/var/lib/dovecot" \
1345 - --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
1346 - --without-stemmer \
1347 - --disable-rpath \
1348 - --without-libbsd \
1349 - --with-icu \
1350 - --with-ssl \
1351 - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
1352 - $( use_with argon2 sodium ) \
1353 - $( use_with bzip2 bzlib ) \
1354 - $( use_with caps libcap ) \
1355 - $( use_with kerberos gssapi ) \
1356 - $( use_with lua ) \
1357 - $( use_with ldap ) \
1358 - $( use_with lucene ) \
1359 - $( use_with lz4 ) \
1360 - $( use_with lzma ) \
1361 - $( use_with mysql ) \
1362 - $( use_with pam ) \
1363 - $( use_with postgres pgsql ) \
1364 - $( use_with sqlite ) \
1365 - $( use_with solr ) \
1366 - $( use_with tcpd libwrap ) \
1367 - $( use_with textcat ) \
1368 - $( use_with vpopmail ) \
1369 - $( use_with zlib ) \
1370 - $( use_enable static-libs static ) \
1371 - ${conf}
1372 -
1373 - if use sieve || use managesieve ; then
1374 - # The sieve plugin needs this file to be build to determine the plugin
1375 - # directory and the list of libraries to link to.
1376 - emake dovecot-config
1377 - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
1378 - econf \
1379 - $( use_enable static-libs static ) \
1380 - --localstatedir="${EPREFIX%/}/var" \
1381 - --enable-shared \
1382 - --with-dovecot="${S}" \
1383 - $( use_with managesieve )
1384 - fi
1385 -}
1386 -
1387 -src_compile() {
1388 - default
1389 - if use sieve || use managesieve ; then
1390 - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
1391 - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
1392 - fi
1393 -}
1394 -
1395 -src_test() {
1396 - default
1397 - if use sieve || use managesieve ; then
1398 - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
1399 - default
1400 - fi
1401 -}
1402 -
1403 -src_install () {
1404 - default
1405 -
1406 - # insecure:
1407 - # use suid && fperms u+s /usr/libexec/dovecot/deliver
1408 - # better:
1409 - if use suid;then
1410 - einfo "Changing perms to allow deliver to be suided"
1411 - fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
1412 - fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
1413 - fi
1414 -
1415 - newinitd "${FILESDIR}"/dovecot.init-r5 dovecot
1416 -
1417 - rm -rf "${ED}"/usr/share/doc/dovecot
1418 -
1419 - dodoc AUTHORS NEWS README TODO
1420 - dodoc doc/*.{txt,cnf,xml,sh}
1421 - docinto example-config
1422 - dodoc doc/example-config/*.{conf,ext}
1423 - docinto example-config/conf.d
1424 - dodoc doc/example-config/conf.d/*.{conf,ext}
1425 - docinto wiki
1426 - dodoc doc/wiki/*
1427 - doman doc/man/*.{1,7}
1428 -
1429 - # Create the dovecot.conf file from the dovecot-example.conf file that
1430 - # the dovecot folks nicely left for us....
1431 - local conf="${ED}/etc/dovecot/dovecot.conf"
1432 - local confd="${ED}/etc/dovecot/conf.d"
1433 -
1434 - insinto /etc/dovecot
1435 - doins doc/example-config/*.{conf,ext}
1436 - insinto /etc/dovecot/conf.d
1437 - doins doc/example-config/conf.d/*.{conf,ext}
1438 - fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
1439 - rm -f "${confd}/../README"
1440 -
1441 - # .maildir is the Gentoo default
1442 - local mail_location="maildir:~/.maildir"
1443 - sed -i -e \
1444 - "s|#mail_location =|mail_location = ${mail_location}|" \
1445 - "${confd}/10-mail.conf" \
1446 - || die "failed to update mail location settings in 10-mail.conf"
1447 -
1448 - # We're using pam files (imap and pop3) provided by mailbase
1449 - if use pam; then
1450 - sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
1451 - "${confd}/auth-system.conf.ext" \
1452 - || die "failed to update PAM settings in auth-system.conf.ext"
1453 - # mailbase does not provide a sieve pam file
1454 - use managesieve && dosym imap /etc/pam.d/sieve
1455 - sed -i -e \
1456 - 's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
1457 - "${confd}/10-auth.conf" \
1458 - || die "failed to update PAM settings in 10-auth.conf"
1459 - fi
1460 -
1461 - # Disable ipv6 if necessary
1462 - if ! use ipv6; then
1463 - sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
1464 - || die "failed to update listen settings in dovecot.conf"
1465 - fi
1466 -
1467 - # Update ssl cert locations
1468 - sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
1469 - || die "ssl conf failed"
1470 - sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
1471 - -e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
1472 - "${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
1473 -
1474 - # Install SQL configuration
1475 - if use mysql || use postgres; then
1476 - sed -i -e \
1477 - 's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
1478 - "${confd}/10-auth.conf" || die "failed to update SQL settings in \
1479 - 10-auth.conf"
1480 - fi
1481 -
1482 - # Install LDAP configuration
1483 - if use ldap; then
1484 - sed -i -e \
1485 - 's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
1486 - "${confd}/10-auth.conf" \
1487 - || die "failed to update ldap settings in 10-auth.conf"
1488 - fi
1489 -
1490 - if use vpopmail; then
1491 - sed -i -e \
1492 - 's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
1493 - "${confd}/10-auth.conf" \
1494 - || die "failed to update vpopmail settings in 10-auth.conf"
1495 - fi
1496 -
1497 - if use sieve || use managesieve ; then
1498 - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
1499 - emake DESTDIR="${ED}" install
1500 - sed -i -e \
1501 - 's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
1502 - || die "failed to update sieve settings in 15-lda.conf"
1503 - rm -rf "${ED}"/usr/share/doc/dovecot
1504 - docinto example-config/conf.d
1505 - dodoc doc/example-config/conf.d/*.conf
1506 - insinto /etc/dovecot/conf.d
1507 - doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
1508 - use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
1509 - docinto sieve/rfc
1510 - dodoc doc/rfc/*.txt
1511 - docinto sieve/devel
1512 - dodoc doc/devel/DESIGN
1513 - docinto plugins
1514 - dodoc doc/plugins/*.txt
1515 - docinto extensions
1516 - dodoc doc/extensions/*.txt
1517 - docinto locations
1518 - dodoc doc/locations/*.txt
1519 - doman doc/man/*.{1,7}
1520 - fi
1521 -
1522 - use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
1523 -}
1524 -
1525 -pkg_postinst() {
1526 - # Let's not make a new certificate if we already have one
1527 - if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
1528 - -e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then
1529 - einfo "Creating SSL certificate"
1530 - SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
1531 - install_cert /etc/ssl/dovecot/server
1532 - fi
1533 -
1534 - elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
1535 -}
1536
1537 diff --git a/net-mail/dovecot/dovecot-2.3.4.1.ebuild b/net-mail/dovecot/dovecot-2.3.4.1.ebuild
1538 deleted file mode 100644
1539 index 8bb0af3db63..00000000000
1540 --- a/net-mail/dovecot/dovecot-2.3.4.1.ebuild
1541 +++ /dev/null
1542 @@ -1,293 +0,0 @@
1543 -# Copyright 1999-2019 Gentoo Authors
1544 -# Distributed under the terms of the GNU General Public License v2
1545 -
1546 -EAPI=6
1547 -# do not add a ssl USE flag. ssl is mandatory
1548 -SSL_DEPS_SKIP=1
1549 -inherit autotools ssl-cert systemd user versionator
1550 -
1551 -MY_P="${P/_/.}"
1552 -#MY_S="${PN}-ce-${PV}"
1553 -major_minor="$(get_version_component_range 1-2)"
1554 -sieve_version="0.5.4"
1555 -if [[ ${PV} == *_rc* ]] ; then
1556 - rc_dir="rc/"
1557 -else
1558 - rc_dir=""
1559 -fi
1560 -SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
1561 - sieve? (
1562 - https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
1563 - )
1564 - managesieve? (
1565 - https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
1566 - ) "
1567 -DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
1568 -HOMEPAGE="https://www.dovecot.org/"
1569 -
1570 -SLOT="0"
1571 -LICENSE="LGPL-2.1 MIT"
1572 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
1573 -
1574 -IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
1575 -IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
1576 -IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat"
1577 -
1578 -IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
1579 -
1580 -DEPEND="argon2? ( dev-libs/libsodium )
1581 - bzip2? ( app-arch/bzip2 )
1582 - caps? ( sys-libs/libcap )
1583 - kerberos? ( virtual/krb5 )
1584 - ldap? ( net-nds/openldap )
1585 - lua? ( dev-lang/lua:* )
1586 - lucene? ( >=dev-cpp/clucene-2.3 )
1587 - lzma? ( app-arch/xz-utils )
1588 - lz4? ( app-arch/lz4 )
1589 - mysql? ( virtual/mysql )
1590 - pam? ( virtual/pam )
1591 - postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
1592 - selinux? ( sec-policy/selinux-dovecot )
1593 - solr? ( net-misc/curl dev-libs/expat )
1594 - sqlite? ( dev-db/sqlite:* )
1595 - !libressl? ( dev-libs/openssl:0 )
1596 - libressl? ( dev-libs/libressl )
1597 - tcpd? ( sys-apps/tcp-wrappers )
1598 - textcat? ( app-text/libexttextcat )
1599 - vpopmail? ( net-mail/vpopmail )
1600 - zlib? ( sys-libs/zlib )
1601 - virtual/libiconv
1602 - dev-libs/icu:="
1603 -
1604 -RDEPEND="${DEPEND}
1605 - net-mail/mailbase"
1606 -
1607 -PATCHES=(
1608 - "${FILESDIR}/${PN}-userdb-passwd-fix.patch"
1609 -)
1610 -
1611 -pkg_setup() {
1612 - if use managesieve && ! use sieve; then
1613 - ewarn "managesieve USE flag selected but sieve USE flag unselected"
1614 - ewarn "sieve USE flag will be turned on"
1615 - fi
1616 - # default internal user
1617 - enewgroup dovecot 97
1618 - enewuser dovecot 97 -1 /dev/null dovecot
1619 - # default login user
1620 - enewuser dovenull -1 -1 /dev/null
1621 - # add "mail" group for suid'ing. Better security isolation.
1622 - if use suid; then
1623 - enewgroup mail
1624 - fi
1625 -}
1626 -
1627 -src_prepare() {
1628 - default
1629 - # bug 657108
1630 - # elibtoolize
1631 - eautoreconf
1632 -}
1633 -
1634 -src_configure() {
1635 - local conf=""
1636 -
1637 - if use postgres || use mysql || use sqlite; then
1638 - conf="${conf} --with-sql"
1639 - fi
1640 -
1641 - # turn valgrind tests off. Bug #340791
1642 - VALGRIND=no econf \
1643 - --with-rundir="${EPREFIX}/run/dovecot" \
1644 - --with-statedir="${EPREFIX}/var/lib/dovecot" \
1645 - --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
1646 - --without-stemmer \
1647 - --disable-rpath \
1648 - --without-libbsd \
1649 - --with-icu \
1650 - --with-ssl \
1651 - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
1652 - $( use_with argon2 sodium ) \
1653 - $( use_with bzip2 bzlib ) \
1654 - $( use_with caps libcap ) \
1655 - $( use_with kerberos gssapi ) \
1656 - $( use_with lua ) \
1657 - $( use_with ldap ) \
1658 - $( use_with lucene ) \
1659 - $( use_with lz4 ) \
1660 - $( use_with lzma ) \
1661 - $( use_with mysql ) \
1662 - $( use_with pam ) \
1663 - $( use_with postgres pgsql ) \
1664 - $( use_with sqlite ) \
1665 - $( use_with solr ) \
1666 - $( use_with tcpd libwrap ) \
1667 - $( use_with textcat ) \
1668 - $( use_with vpopmail ) \
1669 - $( use_with zlib ) \
1670 - $( use_enable static-libs static ) \
1671 - ${conf}
1672 -
1673 - if use sieve || use managesieve ; then
1674 - # The sieve plugin needs this file to be build to determine the plugin
1675 - # directory and the list of libraries to link to.
1676 - emake dovecot-config
1677 - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
1678 - econf \
1679 - $( use_enable static-libs static ) \
1680 - --localstatedir="${EPREFIX%/}/var" \
1681 - --enable-shared \
1682 - --with-dovecot="${S}" \
1683 - $( use_with managesieve )
1684 - fi
1685 -}
1686 -
1687 -src_compile() {
1688 - default
1689 - if use sieve || use managesieve ; then
1690 - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
1691 - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
1692 - fi
1693 -}
1694 -
1695 -src_test() {
1696 - default
1697 - if use sieve || use managesieve ; then
1698 - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
1699 - default
1700 - fi
1701 -}
1702 -
1703 -src_install () {
1704 - default
1705 -
1706 - # insecure:
1707 - # use suid && fperms u+s /usr/libexec/dovecot/deliver
1708 - # better:
1709 - if use suid;then
1710 - einfo "Changing perms to allow deliver to be suided"
1711 - fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
1712 - fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
1713 - fi
1714 -
1715 - newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
1716 -
1717 - rm -rf "${ED}"/usr/share/doc/dovecot
1718 -
1719 - dodoc AUTHORS NEWS README TODO
1720 - dodoc doc/*.{txt,cnf,xml,sh}
1721 - docinto example-config
1722 - dodoc doc/example-config/*.{conf,ext}
1723 - docinto example-config/conf.d
1724 - dodoc doc/example-config/conf.d/*.{conf,ext}
1725 - docinto wiki
1726 - dodoc doc/wiki/*
1727 - doman doc/man/*.{1,7}
1728 -
1729 - # Create the dovecot.conf file from the dovecot-example.conf file that
1730 - # the dovecot folks nicely left for us....
1731 - local conf="${ED}/etc/dovecot/dovecot.conf"
1732 - local confd="${ED}/etc/dovecot/conf.d"
1733 -
1734 - insinto /etc/dovecot
1735 - doins doc/example-config/*.{conf,ext}
1736 - insinto /etc/dovecot/conf.d
1737 - doins doc/example-config/conf.d/*.{conf,ext}
1738 - fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
1739 - rm -f "${confd}/../README"
1740 -
1741 - # .maildir is the Gentoo default
1742 - local mail_location="maildir:~/.maildir"
1743 - sed -i -e \
1744 - "s|#mail_location =|mail_location = ${mail_location}|" \
1745 - "${confd}/10-mail.conf" \
1746 - || die "failed to update mail location settings in 10-mail.conf"
1747 -
1748 - # We're using pam files (imap and pop3) provided by mailbase
1749 - if use pam; then
1750 - sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
1751 - "${confd}/auth-system.conf.ext" \
1752 - || die "failed to update PAM settings in auth-system.conf.ext"
1753 - # mailbase does not provide a sieve pam file
1754 - use managesieve && dosym imap /etc/pam.d/sieve
1755 - sed -i -e \
1756 - 's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
1757 - "${confd}/10-auth.conf" \
1758 - || die "failed to update PAM settings in 10-auth.conf"
1759 - fi
1760 -
1761 - # Disable ipv6 if necessary
1762 - if ! use ipv6; then
1763 - sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
1764 - || die "failed to update listen settings in dovecot.conf"
1765 - fi
1766 -
1767 - # Update ssl cert locations
1768 - sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
1769 - || die "ssl conf failed"
1770 - sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
1771 - -e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
1772 - "${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
1773 -
1774 - # Install SQL configuration
1775 - if use mysql || use postgres; then
1776 - sed -i -e \
1777 - 's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
1778 - "${confd}/10-auth.conf" || die "failed to update SQL settings in \
1779 - 10-auth.conf"
1780 - fi
1781 -
1782 - # Install LDAP configuration
1783 - if use ldap; then
1784 - sed -i -e \
1785 - 's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
1786 - "${confd}/10-auth.conf" \
1787 - || die "failed to update ldap settings in 10-auth.conf"
1788 - fi
1789 -
1790 - if use vpopmail; then
1791 - sed -i -e \
1792 - 's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
1793 - "${confd}/10-auth.conf" \
1794 - || die "failed to update vpopmail settings in 10-auth.conf"
1795 - fi
1796 -
1797 - if use sieve || use managesieve ; then
1798 - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
1799 - emake DESTDIR="${ED}" install
1800 - sed -i -e \
1801 - 's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
1802 - || die "failed to update sieve settings in 15-lda.conf"
1803 - rm -rf "${ED}"/usr/share/doc/dovecot
1804 - docinto example-config/conf.d
1805 - dodoc doc/example-config/conf.d/*.conf
1806 - insinto /etc/dovecot/conf.d
1807 - doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
1808 - use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
1809 - docinto sieve/rfc
1810 - dodoc doc/rfc/*.txt
1811 - docinto sieve/devel
1812 - dodoc doc/devel/DESIGN
1813 - docinto plugins
1814 - dodoc doc/plugins/*.txt
1815 - docinto extensions
1816 - dodoc doc/extensions/*.txt
1817 - docinto locations
1818 - dodoc doc/locations/*.txt
1819 - doman doc/man/*.{1,7}
1820 - fi
1821 -
1822 - use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
1823 -}
1824 -
1825 -pkg_postinst() {
1826 - # Let's not make a new certificate if we already have one
1827 - if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
1828 - -e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then
1829 - einfo "Creating SSL certificate"
1830 - SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
1831 - install_cert /etc/ssl/dovecot/server
1832 - fi
1833 -
1834 - elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
1835 -}
1836
1837 diff --git a/net-mail/dovecot/dovecot-2.3.4.ebuild b/net-mail/dovecot/dovecot-2.3.4.ebuild
1838 deleted file mode 100644
1839 index 3a9711794cd..00000000000
1840 --- a/net-mail/dovecot/dovecot-2.3.4.ebuild
1841 +++ /dev/null
1842 @@ -1,293 +0,0 @@
1843 -# Copyright 1999-2018 Gentoo Authors
1844 -# Distributed under the terms of the GNU General Public License v2
1845 -
1846 -EAPI=6
1847 -# do not add a ssl USE flag. ssl is mandatory
1848 -SSL_DEPS_SKIP=1
1849 -inherit autotools ssl-cert systemd user versionator
1850 -
1851 -MY_P="${P/_/.}"
1852 -#MY_S="${PN}-ce-${PV}"
1853 -major_minor="$(get_version_component_range 1-2)"
1854 -sieve_version="0.5.4"
1855 -if [[ ${PV} == *_rc* ]] ; then
1856 - rc_dir="rc/"
1857 -else
1858 - rc_dir=""
1859 -fi
1860 -SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
1861 - sieve? (
1862 - https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
1863 - )
1864 - managesieve? (
1865 - https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
1866 - ) "
1867 -DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
1868 -HOMEPAGE="https://www.dovecot.org/"
1869 -
1870 -SLOT="0"
1871 -LICENSE="LGPL-2.1 MIT"
1872 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
1873 -
1874 -IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
1875 -IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
1876 -IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat"
1877 -
1878 -IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
1879 -
1880 -DEPEND="argon2? ( dev-libs/libsodium )
1881 - bzip2? ( app-arch/bzip2 )
1882 - caps? ( sys-libs/libcap )
1883 - kerberos? ( virtual/krb5 )
1884 - ldap? ( net-nds/openldap )
1885 - lua? ( dev-lang/lua:* )
1886 - lucene? ( >=dev-cpp/clucene-2.3 )
1887 - lzma? ( app-arch/xz-utils )
1888 - lz4? ( app-arch/lz4 )
1889 - mysql? ( virtual/mysql )
1890 - pam? ( virtual/pam )
1891 - postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
1892 - selinux? ( sec-policy/selinux-dovecot )
1893 - solr? ( net-misc/curl dev-libs/expat )
1894 - sqlite? ( dev-db/sqlite:* )
1895 - !libressl? ( dev-libs/openssl:0 )
1896 - libressl? ( dev-libs/libressl )
1897 - tcpd? ( sys-apps/tcp-wrappers )
1898 - textcat? ( app-text/libexttextcat )
1899 - vpopmail? ( net-mail/vpopmail )
1900 - zlib? ( sys-libs/zlib )
1901 - virtual/libiconv
1902 - dev-libs/icu:="
1903 -
1904 -RDEPEND="${DEPEND}
1905 - net-mail/mailbase"
1906 -
1907 -PATCHES=(
1908 - "${FILESDIR}/${PN}-userdb-passwd-fix.patch"
1909 -)
1910 -
1911 -pkg_setup() {
1912 - if use managesieve && ! use sieve; then
1913 - ewarn "managesieve USE flag selected but sieve USE flag unselected"
1914 - ewarn "sieve USE flag will be turned on"
1915 - fi
1916 - # default internal user
1917 - enewgroup dovecot 97
1918 - enewuser dovecot 97 -1 /dev/null dovecot
1919 - # default login user
1920 - enewuser dovenull -1 -1 /dev/null
1921 - # add "mail" group for suid'ing. Better security isolation.
1922 - if use suid; then
1923 - enewgroup mail
1924 - fi
1925 -}
1926 -
1927 -src_prepare() {
1928 - default
1929 - # bug 657108
1930 - # elibtoolize
1931 - eautoreconf
1932 -}
1933 -
1934 -src_configure() {
1935 - local conf=""
1936 -
1937 - if use postgres || use mysql || use sqlite; then
1938 - conf="${conf} --with-sql"
1939 - fi
1940 -
1941 - # turn valgrind tests off. Bug #340791
1942 - VALGRIND=no econf \
1943 - --with-rundir="${EPREFIX}/run/dovecot" \
1944 - --with-statedir="${EPREFIX}/var/lib/dovecot" \
1945 - --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
1946 - --without-stemmer \
1947 - --disable-rpath \
1948 - --without-libbsd \
1949 - --with-icu \
1950 - --with-ssl \
1951 - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
1952 - $( use_with argon2 sodium ) \
1953 - $( use_with bzip2 bzlib ) \
1954 - $( use_with caps libcap ) \
1955 - $( use_with kerberos gssapi ) \
1956 - $( use_with lua ) \
1957 - $( use_with ldap ) \
1958 - $( use_with lucene ) \
1959 - $( use_with lz4 ) \
1960 - $( use_with lzma ) \
1961 - $( use_with mysql ) \
1962 - $( use_with pam ) \
1963 - $( use_with postgres pgsql ) \
1964 - $( use_with sqlite ) \
1965 - $( use_with solr ) \
1966 - $( use_with tcpd libwrap ) \
1967 - $( use_with textcat ) \
1968 - $( use_with vpopmail ) \
1969 - $( use_with zlib ) \
1970 - $( use_enable static-libs static ) \
1971 - ${conf}
1972 -
1973 - if use sieve || use managesieve ; then
1974 - # The sieve plugin needs this file to be build to determine the plugin
1975 - # directory and the list of libraries to link to.
1976 - emake dovecot-config
1977 - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
1978 - econf \
1979 - $( use_enable static-libs static ) \
1980 - --localstatedir="${EPREFIX%/}/var" \
1981 - --enable-shared \
1982 - --with-dovecot="${S}" \
1983 - $( use_with managesieve )
1984 - fi
1985 -}
1986 -
1987 -src_compile() {
1988 - default
1989 - if use sieve || use managesieve ; then
1990 - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
1991 - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
1992 - fi
1993 -}
1994 -
1995 -src_test() {
1996 - default
1997 - if use sieve || use managesieve ; then
1998 - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
1999 - default
2000 - fi
2001 -}
2002 -
2003 -src_install () {
2004 - default
2005 -
2006 - # insecure:
2007 - # use suid && fperms u+s /usr/libexec/dovecot/deliver
2008 - # better:
2009 - if use suid;then
2010 - einfo "Changing perms to allow deliver to be suided"
2011 - fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
2012 - fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
2013 - fi
2014 -
2015 - newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
2016 -
2017 - rm -rf "${ED}"/usr/share/doc/dovecot
2018 -
2019 - dodoc AUTHORS NEWS README TODO
2020 - dodoc doc/*.{txt,cnf,xml,sh}
2021 - docinto example-config
2022 - dodoc doc/example-config/*.{conf,ext}
2023 - docinto example-config/conf.d
2024 - dodoc doc/example-config/conf.d/*.{conf,ext}
2025 - docinto wiki
2026 - dodoc doc/wiki/*
2027 - doman doc/man/*.{1,7}
2028 -
2029 - # Create the dovecot.conf file from the dovecot-example.conf file that
2030 - # the dovecot folks nicely left for us....
2031 - local conf="${ED}/etc/dovecot/dovecot.conf"
2032 - local confd="${ED}/etc/dovecot/conf.d"
2033 -
2034 - insinto /etc/dovecot
2035 - doins doc/example-config/*.{conf,ext}
2036 - insinto /etc/dovecot/conf.d
2037 - doins doc/example-config/conf.d/*.{conf,ext}
2038 - fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
2039 - rm -f "${confd}/../README"
2040 -
2041 - # .maildir is the Gentoo default
2042 - local mail_location="maildir:~/.maildir"
2043 - sed -i -e \
2044 - "s|#mail_location =|mail_location = ${mail_location}|" \
2045 - "${confd}/10-mail.conf" \
2046 - || die "failed to update mail location settings in 10-mail.conf"
2047 -
2048 - # We're using pam files (imap and pop3) provided by mailbase
2049 - if use pam; then
2050 - sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
2051 - "${confd}/auth-system.conf.ext" \
2052 - || die "failed to update PAM settings in auth-system.conf.ext"
2053 - # mailbase does not provide a sieve pam file
2054 - use managesieve && dosym imap /etc/pam.d/sieve
2055 - sed -i -e \
2056 - 's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
2057 - "${confd}/10-auth.conf" \
2058 - || die "failed to update PAM settings in 10-auth.conf"
2059 - fi
2060 -
2061 - # Disable ipv6 if necessary
2062 - if ! use ipv6; then
2063 - sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
2064 - || die "failed to update listen settings in dovecot.conf"
2065 - fi
2066 -
2067 - # Update ssl cert locations
2068 - sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
2069 - || die "ssl conf failed"
2070 - sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
2071 - -e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
2072 - "${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
2073 -
2074 - # Install SQL configuration
2075 - if use mysql || use postgres; then
2076 - sed -i -e \
2077 - 's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
2078 - "${confd}/10-auth.conf" || die "failed to update SQL settings in \
2079 - 10-auth.conf"
2080 - fi
2081 -
2082 - # Install LDAP configuration
2083 - if use ldap; then
2084 - sed -i -e \
2085 - 's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
2086 - "${confd}/10-auth.conf" \
2087 - || die "failed to update ldap settings in 10-auth.conf"
2088 - fi
2089 -
2090 - if use vpopmail; then
2091 - sed -i -e \
2092 - 's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
2093 - "${confd}/10-auth.conf" \
2094 - || die "failed to update vpopmail settings in 10-auth.conf"
2095 - fi
2096 -
2097 - if use sieve || use managesieve ; then
2098 - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
2099 - emake DESTDIR="${ED}" install
2100 - sed -i -e \
2101 - 's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
2102 - || die "failed to update sieve settings in 15-lda.conf"
2103 - rm -rf "${ED}"/usr/share/doc/dovecot
2104 - docinto example-config/conf.d
2105 - dodoc doc/example-config/conf.d/*.conf
2106 - insinto /etc/dovecot/conf.d
2107 - doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
2108 - use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
2109 - docinto sieve/rfc
2110 - dodoc doc/rfc/*.txt
2111 - docinto sieve/devel
2112 - dodoc doc/devel/DESIGN
2113 - docinto plugins
2114 - dodoc doc/plugins/*.txt
2115 - docinto extensions
2116 - dodoc doc/extensions/*.txt
2117 - docinto locations
2118 - dodoc doc/locations/*.txt
2119 - doman doc/man/*.{1,7}
2120 - fi
2121 -
2122 - use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
2123 -}
2124 -
2125 -pkg_postinst() {
2126 - # Let's not make a new certificate if we already have one
2127 - if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
2128 - -e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then
2129 - einfo "Creating SSL certificate"
2130 - SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
2131 - install_cert /etc/ssl/dovecot/server
2132 - fi
2133 -
2134 - elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
2135 -}
2136
2137 diff --git a/net-mail/dovecot/dovecot-2.3.5.ebuild b/net-mail/dovecot/dovecot-2.3.5.ebuild
2138 deleted file mode 100644
2139 index 0cac1f64056..00000000000
2140 --- a/net-mail/dovecot/dovecot-2.3.5.ebuild
2141 +++ /dev/null
2142 @@ -1,294 +0,0 @@
2143 -# Copyright 1999-2019 Gentoo Authors
2144 -# Distributed under the terms of the GNU General Public License v2
2145 -
2146 -EAPI=6
2147 -
2148 -# do not add a ssl USE flag. ssl is mandatory
2149 -SSL_DEPS_SKIP=1
2150 -inherit autotools ssl-cert systemd user versionator
2151 -
2152 -MY_P="${P/_/.}"
2153 -#MY_S="${PN}-ce-${PV}"
2154 -major_minor="$(get_version_component_range 1-2)"
2155 -sieve_version="0.5.5"
2156 -if [[ ${PV} == *_rc* ]] ; then
2157 - rc_dir="rc/"
2158 -else
2159 - rc_dir=""
2160 -fi
2161 -SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
2162 - sieve? (
2163 - https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
2164 - )
2165 - managesieve? (
2166 - https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
2167 - ) "
2168 -DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
2169 -HOMEPAGE="https://www.dovecot.org/"
2170 -
2171 -SLOT="0"
2172 -LICENSE="LGPL-2.1 MIT"
2173 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
2174 -
2175 -IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
2176 -IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
2177 -IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat"
2178 -
2179 -IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
2180 -
2181 -DEPEND="argon2? ( dev-libs/libsodium )
2182 - bzip2? ( app-arch/bzip2 )
2183 - caps? ( sys-libs/libcap )
2184 - kerberos? ( virtual/krb5 )
2185 - ldap? ( net-nds/openldap )
2186 - lua? ( dev-lang/lua:* )
2187 - lucene? ( >=dev-cpp/clucene-2.3 )
2188 - lzma? ( app-arch/xz-utils )
2189 - lz4? ( app-arch/lz4 )
2190 - mysql? ( dev-db/mysql-connector-c:0= )
2191 - pam? ( virtual/pam )
2192 - postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
2193 - selinux? ( sec-policy/selinux-dovecot )
2194 - solr? ( net-misc/curl dev-libs/expat )
2195 - sqlite? ( dev-db/sqlite:* )
2196 - !libressl? ( dev-libs/openssl:0 )
2197 - libressl? ( dev-libs/libressl )
2198 - tcpd? ( sys-apps/tcp-wrappers )
2199 - textcat? ( app-text/libexttextcat )
2200 - vpopmail? ( net-mail/vpopmail )
2201 - zlib? ( sys-libs/zlib )
2202 - virtual/libiconv
2203 - dev-libs/icu:="
2204 -
2205 -RDEPEND="${DEPEND}
2206 - net-mail/mailbase"
2207 -
2208 -PATCHES=(
2209 - "${FILESDIR}/${PN}-userdb-passwd-fix.patch"
2210 -)
2211 -
2212 -pkg_setup() {
2213 - if use managesieve && ! use sieve; then
2214 - ewarn "managesieve USE flag selected but sieve USE flag unselected"
2215 - ewarn "sieve USE flag will be turned on"
2216 - fi
2217 - # default internal user
2218 - enewgroup dovecot 97
2219 - enewuser dovecot 97 -1 /dev/null dovecot
2220 - # default login user
2221 - enewuser dovenull -1 -1 /dev/null
2222 - # add "mail" group for suid'ing. Better security isolation.
2223 - if use suid; then
2224 - enewgroup mail
2225 - fi
2226 -}
2227 -
2228 -src_prepare() {
2229 - default
2230 - # bug 657108
2231 - # elibtoolize
2232 - eautoreconf
2233 -}
2234 -
2235 -src_configure() {
2236 - local conf=""
2237 -
2238 - if use postgres || use mysql || use sqlite; then
2239 - conf="${conf} --with-sql"
2240 - fi
2241 -
2242 - # turn valgrind tests off. Bug #340791
2243 - VALGRIND=no econf \
2244 - --with-rundir="${EPREFIX}/run/dovecot" \
2245 - --with-statedir="${EPREFIX}/var/lib/dovecot" \
2246 - --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
2247 - --without-stemmer \
2248 - --disable-rpath \
2249 - --without-libbsd \
2250 - --with-icu \
2251 - --with-ssl \
2252 - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
2253 - $( use_with argon2 sodium ) \
2254 - $( use_with bzip2 bzlib ) \
2255 - $( use_with caps libcap ) \
2256 - $( use_with kerberos gssapi ) \
2257 - $( use_with lua ) \
2258 - $( use_with ldap ) \
2259 - $( use_with lucene ) \
2260 - $( use_with lz4 ) \
2261 - $( use_with lzma ) \
2262 - $( use_with mysql ) \
2263 - $( use_with pam ) \
2264 - $( use_with postgres pgsql ) \
2265 - $( use_with sqlite ) \
2266 - $( use_with solr ) \
2267 - $( use_with tcpd libwrap ) \
2268 - $( use_with textcat ) \
2269 - $( use_with vpopmail ) \
2270 - $( use_with zlib ) \
2271 - $( use_enable static-libs static ) \
2272 - ${conf}
2273 -
2274 - if use sieve || use managesieve ; then
2275 - # The sieve plugin needs this file to be build to determine the plugin
2276 - # directory and the list of libraries to link to.
2277 - emake dovecot-config
2278 - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
2279 - econf \
2280 - $( use_enable static-libs static ) \
2281 - --localstatedir="${EPREFIX%/}/var" \
2282 - --enable-shared \
2283 - --with-dovecot="${S}" \
2284 - $( use_with managesieve )
2285 - fi
2286 -}
2287 -
2288 -src_compile() {
2289 - default
2290 - if use sieve || use managesieve ; then
2291 - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
2292 - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
2293 - fi
2294 -}
2295 -
2296 -src_test() {
2297 - default
2298 - if use sieve || use managesieve ; then
2299 - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
2300 - default
2301 - fi
2302 -}
2303 -
2304 -src_install () {
2305 - default
2306 -
2307 - # insecure:
2308 - # use suid && fperms u+s /usr/libexec/dovecot/deliver
2309 - # better:
2310 - if use suid;then
2311 - einfo "Changing perms to allow deliver to be suided"
2312 - fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
2313 - fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
2314 - fi
2315 -
2316 - newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
2317 -
2318 - rm -rf "${ED}"/usr/share/doc/dovecot
2319 -
2320 - dodoc AUTHORS NEWS README TODO
2321 - dodoc doc/*.{txt,cnf,xml,sh}
2322 - docinto example-config
2323 - dodoc doc/example-config/*.{conf,ext}
2324 - docinto example-config/conf.d
2325 - dodoc doc/example-config/conf.d/*.{conf,ext}
2326 - docinto wiki
2327 - dodoc doc/wiki/*
2328 - doman doc/man/*.{1,7}
2329 -
2330 - # Create the dovecot.conf file from the dovecot-example.conf file that
2331 - # the dovecot folks nicely left for us....
2332 - local conf="${ED}/etc/dovecot/dovecot.conf"
2333 - local confd="${ED}/etc/dovecot/conf.d"
2334 -
2335 - insinto /etc/dovecot
2336 - doins doc/example-config/*.{conf,ext}
2337 - insinto /etc/dovecot/conf.d
2338 - doins doc/example-config/conf.d/*.{conf,ext}
2339 - fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
2340 - rm -f "${confd}/../README"
2341 -
2342 - # .maildir is the Gentoo default
2343 - local mail_location="maildir:~/.maildir"
2344 - sed -i -e \
2345 - "s|#mail_location =|mail_location = ${mail_location}|" \
2346 - "${confd}/10-mail.conf" \
2347 - || die "failed to update mail location settings in 10-mail.conf"
2348 -
2349 - # We're using pam files (imap and pop3) provided by mailbase
2350 - if use pam; then
2351 - sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
2352 - "${confd}/auth-system.conf.ext" \
2353 - || die "failed to update PAM settings in auth-system.conf.ext"
2354 - # mailbase does not provide a sieve pam file
2355 - use managesieve && dosym imap /etc/pam.d/sieve
2356 - sed -i -e \
2357 - 's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
2358 - "${confd}/10-auth.conf" \
2359 - || die "failed to update PAM settings in 10-auth.conf"
2360 - fi
2361 -
2362 - # Disable ipv6 if necessary
2363 - if ! use ipv6; then
2364 - sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
2365 - || die "failed to update listen settings in dovecot.conf"
2366 - fi
2367 -
2368 - # Update ssl cert locations
2369 - sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
2370 - || die "ssl conf failed"
2371 - sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
2372 - -e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
2373 - "${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
2374 -
2375 - # Install SQL configuration
2376 - if use mysql || use postgres; then
2377 - sed -i -e \
2378 - 's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
2379 - "${confd}/10-auth.conf" || die "failed to update SQL settings in \
2380 - 10-auth.conf"
2381 - fi
2382 -
2383 - # Install LDAP configuration
2384 - if use ldap; then
2385 - sed -i -e \
2386 - 's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
2387 - "${confd}/10-auth.conf" \
2388 - || die "failed to update ldap settings in 10-auth.conf"
2389 - fi
2390 -
2391 - if use vpopmail; then
2392 - sed -i -e \
2393 - 's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
2394 - "${confd}/10-auth.conf" \
2395 - || die "failed to update vpopmail settings in 10-auth.conf"
2396 - fi
2397 -
2398 - if use sieve || use managesieve ; then
2399 - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
2400 - emake DESTDIR="${ED}" install
2401 - sed -i -e \
2402 - 's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
2403 - || die "failed to update sieve settings in 15-lda.conf"
2404 - rm -rf "${ED}"/usr/share/doc/dovecot
2405 - docinto example-config/conf.d
2406 - dodoc doc/example-config/conf.d/*.conf
2407 - insinto /etc/dovecot/conf.d
2408 - doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
2409 - use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
2410 - docinto sieve/rfc
2411 - dodoc doc/rfc/*.txt
2412 - docinto sieve/devel
2413 - dodoc doc/devel/DESIGN
2414 - docinto plugins
2415 - dodoc doc/plugins/*.txt
2416 - docinto extensions
2417 - dodoc doc/extensions/*.txt
2418 - docinto locations
2419 - dodoc doc/locations/*.txt
2420 - doman doc/man/*.{1,7}
2421 - fi
2422 -
2423 - use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
2424 -}
2425 -
2426 -pkg_postinst() {
2427 - # Let's not make a new certificate if we already have one
2428 - if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
2429 - -e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then
2430 - einfo "Creating SSL certificate"
2431 - SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
2432 - install_cert /etc/ssl/dovecot/server
2433 - fi
2434 -
2435 - elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
2436 -}