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