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: Mon, 05 Jun 2017 12:28:14
Message-Id: 1496665670.0961a295eca7f1040d2036f431907e63be5580eb.eras@gentoo
1 commit: 0961a295eca7f1040d2036f431907e63be5580eb
2 Author: Eray Aslan <eras <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 5 12:27:50 2017 +0000
4 Commit: Eray Aslan <eras <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 5 12:27:50 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0961a295
7
8 net-mail/dovecot: version bump to 2.2.30.1
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.2
11
12 net-mail/dovecot/Manifest | 1 +
13 net-mail/dovecot/dovecot-2.2.30.1.ebuild | 290 +++++++++++++++++++++++++++++++
14 2 files changed, 291 insertions(+)
15
16 diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
17 index 443adbf17fe..398b00621a5 100644
18 --- a/net-mail/dovecot/Manifest
19 +++ b/net-mail/dovecot/Manifest
20 @@ -2,3 +2,4 @@ DIST dovecot-2.2-pigeonhole-0.4.18.tar.gz 1742357 SHA256 dd871bb57fad22795460f61
21 DIST dovecot-2.2-pigeonhole-0.4.9.tar.gz 1577127 SHA256 82892f876d26008a076973dfddf1cffaf5a0451825fd44e06287e94b89078649 SHA512 9e7a18b43d59ed955b142d16696ca221822a547ea59ac70c1bb374eedb28b6ed99ea49f34ead1f9a16ded4573605e410a5cc8e038e1bdf5f943a65588b5d3af2 WHIRLPOOL be309436b43af82a7cb8eff205e1638b2c59751927fdab187e6fde72330e4abd99878cbfa94ca50440ec8de1f9b569bf334d426891ddc73d5f647ee2040c193f
22 DIST dovecot-2.2.19.tar.gz 5256627 SHA256 759e1e3f9d907cdaabad1f5fbacc793ca191d234c084bec3bba42966952a4e9f SHA512 1b9d605a6a5862ade9d1ca634a9e0171b7c212ab025fc2059051c3795470685b66516fa9fbe5ad91d84388268ea15795f2dcd70ffdf81736ce4d80fd284835e9 WHIRLPOOL 30dbe70bfeef10dbe414ebf3f091041ad66926a8748cd401ecaf9ed5c7602939e86943d98bfb839f32c0aa1d0081ab71adacf23bb4adba34e828ee296e9a7278
23 DIST dovecot-2.2.29.1.tar.gz 5972119 SHA256 ccfa9ffb7eb91e9e87c21c108324b911250c9ffa838bffb64b1caafadcb0f388 SHA512 1e5ea6080ebe7dd4afe6fcfe8e98ed6d2ad2735655a18cc96e439dd044ccc3a1a6a80428bc746b4d6250820895d6a62121562e97e4b46c8b1cf88a19443bc111 WHIRLPOOL 97a3b45191a32e78a08b4113a6e8b34e0bc538ec8359210d0bdf63990246af89be25cdaf9017c46f3107a7ec82758fa25820d61c25eda94f14ce7351d3aaea7a
24 +DIST dovecot-2.2.30.1.tar.gz 6004223 SHA256 9049db49f7ccd76850a17872896dfb8778676bab38454575f59bb39f16b083a4 SHA512 f95e85093e1f671b1e9d067974880eaaf8ab021df1f6d298977c40146a1db2a2b71b4029842785ffaae1aeedec83b2218ff03112537045e08dfc7c845f9e27c3 WHIRLPOOL c4c180b3f92c5af832e6da95173eacf52e16680221968d03c62cec59d96fde84975c81687a2bd256c4f2ed4720690b278f4f706bc0d16710f6b043a6bb348797
25
26 diff --git a/net-mail/dovecot/dovecot-2.2.30.1.ebuild b/net-mail/dovecot/dovecot-2.2.30.1.ebuild
27 new file mode 100644
28 index 00000000000..9a811261c57
29 --- /dev/null
30 +++ b/net-mail/dovecot/dovecot-2.2.30.1.ebuild
31 @@ -0,0 +1,290 @@
32 +# Copyright 1999-2017 Gentoo Foundation
33 +# Distributed under the terms of the GNU General Public License v2
34 +
35 +EAPI=6
36 +inherit ssl-cert systemd user versionator
37 +
38 +MY_P="${P/_/.}"
39 +major_minor="$(get_version_component_range 1-2)"
40 +sieve_version="0.4.18"
41 +if [[ ${PV} == *_rc* ]] ; then
42 + rc_dir="rc/"
43 +else
44 + rc_dir=""
45 +fi
46 +SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
47 + sieve? (
48 + https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
49 + )
50 + managesieve? (
51 + https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
52 + ) "
53 +DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
54 +HOMEPAGE="http://www.dovecot.org/"
55 +
56 +SLOT="0"
57 +LICENSE="LGPL-2.1 MIT"
58 +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~x86"
59 +
60 +IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
61 +IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
62 +IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd textcat"
63 +
64 +IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
65 +
66 +DEPEND="bzip2? ( app-arch/bzip2 )
67 + caps? ( sys-libs/libcap )
68 + kerberos? ( virtual/krb5 )
69 + ldap? ( net-nds/openldap )
70 + lucene? ( >=dev-cpp/clucene-2.3 )
71 + lzma? ( app-arch/xz-utils )
72 + lz4? ( app-arch/lz4 )
73 + mysql? ( virtual/mysql )
74 + pam? ( virtual/pam )
75 + postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
76 + selinux? ( sec-policy/selinux-dovecot )
77 + solr? ( net-misc/curl dev-libs/expat )
78 + sqlite? ( dev-db/sqlite:* )
79 + ssl? (
80 + !libressl? ( dev-libs/openssl:0 )
81 + libressl? ( dev-libs/libressl )
82 + )
83 + tcpd? ( sys-apps/tcp-wrappers )
84 + textcat? ( app-text/libexttextcat )
85 + vpopmail? ( net-mail/vpopmail )
86 + zlib? ( sys-libs/zlib )
87 + virtual/libiconv
88 + dev-libs/icu:="
89 +
90 +RDEPEND="${DEPEND}
91 + net-mail/mailbase"
92 +
93 +# Dovecot does not support building without ssl. Force it for now
94 +REQUIRED_USE="ssl"
95 +
96 +S=${WORKDIR}/${MY_P}
97 +
98 +pkg_setup() {
99 + if use managesieve && ! use sieve; then
100 + ewarn "managesieve USE flag selected but sieve USE flag unselected"
101 + ewarn "sieve USE flag will be turned on"
102 + fi
103 + # default internal user
104 + enewgroup dovecot 97
105 + enewuser dovecot 97 -1 /dev/null dovecot
106 + # default login user
107 + enewuser dovenull -1 -1 /dev/null
108 + # add "mail" group for suid'ing. Better security isolation.
109 + if use suid; then
110 + enewgroup mail
111 + fi
112 +}
113 +
114 +src_prepare() {
115 + eapply -p0 "${FILESDIR}/${PN}-10-ssl.patch"
116 + eapply_user
117 +}
118 +
119 +src_configure() {
120 + local conf=""
121 +
122 + if use postgres || use mysql || use sqlite; then
123 + conf="${conf} --with-sql"
124 + fi
125 +
126 + # turn valgrind tests off. Bug #340791
127 + VALGRIND=no econf \
128 + --localstatedir="${EPREFIX}/var" \
129 + --runstatedir="${EPREFIX}/run" \
130 + --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
131 + --without-stemmer \
132 + --disable-rpath \
133 + --with-icu \
134 + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
135 + $( use_with bzip2 bzlib ) \
136 + $( use_with caps libcap ) \
137 + $( use_with kerberos gssapi ) \
138 + $( use_with ldap ) \
139 + $( use_with lucene ) \
140 + $( use_with lz4 ) \
141 + $( use_with lzma ) \
142 + $( use_with mysql ) \
143 + $( use_with pam ) \
144 + $( use_with postgres pgsql ) \
145 + $( use_with sqlite ) \
146 + $( use_with solr ) \
147 + $( use_with ssl ) \
148 + $( use_with tcpd libwrap ) \
149 + $( use_with textcat ) \
150 + $( use_with vpopmail ) \
151 + $( use_with zlib ) \
152 + $( use_enable static-libs static ) \
153 + ${conf}
154 +
155 + if use sieve || use managesieve ; then
156 + # The sieve plugin needs this file to be build to determine the plugin
157 + # directory and the list of libraries to link to.
158 + emake dovecot-config
159 + cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
160 + econf \
161 + $( use_enable static-libs static ) \
162 + --localstatedir="${EPREFIX}/var" \
163 + --enable-shared \
164 + --with-dovecot="../${MY_P}" \
165 + $( use_with managesieve )
166 + fi
167 +}
168 +
169 +src_compile() {
170 + default
171 + if use sieve || use managesieve ; then
172 + cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
173 + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
174 + fi
175 +}
176 +
177 +src_test() {
178 + default
179 + if use sieve || use managesieve ; then
180 + cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
181 + default
182 + fi
183 +}
184 +
185 +src_install () {
186 + default
187 +
188 + # insecure:
189 + # use suid && fperms u+s /usr/libexec/dovecot/deliver
190 + # better:
191 + if use suid;then
192 + einfo "Changing perms to allow deliver to be suided"
193 + fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
194 + fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
195 + fi
196 +
197 + newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
198 +
199 + rm -rf "${ED}"/usr/share/doc/dovecot
200 +
201 + dodoc AUTHORS NEWS README TODO
202 + dodoc doc/*.{txt,cnf,xml,sh}
203 + docinto example-config
204 + dodoc doc/example-config/*.{conf,ext}
205 + docinto example-config/conf.d
206 + dodoc doc/example-config/conf.d/*.{conf,ext}
207 + docinto wiki
208 + dodoc doc/wiki/*
209 + doman doc/man/*.{1,7}
210 +
211 + # Create the dovecot.conf file from the dovecot-example.conf file that
212 + # the dovecot folks nicely left for us....
213 + local conf="${ED}/etc/dovecot/dovecot.conf"
214 + local confd="${ED}/etc/dovecot/conf.d"
215 +
216 + insinto /etc/dovecot
217 + doins doc/example-config/*.{conf,ext}
218 + insinto /etc/dovecot/conf.d
219 + doins doc/example-config/conf.d/*.{conf,ext}
220 + fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
221 + rm -f "${confd}/../README"
222 +
223 + # .maildir is the Gentoo default
224 + local mail_location="maildir:~/.maildir"
225 + sed -i -e \
226 + "s|#mail_location =|mail_location = ${mail_location}|" \
227 + "${confd}/10-mail.conf" \
228 + || die "failed to update mail location settings in 10-mail.conf"
229 +
230 + # We're using pam files (imap and pop3) provided by mailbase
231 + if use pam; then
232 + sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
233 + "${confd}/auth-system.conf.ext" \
234 + || die "failed to update PAM settings in auth-system.conf.ext"
235 + # mailbase does not provide a sieve pam file
236 + use managesieve && dosym imap /etc/pam.d/sieve
237 + sed -i -e \
238 + 's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
239 + "${confd}/10-auth.conf" \
240 + || die "failed to update PAM settings in 10-auth.conf"
241 + fi
242 +
243 + # Disable ipv6 if necessary
244 + if ! use ipv6; then
245 + sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
246 + || die "failed to update listen settings in dovecot.conf"
247 + fi
248 +
249 + # Update ssl cert locations
250 + if use ssl; then
251 + sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
252 + || die "ssl conf failed"
253 + sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
254 + -e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
255 + "${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
256 + fi
257 +
258 + # Install SQL configuration
259 + if use mysql || use postgres; then
260 + sed -i -e \
261 + 's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
262 + "${confd}/10-auth.conf" || die "failed to update SQL settings in \
263 + 10-auth.conf"
264 + fi
265 +
266 + # Install LDAP configuration
267 + if use ldap; then
268 + sed -i -e \
269 + 's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
270 + "${confd}/10-auth.conf" \
271 + || die "failed to update ldap settings in 10-auth.conf"
272 + fi
273 +
274 + if use vpopmail; then
275 + sed -i -e \
276 + 's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
277 + "${confd}/10-auth.conf" \
278 + || die "failed to update vpopmail settings in 10-auth.conf"
279 + fi
280 +
281 + if use sieve || use managesieve ; then
282 + cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
283 + emake DESTDIR="${ED}" install
284 + sed -i -e \
285 + 's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
286 + || die "failed to update sieve settings in 15-lda.conf"
287 + rm -rf "${ED}"/usr/share/doc/dovecot
288 + docinto example-config/conf.d
289 + dodoc doc/example-config/conf.d/*.conf
290 + insinto /etc/dovecot/conf.d
291 + doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
292 + use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
293 + docinto sieve/rfc
294 + dodoc doc/rfc/*.txt
295 + docinto sieve/devel
296 + dodoc doc/devel/DESIGN
297 + docinto plugins
298 + dodoc doc/plugins/*.txt
299 + docinto extensions
300 + dodoc doc/extensions/*.txt
301 + docinto locations
302 + dodoc doc/locations/*.txt
303 + doman doc/man/*.{1,7}
304 + fi
305 +
306 + use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
307 +}
308 +
309 +pkg_postinst() {
310 + if use ssl; then
311 + # Let's not make a new certificate if we already have one
312 + if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
313 + -e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then
314 + einfo "Creating SSL certificate"
315 + SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
316 + install_cert /etc/ssl/dovecot/server
317 + fi
318 + fi
319 +
320 + elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
321 +}