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