Gentoo Archives: gentoo-commits

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