1 |
commit: 001e4977e5a5847a1e2f08d0510872a6d0684660 |
2 |
Author: Eray Aslan <eras <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Aug 11 15:50:20 2017 +0000 |
4 |
Commit: Eray Aslan <eras <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Aug 11 15:50:45 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=001e4977 |
7 |
|
8 |
net-mail/cyrus-imapd: remove vulnerable |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
11 |
|
12 |
net-mail/cyrus-imapd/Manifest | 2 - |
13 |
net-mail/cyrus-imapd/cyrus-imapd-3.0.1.ebuild | 203 --------------------- |
14 |
net-mail/cyrus-imapd/cyrus-imapd-3.0.2.ebuild | 203 --------------------- |
15 |
.../files/cyrus-imapd-sieve-libs-v3.patch | 127 ------------- |
16 |
4 files changed, 535 deletions(-) |
17 |
|
18 |
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest |
19 |
index 3917ba2fa70..d64ddbe28af 100644 |
20 |
--- a/net-mail/cyrus-imapd/Manifest |
21 |
+++ b/net-mail/cyrus-imapd/Manifest |
22 |
@@ -1,5 +1,3 @@ |
23 |
DIST cyrus-imapd-2.5.10.tar.gz 3103914 SHA256 b38f4fd72825a298ac47426dcd2a50c8437c2947864ba50d79a9a53fe9845c5f SHA512 78b85e37c63f1dbb60898da229f70f45810326a01244067d23b1317e2c2ae3326e48b6944787d59024e44c48c441ed2b848d6a83c451c192a3bb95c8f37880fa WHIRLPOOL d2167900596c1b6f8e595de7aec499a7fbd6228537d7a27bec4fe0bda6a74b861303c4e9691ca829994972b099f29c362f9692f266df66d76c05a69629b52dfd |
24 |
DIST cyrus-imapd-2.5.11.tar.gz 3109188 SHA256 36a79117b320c78d62bc6842c3024d970d3bec7aa12908f862d92cf1d63397d5 SHA512 bbb0e11f31d91d85037306321165e3608f8d5e2699b971fc4fbdd1630ec0a1485c8f6f17900142dec584ab41b0ec0c65c11cfaf8c5bbf1054b194a8f5f361538 WHIRLPOOL e6aaedb642b634d9fc0c56f7ddd06e15130091bd21f4e089ae46168fb2976c7e1fa281f8c6fc0f3e171e70bbfeb5cec8f6cc613f62d5b769fb8b6af4dede6e67 |
25 |
-DIST cyrus-imapd-3.0.1.tar.gz 10515460 SHA256 24a9886aa6bbe001484a54b29309ff99415c0f355b98325ebb29ad61fff5e257 SHA512 0a2bf13b4793e642f3df53231fd66774e0c5ad753b436a7fb0645db6ee70121d0da245038527cc58cb078255fec3e7b32a6230c196cceea040f74813ef78e337 WHIRLPOOL 830284e3d96b2d34d88350f8e65de2cac28c34c9d302dc7fe4247022c5d96251d72989714062408cfcf08828650a7b67aecfb1672165fed344b2e98c2dc06265 |
26 |
-DIST cyrus-imapd-3.0.2.tar.gz 10706654 SHA256 5612f3cfa0504eb50bc3e49a77bf04a31c1aff3096fa1bbddb26cd7dbb69d94d SHA512 95f145733a4b2589b2f7eb6281ce0d1df5788521dea0c81fda10c7c7ae4ac7cf1a9037dba45deee6101a73bbde4552906d7c6bfa9369aa3c802061a7f5cec85d WHIRLPOOL cf56390ea0d8ecd9fcfb9a2459a552ba7815474b52b089c54b1428b42691826f91b163cfe723c795b28289530911ed614e2252e038919c4d710d9a95658f8997 |
27 |
DIST cyrus-imapd-3.0.3.tar.gz 10819454 SHA256 6a76d8d00b26a2c9d03c65197724a28ab6d044527d7e230e6331f8de79af889a SHA512 0b5c3167d80d91371e3f07e64b8bc8c085481946e6536dd407976f6f8ae66405fd1f6d2ff5ad51e5e0eb827a64d90d93daf72d5a1afa409782a287bec29665df WHIRLPOOL 6d543b09d3f18d10c481133fafb78f82a6e2d0dd3fb7c4cdb1d181d906acef7db4c6da5dcc86254a836f69fc7cbd54034f889b0808da060a083f35dd8ee40434 |
28 |
|
29 |
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.1.ebuild |
30 |
deleted file mode 100644 |
31 |
index c5a0435e386..00000000000 |
32 |
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.1.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,203 +0,0 @@ |
35 |
-# Copyright 1999-2017 Gentoo Foundation |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=6 |
39 |
-inherit autotools pam ssl-cert user |
40 |
- |
41 |
-MY_P=${P/_/} |
42 |
- |
43 |
-DESCRIPTION="The Cyrus IMAP Server" |
44 |
-HOMEPAGE="http://www.cyrusimap.org/" |
45 |
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz" |
46 |
- |
47 |
-LICENSE="BSD-with-attribution" |
48 |
-SLOT="0" |
49 |
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
50 |
-IUSE="afs backup calalarm caps clamav http jmap kerberos ldap lmdb \ |
51 |
- mysql nntp pam perl postgres replication +server sieve snmp \ |
52 |
- sphinx sqlite ssl static-libs tcpd test xapian" |
53 |
- |
54 |
-# virtual/mysql-5.5 added for the --variable= option below |
55 |
-CDEPEND="sys-libs/zlib |
56 |
- dev-libs/libpcre |
57 |
- >=dev-libs/cyrus-sasl-2.1.13 |
58 |
- dev-libs/jansson |
59 |
- dev-libs/icu:= |
60 |
- afs? ( net-fs/openafs ) |
61 |
- caps? ( sys-libs/libcap ) |
62 |
- clamav? ( app-antivirus/clamav ) |
63 |
- http? ( dev-libs/libxml2 dev-libs/libical ) |
64 |
- kerberos? ( virtual/krb5 ) |
65 |
- ldap? ( net-nds/openldap ) |
66 |
- lmdb? ( dev-db/lmdb ) |
67 |
- mysql? ( >=virtual/mysql-5.5 ) |
68 |
- nntp? ( !net-nntp/leafnode ) |
69 |
- pam? ( |
70 |
- virtual/pam |
71 |
- >=net-mail/mailbase-1 |
72 |
- ) |
73 |
- perl? ( dev-lang/perl:= ) |
74 |
- postgres? ( dev-db/postgresql:* ) |
75 |
- snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) |
76 |
- ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] ) |
77 |
- sqlite? ( dev-db/sqlite:3 ) |
78 |
- tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) ) |
79 |
- xapian? ( >=dev-libs/xapian-1.4.0 )" |
80 |
- |
81 |
-DEPEND="${CDEPEND} |
82 |
- test? ( dev-util/cunit )" |
83 |
- |
84 |
-# all blockers really needed? |
85 |
-RDEPEND="${CDEPEND} |
86 |
- !mail-mta/courier |
87 |
- !net-mail/bincimap |
88 |
- !net-mail/courier-imap |
89 |
- !net-mail/uw-imap |
90 |
- !net-mail/cyrus-imap-admin" |
91 |
- |
92 |
-REQUIRED_USE="afs? ( kerberos ) |
93 |
- backup? ( sqlite ) |
94 |
- calalarm? ( http ) |
95 |
- http? ( sqlite ) |
96 |
- jmap? ( http xapian ) |
97 |
- sphinx? ( mysql )" |
98 |
- |
99 |
-S=${WORKDIR}/${MY_P} |
100 |
- |
101 |
-pkg_setup() { |
102 |
- enewuser cyrus -1 -1 /usr/cyrus mail |
103 |
-} |
104 |
- |
105 |
-src_prepare() { |
106 |
- # bug 604470 |
107 |
- eapply -p1 "${FILESDIR}/${PN}-sieve-libs-v3.patch" |
108 |
- eapply -p1 "${FILESDIR}/${PN}-fix-tests.patch" |
109 |
- # Fix master(8)->cyrusmaster(8) manpage. |
110 |
- for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do |
111 |
- sed -i -e 's:master\.8:cyrusmaster.8:g' \ |
112 |
- -e 's:master(8):cyrusmaster(8):g' \ |
113 |
- "${i}" || die "sed failed" || die "sed failed" |
114 |
- done |
115 |
- mv man/master.8 man/cyrusmaster.8 || die "mv failed" |
116 |
- sed -i -e "s:MASTER:CYRUSMASTER:g" \ |
117 |
- -e "s:Master:Cyrusmaster:g" \ |
118 |
- -e "s:master:cyrusmaster:g" \ |
119 |
- man/cyrusmaster.8 || die "sed failed" |
120 |
- |
121 |
- # lock.h to afs/lock.h |
122 |
- sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \ |
123 |
- ptclient/afskrb.c || die |
124 |
- |
125 |
- eapply_user |
126 |
- eautoreconf |
127 |
-} |
128 |
- |
129 |
-src_configure() { |
130 |
- local myconf |
131 |
- if use afs ; then |
132 |
- myconf+=" --with-afs-libdir=/usr/$(get_libdir)" |
133 |
- myconf+=" --with-afs-incdir=/usr/include/afs" |
134 |
- fi |
135 |
- econf \ |
136 |
- --enable-unit-tests \ |
137 |
- --enable-murder \ |
138 |
- --enable-idled \ |
139 |
- --enable-event-notification \ |
140 |
- --enable-autocreate \ |
141 |
- --enable-pcre \ |
142 |
- --with-cyrus-user=cyrus \ |
143 |
- --with-cyrus-group=mail \ |
144 |
- --with-com_err=yes \ |
145 |
- --with-sasl \ |
146 |
- --without-krb \ |
147 |
- --without-krbdes \ |
148 |
- --enable-squat \ |
149 |
- --with-zlib \ |
150 |
- $(use_enable afs) \ |
151 |
- $(use_enable afs krb5afspts) \ |
152 |
- $(use_enable backup) \ |
153 |
- $(use_enable calalarm calalarmd) \ |
154 |
- $(use_with caps libcap) \ |
155 |
- $(use_with clamav) \ |
156 |
- $(use_enable jmap) \ |
157 |
- $(use_enable nntp) \ |
158 |
- $(use_enable http) \ |
159 |
- $(use_enable replication) \ |
160 |
- $(use_enable kerberos gssapi) \ |
161 |
- $(use_with ldap) \ |
162 |
- $(use_with lmdb) \ |
163 |
- $(use_with mysql) \ |
164 |
- $(use_with postgres pgsql) \ |
165 |
- $(use_with perl) \ |
166 |
- $(use_with sqlite) \ |
167 |
- $(use_with ssl openssl) \ |
168 |
- $(use_enable server) \ |
169 |
- $(use_enable sieve) \ |
170 |
- $(use_with snmp) \ |
171 |
- $(use_enable sphinx) \ |
172 |
- $(use_enable static-libs static) \ |
173 |
- $(use_with tcpd libwrap) \ |
174 |
- $(use_enable xapian) \ |
175 |
- ${myconf} |
176 |
-} |
177 |
- |
178 |
-src_install() { |
179 |
- emake DESTDIR="${D}" INSTALLDIRS=vendor install |
180 |
- |
181 |
- dodoc README* |
182 |
- dodoc -r doc |
183 |
- cp -r contrib tools "${D}/usr/share/doc/${PF}" |
184 |
- rm -f doc/text/Makefile* |
185 |
- |
186 |
- insinto /etc |
187 |
- doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf" |
188 |
- |
189 |
- # turn off sieve if not installed |
190 |
- if ! use sieve; then |
191 |
- sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die |
192 |
- fi |
193 |
- |
194 |
- newinitd "${FILESDIR}/cyrus.rc6" cyrus |
195 |
- newconfd "${FILESDIR}/cyrus.confd" cyrus |
196 |
- newpamd "${FILESDIR}/cyrus.pam-include" sieve |
197 |
- |
198 |
- for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do |
199 |
- keepdir "/var/${subdir}" |
200 |
- fowners cyrus:mail "/var/${subdir}" |
201 |
- fperms 0750 "/var/${subdir}" |
202 |
- done |
203 |
- for subdir in imap/{user,quota,sieve} spool/imap ; do |
204 |
- for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do |
205 |
- keepdir "/var/${subdir}/${i}" |
206 |
- fowners cyrus:mail "/var/${subdir}/${i}" |
207 |
- fperms 0750 "/var/${subdir}/${i}" |
208 |
- done |
209 |
- done |
210 |
-} |
211 |
- |
212 |
-pkg_preinst() { |
213 |
- if ! has_version ${CATEGORY}/${PN} ; then |
214 |
- elog "For correct logging add the following to /etc/syslog.conf:" |
215 |
- elog " local6.* /var/log/imapd.log" |
216 |
- elog " auth.debug /var/log/auth.log" |
217 |
- echo |
218 |
- |
219 |
- elog "You have to add user cyrus to the sasldb2. Do this with:" |
220 |
- elog " saslpasswd2 cyrus" |
221 |
- fi |
222 |
-} |
223 |
- |
224 |
-pkg_postinst() { |
225 |
- # do not install server.{key,pem) if they exist |
226 |
- if use ssl ; then |
227 |
- if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then |
228 |
- install_cert /etc/ssl/cyrus/server |
229 |
- chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem} |
230 |
- fi |
231 |
- fi |
232 |
- |
233 |
- echo |
234 |
- ewarn "Please see http://www.cyrusimap.org/imap/download/upgrade.html" |
235 |
- ewarn "for upgrade instructions." |
236 |
- echo |
237 |
-} |
238 |
|
239 |
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.2.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.2.ebuild |
240 |
deleted file mode 100644 |
241 |
index c5a0435e386..00000000000 |
242 |
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.2.ebuild |
243 |
+++ /dev/null |
244 |
@@ -1,203 +0,0 @@ |
245 |
-# Copyright 1999-2017 Gentoo Foundation |
246 |
-# Distributed under the terms of the GNU General Public License v2 |
247 |
- |
248 |
-EAPI=6 |
249 |
-inherit autotools pam ssl-cert user |
250 |
- |
251 |
-MY_P=${P/_/} |
252 |
- |
253 |
-DESCRIPTION="The Cyrus IMAP Server" |
254 |
-HOMEPAGE="http://www.cyrusimap.org/" |
255 |
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz" |
256 |
- |
257 |
-LICENSE="BSD-with-attribution" |
258 |
-SLOT="0" |
259 |
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
260 |
-IUSE="afs backup calalarm caps clamav http jmap kerberos ldap lmdb \ |
261 |
- mysql nntp pam perl postgres replication +server sieve snmp \ |
262 |
- sphinx sqlite ssl static-libs tcpd test xapian" |
263 |
- |
264 |
-# virtual/mysql-5.5 added for the --variable= option below |
265 |
-CDEPEND="sys-libs/zlib |
266 |
- dev-libs/libpcre |
267 |
- >=dev-libs/cyrus-sasl-2.1.13 |
268 |
- dev-libs/jansson |
269 |
- dev-libs/icu:= |
270 |
- afs? ( net-fs/openafs ) |
271 |
- caps? ( sys-libs/libcap ) |
272 |
- clamav? ( app-antivirus/clamav ) |
273 |
- http? ( dev-libs/libxml2 dev-libs/libical ) |
274 |
- kerberos? ( virtual/krb5 ) |
275 |
- ldap? ( net-nds/openldap ) |
276 |
- lmdb? ( dev-db/lmdb ) |
277 |
- mysql? ( >=virtual/mysql-5.5 ) |
278 |
- nntp? ( !net-nntp/leafnode ) |
279 |
- pam? ( |
280 |
- virtual/pam |
281 |
- >=net-mail/mailbase-1 |
282 |
- ) |
283 |
- perl? ( dev-lang/perl:= ) |
284 |
- postgres? ( dev-db/postgresql:* ) |
285 |
- snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) |
286 |
- ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] ) |
287 |
- sqlite? ( dev-db/sqlite:3 ) |
288 |
- tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) ) |
289 |
- xapian? ( >=dev-libs/xapian-1.4.0 )" |
290 |
- |
291 |
-DEPEND="${CDEPEND} |
292 |
- test? ( dev-util/cunit )" |
293 |
- |
294 |
-# all blockers really needed? |
295 |
-RDEPEND="${CDEPEND} |
296 |
- !mail-mta/courier |
297 |
- !net-mail/bincimap |
298 |
- !net-mail/courier-imap |
299 |
- !net-mail/uw-imap |
300 |
- !net-mail/cyrus-imap-admin" |
301 |
- |
302 |
-REQUIRED_USE="afs? ( kerberos ) |
303 |
- backup? ( sqlite ) |
304 |
- calalarm? ( http ) |
305 |
- http? ( sqlite ) |
306 |
- jmap? ( http xapian ) |
307 |
- sphinx? ( mysql )" |
308 |
- |
309 |
-S=${WORKDIR}/${MY_P} |
310 |
- |
311 |
-pkg_setup() { |
312 |
- enewuser cyrus -1 -1 /usr/cyrus mail |
313 |
-} |
314 |
- |
315 |
-src_prepare() { |
316 |
- # bug 604470 |
317 |
- eapply -p1 "${FILESDIR}/${PN}-sieve-libs-v3.patch" |
318 |
- eapply -p1 "${FILESDIR}/${PN}-fix-tests.patch" |
319 |
- # Fix master(8)->cyrusmaster(8) manpage. |
320 |
- for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do |
321 |
- sed -i -e 's:master\.8:cyrusmaster.8:g' \ |
322 |
- -e 's:master(8):cyrusmaster(8):g' \ |
323 |
- "${i}" || die "sed failed" || die "sed failed" |
324 |
- done |
325 |
- mv man/master.8 man/cyrusmaster.8 || die "mv failed" |
326 |
- sed -i -e "s:MASTER:CYRUSMASTER:g" \ |
327 |
- -e "s:Master:Cyrusmaster:g" \ |
328 |
- -e "s:master:cyrusmaster:g" \ |
329 |
- man/cyrusmaster.8 || die "sed failed" |
330 |
- |
331 |
- # lock.h to afs/lock.h |
332 |
- sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \ |
333 |
- ptclient/afskrb.c || die |
334 |
- |
335 |
- eapply_user |
336 |
- eautoreconf |
337 |
-} |
338 |
- |
339 |
-src_configure() { |
340 |
- local myconf |
341 |
- if use afs ; then |
342 |
- myconf+=" --with-afs-libdir=/usr/$(get_libdir)" |
343 |
- myconf+=" --with-afs-incdir=/usr/include/afs" |
344 |
- fi |
345 |
- econf \ |
346 |
- --enable-unit-tests \ |
347 |
- --enable-murder \ |
348 |
- --enable-idled \ |
349 |
- --enable-event-notification \ |
350 |
- --enable-autocreate \ |
351 |
- --enable-pcre \ |
352 |
- --with-cyrus-user=cyrus \ |
353 |
- --with-cyrus-group=mail \ |
354 |
- --with-com_err=yes \ |
355 |
- --with-sasl \ |
356 |
- --without-krb \ |
357 |
- --without-krbdes \ |
358 |
- --enable-squat \ |
359 |
- --with-zlib \ |
360 |
- $(use_enable afs) \ |
361 |
- $(use_enable afs krb5afspts) \ |
362 |
- $(use_enable backup) \ |
363 |
- $(use_enable calalarm calalarmd) \ |
364 |
- $(use_with caps libcap) \ |
365 |
- $(use_with clamav) \ |
366 |
- $(use_enable jmap) \ |
367 |
- $(use_enable nntp) \ |
368 |
- $(use_enable http) \ |
369 |
- $(use_enable replication) \ |
370 |
- $(use_enable kerberos gssapi) \ |
371 |
- $(use_with ldap) \ |
372 |
- $(use_with lmdb) \ |
373 |
- $(use_with mysql) \ |
374 |
- $(use_with postgres pgsql) \ |
375 |
- $(use_with perl) \ |
376 |
- $(use_with sqlite) \ |
377 |
- $(use_with ssl openssl) \ |
378 |
- $(use_enable server) \ |
379 |
- $(use_enable sieve) \ |
380 |
- $(use_with snmp) \ |
381 |
- $(use_enable sphinx) \ |
382 |
- $(use_enable static-libs static) \ |
383 |
- $(use_with tcpd libwrap) \ |
384 |
- $(use_enable xapian) \ |
385 |
- ${myconf} |
386 |
-} |
387 |
- |
388 |
-src_install() { |
389 |
- emake DESTDIR="${D}" INSTALLDIRS=vendor install |
390 |
- |
391 |
- dodoc README* |
392 |
- dodoc -r doc |
393 |
- cp -r contrib tools "${D}/usr/share/doc/${PF}" |
394 |
- rm -f doc/text/Makefile* |
395 |
- |
396 |
- insinto /etc |
397 |
- doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf" |
398 |
- |
399 |
- # turn off sieve if not installed |
400 |
- if ! use sieve; then |
401 |
- sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die |
402 |
- fi |
403 |
- |
404 |
- newinitd "${FILESDIR}/cyrus.rc6" cyrus |
405 |
- newconfd "${FILESDIR}/cyrus.confd" cyrus |
406 |
- newpamd "${FILESDIR}/cyrus.pam-include" sieve |
407 |
- |
408 |
- for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do |
409 |
- keepdir "/var/${subdir}" |
410 |
- fowners cyrus:mail "/var/${subdir}" |
411 |
- fperms 0750 "/var/${subdir}" |
412 |
- done |
413 |
- for subdir in imap/{user,quota,sieve} spool/imap ; do |
414 |
- for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do |
415 |
- keepdir "/var/${subdir}/${i}" |
416 |
- fowners cyrus:mail "/var/${subdir}/${i}" |
417 |
- fperms 0750 "/var/${subdir}/${i}" |
418 |
- done |
419 |
- done |
420 |
-} |
421 |
- |
422 |
-pkg_preinst() { |
423 |
- if ! has_version ${CATEGORY}/${PN} ; then |
424 |
- elog "For correct logging add the following to /etc/syslog.conf:" |
425 |
- elog " local6.* /var/log/imapd.log" |
426 |
- elog " auth.debug /var/log/auth.log" |
427 |
- echo |
428 |
- |
429 |
- elog "You have to add user cyrus to the sasldb2. Do this with:" |
430 |
- elog " saslpasswd2 cyrus" |
431 |
- fi |
432 |
-} |
433 |
- |
434 |
-pkg_postinst() { |
435 |
- # do not install server.{key,pem) if they exist |
436 |
- if use ssl ; then |
437 |
- if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then |
438 |
- install_cert /etc/ssl/cyrus/server |
439 |
- chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem} |
440 |
- fi |
441 |
- fi |
442 |
- |
443 |
- echo |
444 |
- ewarn "Please see http://www.cyrusimap.org/imap/download/upgrade.html" |
445 |
- ewarn "for upgrade instructions." |
446 |
- echo |
447 |
-} |
448 |
|
449 |
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-sieve-libs-v3.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-sieve-libs-v3.patch |
450 |
deleted file mode 100644 |
451 |
index 3c07a6df006..00000000000 |
452 |
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-sieve-libs-v3.patch |
453 |
+++ /dev/null |
454 |
@@ -1,127 +0,0 @@ |
455 |
---- a/configure.ac 2017-04-20 04:21:48.000000000 +0300 |
456 |
-+++ b/configure.ac 2017-05-16 10:30:37.337965921 +0300 |
457 |
-@@ -666,7 +666,9 @@ |
458 |
- fi |
459 |
- |
460 |
- if test "$cyrus_cv_pcre_utf8" = "yes"; then |
461 |
-- LIBS="$LIBS -lpcre -lpcreposix"; |
462 |
-+ PCRE_LIBS="-lpcre -lpcreposix" |
463 |
-+ AC_SUBST(PCRE_LIBS) |
464 |
-+ LIBS="$LIBS $PCRE_LIBS" |
465 |
- AC_DEFINE(ENABLE_REGEX, [], [Do we have a regex library?]) |
466 |
- AC_DEFINE(HAVE_PCREPOSIX_H, [], [Do we have usable pcre library?]) |
467 |
- else |
468 |
-@@ -1938,6 +1940,7 @@ |
469 |
- fi |
470 |
- |
471 |
- LIBS="${LIBS} ${SQLITE_LIBADD}" |
472 |
-+ AC_SUBST(SQLITE_LIBADD) |
473 |
- CPPFLAGS="${SQLITE_INCADD} ${CPPFLAGS}" |
474 |
- AC_DEFINE(HAVE_SQLITE,[],[Build in SQLite support?]) |
475 |
- else |
476 |
---- a/perl/imap/Makefile.PL.in 2017-04-07 08:31:10.000000000 +0300 |
477 |
-+++ b/perl/imap/Makefile.PL.in 2017-05-16 10:26:08.193965921 +0300 |
478 |
-@@ -90,7 +90,7 @@ |
479 |
- 'clean' => {'FILES' => 'libcyrperl.a cyradm'}, |
480 |
- 'OBJECT' => 'IMAP.o', |
481 |
- 'MYEXTLIB' => '@top_builddir@/perl/.libs/libcyrus.a @top_builddir@/perl/.libs/libcyrus_min.a', |
482 |
-- 'LIBS' => [ "$LIB_SASL @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ @ZLIB@"], |
483 |
-+ 'LIBS' => [ "$LIB_SASL @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ @ZLIB@ @PCRE_LIBS@ @SQLITE_LIBADD@"], |
484 |
- 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING' |
485 |
- 'INC' => "-I@top_srcdir@ -I@top_srcdir@/com_err/et @SASLFLAGS@ @SSL_CPPFLAGS@ -I@top_srcdir@/perl/imap", |
486 |
- 'EXE_FILES' => [cyradm], |
487 |
---- a/perl/sieve/managesieve/Makefile.PL.in 2017-04-07 08:31:10.000000000 +0300 |
488 |
-+++ b/perl/sieve/managesieve/Makefile.PL.in 2017-05-16 10:26:31.048965921 +0300 |
489 |
-@@ -69,7 +69,7 @@ |
490 |
- 'ABSTRACT' => 'Cyrus Sieve management interface', |
491 |
- 'VERSION_FROM' => "@top_srcdir@/perl/sieve/managesieve/managesieve.pm", # finds $VERSION |
492 |
- 'MYEXTLIB' => '../lib/.libs/libisieve.a @top_builddir@/perl/.libs/libcyrus.a @top_builddir@/perl/.libs/libcyrus_min.a', |
493 |
-- 'LIBS' => ["$LIB_SASL @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ @ZLIB@"], |
494 |
-+ 'LIBS' => ["$LIB_SASL @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ @ZLIB@ @PCRE_LIBS@ @SQLITE_LIBADD@"], |
495 |
- 'CCFLAGS' => '@GCOV_CFLAGS@', |
496 |
- 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING' |
497 |
- 'INC' => "-I@top_srcdir@/lib -I@top_srcdir@/perl/sieve -I@top_srcdir@/perl/sieve/lib @SASLFLAGS@ @SSL_CPPFLAGS@", |
498 |
---- a/configure.ac 2017-05-16 15:18:23.648756211 +0300 |
499 |
-+++ b/configure.ac 2017-05-16 15:26:49.241756211 +0300 |
500 |
-@@ -633,8 +633,6 @@ |
501 |
- |
502 |
- AC_ARG_ENABLE(sieve, |
503 |
- [AS_HELP_STRING([--disable-sieve], [disable Sieve support])],,[enable_sieve="yes";]) |
504 |
--AC_ARG_ENABLE(pcre, |
505 |
-- [AS_HELP_STRING([--disable-pcre], [disable PCRE library])]) |
506 |
- |
507 |
- if test "$enable_sieve" != "no"; then |
508 |
- AC_DEFINE(USE_SIEVE,[],[Build in Sieve support?]) |
509 |
-@@ -650,42 +648,46 @@ |
510 |
- if test -z "$ac_cv_prog_LEX"; then |
511 |
- AC_MSG_ERROR([Sieve requires flex/lex, but none is installed]) |
512 |
- fi |
513 |
-+fi |
514 |
-+AM_CONDITIONAL([SIEVE], [test "${enable_sieve}" != "no"]) |
515 |
-+ |
516 |
- |
517 |
-- if test "$enable_pcre" != "no"; then |
518 |
-- AC_CHECK_HEADER(pcreposix.h) |
519 |
-- if test "$ac_cv_header_pcreposix_h" = "yes"; then |
520 |
-- AC_MSG_CHECKING(for utf8 enabled pcre) |
521 |
-- AC_CACHE_VAL(cyrus_cv_pcre_utf8, AC_TRY_CPP([#include <pcreposix.h> |
522 |
-+AC_ARG_ENABLE(pcre, |
523 |
-+ [AS_HELP_STRING([--disable-pcre], [disable PCRE library])]) |
524 |
-+ |
525 |
-+if test "$enable_pcre" != "no"; then |
526 |
-+ AC_CHECK_HEADER(pcreposix.h) |
527 |
-+ if test "$ac_cv_header_pcreposix_h" = "yes"; then |
528 |
-+ AC_MSG_CHECKING(for utf8 enabled pcre) |
529 |
-+ AC_CACHE_VAL(cyrus_cv_pcre_utf8, AC_TRY_CPP([#include <pcreposix.h> |
530 |
- #ifndef REG_UTF8 |
531 |
- #include </nonexistent> |
532 |
- #endif],cyrus_cv_pcre_utf8=yes,cyrus_cv_pcre_utf8=no)) |
533 |
-- AC_MSG_RESULT($cyrus_cv_pcre_utf8) |
534 |
-- else |
535 |
-- cyrus_cv_pcre_utf8="no" |
536 |
-- fi |
537 |
-+ AC_MSG_RESULT($cyrus_cv_pcre_utf8) |
538 |
-+ else |
539 |
-+ cyrus_cv_pcre_utf8="no" |
540 |
- fi |
541 |
-+fi |
542 |
- |
543 |
-- if test "$cyrus_cv_pcre_utf8" = "yes"; then |
544 |
-- PCRE_LIBS="-lpcre -lpcreposix" |
545 |
-- AC_SUBST(PCRE_LIBS) |
546 |
-- LIBS="$LIBS $PCRE_LIBS" |
547 |
-- AC_DEFINE(ENABLE_REGEX, [], [Do we have a regex library?]) |
548 |
-- AC_DEFINE(HAVE_PCREPOSIX_H, [], [Do we have usable pcre library?]) |
549 |
-+if test "$cyrus_cv_pcre_utf8" = "yes"; then |
550 |
-+ PCRE_LIBS="-lpcre -lpcreposix" |
551 |
-+ AC_SUBST(PCRE_LIBS) |
552 |
-+ LIBS="$LIBS $PCRE_LIBS" |
553 |
-+ AC_DEFINE(ENABLE_REGEX, [], [Do we have a regex library?]) |
554 |
-+ AC_DEFINE(HAVE_PCREPOSIX_H, [], [Do we have usable pcre library?]) |
555 |
-+else |
556 |
-+ AC_CHECK_HEADERS(rxposix.h) |
557 |
-+ if test "$ac_cv_header_rxposix_h" = "yes"; then |
558 |
-+ LIBS="$LIBS -lrx" |
559 |
-+ AC_DEFINE(ENABLE_REGEX, [], |
560 |
-+ [Do we have a regex library?]) |
561 |
- else |
562 |
-- AC_CHECK_HEADERS(rxposix.h) |
563 |
-- if test "$ac_cv_header_rxposix_h" = "yes"; then |
564 |
-- LIBS="$LIBS -lrx" |
565 |
-- AC_DEFINE(ENABLE_REGEX, [], |
566 |
-- [Do we have a regex library?]) |
567 |
-- else |
568 |
-- AC_SEARCH_LIBS(regcomp, regex, |
569 |
-- AC_DEFINE(ENABLE_REGEX, [], |
570 |
-- [Do we have a regex library?]), []) |
571 |
-- fi |
572 |
-+ AC_SEARCH_LIBS(regcomp, regex, |
573 |
-+ AC_DEFINE(ENABLE_REGEX, [], |
574 |
-+ [Do we have a regex library?]), []) |
575 |
- fi |
576 |
- fi |
577 |
- |
578 |
--AM_CONDITIONAL([SIEVE], [test "${enable_sieve}" != "no"]) |
579 |
- |
580 |
- dnl look for an option to disable sign-comparison warnings (needed for |
581 |
- dnl flex-generated sieve sources when building with -Werror) |