1 |
commit: d5932d124e6d6505b7bf5b230ee22444c4065345 |
2 |
Author: Eray Aslan <eras <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Apr 30 08:05:27 2018 +0000 |
4 |
Commit: Eray Aslan <eras <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 30 08:05:27 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5932d12 |
7 |
|
8 |
net-mail/cyrus-imapd: bump to 3.0.6 |
9 |
|
10 |
and fix dependencies and file collisions |
11 |
|
12 |
Fixes: https://bugs.gentoo.org/650200 |
13 |
Fixes: https://bugs.gentoo.org/627168 |
14 |
Fixes: https://bugs.gentoo.org/619584 |
15 |
Fixes: https://bugs.gentoo.org/618846 |
16 |
Package-Manager: Portage-2.3.31, Repoman-2.3.9 |
17 |
|
18 |
net-mail/cyrus-imapd/Manifest | 1 + |
19 |
net-mail/cyrus-imapd/cyrus-imapd-3.0.6.ebuild | 221 ++++++++++++++++++++++++++ |
20 |
2 files changed, 222 insertions(+) |
21 |
|
22 |
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest |
23 |
index 102d9c65627..fd7b4a36bf9 100644 |
24 |
--- a/net-mail/cyrus-imapd/Manifest |
25 |
+++ b/net-mail/cyrus-imapd/Manifest |
26 |
@@ -2,3 +2,4 @@ DIST cyrus-imapd-2.5.10.tar.gz 3103914 BLAKE2B 588764d47b3d458633e0ced2619cc1ccc |
27 |
DIST cyrus-imapd-2.5.11.tar.gz 3109188 BLAKE2B 9382d8e4b9317f7fa12f63f7262eb0c6a1571d405665694f735fb72b6de76058ea586172f2001babe280170f122c887374b1378f51fe9c89a522aaeb74b885c9 SHA512 bbb0e11f31d91d85037306321165e3608f8d5e2699b971fc4fbdd1630ec0a1485c8f6f17900142dec584ab41b0ec0c65c11cfaf8c5bbf1054b194a8f5f361538 |
28 |
DIST cyrus-imapd-3.0.4.tar.gz 10819487 BLAKE2B 209e379731c996ee083b0de61d6122b3756d1f6880071ebf015157057cf45845961d762ee762ae56213f72f15c01df29ab2d2661c4e352c6b4a680924d15d7b0 SHA512 9ceb7ac837c932c70fa0c1583bf8700b3ec27568d72538ae8d59f2f551e3007b3c2fc68fd29c009597c3949345dbe1bf2eb614bea038d70a5b49e5507df6b69a |
29 |
DIST cyrus-imapd-3.0.5.tar.gz 10910080 BLAKE2B a7914ab189a290427ddc0d013c19ff0c36f3a6c4fc016f50013d0f6abb11ae2f7d067b71df99b7f00ba4e8a2170e0f068baa170458b0dc1e94d69d8e4b814873 SHA512 262806729d5ee5d753732603aa7af33c6f96bc5145b7a951b8668ffdee0dcd4a90bd287da0949e85c4596cccb471a688f7f8b6f3e39194e1cff311950d4d4410 |
30 |
+DIST cyrus-imapd-3.0.6.tar.gz 10734548 BLAKE2B d16d1093b17f632fa75e77c1b923deb0c5a76de4c06a657c4c1dd2f9498ac0abd81ecee58c64378118d4b09be872957afc6db5d8deebf72c819623d6ea5aa0a9 SHA512 375e3936465e9ee448996cf738ebe93a35697a58a7784cf6f7a8be25e3e03925fb4f44ff98a0aacbc5b9e3ef39fc8a0e51acb4ea26cbbfbc8e492556fdc03a03 |
31 |
|
32 |
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.6.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.6.ebuild |
33 |
new file mode 100644 |
34 |
index 00000000000..b5c209187c1 |
35 |
--- /dev/null |
36 |
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.6.ebuild |
37 |
@@ -0,0 +1,221 @@ |
38 |
+# Copyright 1999-2018 Gentoo Foundation |
39 |
+# Distributed under the terms of the GNU General Public License v2 |
40 |
+ |
41 |
+EAPI=6 |
42 |
+inherit autotools flag-o-matic pam ssl-cert user |
43 |
+ |
44 |
+MY_P=${P/_/} |
45 |
+ |
46 |
+DESCRIPTION="The Cyrus IMAP Server" |
47 |
+HOMEPAGE="http://www.cyrusimap.org/" |
48 |
+SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz" |
49 |
+ |
50 |
+LICENSE="BSD-with-attribution" |
51 |
+SLOT="0" |
52 |
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
53 |
+IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \ |
54 |
+ mysql nntp pam perl postgres replication +server sieve snmp \ |
55 |
+ sphinx sqlite ssl static-libs tcpd test xapian" |
56 |
+ |
57 |
+# virtual/mysql-5.5 added for the --variable= option below |
58 |
+CDEPEND="sys-libs/zlib |
59 |
+ dev-libs/libpcre |
60 |
+ >=dev-libs/cyrus-sasl-2.1.13 |
61 |
+ dev-libs/jansson |
62 |
+ dev-libs/icu:= |
63 |
+ sys-libs/e2fsprogs-libs |
64 |
+ afs? ( net-fs/openafs ) |
65 |
+ calalarm? ( dev-libs/libical ) |
66 |
+ caps? ( sys-libs/libcap ) |
67 |
+ clamav? ( app-antivirus/clamav ) |
68 |
+ http? ( dev-libs/libxml2 dev-libs/libical ) |
69 |
+ kerberos? ( virtual/krb5 ) |
70 |
+ ldap? ( net-nds/openldap ) |
71 |
+ lmdb? ( dev-db/lmdb ) |
72 |
+ mysql? ( >=virtual/mysql-5.5 ) |
73 |
+ nntp? ( !net-nntp/leafnode ) |
74 |
+ pam? ( |
75 |
+ virtual/pam |
76 |
+ >=net-mail/mailbase-1 |
77 |
+ ) |
78 |
+ perl? ( dev-lang/perl:= ) |
79 |
+ postgres? ( dev-db/postgresql:* ) |
80 |
+ snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) |
81 |
+ ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] ) |
82 |
+ sqlite? ( dev-db/sqlite:3 ) |
83 |
+ tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) ) |
84 |
+ xapian? ( >=dev-libs/xapian-1.4.0 )" |
85 |
+ |
86 |
+DEPEND="${CDEPEND} |
87 |
+ test? ( dev-util/cunit )" |
88 |
+ |
89 |
+# all blockers really needed? |
90 |
+# file collision with app-arch/dump - bug 619584 |
91 |
+RDEPEND="${CDEPEND} |
92 |
+ !mail-mta/courier |
93 |
+ !net-mail/bincimap |
94 |
+ !net-mail/courier-imap |
95 |
+ !net-mail/uw-imap |
96 |
+ !net-mail/cyrus-imap-admin |
97 |
+ !app-arch/dump" |
98 |
+ |
99 |
+REQUIRED_USE="afs? ( kerberos ) |
100 |
+ backup? ( sqlite ) |
101 |
+ calalarm? ( http ) |
102 |
+ http? ( sqlite ) |
103 |
+ sphinx? ( mysql )" |
104 |
+ |
105 |
+S=${WORKDIR}/${MY_P} |
106 |
+ |
107 |
+pkg_setup() { |
108 |
+ enewuser cyrus -1 -1 /usr/cyrus mail |
109 |
+ append-ldflags $(no-as-needed) |
110 |
+} |
111 |
+ |
112 |
+src_prepare() { |
113 |
+ # bug 604470 |
114 |
+ eapply -p1 "${FILESDIR}/${PN}-sieve-libs-v4.patch" |
115 |
+ eapply -p1 "${FILESDIR}/${PN}-libcap-libs.patch" |
116 |
+ # Fix master(8)->cyrusmaster(8) manpage. |
117 |
+ for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do |
118 |
+ sed -i -e 's:master\.8:cyrusmaster.8:g' \ |
119 |
+ -e 's:master(8):cyrusmaster(8):g' \ |
120 |
+ "${i}" || die "sed failed" || die "sed failed" |
121 |
+ done |
122 |
+ mv man/master.8 man/cyrusmaster.8 || die "mv failed" |
123 |
+ sed -i -e "s:MASTER:CYRUSMASTER:g" \ |
124 |
+ -e "s:Master:Cyrusmaster:g" \ |
125 |
+ -e "s:master:cyrusmaster:g" \ |
126 |
+ man/cyrusmaster.8 || die "sed failed" |
127 |
+ |
128 |
+ # lock.h to afs/lock.h |
129 |
+ sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \ |
130 |
+ ptclient/afskrb.c || die |
131 |
+ |
132 |
+ eapply_user |
133 |
+ eautoreconf |
134 |
+} |
135 |
+ |
136 |
+src_configure() { |
137 |
+ local myconf |
138 |
+ if use afs ; then |
139 |
+ myconf+=" --with-afs-libdir=/usr/$(get_libdir)" |
140 |
+ myconf+=" --with-afs-incdir=/usr/include/afs" |
141 |
+ fi |
142 |
+ econf \ |
143 |
+ --enable-unit-tests \ |
144 |
+ --enable-murder \ |
145 |
+ --enable-idled \ |
146 |
+ --enable-event-notification \ |
147 |
+ --enable-autocreate \ |
148 |
+ --enable-pcre \ |
149 |
+ --with-cyrus-user=cyrus \ |
150 |
+ --with-cyrus-group=mail \ |
151 |
+ --with-sasl \ |
152 |
+ --without-krb \ |
153 |
+ --without-krbdes \ |
154 |
+ --enable-squat \ |
155 |
+ --with-zlib \ |
156 |
+ $(use_enable afs) \ |
157 |
+ $(use_enable afs krb5afspts) \ |
158 |
+ $(use_enable backup) \ |
159 |
+ $(use_enable calalarm calalarmd) \ |
160 |
+ $(use_with caps libcap) \ |
161 |
+ $(use_with clamav) \ |
162 |
+ $(use_enable nntp) \ |
163 |
+ $(use_enable http) \ |
164 |
+ $(use_enable replication) \ |
165 |
+ $(use_enable kerberos gssapi) \ |
166 |
+ $(use_with ldap) \ |
167 |
+ $(use_with lmdb) \ |
168 |
+ $(use_with mysql) \ |
169 |
+ $(use_with postgres pgsql) \ |
170 |
+ $(use_with perl) \ |
171 |
+ $(use_with sqlite) \ |
172 |
+ $(use_with ssl openssl) \ |
173 |
+ $(use_enable server) \ |
174 |
+ $(use_enable sieve) \ |
175 |
+ $(use_with snmp) \ |
176 |
+ $(use_enable sphinx) \ |
177 |
+ $(use_enable static-libs static) \ |
178 |
+ $(use_with tcpd libwrap) \ |
179 |
+ $(use_enable xapian) \ |
180 |
+ ${myconf} |
181 |
+} |
182 |
+ |
183 |
+src_install() { |
184 |
+ emake DESTDIR="${D}" INSTALLDIRS=vendor install |
185 |
+ |
186 |
+ dodoc README* |
187 |
+ dodoc -r doc |
188 |
+ cp -r contrib tools "${D}/usr/share/doc/${PF}" |
189 |
+ rm -f doc/text/Makefile* |
190 |
+ |
191 |
+ mv "${D}"usr/libexec/{master,cyrusmaster} || die |
192 |
+ |
193 |
+ insinto /etc |
194 |
+ newins "${D}usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf |
195 |
+ newins "${D}usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf |
196 |
+ |
197 |
+ sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \ |
198 |
+ -e '/^partition-default/s|/var/.*|/var/spool/imap|' \ |
199 |
+ -e '/^sievedir/s|/var/.*|/var/imap/sieve|' \ |
200 |
+ "${D}"etc/imapd.conf |
201 |
+ |
202 |
+ sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \ |
203 |
+ -e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \ |
204 |
+ "${D}"etc/cyrus.conf |
205 |
+ |
206 |
+ # turn off sieve if not installed |
207 |
+ if ! use sieve; then |
208 |
+ sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die |
209 |
+ fi |
210 |
+ # same thing for http(s) as well |
211 |
+ if ! use http; then |
212 |
+ sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die |
213 |
+ fi |
214 |
+ |
215 |
+ newinitd "${FILESDIR}/cyrus.rc8" cyrus |
216 |
+ newconfd "${FILESDIR}/cyrus.confd" cyrus |
217 |
+ newpamd "${FILESDIR}/cyrus.pam-include" sieve |
218 |
+ |
219 |
+ for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do |
220 |
+ keepdir "/var/${subdir}" |
221 |
+ fowners cyrus:mail "/var/${subdir}" |
222 |
+ fperms 0750 "/var/${subdir}" |
223 |
+ done |
224 |
+ for subdir in imap/{user,quota,sieve} spool/imap ; do |
225 |
+ 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 |
226 |
+ keepdir "/var/${subdir}/${i}" |
227 |
+ fowners cyrus:mail "/var/${subdir}/${i}" |
228 |
+ fperms 0750 "/var/${subdir}/${i}" |
229 |
+ done |
230 |
+ done |
231 |
+} |
232 |
+ |
233 |
+pkg_preinst() { |
234 |
+ if ! has_version ${CATEGORY}/${PN} ; then |
235 |
+ elog "For correct logging add the following to /etc/syslog.conf:" |
236 |
+ elog " local6.* /var/log/imapd.log" |
237 |
+ elog " auth.debug /var/log/auth.log" |
238 |
+ echo |
239 |
+ |
240 |
+ elog "You have to add user cyrus to the sasldb2. Do this with:" |
241 |
+ elog " saslpasswd2 cyrus" |
242 |
+ fi |
243 |
+} |
244 |
+ |
245 |
+pkg_postinst() { |
246 |
+ # do not install server.{key,pem) if they exist |
247 |
+ if use ssl ; then |
248 |
+ if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then |
249 |
+ install_cert /etc/ssl/cyrus/server |
250 |
+ chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem} |
251 |
+ fi |
252 |
+ fi |
253 |
+ |
254 |
+ echo |
255 |
+ einfo "Please see http://www.cyrusimap.org/imap/download/upgrade.html" |
256 |
+ einfo "for upgrade instructions." |
257 |
+ echo |
258 |
+} |