Gentoo Archives: gentoo-commits

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