1 |
commit: c7831824c64115adf396d7383272a078d7273633 |
2 |
Author: Eray Aslan <eras <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jul 17 13:00:54 2021 +0000 |
4 |
Commit: Eray Aslan <eras <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 17 13:00:54 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7831824 |
7 |
|
8 |
net-mail/dovecot: cleanup |
9 |
|
10 |
Bug: https://bugs.gentoo.org/797349 |
11 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
12 |
Signed-off-by: Eray Aslan <eras <AT> gentoo.org> |
13 |
|
14 |
net-mail/dovecot/Manifest | 3 - |
15 |
net-mail/dovecot/dovecot-2.3.13-r101.ebuild | 295 --------------------- |
16 |
net-mail/dovecot/dovecot-2.3.14-r1.ebuild | 294 -------------------- |
17 |
.../files/dovecot-2.3.13-32-bit-tests-1.patch | 52 ---- |
18 |
.../files/dovecot-2.3.13-32-bit-tests-2.patch | 27 -- |
19 |
.../dovecot/files/dovecot-unwind-generic.patch | 15 -- |
20 |
6 files changed, 686 deletions(-) |
21 |
|
22 |
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest |
23 |
index 1a54583afcc..7f36a40046c 100644 |
24 |
--- a/net-mail/dovecot/Manifest |
25 |
+++ b/net-mail/dovecot/Manifest |
26 |
@@ -1,7 +1,4 @@ |
27 |
-DIST dovecot-2.3-pigeonhole-0.5.13.tar.gz 1908839 BLAKE2B 37fbd9d9b41ca1893c19ac546dd9b272b361752c70eed0596bbb743cd8c30d942427d5814ab551bb39eb844c7bd05074bb49b11a6b81747e2fc535b0f9993f14 SHA512 fcbc13d71af4e6dd4e34192484e203d755e5015da76a4774b11a79182b2baad36cab5a471346093111ace36a7775dfe8294555f8b777786dde386820b3ec5cd3 |
28 |
DIST dovecot-2.3-pigeonhole-0.5.14.tar.gz 1910607 BLAKE2B 5c08214535d298ce2b8defd8c945e96597a98bda6493a3e27481fdadc0e149e6dd01c6ececaa583dd331614669bd8e033cd1b91d64d03a9e0cdcef67fa9c27b8 SHA512 c5d5d309769eabe2c0971646d0c14d166b6b524acf59e1069eca803f764544fa2535c09c9a630ca706aa70442b688ee26af831d29e674823bac7ea7c0e1f33cc |
29 |
DIST dovecot-2.3-pigeonhole-0.5.15.tar.gz 1935601 BLAKE2B e26405cc9a93681206e27c2b548e3409ae4444c1c011127b27eda364fec27d572dc01c7ea63688693bde10a8b4086bf67e14bb67e917d62db426d8871d6af0ec SHA512 521070080802bf2a50cd0ff0af5dc991c04d70b807abc2cd9aa567444a4869f5f42800f19d9b740a519bd4069437139e70ca6ae4b905479fcec8faa133ac5f54 |
30 |
-DIST dovecot-2.3.13.tar.gz 7456073 BLAKE2B 6cf3e7d9c6cf90279e0d72782cca88a11617f3f08e3c27da7948f46b8796575e42c776323cd56bc4208474831d4480afcac35ebe0b74d99db40acd4cda2279be SHA512 758a169fba8925637ed18fa7522a6f06c9fe01a1707b1ca0d0a4d8757c578a8e117c91733e8314403839f9a484bbcac71ce3532c82379eb583b480756d556a95 |
31 |
DIST dovecot-2.3.14.1.tar.gz 7534719 BLAKE2B 1ba5143711fe340b9fad61db41ba658485e42be52f3b0f196eeb9b8e4b7c1b865b6a08f879dadeb2db3979b17be34699ce5febc4545887307f62bd5b72076f86 SHA512 b71b82c2918ac9940ef6bc274bc9c2b3e56a08cf5054244d80547ad89c421b9180c5afa8b5b140831239fbe2cbeeceb83a0052e037eb198d8fc27d07cba4ba35 |
32 |
-DIST dovecot-2.3.14.tar.gz 7483769 BLAKE2B bf2606ed64bef66fdeb165da65295031e692b7ba5186847c027adbd50093a9684b57eb724595c27838d91769e097ab2a82978ba845bf4e026dcfd78aa1372501 SHA512 69df234cb739c7ee7ae3acfb9756bc22481e94c95463d32bfac315c7ec4b1ba0dfbff552b769f2ab7ee554087ca2ebbe331aa008d3af26417016612dc7cad103 |
33 |
DIST dovecot-2.3.15.tar.gz 7608561 BLAKE2B 85134064dbff0b4f50831a835fb6eafc92081d75d91ab331fa0ae79c453382a88485bad8c774491968b879478dc66841a9c6170e5931d562cf5eaa6af755440b SHA512 75bbdbeac663da109f78dba06c42bb5193e911c6b3c64f055fc4473ae9afaf0c8304c49fc7f06c5c6b61e67dd13dc21fbed6ff160a99f38f547c88ba05e6b03a |
34 |
|
35 |
diff --git a/net-mail/dovecot/dovecot-2.3.13-r101.ebuild b/net-mail/dovecot/dovecot-2.3.13-r101.ebuild |
36 |
deleted file mode 100644 |
37 |
index f13784a01b2..00000000000 |
38 |
--- a/net-mail/dovecot/dovecot-2.3.13-r101.ebuild |
39 |
+++ /dev/null |
40 |
@@ -1,295 +0,0 @@ |
41 |
-# Copyright 1999-2021 Gentoo Authors |
42 |
-# Distributed under the terms of the GNU General Public License v2 |
43 |
- |
44 |
-EAPI=7 |
45 |
- |
46 |
-LUA_COMPAT=( lua5-{1..3} ) |
47 |
- |
48 |
-# do not add a ssl USE flag. ssl is mandatory |
49 |
-SSL_DEPS_SKIP=1 |
50 |
-inherit autotools lua-single ssl-cert systemd toolchain-funcs |
51 |
- |
52 |
-MY_P="${P/_/.}" |
53 |
-#MY_S="${PN}-ce-${PV}" |
54 |
-major_minor="$(ver_cut 1-2)" |
55 |
-sieve_version="0.5.13" |
56 |
-if [[ ${PV} == *_rc* ]] ; then |
57 |
- rc_dir="rc/" |
58 |
-else |
59 |
- rc_dir="" |
60 |
-fi |
61 |
-SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz |
62 |
- sieve? ( |
63 |
- https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz |
64 |
- ) |
65 |
- managesieve? ( |
66 |
- https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz |
67 |
- ) " |
68 |
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind" |
69 |
-HOMEPAGE="https://www.dovecot.org/" |
70 |
- |
71 |
-SLOT="0" |
72 |
-LICENSE="LGPL-2.1 MIT" |
73 |
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86" |
74 |
- |
75 |
-IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite" |
76 |
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib zstd" |
77 |
-IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 lucene managesieve rpc selinux sieve solr static-libs suid tcpd textcat unwind" |
78 |
- |
79 |
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}" |
80 |
- |
81 |
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" |
82 |
- |
83 |
-DEPEND="argon2? ( dev-libs/libsodium:= ) |
84 |
- bzip2? ( app-arch/bzip2 ) |
85 |
- caps? ( sys-libs/libcap ) |
86 |
- kerberos? ( virtual/krb5 ) |
87 |
- ldap? ( net-nds/openldap ) |
88 |
- lua? ( ${LUA_DEPS} ) |
89 |
- lucene? ( >=dev-cpp/clucene-2.3 ) |
90 |
- lzma? ( app-arch/xz-utils ) |
91 |
- lz4? ( app-arch/lz4 ) |
92 |
- mysql? ( dev-db/mysql-connector-c:0= ) |
93 |
- pam? ( sys-libs/pam:= ) |
94 |
- postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) |
95 |
- rpc? ( net-libs/libtirpc:= net-libs/rpcsvc-proto ) |
96 |
- selinux? ( sec-policy/selinux-dovecot ) |
97 |
- solr? ( net-misc/curl dev-libs/expat ) |
98 |
- sqlite? ( dev-db/sqlite:* ) |
99 |
- dev-libs/openssl:0= |
100 |
- suid? ( acct-group/mail ) |
101 |
- tcpd? ( sys-apps/tcp-wrappers ) |
102 |
- textcat? ( app-text/libexttextcat ) |
103 |
- unwind? ( sys-libs/libunwind:= ) |
104 |
- zlib? ( sys-libs/zlib:= ) |
105 |
- zstd? ( app-arch/zstd:= ) |
106 |
- virtual/libcrypt:= |
107 |
- virtual/libiconv |
108 |
- dev-libs/icu:=" |
109 |
- |
110 |
-RDEPEND="${DEPEND} |
111 |
- acct-group/dovecot |
112 |
- acct-group/dovenull |
113 |
- acct-user/dovecot |
114 |
- acct-user/dovenull |
115 |
- net-mail/mailbase" |
116 |
- |
117 |
-PATCHES=( |
118 |
- "${FILESDIR}/${PN}"-autoconf-lua-version.patch |
119 |
- "${FILESDIR}/${PN}"-unwind-generic.patch |
120 |
- "${FILESDIR}/${PN}"-socket-name-too-long.patch |
121 |
- "${FILESDIR}/${P}"-32-bit-tests-1.patch |
122 |
- "${FILESDIR}/${P}"-32-bit-tests-2.patch |
123 |
-) |
124 |
- |
125 |
-pkg_setup() { |
126 |
- use lua && lua-single_pkg_setup |
127 |
- if use managesieve && ! use sieve; then |
128 |
- ewarn "managesieve USE flag selected but sieve USE flag unselected" |
129 |
- ewarn "sieve USE flag will be turned on" |
130 |
- fi |
131 |
-} |
132 |
- |
133 |
-src_prepare() { |
134 |
- default |
135 |
- # bug 657108 |
136 |
- #elibtoolize |
137 |
- eautoreconf |
138 |
-} |
139 |
- |
140 |
-src_configure() { |
141 |
- local conf="" |
142 |
- |
143 |
- if use postgres || use mysql || use sqlite; then |
144 |
- conf="${conf} --with-sql" |
145 |
- fi |
146 |
- |
147 |
- # turn valgrind tests off. Bug #340791 |
148 |
- VALGRIND=no LUAPC="${ELUA}" econf \ |
149 |
- --with-rundir="${EPREFIX}/run/dovecot" \ |
150 |
- --with-statedir="${EPREFIX}/var/lib/dovecot" \ |
151 |
- --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \ |
152 |
- --without-stemmer \ |
153 |
- --disable-rpath \ |
154 |
- --without-libbsd \ |
155 |
- --with-icu \ |
156 |
- --with-ssl \ |
157 |
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ |
158 |
- $( use_with argon2 sodium ) \ |
159 |
- $( use_with bzip2 bzlib ) \ |
160 |
- $( use_with caps libcap ) \ |
161 |
- $( use_with kerberos gssapi ) \ |
162 |
- $( use_with lua ) \ |
163 |
- $( use_with ldap ) \ |
164 |
- $( use_with lucene ) \ |
165 |
- $( use_with lz4 ) \ |
166 |
- $( use_with lzma ) \ |
167 |
- $( use_with mysql ) \ |
168 |
- $( use_with pam ) \ |
169 |
- $( use_with postgres pgsql ) \ |
170 |
- $( use_with sqlite ) \ |
171 |
- $( use_with solr ) \ |
172 |
- $( use_with tcpd libwrap ) \ |
173 |
- $( use_with textcat ) \ |
174 |
- $( use_with unwind libunwind ) \ |
175 |
- $( use_with zlib ) \ |
176 |
- $( use_with zstd ) \ |
177 |
- $( use_enable static-libs static ) \ |
178 |
- ${conf} |
179 |
- |
180 |
- if use sieve || use managesieve ; then |
181 |
- # The sieve plugin needs this file to be build to determine the plugin |
182 |
- # directory and the list of libraries to link to. |
183 |
- emake dovecot-config |
184 |
- cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" |
185 |
- econf \ |
186 |
- $( use_enable static-libs static ) \ |
187 |
- --localstatedir="${EPREFIX}/var" \ |
188 |
- --enable-shared \ |
189 |
- --with-dovecot="${S}" \ |
190 |
- $( use_with managesieve ) |
191 |
- fi |
192 |
-} |
193 |
- |
194 |
-src_compile() { |
195 |
- default |
196 |
- if use sieve || use managesieve ; then |
197 |
- cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" |
198 |
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" |
199 |
- fi |
200 |
-} |
201 |
- |
202 |
-src_test() { |
203 |
- default |
204 |
- if use sieve || use managesieve ; then |
205 |
- cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" |
206 |
- default |
207 |
- fi |
208 |
-} |
209 |
- |
210 |
-src_install() { |
211 |
- default |
212 |
- |
213 |
- # insecure: |
214 |
- # use suid && fperms u+s /usr/libexec/dovecot/deliver |
215 |
- # better: |
216 |
- if use suid;then |
217 |
- einfo "Changing perms to allow deliver to be suided" |
218 |
- fowners root:mail "/usr/libexec/dovecot/dovecot-lda" |
219 |
- fperms 4750 "/usr/libexec/dovecot/dovecot-lda" |
220 |
- fi |
221 |
- |
222 |
- newinitd "${FILESDIR}"/dovecot.init-r6 dovecot |
223 |
- |
224 |
- rm -rf "${ED}"/usr/share/doc/dovecot |
225 |
- |
226 |
- dodoc AUTHORS NEWS README TODO |
227 |
- dodoc doc/*.{txt,cnf,xml,sh} |
228 |
- docinto example-config |
229 |
- dodoc doc/example-config/*.{conf,ext} |
230 |
- docinto example-config/conf.d |
231 |
- dodoc doc/example-config/conf.d/*.{conf,ext} |
232 |
- docinto wiki |
233 |
- dodoc doc/wiki/* |
234 |
- doman doc/man/*.{1,7} |
235 |
- |
236 |
- # Create the dovecot.conf file from the dovecot-example.conf file that |
237 |
- # the dovecot folks nicely left for us.... |
238 |
- local conf="${ED}/etc/dovecot/dovecot.conf" |
239 |
- local confd="${ED}/etc/dovecot/conf.d" |
240 |
- |
241 |
- insinto /etc/dovecot |
242 |
- doins doc/example-config/*.{conf,ext} |
243 |
- insinto /etc/dovecot/conf.d |
244 |
- doins doc/example-config/conf.d/*.{conf,ext} |
245 |
- fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext |
246 |
- rm -f "${confd}/../README" |
247 |
- |
248 |
- # .maildir is the Gentoo default |
249 |
- local mail_location="maildir:~/.maildir" |
250 |
- sed -i -e \ |
251 |
- "s|#mail_location =|mail_location = ${mail_location}|" \ |
252 |
- "${confd}/10-mail.conf" \ |
253 |
- || die "failed to update mail location settings in 10-mail.conf" |
254 |
- |
255 |
- # We're using pam files (imap and pop3) provided by mailbase |
256 |
- if use pam; then |
257 |
- sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \ |
258 |
- "${confd}/auth-system.conf.ext" \ |
259 |
- || die "failed to update PAM settings in auth-system.conf.ext" |
260 |
- # mailbase does not provide a sieve pam file |
261 |
- use managesieve && dosym imap /etc/pam.d/sieve |
262 |
- sed -i -e \ |
263 |
- 's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \ |
264 |
- "${confd}/10-auth.conf" \ |
265 |
- || die "failed to update PAM settings in 10-auth.conf" |
266 |
- fi |
267 |
- |
268 |
- # Disable ipv6 if necessary |
269 |
- if ! use ipv6; then |
270 |
- sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \ |
271 |
- || die "failed to update listen settings in dovecot.conf" |
272 |
- fi |
273 |
- |
274 |
- # Update ssl cert locations |
275 |
- sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \ |
276 |
- || die "ssl conf failed" |
277 |
- sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \ |
278 |
- -e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \ |
279 |
- "${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf" |
280 |
- |
281 |
- # Install SQL configuration |
282 |
- if use mysql || use postgres; then |
283 |
- sed -i -e \ |
284 |
- 's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \ |
285 |
- "${confd}/10-auth.conf" || die "failed to update SQL settings in \ |
286 |
- 10-auth.conf" |
287 |
- fi |
288 |
- |
289 |
- # Install LDAP configuration |
290 |
- if use ldap; then |
291 |
- sed -i -e \ |
292 |
- 's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \ |
293 |
- "${confd}/10-auth.conf" \ |
294 |
- || die "failed to update ldap settings in 10-auth.conf" |
295 |
- fi |
296 |
- |
297 |
- if use sieve || use managesieve ; then |
298 |
- cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" |
299 |
- emake DESTDIR="${ED}" install |
300 |
- sed -i -e \ |
301 |
- 's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \ |
302 |
- || die "failed to update sieve settings in 15-lda.conf" |
303 |
- rm -rf "${ED}"/usr/share/doc/dovecot |
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 |
- docinto plugins |
314 |
- dodoc doc/plugins/*.txt |
315 |
- docinto extensions |
316 |
- dodoc doc/extensions/*.txt |
317 |
- docinto locations |
318 |
- dodoc doc/locations/*.txt |
319 |
- doman doc/man/*.{1,7} |
320 |
- fi |
321 |
- |
322 |
- use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete |
323 |
-} |
324 |
- |
325 |
-pkg_postinst() { |
326 |
- # Let's not make a new certificate if we already have one |
327 |
- if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \ |
328 |
- -e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then |
329 |
- einfo "Creating SSL certificate" |
330 |
- SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}" |
331 |
- install_cert /etc/ssl/dovecot/server |
332 |
- fi |
333 |
- |
334 |
- elog "Please read https://doc.dovecot.org/installation_guide/upgrading/ for upgrade notes." |
335 |
-} |
336 |
|
337 |
diff --git a/net-mail/dovecot/dovecot-2.3.14-r1.ebuild b/net-mail/dovecot/dovecot-2.3.14-r1.ebuild |
338 |
deleted file mode 100644 |
339 |
index 450c88e67af..00000000000 |
340 |
--- a/net-mail/dovecot/dovecot-2.3.14-r1.ebuild |
341 |
+++ /dev/null |
342 |
@@ -1,294 +0,0 @@ |
343 |
-# Copyright 1999-2021 Gentoo Authors |
344 |
-# Distributed under the terms of the GNU General Public License v2 |
345 |
- |
346 |
-EAPI=7 |
347 |
- |
348 |
-LUA_COMPAT=( lua5-{1..3} ) |
349 |
- |
350 |
-# do not add a ssl USE flag. ssl is mandatory |
351 |
-SSL_DEPS_SKIP=1 |
352 |
-inherit autotools lua-single ssl-cert systemd toolchain-funcs |
353 |
- |
354 |
-MY_P="${P/_/.}" |
355 |
-#MY_S="${PN}-ce-${PV}" |
356 |
-major_minor="$(ver_cut 1-2)" |
357 |
-sieve_version="0.5.14" |
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}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz |
366 |
- ) |
367 |
- managesieve? ( |
368 |
- https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" |
376 |
- |
377 |
-IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite" |
378 |
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib zstd" |
379 |
-IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 lucene managesieve rpc selinux sieve solr static-libs suid tcpd textcat unwind" |
380 |
- |
381 |
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}" |
382 |
- |
383 |
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" |
384 |
- |
385 |
-DEPEND="argon2? ( dev-libs/libsodium:= ) |
386 |
- bzip2? ( app-arch/bzip2 ) |
387 |
- caps? ( sys-libs/libcap ) |
388 |
- kerberos? ( virtual/krb5 ) |
389 |
- ldap? ( net-nds/openldap ) |
390 |
- lua? ( ${LUA_DEPS} ) |
391 |
- lucene? ( >=dev-cpp/clucene-2.3 ) |
392 |
- lzma? ( app-arch/xz-utils ) |
393 |
- lz4? ( app-arch/lz4 ) |
394 |
- mysql? ( dev-db/mysql-connector-c:0= ) |
395 |
- pam? ( sys-libs/pam:= ) |
396 |
- postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) |
397 |
- rpc? ( net-libs/libtirpc:= net-libs/rpcsvc-proto ) |
398 |
- selinux? ( sec-policy/selinux-dovecot ) |
399 |
- solr? ( net-misc/curl dev-libs/expat ) |
400 |
- sqlite? ( dev-db/sqlite:* ) |
401 |
- dev-libs/openssl:0= |
402 |
- suid? ( acct-group/mail ) |
403 |
- tcpd? ( sys-apps/tcp-wrappers ) |
404 |
- textcat? ( app-text/libexttextcat ) |
405 |
- unwind? ( sys-libs/libunwind:= ) |
406 |
- zlib? ( sys-libs/zlib ) |
407 |
- zstd? ( app-arch/zstd ) |
408 |
- virtual/libcrypt:= |
409 |
- virtual/libiconv |
410 |
- dev-libs/icu:=" |
411 |
- |
412 |
-RDEPEND="${DEPEND} |
413 |
- acct-group/dovecot |
414 |
- acct-group/dovenull |
415 |
- acct-user/dovecot |
416 |
- acct-user/dovenull |
417 |
- net-mail/mailbase" |
418 |
- |
419 |
-S="${WORKDIR}/${MY_P}" |
420 |
- |
421 |
-PATCHES=( |
422 |
- "${FILESDIR}/${PN}"-autoconf-lua-version.patch |
423 |
- "${FILESDIR}/${PN}"-socket-name-too-long.patch |
424 |
-) |
425 |
- |
426 |
-pkg_setup() { |
427 |
- use lua && lua-single_pkg_setup |
428 |
- if use managesieve && ! use sieve; then |
429 |
- ewarn "managesieve USE flag selected but sieve USE flag unselected" |
430 |
- ewarn "sieve USE flag will be turned on" |
431 |
- fi |
432 |
-} |
433 |
- |
434 |
-src_prepare() { |
435 |
- default |
436 |
- # bug 657108 |
437 |
- #elibtoolize |
438 |
- eautoreconf |
439 |
-} |
440 |
- |
441 |
-src_configure() { |
442 |
- local conf="" |
443 |
- |
444 |
- if use postgres || use mysql || use sqlite; then |
445 |
- conf="${conf} --with-sql" |
446 |
- fi |
447 |
- |
448 |
- # turn valgrind tests off. Bug #340791 |
449 |
- VALGRIND=no LUAPC="${ELUA}" econf \ |
450 |
- --with-rundir="${EPREFIX}/run/dovecot" \ |
451 |
- --with-statedir="${EPREFIX}/var/lib/dovecot" \ |
452 |
- --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \ |
453 |
- --without-stemmer \ |
454 |
- --disable-rpath \ |
455 |
- --without-libbsd \ |
456 |
- --with-icu \ |
457 |
- --with-ssl \ |
458 |
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ |
459 |
- $( use_with argon2 sodium ) \ |
460 |
- $( use_with bzip2 bzlib ) \ |
461 |
- $( use_with caps libcap ) \ |
462 |
- $( use_with kerberos gssapi ) \ |
463 |
- $( use_with lua ) \ |
464 |
- $( use_with ldap ) \ |
465 |
- $( use_with lucene ) \ |
466 |
- $( use_with lz4 ) \ |
467 |
- $( use_with lzma ) \ |
468 |
- $( use_with mysql ) \ |
469 |
- $( use_with pam ) \ |
470 |
- $( use_with postgres pgsql ) \ |
471 |
- $( use_with sqlite ) \ |
472 |
- $( use_with solr ) \ |
473 |
- $( use_with tcpd libwrap ) \ |
474 |
- $( use_with textcat ) \ |
475 |
- $( use_with unwind libunwind ) \ |
476 |
- $( use_with zlib ) \ |
477 |
- $( use_with zstd ) \ |
478 |
- $( use_enable static-libs static ) \ |
479 |
- ${conf} |
480 |
- |
481 |
- if use sieve || use managesieve ; then |
482 |
- # The sieve plugin needs this file to be build to determine the plugin |
483 |
- # directory and the list of libraries to link to. |
484 |
- emake dovecot-config |
485 |
- cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" |
486 |
- econf \ |
487 |
- $( use_enable static-libs static ) \ |
488 |
- --localstatedir="${EPREFIX}/var" \ |
489 |
- --enable-shared \ |
490 |
- --with-dovecot="${S}" \ |
491 |
- $( use_with managesieve ) |
492 |
- fi |
493 |
-} |
494 |
- |
495 |
-src_compile() { |
496 |
- default |
497 |
- if use sieve || use managesieve ; then |
498 |
- cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" |
499 |
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" |
500 |
- fi |
501 |
-} |
502 |
- |
503 |
-src_test() { |
504 |
- default |
505 |
- if use sieve || use managesieve ; then |
506 |
- cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" |
507 |
- default |
508 |
- fi |
509 |
-} |
510 |
- |
511 |
-src_install() { |
512 |
- default |
513 |
- |
514 |
- # insecure: |
515 |
- # use suid && fperms u+s /usr/libexec/dovecot/deliver |
516 |
- # better: |
517 |
- if use suid;then |
518 |
- einfo "Changing perms to allow deliver to be suided" |
519 |
- fowners root:mail "/usr/libexec/dovecot/dovecot-lda" |
520 |
- fperms 4750 "/usr/libexec/dovecot/dovecot-lda" |
521 |
- fi |
522 |
- |
523 |
- newinitd "${FILESDIR}"/dovecot.init-r6 dovecot |
524 |
- |
525 |
- rm -rf "${ED}"/usr/share/doc/dovecot |
526 |
- |
527 |
- dodoc AUTHORS NEWS README TODO |
528 |
- dodoc doc/*.{txt,cnf,xml,sh} |
529 |
- docinto example-config |
530 |
- dodoc doc/example-config/*.{conf,ext} |
531 |
- docinto example-config/conf.d |
532 |
- dodoc doc/example-config/conf.d/*.{conf,ext} |
533 |
- docinto wiki |
534 |
- dodoc doc/wiki/* |
535 |
- doman doc/man/*.{1,7} |
536 |
- |
537 |
- # Create the dovecot.conf file from the dovecot-example.conf file that |
538 |
- # the dovecot folks nicely left for us.... |
539 |
- local conf="${ED}/etc/dovecot/dovecot.conf" |
540 |
- local confd="${ED}/etc/dovecot/conf.d" |
541 |
- |
542 |
- insinto /etc/dovecot |
543 |
- doins doc/example-config/*.{conf,ext} |
544 |
- insinto /etc/dovecot/conf.d |
545 |
- doins doc/example-config/conf.d/*.{conf,ext} |
546 |
- fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext |
547 |
- rm -f "${confd}/../README" |
548 |
- |
549 |
- # .maildir is the Gentoo default |
550 |
- local mail_location="maildir:~/.maildir" |
551 |
- sed -i -e \ |
552 |
- "s|#mail_location =|mail_location = ${mail_location}|" \ |
553 |
- "${confd}/10-mail.conf" \ |
554 |
- || die "failed to update mail location settings in 10-mail.conf" |
555 |
- |
556 |
- # We're using pam files (imap and pop3) provided by mailbase |
557 |
- if use pam; then |
558 |
- sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \ |
559 |
- "${confd}/auth-system.conf.ext" \ |
560 |
- || die "failed to update PAM settings in auth-system.conf.ext" |
561 |
- # mailbase does not provide a sieve pam file |
562 |
- use managesieve && dosym imap /etc/pam.d/sieve |
563 |
- sed -i -e \ |
564 |
- 's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \ |
565 |
- "${confd}/10-auth.conf" \ |
566 |
- || die "failed to update PAM settings in 10-auth.conf" |
567 |
- fi |
568 |
- |
569 |
- # Disable ipv6 if necessary |
570 |
- if ! use ipv6; then |
571 |
- sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \ |
572 |
- || die "failed to update listen settings in dovecot.conf" |
573 |
- fi |
574 |
- |
575 |
- # Update ssl cert locations |
576 |
- sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \ |
577 |
- || die "ssl conf failed" |
578 |
- sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \ |
579 |
- -e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \ |
580 |
- "${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf" |
581 |
- |
582 |
- # Install SQL configuration |
583 |
- if use mysql || use postgres; then |
584 |
- sed -i -e \ |
585 |
- 's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \ |
586 |
- "${confd}/10-auth.conf" || die "failed to update SQL settings in \ |
587 |
- 10-auth.conf" |
588 |
- fi |
589 |
- |
590 |
- # Install LDAP configuration |
591 |
- if use ldap; then |
592 |
- sed -i -e \ |
593 |
- 's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \ |
594 |
- "${confd}/10-auth.conf" \ |
595 |
- || die "failed to update ldap 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 |
- # Let's not make a new certificate if we already have one |
628 |
- if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \ |
629 |
- -e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then |
630 |
- einfo "Creating SSL certificate" |
631 |
- SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}" |
632 |
- install_cert /etc/ssl/dovecot/server |
633 |
- fi |
634 |
- |
635 |
- elog "Please read https://doc.dovecot.org/installation_guide/upgrading/ for upgrade notes." |
636 |
-} |
637 |
|
638 |
diff --git a/net-mail/dovecot/files/dovecot-2.3.13-32-bit-tests-1.patch b/net-mail/dovecot/files/dovecot-2.3.13-32-bit-tests-1.patch |
639 |
deleted file mode 100644 |
640 |
index 204424c5ebb..00000000000 |
641 |
--- a/net-mail/dovecot/files/dovecot-2.3.13-32-bit-tests-1.patch |
642 |
+++ /dev/null |
643 |
@@ -1,52 +0,0 @@ |
644 |
-https://bugs.gentoo.org/764713 |
645 |
-https://github.com/dovecot/core/commit/2cc1feca9087651902a5ea3cda021c8a0b3217ce.patch |
646 |
- |
647 |
-From 2cc1feca9087651902a5ea3cda021c8a0b3217ce Mon Sep 17 00:00:00 2001 |
648 |
-From: Paul Howarth <paul@××××××××.org> |
649 |
-Date: Mon, 4 Jan 2021 16:31:03 +0000 |
650 |
-Subject: [PATCH] lib: Fix timeval_cmp_margin for 32-bit systems |
651 |
- |
652 |
-The test suite compares times with seconds values of -INT_MAX and |
653 |
-INT_MAX. The result of this comparison does not fit in a value of |
654 |
-type int and so the test suite fails on 32-bit systems where time_t |
655 |
-is an int. To fix this, calculations on seconds values are done |
656 |
-using long long integers. |
657 |
- |
658 |
-Broken by 16ab5542 |
659 |
---- |
660 |
- src/lib/time-util.c | 12 +++++++----- |
661 |
- 1 file changed, 7 insertions(+), 5 deletions(-) |
662 |
- |
663 |
-diff --git a/src/lib/time-util.c b/src/lib/time-util.c |
664 |
-index 294bb02310..3f4cd01c9e 100644 |
665 |
---- a/src/lib/time-util.c |
666 |
-+++ b/src/lib/time-util.c |
667 |
-@@ -38,21 +38,23 @@ int timeval_cmp(const struct timeval *tv1, const struct timeval *tv2) |
668 |
- int timeval_cmp_margin(const struct timeval *tv1, const struct timeval *tv2, |
669 |
- unsigned int usec_margin) |
670 |
- { |
671 |
-- long long usecs_diff; |
672 |
-+ long long secs_diff, usecs_diff; |
673 |
- int sec_margin, ret; |
674 |
- |
675 |
- if (tv1->tv_sec < tv2->tv_sec) { |
676 |
- sec_margin = ((int)usec_margin / 1000000) + 1; |
677 |
-- if ((tv2->tv_sec - tv1->tv_sec) > sec_margin) |
678 |
-+ secs_diff = (long long)tv2->tv_sec - (long long)tv1->tv_sec; |
679 |
-+ if (secs_diff > sec_margin) |
680 |
- return -1; |
681 |
-- usecs_diff = (tv2->tv_sec - tv1->tv_sec) * 1000000LL + |
682 |
-+ usecs_diff = secs_diff * 1000000LL + |
683 |
- (tv2->tv_usec - tv1->tv_usec); |
684 |
- ret = -1; |
685 |
- } else if (tv1->tv_sec > tv2->tv_sec) { |
686 |
- sec_margin = ((int)usec_margin / 1000000) + 1; |
687 |
-- if ((tv1->tv_sec - tv2->tv_sec) > sec_margin) |
688 |
-+ secs_diff = (long long)tv1->tv_sec - (long long)tv2->tv_sec; |
689 |
-+ if (secs_diff > sec_margin) |
690 |
- return 1; |
691 |
-- usecs_diff = (tv1->tv_sec - tv2->tv_sec) * 1000000LL + |
692 |
-+ usecs_diff = secs_diff * 1000000LL + |
693 |
- (tv1->tv_usec - tv2->tv_usec); |
694 |
- ret = 1; |
695 |
- } else if (tv1->tv_usec < tv2->tv_usec) { |
696 |
|
697 |
diff --git a/net-mail/dovecot/files/dovecot-2.3.13-32-bit-tests-2.patch b/net-mail/dovecot/files/dovecot-2.3.13-32-bit-tests-2.patch |
698 |
deleted file mode 100644 |
699 |
index 8956773b43e..00000000000 |
700 |
--- a/net-mail/dovecot/files/dovecot-2.3.13-32-bit-tests-2.patch |
701 |
+++ /dev/null |
702 |
@@ -1,27 +0,0 @@ |
703 |
-https://bugs.gentoo.org/764713 |
704 |
-https://github.com/dovecot/core/commit/01366bd18ea98bf6979328ff8580488920a33f0c |
705 |
- |
706 |
-From 01366bd18ea98bf6979328ff8580488920a33f0c Mon Sep 17 00:00:00 2001 |
707 |
-From: Aki Tuomi <aki.tuomi@××××××××××××.com> |
708 |
-Date: Thu, 4 Feb 2021 08:44:46 +0200 |
709 |
-Subject: [PATCH] lib: test-time-util - Use correct types for test case |
710 |
- |
711 |
-Fixes type mismatch on 32-bit systems. |
712 |
---- |
713 |
- src/lib/test-time-util.c | 3 ++- |
714 |
- 1 file changed, 2 insertions(+), 1 deletion(-) |
715 |
- |
716 |
-diff --git a/src/lib/test-time-util.c b/src/lib/test-time-util.c |
717 |
-index cfa322048e..139db0ec5d 100644 |
718 |
---- a/src/lib/test-time-util.c |
719 |
-+++ b/src/lib/test-time-util.c |
720 |
-@@ -358,7 +358,8 @@ static void test_str_to_timeval(void) |
721 |
- { |
722 |
- struct { |
723 |
- const char *str; |
724 |
-- unsigned int tv_sec, tv_usec; |
725 |
-+ time_t tv_sec; |
726 |
-+ suseconds_t tv_usec; |
727 |
- } tests[] = { |
728 |
- { "0", 0, 0 }, |
729 |
- { "0.0", 0, 0 }, |
730 |
|
731 |
diff --git a/net-mail/dovecot/files/dovecot-unwind-generic.patch b/net-mail/dovecot/files/dovecot-unwind-generic.patch |
732 |
deleted file mode 100644 |
733 |
index f7bc8d94ff2..00000000000 |
734 |
--- a/net-mail/dovecot/files/dovecot-unwind-generic.patch |
735 |
+++ /dev/null |
736 |
@@ -1,15 +0,0 @@ |
737 |
-Bug 728336 |
738 |
---- a/m4/want_unwind.m4 |
739 |
-+++ b/m4/want_unwind.m4 |
740 |
-@@ -4,9 +4,9 @@ |
741 |
- PKG_CHECK_EXISTS([libunwind], [ |
742 |
- PKG_CHECK_MODULES([LIBUNWIND], [libunwind],[ |
743 |
- dnl see if there is target-specific library |
744 |
-- AC_CHECK_LIB([unwind-${build_cpu}], [_U${build_cpu}_init_local],[ |
745 |
-+ PKG_CHECK_MODULES([LIBUNWIND_GENERIC], [libunwind-generic],[ |
746 |
- have_libunwind=yes |
747 |
-- LIBUNWIND_LIBS="$LIBUNWIND_LIBS -lunwind-${build_cpu}" |
748 |
-+ LIBUNWIND_LIBS="$LIBUNWIND_LIBS $LIBUNWIND_GENERIC_LIBS" |
749 |
- AC_DEFINE([HAVE_LIBUNWIND],,[Define this if you have libunwind]) |
750 |
- ],[ |
751 |
- have_libunwind=no |