1 |
commit: 05e63664ed98b45a24cb6cccac4c284ade728b4b |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 16 01:14:58 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 16 01:17:35 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05e63664 |
7 |
|
8 |
net-mail/cyrus-imapd: add 3.4.2 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/798111 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
net-mail/cyrus-imapd/Manifest | 1 + |
14 |
net-mail/cyrus-imapd/cyrus-imapd-3.4.2.ebuild | 233 ++++++++++++++++++++++++++ |
15 |
profiles/base/package.use.force | 6 - |
16 |
3 files changed, 234 insertions(+), 6 deletions(-) |
17 |
|
18 |
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest |
19 |
index b22ec598adf..680623a04a7 100644 |
20 |
--- a/net-mail/cyrus-imapd/Manifest |
21 |
+++ b/net-mail/cyrus-imapd/Manifest |
22 |
@@ -3,3 +3,4 @@ DIST cyrus-imapd-3.0.14.tar.gz 10865880 BLAKE2B 36f3e60d715d2eab430040964e93cb33 |
23 |
DIST cyrus-imapd-3.0.15.tar.gz 10843341 BLAKE2B efe65c7afc7d63770adef9e4ea13b87e3b7fdd1847e4ada028175999b31ebb84f9d84b014018bd2be3fee9af1b5e81dd08f63225bc62dc5a4fd4a0791da16594 SHA512 2f65209095f086092fec0bfc9547c999a6e568cccc0a4164e7a3751fe2881f47bbbbd67ba9c9169feafead8c40d42f594d34171d911e4028425cfd8ba72d8f4a |
24 |
DIST cyrus-imapd-3.0.16.tar.gz 10875516 BLAKE2B 10915418b4de3f460a20d3808274f9ea83bdadc9a9edf2b383081605f7510a3e1563fa009e1dcc203f1c008f26e9db3ffd80f101f546de1dc8c3e714efc13596 SHA512 c17dd940102989d1e329ad8a1c08655bdd8b349ecb08e661f55ab8e602516ece1a86e52313e8cd5677048470f15f4272fcb598e4bbc61d27e5a673c01cb81ca3 |
25 |
DIST cyrus-imapd-3.4.1.tar.gz 12539102 BLAKE2B f791d26f34a9a5e9896231ec812ae623bb3f5fc85a577ea25deea956bda153f941f2a759f77de10d105d0746827243efed773fe67eea4921200cb2cddf81e049 SHA512 9fd13e93755aca98215c1bd9c21fa3ef3a3db8b1ff48f71dd6070e614e9c68cb591b1cb411fa1319d46ab1d49ddc971f188a41cc0c9a2e2c9df0cc08299f8bfa |
26 |
+DIST cyrus-imapd-3.4.2.tar.gz 12603768 BLAKE2B 515c36fc3d6a29991283d47a3e523d87a68c3191b4aae85074f40b2416fe3a89793f1991dc5729912a3d56247f6fbf4aed52abcadbc37ca7cc9bf857a8641871 SHA512 4d7d14e222bc1e97b2d8188804139c4c477de66cb621caba475b57533739ee59d88504d4f47735bb6a6b3c9097dbec382ecfa2c678f978791b9a6956a3cd91d6 |
27 |
|
28 |
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.2.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.2.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000000..9f3b5413327 |
31 |
--- /dev/null |
32 |
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.2.ebuild |
33 |
@@ -0,0 +1,233 @@ |
34 |
+# Copyright 1999-2021 Gentoo Authors |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+ |
37 |
+EAPI=7 |
38 |
+ |
39 |
+inherit autotools flag-o-matic pam ssl-cert |
40 |
+ |
41 |
+DESCRIPTION="The Cyrus IMAP Server" |
42 |
+HOMEPAGE="https://www.cyrusimap.org/" |
43 |
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz" |
44 |
+ |
45 |
+LICENSE="BSD-with-attribution GPL-2" |
46 |
+SLOT="0" |
47 |
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
48 |
+IUSE="afs backup calalarm caps clamav http kerberos ldap \ |
49 |
+ mysql nntp pam perl postgres replication +server sieve \ |
50 |
+ sqlite ssl static-libs tcpd test xapian" |
51 |
+RESTRICT="!test? ( test )" |
52 |
+ |
53 |
+CDEPEND=" |
54 |
+ sys-libs/zlib:0= |
55 |
+ dev-libs/libpcre:3 |
56 |
+ >=dev-libs/cyrus-sasl-2.1.13:2 |
57 |
+ dev-libs/jansson |
58 |
+ dev-libs/icu:0= |
59 |
+ sys-fs/e2fsprogs |
60 |
+ afs? ( net-fs/openafs ) |
61 |
+ calalarm? ( dev-libs/libical:0= ) |
62 |
+ caps? ( sys-libs/libcap ) |
63 |
+ clamav? ( app-antivirus/clamav ) |
64 |
+ http? ( |
65 |
+ dev-libs/libxml2:2 |
66 |
+ dev-libs/libical:0= |
67 |
+ net-libs/nghttp2 |
68 |
+ ) |
69 |
+ kerberos? ( virtual/krb5 ) |
70 |
+ ldap? ( net-nds/openldap ) |
71 |
+ mysql? ( dev-db/mysql-connector-c:0= ) |
72 |
+ nntp? ( !net-nntp/leafnode ) |
73 |
+ pam? ( |
74 |
+ >=net-mail/mailbase-1 |
75 |
+ sys-libs/pam |
76 |
+ ) |
77 |
+ perl? ( dev-lang/perl:= ) |
78 |
+ postgres? ( dev-db/postgresql:* ) |
79 |
+ ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] ) |
80 |
+ sqlite? ( dev-db/sqlite:3 ) |
81 |
+ tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) |
82 |
+ xapian? ( >=dev-libs/xapian-1.4.0:0= ) |
83 |
+" |
84 |
+DEPEND="${CDEPEND} |
85 |
+ test? ( dev-util/cunit ) |
86 |
+" |
87 |
+ |
88 |
+# all blockers really needed? |
89 |
+# file collision with app-arch/dump - bug 619584 |
90 |
+RDEPEND="${CDEPEND} |
91 |
+ acct-group/mail |
92 |
+ acct-user/cyrus |
93 |
+ !mail-mta/courier |
94 |
+ !net-mail/bincimap |
95 |
+ !net-mail/courier-imap |
96 |
+ !net-mail/uw-imap |
97 |
+ !app-arch/dump |
98 |
+" |
99 |
+ |
100 |
+REQUIRED_USE=" |
101 |
+ afs? ( kerberos ) |
102 |
+ backup? ( sqlite ) |
103 |
+ calalarm? ( http ) |
104 |
+ http? ( sqlite ) |
105 |
+" |
106 |
+ |
107 |
+# https://bugs.gentoo.org/678754 |
108 |
+# TODO: check underlinking for other libraries |
109 |
+#PATCHES=( |
110 |
+# "${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch" |
111 |
+#) |
112 |
+ |
113 |
+src_prepare() { |
114 |
+ default |
115 |
+ |
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 |
+ eautoreconf |
133 |
+} |
134 |
+ |
135 |
+src_configure() { |
136 |
+ local myconf |
137 |
+ |
138 |
+ # https://bugs.gentoo.org/604466 |
139 |
+ append-ldflags $(no-as-needed) |
140 |
+ |
141 |
+ if use afs ; then |
142 |
+ myconf+=" --with-afs-libdir=/usr/$(get_libdir)" |
143 |
+ myconf+=" --with-afs-incdir=/usr/include/afs" |
144 |
+ fi |
145 |
+ |
146 |
+ # TODO: |
147 |
+ # - revisit --with-sphinx-build=no? (it's docs this time, not the search engine) |
148 |
+ # - post-emerge message re lmdb removal? |
149 |
+ econf \ |
150 |
+ --enable-unit-tests \ |
151 |
+ --enable-murder \ |
152 |
+ --enable-idled \ |
153 |
+ --enable-autocreate \ |
154 |
+ --enable-pcre \ |
155 |
+ --with-com_err \ |
156 |
+ --with-cyrus-user=cyrus \ |
157 |
+ --with-sasl \ |
158 |
+ --with-sphinx-build=no \ |
159 |
+ --without-krb \ |
160 |
+ --without-krbdes \ |
161 |
+ --enable-squat \ |
162 |
+ --with-zlib \ |
163 |
+ $(use_enable afs) \ |
164 |
+ $(use_enable afs krb5afspts) \ |
165 |
+ $(use_enable backup) \ |
166 |
+ $(use_enable calalarm calalarmd) \ |
167 |
+ $(use_with caps libcap) \ |
168 |
+ $(use_with clamav) \ |
169 |
+ $(use_enable nntp) \ |
170 |
+ $(use_enable http) \ |
171 |
+ $(use_with http nghttp2) \ |
172 |
+ $(use_enable replication) \ |
173 |
+ $(use_enable kerberos gssapi) \ |
174 |
+ $(use_with ldap) \ |
175 |
+ $(use_with mysql) \ |
176 |
+ $(use_with postgres pgsql) \ |
177 |
+ $(use_with perl) \ |
178 |
+ $(use_with sqlite) \ |
179 |
+ $(use_with ssl openssl) \ |
180 |
+ $(use_enable server) \ |
181 |
+ $(use_enable sieve) \ |
182 |
+ $(use_enable static-libs static) \ |
183 |
+ $(use_with tcpd libwrap) \ |
184 |
+ $(use_enable xapian) \ |
185 |
+ ${myconf} |
186 |
+} |
187 |
+ |
188 |
+src_install() { |
189 |
+ emake DESTDIR="${D}" INSTALLDIRS=vendor install |
190 |
+ |
191 |
+ dodoc README* |
192 |
+ dodoc -r doc |
193 |
+ |
194 |
+ cp -r contrib tools "${ED}/usr/share/doc/${PF}" || die |
195 |
+ rm -f doc/text/Makefile* || die |
196 |
+ |
197 |
+ mv "${ED}"/usr/libexec/{master,cyrusmaster} || die |
198 |
+ |
199 |
+ insinto /etc |
200 |
+ newins "${ED}/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf |
201 |
+ newins "${ED}/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf |
202 |
+ |
203 |
+ sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \ |
204 |
+ -e '/^partition-default/s|/var/.*|/var/spool/imap|' \ |
205 |
+ -e '/^sievedir/s|/var/.*|/var/imap/sieve|' \ |
206 |
+ "${ED}"/etc/imapd.conf || die |
207 |
+ |
208 |
+ sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \ |
209 |
+ -e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \ |
210 |
+ "${ED}"/etc/cyrus.conf || die |
211 |
+ |
212 |
+ # turn off sieve if not installed |
213 |
+ if ! use sieve; then |
214 |
+ sed -i -e "/sieve/s/^/#/" "${ED}/etc/cyrus.conf" || die |
215 |
+ fi |
216 |
+ |
217 |
+ # same thing for http(s) as well |
218 |
+ if ! use http; then |
219 |
+ sed -i -e "/http/s/^/#/" "${ED}/etc/cyrus.conf" || die |
220 |
+ fi |
221 |
+ |
222 |
+ newinitd "${FILESDIR}/cyrus.rc8" cyrus |
223 |
+ newconfd "${FILESDIR}/cyrus.confd" cyrus |
224 |
+ newpamd "${FILESDIR}/cyrus.pam-include" sieve |
225 |
+ |
226 |
+ for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do |
227 |
+ keepdir "/var/${subdir}" |
228 |
+ fowners cyrus:mail "/var/${subdir}" |
229 |
+ fperms 0750 "/var/${subdir}" |
230 |
+ done |
231 |
+ |
232 |
+ for subdir in imap/{user,quota,sieve} spool/imap ; do |
233 |
+ 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 |
234 |
+ keepdir "/var/${subdir}/${i}" |
235 |
+ fowners cyrus:mail "/var/${subdir}/${i}" |
236 |
+ fperms 0750 "/var/${subdir}/${i}" |
237 |
+ done |
238 |
+ done |
239 |
+} |
240 |
+ |
241 |
+pkg_preinst() { |
242 |
+ if ! has_version ${CATEGORY}/${PN} ; then |
243 |
+ elog "For correct logging add the following to /etc/syslog.conf:" |
244 |
+ elog " local6.* /var/log/imapd.log" |
245 |
+ elog " auth.debug /var/log/auth.log" |
246 |
+ echo |
247 |
+ |
248 |
+ elog "You have to add user cyrus to the sasldb2. Do this with:" |
249 |
+ elog " saslpasswd2 cyrus" |
250 |
+ fi |
251 |
+} |
252 |
+ |
253 |
+pkg_postinst() { |
254 |
+ # do not install server.{key,pem) if they exist |
255 |
+ if use ssl ; then |
256 |
+ if [[ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]]; then |
257 |
+ install_cert /etc/ssl/cyrus/server |
258 |
+ chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem} |
259 |
+ fi |
260 |
+ fi |
261 |
+ |
262 |
+ echo |
263 |
+ einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html" |
264 |
+ einfo "for upgrade instructions." |
265 |
+ echo |
266 |
+} |
267 |
|
268 |
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force |
269 |
index aa66e55ed5b..0915aaf80a2 100644 |
270 |
--- a/profiles/base/package.use.force |
271 |
+++ b/profiles/base/package.use.force |
272 |
@@ -1,12 +1,6 @@ |
273 |
# Copyright 1999-2021 Gentoo Authors |
274 |
# Distributed under the terms of the GNU General Public License v2 |
275 |
|
276 |
-# Sam James <sam@g.o> (2021-05-07) |
277 |
-# Forced on for now as generated headers are now |
278 |
-# included unconditionally. |
279 |
-# (https://github.com/cyrusimap/cyrus-imapd/pull/3270) |
280 |
->=net-mail/cyrus-imapd-3.4.0 sieve |
281 |
- |
282 |
# Sam James <sam@g.o> (2021-03-08) |
283 |
# Broken without USE=unicode |
284 |
# Needs to link with libiconv, bug #774507 |