public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2023-02-13  4:23 Sam James
  0 siblings, 0 replies; 85+ messages in thread
From: Sam James @ 2023-02-13  4:23 UTC (permalink / raw
  To: gentoo-commits

commit:     de49f727f63b4c0f3a4c61a33e64b6a978df9312
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 13 04:09:42 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 13 04:09:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de49f727

net-mail/cyrus-imapd: add 3.4.5

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/cyrus-imapd/Manifest                 |   1 +
 net-mail/cyrus-imapd/cyrus-imapd-3.4.5.ebuild | 247 ++++++++++++++++++++++++++
 2 files changed, 248 insertions(+)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 5ec20a19c755..ef9fd5701264 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -4,3 +4,4 @@ DIST cyrus-imapd-3.0.18.tar.gz 11465046 BLAKE2B 74b0ad899341959dd70f872fe5c190dd
 DIST cyrus-imapd-3.4.2.tar.gz 12603768 BLAKE2B 515c36fc3d6a29991283d47a3e523d87a68c3191b4aae85074f40b2416fe3a89793f1991dc5729912a3d56247f6fbf4aed52abcadbc37ca7cc9bf857a8641871 SHA512 4d7d14e222bc1e97b2d8188804139c4c477de66cb621caba475b57533739ee59d88504d4f47735bb6a6b3c9097dbec382ecfa2c678f978791b9a6956a3cd91d6
 DIST cyrus-imapd-3.4.3.tar.gz 13182110 BLAKE2B 485df8e2518a55a3b096d0c330d55f7ed93209ca4ab5851dda53083082e203ad9b1d9218c0863a9bd1e678a732427ef499ff78bacf2d3fb2fe18464186a9e6d2 SHA512 5c4db2a0c26d2323332c1ba67f7b207acfad15f0442f20c6c8a205b5423498465524398315946213c8168bc7eba1fd9f7dc573a91efac6708bfbaf2cb57e9276
 DIST cyrus-imapd-3.4.4.tar.gz 13236335 BLAKE2B 105ae3defcf321a01394b38672b080ea58f68ecdc41384af46186c6ef88c02061ac066bd3e382d7b649761d5e462f2310a4568989c87e5ec518e08051179f4b3 SHA512 7904a9d0535e9d606bbb7748a4886e10092e2b682180dddf94933199f19402ae6f5cc4472a3797decf9ef20d3a8b7f1715ab00f6751037f14b19cd7322942dc2
+DIST cyrus-imapd-3.4.5.tar.gz 13291987 BLAKE2B 4ac383ef7f3dea66a7dc11c2241b8663e3cda323b73e3b439255468cf9b6d80302a135793f952843ddee418acb4aa4a9a9d56fcb743b5d589d535764c2289c1d SHA512 e43185193130af2e11ced89b2241a7b6f321847cf8bc01c0d89cbbb1cb222a962fe00cdd54b1f89cea141a569b57d2ce2f0edffaca8db9fd5f7fc2cd82b4537b

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.5.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.5.ebuild
new file mode 100644
index 000000000000..ff38d8a5b3ab
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.5.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Keep an eye on https://www.cyrusimap.org/imap/developer/compiling.html!
+inherit autotools flag-o-matic pam ssl-cert
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="https://www.cyrusimap.org/"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs backup calalarm caps clamav http kerberos ldap \
+	mysql nntp pam perl postgres replication +server sieve \
+	sqlite ssl static-libs tcpd test xapian"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-libs/libpcre:3
+	>=dev-libs/cyrus-sasl-2.1.13:2
+	dev-libs/jansson:=
+	dev-libs/icu:=
+	sys-apps/util-linux
+	sys-fs/e2fsprogs:=
+	sys-libs/zlib:=
+	afs? ( net-fs/openafs )
+	calalarm? ( dev-libs/libical:= )
+	caps? ( sys-libs/libcap )
+	clamav? ( app-antivirus/clamav )
+	http? (
+		app-arch/brotli:=
+		app-arch/zstd:=
+		dev-libs/libxml2
+		dev-libs/libical:=
+		net-libs/nghttp2:=
+		sci-libs/shapelib:=
+	)
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+		>=net-mail/mailbase-1
+		sys-libs/pam
+	)
+	perl? (
+		dev-lang/perl:=
+		virtual/perl-Term-ReadLine
+	)
+	postgres? ( dev-db/postgresql:* )
+	ssl? ( >=dev-libs/openssl-1.0.1e:=[-bindist(-)] )
+	sqlite? ( dev-db/sqlite:3 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	xapian? ( >=dev-libs/xapian-1.4.0:= )"
+# all blockers really needed?
+# file collision with app-arch/dump - bug 619584
+RDEPEND="${DEPEND}
+	acct-group/mail
+	acct-user/cyrus
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!app-arch/dump"
+DEPEND+=" test? ( dev-util/cunit )"
+BDEPEND="sys-devel/flex
+	virtual/pkgconfig
+	app-alternatives/yacc"
+
+REQUIRED_USE="afs? ( kerberos )
+	backup? ( sqlite )
+	calalarm? ( http )
+	http? ( sqlite )"
+
+# https://bugs.gentoo.org/678754
+# TODO: check underlinking for other libraries
+#PATCHES=(
+#	"${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
+#)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4.4-0001-Test-for-libm.patch
+	"${FILESDIR}"/${PN}-3.4.4-0002-Avoid-underlinking-libcyrus-lm.patch
+)
+
+src_prepare() {
+	default
+
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# bug #604466
+	append-ldflags $(no-as-needed)
+
+	# Workaround runtime crash
+	# bug #834573
+	append-flags -fno-toplevel-reorder
+
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+
+	# TODO:
+	# - revisit --with-sphinx-build=no? (it's docs this time, not the search engine)
+	# - post-emerge message re lmdb removal?
+	econf \
+		--enable-murder \
+		--enable-idled \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-com_err \
+		--with-cyrus-user=cyrus \
+		--with-sasl \
+		--with-sphinx-build=no \
+		--without-krb \
+		--without-krbdes \
+		--enable-squat \
+		--with-zlib \
+		--without-wslay \
+		--without-chardet \
+		--without-cld2 \
+		--disable-srs \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_enable backup) \
+		$(use_enable calalarm calalarmd) \
+		$(use_with caps libcap) \
+		$(use_with clamav) \
+		$(use_enable nntp) \
+		$(use_enable http) \
+		$(use_with http nghttp2) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		$(use_enable xapian) \
+		$(use_enable test unit-tests) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dodoc -r doc
+
+	cp -r contrib tools "${ED}"/usr/share/doc/${PF} || die
+	rm -f doc/text/Makefile* || die
+
+	mv "${ED}"/usr/libexec/{master,cyrusmaster} || die
+
+	insinto /etc
+	newins "${ED}"/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf cyrus.conf
+	newins "${ED}"/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf imapd.conf
+
+	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
+		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
+		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
+		"${ED}"/etc/imapd.conf || die
+
+	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
+		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
+		"${ED}"/etc/cyrus.conf || die
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${ED}"/etc/cyrus.conf || die
+	fi
+
+	# same thing for http(s) as well
+	if ! use http; then
+		sed -i -e "/http/s/^/#/" "${ED}"/etc/cyrus.conf || die
+	fi
+
+	newinitd "${FILESDIR}"/cyrus.rc8 cyrus
+	newconfd "${FILESDIR}"/cyrus.confd cyrus
+	newpamd "${FILESDIR}"/cyrus.pam-include sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		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
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist
+	if use ssl ; then
+		if [[ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+
+	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "for upgrade instructions."
+}


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2023-07-02 11:14 David Seifert
  0 siblings, 0 replies; 85+ messages in thread
From: David Seifert @ 2023-07-02 11:14 UTC (permalink / raw
  To: gentoo-commits

commit:     b49f9341d5f655927afe21de70cddacf555ed214
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  2 11:14:21 2023 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jul  2 11:14:21 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b49f9341

net-mail/cyrus-imapd: remove obsolete blockers

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 net-mail/cyrus-imapd/cyrus-imapd-3.4.5-r1.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.5-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.5-r1.ebuild
index 5a7f7b4e6204..12a307abf989 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.5-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.5-r1.ebuild
@@ -60,9 +60,7 @@ RDEPEND="${DEPEND}
 	acct-group/mail
 	acct-user/cyrus
 	!mail-mta/courier
-	!net-mail/bincimap
 	!net-mail/courier-imap
-	!net-mail/uw-imap
 	!app-arch/dump"
 DEPEND+=" test? ( dev-util/cunit )"
 BDEPEND="sys-devel/flex


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2023-05-05 10:42 Arthur Zamarin
  0 siblings, 0 replies; 85+ messages in thread
From: Arthur Zamarin @ 2023-05-05 10:42 UTC (permalink / raw
  To: gentoo-commits

commit:     246030034aa78479771cf17f23ba3d4da445083a
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri May  5 10:41:51 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri May  5 10:41:51 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24603003

net-mail/cyrus-imapd: Stabilize 3.4.5-r1 amd64, #901959

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-mail/cyrus-imapd/cyrus-imapd-3.4.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.5-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.5-r1.ebuild
index f0c61fc55b96..5a7f7b4e6204 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.5-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.5-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap \
 	mysql nntp pam perl postgres replication +server sieve \
 	sqlite ssl static-libs tcpd test xapian"


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2023-03-25  6:35 Arthur Zamarin
  0 siblings, 0 replies; 85+ messages in thread
From: Arthur Zamarin @ 2023-03-25  6:35 UTC (permalink / raw
  To: gentoo-commits

commit:     2cf583b3de10e5b113cf172a2cc9f64289d4122c
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 25 06:34:58 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 25 06:34:58 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cf583b3

net-mail/cyrus-imapd: Stabilize 3.4.5-r1 x86, #901959

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-mail/cyrus-imapd/cyrus-imapd-3.4.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.5-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.5-r1.ebuild
index 53019d534474..f0c61fc55b96 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.5-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.5-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap \
 	mysql nntp pam perl postgres replication +server sieve \
 	sqlite ssl static-libs tcpd test xapian"


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2023-02-13  4:23 Sam James
  0 siblings, 0 replies; 85+ messages in thread
From: Sam James @ 2023-02-13  4:23 UTC (permalink / raw
  To: gentoo-commits

commit:     113a633e31499e016e7a4f023669add9970c3dd0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 13 04:01:41 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 13 04:01:41 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=113a633e

net-mail/cyrus-imapd: add 3.0.18

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/cyrus-imapd/Manifest                  |   1 +
 net-mail/cyrus-imapd/cyrus-imapd-3.0.18.ebuild | 232 +++++++++++++++++++++++++
 2 files changed, 233 insertions(+)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 414e0a4c708b..5ec20a19c755 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,5 +1,6 @@
 DIST cyrus-imapd-3.0.16.tar.gz 10875516 BLAKE2B 10915418b4de3f460a20d3808274f9ea83bdadc9a9edf2b383081605f7510a3e1563fa009e1dcc203f1c008f26e9db3ffd80f101f546de1dc8c3e714efc13596 SHA512 c17dd940102989d1e329ad8a1c08655bdd8b349ecb08e661f55ab8e602516ece1a86e52313e8cd5677048470f15f4272fcb598e4bbc61d27e5a673c01cb81ca3
 DIST cyrus-imapd-3.0.17.tar.gz 11445224 BLAKE2B bf2cd85f878c1b4198be5ce96cf6a4ae1e4fcc765b0c7fe60a6bfd04dd066c0420f86508cbfc1030831b57c2732715440cbf0e327f5147b074fe12926dcda85f SHA512 75519bf8a2ae4a8ff844338bee641d519eaf3419fb81b819dc7a42e5956ef57569e47a0e094ccb9726a9c43f0469cd3def6c62783565b2a2aaa863bda354a7da
+DIST cyrus-imapd-3.0.18.tar.gz 11465046 BLAKE2B 74b0ad899341959dd70f872fe5c190ddf5f4452834b0ee3f339b7c6c1c925d2a3ce091b826881fc3077aeb2ac0f9817f275469473155452236f5385134e3bcd7 SHA512 e4c2ebd979223ad577bf2d91299c324e08fa9e8a7871ef99d2db9e3ea29b44d170c36aa57ffe84bbbdd28014d06af9c54d5e72eb18036d5ee8aed910f45f5941
 DIST cyrus-imapd-3.4.2.tar.gz 12603768 BLAKE2B 515c36fc3d6a29991283d47a3e523d87a68c3191b4aae85074f40b2416fe3a89793f1991dc5729912a3d56247f6fbf4aed52abcadbc37ca7cc9bf857a8641871 SHA512 4d7d14e222bc1e97b2d8188804139c4c477de66cb621caba475b57533739ee59d88504d4f47735bb6a6b3c9097dbec382ecfa2c678f978791b9a6956a3cd91d6
 DIST cyrus-imapd-3.4.3.tar.gz 13182110 BLAKE2B 485df8e2518a55a3b096d0c330d55f7ed93209ca4ab5851dda53083082e203ad9b1d9218c0863a9bd1e678a732427ef499ff78bacf2d3fb2fe18464186a9e6d2 SHA512 5c4db2a0c26d2323332c1ba67f7b207acfad15f0442f20c6c8a205b5423498465524398315946213c8168bc7eba1fd9f7dc573a91efac6708bfbaf2cb57e9276
 DIST cyrus-imapd-3.4.4.tar.gz 13236335 BLAKE2B 105ae3defcf321a01394b38672b080ea58f68ecdc41384af46186c6ef88c02061ac066bd3e382d7b649761d5e462f2310a4568989c87e5ec518e08051179f4b3 SHA512 7904a9d0535e9d606bbb7748a4886e10092e2b682180dddf94933199f19402ae6f5cc4472a3797decf9ef20d3a8b7f1715ab00f6751037f14b19cd7322942dc2

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.18.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.18.ebuild
new file mode 100644
index 000000000000..e7037f973119
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.18.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic pam ssl-cert
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="https://www.cyrusimap.org/"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
+	mysql nntp pam perl postgres replication +server sieve snmp \
+	sqlite ssl static-libs tcpd test xapian"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	sys-libs/zlib:=
+	dev-libs/libpcre:3
+	>=dev-libs/cyrus-sasl-2.1.13:2
+	dev-libs/jansson:=
+	dev-libs/icu:=
+	sys-fs/e2fsprogs
+	afs? ( net-fs/openafs )
+	calalarm? ( dev-libs/libical:= )
+	caps? ( sys-libs/libcap )
+	clamav? ( app-antivirus/clamav )
+	http? (
+		dev-libs/libxml2:2
+		dev-libs/libical:=
+		net-libs/nghttp2:=
+	)
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap:= )
+	lmdb? ( dev-db/lmdb:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+		sys-libs/pam
+		>=net-mail/mailbase-1
+	)
+	perl? ( dev-lang/perl:= )
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:= )
+	ssl? ( >=dev-libs/openssl-1.0.1e:=[-bindist(-)] )
+	sqlite? ( dev-db/sqlite:3 )
+	tcpd? (
+		>=sys-apps/tcp-wrappers-7.6
+		snmp? ( net-analyzer/net-snmp:=[tcpd=] )
+	)
+	xapian? ( >=dev-libs/xapian-1.4.0:= )
+"
+DEPEND="${CDEPEND}
+	test? ( dev-util/cunit )
+"
+# all blockers really needed?
+# file collision with app-arch/dump - bug #619584
+RDEPEND="${CDEPEND}
+	acct-group/mail
+	acct-user/cyrus
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!app-arch/dump
+"
+
+REQUIRED_USE="afs? ( kerberos )
+	backup? ( sqlite )
+	calalarm? ( http )
+	http? ( sqlite )"
+
+# https://bugs.gentoo.org/678754
+# TODO: check underlinking for other libraries
+PATCHES=(
+	"${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
+)
+
+src_prepare() {
+	default
+
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# https://bugs.gentoo.org/604466
+	append-ldflags $(no-as-needed)
+
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+
+	# sphinx is unmaintained and dead, bug #662944
+	econf \
+		--enable-unit-tests \
+		--enable-murder \
+		--enable-idled \
+		--enable-event-notification \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-com_err \
+		--with-cyrus-user=cyrus \
+		--with-sasl \
+		--without-krb \
+		--without-krbdes \
+		--disable-sphinx \
+		--enable-squat \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_enable backup) \
+		$(use_enable calalarm calalarmd) \
+		$(use_with caps libcap) \
+		$(use_with clamav) \
+		$(use_enable nntp) \
+		$(use_enable http) \
+		$(use_with http nghttp2) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with lmdb) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_with snmp) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		$(use_enable xapian) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dodoc -r doc
+	cp -r contrib tools "${D}"/usr/share/doc/${PF}
+	rm -f doc/text/Makefile*
+
+	mv "${D}"/usr/libexec/{master,cyrusmaster} || die
+
+	insinto /etc
+	newins "${ED}"/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf cyrus.conf
+	newins "${ED}"/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf imapd.conf
+
+	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
+		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
+		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
+		"${ED}"/etc/imapd.conf || die
+
+	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
+		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
+		"${ED}"/etc/cyrus.conf || die
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${ED}"/etc/cyrus.conf || die
+	fi
+	# same thing for http(s) as well
+	if ! use http; then
+		sed -i -e "/http/s/^/#/" "${ED}"/etc/cyrus.conf || die
+	fi
+
+	newinitd "${FILESDIR}"/cyrus.rc8 cyrus
+	newconfd "${FILESDIR}"/cyrus.confd cyrus
+	newpamd "${FILESDIR}"/cyrus.pam-include sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		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
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist
+	if use ssl ; then
+		if [ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+
+	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "for upgrade instructions."
+}


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2022-08-24  5:29 Agostino Sarubbo
  0 siblings, 0 replies; 85+ messages in thread
From: Agostino Sarubbo @ 2022-08-24  5:29 UTC (permalink / raw
  To: gentoo-commits

commit:     efb0f6f524ab2b8bc599ef3b89cda6dba6cd6b1c
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 24 05:29:01 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Aug 24 05:29:01 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efb0f6f5

net-mail/cyrus-imapd: x86 stable wrt bug #866243

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-mail/cyrus-imapd/cyrus-imapd-3.4.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.4.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.4.ebuild
index 6e0c6ecd9f5b..846882ec4516 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.4.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap \
 	mysql nntp pam perl postgres replication +server sieve \
 	sqlite ssl static-libs tcpd test xapian"


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2022-08-24  5:25 Agostino Sarubbo
  0 siblings, 0 replies; 85+ messages in thread
From: Agostino Sarubbo @ 2022-08-24  5:25 UTC (permalink / raw
  To: gentoo-commits

commit:     06e7f988664b2dab14bd866e842e34b9fb964edf
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 24 05:25:06 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Aug 24 05:25:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06e7f988

net-mail/cyrus-imapd: amd64 stable wrt bug #866243

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-mail/cyrus-imapd/cyrus-imapd-3.4.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.4.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.4.ebuild
index fd888906a05d..6e0c6ecd9f5b 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.4.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap \
 	mysql nntp pam perl postgres replication +server sieve \
 	sqlite ssl static-libs tcpd test xapian"


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2022-06-27  9:55 Sam James
  0 siblings, 0 replies; 85+ messages in thread
From: Sam James @ 2022-06-27  9:55 UTC (permalink / raw
  To: gentoo-commits

commit:     b0f381249ca032ab7bf7a92eddcda2f29b2ad5cc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 27 09:54:48 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 27 09:55:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0f38124

net-mail/cyrus-imapd: add 3.4.4

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/cyrus-imapd/Manifest                 |   1 +
 net-mail/cyrus-imapd/cyrus-imapd-3.4.4.ebuild | 242 ++++++++++++++++++++++++++
 2 files changed, 243 insertions(+)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index ea0166b1d393..414e0a4c708b 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -2,3 +2,4 @@ DIST cyrus-imapd-3.0.16.tar.gz 10875516 BLAKE2B 10915418b4de3f460a20d3808274f9ea
 DIST cyrus-imapd-3.0.17.tar.gz 11445224 BLAKE2B bf2cd85f878c1b4198be5ce96cf6a4ae1e4fcc765b0c7fe60a6bfd04dd066c0420f86508cbfc1030831b57c2732715440cbf0e327f5147b074fe12926dcda85f SHA512 75519bf8a2ae4a8ff844338bee641d519eaf3419fb81b819dc7a42e5956ef57569e47a0e094ccb9726a9c43f0469cd3def6c62783565b2a2aaa863bda354a7da
 DIST cyrus-imapd-3.4.2.tar.gz 12603768 BLAKE2B 515c36fc3d6a29991283d47a3e523d87a68c3191b4aae85074f40b2416fe3a89793f1991dc5729912a3d56247f6fbf4aed52abcadbc37ca7cc9bf857a8641871 SHA512 4d7d14e222bc1e97b2d8188804139c4c477de66cb621caba475b57533739ee59d88504d4f47735bb6a6b3c9097dbec382ecfa2c678f978791b9a6956a3cd91d6
 DIST cyrus-imapd-3.4.3.tar.gz 13182110 BLAKE2B 485df8e2518a55a3b096d0c330d55f7ed93209ca4ab5851dda53083082e203ad9b1d9218c0863a9bd1e678a732427ef499ff78bacf2d3fb2fe18464186a9e6d2 SHA512 5c4db2a0c26d2323332c1ba67f7b207acfad15f0442f20c6c8a205b5423498465524398315946213c8168bc7eba1fd9f7dc573a91efac6708bfbaf2cb57e9276
+DIST cyrus-imapd-3.4.4.tar.gz 13236335 BLAKE2B 105ae3defcf321a01394b38672b080ea58f68ecdc41384af46186c6ef88c02061ac066bd3e382d7b649761d5e462f2310a4568989c87e5ec518e08051179f4b3 SHA512 7904a9d0535e9d606bbb7748a4886e10092e2b682180dddf94933199f19402ae6f5cc4472a3797decf9ef20d3a8b7f1715ab00f6751037f14b19cd7322942dc2

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.4.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.4.ebuild
new file mode 100644
index 000000000000..fd888906a05d
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.4.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Keep an eye on https://www.cyrusimap.org/imap/developer/compiling.html!
+inherit autotools flag-o-matic pam ssl-cert
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="https://www.cyrusimap.org/"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs backup calalarm caps clamav http kerberos ldap \
+	mysql nntp pam perl postgres replication +server sieve \
+	sqlite ssl static-libs tcpd test xapian"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-libs/libpcre:3
+	>=dev-libs/cyrus-sasl-2.1.13:2
+	dev-libs/jansson:=
+	dev-libs/icu:=
+	sys-apps/util-linux
+	sys-fs/e2fsprogs:=
+	sys-libs/zlib:=
+	afs? ( net-fs/openafs )
+	calalarm? ( dev-libs/libical:= )
+	caps? ( sys-libs/libcap )
+	clamav? ( app-antivirus/clamav )
+	http? (
+		app-arch/brotli:=
+		app-arch/zstd:=
+		dev-libs/libxml2
+		dev-libs/libical:=
+		net-libs/nghttp2:=
+		sci-libs/shapelib:=
+	)
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+		>=net-mail/mailbase-1
+		sys-libs/pam
+	)
+	perl? (
+		dev-lang/perl:=
+		virtual/perl-Term-ReadLine
+	)
+	postgres? ( dev-db/postgresql:* )
+	ssl? ( >=dev-libs/openssl-1.0.1e:=[-bindist(-)] )
+	sqlite? ( dev-db/sqlite:3 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	xapian? ( >=dev-libs/xapian-1.4.0:= )"
+# all blockers really needed?
+# file collision with app-arch/dump - bug 619584
+RDEPEND="${DEPEND}
+	acct-group/mail
+	acct-user/cyrus
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!app-arch/dump"
+DEPEND+=" test? ( dev-util/cunit )"
+BDEPEND="sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc"
+
+REQUIRED_USE="afs? ( kerberos )
+	backup? ( sqlite )
+	calalarm? ( http )
+	http? ( sqlite )"
+
+# https://bugs.gentoo.org/678754
+# TODO: check underlinking for other libraries
+#PATCHES=(
+#	"${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
+#)
+
+src_prepare() {
+	default
+
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# bug #604466
+	append-ldflags $(no-as-needed)
+
+	# Workaround runtime crash
+	# bug #834573
+	append-flags -fno-toplevel-reorder
+
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+
+	# TODO:
+	# - revisit --with-sphinx-build=no? (it's docs this time, not the search engine)
+	# - post-emerge message re lmdb removal?
+	econf \
+		--enable-murder \
+		--enable-idled \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-com_err \
+		--with-cyrus-user=cyrus \
+		--with-sasl \
+		--with-sphinx-build=no \
+		--without-krb \
+		--without-krbdes \
+		--enable-squat \
+		--with-zlib \
+		--without-wslay \
+		--without-chardet \
+		--without-cld2 \
+		--disable-srs \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_enable backup) \
+		$(use_enable calalarm calalarmd) \
+		$(use_with caps libcap) \
+		$(use_with clamav) \
+		$(use_enable nntp) \
+		$(use_enable http) \
+		$(use_with http nghttp2) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		$(use_enable xapian) \
+		$(use_enable test unit-tests) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dodoc -r doc
+
+	cp -r contrib tools "${ED}"/usr/share/doc/${PF} || die
+	rm -f doc/text/Makefile* || die
+
+	mv "${ED}"/usr/libexec/{master,cyrusmaster} || die
+
+	insinto /etc
+	newins "${ED}"/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf cyrus.conf
+	newins "${ED}"/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf imapd.conf
+
+	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
+		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
+		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
+		"${ED}"/etc/imapd.conf || die
+
+	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
+		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
+		"${ED}"/etc/cyrus.conf || die
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${ED}"/etc/cyrus.conf || die
+	fi
+
+	# same thing for http(s) as well
+	if ! use http; then
+		sed -i -e "/http/s/^/#/" "${ED}"/etc/cyrus.conf || die
+	fi
+
+	newinitd "${FILESDIR}"/cyrus.rc8 cyrus
+	newconfd "${FILESDIR}"/cyrus.confd cyrus
+	newpamd "${FILESDIR}"/cyrus.pam-include sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		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
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist
+	if use ssl ; then
+		if [[ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+
+	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "for upgrade instructions."
+}


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2022-05-10 16:59 Sam James
  0 siblings, 0 replies; 85+ messages in thread
From: Sam James @ 2022-05-10 16:59 UTC (permalink / raw
  To: gentoo-commits

commit:     34da02a7cee6cb1c50fbb7c1e2754afbc29585b6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 10 16:59:36 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 10 16:59:43 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34da02a7

net-mail/cyrus-imapd: drop back to ~ppc64

Bug: https://bugs.gentoo.org/816903
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r2.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r2.ebuild
index 543935234a1b..06d4168cf795 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r2.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sqlite ssl static-libs tcpd test xapian"


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2022-05-10 13:47 Agostino Sarubbo
  0 siblings, 0 replies; 85+ messages in thread
From: Agostino Sarubbo @ 2022-05-10 13:47 UTC (permalink / raw
  To: gentoo-commits

commit:     fee034cb90ccd99d4dce5b16190f4f98f0d073a5
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue May 10 13:47:40 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue May 10 13:47:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fee034cb

net-mail/cyrus-imapd: ppc64 stable wrt bug #816903

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r2.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r2.ebuild
index 06d4168cf795..543935234a1b 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r2.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sqlite ssl static-libs tcpd test xapian"


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2022-03-22 23:32 Sam James
  0 siblings, 0 replies; 85+ messages in thread
From: Sam James @ 2022-03-22 23:32 UTC (permalink / raw
  To: gentoo-commits

commit:     c38a37ee9b59e1d4b7e4e418ed842674a8903643
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 23:24:17 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 23:27:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c38a37ee

net-mail/cyrus-imapd: add subslot dep on OpenLDAP

New OpenLDAP breaks ABI (changes SONAME)

Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...mapd-3.0.13-r3.ebuild => cyrus-imapd-3.0.13-r4.ebuild} | 15 ++++++++-------
 ...mapd-3.0.14-r3.ebuild => cyrus-imapd-3.0.14-r4.ebuild} | 15 ++++++++-------
 ...mapd-3.0.15-r3.ebuild => cyrus-imapd-3.0.15-r4.ebuild} | 15 ++++++++-------
 ...mapd-3.0.16-r1.ebuild => cyrus-imapd-3.0.16-r2.ebuild} | 15 ++++++++-------
 ...s-imapd-3.0.17.ebuild => cyrus-imapd-3.0.17-r1.ebuild} |  4 ++--
 ...-imapd-3.4.2-r1.ebuild => cyrus-imapd-3.4.2-r2.ebuild} |  6 +++---
 ...-imapd-3.4.3-r1.ebuild => cyrus-imapd-3.4.3-r2.ebuild} |  2 +-
 7 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r3.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r4.ebuild
similarity index 98%
rename from net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r3.ebuild
rename to net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r4.ebuild
index ef409df0114d..824794bbbc35 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r3.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r4.ebuild
@@ -27,24 +27,25 @@ CDEPEND="
 	calalarm? ( dev-libs/libical:0= )
 	caps? ( sys-libs/libcap )
 	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 )
+	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2:= )
 	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
+	ldap? ( net-nds/openldap:= )
 	lmdb? ( dev-db/lmdb:0= )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	nntp? ( !net-nntp/leafnode )
 	pam? (
-			sys-libs/pam
-			>=net-mail/mailbase-1
-		)
+		sys-libs/pam
+		>=net-mail/mailbase-1
+	)
 	perl? ( dev-lang/perl:= )
 	postgres? ( dev-db/postgresql:* )
 	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= )
 	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] )
 	sqlite? ( dev-db/sqlite:3 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6
+	tcpd? (
+		>=sys-apps/tcp-wrappers-7.6
 		snmp? ( net-analyzer/net-snmp:0=[tcpd=] )
-		)
+	)
 	xapian? ( >=dev-libs/xapian-1.4.0:0= )
 "
 DEPEND="${CDEPEND}

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r3.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r4.ebuild
similarity index 98%
rename from net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r3.ebuild
rename to net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r4.ebuild
index b64e165b3a8e..471ab7129ca9 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r3.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r4.ebuild
@@ -27,24 +27,25 @@ CDEPEND="
 	calalarm? ( dev-libs/libical:0= )
 	caps? ( sys-libs/libcap )
 	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 )
+	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2:= )
 	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
+	ldap? ( net-nds/openldap:= )
 	lmdb? ( dev-db/lmdb:0= )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	nntp? ( !net-nntp/leafnode )
 	pam? (
-			sys-libs/pam
-			>=net-mail/mailbase-1
-		)
+		sys-libs/pam
+		>=net-mail/mailbase-1
+	)
 	perl? ( dev-lang/perl:= )
 	postgres? ( dev-db/postgresql:* )
 	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= )
 	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] )
 	sqlite? ( dev-db/sqlite:3 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6
+	tcpd? (
+		>=sys-apps/tcp-wrappers-7.6
 		snmp? ( net-analyzer/net-snmp:0=[tcpd=] )
-		)
+	)
 	xapian? ( >=dev-libs/xapian-1.4.0:0= )
 "
 DEPEND="${CDEPEND}

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r3.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r4.ebuild
similarity index 98%
rename from net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r3.ebuild
rename to net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r4.ebuild
index 661c6333d774..06d4168cf795 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r3.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r4.ebuild
@@ -28,24 +28,25 @@ CDEPEND="
 	calalarm? ( dev-libs/libical:0= )
 	caps? ( sys-libs/libcap )
 	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 )
+	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2:= )
 	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
+	ldap? ( net-nds/openldap:= )
 	lmdb? ( dev-db/lmdb:0= )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	nntp? ( !net-nntp/leafnode )
 	pam? (
-			sys-libs/pam
-			>=net-mail/mailbase-1
-		)
+		sys-libs/pam
+		>=net-mail/mailbase-1
+	)
 	perl? ( dev-lang/perl:= )
 	postgres? ( dev-db/postgresql:* )
 	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= )
 	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] )
 	sqlite? ( dev-db/sqlite:3 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6
+	tcpd? (
+		>=sys-apps/tcp-wrappers-7.6
 		snmp? ( net-analyzer/net-snmp:0=[tcpd=] )
-		)
+	)
 	xapian? ( >=dev-libs/xapian-1.4.0:0= )
 "
 DEPEND="${CDEPEND}

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r2.ebuild
similarity index 98%
rename from net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild
rename to net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r2.ebuild
index 661c6333d774..06d4168cf795 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r2.ebuild
@@ -28,24 +28,25 @@ CDEPEND="
 	calalarm? ( dev-libs/libical:0= )
 	caps? ( sys-libs/libcap )
 	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 )
+	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2:= )
 	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
+	ldap? ( net-nds/openldap:= )
 	lmdb? ( dev-db/lmdb:0= )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	nntp? ( !net-nntp/leafnode )
 	pam? (
-			sys-libs/pam
-			>=net-mail/mailbase-1
-		)
+		sys-libs/pam
+		>=net-mail/mailbase-1
+	)
 	perl? ( dev-lang/perl:= )
 	postgres? ( dev-db/postgresql:* )
 	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= )
 	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] )
 	sqlite? ( dev-db/sqlite:3 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6
+	tcpd? (
+		>=sys-apps/tcp-wrappers-7.6
 		snmp? ( net-analyzer/net-snmp:0=[tcpd=] )
-		)
+	)
 	xapian? ( >=dev-libs/xapian-1.4.0:0= )
 "
 DEPEND="${CDEPEND}

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.17.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.17-r1.ebuild
similarity index 99%
rename from net-mail/cyrus-imapd/cyrus-imapd-3.0.17.ebuild
rename to net-mail/cyrus-imapd/cyrus-imapd-3.0.17-r1.ebuild
index fb391be37dcf..9346b47b1dab 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.17.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.17-r1.ebuild
@@ -31,10 +31,10 @@ CDEPEND="
 	http? (
 		dev-libs/libxml2:2
 		dev-libs/libical:=
-		net-libs/nghttp2
+		net-libs/nghttp2:=
 	)
 	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
+	ldap? ( net-nds/openldap:= )
 	lmdb? ( dev-db/lmdb:= )
 	mysql? ( dev-db/mysql-connector-c:= )
 	nntp? ( !net-nntp/leafnode )

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r2.ebuild
similarity index 98%
rename from net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild
rename to net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r2.ebuild
index 5df5b8a089db..9d13260102be 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r2.ebuild
@@ -30,11 +30,11 @@ CDEPEND="
 	clamav? ( app-antivirus/clamav )
 	http? (
 		dev-libs/libxml2:2
-		dev-libs/libical:0=
-		net-libs/nghttp2
+		dev-libs/libical:=
+		net-libs/nghttp2:=
 	)
 	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
+	ldap? ( net-nds/openldap:= )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	nntp? ( !net-nntp/leafnode )
 	pam? (

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.3-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.3-r2.ebuild
similarity index 99%
rename from net-mail/cyrus-imapd/cyrus-imapd-3.4.3-r1.ebuild
rename to net-mail/cyrus-imapd/cyrus-imapd-3.4.3-r2.ebuild
index 6f4377b85644..fd888906a05d 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.3-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.3-r2.ebuild
@@ -38,7 +38,7 @@ DEPEND="dev-libs/libpcre:3
 		sci-libs/shapelib:=
 	)
 	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
+	ldap? ( net-nds/openldap:= )
 	mysql? ( dev-db/mysql-connector-c:= )
 	nntp? ( !net-nntp/leafnode )
 	pam? (


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2022-02-23  2:52 Sam James
  0 siblings, 0 replies; 85+ messages in thread
From: Sam James @ 2022-02-23  2:52 UTC (permalink / raw
  To: gentoo-commits

commit:     9c2fc75147983cfb9a90ca9a5dd7b1a057650951
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 23 02:45:58 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 23 02:45:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c2fc751

net-mail/cyrus-imapd: add 3.0.17

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/cyrus-imapd/Manifest                  |   1 +
 net-mail/cyrus-imapd/cyrus-imapd-3.0.17.ebuild | 232 +++++++++++++++++++++++++
 2 files changed, 233 insertions(+)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 983e8859fdcf..cb3a88782ed5 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -2,4 +2,5 @@ DIST cyrus-imapd-3.0.13.tar.gz 10840005 BLAKE2B f4790837a198673b42d553bc7cbc8254
 DIST cyrus-imapd-3.0.14.tar.gz 10865880 BLAKE2B 36f3e60d715d2eab430040964e93cb332cfc4d9097f0f863b94325eb4eb964a4030d1d0f8ddb7870a08b655e1694bbc751d5aab99af6670ab33ad6747f55f6bd SHA512 0bade56f4f7834ef51efc4081f2915bf0f98a2a555cd1b847f13a34418e4c52f2abcb4018906c144c161241433a8ff9ddc6d88499804d3fe616a05f186a3f209
 DIST cyrus-imapd-3.0.15.tar.gz 10843341 BLAKE2B efe65c7afc7d63770adef9e4ea13b87e3b7fdd1847e4ada028175999b31ebb84f9d84b014018bd2be3fee9af1b5e81dd08f63225bc62dc5a4fd4a0791da16594 SHA512 2f65209095f086092fec0bfc9547c999a6e568cccc0a4164e7a3751fe2881f47bbbbd67ba9c9169feafead8c40d42f594d34171d911e4028425cfd8ba72d8f4a
 DIST cyrus-imapd-3.0.16.tar.gz 10875516 BLAKE2B 10915418b4de3f460a20d3808274f9ea83bdadc9a9edf2b383081605f7510a3e1563fa009e1dcc203f1c008f26e9db3ffd80f101f546de1dc8c3e714efc13596 SHA512 c17dd940102989d1e329ad8a1c08655bdd8b349ecb08e661f55ab8e602516ece1a86e52313e8cd5677048470f15f4272fcb598e4bbc61d27e5a673c01cb81ca3
+DIST cyrus-imapd-3.0.17.tar.gz 11445224 BLAKE2B bf2cd85f878c1b4198be5ce96cf6a4ae1e4fcc765b0c7fe60a6bfd04dd066c0420f86508cbfc1030831b57c2732715440cbf0e327f5147b074fe12926dcda85f SHA512 75519bf8a2ae4a8ff844338bee641d519eaf3419fb81b819dc7a42e5956ef57569e47a0e094ccb9726a9c43f0469cd3def6c62783565b2a2aaa863bda354a7da
 DIST cyrus-imapd-3.4.2.tar.gz 12603768 BLAKE2B 515c36fc3d6a29991283d47a3e523d87a68c3191b4aae85074f40b2416fe3a89793f1991dc5729912a3d56247f6fbf4aed52abcadbc37ca7cc9bf857a8641871 SHA512 4d7d14e222bc1e97b2d8188804139c4c477de66cb621caba475b57533739ee59d88504d4f47735bb6a6b3c9097dbec382ecfa2c678f978791b9a6956a3cd91d6

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.17.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.17.ebuild
new file mode 100644
index 000000000000..fb391be37dcf
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.17.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic pam ssl-cert
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="https://www.cyrusimap.org/"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
+	mysql nntp pam perl postgres replication +server sieve snmp \
+	sqlite ssl static-libs tcpd test xapian"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	sys-libs/zlib:=
+	dev-libs/libpcre:3
+	>=dev-libs/cyrus-sasl-2.1.13:2
+	dev-libs/jansson:=
+	dev-libs/icu:=
+	sys-fs/e2fsprogs
+	afs? ( net-fs/openafs )
+	calalarm? ( dev-libs/libical:= )
+	caps? ( sys-libs/libcap )
+	clamav? ( app-antivirus/clamav )
+	http? (
+		dev-libs/libxml2:2
+		dev-libs/libical:=
+		net-libs/nghttp2
+	)
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lmdb? ( dev-db/lmdb:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+		sys-libs/pam
+		>=net-mail/mailbase-1
+	)
+	perl? ( dev-lang/perl:= )
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:= )
+	ssl? ( >=dev-libs/openssl-1.0.1e:=[-bindist(-)] )
+	sqlite? ( dev-db/sqlite:3 )
+	tcpd? (
+		>=sys-apps/tcp-wrappers-7.6
+		snmp? ( net-analyzer/net-snmp:=[tcpd=] )
+	)
+	xapian? ( >=dev-libs/xapian-1.4.0:= )
+"
+DEPEND="${CDEPEND}
+	test? ( dev-util/cunit )
+"
+# all blockers really needed?
+# file collision with app-arch/dump - bug #619584
+RDEPEND="${CDEPEND}
+	acct-group/mail
+	acct-user/cyrus
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!app-arch/dump
+"
+
+REQUIRED_USE="afs? ( kerberos )
+	backup? ( sqlite )
+	calalarm? ( http )
+	http? ( sqlite )"
+
+# https://bugs.gentoo.org/678754
+# TODO: check underlinking for other libraries
+PATCHES=(
+	"${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
+)
+
+src_prepare() {
+	default
+
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# https://bugs.gentoo.org/604466
+	append-ldflags $(no-as-needed)
+
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+
+	# sphinx is unmaintained and dead, bug #662944
+	econf \
+		--enable-unit-tests \
+		--enable-murder \
+		--enable-idled \
+		--enable-event-notification \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-com_err \
+		--with-cyrus-user=cyrus \
+		--with-sasl \
+		--without-krb \
+		--without-krbdes \
+		--disable-sphinx \
+		--enable-squat \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_enable backup) \
+		$(use_enable calalarm calalarmd) \
+		$(use_with caps libcap) \
+		$(use_with clamav) \
+		$(use_enable nntp) \
+		$(use_enable http) \
+		$(use_with http nghttp2) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with lmdb) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_with snmp) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		$(use_enable xapian) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dodoc -r doc
+	cp -r contrib tools "${D}"/usr/share/doc/${PF}
+	rm -f doc/text/Makefile*
+
+	mv "${D}"/usr/libexec/{master,cyrusmaster} || die
+
+	insinto /etc
+	newins "${ED}"/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf cyrus.conf
+	newins "${ED}"/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf imapd.conf
+
+	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
+		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
+		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
+		"${ED}"/etc/imapd.conf || die
+
+	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
+		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
+		"${ED}"/etc/cyrus.conf || die
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${ED}"/etc/cyrus.conf || die
+	fi
+	# same thing for http(s) as well
+	if ! use http; then
+		sed -i -e "/http/s/^/#/" "${ED}"/etc/cyrus.conf || die
+	fi
+
+	newinitd "${FILESDIR}"/cyrus.rc8 cyrus
+	newconfd "${FILESDIR}"/cyrus.confd cyrus
+	newpamd "${FILESDIR}"/cyrus.pam-include sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		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
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist
+	if use ssl ; then
+		if [ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+
+	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "for upgrade instructions."
+}


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2022-02-23  2:52 Sam James
  0 siblings, 0 replies; 85+ messages in thread
From: Sam James @ 2022-02-23  2:52 UTC (permalink / raw
  To: gentoo-commits

commit:     244251d4b188d393047aebefc6826758fe793e47
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 23 02:46:04 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 23 02:46:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=244251d4

net-mail/cyrus-imapd: add 3.4.3

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/cyrus-imapd/Manifest                 |   1 +
 net-mail/cyrus-imapd/cyrus-imapd-3.4.3.ebuild | 226 ++++++++++++++++++++++++++
 2 files changed, 227 insertions(+)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index cb3a88782ed5..44417b447816 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -4,3 +4,4 @@ DIST cyrus-imapd-3.0.15.tar.gz 10843341 BLAKE2B efe65c7afc7d63770adef9e4ea13b87e
 DIST cyrus-imapd-3.0.16.tar.gz 10875516 BLAKE2B 10915418b4de3f460a20d3808274f9ea83bdadc9a9edf2b383081605f7510a3e1563fa009e1dcc203f1c008f26e9db3ffd80f101f546de1dc8c3e714efc13596 SHA512 c17dd940102989d1e329ad8a1c08655bdd8b349ecb08e661f55ab8e602516ece1a86e52313e8cd5677048470f15f4272fcb598e4bbc61d27e5a673c01cb81ca3
 DIST cyrus-imapd-3.0.17.tar.gz 11445224 BLAKE2B bf2cd85f878c1b4198be5ce96cf6a4ae1e4fcc765b0c7fe60a6bfd04dd066c0420f86508cbfc1030831b57c2732715440cbf0e327f5147b074fe12926dcda85f SHA512 75519bf8a2ae4a8ff844338bee641d519eaf3419fb81b819dc7a42e5956ef57569e47a0e094ccb9726a9c43f0469cd3def6c62783565b2a2aaa863bda354a7da
 DIST cyrus-imapd-3.4.2.tar.gz 12603768 BLAKE2B 515c36fc3d6a29991283d47a3e523d87a68c3191b4aae85074f40b2416fe3a89793f1991dc5729912a3d56247f6fbf4aed52abcadbc37ca7cc9bf857a8641871 SHA512 4d7d14e222bc1e97b2d8188804139c4c477de66cb621caba475b57533739ee59d88504d4f47735bb6a6b3c9097dbec382ecfa2c678f978791b9a6956a3cd91d6
+DIST cyrus-imapd-3.4.3.tar.gz 13182110 BLAKE2B 485df8e2518a55a3b096d0c330d55f7ed93209ca4ab5851dda53083082e203ad9b1d9218c0863a9bd1e678a732427ef499ff78bacf2d3fb2fe18464186a9e6d2 SHA512 5c4db2a0c26d2323332c1ba67f7b207acfad15f0442f20c6c8a205b5423498465524398315946213c8168bc7eba1fd9f7dc573a91efac6708bfbaf2cb57e9276

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.3.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.3.ebuild
new file mode 100644
index 000000000000..5bcd06cfed19
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.3.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic pam ssl-cert
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="https://www.cyrusimap.org/"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs backup calalarm caps clamav http kerberos ldap \
+	mysql nntp pam perl postgres replication +server sieve \
+	sqlite ssl static-libs tcpd test xapian"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	sys-libs/zlib:=
+	dev-libs/libpcre:3
+	>=dev-libs/cyrus-sasl-2.1.13:2
+	dev-libs/jansson:=
+	dev-libs/icu:=
+	sys-fs/e2fsprogs
+	afs? ( net-fs/openafs )
+	calalarm? ( dev-libs/libical:= )
+	caps? ( sys-libs/libcap )
+	clamav? ( app-antivirus/clamav )
+	http? (
+		dev-libs/libxml2:2
+		dev-libs/libical:=
+		net-libs/nghttp2
+	)
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	mysql? ( dev-db/mysql-connector-c:= )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+		>=net-mail/mailbase-1
+		sys-libs/pam
+	)
+	perl? ( dev-lang/perl:= )
+	postgres? ( dev-db/postgresql:* )
+	ssl? ( >=dev-libs/openssl-1.0.1e:=[-bindist(-)] )
+	sqlite? ( dev-db/sqlite:3 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	xapian? ( >=dev-libs/xapian-1.4.0:= )"
+DEPEND="${CDEPEND}
+	test? ( dev-util/cunit )"
+
+# all blockers really needed?
+# file collision with app-arch/dump - bug 619584
+RDEPEND="${CDEPEND}
+	acct-group/mail
+	acct-user/cyrus
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!app-arch/dump"
+
+REQUIRED_USE="afs? ( kerberos )
+	backup? ( sqlite )
+	calalarm? ( http )
+	http? ( sqlite )"
+
+# https://bugs.gentoo.org/678754
+# TODO: check underlinking for other libraries
+#PATCHES=(
+#	"${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
+#)
+
+src_prepare() {
+	default
+
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# bug #604466
+	append-ldflags $(no-as-needed)
+
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+
+	# TODO:
+	# - revisit --with-sphinx-build=no? (it's docs this time, not the search engine)
+	# - post-emerge message re lmdb removal?
+	econf \
+		--enable-murder \
+		--enable-idled \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-com_err \
+		--with-cyrus-user=cyrus \
+		--with-sasl \
+		--with-sphinx-build=no \
+		--without-krb \
+		--without-krbdes \
+		--enable-squat \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_enable backup) \
+		$(use_enable calalarm calalarmd) \
+		$(use_with caps libcap) \
+		$(use_with clamav) \
+		$(use_enable nntp) \
+		$(use_enable http) \
+		$(use_with http nghttp2) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		$(use_enable xapian) \
+		$(use_enable test unit-tests) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dodoc -r doc
+
+	cp -r contrib tools "${ED}"/usr/share/doc/${PF} || die
+	rm -f doc/text/Makefile* || die
+
+	mv "${ED}"/usr/libexec/{master,cyrusmaster} || die
+
+	insinto /etc
+	newins "${ED}"/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf cyrus.conf
+	newins "${ED}"/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf imapd.conf
+
+	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
+		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
+		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
+		"${ED}"/etc/imapd.conf || die
+
+	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
+		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
+		"${ED}"/etc/cyrus.conf || die
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${ED}"/etc/cyrus.conf || die
+	fi
+
+	# same thing for http(s) as well
+	if ! use http; then
+		sed -i -e "/http/s/^/#/" "${ED}"/etc/cyrus.conf || die
+	fi
+
+	newinitd "${FILESDIR}"/cyrus.rc8 cyrus
+	newconfd "${FILESDIR}"/cyrus.confd cyrus
+	newpamd "${FILESDIR}"/cyrus.pam-include sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		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
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist
+	if use ssl ; then
+		if [[ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+
+	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "for upgrade instructions."
+}


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2022-02-21  7:47 Agostino Sarubbo
  0 siblings, 0 replies; 85+ messages in thread
From: Agostino Sarubbo @ 2022-02-21  7:47 UTC (permalink / raw
  To: gentoo-commits

commit:     aa635195329b33101ff521824b7464304479d5f8
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 21 07:47:36 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Feb 21 07:47:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa635195

net-mail/cyrus-imapd: x86 stable wrt bug #833707

Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild
index 94694b17ba24..1153a1bbaf9c 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap \
 	mysql nntp pam perl postgres replication +server sieve \
 	sqlite ssl static-libs tcpd test xapian"


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2022-02-19 19:28 Sam James
  0 siblings, 0 replies; 85+ messages in thread
From: Sam James @ 2022-02-19 19:28 UTC (permalink / raw
  To: gentoo-commits

commit:     7dc0bcec5be8773b85ec0cbb7fbcda0392d2a442
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 19 19:26:29 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 19:26:29 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dc0bcec

net-mail/cyrus-imapd: Stabilize 3.4.2-r1 ppc, #833707

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild
index bd5966569262..94694b17ba24 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap \
 	mysql nntp pam perl postgres replication +server sieve \
 	sqlite ssl static-libs tcpd test xapian"


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2022-02-19 15:47 Jakov Smolić
  0 siblings, 0 replies; 85+ messages in thread
From: Jakov Smolić @ 2022-02-19 15:47 UTC (permalink / raw
  To: gentoo-commits

commit:     98535d7dc40bcbab8ca4526278043f515a19b253
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 19 15:47:30 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 15:47:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98535d7d

net-mail/cyrus-imapd: Stabilize 3.4.2-r1 amd64, #833707

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild
index 3c1ae3f5e26a..bd5966569262 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap \
 	mysql nntp pam perl postgres replication +server sieve \
 	sqlite ssl static-libs tcpd test xapian"


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2021-11-20 15:34 Arthur Zamarin
  0 siblings, 0 replies; 85+ messages in thread
From: Arthur Zamarin @ 2021-11-20 15:34 UTC (permalink / raw
  To: gentoo-commits

commit:     59e23cb1054a7bb32be0625bfb4db95c82f1fac3
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 20 15:33:15 2021 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 20 15:33:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59e23cb1

net-mail/cyrus-imapd: Stabilize 3.0.16-r1 ppc64, #816903

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild
index cdbc51c6944c..3e10403da608 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sqlite ssl static-libs tcpd test xapian"


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2021-10-09  3:20 Sam James
  0 siblings, 0 replies; 85+ messages in thread
From: Sam James @ 2021-10-09  3:20 UTC (permalink / raw
  To: gentoo-commits

commit:     2fad4b8f71e5882db009efcb1f3b5ce749906aee
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  9 02:52:10 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct  9 02:52:10 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fad4b8f

net-mail/cyrus-imapd: build tests conditionally

Closes: https://bugs.gentoo.org/817002
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild
index 314a790e39a..3c1ae3f5e26 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild
@@ -114,7 +114,6 @@ src_configure() {
 	# - revisit --with-sphinx-build=no? (it's docs this time, not the search engine)
 	# - post-emerge message re lmdb removal?
 	econf \
-		--enable-unit-tests \
 		--enable-murder \
 		--enable-idled \
 		--enable-autocreate \
@@ -149,6 +148,7 @@ src_configure() {
 		$(use_enable static-libs static) \
 		$(use_with tcpd libwrap) \
 		$(use_enable xapian) \
+		$(use_enable test unit-tests) \
 		${myconf}
 }
 


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2021-10-08 18:49 Agostino Sarubbo
  0 siblings, 0 replies; 85+ messages in thread
From: Agostino Sarubbo @ 2021-10-08 18:49 UTC (permalink / raw
  To: gentoo-commits

commit:     3219aad8575fd4d53af8b30b18ec30874f51e15e
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  8 18:49:54 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Oct  8 18:49:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3219aad8

net-mail/cyrus-imapd: x86 stable wrt bug #816903

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild
index da61624ae09..cdbc51c6944 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sqlite ssl static-libs tcpd test xapian"


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2021-10-08 18:48 Agostino Sarubbo
  0 siblings, 0 replies; 85+ messages in thread
From: Agostino Sarubbo @ 2021-10-08 18:48 UTC (permalink / raw
  To: gentoo-commits

commit:     75ceccbc2476bc7de8f4f53e322299e6095799ef
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  8 18:48:42 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Oct  8 18:48:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75ceccbc

net-mail/cyrus-imapd: ppc stable wrt bug #816903

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild
index ad36bfb5cba..da61624ae09 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sqlite ssl static-libs tcpd test xapian"


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2021-10-08 18:48 Agostino Sarubbo
  0 siblings, 0 replies; 85+ messages in thread
From: Agostino Sarubbo @ 2021-10-08 18:48 UTC (permalink / raw
  To: gentoo-commits

commit:     625bea3947d8eb025eb270aed756e747f477d87a
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  8 18:47:57 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Oct  8 18:47:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=625bea39

net-mail/cyrus-imapd: amd64 stable wrt bug #816903

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild
index 65438fc551b..ad36bfb5cba 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sqlite ssl static-libs tcpd test xapian"


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2021-09-25 19:08 Sam James
  0 siblings, 0 replies; 85+ messages in thread
From: Sam James @ 2021-09-25 19:08 UTC (permalink / raw
  To: gentoo-commits

commit:     fa78bbc3993001ce709d6c920ba25549f95d104b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 25 19:01:00 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 25 19:08:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa78bbc3

net-mail/cyrus-imapd: add libjansson subslot dep

Earlier versions of libjansson lacked symbol versioning, causing crashes.

Bug: https://bugs.gentoo.org/812119
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{cyrus-imapd-3.0.13-r2.ebuild => cyrus-imapd-3.0.13-r3.ebuild}      | 2 +-
 .../{cyrus-imapd-3.0.14-r2.ebuild => cyrus-imapd-3.0.14-r3.ebuild}      | 2 +-
 .../{cyrus-imapd-3.0.15-r2.ebuild => cyrus-imapd-3.0.15-r3.ebuild}      | 2 +-
 .../{cyrus-imapd-3.0.16.ebuild => cyrus-imapd-3.0.16-r1.ebuild}         | 2 +-
 .../{cyrus-imapd-3.4.2.ebuild => cyrus-imapd-3.4.2-r1.ebuild}           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r2.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r3.ebuild
similarity index 99%
rename from net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r2.ebuild
rename to net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r3.ebuild
index b43bc8a9c6b..6b45c1d02cd 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r2.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r3.ebuild
@@ -20,7 +20,7 @@ CDEPEND="
 	sys-libs/zlib:0=
 	dev-libs/libpcre:3
 	>=dev-libs/cyrus-sasl-2.1.13:2
-	dev-libs/jansson
+	dev-libs/jansson:=
 	dev-libs/icu:0=
 	sys-fs/e2fsprogs
 	afs? ( net-fs/openafs )

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r2.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r3.ebuild
similarity index 99%
rename from net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r2.ebuild
rename to net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r3.ebuild
index 5bbfe2dcd57..1a96230a857 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r2.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r3.ebuild
@@ -20,7 +20,7 @@ CDEPEND="
 	sys-libs/zlib:0=
 	dev-libs/libpcre:3
 	>=dev-libs/cyrus-sasl-2.1.13:2
-	dev-libs/jansson
+	dev-libs/jansson:=
 	dev-libs/icu:0=
 	sys-fs/e2fsprogs
 	afs? ( net-fs/openafs )

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r2.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r3.ebuild
similarity index 99%
rename from net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r2.ebuild
rename to net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r3.ebuild
index c815c216b76..cdbc51c6944 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r2.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r3.ebuild
@@ -21,7 +21,7 @@ CDEPEND="
 	sys-libs/zlib:0=
 	dev-libs/libpcre:3
 	>=dev-libs/cyrus-sasl-2.1.13:2
-	dev-libs/jansson
+	dev-libs/jansson:=
 	dev-libs/icu:0=
 	sys-fs/e2fsprogs
 	afs? ( net-fs/openafs )

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.16.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild
similarity index 99%
rename from net-mail/cyrus-imapd/cyrus-imapd-3.0.16.ebuild
rename to net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild
index 7d03ce6b686..65438fc551b 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.16.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild
@@ -21,7 +21,7 @@ CDEPEND="
 	sys-libs/zlib:0=
 	dev-libs/libpcre:3
 	>=dev-libs/cyrus-sasl-2.1.13:2
-	dev-libs/jansson
+	dev-libs/jansson:=
 	dev-libs/icu:0=
 	sys-fs/e2fsprogs
 	afs? ( net-fs/openafs )

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.2.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild
similarity index 99%
rename from net-mail/cyrus-imapd/cyrus-imapd-3.4.2.ebuild
rename to net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild
index 9f3b5413327..314a790e39a 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.2.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild
@@ -21,7 +21,7 @@ CDEPEND="
 	sys-libs/zlib:0=
 	dev-libs/libpcre:3
 	>=dev-libs/cyrus-sasl-2.1.13:2
-	dev-libs/jansson
+	dev-libs/jansson:=
 	dev-libs/icu:0=
 	sys-fs/e2fsprogs
 	afs? ( net-fs/openafs )


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2021-09-16  1:18 Sam James
  0 siblings, 0 replies; 85+ messages in thread
From: Sam James @ 2021-09-16  1:18 UTC (permalink / raw
  To: gentoo-commits

commit:     2c2d15266be6c03cf2b8aefc669da2a50fd22129
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 16 01:15:10 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 16 01:17:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c2d1526

net-mail/cyrus-imapd: drop 3.4.1-r2

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/cyrus-imapd/Manifest                    |   1 -
 net-mail/cyrus-imapd/cyrus-imapd-3.4.1-r2.ebuild | 236 -----------------------
 2 files changed, 237 deletions(-)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 680623a04a7..983e8859fdc 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -2,5 +2,4 @@ DIST cyrus-imapd-3.0.13.tar.gz 10840005 BLAKE2B f4790837a198673b42d553bc7cbc8254
 DIST cyrus-imapd-3.0.14.tar.gz 10865880 BLAKE2B 36f3e60d715d2eab430040964e93cb332cfc4d9097f0f863b94325eb4eb964a4030d1d0f8ddb7870a08b655e1694bbc751d5aab99af6670ab33ad6747f55f6bd SHA512 0bade56f4f7834ef51efc4081f2915bf0f98a2a555cd1b847f13a34418e4c52f2abcb4018906c144c161241433a8ff9ddc6d88499804d3fe616a05f186a3f209
 DIST cyrus-imapd-3.0.15.tar.gz 10843341 BLAKE2B efe65c7afc7d63770adef9e4ea13b87e3b7fdd1847e4ada028175999b31ebb84f9d84b014018bd2be3fee9af1b5e81dd08f63225bc62dc5a4fd4a0791da16594 SHA512 2f65209095f086092fec0bfc9547c999a6e568cccc0a4164e7a3751fe2881f47bbbbd67ba9c9169feafead8c40d42f594d34171d911e4028425cfd8ba72d8f4a
 DIST cyrus-imapd-3.0.16.tar.gz 10875516 BLAKE2B 10915418b4de3f460a20d3808274f9ea83bdadc9a9edf2b383081605f7510a3e1563fa009e1dcc203f1c008f26e9db3ffd80f101f546de1dc8c3e714efc13596 SHA512 c17dd940102989d1e329ad8a1c08655bdd8b349ecb08e661f55ab8e602516ece1a86e52313e8cd5677048470f15f4272fcb598e4bbc61d27e5a673c01cb81ca3
-DIST cyrus-imapd-3.4.1.tar.gz 12539102 BLAKE2B f791d26f34a9a5e9896231ec812ae623bb3f5fc85a577ea25deea956bda153f941f2a759f77de10d105d0746827243efed773fe67eea4921200cb2cddf81e049 SHA512 9fd13e93755aca98215c1bd9c21fa3ef3a3db8b1ff48f71dd6070e614e9c68cb591b1cb411fa1319d46ab1d49ddc971f188a41cc0c9a2e2c9df0cc08299f8bfa
 DIST cyrus-imapd-3.4.2.tar.gz 12603768 BLAKE2B 515c36fc3d6a29991283d47a3e523d87a68c3191b4aae85074f40b2416fe3a89793f1991dc5729912a3d56247f6fbf4aed52abcadbc37ca7cc9bf857a8641871 SHA512 4d7d14e222bc1e97b2d8188804139c4c477de66cb621caba475b57533739ee59d88504d4f47735bb6a6b3c9097dbec382ecfa2c678f978791b9a6956a3cd91d6

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
deleted file mode 100644
index d56834f7f8f..00000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.1-r2.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic pam ssl-cert
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="https://www.cyrusimap.org/"
-SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="afs backup calalarm caps clamav http kerberos ldap \
-	mysql nntp pam perl postgres replication +server sieve \
-	sqlite ssl static-libs tcpd test xapian"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	sys-libs/zlib:0=
-	dev-libs/libpcre:3
-	>=dev-libs/cyrus-sasl-2.1.13:2
-	dev-libs/jansson
-	dev-libs/icu:0=
-	sys-fs/e2fsprogs
-	afs? ( net-fs/openafs )
-	calalarm? ( dev-libs/libical:0= )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	http? (
-		dev-libs/libxml2:2
-		dev-libs/libical:0=
-		net-libs/nghttp2
-	)
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-		>=net-mail/mailbase-1
-		sys-libs/pam
-	)
-	perl? ( dev-lang/perl:= )
-	postgres? ( dev-db/postgresql:* )
-	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] )
-	sqlite? ( dev-db/sqlite:3 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	xapian? ( >=dev-libs/xapian-1.4.0:0= )
-"
-DEPEND="${CDEPEND}
-	test? ( dev-util/cunit )
-"
-
-# all blockers really needed?
-# file collision with app-arch/dump - bug 619584
-RDEPEND="${CDEPEND}
-	acct-group/mail
-	acct-user/cyrus
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap
-	!app-arch/dump
-"
-
-REQUIRED_USE="
-	afs? ( kerberos )
-	backup? ( sqlite )
-	calalarm? ( http )
-	http? ( sqlite )
-"
-
-# https://bugs.gentoo.org/678754
-# TODO: check underlinking for other libraries
-#PATCHES=(
-#	"${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
-#)
-
-src_prepare() {
-	default
-
-	# Fix master(8)->cyrusmaster(8) manpage.
-	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -i -e 's:master\.8:cyrusmaster.8:g' \
-			-e 's:master(8):cyrusmaster(8):g' \
-			"${i}" || die "sed failed" || die "sed failed"
-	done
-	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
-	sed -i -e "s:MASTER:CYRUSMASTER:g" \
-		-e "s:Master:Cyrusmaster:g" \
-		-e "s:master:cyrusmaster:g" \
-		man/cyrusmaster.8 || die "sed failed"
-
-	# lock.h to afs/lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# https://bugs.gentoo.org/604466
-	append-ldflags $(no-as-needed)
-
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-
-	# TODO:
-	# - revisit --with-sphinx-build=no? (it's docs this time, not the search engine)
-	# - post-emerge message re lmdb removal?
-	# - fix sieve usage upstream to allow it to be conditional again?
-	# (remove package.use.force)
-	# (https://github.com/cyrusimap/cyrus-imapd/pull/3270)
-	econf \
-		--enable-unit-tests \
-		--enable-murder \
-		--enable-idled \
-		--enable-autocreate \
-		--enable-pcre \
-		--with-com_err \
-		--with-cyrus-user=cyrus \
-		--with-sasl \
-		--with-sphinx-build=no \
-		--without-krb \
-		--without-krbdes \
-		--enable-squat \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_enable backup) \
-		$(use_enable calalarm calalarmd) \
-		$(use_with caps libcap) \
-		$(use_with clamav) \
-		$(use_enable nntp) \
-		$(use_enable http) \
-		$(use_with http nghttp2) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with perl) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable server) \
-		$(use_enable sieve) \
-		$(use_enable static-libs static) \
-		$(use_with tcpd libwrap) \
-		$(use_enable xapian) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALLDIRS=vendor install
-
-	dodoc README*
-	dodoc -r doc
-
-	cp -r contrib tools "${ED}/usr/share/doc/${PF}" || die
-	rm -f doc/text/Makefile* || die
-
-	mv "${ED}"/usr/libexec/{master,cyrusmaster} || die
-
-	insinto /etc
-	newins "${ED}/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
-	newins "${ED}/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
-
-	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
-		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
-		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
-		"${ED}"/etc/imapd.conf || die
-
-	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
-		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
-		"${ED}"/etc/cyrus.conf || die
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${ED}/etc/cyrus.conf" || die
-	fi
-
-	# same thing for http(s) as well
-	if ! use http; then
-		sed -i -e "/http/s/^/#/" "${ED}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc8" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
-		keepdir "/var/${subdir}"
-		fowners cyrus:mail "/var/${subdir}"
-		fperms 0750 "/var/${subdir}"
-	done
-
-	for subdir in imap/{user,quota,sieve} spool/imap ; do
-		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
-			keepdir "/var/${subdir}/${i}"
-			fowners cyrus:mail "/var/${subdir}/${i}"
-			fperms 0750 "/var/${subdir}/${i}"
-		done
-	done
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} ; then
-		elog "For correct logging add the following to /etc/syslog.conf:"
-		elog "    local6.*         /var/log/imapd.log"
-		elog "    auth.debug       /var/log/auth.log"
-		echo
-
-		elog "You have to add user cyrus to the sasldb2. Do this with:"
-		elog "    saslpasswd2 cyrus"
-	fi
-}
-
-pkg_postinst() {
-	# do not install server.{key,pem) if they exist
-	if use ssl ; then
-		if [[ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]]; then
-			install_cert /etc/ssl/cyrus/server
-			chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem}
-		fi
-	fi
-
-	echo
-	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
-	einfo "for upgrade instructions."
-	echo
-}


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2021-09-16  1:18 Sam James
  0 siblings, 0 replies; 85+ messages in thread
From: Sam James @ 2021-09-16  1:18 UTC (permalink / raw
  To: gentoo-commits

commit:     8ab88c8d3cfc31a6c437eef0ec4321728fff65ef
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 16 01:14:45 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 16 01:17:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ab88c8d

net-mail/cyrus-imapd: add 3.0.16

Bug: https://bugs.gentoo.org/798111
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/cyrus-imapd/Manifest                  |   1 +
 net-mail/cyrus-imapd/cyrus-imapd-3.0.16.ebuild | 230 +++++++++++++++++++++++++
 2 files changed, 231 insertions(+)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 410cf54c853..b22ec598adf 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,4 +1,5 @@
 DIST cyrus-imapd-3.0.13.tar.gz 10840005 BLAKE2B f4790837a198673b42d553bc7cbc825456ff5a3d1d14ff382ca0f40252d09eb355f92c2020c0a974cc99eda9af4323a3a5b9428375288bf8892dfba35602da4e SHA512 5cd066916797efb975cdb97720f65edc72d3fe82afbd78a26aa8369d95ae4ca09c0593dd4bec5521156c64ea38af7a13065f3b35447a76267dec93feb0ac6ac6
 DIST cyrus-imapd-3.0.14.tar.gz 10865880 BLAKE2B 36f3e60d715d2eab430040964e93cb332cfc4d9097f0f863b94325eb4eb964a4030d1d0f8ddb7870a08b655e1694bbc751d5aab99af6670ab33ad6747f55f6bd SHA512 0bade56f4f7834ef51efc4081f2915bf0f98a2a555cd1b847f13a34418e4c52f2abcb4018906c144c161241433a8ff9ddc6d88499804d3fe616a05f186a3f209
 DIST cyrus-imapd-3.0.15.tar.gz 10843341 BLAKE2B efe65c7afc7d63770adef9e4ea13b87e3b7fdd1847e4ada028175999b31ebb84f9d84b014018bd2be3fee9af1b5e81dd08f63225bc62dc5a4fd4a0791da16594 SHA512 2f65209095f086092fec0bfc9547c999a6e568cccc0a4164e7a3751fe2881f47bbbbd67ba9c9169feafead8c40d42f594d34171d911e4028425cfd8ba72d8f4a
+DIST cyrus-imapd-3.0.16.tar.gz 10875516 BLAKE2B 10915418b4de3f460a20d3808274f9ea83bdadc9a9edf2b383081605f7510a3e1563fa009e1dcc203f1c008f26e9db3ffd80f101f546de1dc8c3e714efc13596 SHA512 c17dd940102989d1e329ad8a1c08655bdd8b349ecb08e661f55ab8e602516ece1a86e52313e8cd5677048470f15f4272fcb598e4bbc61d27e5a673c01cb81ca3
 DIST cyrus-imapd-3.4.1.tar.gz 12539102 BLAKE2B f791d26f34a9a5e9896231ec812ae623bb3f5fc85a577ea25deea956bda153f941f2a759f77de10d105d0746827243efed773fe67eea4921200cb2cddf81e049 SHA512 9fd13e93755aca98215c1bd9c21fa3ef3a3db8b1ff48f71dd6070e614e9c68cb591b1cb411fa1319d46ab1d49ddc971f188a41cc0c9a2e2c9df0cc08299f8bfa

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.16.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16.ebuild
new file mode 100644
index 00000000000..7d03ce6b686
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic pam ssl-cert
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="https://www.cyrusimap.org/"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
+	mysql nntp pam perl postgres replication +server sieve snmp \
+	sqlite ssl static-libs tcpd test xapian"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	sys-libs/zlib:0=
+	dev-libs/libpcre:3
+	>=dev-libs/cyrus-sasl-2.1.13:2
+	dev-libs/jansson
+	dev-libs/icu:0=
+	sys-fs/e2fsprogs
+	afs? ( net-fs/openafs )
+	calalarm? ( dev-libs/libical:0= )
+	caps? ( sys-libs/libcap )
+	clamav? ( app-antivirus/clamav )
+	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lmdb? ( dev-db/lmdb:0= )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+			sys-libs/pam
+			>=net-mail/mailbase-1
+		)
+	perl? ( dev-lang/perl:= )
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= )
+	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] )
+	sqlite? ( dev-db/sqlite:3 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6
+		snmp? ( net-analyzer/net-snmp:0=[tcpd=] )
+		)
+	xapian? ( >=dev-libs/xapian-1.4.0:0= )
+"
+DEPEND="${CDEPEND}
+	test? ( dev-util/cunit )
+"
+
+# all blockers really needed?
+# file collision with app-arch/dump - bug 619584
+RDEPEND="${CDEPEND}
+	acct-group/mail
+	acct-user/cyrus
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!app-arch/dump
+"
+
+REQUIRED_USE="
+	afs? ( kerberos )
+	backup? ( sqlite )
+	calalarm? ( http )
+	http? ( sqlite )
+"
+
+# https://bugs.gentoo.org/678754
+# TODO: check underlinking for other libraries
+PATCHES=(
+	"${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
+)
+
+src_prepare() {
+	default
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# https://bugs.gentoo.org/604466
+	append-ldflags $(no-as-needed)
+
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+
+	# sphinx is unmaintained and dead, bug #662944
+	econf \
+		--enable-unit-tests \
+		--enable-murder \
+		--enable-idled \
+		--enable-event-notification \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-com_err \
+		--with-cyrus-user=cyrus \
+		--with-sasl \
+		--without-krb \
+		--without-krbdes \
+		--disable-sphinx \
+		--enable-squat \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_enable backup) \
+		$(use_enable calalarm calalarmd) \
+		$(use_with caps libcap) \
+		$(use_with clamav) \
+		$(use_enable nntp) \
+		$(use_enable http) \
+		$(use_with http nghttp2) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with lmdb) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_with snmp) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		$(use_enable xapian) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dodoc -r doc
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	rm -f doc/text/Makefile*
+
+	mv "${D}"/usr/libexec/{master,cyrusmaster} || die
+
+	insinto /etc
+	newins "${D}/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
+	newins "${D}/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
+
+	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
+		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
+		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
+		"${D}"/etc/imapd.conf
+
+	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
+		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
+		"${D}"/etc/cyrus.conf
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+	# same thing for http(s) as well
+	if ! use http; then
+		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	newinitd "${FILESDIR}/cyrus.rc8" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		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
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist
+	if use ssl ; then
+		if [ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+
+	echo
+	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "for upgrade instructions."
+	echo
+}


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2021-09-13 20:30 David Seifert
  0 siblings, 0 replies; 85+ messages in thread
From: David Seifert @ 2021-09-13 20:30 UTC (permalink / raw
  To: gentoo-commits

commit:     fc956aee188f00dec1fc117e0574f4651193481e
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 13 20:30:17 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Sep 13 20:30:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc956aee

net-mail/cyrus-imapd: e2fsprogs-libs → e2fsprogs

Bug: https://bugs.gentoo.org/806875
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../{cyrus-imapd-3.0.13-r1.ebuild => cyrus-imapd-3.0.13-r2.ebuild}      | 2 +-
 .../{cyrus-imapd-3.0.14-r1.ebuild => cyrus-imapd-3.0.14-r2.ebuild}      | 2 +-
 .../{cyrus-imapd-3.0.15-r1.ebuild => cyrus-imapd-3.0.15-r2.ebuild}      | 2 +-
 .../{cyrus-imapd-3.4.1-r1.ebuild => cyrus-imapd-3.4.1-r2.ebuild}        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r2.ebuild
similarity index 99%
rename from net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r1.ebuild
rename to net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r2.ebuild
index 0b1c4623c1d..b43bc8a9c6b 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r2.ebuild
@@ -22,7 +22,7 @@ CDEPEND="
 	>=dev-libs/cyrus-sasl-2.1.13:2
 	dev-libs/jansson
 	dev-libs/icu:0=
-	sys-libs/e2fsprogs-libs
+	sys-fs/e2fsprogs
 	afs? ( net-fs/openafs )
 	calalarm? ( dev-libs/libical:0= )
 	caps? ( sys-libs/libcap )

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r2.ebuild
similarity index 99%
rename from net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r1.ebuild
rename to net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r2.ebuild
index 3affaab2f21..5bbfe2dcd57 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r2.ebuild
@@ -22,7 +22,7 @@ CDEPEND="
 	>=dev-libs/cyrus-sasl-2.1.13:2
 	dev-libs/jansson
 	dev-libs/icu:0=
-	sys-libs/e2fsprogs-libs
+	sys-fs/e2fsprogs
 	afs? ( net-fs/openafs )
 	calalarm? ( dev-libs/libical:0= )
 	caps? ( sys-libs/libcap )

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r2.ebuild
similarity index 99%
rename from net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r1.ebuild
rename to net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r2.ebuild
index 0c07e5648b5..c815c216b76 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r2.ebuild
@@ -23,7 +23,7 @@ CDEPEND="
 	>=dev-libs/cyrus-sasl-2.1.13:2
 	dev-libs/jansson
 	dev-libs/icu:0=
-	sys-libs/e2fsprogs-libs
+	sys-fs/e2fsprogs
 	afs? ( net-fs/openafs )
 	calalarm? ( dev-libs/libical:0= )
 	caps? ( sys-libs/libcap )

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.1-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.1-r2.ebuild
similarity index 99%
rename from net-mail/cyrus-imapd/cyrus-imapd-3.4.1-r1.ebuild
rename to net-mail/cyrus-imapd/cyrus-imapd-3.4.1-r2.ebuild
index d3b05eeba46..d56834f7f8f 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.1-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.1-r2.ebuild
@@ -23,7 +23,7 @@ CDEPEND="
 	>=dev-libs/cyrus-sasl-2.1.13:2
 	dev-libs/jansson
 	dev-libs/icu:0=
-	sys-libs/e2fsprogs-libs
+	sys-fs/e2fsprogs
 	afs? ( net-fs/openafs )
 	calalarm? ( dev-libs/libical:0= )
 	caps? ( sys-libs/libcap )


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2021-06-17 22:18 Thomas Deutschmann
  0 siblings, 0 replies; 85+ messages in thread
From: Thomas Deutschmann @ 2021-06-17 22:18 UTC (permalink / raw
  To: gentoo-commits

commit:     eb8cb69d11e668020038d84ef76106654fcbf3e3
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 17 21:56:52 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jun 17 22:18:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb8cb69d

net-mail/cyrus-imapd: rev bump for commit 2818eaa8d

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 .../{cyrus-imapd-3.0.13.ebuild => cyrus-imapd-3.0.13-r1.ebuild}           | 0
 .../{cyrus-imapd-3.0.14.ebuild => cyrus-imapd-3.0.14-r1.ebuild}           | 0
 .../{cyrus-imapd-3.0.15.ebuild => cyrus-imapd-3.0.15-r1.ebuild}           | 0
 .../cyrus-imapd/{cyrus-imapd-3.4.1.ebuild => cyrus-imapd-3.4.1-r1.ebuild} | 0
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r1.ebuild
similarity index 100%
rename from net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild
rename to net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r1.ebuild

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r1.ebuild
similarity index 100%
rename from net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild
rename to net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r1.ebuild

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r1.ebuild
similarity index 100%
rename from net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild
rename to net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r1.ebuild

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.1-r1.ebuild
similarity index 100%
rename from net-mail/cyrus-imapd/cyrus-imapd-3.4.1.ebuild
rename to net-mail/cyrus-imapd/cyrus-imapd-3.4.1-r1.ebuild


^ permalink raw reply	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2021-06-17 20:32 Thomas Deutschmann
  0 siblings, 0 replies; 85+ messages in thread
From: Thomas Deutschmann @ 2021-06-17 20:32 UTC (permalink / raw
  To: gentoo-commits

commit:     2818eaa8d0f8d9f4242dd36f3375185f616c7cd2
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 17 20:03:25 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jun 17 20:31:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2818eaa8

net-mail/cyrus-imapd: Fix MissingUseDepDefault for dev-libs/openssl[bindist]

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild | 4 ++--
 net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild | 4 ++--
 net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild | 2 +-
 net-mail/cyrus-imapd/cyrus-imapd-3.4.1.ebuild  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild
index ecad086e12b..0b1c4623c1d 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,7 +40,7 @@ CDEPEND="
 	perl? ( dev-lang/perl:= )
 	postgres? ( dev-db/postgresql:* )
 	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= )
-	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist] )
+	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] )
 	sqlite? ( dev-db/sqlite:3 )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6
 		snmp? ( net-analyzer/net-snmp:0=[tcpd=] )

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild
index fb212858546..3affaab2f21 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,7 +40,7 @@ CDEPEND="
 	perl? ( dev-lang/perl:= )
 	postgres? ( dev-db/postgresql:* )
 	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= )
-	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist] )
+	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] )
 	sqlite? ( dev-db/sqlite:3 )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6
 		snmp? ( net-analyzer/net-snmp:0=[tcpd=] )

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild
index fa548a22b7f..0c07e5648b5 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild
@@ -41,7 +41,7 @@ CDEPEND="
 	perl? ( dev-lang/perl:= )
 	postgres? ( dev-db/postgresql:* )
 	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= )
-	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist] )
+	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] )
 	sqlite? ( dev-db/sqlite:3 )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6
 		snmp? ( net-analyzer/net-snmp:0=[tcpd=] )

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.1.ebuild
index d0c9a1d5d28..d3b05eeba46 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.1.ebuild
@@ -43,7 +43,7 @@ CDEPEND="
 	)
 	perl? ( dev-lang/perl:= )
 	postgres? ( dev-db/postgresql:* )
-	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist] )
+	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] )
 	sqlite? ( dev-db/sqlite:3 )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 	xapian? ( >=dev-libs/xapian-1.4.0:0= )


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2021-06-13  6:32 Agostino Sarubbo
  0 siblings, 0 replies; 85+ messages in thread
From: Agostino Sarubbo @ 2021-06-13  6:32 UTC (permalink / raw
  To: gentoo-commits

commit:     ceb23a0fec34cc9490e4a398f8b3f0a4c491d0ef
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 13 06:31:56 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Jun 13 06:31:56 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ceb23a0f

net-mail/cyrus-imapd: x86 stable wrt bug #795306

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild
index d85cc0e5e60..fa548a22b7f 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sqlite ssl static-libs tcpd test xapian"


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2021-06-13  6:28 Agostino Sarubbo
  0 siblings, 0 replies; 85+ messages in thread
From: Agostino Sarubbo @ 2021-06-13  6:28 UTC (permalink / raw
  To: gentoo-commits

commit:     e7403c651bef09917fb3b044af255ecb0e2d0beb
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 13 06:27:30 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Jun 13 06:27:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7403c65

net-mail/cyrus-imapd: amd64 stable wrt bug #795306

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild
index ef3f6c846e9..d85cc0e5e60 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sqlite ssl static-libs tcpd test xapian"


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2021-06-13  3:45 Sam James
  0 siblings, 0 replies; 85+ messages in thread
From: Sam James @ 2021-06-13  3:45 UTC (permalink / raw
  To: gentoo-commits

commit:     036a0052d653017737401bd3016d596f524ee1a2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 13 03:44:45 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 13 03:44:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=036a0052

net-mail/cyrus-imapd: Stabilize 3.0.15 ppc, #795306

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild
index aa2bb2f6608..ef3f6c846e9 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sqlite ssl static-libs tcpd test xapian"


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2021-05-10  9:28 Sam James
  0 siblings, 0 replies; 85+ messages in thread
From: Sam James @ 2021-05-10  9:28 UTC (permalink / raw
  To: gentoo-commits

commit:     bccff51c278212c7e7a92ed17f71dc5d503d768e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 10 09:27:57 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 10 09:27:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bccff51c

net-mail/cyrus-imapd: tidy up ebuild for 3.4.1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/cyrus-imapd/cyrus-imapd-3.4.1.ebuild | 33 +++++++++++++++------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.1.ebuild
index d6d5a4de007..d0c9a1d5d28 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.1.ebuild
@@ -28,15 +28,19 @@ CDEPEND="
 	calalarm? ( dev-libs/libical:0= )
 	caps? ( sys-libs/libcap )
 	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 )
+	http? (
+		dev-libs/libxml2:2
+		dev-libs/libical:0=
+		net-libs/nghttp2
+	)
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	nntp? ( !net-nntp/leafnode )
 	pam? (
-			sys-libs/pam
-			>=net-mail/mailbase-1
-		)
+		>=net-mail/mailbase-1
+		sys-libs/pam
+	)
 	perl? ( dev-lang/perl:= )
 	postgres? ( dev-db/postgresql:* )
 	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist] )
@@ -156,32 +160,33 @@ src_install() {
 
 	dodoc README*
 	dodoc -r doc
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	rm -f doc/text/Makefile*
 
-	mv "${D}"/usr/libexec/{master,cyrusmaster} || die
+	cp -r contrib tools "${ED}/usr/share/doc/${PF}" || die
+	rm -f doc/text/Makefile* || die
+
+	mv "${ED}"/usr/libexec/{master,cyrusmaster} || die
 
 	insinto /etc
-	newins "${D}/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
-	newins "${D}/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
+	newins "${ED}/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
+	newins "${ED}/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
 
 	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
 		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
 		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
-		"${D}"/etc/imapd.conf
+		"${ED}"/etc/imapd.conf || die
 
 	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
 		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
-		"${D}"/etc/cyrus.conf
+		"${ED}"/etc/cyrus.conf || die
 
 	# turn off sieve if not installed
 	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+		sed -i -e "/sieve/s/^/#/" "${ED}/etc/cyrus.conf" || die
 	fi
 
 	# same thing for http(s) as well
 	if ! use http; then
-		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
+		sed -i -e "/http/s/^/#/" "${ED}/etc/cyrus.conf" || die
 	fi
 
 	newinitd "${FILESDIR}/cyrus.rc8" cyrus
@@ -218,7 +223,7 @@ pkg_preinst() {
 pkg_postinst() {
 	# do not install server.{key,pem) if they exist
 	if use ssl ; then
-		if [ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]; then
+		if [[ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]]; then
 			install_cert /etc/ssl/cyrus/server
 			chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem}
 		fi


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2021-05-10  9:22 Sam James
  0 siblings, 0 replies; 85+ messages in thread
From: Sam James @ 2021-05-10  9:22 UTC (permalink / raw
  To: gentoo-commits

commit:     fbf5d5b3508406960e29a915c44ef367bd66336a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 10 09:21:06 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 10 09:21:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbf5d5b3

net-mail/cyrus-imapd: drop 3.4.0

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/cyrus-imapd/Manifest                 |   1 -
 net-mail/cyrus-imapd/cyrus-imapd-3.4.0.ebuild | 232 --------------------------
 2 files changed, 233 deletions(-)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index a1c42e3723f..410cf54c853 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,5 +1,4 @@
 DIST cyrus-imapd-3.0.13.tar.gz 10840005 BLAKE2B f4790837a198673b42d553bc7cbc825456ff5a3d1d14ff382ca0f40252d09eb355f92c2020c0a974cc99eda9af4323a3a5b9428375288bf8892dfba35602da4e SHA512 5cd066916797efb975cdb97720f65edc72d3fe82afbd78a26aa8369d95ae4ca09c0593dd4bec5521156c64ea38af7a13065f3b35447a76267dec93feb0ac6ac6
 DIST cyrus-imapd-3.0.14.tar.gz 10865880 BLAKE2B 36f3e60d715d2eab430040964e93cb332cfc4d9097f0f863b94325eb4eb964a4030d1d0f8ddb7870a08b655e1694bbc751d5aab99af6670ab33ad6747f55f6bd SHA512 0bade56f4f7834ef51efc4081f2915bf0f98a2a555cd1b847f13a34418e4c52f2abcb4018906c144c161241433a8ff9ddc6d88499804d3fe616a05f186a3f209
 DIST cyrus-imapd-3.0.15.tar.gz 10843341 BLAKE2B efe65c7afc7d63770adef9e4ea13b87e3b7fdd1847e4ada028175999b31ebb84f9d84b014018bd2be3fee9af1b5e81dd08f63225bc62dc5a4fd4a0791da16594 SHA512 2f65209095f086092fec0bfc9547c999a6e568cccc0a4164e7a3751fe2881f47bbbbd67ba9c9169feafead8c40d42f594d34171d911e4028425cfd8ba72d8f4a
-DIST cyrus-imapd-3.4.0.tar.gz 12514849 BLAKE2B 319a2c69bb293c55340e9ac87258799458fc216f39b949fefc01178ac6c8a06962a9b02dfd143fb1d7715b789b4b9401f85b55f30abfcae06b815a87def2b017 SHA512 1dc6c721d8d59f403895dc772dabaa38a1c8dce2c433674e6d34b7ab9e51ab1a3e0fa584db883a9e9c76bbaf28c2c2c63d90453e614d8c2aab870dbaf3148741
 DIST cyrus-imapd-3.4.1.tar.gz 12539102 BLAKE2B f791d26f34a9a5e9896231ec812ae623bb3f5fc85a577ea25deea956bda153f941f2a759f77de10d105d0746827243efed773fe67eea4921200cb2cddf81e049 SHA512 9fd13e93755aca98215c1bd9c21fa3ef3a3db8b1ff48f71dd6070e614e9c68cb591b1cb411fa1319d46ab1d49ddc971f188a41cc0c9a2e2c9df0cc08299f8bfa

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.0.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.0.ebuild
deleted file mode 100644
index e5c77cc1573..00000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.0.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic pam ssl-cert
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="https://www.cyrusimap.org/"
-SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="afs backup calalarm caps clamav http kerberos ldap \
-	mysql nntp pam perl postgres replication +server sieve \
-	sqlite ssl static-libs tcpd test xapian"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	sys-libs/zlib:0=
-	dev-libs/libpcre:3
-	>=dev-libs/cyrus-sasl-2.1.13:2
-	dev-libs/jansson
-	dev-libs/icu:0=
-	sys-libs/e2fsprogs-libs
-	afs? ( net-fs/openafs )
-	calalarm? ( dev-libs/libical:0= )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-			sys-libs/pam
-			>=net-mail/mailbase-1
-		)
-	perl? ( dev-lang/perl:= )
-	postgres? ( dev-db/postgresql:* )
-	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist] )
-	sqlite? ( dev-db/sqlite:3 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	xapian? ( >=dev-libs/xapian-1.4.0:0= )
-"
-DEPEND="${CDEPEND}
-	test? ( dev-util/cunit )
-"
-
-# all blockers really needed?
-# file collision with app-arch/dump - bug 619584
-RDEPEND="${CDEPEND}
-	acct-group/mail
-	acct-user/cyrus
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap
-	!app-arch/dump
-"
-
-REQUIRED_USE="
-	afs? ( kerberos )
-	backup? ( sqlite )
-	calalarm? ( http )
-	http? ( sqlite )
-"
-
-# https://bugs.gentoo.org/678754
-# TODO: check underlinking for other libraries
-#PATCHES=(
-#	"${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
-#)
-
-src_prepare() {
-	default
-
-	# Fix master(8)->cyrusmaster(8) manpage.
-	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -i -e 's:master\.8:cyrusmaster.8:g' \
-			-e 's:master(8):cyrusmaster(8):g' \
-			"${i}" || die "sed failed" || die "sed failed"
-	done
-	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
-	sed -i -e "s:MASTER:CYRUSMASTER:g" \
-		-e "s:Master:Cyrusmaster:g" \
-		-e "s:master:cyrusmaster:g" \
-		man/cyrusmaster.8 || die "sed failed"
-
-	# lock.h to afs/lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# https://bugs.gentoo.org/604466
-	append-ldflags $(no-as-needed)
-
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-
-	# TODO:
-	# - revisit --with-sphinx-build=no? (it's docs this time, not the search engine)
-	# - post-emerge message re lmdb removal?
-	# - fix sieve usage upstream to allow it to be conditional again?
-	# (remove package.use.force)
-	# (https://github.com/cyrusimap/cyrus-imapd/pull/3270)
-	econf \
-		--enable-unit-tests \
-		--enable-murder \
-		--enable-idled \
-		--enable-event-notification \
-		--enable-autocreate \
-		--enable-pcre \
-		--with-com_err \
-		--with-cyrus-user=cyrus \
-		--with-sasl \
-		--with-sphinx-build=no \
-		--without-krb \
-		--without-krbdes \
-		--enable-squat \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_enable backup) \
-		$(use_enable calalarm calalarmd) \
-		$(use_with caps libcap) \
-		$(use_with clamav) \
-		$(use_enable nntp) \
-		$(use_enable http) \
-		$(use_with http nghttp2) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with perl) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable server) \
-		$(use_enable sieve) \
-		$(use_enable static-libs static) \
-		$(use_with tcpd libwrap) \
-		$(use_enable xapian) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALLDIRS=vendor install
-
-	dodoc README*
-	dodoc -r doc
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	rm -f doc/text/Makefile*
-
-	mv "${D}"/usr/libexec/{master,cyrusmaster} || die
-
-	insinto /etc
-	newins "${D}/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
-	newins "${D}/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
-
-	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
-		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
-		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
-		"${D}"/etc/imapd.conf
-
-	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
-		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
-		"${D}"/etc/cyrus.conf
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	# same thing for http(s) as well
-	if ! use http; then
-		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc8" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
-		keepdir "/var/${subdir}"
-		fowners cyrus:mail "/var/${subdir}"
-		fperms 0750 "/var/${subdir}"
-	done
-
-	for subdir in imap/{user,quota,sieve} spool/imap ; do
-		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
-			keepdir "/var/${subdir}/${i}"
-			fowners cyrus:mail "/var/${subdir}/${i}"
-			fperms 0750 "/var/${subdir}/${i}"
-		done
-	done
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} ; then
-		elog "For correct logging add the following to /etc/syslog.conf:"
-		elog "    local6.*         /var/log/imapd.log"
-		elog "    auth.debug       /var/log/auth.log"
-		echo
-
-		elog "You have to add user cyrus to the sasldb2. Do this with:"
-		elog "    saslpasswd2 cyrus"
-	fi
-}
-
-pkg_postinst() {
-	# do not install server.{key,pem) if they exist
-	if use ssl ; then
-		if [ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]; then
-			install_cert /etc/ssl/cyrus/server
-			chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem}
-		fi
-	fi
-
-	echo
-	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
-	einfo "for upgrade instructions."
-	echo
-}


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2021-05-10  9:22 Sam James
  0 siblings, 0 replies; 85+ messages in thread
From: Sam James @ 2021-05-10  9:22 UTC (permalink / raw
  To: gentoo-commits

commit:     5e998f15e1bfafcc31554cf91280d6b58f5eb8fd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 10 09:20:54 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 10 09:20:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e998f15

net-mail/cyrus-imapd: add 3.4.1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/cyrus-imapd/Manifest                 |   1 +
 net-mail/cyrus-imapd/cyrus-imapd-3.4.1.ebuild | 231 ++++++++++++++++++++++++++
 2 files changed, 232 insertions(+)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 6511617dee1..a1c42e3723f 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -2,3 +2,4 @@ DIST cyrus-imapd-3.0.13.tar.gz 10840005 BLAKE2B f4790837a198673b42d553bc7cbc8254
 DIST cyrus-imapd-3.0.14.tar.gz 10865880 BLAKE2B 36f3e60d715d2eab430040964e93cb332cfc4d9097f0f863b94325eb4eb964a4030d1d0f8ddb7870a08b655e1694bbc751d5aab99af6670ab33ad6747f55f6bd SHA512 0bade56f4f7834ef51efc4081f2915bf0f98a2a555cd1b847f13a34418e4c52f2abcb4018906c144c161241433a8ff9ddc6d88499804d3fe616a05f186a3f209
 DIST cyrus-imapd-3.0.15.tar.gz 10843341 BLAKE2B efe65c7afc7d63770adef9e4ea13b87e3b7fdd1847e4ada028175999b31ebb84f9d84b014018bd2be3fee9af1b5e81dd08f63225bc62dc5a4fd4a0791da16594 SHA512 2f65209095f086092fec0bfc9547c999a6e568cccc0a4164e7a3751fe2881f47bbbbd67ba9c9169feafead8c40d42f594d34171d911e4028425cfd8ba72d8f4a
 DIST cyrus-imapd-3.4.0.tar.gz 12514849 BLAKE2B 319a2c69bb293c55340e9ac87258799458fc216f39b949fefc01178ac6c8a06962a9b02dfd143fb1d7715b789b4b9401f85b55f30abfcae06b815a87def2b017 SHA512 1dc6c721d8d59f403895dc772dabaa38a1c8dce2c433674e6d34b7ab9e51ab1a3e0fa584db883a9e9c76bbaf28c2c2c63d90453e614d8c2aab870dbaf3148741
+DIST cyrus-imapd-3.4.1.tar.gz 12539102 BLAKE2B f791d26f34a9a5e9896231ec812ae623bb3f5fc85a577ea25deea956bda153f941f2a759f77de10d105d0746827243efed773fe67eea4921200cb2cddf81e049 SHA512 9fd13e93755aca98215c1bd9c21fa3ef3a3db8b1ff48f71dd6070e614e9c68cb591b1cb411fa1319d46ab1d49ddc971f188a41cc0c9a2e2c9df0cc08299f8bfa

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.1.ebuild
new file mode 100644
index 00000000000..d6d5a4de007
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.1.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic pam ssl-cert
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="https://www.cyrusimap.org/"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs backup calalarm caps clamav http kerberos ldap \
+	mysql nntp pam perl postgres replication +server sieve \
+	sqlite ssl static-libs tcpd test xapian"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	sys-libs/zlib:0=
+	dev-libs/libpcre:3
+	>=dev-libs/cyrus-sasl-2.1.13:2
+	dev-libs/jansson
+	dev-libs/icu:0=
+	sys-libs/e2fsprogs-libs
+	afs? ( net-fs/openafs )
+	calalarm? ( dev-libs/libical:0= )
+	caps? ( sys-libs/libcap )
+	clamav? ( app-antivirus/clamav )
+	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+			sys-libs/pam
+			>=net-mail/mailbase-1
+		)
+	perl? ( dev-lang/perl:= )
+	postgres? ( dev-db/postgresql:* )
+	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist] )
+	sqlite? ( dev-db/sqlite:3 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	xapian? ( >=dev-libs/xapian-1.4.0:0= )
+"
+DEPEND="${CDEPEND}
+	test? ( dev-util/cunit )
+"
+
+# all blockers really needed?
+# file collision with app-arch/dump - bug 619584
+RDEPEND="${CDEPEND}
+	acct-group/mail
+	acct-user/cyrus
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!app-arch/dump
+"
+
+REQUIRED_USE="
+	afs? ( kerberos )
+	backup? ( sqlite )
+	calalarm? ( http )
+	http? ( sqlite )
+"
+
+# https://bugs.gentoo.org/678754
+# TODO: check underlinking for other libraries
+#PATCHES=(
+#	"${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
+#)
+
+src_prepare() {
+	default
+
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# https://bugs.gentoo.org/604466
+	append-ldflags $(no-as-needed)
+
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+
+	# TODO:
+	# - revisit --with-sphinx-build=no? (it's docs this time, not the search engine)
+	# - post-emerge message re lmdb removal?
+	# - fix sieve usage upstream to allow it to be conditional again?
+	# (remove package.use.force)
+	# (https://github.com/cyrusimap/cyrus-imapd/pull/3270)
+	econf \
+		--enable-unit-tests \
+		--enable-murder \
+		--enable-idled \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-com_err \
+		--with-cyrus-user=cyrus \
+		--with-sasl \
+		--with-sphinx-build=no \
+		--without-krb \
+		--without-krbdes \
+		--enable-squat \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_enable backup) \
+		$(use_enable calalarm calalarmd) \
+		$(use_with caps libcap) \
+		$(use_with clamav) \
+		$(use_enable nntp) \
+		$(use_enable http) \
+		$(use_with http nghttp2) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		$(use_enable xapian) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dodoc -r doc
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	rm -f doc/text/Makefile*
+
+	mv "${D}"/usr/libexec/{master,cyrusmaster} || die
+
+	insinto /etc
+	newins "${D}/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
+	newins "${D}/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
+
+	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
+		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
+		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
+		"${D}"/etc/imapd.conf
+
+	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
+		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
+		"${D}"/etc/cyrus.conf
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	# same thing for http(s) as well
+	if ! use http; then
+		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	newinitd "${FILESDIR}/cyrus.rc8" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		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
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist
+	if use ssl ; then
+		if [ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+
+	echo
+	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "for upgrade instructions."
+	echo
+}


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2021-05-07 14:38 Sam James
  0 siblings, 0 replies; 85+ messages in thread
From: Sam James @ 2021-05-07 14:38 UTC (permalink / raw
  To: gentoo-commits

commit:     33f62c77eb8f4c280cf80a1e8cc8f8815055b2e4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May  7 13:58:25 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May  7 14:38:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33f62c77

net-mail/cyrus-imapd: move append-ldflags from pkg_setup->src_configure

Has no place on non-source builds.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild | 13 +++++++------
 net-mail/cyrus-imapd/cyrus-imapd-3.4.0.ebuild  |  8 +++-----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild
index 621e5456a13..aa2bb2f6608 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools flag-o-matic pam ssl-cert
 
 DESCRIPTION="The Cyrus IMAP Server"
@@ -74,12 +75,7 @@ REQUIRED_USE="
 # TODO: check underlinking for other libraries
 PATCHES=(
 	"${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
-	)
-
-pkg_setup() {
-	# https://bugs.gentoo.org/604466
-	append-ldflags $(no-as-needed)
-}
+)
 
 src_prepare() {
 	default
@@ -104,10 +100,15 @@ src_prepare() {
 
 src_configure() {
 	local myconf
+
+	# https://bugs.gentoo.org/604466
+	append-ldflags $(no-as-needed)
+
 	if use afs ; then
 		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
 		myconf+=" --with-afs-incdir=/usr/include/afs"
 	fi
+
 	# sphinx is unmaintained and dead, bug #662944
 	econf \
 		--enable-unit-tests \

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.0.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.0.ebuild
index 3a9516d6cca..e5c77cc1573 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.0.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.0.ebuild
@@ -73,11 +73,6 @@ REQUIRED_USE="
 #	"${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
 #)
 
-pkg_setup() {
-	# https://bugs.gentoo.org/604466
-	append-ldflags $(no-as-needed)
-}
-
 src_prepare() {
 	default
 
@@ -103,6 +98,9 @@ src_prepare() {
 src_configure() {
 	local myconf
 
+	# https://bugs.gentoo.org/604466
+	append-ldflags $(no-as-needed)
+
 	if use afs ; then
 		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
 		myconf+=" --with-afs-incdir=/usr/include/afs"


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2021-05-06 23:26 Sam James
  0 siblings, 0 replies; 85+ messages in thread
From: Sam James @ 2021-05-06 23:26 UTC (permalink / raw
  To: gentoo-commits

commit:     f2b08a02bdc724992071e52b60e356ee9fcd0759
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May  6 22:44:21 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May  6 23:26:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2b08a02

net-mail/cyrus-imapd: add 3.0.15

Bug: https://bugs.gentoo.org/738280
Bug: https://bugs.gentoo.org/740188
Bug: https://bugs.gentoo.org/738278
Bug: https://bugs.gentoo.org/738276
Bug: https://bugs.gentoo.org/356341
Bug: https://bugs.gentoo.org/688242
Bug: https://bugs.gentoo.org/721466
Bug: https://bugs.gentoo.org/662896
Bug: https://bugs.gentoo.org/687864
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/cyrus-imapd/Manifest                  |   1 +
 net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild | 229 +++++++++++++++++++++++++
 2 files changed, 230 insertions(+)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 28db78e6cf6..9024ddcaa10 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,2 +1,3 @@
 DIST cyrus-imapd-3.0.13.tar.gz 10840005 BLAKE2B f4790837a198673b42d553bc7cbc825456ff5a3d1d14ff382ca0f40252d09eb355f92c2020c0a974cc99eda9af4323a3a5b9428375288bf8892dfba35602da4e SHA512 5cd066916797efb975cdb97720f65edc72d3fe82afbd78a26aa8369d95ae4ca09c0593dd4bec5521156c64ea38af7a13065f3b35447a76267dec93feb0ac6ac6
 DIST cyrus-imapd-3.0.14.tar.gz 10865880 BLAKE2B 36f3e60d715d2eab430040964e93cb332cfc4d9097f0f863b94325eb4eb964a4030d1d0f8ddb7870a08b655e1694bbc751d5aab99af6670ab33ad6747f55f6bd SHA512 0bade56f4f7834ef51efc4081f2915bf0f98a2a555cd1b847f13a34418e4c52f2abcb4018906c144c161241433a8ff9ddc6d88499804d3fe616a05f186a3f209
+DIST cyrus-imapd-3.0.15.tar.gz 10843341 BLAKE2B efe65c7afc7d63770adef9e4ea13b87e3b7fdd1847e4ada028175999b31ebb84f9d84b014018bd2be3fee9af1b5e81dd08f63225bc62dc5a4fd4a0791da16594 SHA512 2f65209095f086092fec0bfc9547c999a6e568cccc0a4164e7a3751fe2881f47bbbbd67ba9c9169feafead8c40d42f594d34171d911e4028425cfd8ba72d8f4a

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild
new file mode 100644
index 00000000000..621e5456a13
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic pam ssl-cert
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="https://www.cyrusimap.org/"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
+	mysql nntp pam perl postgres replication +server sieve snmp \
+	sqlite ssl static-libs tcpd test xapian"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	sys-libs/zlib:0=
+	dev-libs/libpcre:3
+	>=dev-libs/cyrus-sasl-2.1.13:2
+	dev-libs/jansson
+	dev-libs/icu:0=
+	sys-libs/e2fsprogs-libs
+	afs? ( net-fs/openafs )
+	calalarm? ( dev-libs/libical:0= )
+	caps? ( sys-libs/libcap )
+	clamav? ( app-antivirus/clamav )
+	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lmdb? ( dev-db/lmdb:0= )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+			sys-libs/pam
+			>=net-mail/mailbase-1
+		)
+	perl? ( dev-lang/perl:= )
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= )
+	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist] )
+	sqlite? ( dev-db/sqlite:3 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6
+		snmp? ( net-analyzer/net-snmp:0=[tcpd=] )
+		)
+	xapian? ( >=dev-libs/xapian-1.4.0:0= )
+"
+DEPEND="${CDEPEND}
+	test? ( dev-util/cunit )
+"
+
+# all blockers really needed?
+# file collision with app-arch/dump - bug 619584
+RDEPEND="${CDEPEND}
+	acct-group/mail
+	acct-user/cyrus
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!app-arch/dump
+"
+
+REQUIRED_USE="
+	afs? ( kerberos )
+	backup? ( sqlite )
+	calalarm? ( http )
+	http? ( sqlite )
+"
+
+# https://bugs.gentoo.org/678754
+# TODO: check underlinking for other libraries
+PATCHES=(
+	"${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
+	)
+
+pkg_setup() {
+	# https://bugs.gentoo.org/604466
+	append-ldflags $(no-as-needed)
+}
+
+src_prepare() {
+	default
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+	# sphinx is unmaintained and dead, bug #662944
+	econf \
+		--enable-unit-tests \
+		--enable-murder \
+		--enable-idled \
+		--enable-event-notification \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-com_err \
+		--with-cyrus-user=cyrus \
+		--with-sasl \
+		--without-krb \
+		--without-krbdes \
+		--disable-sphinx \
+		--enable-squat \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_enable backup) \
+		$(use_enable calalarm calalarmd) \
+		$(use_with caps libcap) \
+		$(use_with clamav) \
+		$(use_enable nntp) \
+		$(use_enable http) \
+		$(use_with http nghttp2) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with lmdb) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_with snmp) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		$(use_enable xapian) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dodoc -r doc
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	rm -f doc/text/Makefile*
+
+	mv "${D}"/usr/libexec/{master,cyrusmaster} || die
+
+	insinto /etc
+	newins "${D}/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
+	newins "${D}/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
+
+	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
+		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
+		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
+		"${D}"/etc/imapd.conf
+
+	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
+		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
+		"${D}"/etc/cyrus.conf
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+	# same thing for http(s) as well
+	if ! use http; then
+		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	newinitd "${FILESDIR}/cyrus.rc8" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		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
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist
+	if use ssl ; then
+		if [ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+
+	echo
+	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "for upgrade instructions."
+	echo
+}


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2021-05-06 23:26 Sam James
  0 siblings, 0 replies; 85+ messages in thread
From: Sam James @ 2021-05-06 23:26 UTC (permalink / raw
  To: gentoo-commits

commit:     29d6fcf84037c3a3f25853afb616cb75f4b93e5e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May  6 22:47:03 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May  6 23:26:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29d6fcf8

net-mail/cyrus-imapd: fix metadata indentation

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/cyrus-imapd/metadata.xml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/net-mail/cyrus-imapd/metadata.xml b/net-mail/cyrus-imapd/metadata.xml
index b48ec92db7c..07719eba802 100644
--- a/net-mail/cyrus-imapd/metadata.xml
+++ b/net-mail/cyrus-imapd/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <use>
-    <flag name="replication">Enable replication support</flag>
-    <flag name="sieve">Enable sieve support</flag>
-    <flag name="http">Enable http and http/2 support</flag>
-    <flag name="server">Enable building server binaries</flag>
-    <flag name="backup">Enable backup service support</flag>
-    <flag name="calalarm">Enable CalDAV alarm support</flag>
-    <flag name="xapian">Enable Xapian search engine support</flag>
-    <flag name="lmdb">Enable support for using <pkg>dev-db/lmdb</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="github">cyrusimap/cyrus-imapd</remote-id>
-  </upstream>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="replication">Enable replication support</flag>
+		<flag name="sieve">Enable sieve support</flag>
+		<flag name="http">Enable http and http/2 support</flag>
+		<flag name="server">Enable building server binaries</flag>
+		<flag name="backup">Enable backup service support</flag>
+		<flag name="calalarm">Enable CalDAV alarm support</flag>
+		<flag name="xapian">Enable Xapian search engine support</flag>
+		<flag name="lmdb">Enable support for using <pkg>dev-db/lmdb</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">cyrusimap/cyrus-imapd</remote-id>
+	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2021-05-06 23:26 Sam James
  0 siblings, 0 replies; 85+ messages in thread
From: Sam James @ 2021-05-06 23:26 UTC (permalink / raw
  To: gentoo-commits

commit:     9724a2bd22bcf58dbd83e2f1580d4507ad9fa6bc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May  6 23:14:00 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May  6 23:26:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9724a2bd

net-mail/cyrus-imapd: add 3.4.0 (masked)

Changes:
* lmdb support dropped upstream
* sieve is, for now, unconditionally built due to upstream changes

Masked for testing in a follow-up commit.

Bug: https://bugs.gentoo.org/731266
Bug: https://bugs.gentoo.org/738280
Bug: https://bugs.gentoo.org/740188
Bug: https://bugs.gentoo.org/738278
Bug: https://bugs.gentoo.org/738276
Bug: https://bugs.gentoo.org/356341
Bug: https://bugs.gentoo.org/688242
Bug: https://bugs.gentoo.org/662896
Bug: https://bugs.gentoo.org/687864
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/cyrus-imapd/Manifest                 |   1 +
 net-mail/cyrus-imapd/cyrus-imapd-3.4.0.ebuild | 234 ++++++++++++++++++++++++++
 2 files changed, 235 insertions(+)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 9024ddcaa10..6511617dee1 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,3 +1,4 @@
 DIST cyrus-imapd-3.0.13.tar.gz 10840005 BLAKE2B f4790837a198673b42d553bc7cbc825456ff5a3d1d14ff382ca0f40252d09eb355f92c2020c0a974cc99eda9af4323a3a5b9428375288bf8892dfba35602da4e SHA512 5cd066916797efb975cdb97720f65edc72d3fe82afbd78a26aa8369d95ae4ca09c0593dd4bec5521156c64ea38af7a13065f3b35447a76267dec93feb0ac6ac6
 DIST cyrus-imapd-3.0.14.tar.gz 10865880 BLAKE2B 36f3e60d715d2eab430040964e93cb332cfc4d9097f0f863b94325eb4eb964a4030d1d0f8ddb7870a08b655e1694bbc751d5aab99af6670ab33ad6747f55f6bd SHA512 0bade56f4f7834ef51efc4081f2915bf0f98a2a555cd1b847f13a34418e4c52f2abcb4018906c144c161241433a8ff9ddc6d88499804d3fe616a05f186a3f209
 DIST cyrus-imapd-3.0.15.tar.gz 10843341 BLAKE2B efe65c7afc7d63770adef9e4ea13b87e3b7fdd1847e4ada028175999b31ebb84f9d84b014018bd2be3fee9af1b5e81dd08f63225bc62dc5a4fd4a0791da16594 SHA512 2f65209095f086092fec0bfc9547c999a6e568cccc0a4164e7a3751fe2881f47bbbbd67ba9c9169feafead8c40d42f594d34171d911e4028425cfd8ba72d8f4a
+DIST cyrus-imapd-3.4.0.tar.gz 12514849 BLAKE2B 319a2c69bb293c55340e9ac87258799458fc216f39b949fefc01178ac6c8a06962a9b02dfd143fb1d7715b789b4b9401f85b55f30abfcae06b815a87def2b017 SHA512 1dc6c721d8d59f403895dc772dabaa38a1c8dce2c433674e6d34b7ab9e51ab1a3e0fa584db883a9e9c76bbaf28c2c2c63d90453e614d8c2aab870dbaf3148741

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.0.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.0.ebuild
new file mode 100644
index 00000000000..3a9516d6cca
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.0.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic pam ssl-cert
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="https://www.cyrusimap.org/"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs backup calalarm caps clamav http kerberos ldap \
+	mysql nntp pam perl postgres replication +server sieve \
+	sqlite ssl static-libs tcpd test xapian"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	sys-libs/zlib:0=
+	dev-libs/libpcre:3
+	>=dev-libs/cyrus-sasl-2.1.13:2
+	dev-libs/jansson
+	dev-libs/icu:0=
+	sys-libs/e2fsprogs-libs
+	afs? ( net-fs/openafs )
+	calalarm? ( dev-libs/libical:0= )
+	caps? ( sys-libs/libcap )
+	clamav? ( app-antivirus/clamav )
+	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+			sys-libs/pam
+			>=net-mail/mailbase-1
+		)
+	perl? ( dev-lang/perl:= )
+	postgres? ( dev-db/postgresql:* )
+	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist] )
+	sqlite? ( dev-db/sqlite:3 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	xapian? ( >=dev-libs/xapian-1.4.0:0= )
+"
+DEPEND="${CDEPEND}
+	test? ( dev-util/cunit )
+"
+
+# all blockers really needed?
+# file collision with app-arch/dump - bug 619584
+RDEPEND="${CDEPEND}
+	acct-group/mail
+	acct-user/cyrus
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!app-arch/dump
+"
+
+REQUIRED_USE="
+	afs? ( kerberos )
+	backup? ( sqlite )
+	calalarm? ( http )
+	http? ( sqlite )
+"
+
+# https://bugs.gentoo.org/678754
+# TODO: check underlinking for other libraries
+#PATCHES=(
+#	"${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
+#)
+
+pkg_setup() {
+	# https://bugs.gentoo.org/604466
+	append-ldflags $(no-as-needed)
+}
+
+src_prepare() {
+	default
+
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+
+	# TODO:
+	# - revisit --with-sphinx-build=no? (it's docs this time, not the search engine)
+	# - post-emerge message re lmdb removal?
+	# - fix sieve usage upstream to allow it to be conditional again?
+	# (remove package.use.force)
+	# (https://github.com/cyrusimap/cyrus-imapd/pull/3270)
+	econf \
+		--enable-unit-tests \
+		--enable-murder \
+		--enable-idled \
+		--enable-event-notification \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-com_err \
+		--with-cyrus-user=cyrus \
+		--with-sasl \
+		--with-sphinx-build=no \
+		--without-krb \
+		--without-krbdes \
+		--enable-squat \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_enable backup) \
+		$(use_enable calalarm calalarmd) \
+		$(use_with caps libcap) \
+		$(use_with clamav) \
+		$(use_enable nntp) \
+		$(use_enable http) \
+		$(use_with http nghttp2) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		$(use_enable xapian) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dodoc -r doc
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	rm -f doc/text/Makefile*
+
+	mv "${D}"/usr/libexec/{master,cyrusmaster} || die
+
+	insinto /etc
+	newins "${D}/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
+	newins "${D}/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
+
+	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
+		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
+		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
+		"${D}"/etc/imapd.conf
+
+	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
+		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
+		"${D}"/etc/cyrus.conf
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	# same thing for http(s) as well
+	if ! use http; then
+		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	newinitd "${FILESDIR}/cyrus.rc8" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		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
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist
+	if use ssl ; then
+		if [ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+
+	echo
+	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "for upgrade instructions."
+	echo
+}


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2021-05-06 23:26 Sam James
  0 siblings, 0 replies; 85+ messages in thread
From: Sam James @ 2021-05-06 23:26 UTC (permalink / raw
  To: gentoo-commits

commit:     fe7a9e88d45b4faa1d05559f4434c3714d4c0662
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May  6 22:45:04 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May  6 23:26:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe7a9e88

net-mail/cyrus-imapd: add github remote-id

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/cyrus-imapd/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/net-mail/cyrus-imapd/metadata.xml b/net-mail/cyrus-imapd/metadata.xml
index c0215ef6fa4..b48ec92db7c 100644
--- a/net-mail/cyrus-imapd/metadata.xml
+++ b/net-mail/cyrus-imapd/metadata.xml
@@ -12,4 +12,7 @@
     <flag name="xapian">Enable Xapian search engine support</flag>
     <flag name="lmdb">Enable support for using <pkg>dev-db/lmdb</pkg></flag>
   </use>
+  <upstream>
+    <remote-id type="github">cyrusimap/cyrus-imapd</remote-id>
+  </upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2020-12-20 19:07 Thomas Deutschmann
  0 siblings, 0 replies; 85+ messages in thread
From: Thomas Deutschmann @ 2020-12-20 19:07 UTC (permalink / raw
  To: gentoo-commits

commit:     17c3b2794ab663db5ec2ae7b31001c151aae86b6
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 20 18:52:52 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Dec 20 19:06:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17c3b279

net-mail/cyrus-imapd: x86 stable (bug #760396)

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild
index c7bac016fb1..fb212858546 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sqlite ssl static-libs tcpd test xapian"


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2020-12-17 16:41 Agostino Sarubbo
  0 siblings, 0 replies; 85+ messages in thread
From: Agostino Sarubbo @ 2020-12-17 16:41 UTC (permalink / raw
  To: gentoo-commits

commit:     b18d9d216b185290a84f4ba0af5e0c8e8ca74842
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 17 16:40:47 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Dec 17 16:40:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b18d9d21

net-mail/cyrus-imapd: amd64 stable wrt bug #760396

Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild
index 18500025fdf..c7bac016fb1 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sqlite ssl static-libs tcpd test xapian"


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2020-12-17  8:58 Sam James
  0 siblings, 0 replies; 85+ messages in thread
From: Sam James @ 2020-12-17  8:58 UTC (permalink / raw
  To: gentoo-commits

commit:     23a2f40c303d49e0f9f97643b5f34dac85d9506b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 17 08:58:05 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 17 08:58:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23a2f40c

net-mail/cyrus-imapd: Stabilize 3.0.14 ppc, #760396

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild
index 3487441622a..18500025fdf 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sqlite ssl static-libs tcpd test xapian"


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2020-09-08  9:21 Eray Aslan
  0 siblings, 0 replies; 85+ messages in thread
From: Eray Aslan @ 2020-09-08  9:21 UTC (permalink / raw
  To: gentoo-commits

commit:     1858f72b398caf2976e7fed5df108f540eb001e7
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  8 09:21:07 2020 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Tue Sep  8 09:21:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1858f72b

net-mail/cyrus-imapd: bump to 3.0.14

Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Eray Aslan <eras <AT> gentoo.org>

 net-mail/cyrus-imapd/Manifest                  |   1 +
 net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild | 229 +++++++++++++++++++++++++
 2 files changed, 230 insertions(+)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index c8449d06e81..28db78e6cf6 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1 +1,2 @@
 DIST cyrus-imapd-3.0.13.tar.gz 10840005 BLAKE2B f4790837a198673b42d553bc7cbc825456ff5a3d1d14ff382ca0f40252d09eb355f92c2020c0a974cc99eda9af4323a3a5b9428375288bf8892dfba35602da4e SHA512 5cd066916797efb975cdb97720f65edc72d3fe82afbd78a26aa8369d95ae4ca09c0593dd4bec5521156c64ea38af7a13065f3b35447a76267dec93feb0ac6ac6
+DIST cyrus-imapd-3.0.14.tar.gz 10865880 BLAKE2B 36f3e60d715d2eab430040964e93cb332cfc4d9097f0f863b94325eb4eb964a4030d1d0f8ddb7870a08b655e1694bbc751d5aab99af6670ab33ad6747f55f6bd SHA512 0bade56f4f7834ef51efc4081f2915bf0f98a2a555cd1b847f13a34418e4c52f2abcb4018906c144c161241433a8ff9ddc6d88499804d3fe616a05f186a3f209

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild
new file mode 100644
index 00000000000..3487441622a
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic pam ssl-cert
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="https://www.cyrusimap.org/"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
+	mysql nntp pam perl postgres replication +server sieve snmp \
+	sqlite ssl static-libs tcpd test xapian"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	sys-libs/zlib:0=
+	dev-libs/libpcre:3
+	>=dev-libs/cyrus-sasl-2.1.13:2
+	dev-libs/jansson
+	dev-libs/icu:0=
+	sys-libs/e2fsprogs-libs
+	afs? ( net-fs/openafs )
+	calalarm? ( dev-libs/libical:0= )
+	caps? ( sys-libs/libcap )
+	clamav? ( app-antivirus/clamav )
+	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lmdb? ( dev-db/lmdb:0= )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+			sys-libs/pam
+			>=net-mail/mailbase-1
+		)
+	perl? ( dev-lang/perl:= )
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= )
+	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist] )
+	sqlite? ( dev-db/sqlite:3 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6
+		snmp? ( net-analyzer/net-snmp:0=[tcpd=] )
+		)
+	xapian? ( >=dev-libs/xapian-1.4.0:0= )
+"
+DEPEND="${CDEPEND}
+	test? ( dev-util/cunit )
+"
+
+# all blockers really needed?
+# file collision with app-arch/dump - bug 619584
+RDEPEND="${CDEPEND}
+	acct-group/mail
+	acct-user/cyrus
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!app-arch/dump
+"
+
+REQUIRED_USE="
+	afs? ( kerberos )
+	backup? ( sqlite )
+	calalarm? ( http )
+	http? ( sqlite )
+"
+
+# https://bugs.gentoo.org/678754
+# TODO: check underlinking for other libraries
+PATCHES=(
+	"${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
+	)
+
+pkg_setup() {
+	# https://bugs.gentoo.org/604466
+	append-ldflags $(no-as-needed)
+}
+
+src_prepare() {
+	default
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+	# sphinx is unmaintained and dead, bug #662944
+	econf \
+		--enable-unit-tests \
+		--enable-murder \
+		--enable-idled \
+		--enable-event-notification \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-com_err \
+		--with-cyrus-user=cyrus \
+		--with-sasl \
+		--without-krb \
+		--without-krbdes \
+		--disable-sphinx \
+		--enable-squat \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_enable backup) \
+		$(use_enable calalarm calalarmd) \
+		$(use_with caps libcap) \
+		$(use_with clamav) \
+		$(use_enable nntp) \
+		$(use_enable http) \
+		$(use_with http nghttp2) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with lmdb) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_with snmp) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		$(use_enable xapian) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dodoc -r doc
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	rm -f doc/text/Makefile*
+
+	mv "${D}"/usr/libexec/{master,cyrusmaster} || die
+
+	insinto /etc
+	newins "${D}/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
+	newins "${D}/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
+
+	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
+		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
+		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
+		"${D}"/etc/imapd.conf
+
+	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
+		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
+		"${D}"/etc/cyrus.conf
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+	# same thing for http(s) as well
+	if ! use http; then
+		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	newinitd "${FILESDIR}/cyrus.rc8" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		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
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist
+	if use ssl ; then
+		if [ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+
+	echo
+	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "for upgrade instructions."
+	echo
+}


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2020-09-08  6:40 Eray Aslan
  0 siblings, 0 replies; 85+ messages in thread
From: Eray Aslan @ 2020-09-08  6:40 UTC (permalink / raw
  To: gentoo-commits

commit:     0da8073555542ada0b0053360f9e07285b01966c
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  8 06:40:32 2020 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Tue Sep  8 06:40:32 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0da80735

net-mail/cyrus-imapd: cleanup

Bug: https://bugs.gentoo.org/703630
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Eray Aslan <eras <AT> gentoo.org>

 net-mail/cyrus-imapd/Manifest                     |   2 -
 net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild | 225 ----------------------
 net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild    | 225 ----------------------
 3 files changed, 452 deletions(-)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 7449e34e203..c8449d06e81 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,3 +1 @@
-DIST cyrus-imapd-3.0.10.tar.gz 10766263 BLAKE2B 366a8f524849d2173b8ea836e9f239ae20295dd435594af17d4c4682e7e672bc92c9f1bb0a60d7f7dce638beb94954f20906f9454b33830d2dcabb956ebd558a SHA512 1ae153a8f181bbe020326bec2dc177b78ef3c442f94e24e89b7a719298d93701006596dd21fa1c3a40afd75f01162b03524cf793dd7438ec7192f9a13f7614d0
-DIST cyrus-imapd-3.0.11.tar.gz 10797507 BLAKE2B ac62c11e50b6d92c17056a050f3adcfdeb055930a8568873f65c14a131a04223929c00679265ab7b96a056d7642f93f484ac75b136a9d09c0fa5e0dba0e89a06 SHA512 058efc2e462729b79e431e1b5dab1addfe737aeec8b686698cd2270748275028ca5722ed3960fcd680a0393027ee1b1d7dff65872dd1d8349a3f933e81227e48
 DIST cyrus-imapd-3.0.13.tar.gz 10840005 BLAKE2B f4790837a198673b42d553bc7cbc825456ff5a3d1d14ff382ca0f40252d09eb355f92c2020c0a974cc99eda9af4323a3a5b9428375288bf8892dfba35602da4e SHA512 5cd066916797efb975cdb97720f65edc72d3fe82afbd78a26aa8369d95ae4ca09c0593dd4bec5521156c64ea38af7a13065f3b35447a76267dec93feb0ac6ac6

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild
deleted file mode 100644
index 855c2e53448..00000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic pam ssl-cert user
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="https://www.cyrusimap.org/"
-SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
-	mysql nntp pam perl postgres replication +server sieve snmp \
-	sqlite ssl static-libs tcpd test xapian"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	sys-libs/zlib:0=
-	dev-libs/libpcre:3
-	>=dev-libs/cyrus-sasl-2.1.13:2
-	dev-libs/jansson
-	dev-libs/icu:0=
-	sys-libs/e2fsprogs-libs
-	afs? ( net-fs/openafs )
-	calalarm? ( dev-libs/libical:0= )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2:2 dev-libs/libical:0= )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lmdb? ( dev-db/lmdb:0= )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-			sys-libs/pam
-			>=net-mail/mailbase-1
-		)
-	perl? ( dev-lang/perl:= )
-	postgres? ( dev-db/postgresql:* )
-	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= )
-	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist] )
-	sqlite? ( dev-db/sqlite:3 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6
-		snmp? ( net-analyzer/net-snmp:0=[tcpd=] )
-		)
-	xapian? ( >=dev-libs/xapian-1.4.0:0= )
-"
-DEPEND="${CDEPEND}
-	test? ( dev-util/cunit )
-"
-
-# all blockers really needed?
-# file collision with app-arch/dump - bug 619584
-RDEPEND="${CDEPEND}
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap
-	!app-arch/dump
-"
-
-REQUIRED_USE="
-	afs? ( kerberos )
-	backup? ( sqlite )
-	calalarm? ( http )
-	http? ( sqlite )
-"
-
-# https://bugs.gentoo.org/678754
-# TODO: check underlinking for other libraries
-PATCHES=( "${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch" )
-
-pkg_setup() {
-	enewuser cyrus -1 -1 /usr/cyrus mail
-	# https://bugs.gentoo.org/604466
-	append-ldflags $(no-as-needed)
-}
-
-src_prepare() {
-	default
-	# Fix master(8)->cyrusmaster(8) manpage.
-	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -i -e 's:master\.8:cyrusmaster.8:g' \
-			-e 's:master(8):cyrusmaster(8):g' \
-			"${i}" || die "sed failed" || die "sed failed"
-	done
-	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
-	sed -i -e "s:MASTER:CYRUSMASTER:g" \
-		-e "s:Master:Cyrusmaster:g" \
-		-e "s:master:cyrusmaster:g" \
-		man/cyrusmaster.8 || die "sed failed"
-
-	# lock.h to afs/lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-	# sphinx is unmaintained and dead, bug #662944
-	econf \
-		--enable-unit-tests \
-		--enable-murder \
-		--enable-idled \
-		--enable-event-notification \
-		--enable-autocreate \
-		--enable-pcre \
-		--with-com_err \
-		--with-cyrus-user=cyrus \
-		--with-sasl \
-		--without-krb \
-		--without-krbdes \
-		--disable-sphinx \
-		--enable-squat \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_enable backup) \
-		$(use_enable calalarm calalarmd) \
-		$(use_with caps libcap) \
-		$(use_with clamav) \
-		$(use_enable nntp) \
-		$(use_enable http) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with lmdb) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with perl) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable server) \
-		$(use_enable sieve) \
-		$(use_with snmp) \
-		$(use_enable static-libs static) \
-		$(use_with tcpd libwrap) \
-		$(use_enable xapian) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALLDIRS=vendor install
-
-	dodoc README*
-	dodoc -r doc
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	rm -f doc/text/Makefile*
-
-	mv "${D}"usr/libexec/{master,cyrusmaster} || die
-
-	insinto /etc
-	newins "${D}usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
-	newins "${D}usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
-
-	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
-		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
-		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
-		"${D}"etc/imapd.conf
-
-	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
-		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
-		"${D}"etc/cyrus.conf
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-	# same thing for http(s) as well
-	if ! use http; then
-		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc8" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
-		keepdir "/var/${subdir}"
-		fowners cyrus:mail "/var/${subdir}"
-		fperms 0750 "/var/${subdir}"
-	done
-	for subdir in imap/{user,quota,sieve} spool/imap ; do
-		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
-			keepdir "/var/${subdir}/${i}"
-			fowners cyrus:mail "/var/${subdir}/${i}"
-			fperms 0750 "/var/${subdir}/${i}"
-		done
-	done
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} ; then
-		elog "For correct logging add the following to /etc/syslog.conf:"
-		elog "    local6.*         /var/log/imapd.log"
-		elog "    auth.debug       /var/log/auth.log"
-		echo
-
-		elog "You have to add user cyrus to the sasldb2. Do this with:"
-		elog "    saslpasswd2 cyrus"
-	fi
-}
-
-pkg_postinst() {
-	# do not install server.{key,pem) if they exist
-	if use ssl ; then
-		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
-			install_cert /etc/ssl/cyrus/server
-			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
-		fi
-	fi
-
-	echo
-	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
-	einfo "for upgrade instructions."
-	echo
-}

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild
deleted file mode 100644
index 5f70b01ab23..00000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic pam ssl-cert user
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="https://www.cyrusimap.org/"
-SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
-	mysql nntp pam perl postgres replication +server sieve snmp \
-	sqlite ssl static-libs tcpd test xapian"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	sys-libs/zlib:0=
-	dev-libs/libpcre:3
-	>=dev-libs/cyrus-sasl-2.1.13:2
-	dev-libs/jansson
-	dev-libs/icu:0=
-	sys-libs/e2fsprogs-libs
-	afs? ( net-fs/openafs )
-	calalarm? ( dev-libs/libical:0= )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2:2 dev-libs/libical:0= )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lmdb? ( dev-db/lmdb:0= )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-			sys-libs/pam
-			>=net-mail/mailbase-1
-		)
-	perl? ( dev-lang/perl:= )
-	postgres? ( dev-db/postgresql:* )
-	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= )
-	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist] )
-	sqlite? ( dev-db/sqlite:3 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6
-		snmp? ( net-analyzer/net-snmp:0=[tcpd=] )
-		)
-	xapian? ( >=dev-libs/xapian-1.4.0:0= )
-"
-DEPEND="${CDEPEND}
-	test? ( dev-util/cunit )
-"
-
-# all blockers really needed?
-# file collision with app-arch/dump - bug 619584
-RDEPEND="${CDEPEND}
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap
-	!app-arch/dump
-"
-
-REQUIRED_USE="
-	afs? ( kerberos )
-	backup? ( sqlite )
-	calalarm? ( http )
-	http? ( sqlite )
-"
-
-# https://bugs.gentoo.org/678754
-# TODO: check underlinking for other libraries
-PATCHES=( "${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch" )
-
-pkg_setup() {
-	enewuser cyrus -1 -1 /usr/cyrus mail
-	# https://bugs.gentoo.org/604466
-	append-ldflags $(no-as-needed)
-}
-
-src_prepare() {
-	default
-	# Fix master(8)->cyrusmaster(8) manpage.
-	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -i -e 's:master\.8:cyrusmaster.8:g' \
-			-e 's:master(8):cyrusmaster(8):g' \
-			"${i}" || die "sed failed" || die "sed failed"
-	done
-	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
-	sed -i -e "s:MASTER:CYRUSMASTER:g" \
-		-e "s:Master:Cyrusmaster:g" \
-		-e "s:master:cyrusmaster:g" \
-		man/cyrusmaster.8 || die "sed failed"
-
-	# lock.h to afs/lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-	# sphinx is unmaintained and dead, bug #662944
-	econf \
-		--enable-unit-tests \
-		--enable-murder \
-		--enable-idled \
-		--enable-event-notification \
-		--enable-autocreate \
-		--enable-pcre \
-		--with-com_err \
-		--with-cyrus-user=cyrus \
-		--with-sasl \
-		--without-krb \
-		--without-krbdes \
-		--disable-sphinx \
-		--enable-squat \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_enable backup) \
-		$(use_enable calalarm calalarmd) \
-		$(use_with caps libcap) \
-		$(use_with clamav) \
-		$(use_enable nntp) \
-		$(use_enable http) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with lmdb) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with perl) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable server) \
-		$(use_enable sieve) \
-		$(use_with snmp) \
-		$(use_enable static-libs static) \
-		$(use_with tcpd libwrap) \
-		$(use_enable xapian) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALLDIRS=vendor install
-
-	dodoc README*
-	dodoc -r doc
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	rm -f doc/text/Makefile*
-
-	mv "${D}"usr/libexec/{master,cyrusmaster} || die
-
-	insinto /etc
-	newins "${D}usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
-	newins "${D}usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
-
-	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
-		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
-		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
-		"${D}"etc/imapd.conf
-
-	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
-		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
-		"${D}"etc/cyrus.conf
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-	# same thing for http(s) as well
-	if ! use http; then
-		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc8" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
-		keepdir "/var/${subdir}"
-		fowners cyrus:mail "/var/${subdir}"
-		fperms 0750 "/var/${subdir}"
-	done
-	for subdir in imap/{user,quota,sieve} spool/imap ; do
-		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
-			keepdir "/var/${subdir}/${i}"
-			fowners cyrus:mail "/var/${subdir}/${i}"
-			fperms 0750 "/var/${subdir}/${i}"
-		done
-	done
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} ; then
-		elog "For correct logging add the following to /etc/syslog.conf:"
-		elog "    local6.*         /var/log/imapd.log"
-		elog "    auth.debug       /var/log/auth.log"
-		echo
-
-		elog "You have to add user cyrus to the sasldb2. Do this with:"
-		elog "    saslpasswd2 cyrus"
-	fi
-}
-
-pkg_postinst() {
-	# do not install server.{key,pem) if they exist
-	if use ssl ; then
-		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
-			install_cert /etc/ssl/cyrus/server
-			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
-		fi
-	fi
-
-	echo
-	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
-	einfo "for upgrade instructions."
-	echo
-}


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2020-09-05  4:06 Sam James
  0 siblings, 0 replies; 85+ messages in thread
From: Sam James @ 2020-09-05  4:06 UTC (permalink / raw
  To: gentoo-commits

commit:     05ea3cd5f510f582e00faad23b00113616d6bc86
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  5 04:05:54 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep  5 04:05:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05ea3cd5

net-mail/cyrus-imapd: Stabilize 3.0.13 ppc64, #703630

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild
index 349c1c1f07a..ecad086e12b 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sqlite ssl static-libs tcpd test xapian"


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2020-05-08  6:38 Agostino Sarubbo
  0 siblings, 0 replies; 85+ messages in thread
From: Agostino Sarubbo @ 2020-05-08  6:38 UTC (permalink / raw
  To: gentoo-commits

commit:     40cf240be7705fc8a5583766c75e0152382b8579
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri May  8 06:37:07 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri May  8 06:37:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40cf240b

net-mail/cyrus-imapd: amd64 stable wrt bug #703630

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild
index 9b4103b6882..349c1c1f07a 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sqlite ssl static-libs tcpd test xapian"


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2020-04-09 18:42 Eray Aslan
  0 siblings, 0 replies; 85+ messages in thread
From: Eray Aslan @ 2020-04-09 18:42 UTC (permalink / raw
  To: gentoo-commits

commit:     2f068e9907d193160d6ced7884ec5d2d39c86ab3
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  9 18:42:13 2020 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Thu Apr  9 18:42:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f068e99

net-mail/cyrus-imapd: add missing slashes

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Eray Aslan <eras <AT> gentoo.org>

 net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild
index 2ba848e8625..73ea9e3ef7b 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild
@@ -217,9 +217,9 @@ pkg_preinst() {
 pkg_postinst() {
 	# do not install server.{key,pem) if they exist
 	if use ssl ; then
-		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
+		if [ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]; then
 			install_cert /etc/ssl/cyrus/server
-			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
+			chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem}
 		fi
 	fi
 


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2019-12-12 14:58 Michał Górny
  0 siblings, 0 replies; 85+ messages in thread
From: Michał Górny @ 2019-12-12 14:58 UTC (permalink / raw
  To: gentoo-commits

commit:     ec4a82e4b3f4a5bae9fbc6749404862785a717a3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 12 14:55:35 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Dec 12 14:58:41 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec4a82e4

net-mail/cyrus-imapd: Fix MissingTestRestrict

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild | 1 +
 net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild
index b2ba1c3eae1..855c2e53448 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild
@@ -14,6 +14,7 @@ KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sqlite ssl static-libs tcpd test xapian"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	sys-libs/zlib:0=

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild
index 4fe6676ef6d..5f70b01ab23 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild
@@ -14,6 +14,7 @@ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sqlite ssl static-libs tcpd test xapian"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	sys-libs/zlib:0=


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2019-10-12 21:24 Mikle Kolyada
  0 siblings, 0 replies; 85+ messages in thread
From: Mikle Kolyada @ 2019-10-12 21:24 UTC (permalink / raw
  To: gentoo-commits

commit:     a893e157dc578bf85fcfa364a7e70da9f6abd00f
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 12 21:23:53 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Oct 12 21:23:58 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a893e157

net-mail/cyrus-imapd: migrate to sys-libs/pam

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild | 2 +-
 net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild
index 50d4b5e4bfc..b2ba1c3eae1 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild
@@ -33,7 +33,7 @@ CDEPEND="
 	mysql? ( dev-db/mysql-connector-c:0= )
 	nntp? ( !net-nntp/leafnode )
 	pam? (
-			virtual/pam
+			sys-libs/pam
 			>=net-mail/mailbase-1
 		)
 	perl? ( dev-lang/perl:= )

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild
index 2a381e5de2d..4fe6676ef6d 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild
@@ -33,7 +33,7 @@ CDEPEND="
 	mysql? ( dev-db/mysql-connector-c:0= )
 	nntp? ( !net-nntp/leafnode )
 	pam? (
-			virtual/pam
+			sys-libs/pam
 			>=net-mail/mailbase-1
 		)
 	perl? ( dev-lang/perl:= )


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2019-07-30  6:35 Eray Aslan
  0 siblings, 0 replies; 85+ messages in thread
From: Eray Aslan @ 2019-07-30  6:35 UTC (permalink / raw
  To: gentoo-commits

commit:     7e481b20b55c896ba8c7b6a31b59a7c54b257c00
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 30 06:31:32 2019 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 06:31:51 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e481b20

net-mail/cyrus-imapd: bump to 3.0.11

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Eray Aslan <eras <AT> gentoo.org>

 net-mail/cyrus-imapd/Manifest                  |   1 +
 net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild | 224 +++++++++++++++++++++++++
 2 files changed, 225 insertions(+)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index a6fd79b4cf5..a8109439a59 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,2 +1,3 @@
 DIST cyrus-imapd-3.0.10.tar.gz 10766263 BLAKE2B 366a8f524849d2173b8ea836e9f239ae20295dd435594af17d4c4682e7e672bc92c9f1bb0a60d7f7dce638beb94954f20906f9454b33830d2dcabb956ebd558a SHA512 1ae153a8f181bbe020326bec2dc177b78ef3c442f94e24e89b7a719298d93701006596dd21fa1c3a40afd75f01162b03524cf793dd7438ec7192f9a13f7614d0
+DIST cyrus-imapd-3.0.11.tar.gz 10797507 BLAKE2B ac62c11e50b6d92c17056a050f3adcfdeb055930a8568873f65c14a131a04223929c00679265ab7b96a056d7642f93f484ac75b136a9d09c0fa5e0dba0e89a06 SHA512 058efc2e462729b79e431e1b5dab1addfe737aeec8b686698cd2270748275028ca5722ed3960fcd680a0393027ee1b1d7dff65872dd1d8349a3f933e81227e48
 DIST cyrus-imapd-3.0.5.tar.gz 10910080 BLAKE2B a7914ab189a290427ddc0d013c19ff0c36f3a6c4fc016f50013d0f6abb11ae2f7d067b71df99b7f00ba4e8a2170e0f068baa170458b0dc1e94d69d8e4b814873 SHA512 262806729d5ee5d753732603aa7af33c6f96bc5145b7a951b8668ffdee0dcd4a90bd287da0949e85c4596cccb471a688f7f8b6f3e39194e1cff311950d4d4410

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild
new file mode 100644
index 00000000000..2a381e5de2d
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic pam ssl-cert user
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="https://www.cyrusimap.org/"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
+	mysql nntp pam perl postgres replication +server sieve snmp \
+	sqlite ssl static-libs tcpd test xapian"
+
+CDEPEND="
+	sys-libs/zlib:0=
+	dev-libs/libpcre:3
+	>=dev-libs/cyrus-sasl-2.1.13:2
+	dev-libs/jansson
+	dev-libs/icu:0=
+	sys-libs/e2fsprogs-libs
+	afs? ( net-fs/openafs )
+	calalarm? ( dev-libs/libical:0= )
+	caps? ( sys-libs/libcap )
+	clamav? ( app-antivirus/clamav )
+	http? ( dev-libs/libxml2:2 dev-libs/libical:0= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lmdb? ( dev-db/lmdb:0= )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+			virtual/pam
+			>=net-mail/mailbase-1
+		)
+	perl? ( dev-lang/perl:= )
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= )
+	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist] )
+	sqlite? ( dev-db/sqlite:3 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6
+		snmp? ( net-analyzer/net-snmp:0=[tcpd=] )
+		)
+	xapian? ( >=dev-libs/xapian-1.4.0:0= )
+"
+DEPEND="${CDEPEND}
+	test? ( dev-util/cunit )
+"
+
+# all blockers really needed?
+# file collision with app-arch/dump - bug 619584
+RDEPEND="${CDEPEND}
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!app-arch/dump
+"
+
+REQUIRED_USE="
+	afs? ( kerberos )
+	backup? ( sqlite )
+	calalarm? ( http )
+	http? ( sqlite )
+"
+
+# https://bugs.gentoo.org/678754
+# TODO: check underlinking for other libraries
+PATCHES=( "${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch" )
+
+pkg_setup() {
+	enewuser cyrus -1 -1 /usr/cyrus mail
+	# https://bugs.gentoo.org/604466
+	append-ldflags $(no-as-needed)
+}
+
+src_prepare() {
+	default
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+	# sphinx is unmaintained and dead, bug #662944
+	econf \
+		--enable-unit-tests \
+		--enable-murder \
+		--enable-idled \
+		--enable-event-notification \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-com_err \
+		--with-cyrus-user=cyrus \
+		--with-sasl \
+		--without-krb \
+		--without-krbdes \
+		--disable-sphinx \
+		--enable-squat \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_enable backup) \
+		$(use_enable calalarm calalarmd) \
+		$(use_with caps libcap) \
+		$(use_with clamav) \
+		$(use_enable nntp) \
+		$(use_enable http) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with lmdb) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_with snmp) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		$(use_enable xapian) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dodoc -r doc
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	rm -f doc/text/Makefile*
+
+	mv "${D}"usr/libexec/{master,cyrusmaster} || die
+
+	insinto /etc
+	newins "${D}usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
+	newins "${D}usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
+
+	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
+		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
+		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
+		"${D}"etc/imapd.conf
+
+	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
+		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
+		"${D}"etc/cyrus.conf
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+	# same thing for http(s) as well
+	if ! use http; then
+		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	newinitd "${FILESDIR}/cyrus.rc8" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		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
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist
+	if use ssl ; then
+		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+
+	echo
+	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "for upgrade instructions."
+	echo
+}


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2019-06-13 14:54 Agostino Sarubbo
  0 siblings, 0 replies; 85+ messages in thread
From: Agostino Sarubbo @ 2019-06-13 14:54 UTC (permalink / raw
  To: gentoo-commits

commit:     d2dfddaeb8906c4bc96dafdacfdb057f55d9fff7
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 13 14:54:25 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jun 13 14:54:25 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2dfddae

net-mail/cyrus-imapd: ppc64 stable wrt bug #671576

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="ppc64"

 net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild
index c80b35c717b..50d4b5e4bfc 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sqlite ssl static-libs tcpd test xapian"


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2019-06-13 14:53 Agostino Sarubbo
  0 siblings, 0 replies; 85+ messages in thread
From: Agostino Sarubbo @ 2019-06-13 14:53 UTC (permalink / raw
  To: gentoo-commits

commit:     2d59c55b2992b97d2efe79c6a79dda7f267654fe
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 13 14:53:26 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jun 13 14:53:26 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d59c55b

net-mail/cyrus-imapd: x86 stable wrt bug #671576

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="x86"

 net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild
index 1108e062c1b..c80b35c717b 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sqlite ssl static-libs tcpd test xapian"


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2019-06-13 14:28 Agostino Sarubbo
  0 siblings, 0 replies; 85+ messages in thread
From: Agostino Sarubbo @ 2019-06-13 14:28 UTC (permalink / raw
  To: gentoo-commits

commit:     37bc1d78108cec3a14a72db741c03171cb86a0f5
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 13 14:28:37 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jun 13 14:28:37 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37bc1d78

net-mail/cyrus-imapd: ppc stable wrt bug #671576

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="ppc"

 net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild
index 284e779921f..1108e062c1b 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sqlite ssl static-libs tcpd test xapian"


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2019-06-13 14:12 Agostino Sarubbo
  0 siblings, 0 replies; 85+ messages in thread
From: Agostino Sarubbo @ 2019-06-13 14:12 UTC (permalink / raw
  To: gentoo-commits

commit:     80f82c580326234faabf20aca023a2bbfa1d4781
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 13 14:11:54 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jun 13 14:11:54 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80f82c58

net-mail/cyrus-imapd: amd64 stable wrt bug #671576

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild
index 2a381e5de2d..284e779921f 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sqlite ssl static-libs tcpd test xapian"


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2019-06-09 11:40 Pacho Ramos
  0 siblings, 0 replies; 85+ messages in thread
From: Pacho Ramos @ 2019-06-09 11:40 UTC (permalink / raw
  To: gentoo-commits

commit:     ba95373d32f970856c7f436771047a7aa389c981
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  9 11:39:45 2019 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 11:39:57 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba95373d

net-mail/cyrus-imapd: Drop old

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 net-mail/cyrus-imapd/Manifest                    |   4 -
 net-mail/cyrus-imapd/cyrus-imapd-3.0.10.ebuild   | 217 ----------------------
 net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild    | 220 ----------------------
 net-mail/cyrus-imapd/cyrus-imapd-3.0.6.ebuild    | 221 -----------------------
 net-mail/cyrus-imapd/cyrus-imapd-3.0.8-r1.ebuild | 214 ----------------------
 net-mail/cyrus-imapd/cyrus-imapd-3.0.9.ebuild    | 218 ----------------------
 6 files changed, 1094 deletions(-)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 931da492bf2..a6fd79b4cf5 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,6 +1,2 @@
 DIST cyrus-imapd-3.0.10.tar.gz 10766263 BLAKE2B 366a8f524849d2173b8ea836e9f239ae20295dd435594af17d4c4682e7e672bc92c9f1bb0a60d7f7dce638beb94954f20906f9454b33830d2dcabb956ebd558a SHA512 1ae153a8f181bbe020326bec2dc177b78ef3c442f94e24e89b7a719298d93701006596dd21fa1c3a40afd75f01162b03524cf793dd7438ec7192f9a13f7614d0
-DIST cyrus-imapd-3.0.4.tar.gz 10819487 BLAKE2B 209e379731c996ee083b0de61d6122b3756d1f6880071ebf015157057cf45845961d762ee762ae56213f72f15c01df29ab2d2661c4e352c6b4a680924d15d7b0 SHA512 9ceb7ac837c932c70fa0c1583bf8700b3ec27568d72538ae8d59f2f551e3007b3c2fc68fd29c009597c3949345dbe1bf2eb614bea038d70a5b49e5507df6b69a
 DIST cyrus-imapd-3.0.5.tar.gz 10910080 BLAKE2B a7914ab189a290427ddc0d013c19ff0c36f3a6c4fc016f50013d0f6abb11ae2f7d067b71df99b7f00ba4e8a2170e0f068baa170458b0dc1e94d69d8e4b814873 SHA512 262806729d5ee5d753732603aa7af33c6f96bc5145b7a951b8668ffdee0dcd4a90bd287da0949e85c4596cccb471a688f7f8b6f3e39194e1cff311950d4d4410
-DIST cyrus-imapd-3.0.6.tar.gz 10734548 BLAKE2B d16d1093b17f632fa75e77c1b923deb0c5a76de4c06a657c4c1dd2f9498ac0abd81ecee58c64378118d4b09be872957afc6db5d8deebf72c819623d6ea5aa0a9 SHA512 375e3936465e9ee448996cf738ebe93a35697a58a7784cf6f7a8be25e3e03925fb4f44ff98a0aacbc5b9e3ef39fc8a0e51acb4ea26cbbfbc8e492556fdc03a03
-DIST cyrus-imapd-3.0.8.tar.gz 10735462 BLAKE2B 27fdead9a75048c12fe4c0eed1dcda9ce24319c2183851190068fd3ded32c1f6b4d550e726dd4a483bafe298ac0199aa2b1354c6f0c5ac0083d7d1ad0e69457a SHA512 f4aa9877e62479439bee2ca29f452bd7e9daa091c19bf3567aa7f493f5163c98b44086b749c70981402212ff90e19d9125b508cfcc077088f8c705e533812960
-DIST cyrus-imapd-3.0.9.tar.gz 10771916 BLAKE2B cc483246c83ed55fa7d4e85aa8189852f2e6be23aff5bb478c2d2123e3d928cc8248e580c80c1474b2b3eea9aa1c0f8b3336f779e72e690d8d093e70993cd657 SHA512 d1a65e957ad3bbbd70e4c8c699e226c17911c6f5815839694136b967a7067acaf4261c8aaad223ffb1e41d76ef78e9e7279a2805048de9b05939044ce17cb738

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.10.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.10.ebuild
deleted file mode 100644
index 5bf98d12a9b..00000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.10.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic pam ssl-cert user
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="https://www.cyrusimap.org/"
-SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
-	mysql nntp pam perl postgres replication +server sieve snmp \
-	sphinx sqlite ssl static-libs tcpd test xapian"
-
-CDEPEND="sys-libs/zlib
-	dev-libs/libpcre
-	>=dev-libs/cyrus-sasl-2.1.13
-	dev-libs/jansson
-	dev-libs/icu:=
-	sys-libs/e2fsprogs-libs
-	afs? ( net-fs/openafs )
-	calalarm? ( dev-libs/libical )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2 dev-libs/libical )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lmdb? ( dev-db/lmdb )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-			virtual/pam
-			>=net-mail/mailbase-1
-		)
-	perl? ( dev-lang/perl:= )
-	postgres? ( dev-db/postgresql:* )
-	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
-	ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
-	sqlite? ( dev-db/sqlite:3 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )
-	xapian? ( >=dev-libs/xapian-1.4.0 )"
-
-DEPEND="${CDEPEND}
-	test? ( dev-util/cunit )"
-
-# all blockers really needed?
-# file collision with app-arch/dump - bug 619584
-RDEPEND="${CDEPEND}
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap
-	!app-arch/dump"
-
-REQUIRED_USE="afs? ( kerberos )
-	backup? ( sqlite )
-	calalarm? ( http )
-	http? ( sqlite )
-	sphinx? ( mysql )"
-
-# https://bugs.gentoo.org/678754
-# TODO: check underlinking for other libraries
-PATCHES=( "${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch" )
-
-pkg_setup() {
-	enewuser cyrus -1 -1 /usr/cyrus mail
-	# https://bugs.gentoo.org/604466
-	append-ldflags $(no-as-needed)
-}
-
-src_prepare() {
-	default
-	# Fix master(8)->cyrusmaster(8) manpage.
-	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -i -e 's:master\.8:cyrusmaster.8:g' \
-			-e 's:master(8):cyrusmaster(8):g' \
-			"${i}" || die "sed failed" || die "sed failed"
-	done
-	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
-	sed -i -e "s:MASTER:CYRUSMASTER:g" \
-		-e "s:Master:Cyrusmaster:g" \
-		-e "s:master:cyrusmaster:g" \
-		man/cyrusmaster.8 || die "sed failed"
-
-	# lock.h to afs/lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-	econf \
-		--enable-unit-tests \
-		--enable-murder \
-		--enable-idled \
-		--enable-event-notification \
-		--enable-autocreate \
-		--enable-pcre \
-		--with-com_err \
-		--with-cyrus-user=cyrus \
-		--with-sasl \
-		--without-krb \
-		--without-krbdes \
-		--enable-squat \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_enable backup) \
-		$(use_enable calalarm calalarmd) \
-		$(use_with caps libcap) \
-		$(use_with clamav) \
-		$(use_enable nntp) \
-		$(use_enable http) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with lmdb) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with perl) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable server) \
-		$(use_enable sieve) \
-		$(use_with snmp) \
-		$(use_enable sphinx) \
-		$(use_enable static-libs static) \
-		$(use_with tcpd libwrap) \
-		$(use_enable xapian) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALLDIRS=vendor install
-
-	dodoc README*
-	dodoc -r doc
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	rm -f doc/text/Makefile*
-
-	mv "${D}"usr/libexec/{master,cyrusmaster} || die
-
-	insinto /etc
-	newins "${D}usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
-	newins "${D}usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
-
-	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
-		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
-		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
-		"${D}"etc/imapd.conf
-
-	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
-		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
-		"${D}"etc/cyrus.conf
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-	# same thing for http(s) as well
-	if ! use http; then
-		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc8" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
-		keepdir "/var/${subdir}"
-		fowners cyrus:mail "/var/${subdir}"
-		fperms 0750 "/var/${subdir}"
-	done
-	for subdir in imap/{user,quota,sieve} spool/imap ; do
-		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
-			keepdir "/var/${subdir}/${i}"
-			fowners cyrus:mail "/var/${subdir}/${i}"
-			fperms 0750 "/var/${subdir}/${i}"
-		done
-	done
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} ; then
-		elog "For correct logging add the following to /etc/syslog.conf:"
-		elog "    local6.*         /var/log/imapd.log"
-		elog "    auth.debug       /var/log/auth.log"
-		echo
-
-		elog "You have to add user cyrus to the sasldb2. Do this with:"
-		elog "    saslpasswd2 cyrus"
-	fi
-}
-
-pkg_postinst() {
-	# do not install server.{key,pem) if they exist
-	if use ssl ; then
-		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
-			install_cert /etc/ssl/cyrus/server
-			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
-		fi
-	fi
-
-	echo
-	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
-	einfo "for upgrade instructions."
-	echo
-}

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild
deleted file mode 100644
index 6537bc8a826..00000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools pam ssl-cert user
-
-MY_P=${P/_/}
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="https://www.cyrusimap.org/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="afs backup calalarm caps clamav http jmap kerberos ldap lmdb \
-	mysql nntp pam perl postgres replication +server sieve snmp \
-	sphinx sqlite ssl static-libs tcpd test xapian"
-
-# virtual/mysql-5.5 added for the --variable= option below
-CDEPEND="sys-libs/zlib
-	dev-libs/libpcre
-	>=dev-libs/cyrus-sasl-2.1.13
-	dev-libs/jansson
-	dev-libs/icu:=
-	afs? ( net-fs/openafs )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2 dev-libs/libical )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lmdb? ( dev-db/lmdb )
-	mysql? ( >=virtual/mysql-5.5 )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-			virtual/pam
-			>=net-mail/mailbase-1
-		)
-	perl? ( dev-lang/perl:= )
-	postgres? ( dev-db/postgresql:* )
-	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
-	ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
-	sqlite? ( dev-db/sqlite:3 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )
-	xapian? ( >=dev-libs/xapian-1.4.0 )"
-
-DEPEND="${CDEPEND}
-	test? ( dev-util/cunit )"
-
-# all blockers really needed?
-RDEPEND="${CDEPEND}
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap
-	!net-mail/cyrus-imap-admin"
-
-REQUIRED_USE="afs? ( kerberos )
-	backup? ( sqlite )
-	calalarm? ( http )
-	http? ( sqlite )
-	jmap? ( http xapian )
-	sphinx? ( mysql )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewuser cyrus -1 -1 /usr/cyrus mail
-}
-
-src_prepare() {
-	# bug 604470
-	eapply -p1 "${FILESDIR}/${PN}-sieve-libs-v4.patch"
-	eapply -p1 "${FILESDIR}/${PN}-libcap-libs.patch"
-	eapply -p1 "${FILESDIR}/${PN}-fix-tests.patch"
-	# Fix master(8)->cyrusmaster(8) manpage.
-	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -i -e 's:master\.8:cyrusmaster.8:g' \
-			-e 's:master(8):cyrusmaster(8):g' \
-			"${i}" || die "sed failed" || die "sed failed"
-	done
-	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
-	sed -i -e "s:MASTER:CYRUSMASTER:g" \
-		-e "s:Master:Cyrusmaster:g" \
-		-e "s:master:cyrusmaster:g" \
-		man/cyrusmaster.8 || die "sed failed"
-
-	# lock.h to afs/lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-	econf \
-		--enable-unit-tests \
-		--enable-murder \
-		--enable-idled \
-		--enable-event-notification \
-		--enable-autocreate \
-		--enable-pcre \
-		--with-cyrus-user=cyrus \
-		--with-cyrus-group=mail \
-		--with-com_err=yes \
-		--with-sasl \
-		--without-krb \
-		--without-krbdes \
-		--enable-squat \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_enable backup) \
-		$(use_enable calalarm calalarmd) \
-		$(use_with caps libcap) \
-		$(use_with clamav) \
-		$(use_enable jmap) \
-		$(use_enable nntp) \
-		$(use_enable http) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with lmdb) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with perl) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable server) \
-		$(use_enable sieve) \
-		$(use_with snmp) \
-		$(use_enable sphinx) \
-		$(use_enable static-libs static) \
-		$(use_with tcpd libwrap) \
-		$(use_enable xapian) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALLDIRS=vendor install
-
-	dodoc README*
-	dodoc -r doc
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	rm -f doc/text/Makefile*
-
-	mv "${D}"usr/libexec/{master,cyrusmaster} || die
-
-	insinto /etc
-	newins "${D}usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
-	newins "${D}usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
-
-	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
-		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
-		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
-		"${D}"etc/imapd.conf
-
-	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
-		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
-		"${D}"etc/cyrus.conf
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-	# same thing for http(s) as well
-	if ! use http; then
-		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc8" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
-		keepdir "/var/${subdir}"
-		fowners cyrus:mail "/var/${subdir}"
-		fperms 0750 "/var/${subdir}"
-	done
-	for subdir in imap/{user,quota,sieve} spool/imap ; do
-		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
-			keepdir "/var/${subdir}/${i}"
-			fowners cyrus:mail "/var/${subdir}/${i}"
-			fperms 0750 "/var/${subdir}/${i}"
-		done
-	done
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} ; then
-		elog "For correct logging add the following to /etc/syslog.conf:"
-		elog "    local6.*         /var/log/imapd.log"
-		elog "    auth.debug       /var/log/auth.log"
-		echo
-
-		elog "You have to add user cyrus to the sasldb2. Do this with:"
-		elog "    saslpasswd2 cyrus"
-	fi
-}
-
-pkg_postinst() {
-	# do not install server.{key,pem) if they exist
-	if use ssl ; then
-		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
-			install_cert /etc/ssl/cyrus/server
-			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
-		fi
-	fi
-
-	echo
-	ewarn "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
-	ewarn "for upgrade instructions."
-	echo
-}

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.6.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.6.ebuild
deleted file mode 100644
index 54e10fe359c..00000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.6.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic pam ssl-cert user
-
-MY_P=${P/_/}
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="https://www.cyrusimap.org/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
-	mysql nntp pam perl postgres replication +server sieve snmp \
-	sphinx sqlite ssl static-libs tcpd test xapian"
-
-# virtual/mysql-5.5 added for the --variable= option below
-CDEPEND="sys-libs/zlib
-	dev-libs/libpcre
-	>=dev-libs/cyrus-sasl-2.1.13
-	dev-libs/jansson
-	dev-libs/icu:=
-	sys-libs/e2fsprogs-libs
-	afs? ( net-fs/openafs )
-	calalarm? ( dev-libs/libical )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2 dev-libs/libical )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lmdb? ( dev-db/lmdb )
-	mysql? ( >=virtual/mysql-5.5 )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-			virtual/pam
-			>=net-mail/mailbase-1
-		)
-	perl? ( dev-lang/perl:= )
-	postgres? ( dev-db/postgresql:* )
-	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
-	ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
-	sqlite? ( dev-db/sqlite:3 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )
-	xapian? ( >=dev-libs/xapian-1.4.0 )"
-
-DEPEND="${CDEPEND}
-	test? ( dev-util/cunit )"
-
-# all blockers really needed?
-# file collision with app-arch/dump - bug 619584
-RDEPEND="${CDEPEND}
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap
-	!net-mail/cyrus-imap-admin
-	!app-arch/dump"
-
-REQUIRED_USE="afs? ( kerberos )
-	backup? ( sqlite )
-	calalarm? ( http )
-	http? ( sqlite )
-	sphinx? ( mysql )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewuser cyrus -1 -1 /usr/cyrus mail
-	append-ldflags $(no-as-needed)
-}
-
-src_prepare() {
-	# bug 604470
-	eapply -p1 "${FILESDIR}/${PN}-sieve-libs-v4.patch"
-	eapply -p1 "${FILESDIR}/${PN}-libcap-libs.patch"
-	# Fix master(8)->cyrusmaster(8) manpage.
-	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -i -e 's:master\.8:cyrusmaster.8:g' \
-			-e 's:master(8):cyrusmaster(8):g' \
-			"${i}" || die "sed failed" || die "sed failed"
-	done
-	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
-	sed -i -e "s:MASTER:CYRUSMASTER:g" \
-		-e "s:Master:Cyrusmaster:g" \
-		-e "s:master:cyrusmaster:g" \
-		man/cyrusmaster.8 || die "sed failed"
-
-	# lock.h to afs/lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-	econf \
-		--enable-unit-tests \
-		--enable-murder \
-		--enable-idled \
-		--enable-event-notification \
-		--enable-autocreate \
-		--enable-pcre \
-		--with-cyrus-user=cyrus \
-		--with-cyrus-group=mail \
-		--with-sasl \
-		--without-krb \
-		--without-krbdes \
-		--enable-squat \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_enable backup) \
-		$(use_enable calalarm calalarmd) \
-		$(use_with caps libcap) \
-		$(use_with clamav) \
-		$(use_enable nntp) \
-		$(use_enable http) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with lmdb) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with perl) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable server) \
-		$(use_enable sieve) \
-		$(use_with snmp) \
-		$(use_enable sphinx) \
-		$(use_enable static-libs static) \
-		$(use_with tcpd libwrap) \
-		$(use_enable xapian) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALLDIRS=vendor install
-
-	dodoc README*
-	dodoc -r doc
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	rm -f doc/text/Makefile*
-
-	mv "${D}"usr/libexec/{master,cyrusmaster} || die
-
-	insinto /etc
-	newins "${D}usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
-	newins "${D}usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
-
-	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
-		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
-		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
-		"${D}"etc/imapd.conf
-
-	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
-		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
-		"${D}"etc/cyrus.conf
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-	# same thing for http(s) as well
-	if ! use http; then
-		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc8" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
-		keepdir "/var/${subdir}"
-		fowners cyrus:mail "/var/${subdir}"
-		fperms 0750 "/var/${subdir}"
-	done
-	for subdir in imap/{user,quota,sieve} spool/imap ; do
-		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
-			keepdir "/var/${subdir}/${i}"
-			fowners cyrus:mail "/var/${subdir}/${i}"
-			fperms 0750 "/var/${subdir}/${i}"
-		done
-	done
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} ; then
-		elog "For correct logging add the following to /etc/syslog.conf:"
-		elog "    local6.*         /var/log/imapd.log"
-		elog "    auth.debug       /var/log/auth.log"
-		echo
-
-		elog "You have to add user cyrus to the sasldb2. Do this with:"
-		elog "    saslpasswd2 cyrus"
-	fi
-}
-
-pkg_postinst() {
-	# do not install server.{key,pem) if they exist
-	if use ssl ; then
-		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
-			install_cert /etc/ssl/cyrus/server
-			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
-		fi
-	fi
-
-	echo
-	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
-	einfo "for upgrade instructions."
-	echo
-}

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.8-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.8-r1.ebuild
deleted file mode 100644
index 330e8d86ef2..00000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.8-r1.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic pam ssl-cert user
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="https://www.cyrusimap.org/"
-SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
-	mysql nntp pam perl postgres replication +server sieve snmp \
-	sphinx sqlite ssl static-libs tcpd test xapian"
-
-# virtual/mysql-5.5 added for the --variable= option below
-CDEPEND="sys-libs/zlib
-	dev-libs/libpcre
-	>=dev-libs/cyrus-sasl-2.1.13
-	dev-libs/jansson
-	dev-libs/icu:=
-	sys-libs/e2fsprogs-libs
-	afs? ( net-fs/openafs )
-	calalarm? ( dev-libs/libical )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2 dev-libs/libical )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lmdb? ( dev-db/lmdb )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-			virtual/pam
-			>=net-mail/mailbase-1
-		)
-	perl? ( dev-lang/perl:= )
-	postgres? ( dev-db/postgresql:* )
-	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
-	ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
-	sqlite? ( dev-db/sqlite:3 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )
-	xapian? ( >=dev-libs/xapian-1.4.0 )"
-
-DEPEND="${CDEPEND}
-	test? ( dev-util/cunit )"
-
-# all blockers really needed?
-# file collision with app-arch/dump - bug 619584
-RDEPEND="${CDEPEND}
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap
-	!net-mail/cyrus-imap-admin
-	!app-arch/dump"
-
-REQUIRED_USE="afs? ( kerberos )
-	backup? ( sqlite )
-	calalarm? ( http )
-	http? ( sqlite )
-	sphinx? ( mysql )"
-
-pkg_setup() {
-	enewuser cyrus -1 -1 /usr/cyrus mail
-	append-ldflags $(no-as-needed)
-}
-
-src_prepare() {
-	# Fix master(8)->cyrusmaster(8) manpage.
-	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -i -e 's:master\.8:cyrusmaster.8:g' \
-			-e 's:master(8):cyrusmaster(8):g' \
-			"${i}" || die "sed failed" || die "sed failed"
-	done
-	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
-	sed -i -e "s:MASTER:CYRUSMASTER:g" \
-		-e "s:Master:Cyrusmaster:g" \
-		-e "s:master:cyrusmaster:g" \
-		man/cyrusmaster.8 || die "sed failed"
-
-	# lock.h to afs/lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-	econf \
-		--enable-unit-tests \
-		--enable-murder \
-		--enable-idled \
-		--enable-event-notification \
-		--enable-autocreate \
-		--enable-pcre \
-		--with-cyrus-user=cyrus \
-		--with-cyrus-group=mail \
-		--with-sasl \
-		--without-krb \
-		--without-krbdes \
-		--enable-squat \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_enable backup) \
-		$(use_enable calalarm calalarmd) \
-		$(use_with caps libcap) \
-		$(use_with clamav) \
-		$(use_enable nntp) \
-		$(use_enable http) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with lmdb) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with perl) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable server) \
-		$(use_enable sieve) \
-		$(use_with snmp) \
-		$(use_enable sphinx) \
-		$(use_enable static-libs static) \
-		$(use_with tcpd libwrap) \
-		$(use_enable xapian) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALLDIRS=vendor install
-
-	dodoc README*
-	dodoc -r doc
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	rm -f doc/text/Makefile*
-
-	mv "${D}"usr/libexec/{master,cyrusmaster} || die
-
-	insinto /etc
-	newins "${D}usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
-	newins "${D}usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
-
-	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
-		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
-		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
-		"${D}"etc/imapd.conf
-
-	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
-		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
-		"${D}"etc/cyrus.conf
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-	# same thing for http(s) as well
-	if ! use http; then
-		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc8" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
-		keepdir "/var/${subdir}"
-		fowners cyrus:mail "/var/${subdir}"
-		fperms 0750 "/var/${subdir}"
-	done
-	for subdir in imap/{user,quota,sieve} spool/imap ; do
-		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
-			keepdir "/var/${subdir}/${i}"
-			fowners cyrus:mail "/var/${subdir}/${i}"
-			fperms 0750 "/var/${subdir}/${i}"
-		done
-	done
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} ; then
-		elog "For correct logging add the following to /etc/syslog.conf:"
-		elog "    local6.*         /var/log/imapd.log"
-		elog "    auth.debug       /var/log/auth.log"
-		echo
-
-		elog "You have to add user cyrus to the sasldb2. Do this with:"
-		elog "    saslpasswd2 cyrus"
-	fi
-}
-
-pkg_postinst() {
-	# do not install server.{key,pem) if they exist
-	if use ssl ; then
-		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
-			install_cert /etc/ssl/cyrus/server
-			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
-		fi
-	fi
-
-	echo
-	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
-	einfo "for upgrade instructions."
-	echo
-}

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.9.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.9.ebuild
deleted file mode 100644
index e97e19d6192..00000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.9.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic pam ssl-cert user
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="https://www.cyrusimap.org/"
-SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
-	mysql nntp pam perl postgres replication +server sieve snmp \
-	sphinx sqlite ssl static-libs tcpd test xapian"
-
-# virtual/mysql-5.5 added for the --variable= option below
-CDEPEND="sys-libs/zlib
-	dev-libs/libpcre
-	>=dev-libs/cyrus-sasl-2.1.13
-	dev-libs/jansson
-	dev-libs/icu:=
-	sys-libs/e2fsprogs-libs
-	afs? ( net-fs/openafs )
-	calalarm? ( dev-libs/libical )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2 dev-libs/libical )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lmdb? ( dev-db/lmdb )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-			virtual/pam
-			>=net-mail/mailbase-1
-		)
-	perl? ( dev-lang/perl:= )
-	postgres? ( dev-db/postgresql:* )
-	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
-	ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
-	sqlite? ( dev-db/sqlite:3 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )
-	xapian? ( >=dev-libs/xapian-1.4.0 )"
-
-DEPEND="${CDEPEND}
-	test? ( dev-util/cunit )"
-
-# all blockers really needed?
-# file collision with app-arch/dump - bug 619584
-RDEPEND="${CDEPEND}
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap
-	!app-arch/dump"
-
-REQUIRED_USE="afs? ( kerberos )
-	backup? ( sqlite )
-	calalarm? ( http )
-	http? ( sqlite )
-	sphinx? ( mysql )"
-
-# https://bugs.gentoo.org/678754
-# TODO: check underlinking for other libraries
-PATCHES=( "${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch" )
-
-pkg_setup() {
-	enewuser cyrus -1 -1 /usr/cyrus mail
-	# https://bugs.gentoo.org/604466
-	append-ldflags $(no-as-needed)
-}
-
-src_prepare() {
-	default
-	# Fix master(8)->cyrusmaster(8) manpage.
-	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -i -e 's:master\.8:cyrusmaster.8:g' \
-			-e 's:master(8):cyrusmaster(8):g' \
-			"${i}" || die "sed failed" || die "sed failed"
-	done
-	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
-	sed -i -e "s:MASTER:CYRUSMASTER:g" \
-		-e "s:Master:Cyrusmaster:g" \
-		-e "s:master:cyrusmaster:g" \
-		man/cyrusmaster.8 || die "sed failed"
-
-	# lock.h to afs/lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-	econf \
-		--enable-unit-tests \
-		--enable-murder \
-		--enable-idled \
-		--enable-event-notification \
-		--enable-autocreate \
-		--enable-pcre \
-		--with-com_err \
-		--with-cyrus-user=cyrus \
-		--with-sasl \
-		--without-krb \
-		--without-krbdes \
-		--enable-squat \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_enable backup) \
-		$(use_enable calalarm calalarmd) \
-		$(use_with caps libcap) \
-		$(use_with clamav) \
-		$(use_enable nntp) \
-		$(use_enable http) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with lmdb) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with perl) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable server) \
-		$(use_enable sieve) \
-		$(use_with snmp) \
-		$(use_enable sphinx) \
-		$(use_enable static-libs static) \
-		$(use_with tcpd libwrap) \
-		$(use_enable xapian) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALLDIRS=vendor install
-
-	dodoc README*
-	dodoc -r doc
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	rm -f doc/text/Makefile*
-
-	mv "${D}"usr/libexec/{master,cyrusmaster} || die
-
-	insinto /etc
-	newins "${D}usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
-	newins "${D}usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
-
-	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
-		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
-		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
-		"${D}"etc/imapd.conf
-
-	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
-		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
-		"${D}"etc/cyrus.conf
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-	# same thing for http(s) as well
-	if ! use http; then
-		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc8" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
-		keepdir "/var/${subdir}"
-		fowners cyrus:mail "/var/${subdir}"
-		fperms 0750 "/var/${subdir}"
-	done
-	for subdir in imap/{user,quota,sieve} spool/imap ; do
-		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
-			keepdir "/var/${subdir}/${i}"
-			fowners cyrus:mail "/var/${subdir}/${i}"
-			fperms 0750 "/var/${subdir}/${i}"
-		done
-	done
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} ; then
-		elog "For correct logging add the following to /etc/syslog.conf:"
-		elog "    local6.*         /var/log/imapd.log"
-		elog "    auth.debug       /var/log/auth.log"
-		echo
-
-		elog "You have to add user cyrus to the sasldb2. Do this with:"
-		elog "    saslpasswd2 cyrus"
-	fi
-}
-
-pkg_postinst() {
-	# do not install server.{key,pem) if they exist
-	if use ssl ; then
-		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
-			install_cert /etc/ssl/cyrus/server
-			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
-		fi
-	fi
-
-	echo
-	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
-	einfo "for upgrade instructions."
-	echo
-}


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2019-06-09 11:40 Pacho Ramos
  0 siblings, 0 replies; 85+ messages in thread
From: Pacho Ramos @ 2019-06-09 11:40 UTC (permalink / raw
  To: gentoo-commits

commit:     f6d75bdfc33d380556d045c5610e402b8799065e
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  9 11:38:22 2019 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 11:39:57 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6d75bdf

net-mail/cyrus-imapd: sphinx support is unmaintained and broken

Closes: https://bugs.gentoo.org/662944
Closes: https://bugs.gentoo.org/426044
Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild | 224 ++++++++++++++++++++++
 1 file changed, 224 insertions(+)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild
new file mode 100644
index 00000000000..2a381e5de2d
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic pam ssl-cert user
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="https://www.cyrusimap.org/"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
+	mysql nntp pam perl postgres replication +server sieve snmp \
+	sqlite ssl static-libs tcpd test xapian"
+
+CDEPEND="
+	sys-libs/zlib:0=
+	dev-libs/libpcre:3
+	>=dev-libs/cyrus-sasl-2.1.13:2
+	dev-libs/jansson
+	dev-libs/icu:0=
+	sys-libs/e2fsprogs-libs
+	afs? ( net-fs/openafs )
+	calalarm? ( dev-libs/libical:0= )
+	caps? ( sys-libs/libcap )
+	clamav? ( app-antivirus/clamav )
+	http? ( dev-libs/libxml2:2 dev-libs/libical:0= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lmdb? ( dev-db/lmdb:0= )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+			virtual/pam
+			>=net-mail/mailbase-1
+		)
+	perl? ( dev-lang/perl:= )
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= )
+	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist] )
+	sqlite? ( dev-db/sqlite:3 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6
+		snmp? ( net-analyzer/net-snmp:0=[tcpd=] )
+		)
+	xapian? ( >=dev-libs/xapian-1.4.0:0= )
+"
+DEPEND="${CDEPEND}
+	test? ( dev-util/cunit )
+"
+
+# all blockers really needed?
+# file collision with app-arch/dump - bug 619584
+RDEPEND="${CDEPEND}
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!app-arch/dump
+"
+
+REQUIRED_USE="
+	afs? ( kerberos )
+	backup? ( sqlite )
+	calalarm? ( http )
+	http? ( sqlite )
+"
+
+# https://bugs.gentoo.org/678754
+# TODO: check underlinking for other libraries
+PATCHES=( "${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch" )
+
+pkg_setup() {
+	enewuser cyrus -1 -1 /usr/cyrus mail
+	# https://bugs.gentoo.org/604466
+	append-ldflags $(no-as-needed)
+}
+
+src_prepare() {
+	default
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+	# sphinx is unmaintained and dead, bug #662944
+	econf \
+		--enable-unit-tests \
+		--enable-murder \
+		--enable-idled \
+		--enable-event-notification \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-com_err \
+		--with-cyrus-user=cyrus \
+		--with-sasl \
+		--without-krb \
+		--without-krbdes \
+		--disable-sphinx \
+		--enable-squat \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_enable backup) \
+		$(use_enable calalarm calalarmd) \
+		$(use_with caps libcap) \
+		$(use_with clamav) \
+		$(use_enable nntp) \
+		$(use_enable http) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with lmdb) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_with snmp) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		$(use_enable xapian) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dodoc -r doc
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	rm -f doc/text/Makefile*
+
+	mv "${D}"usr/libexec/{master,cyrusmaster} || die
+
+	insinto /etc
+	newins "${D}usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
+	newins "${D}usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
+
+	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
+		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
+		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
+		"${D}"etc/imapd.conf
+
+	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
+		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
+		"${D}"etc/cyrus.conf
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+	# same thing for http(s) as well
+	if ! use http; then
+		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	newinitd "${FILESDIR}/cyrus.rc8" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		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
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist
+	if use ssl ; then
+		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+
+	echo
+	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "for upgrade instructions."
+	echo
+}


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2019-06-04 19:01 Agostino Sarubbo
  0 siblings, 0 replies; 85+ messages in thread
From: Agostino Sarubbo @ 2019-06-04 19:01 UTC (permalink / raw
  To: gentoo-commits

commit:     4012cca3ff21c0cedc2d130547b5e4b48922ae81
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  4 19:00:45 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Jun  4 19:00:45 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4012cca3

net-mail/cyrus-imapd: ppc stable wrt bug #649996

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="ppc"

 net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild
index 2383aa3d9fd..ba030ccce89 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http jmap kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sphinx sqlite ssl static-libs tcpd test xapian"


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2019-06-03 15:00 Agostino Sarubbo
  0 siblings, 0 replies; 85+ messages in thread
From: Agostino Sarubbo @ 2019-06-03 15:00 UTC (permalink / raw
  To: gentoo-commits

commit:     71fa45a1edd795cc66f80ee7c70a98fac37bc2c4
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  3 14:59:43 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Jun  3 14:59:43 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71fa45a1

net-mail/cyrus-imapd: ppc64 stable wrt bug #649996

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="ppc64"

 net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild
index 20d7ed75d76..2383aa3d9fd 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http jmap kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sphinx sqlite ssl static-libs tcpd test xapian"


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2019-05-28 10:17 Eray Aslan
  0 siblings, 0 replies; 85+ messages in thread
From: Eray Aslan @ 2019-05-28 10:17 UTC (permalink / raw
  To: gentoo-commits

commit:     ac3a4f5a9f0f61453e755749f28a66960ce9a81b
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Tue May 28 10:16:55 2019 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Tue May 28 10:16:55 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac3a4f5a

net-mail/cyrus-imapd: security bump to 3.0.10

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Eray Aslan <eras <AT> gentoo.org>

 net-mail/cyrus-imapd/Manifest                  |   1 +
 net-mail/cyrus-imapd/cyrus-imapd-3.0.10.ebuild | 217 +++++++++++++++++++++++++
 2 files changed, 218 insertions(+)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index d13e6897628..931da492bf2 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,3 +1,4 @@
+DIST cyrus-imapd-3.0.10.tar.gz 10766263 BLAKE2B 366a8f524849d2173b8ea836e9f239ae20295dd435594af17d4c4682e7e672bc92c9f1bb0a60d7f7dce638beb94954f20906f9454b33830d2dcabb956ebd558a SHA512 1ae153a8f181bbe020326bec2dc177b78ef3c442f94e24e89b7a719298d93701006596dd21fa1c3a40afd75f01162b03524cf793dd7438ec7192f9a13f7614d0
 DIST cyrus-imapd-3.0.4.tar.gz 10819487 BLAKE2B 209e379731c996ee083b0de61d6122b3756d1f6880071ebf015157057cf45845961d762ee762ae56213f72f15c01df29ab2d2661c4e352c6b4a680924d15d7b0 SHA512 9ceb7ac837c932c70fa0c1583bf8700b3ec27568d72538ae8d59f2f551e3007b3c2fc68fd29c009597c3949345dbe1bf2eb614bea038d70a5b49e5507df6b69a
 DIST cyrus-imapd-3.0.5.tar.gz 10910080 BLAKE2B a7914ab189a290427ddc0d013c19ff0c36f3a6c4fc016f50013d0f6abb11ae2f7d067b71df99b7f00ba4e8a2170e0f068baa170458b0dc1e94d69d8e4b814873 SHA512 262806729d5ee5d753732603aa7af33c6f96bc5145b7a951b8668ffdee0dcd4a90bd287da0949e85c4596cccb471a688f7f8b6f3e39194e1cff311950d4d4410
 DIST cyrus-imapd-3.0.6.tar.gz 10734548 BLAKE2B d16d1093b17f632fa75e77c1b923deb0c5a76de4c06a657c4c1dd2f9498ac0abd81ecee58c64378118d4b09be872957afc6db5d8deebf72c819623d6ea5aa0a9 SHA512 375e3936465e9ee448996cf738ebe93a35697a58a7784cf6f7a8be25e3e03925fb4f44ff98a0aacbc5b9e3ef39fc8a0e51acb4ea26cbbfbc8e492556fdc03a03

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.10.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.10.ebuild
new file mode 100644
index 00000000000..5bf98d12a9b
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.10.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic pam ssl-cert user
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="https://www.cyrusimap.org/"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
+	mysql nntp pam perl postgres replication +server sieve snmp \
+	sphinx sqlite ssl static-libs tcpd test xapian"
+
+CDEPEND="sys-libs/zlib
+	dev-libs/libpcre
+	>=dev-libs/cyrus-sasl-2.1.13
+	dev-libs/jansson
+	dev-libs/icu:=
+	sys-libs/e2fsprogs-libs
+	afs? ( net-fs/openafs )
+	calalarm? ( dev-libs/libical )
+	caps? ( sys-libs/libcap )
+	clamav? ( app-antivirus/clamav )
+	http? ( dev-libs/libxml2 dev-libs/libical )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lmdb? ( dev-db/lmdb )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+			virtual/pam
+			>=net-mail/mailbase-1
+		)
+	perl? ( dev-lang/perl:= )
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
+	ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
+	sqlite? ( dev-db/sqlite:3 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )
+	xapian? ( >=dev-libs/xapian-1.4.0 )"
+
+DEPEND="${CDEPEND}
+	test? ( dev-util/cunit )"
+
+# all blockers really needed?
+# file collision with app-arch/dump - bug 619584
+RDEPEND="${CDEPEND}
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!app-arch/dump"
+
+REQUIRED_USE="afs? ( kerberos )
+	backup? ( sqlite )
+	calalarm? ( http )
+	http? ( sqlite )
+	sphinx? ( mysql )"
+
+# https://bugs.gentoo.org/678754
+# TODO: check underlinking for other libraries
+PATCHES=( "${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch" )
+
+pkg_setup() {
+	enewuser cyrus -1 -1 /usr/cyrus mail
+	# https://bugs.gentoo.org/604466
+	append-ldflags $(no-as-needed)
+}
+
+src_prepare() {
+	default
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+	econf \
+		--enable-unit-tests \
+		--enable-murder \
+		--enable-idled \
+		--enable-event-notification \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-com_err \
+		--with-cyrus-user=cyrus \
+		--with-sasl \
+		--without-krb \
+		--without-krbdes \
+		--enable-squat \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_enable backup) \
+		$(use_enable calalarm calalarmd) \
+		$(use_with caps libcap) \
+		$(use_with clamav) \
+		$(use_enable nntp) \
+		$(use_enable http) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with lmdb) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_with snmp) \
+		$(use_enable sphinx) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		$(use_enable xapian) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dodoc -r doc
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	rm -f doc/text/Makefile*
+
+	mv "${D}"usr/libexec/{master,cyrusmaster} || die
+
+	insinto /etc
+	newins "${D}usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
+	newins "${D}usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
+
+	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
+		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
+		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
+		"${D}"etc/imapd.conf
+
+	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
+		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
+		"${D}"etc/cyrus.conf
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+	# same thing for http(s) as well
+	if ! use http; then
+		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	newinitd "${FILESDIR}/cyrus.rc8" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		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
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist
+	if use ssl ; then
+		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+
+	echo
+	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "for upgrade instructions."
+	echo
+}


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2019-04-06 22:23 Patrice Clement
  0 siblings, 0 replies; 85+ messages in thread
From: Patrice Clement @ 2019-04-06 22:23 UTC (permalink / raw
  To: gentoo-commits

commit:     28b6137053eb458be5f9e342dbb05d4608e83366
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Apr  5 09:40:53 2019 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Apr  6 22:22:17 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28b61370

net-mail/cyrus-imapd: use HTTPS.

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild    | 6 +++---
 net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild    | 6 +++---
 net-mail/cyrus-imapd/cyrus-imapd-3.0.6.ebuild    | 6 +++---
 net-mail/cyrus-imapd/cyrus-imapd-3.0.8-r1.ebuild | 4 ++--
 net-mail/cyrus-imapd/cyrus-imapd-3.0.9.ebuild    | 4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild
index 96e20cb3c07..6537bc8a826 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit autotools pam ssl-cert user
 MY_P=${P/_/}
 
 DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="http://www.cyrusimap.org/"
+HOMEPAGE="https://www.cyrusimap.org/"
 SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
@@ -214,7 +214,7 @@ pkg_postinst() {
 	fi
 
 	echo
-	ewarn "Please see http://www.cyrusimap.org/imap/download/upgrade.html"
+	ewarn "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
 	ewarn "for upgrade instructions."
 	echo
 }

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild
index cac40e0b55c..20d7ed75d76 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit autotools flag-o-matic pam ssl-cert user
 MY_P=${P/_/}
 
 DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="http://www.cyrusimap.org/"
+HOMEPAGE="https://www.cyrusimap.org/"
 SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
@@ -215,7 +215,7 @@ pkg_postinst() {
 	fi
 
 	echo
-	ewarn "Please see http://www.cyrusimap.org/imap/download/upgrade.html"
+	ewarn "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
 	ewarn "for upgrade instructions."
 	echo
 }

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.6.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.6.ebuild
index b5c209187c1..54e10fe359c 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.6.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit autotools flag-o-matic pam ssl-cert user
 MY_P=${P/_/}
 
 DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="http://www.cyrusimap.org/"
+HOMEPAGE="https://www.cyrusimap.org/"
 SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
@@ -215,7 +215,7 @@ pkg_postinst() {
 	fi
 
 	echo
-	einfo "Please see http://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
 	einfo "for upgrade instructions."
 	echo
 }

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.8-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.8-r1.ebuild
index 766fa2077b8..330e8d86ef2 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.8-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.8-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit autotools flag-o-matic pam ssl-cert user
 
 DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="http://www.cyrusimap.org/"
+HOMEPAGE="https://www.cyrusimap.org/"
 SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
@@ -208,7 +208,7 @@ pkg_postinst() {
 	fi
 
 	echo
-	einfo "Please see http://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
 	einfo "for upgrade instructions."
 	echo
 }

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.9.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.9.ebuild
index c6ba07699df..e97e19d6192 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.9.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.9.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit autotools flag-o-matic pam ssl-cert user
 
 DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="http://www.cyrusimap.org/"
+HOMEPAGE="https://www.cyrusimap.org/"
 SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
@@ -212,7 +212,7 @@ pkg_postinst() {
 	fi
 
 	echo
-	einfo "Please see http://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
 	einfo "for upgrade instructions."
 	echo
 }


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2019-03-26 20:17 Aaron Bauman
  0 siblings, 0 replies; 85+ messages in thread
From: Aaron Bauman @ 2019-03-26 20:17 UTC (permalink / raw
  To: gentoo-commits

commit:     d42a9a705011844ad02903274ef730b0d129b50a
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 20:15:23 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 20:17:04 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d42a9a70

net-mail/cyrus-imapd: drop vulnerable wrt bug #630684

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 net-mail/cyrus-imapd/Manifest                     |   2 -
 net-mail/cyrus-imapd/cyrus-imapd-2.5.10.ebuild    | 177 ---------------------
 net-mail/cyrus-imapd/cyrus-imapd-2.5.11-r1.ebuild | 180 ----------------------
 3 files changed, 359 deletions(-)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 6f70f5a7858..d13e6897628 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,5 +1,3 @@
-DIST cyrus-imapd-2.5.10.tar.gz 3103914 BLAKE2B 588764d47b3d458633e0ced2619cc1cccdf26c18d54effd38d4f9f6df12ad98f554efa632af9c7e4b43d7899b04a14a8a71fc152ea360a38cdab6a50685ddf5e SHA512 78b85e37c63f1dbb60898da229f70f45810326a01244067d23b1317e2c2ae3326e48b6944787d59024e44c48c441ed2b848d6a83c451c192a3bb95c8f37880fa
-DIST cyrus-imapd-2.5.11.tar.gz 3109188 BLAKE2B 9382d8e4b9317f7fa12f63f7262eb0c6a1571d405665694f735fb72b6de76058ea586172f2001babe280170f122c887374b1378f51fe9c89a522aaeb74b885c9 SHA512 bbb0e11f31d91d85037306321165e3608f8d5e2699b971fc4fbdd1630ec0a1485c8f6f17900142dec584ab41b0ec0c65c11cfaf8c5bbf1054b194a8f5f361538
 DIST cyrus-imapd-3.0.4.tar.gz 10819487 BLAKE2B 209e379731c996ee083b0de61d6122b3756d1f6880071ebf015157057cf45845961d762ee762ae56213f72f15c01df29ab2d2661c4e352c6b4a680924d15d7b0 SHA512 9ceb7ac837c932c70fa0c1583bf8700b3ec27568d72538ae8d59f2f551e3007b3c2fc68fd29c009597c3949345dbe1bf2eb614bea038d70a5b49e5507df6b69a
 DIST cyrus-imapd-3.0.5.tar.gz 10910080 BLAKE2B a7914ab189a290427ddc0d013c19ff0c36f3a6c4fc016f50013d0f6abb11ae2f7d067b71df99b7f00ba4e8a2170e0f068baa170458b0dc1e94d69d8e4b814873 SHA512 262806729d5ee5d753732603aa7af33c6f96bc5145b7a951b8668ffdee0dcd4a90bd287da0949e85c4596cccb471a688f7f8b6f3e39194e1cff311950d4d4410
 DIST cyrus-imapd-3.0.6.tar.gz 10734548 BLAKE2B d16d1093b17f632fa75e77c1b923deb0c5a76de4c06a657c4c1dd2f9498ac0abd81ecee58c64378118d4b09be872957afc6db5d8deebf72c819623d6ea5aa0a9 SHA512 375e3936465e9ee448996cf738ebe93a35697a58a7784cf6f7a8be25e3e03925fb4f44ff98a0aacbc5b9e3ef39fc8a0e51acb4ea26cbbfbc8e492556fdc03a03

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.5.10.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.5.10.ebuild
deleted file mode 100644
index 7d18d33ec91..00000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.5.10.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools multilib pam ssl-cert user toolchain-funcs
-
-MY_P=${P/_/}
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="http://www.cyrusimap.org/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="afs berkdb clamav http kerberos mysql nntp pam perl postgres \
-	replication +server sieve snmp sqlite ssl static-libs tcpd"
-
-# virtual/mysql-5.5 added for the --variable= option below
-DEPEND="sys-libs/zlib
-	dev-libs/libpcre
-	>=dev-libs/cyrus-sasl-2.1.13
-	dev-libs/jansson
-	afs? ( net-fs/openafs )
-	berkdb? ( >=sys-libs/db-3.2:* )
-	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2 dev-libs/libical )
-	kerberos? ( virtual/krb5 )
-	mysql? ( >=virtual/mysql-5.5 )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-			virtual/pam
-			>=net-mail/mailbase-1
-		)
-	postgres? ( dev-db/postgresql:* )
-	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
-
-# all blockers really needed?
-RDEPEND="${DEPEND}
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap
-	!net-mail/cyrus-imap-admin"
-
-REQUIRED_USE="afs? ( kerberos )
-	http? ( sqlite )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewuser cyrus -1 -1 /usr/cyrus mail
-}
-
-src_prepare() {
-	eapply -p0 "${FILESDIR}/${PN}-db.patch"
-	# Fix master(8)->cyrusmaster(8) manpage.
-	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -i -e 's:master\.8:cyrusmaster.8:g' \
-			-e 's:master(8):cyrusmaster(8):g' \
-			"${i}" || die "sed failed" || die "sed failed"
-	done
-	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
-	sed -i -e "s:MASTER:CYRUSMASTER:g" \
-		-e "s:Master:Cyrusmaster:g" \
-		-e "s:master:cyrusmaster:g" \
-		man/cyrusmaster.8 || die "sed failed"
-
-	# lock.h to afs/lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-	econf \
-		--enable-murder \
-		--enable-netscapehack \
-		--enable-idled \
-		--enable-event-notification \
-		--enable-autocreate \
-		--enable-pcre \
-		--with-service-path=/usr/$(get_libdir)/cyrus \
-		--with-cyrus-user=cyrus \
-		--with-cyrus-group=mail \
-		--with-com_err=yes \
-		--with-sasl \
-		--without-krb \
-		--without-krbdes \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_with berkdb bdb) \
-		$(use_with clamav) \
-		$(use_enable nntp) \
-		$(use_enable http) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with perl) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable server) \
-		$(use_enable sieve) \
-		$(use_with snmp) \
-		$(use_enable static-libs static) \
-		$(use_with tcpd libwrap) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALLDIRS=vendor install
-
-	dodoc README*
-	dodoc -r doc
-	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	rm -f doc/text/Makefile*
-
-	insinto /etc
-	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc6" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
-		keepdir "/var/${subdir}"
-		fowners cyrus:mail "/var/${subdir}"
-		fperms 0750 "/var/${subdir}"
-	done
-	for subdir in imap/{user,quota,sieve} spool/imap ; do
-		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
-			keepdir "/var/${subdir}/${i}"
-			fowners cyrus:mail "/var/${subdir}/${i}"
-			fperms 0750 "/var/${subdir}/${i}"
-		done
-	done
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} ; then
-		elog "For correct logging add the following to /etc/syslog.conf:"
-		elog "    local6.*         /var/log/imapd.log"
-		elog "    auth.debug       /var/log/auth.log"
-		echo
-
-		elog "You have to add user cyrus to the sasldb2. Do this with:"
-		elog "    saslpasswd2 cyrus"
-	fi
-}
-
-pkg_postinst() {
-	# do not install server.{key,pem) if they exist.
-	if use ssl ; then
-		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
-			install_cert /etc/ssl/cyrus/server
-			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
-		fi
-	fi
-}

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.5.11-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.5.11-r1.ebuild
deleted file mode 100644
index cbe96037773..00000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.5.11-r1.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools multilib pam ssl-cert user toolchain-funcs
-
-MY_P=${P/_/}
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="http://www.cyrusimap.org/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="afs berkdb clamav http kerberos mysql nntp pam perl postgres \
-	replication +server sieve snmp sqlite ssl static-libs tcpd"
-
-# virtual/mysql-5.5 added for the --variable= option below
-DEPEND="sys-libs/zlib
-	dev-libs/libpcre
-	>=dev-libs/cyrus-sasl-2.1.13
-	dev-libs/jansson
-	afs? ( net-fs/openafs )
-	berkdb? ( >=sys-libs/db-3.2:* )
-	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2 dev-libs/libical )
-	kerberos? ( virtual/krb5 )
-	mysql? ( >=virtual/mysql-5.5 )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-			virtual/pam
-			>=net-mail/mailbase-1
-		)
-	perl? ( dev-lang/perl:= )
-	postgres? ( dev-db/postgresql:* )
-	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
-
-# all blockers really needed?
-RDEPEND="${DEPEND}
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap
-	!net-mail/cyrus-imap-admin"
-
-REQUIRED_USE="afs? ( kerberos )
-	http? ( sqlite )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewuser cyrus -1 -1 /usr/cyrus mail
-}
-
-src_prepare() {
-	eapply -p0 "${FILESDIR}/${PN}-db.patch"
-	# bug 604470
-	eapply -p1 "${FILESDIR}/${PN}-sieve-libs.patch"
-	# Fix master(8)->cyrusmaster(8) manpage.
-	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -i -e 's:master\.8:cyrusmaster.8:g' \
-			-e 's:master(8):cyrusmaster(8):g' \
-			"${i}" || die "sed failed" || die "sed failed"
-	done
-	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
-	sed -i -e "s:MASTER:CYRUSMASTER:g" \
-		-e "s:Master:Cyrusmaster:g" \
-		-e "s:master:cyrusmaster:g" \
-		man/cyrusmaster.8 || die "sed failed"
-
-	# lock.h to afs/lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-	econf \
-		--enable-murder \
-		--enable-netscapehack \
-		--enable-idled \
-		--enable-event-notification \
-		--enable-autocreate \
-		--enable-pcre \
-		--with-service-path=/usr/$(get_libdir)/cyrus \
-		--with-cyrus-user=cyrus \
-		--with-cyrus-group=mail \
-		--with-com_err=yes \
-		--with-sasl \
-		--without-krb \
-		--without-krbdes \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_with berkdb bdb) \
-		$(use_with clamav) \
-		$(use_enable nntp) \
-		$(use_enable http) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with perl) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable server) \
-		$(use_enable sieve) \
-		$(use_with snmp) \
-		$(use_enable static-libs static) \
-		$(use_with tcpd libwrap) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALLDIRS=vendor install
-
-	dodoc README*
-	dodoc -r doc
-	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	rm -f doc/text/Makefile*
-
-	insinto /etc
-	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc6" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
-		keepdir "/var/${subdir}"
-		fowners cyrus:mail "/var/${subdir}"
-		fperms 0750 "/var/${subdir}"
-	done
-	for subdir in imap/{user,quota,sieve} spool/imap ; do
-		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
-			keepdir "/var/${subdir}/${i}"
-			fowners cyrus:mail "/var/${subdir}/${i}"
-			fperms 0750 "/var/${subdir}/${i}"
-		done
-	done
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} ; then
-		elog "For correct logging add the following to /etc/syslog.conf:"
-		elog "    local6.*         /var/log/imapd.log"
-		elog "    auth.debug       /var/log/auth.log"
-		echo
-
-		elog "You have to add user cyrus to the sasldb2. Do this with:"
-		elog "    saslpasswd2 cyrus"
-	fi
-}
-
-pkg_postinst() {
-	# do not install server.{key,pem) if they exist.
-	if use ssl ; then
-		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
-			install_cert /etc/ssl/cyrus/server
-			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
-		fi
-	fi
-}


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2019-02-18 20:29 Brian Evans
  0 siblings, 0 replies; 85+ messages in thread
From: Brian Evans @ 2019-02-18 20:29 UTC (permalink / raw
  To: gentoo-commits

commit:     3dcf13d18e8f24762a4c3b07f4e6765c944f2e27
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 18 20:29:22 2019 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Feb 18 20:29:22 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dcf13d1

net-mail/cyrus-imapd: Revbump for mysql dependency change

Non-maintainer commit

Bug: https://bugs.gentoo.org/665990
Package-Manager: Portage-2.3.61, Repoman-2.3.12
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 .../{cyrus-imapd-3.0.8.ebuild => cyrus-imapd-3.0.8-r1.ebuild}         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.8.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.8-r1.ebuild
similarity index 98%
rename from net-mail/cyrus-imapd/cyrus-imapd-3.0.8.ebuild
rename to net-mail/cyrus-imapd/cyrus-imapd-3.0.8-r1.ebuild
index 610dbc059bc..766fa2077b8 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.8.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,7 +30,7 @@ CDEPEND="sys-libs/zlib
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
 	lmdb? ( dev-db/lmdb )
-	mysql? ( >=virtual/mysql-5.5 )
+	mysql? ( dev-db/mysql-connector-c:0= )
 	nntp? ( !net-nntp/leafnode )
 	pam? (
 			virtual/pam


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2018-08-29  5:41 Eray Aslan
  0 siblings, 0 replies; 85+ messages in thread
From: Eray Aslan @ 2018-08-29  5:41 UTC (permalink / raw
  To: gentoo-commits

commit:     389b3bff88b2a65bc0f2f60802e6926eb06b62cd
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 29 05:41:16 2018 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Wed Aug 29 05:41:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=389b3bff

net-mail/cyrus-imapd: QA: blank line

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 net-mail/cyrus-imapd/cyrus-imapd-3.0.8.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.8.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.8.ebuild
index 8ab9e5689ef..610dbc059bc 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.8.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.8.ebuild
@@ -4,7 +4,6 @@
 EAPI=6
 inherit autotools flag-o-matic pam ssl-cert user
 
-
 DESCRIPTION="The Cyrus IMAP Server"
 HOMEPAGE="http://www.cyrusimap.org/"
 SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2018-08-29  5:41 Eray Aslan
  0 siblings, 0 replies; 85+ messages in thread
From: Eray Aslan @ 2018-08-29  5:41 UTC (permalink / raw
  To: gentoo-commits

commit:     8cdc8022c7e57f8e98dd856364a05753a642bc9b
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 29 05:40:12 2018 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Wed Aug 29 05:40:12 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cdc8022

net-mail/cyrus-imapd: bump to 3.0.8

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 net-mail/cyrus-imapd/Manifest                 |   1 +
 net-mail/cyrus-imapd/cyrus-imapd-3.0.8.ebuild | 215 ++++++++++++++++++++++++++
 2 files changed, 216 insertions(+)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index fd7b4a36bf9..36d2675692e 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -3,3 +3,4 @@ DIST cyrus-imapd-2.5.11.tar.gz 3109188 BLAKE2B 9382d8e4b9317f7fa12f63f7262eb0c6a
 DIST cyrus-imapd-3.0.4.tar.gz 10819487 BLAKE2B 209e379731c996ee083b0de61d6122b3756d1f6880071ebf015157057cf45845961d762ee762ae56213f72f15c01df29ab2d2661c4e352c6b4a680924d15d7b0 SHA512 9ceb7ac837c932c70fa0c1583bf8700b3ec27568d72538ae8d59f2f551e3007b3c2fc68fd29c009597c3949345dbe1bf2eb614bea038d70a5b49e5507df6b69a
 DIST cyrus-imapd-3.0.5.tar.gz 10910080 BLAKE2B a7914ab189a290427ddc0d013c19ff0c36f3a6c4fc016f50013d0f6abb11ae2f7d067b71df99b7f00ba4e8a2170e0f068baa170458b0dc1e94d69d8e4b814873 SHA512 262806729d5ee5d753732603aa7af33c6f96bc5145b7a951b8668ffdee0dcd4a90bd287da0949e85c4596cccb471a688f7f8b6f3e39194e1cff311950d4d4410
 DIST cyrus-imapd-3.0.6.tar.gz 10734548 BLAKE2B d16d1093b17f632fa75e77c1b923deb0c5a76de4c06a657c4c1dd2f9498ac0abd81ecee58c64378118d4b09be872957afc6db5d8deebf72c819623d6ea5aa0a9 SHA512 375e3936465e9ee448996cf738ebe93a35697a58a7784cf6f7a8be25e3e03925fb4f44ff98a0aacbc5b9e3ef39fc8a0e51acb4ea26cbbfbc8e492556fdc03a03
+DIST cyrus-imapd-3.0.8.tar.gz 10735462 BLAKE2B 27fdead9a75048c12fe4c0eed1dcda9ce24319c2183851190068fd3ded32c1f6b4d550e726dd4a483bafe298ac0199aa2b1354c6f0c5ac0083d7d1ad0e69457a SHA512 f4aa9877e62479439bee2ca29f452bd7e9daa091c19bf3567aa7f493f5163c98b44086b749c70981402212ff90e19d9125b508cfcc077088f8c705e533812960

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.8.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.8.ebuild
new file mode 100644
index 00000000000..8ab9e5689ef
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.8.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic pam ssl-cert user
+
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="http://www.cyrusimap.org/"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
+	mysql nntp pam perl postgres replication +server sieve snmp \
+	sphinx sqlite ssl static-libs tcpd test xapian"
+
+# virtual/mysql-5.5 added for the --variable= option below
+CDEPEND="sys-libs/zlib
+	dev-libs/libpcre
+	>=dev-libs/cyrus-sasl-2.1.13
+	dev-libs/jansson
+	dev-libs/icu:=
+	sys-libs/e2fsprogs-libs
+	afs? ( net-fs/openafs )
+	calalarm? ( dev-libs/libical )
+	caps? ( sys-libs/libcap )
+	clamav? ( app-antivirus/clamav )
+	http? ( dev-libs/libxml2 dev-libs/libical )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lmdb? ( dev-db/lmdb )
+	mysql? ( >=virtual/mysql-5.5 )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+			virtual/pam
+			>=net-mail/mailbase-1
+		)
+	perl? ( dev-lang/perl:= )
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
+	ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
+	sqlite? ( dev-db/sqlite:3 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )
+	xapian? ( >=dev-libs/xapian-1.4.0 )"
+
+DEPEND="${CDEPEND}
+	test? ( dev-util/cunit )"
+
+# all blockers really needed?
+# file collision with app-arch/dump - bug 619584
+RDEPEND="${CDEPEND}
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!net-mail/cyrus-imap-admin
+	!app-arch/dump"
+
+REQUIRED_USE="afs? ( kerberos )
+	backup? ( sqlite )
+	calalarm? ( http )
+	http? ( sqlite )
+	sphinx? ( mysql )"
+
+pkg_setup() {
+	enewuser cyrus -1 -1 /usr/cyrus mail
+	append-ldflags $(no-as-needed)
+}
+
+src_prepare() {
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+	econf \
+		--enable-unit-tests \
+		--enable-murder \
+		--enable-idled \
+		--enable-event-notification \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-cyrus-user=cyrus \
+		--with-cyrus-group=mail \
+		--with-sasl \
+		--without-krb \
+		--without-krbdes \
+		--enable-squat \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_enable backup) \
+		$(use_enable calalarm calalarmd) \
+		$(use_with caps libcap) \
+		$(use_with clamav) \
+		$(use_enable nntp) \
+		$(use_enable http) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with lmdb) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_with snmp) \
+		$(use_enable sphinx) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		$(use_enable xapian) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dodoc -r doc
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	rm -f doc/text/Makefile*
+
+	mv "${D}"usr/libexec/{master,cyrusmaster} || die
+
+	insinto /etc
+	newins "${D}usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
+	newins "${D}usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
+
+	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
+		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
+		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
+		"${D}"etc/imapd.conf
+
+	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
+		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
+		"${D}"etc/cyrus.conf
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+	# same thing for http(s) as well
+	if ! use http; then
+		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	newinitd "${FILESDIR}/cyrus.rc8" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		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
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist
+	if use ssl ; then
+		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+
+	echo
+	einfo "Please see http://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "for upgrade instructions."
+	echo
+}


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2018-04-30  8:06 Eray Aslan
  0 siblings, 0 replies; 85+ messages in thread
From: Eray Aslan @ 2018-04-30  8:06 UTC (permalink / raw
  To: gentoo-commits

commit:     d5932d124e6d6505b7bf5b230ee22444c4065345
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 30 08:05:27 2018 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Mon Apr 30 08:05:27 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5932d12

net-mail/cyrus-imapd: bump to 3.0.6

and fix dependencies and file collisions

Fixes: https://bugs.gentoo.org/650200
Fixes: https://bugs.gentoo.org/627168
Fixes: https://bugs.gentoo.org/619584
Fixes: https://bugs.gentoo.org/618846
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 net-mail/cyrus-imapd/Manifest                 |   1 +
 net-mail/cyrus-imapd/cyrus-imapd-3.0.6.ebuild | 221 ++++++++++++++++++++++++++
 2 files changed, 222 insertions(+)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 102d9c65627..fd7b4a36bf9 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -2,3 +2,4 @@ DIST cyrus-imapd-2.5.10.tar.gz 3103914 BLAKE2B 588764d47b3d458633e0ced2619cc1ccc
 DIST cyrus-imapd-2.5.11.tar.gz 3109188 BLAKE2B 9382d8e4b9317f7fa12f63f7262eb0c6a1571d405665694f735fb72b6de76058ea586172f2001babe280170f122c887374b1378f51fe9c89a522aaeb74b885c9 SHA512 bbb0e11f31d91d85037306321165e3608f8d5e2699b971fc4fbdd1630ec0a1485c8f6f17900142dec584ab41b0ec0c65c11cfaf8c5bbf1054b194a8f5f361538
 DIST cyrus-imapd-3.0.4.tar.gz 10819487 BLAKE2B 209e379731c996ee083b0de61d6122b3756d1f6880071ebf015157057cf45845961d762ee762ae56213f72f15c01df29ab2d2661c4e352c6b4a680924d15d7b0 SHA512 9ceb7ac837c932c70fa0c1583bf8700b3ec27568d72538ae8d59f2f551e3007b3c2fc68fd29c009597c3949345dbe1bf2eb614bea038d70a5b49e5507df6b69a
 DIST cyrus-imapd-3.0.5.tar.gz 10910080 BLAKE2B a7914ab189a290427ddc0d013c19ff0c36f3a6c4fc016f50013d0f6abb11ae2f7d067b71df99b7f00ba4e8a2170e0f068baa170458b0dc1e94d69d8e4b814873 SHA512 262806729d5ee5d753732603aa7af33c6f96bc5145b7a951b8668ffdee0dcd4a90bd287da0949e85c4596cccb471a688f7f8b6f3e39194e1cff311950d4d4410
+DIST cyrus-imapd-3.0.6.tar.gz 10734548 BLAKE2B d16d1093b17f632fa75e77c1b923deb0c5a76de4c06a657c4c1dd2f9498ac0abd81ecee58c64378118d4b09be872957afc6db5d8deebf72c819623d6ea5aa0a9 SHA512 375e3936465e9ee448996cf738ebe93a35697a58a7784cf6f7a8be25e3e03925fb4f44ff98a0aacbc5b9e3ef39fc8a0e51acb4ea26cbbfbc8e492556fdc03a03

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.6.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.6.ebuild
new file mode 100644
index 00000000000..b5c209187c1
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.6.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic pam ssl-cert user
+
+MY_P=${P/_/}
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="http://www.cyrusimap.org/"
+SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
+
+LICENSE="BSD-with-attribution"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
+	mysql nntp pam perl postgres replication +server sieve snmp \
+	sphinx sqlite ssl static-libs tcpd test xapian"
+
+# virtual/mysql-5.5 added for the --variable= option below
+CDEPEND="sys-libs/zlib
+	dev-libs/libpcre
+	>=dev-libs/cyrus-sasl-2.1.13
+	dev-libs/jansson
+	dev-libs/icu:=
+	sys-libs/e2fsprogs-libs
+	afs? ( net-fs/openafs )
+	calalarm? ( dev-libs/libical )
+	caps? ( sys-libs/libcap )
+	clamav? ( app-antivirus/clamav )
+	http? ( dev-libs/libxml2 dev-libs/libical )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lmdb? ( dev-db/lmdb )
+	mysql? ( >=virtual/mysql-5.5 )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+			virtual/pam
+			>=net-mail/mailbase-1
+		)
+	perl? ( dev-lang/perl:= )
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
+	ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
+	sqlite? ( dev-db/sqlite:3 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )
+	xapian? ( >=dev-libs/xapian-1.4.0 )"
+
+DEPEND="${CDEPEND}
+	test? ( dev-util/cunit )"
+
+# all blockers really needed?
+# file collision with app-arch/dump - bug 619584
+RDEPEND="${CDEPEND}
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!net-mail/cyrus-imap-admin
+	!app-arch/dump"
+
+REQUIRED_USE="afs? ( kerberos )
+	backup? ( sqlite )
+	calalarm? ( http )
+	http? ( sqlite )
+	sphinx? ( mysql )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewuser cyrus -1 -1 /usr/cyrus mail
+	append-ldflags $(no-as-needed)
+}
+
+src_prepare() {
+	# bug 604470
+	eapply -p1 "${FILESDIR}/${PN}-sieve-libs-v4.patch"
+	eapply -p1 "${FILESDIR}/${PN}-libcap-libs.patch"
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+	econf \
+		--enable-unit-tests \
+		--enable-murder \
+		--enable-idled \
+		--enable-event-notification \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-cyrus-user=cyrus \
+		--with-cyrus-group=mail \
+		--with-sasl \
+		--without-krb \
+		--without-krbdes \
+		--enable-squat \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_enable backup) \
+		$(use_enable calalarm calalarmd) \
+		$(use_with caps libcap) \
+		$(use_with clamav) \
+		$(use_enable nntp) \
+		$(use_enable http) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with lmdb) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_with snmp) \
+		$(use_enable sphinx) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		$(use_enable xapian) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dodoc -r doc
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	rm -f doc/text/Makefile*
+
+	mv "${D}"usr/libexec/{master,cyrusmaster} || die
+
+	insinto /etc
+	newins "${D}usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
+	newins "${D}usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
+
+	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
+		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
+		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
+		"${D}"etc/imapd.conf
+
+	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
+		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
+		"${D}"etc/cyrus.conf
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+	# same thing for http(s) as well
+	if ! use http; then
+		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	newinitd "${FILESDIR}/cyrus.rc8" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		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
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist
+	if use ssl ; then
+		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+
+	echo
+	einfo "Please see http://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "for upgrade instructions."
+	echo
+}


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2018-03-15 11:09 Mikle Kolyada
  0 siblings, 0 replies; 85+ messages in thread
From: Mikle Kolyada @ 2018-03-15 11:09 UTC (permalink / raw
  To: gentoo-commits

commit:     00f1c87d85e74df1373536abe483ac80a2b70200
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 15 11:08:59 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Mar 15 11:09:17 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00f1c87d

net-mail/cyrus-imapd: amd64 stable wrt bug #649996

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild
index 41ed463d0e0..cac40e0b55c 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http jmap kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sphinx sqlite ssl static-libs tcpd test xapian"


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2018-03-11  2:16 Thomas Deutschmann
  0 siblings, 0 replies; 85+ messages in thread
From: Thomas Deutschmann @ 2018-03-11  2:16 UTC (permalink / raw
  To: gentoo-commits

commit:     d999fe7e3d42b1306f635ed87a178d8033e30b02
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 11 02:06:05 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 11 02:16:28 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d999fe7e

net-mail/cyrus-imapd: x86 stable (bug #649996)

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild
index 13ed85c3a1d..41ed463d0e0 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http jmap kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sphinx sqlite ssl static-libs tcpd test xapian"


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2018-01-22 14:21 Eray Aslan
  0 siblings, 0 replies; 85+ messages in thread
From: Eray Aslan @ 2018-01-22 14:21 UTC (permalink / raw
  To: gentoo-commits

commit:     7c8e1ea5dacdafacb4cf4d9f811a9a3146970f5c
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 22 14:20:45 2018 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Mon Jan 22 14:20:45 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c8e1ea5

net-mail/cyrus-imapd: bump to 3.0.5

Filter --as-needed for working sieve implementation.  Should
really be resolved at toolchain level
Bug: https://bugs.gentoo.org/604466
Package-Manager: Portage-2.3.20, Repoman-2.3.6

 net-mail/cyrus-imapd/Manifest                 |   1 +
 net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild | 221 ++++++++++++++++++++++++++
 2 files changed, 222 insertions(+)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 4f7ad744835..102d9c65627 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,3 +1,4 @@
 DIST cyrus-imapd-2.5.10.tar.gz 3103914 BLAKE2B 588764d47b3d458633e0ced2619cc1cccdf26c18d54effd38d4f9f6df12ad98f554efa632af9c7e4b43d7899b04a14a8a71fc152ea360a38cdab6a50685ddf5e SHA512 78b85e37c63f1dbb60898da229f70f45810326a01244067d23b1317e2c2ae3326e48b6944787d59024e44c48c441ed2b848d6a83c451c192a3bb95c8f37880fa
 DIST cyrus-imapd-2.5.11.tar.gz 3109188 BLAKE2B 9382d8e4b9317f7fa12f63f7262eb0c6a1571d405665694f735fb72b6de76058ea586172f2001babe280170f122c887374b1378f51fe9c89a522aaeb74b885c9 SHA512 bbb0e11f31d91d85037306321165e3608f8d5e2699b971fc4fbdd1630ec0a1485c8f6f17900142dec584ab41b0ec0c65c11cfaf8c5bbf1054b194a8f5f361538
 DIST cyrus-imapd-3.0.4.tar.gz 10819487 BLAKE2B 209e379731c996ee083b0de61d6122b3756d1f6880071ebf015157057cf45845961d762ee762ae56213f72f15c01df29ab2d2661c4e352c6b4a680924d15d7b0 SHA512 9ceb7ac837c932c70fa0c1583bf8700b3ec27568d72538ae8d59f2f551e3007b3c2fc68fd29c009597c3949345dbe1bf2eb614bea038d70a5b49e5507df6b69a
+DIST cyrus-imapd-3.0.5.tar.gz 10910080 BLAKE2B a7914ab189a290427ddc0d013c19ff0c36f3a6c4fc016f50013d0f6abb11ae2f7d067b71df99b7f00ba4e8a2170e0f068baa170458b0dc1e94d69d8e4b814873 SHA512 262806729d5ee5d753732603aa7af33c6f96bc5145b7a951b8668ffdee0dcd4a90bd287da0949e85c4596cccb471a688f7f8b6f3e39194e1cff311950d4d4410

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild
new file mode 100644
index 00000000000..13ed85c3a1d
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic pam ssl-cert user
+
+MY_P=${P/_/}
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="http://www.cyrusimap.org/"
+SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
+
+LICENSE="BSD-with-attribution"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs backup calalarm caps clamav http jmap kerberos ldap lmdb \
+	mysql nntp pam perl postgres replication +server sieve snmp \
+	sphinx sqlite ssl static-libs tcpd test xapian"
+
+# virtual/mysql-5.5 added for the --variable= option below
+CDEPEND="sys-libs/zlib
+	dev-libs/libpcre
+	>=dev-libs/cyrus-sasl-2.1.13
+	dev-libs/jansson
+	dev-libs/icu:=
+	afs? ( net-fs/openafs )
+	caps? ( sys-libs/libcap )
+	clamav? ( app-antivirus/clamav )
+	http? ( dev-libs/libxml2 dev-libs/libical )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lmdb? ( dev-db/lmdb )
+	mysql? ( >=virtual/mysql-5.5 )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+			virtual/pam
+			>=net-mail/mailbase-1
+		)
+	perl? ( dev-lang/perl:= )
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
+	ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
+	sqlite? ( dev-db/sqlite:3 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )
+	xapian? ( >=dev-libs/xapian-1.4.0 )"
+
+DEPEND="${CDEPEND}
+	test? ( dev-util/cunit )"
+
+# all blockers really needed?
+RDEPEND="${CDEPEND}
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!net-mail/cyrus-imap-admin"
+
+REQUIRED_USE="afs? ( kerberos )
+	backup? ( sqlite )
+	calalarm? ( http )
+	http? ( sqlite )
+	jmap? ( http xapian )
+	sphinx? ( mysql )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewuser cyrus -1 -1 /usr/cyrus mail
+	append-ldflags $(no-as-needed)
+}
+
+src_prepare() {
+	# bug 604470
+	eapply -p1 "${FILESDIR}/${PN}-sieve-libs-v4.patch"
+	eapply -p1 "${FILESDIR}/${PN}-libcap-libs.patch"
+	eapply -p1 "${FILESDIR}/${PN}-fix-tests.patch"
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+	econf \
+		--enable-unit-tests \
+		--enable-murder \
+		--enable-idled \
+		--enable-event-notification \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-cyrus-user=cyrus \
+		--with-cyrus-group=mail \
+		--with-com_err=yes \
+		--with-sasl \
+		--without-krb \
+		--without-krbdes \
+		--enable-squat \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_enable backup) \
+		$(use_enable calalarm calalarmd) \
+		$(use_with caps libcap) \
+		$(use_with clamav) \
+		$(use_enable jmap) \
+		$(use_enable nntp) \
+		$(use_enable http) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with lmdb) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_with snmp) \
+		$(use_enable sphinx) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		$(use_enable xapian) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dodoc -r doc
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	rm -f doc/text/Makefile*
+
+	mv "${D}"usr/libexec/{master,cyrusmaster} || die
+
+	insinto /etc
+	newins "${D}usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
+	newins "${D}usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
+
+	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
+		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
+		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
+		"${D}"etc/imapd.conf
+
+	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
+		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
+		"${D}"etc/cyrus.conf
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+	# same thing for http(s) as well
+	if ! use http; then
+		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	newinitd "${FILESDIR}/cyrus.rc8" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		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
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist
+	if use ssl ; then
+		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+
+	echo
+	ewarn "Please see http://www.cyrusimap.org/imap/download/upgrade.html"
+	ewarn "for upgrade instructions."
+	echo
+}


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2017-11-26 19:06 Sergei Trofimovich
  0 siblings, 0 replies; 85+ messages in thread
From: Sergei Trofimovich @ 2017-11-26 19:06 UTC (permalink / raw
  To: gentoo-commits

commit:     f72b750d7ef0f7e126554079e13181aff5fd97b8
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 26 18:53:19 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Nov 26 19:06:02 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f72b750d

net-mail/cyrus-imapd: stable 3.0.4 for hppa, bug #630684

Package-Manager: Portage-2.3.16, Repoman-2.3.6
RepoMan-Options: --include-arches="hppa"

 net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild
index 013513de348..96e20cb3c07 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http jmap kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sphinx sqlite ssl static-libs tcpd test xapian"


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2017-10-25  9:31 Agostino Sarubbo
  0 siblings, 0 replies; 85+ messages in thread
From: Agostino Sarubbo @ 2017-10-25  9:31 UTC (permalink / raw
  To: gentoo-commits

commit:     05cf1c4fd5a97b45ec6137fd23f1ea9ea3ce8b0e
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 25 09:29:21 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Oct 25 09:29:21 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05cf1c4f

net-mail/cyrus-imapd: amd64 stable wrt bug #630684

Package-Manager: Portage-2.3.8, Repoman-2.3.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild
index ea3be88683a..013513de348 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http jmap kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sphinx sqlite ssl static-libs tcpd test xapian"


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2017-10-16 23:28 Sergei Trofimovich
  0 siblings, 0 replies; 85+ messages in thread
From: Sergei Trofimovich @ 2017-10-16 23:28 UTC (permalink / raw
  To: gentoo-commits

commit:     fc39d8626552cf6b30f151d42ab38e4fabbff56a
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 16 23:27:05 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Oct 16 23:28:40 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc39d862

net-mail/cyrus-imapd: stable 3.0.4 for ppc, bug #630684

Package-Manager: Portage-2.3.11, Repoman-2.3.3
RepoMan-Options: --include-arches="ppc"

 net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild
index 09e58add6f9..ea3be88683a 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http jmap kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sphinx sqlite ssl static-libs tcpd test xapian"


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2017-10-15 21:34 Sergei Trofimovich
  0 siblings, 0 replies; 85+ messages in thread
From: Sergei Trofimovich @ 2017-10-15 21:34 UTC (permalink / raw
  To: gentoo-commits

commit:     38abefdc0b2eb3bb38c3e58a918bf609b9e9995d
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 15 21:32:34 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Oct 15 21:34:28 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38abefdc

net-mail/cyrus-imapd: stable 3.0.4 for ppc64, bug #630684

Package-Manager: Portage-2.3.11, Repoman-2.3.3
RepoMan-Options: --include-arches="ppc64"

 net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild
index ff4a257eca5..09e58add6f9 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http jmap kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sphinx sqlite ssl static-libs tcpd test xapian"


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2017-10-13 15:01 Thomas Deutschmann
  0 siblings, 0 replies; 85+ messages in thread
From: Thomas Deutschmann @ 2017-10-13 15:01 UTC (permalink / raw
  To: gentoo-commits

commit:     d79c69183b517da9e4567609632d687f0bc5e215
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 13 15:00:48 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Oct 13 15:01:01 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d79c6918

net-mail/cyrus-imapd: x86 stable (bug #630684)

Package-Manager: Portage-2.3.10, Repoman-2.3.3

 net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild
index 9b55bcb7b8f..ff4a257eca5 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http jmap kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sphinx sqlite ssl static-libs tcpd test xapian"


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2017-06-22  5:22 Eray Aslan
  0 siblings, 0 replies; 85+ messages in thread
From: Eray Aslan @ 2017-06-22  5:22 UTC (permalink / raw
  To: gentoo-commits

commit:     cf6d42974999587dd2b4f2259cc1d8b79f066779
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 22 05:22:13 2017 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Thu Jun 22 05:22:41 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf6d4297

net-mail/cyrus-imapd: bump to 3.0.2

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-mail/cyrus-imapd/Manifest                 |   1 +
 net-mail/cyrus-imapd/cyrus-imapd-3.0.2.ebuild | 203 ++++++++++++++++++++++++++
 2 files changed, 204 insertions(+)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index f295506fb35..1e280f1d391 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -4,3 +4,4 @@ DIST cyrus-imapd-2.4.18.tar.gz 2495098 SHA256 166a0a1efbf01f71d9d8449569152b3cda
 DIST cyrus-imapd-2.5.10.tar.gz 3103914 SHA256 b38f4fd72825a298ac47426dcd2a50c8437c2947864ba50d79a9a53fe9845c5f SHA512 78b85e37c63f1dbb60898da229f70f45810326a01244067d23b1317e2c2ae3326e48b6944787d59024e44c48c441ed2b848d6a83c451c192a3bb95c8f37880fa WHIRLPOOL d2167900596c1b6f8e595de7aec499a7fbd6228537d7a27bec4fe0bda6a74b861303c4e9691ca829994972b099f29c362f9692f266df66d76c05a69629b52dfd
 DIST cyrus-imapd-2.5.11.tar.gz 3109188 SHA256 36a79117b320c78d62bc6842c3024d970d3bec7aa12908f862d92cf1d63397d5 SHA512 bbb0e11f31d91d85037306321165e3608f8d5e2699b971fc4fbdd1630ec0a1485c8f6f17900142dec584ab41b0ec0c65c11cfaf8c5bbf1054b194a8f5f361538 WHIRLPOOL e6aaedb642b634d9fc0c56f7ddd06e15130091bd21f4e089ae46168fb2976c7e1fa281f8c6fc0f3e171e70bbfeb5cec8f6cc613f62d5b769fb8b6af4dede6e67
 DIST cyrus-imapd-3.0.1.tar.gz 10515460 SHA256 24a9886aa6bbe001484a54b29309ff99415c0f355b98325ebb29ad61fff5e257 SHA512 0a2bf13b4793e642f3df53231fd66774e0c5ad753b436a7fb0645db6ee70121d0da245038527cc58cb078255fec3e7b32a6230c196cceea040f74813ef78e337 WHIRLPOOL 830284e3d96b2d34d88350f8e65de2cac28c34c9d302dc7fe4247022c5d96251d72989714062408cfcf08828650a7b67aecfb1672165fed344b2e98c2dc06265
+DIST cyrus-imapd-3.0.2.tar.gz 10706654 SHA256 5612f3cfa0504eb50bc3e49a77bf04a31c1aff3096fa1bbddb26cd7dbb69d94d SHA512 95f145733a4b2589b2f7eb6281ce0d1df5788521dea0c81fda10c7c7ae4ac7cf1a9037dba45deee6101a73bbde4552906d7c6bfa9369aa3c802061a7f5cec85d WHIRLPOOL cf56390ea0d8ecd9fcfb9a2459a552ba7815474b52b089c54b1428b42691826f91b163cfe723c795b28289530911ed614e2252e038919c4d710d9a95658f8997

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.2.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.2.ebuild
new file mode 100644
index 00000000000..c5a0435e386
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.2.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools pam ssl-cert user
+
+MY_P=${P/_/}
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="http://www.cyrusimap.org/"
+SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
+
+LICENSE="BSD-with-attribution"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs backup calalarm caps clamav http jmap kerberos ldap lmdb \
+	mysql nntp pam perl postgres replication +server sieve snmp \
+	sphinx sqlite ssl static-libs tcpd test xapian"
+
+# virtual/mysql-5.5 added for the --variable= option below
+CDEPEND="sys-libs/zlib
+	dev-libs/libpcre
+	>=dev-libs/cyrus-sasl-2.1.13
+	dev-libs/jansson
+	dev-libs/icu:=
+	afs? ( net-fs/openafs )
+	caps? ( sys-libs/libcap )
+	clamav? ( app-antivirus/clamav )
+	http? ( dev-libs/libxml2 dev-libs/libical )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lmdb? ( dev-db/lmdb )
+	mysql? ( >=virtual/mysql-5.5 )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+			virtual/pam
+			>=net-mail/mailbase-1
+		)
+	perl? ( dev-lang/perl:= )
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
+	ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
+	sqlite? ( dev-db/sqlite:3 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )
+	xapian? ( >=dev-libs/xapian-1.4.0 )"
+
+DEPEND="${CDEPEND}
+	test? ( dev-util/cunit )"
+
+# all blockers really needed?
+RDEPEND="${CDEPEND}
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!net-mail/cyrus-imap-admin"
+
+REQUIRED_USE="afs? ( kerberos )
+	backup? ( sqlite )
+	calalarm? ( http )
+	http? ( sqlite )
+	jmap? ( http xapian )
+	sphinx? ( mysql )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewuser cyrus -1 -1 /usr/cyrus mail
+}
+
+src_prepare() {
+	# bug 604470
+	eapply -p1 "${FILESDIR}/${PN}-sieve-libs-v3.patch"
+	eapply -p1 "${FILESDIR}/${PN}-fix-tests.patch"
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+	econf \
+		--enable-unit-tests \
+		--enable-murder \
+		--enable-idled \
+		--enable-event-notification \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-cyrus-user=cyrus \
+		--with-cyrus-group=mail \
+		--with-com_err=yes \
+		--with-sasl \
+		--without-krb \
+		--without-krbdes \
+		--enable-squat \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_enable backup) \
+		$(use_enable calalarm calalarmd) \
+		$(use_with caps libcap) \
+		$(use_with clamav) \
+		$(use_enable jmap) \
+		$(use_enable nntp) \
+		$(use_enable http) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with lmdb) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_with snmp) \
+		$(use_enable sphinx) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		$(use_enable xapian) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dodoc -r doc
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	rm -f doc/text/Makefile*
+
+	insinto /etc
+	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	newinitd "${FILESDIR}/cyrus.rc6" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		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
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist
+	if use ssl ; then
+		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+
+	echo
+	ewarn "Please see http://www.cyrusimap.org/imap/download/upgrade.html"
+	ewarn "for upgrade instructions."
+	echo
+}


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2017-05-17  7:39 Eray Aslan
  0 siblings, 0 replies; 85+ messages in thread
From: Eray Aslan @ 2017-05-17  7:39 UTC (permalink / raw
  To: gentoo-commits

commit:     518d747232bc3c0e95c9f170e3a5b5c86e784fbe
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Wed May 17 07:39:07 2017 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Wed May 17 07:39:30 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=518d7472

net-mail/cyrus-imapd: remove old

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-mail/cyrus-imapd/Manifest                 |   3 -
 net-mail/cyrus-imapd/cyrus-imapd-2.5.7.ebuild | 177 --------------------------
 net-mail/cyrus-imapd/cyrus-imapd-2.5.8.ebuild | 176 -------------------------
 net-mail/cyrus-imapd/cyrus-imapd-2.5.9.ebuild | 177 --------------------------
 4 files changed, 533 deletions(-)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index bee93e3f91b..f295506fb35 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -3,7 +3,4 @@ DIST cyrus-imapd-2.4.17.tar.gz 2486355 SHA256 b3e30052c764ee7163947ffde27bdd58bd
 DIST cyrus-imapd-2.4.18.tar.gz 2495098 SHA256 166a0a1efbf01f71d9d8449569152b3cda4949cd689f299a5e77a38d7026012c SHA512 3b234c1773fe5d57cae35743985930bc7fed2eedaa0919598da8fb19588f95b3beb8ad166d3b4f0c96faf006ff56ed5027ec516fab6007edbe46c4f45572a1ef WHIRLPOOL 1a243a9b3875105dfc414e1092f328691b6bef7c0d04f8bd91824ca0d01c715ebc2449c37bbca2ab86193e4d2dc426b33cfd31a0cdfdea0bacc081fd9010b1df
 DIST cyrus-imapd-2.5.10.tar.gz 3103914 SHA256 b38f4fd72825a298ac47426dcd2a50c8437c2947864ba50d79a9a53fe9845c5f SHA512 78b85e37c63f1dbb60898da229f70f45810326a01244067d23b1317e2c2ae3326e48b6944787d59024e44c48c441ed2b848d6a83c451c192a3bb95c8f37880fa WHIRLPOOL d2167900596c1b6f8e595de7aec499a7fbd6228537d7a27bec4fe0bda6a74b861303c4e9691ca829994972b099f29c362f9692f266df66d76c05a69629b52dfd
 DIST cyrus-imapd-2.5.11.tar.gz 3109188 SHA256 36a79117b320c78d62bc6842c3024d970d3bec7aa12908f862d92cf1d63397d5 SHA512 bbb0e11f31d91d85037306321165e3608f8d5e2699b971fc4fbdd1630ec0a1485c8f6f17900142dec584ab41b0ec0c65c11cfaf8c5bbf1054b194a8f5f361538 WHIRLPOOL e6aaedb642b634d9fc0c56f7ddd06e15130091bd21f4e089ae46168fb2976c7e1fa281f8c6fc0f3e171e70bbfeb5cec8f6cc613f62d5b769fb8b6af4dede6e67
-DIST cyrus-imapd-2.5.7.tar.gz 2928358 SHA256 f06c2c030b16b70145fecdf7edaa0f2ef6bf690b0d8fd6e2c62d95af303d68da SHA512 7514779cb3e36fb76bddfd12c7ec8d986609af671f8a1f0f3ae5007f5a7aa80c3c440bfbc8e7766d4de178dd5aa704076401b35cb5f03a2e25d2ea97ccbc7642 WHIRLPOOL 4db36b3fb27751d15cb74e63272c0adaa8348a90d7e9c4cb9c027837477e22347fce912b3e73c669a30a6b0c9de879644f146f7261eacd90fd237218051e1777
-DIST cyrus-imapd-2.5.8.tar.gz 3069068 SHA256 664dd0a4eccfbf810ec74ccac1766c64e7db87f028f9066ae135390ab0d5c888 SHA512 e9c94696b980c7b10c52ee2c46f2dbdadc633a63ad943ebd5002c2052b13a64d8917e4e0ac4e4ae44a1f553e1fda02010840c9053c936374c06c7e88e09302ef WHIRLPOOL e8dcf43e694a8f91ab610d831ecddd516ebf1773b7543b15ba1b0e32fae7388681a9e0698951862efebb01e4894e6f40b29eae665dd36f16bf26d31583fe9822
-DIST cyrus-imapd-2.5.9.tar.gz 3097555 SHA256 8e1bb6cc373bf318b5895b299c8344eaecbfb83db4566182f5d57f2707bce23d SHA512 aad575b7bf8afb4664bb321c2e9ae2be8d9ec6998341a7ca5582db7d27b2b727376693d5e1ac776c26cbd8dc12d8e299f981a33fc0aab8d802832cbf927e454f WHIRLPOOL 1fb97a70dec59f69b60d72282939d4ff85b820e988b0770c46e2b8d9878dae2c541bd5523042c9a1e9c783e32b7d45fa6c9f668fd2bc5ea2e611ef0d5331563b
 DIST cyrus-imapd-3.0.1.tar.gz 10515460 SHA256 24a9886aa6bbe001484a54b29309ff99415c0f355b98325ebb29ad61fff5e257 SHA512 0a2bf13b4793e642f3df53231fd66774e0c5ad753b436a7fb0645db6ee70121d0da245038527cc58cb078255fec3e7b32a6230c196cceea040f74813ef78e337 WHIRLPOOL 830284e3d96b2d34d88350f8e65de2cac28c34c9d302dc7fe4247022c5d96251d72989714062408cfcf08828650a7b67aecfb1672165fed344b2e98c2dc06265

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.5.7.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.5.7.ebuild
deleted file mode 100644
index a2ff8a27fd8..00000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.5.7.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils multilib pam ssl-cert user toolchain-funcs
-
-MY_P=${P/_/}
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="http://www.cyrusimap.org/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="afs berkdb clamav http kerberos mysql nntp pam perl postgres \
-	replication +server sieve snmp sqlite ssl static-libs tcpd"
-
-# virtual/mysql-5.5 added for the --variable= option below
-DEPEND="sys-libs/zlib
-	dev-libs/libpcre
-	>=dev-libs/cyrus-sasl-2.1.13
-	dev-libs/jansson
-	afs? ( net-fs/openafs )
-	berkdb? ( >=sys-libs/db-3.2:* )
-	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2 dev-libs/libical )
-	kerberos? ( virtual/krb5 )
-	mysql? ( >=virtual/mysql-5.5 )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-			virtual/pam
-			>=net-mail/mailbase-1
-		)
-	postgres? ( dev-db/postgresql:* )
-	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
-
-# all blockers really needed?
-RDEPEND="${DEPEND}
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap
-	!net-mail/cyrus-imap-admin"
-
-REQUIRED_USE="afs? ( kerberos )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewuser cyrus -1 -1 /usr/cyrus mail
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-db.patch"
-	# Fix master(8)->cyrusmaster(8) manpage.
-	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -i -e 's:master\.8:cyrusmaster.8:g' \
-			-e 's:master(8):cyrusmaster(8):g' \
-			"${i}" || die "sed failed" || die "sed failed"
-	done
-	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
-	sed -i -e "s:MASTER:CYRUSMASTER:g" \
-		-e "s:Master:Cyrusmaster:g" \
-		-e "s:master:cyrusmaster:g" \
-		man/cyrusmaster.8 || die "sed failed"
-
-	# lock.h to afs/lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-	econf \
-		--enable-murder \
-		--enable-netscapehack \
-		--enable-idled \
-		--enable-event-notification \
-		--enable-autocreate \
-		--enable-pcre \
-		--with-service-path=/usr/$(get_libdir)/cyrus \
-		--with-cyrus-user=cyrus \
-		--with-cyrus-group=mail \
-		--with-com_err=yes \
-		--with-sasl \
-		--without-krb \
-		--without-krbdes \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_with berkdb bdb) \
-		$(use_with clamav) \
-		$(use_enable nntp) \
-		$(use_enable http) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with perl) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable server) \
-		$(use_enable sieve) \
-		$(use_with snmp) \
-		$(use_enable static-libs static) \
-		$(use_with tcpd libwrap) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALLDIRS=vendor install
-
-	dodoc README*
-	dohtml doc/*.html
-	docinto text
-	dodoc doc/text/*
-	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	rm -f doc/text/Makefile*
-
-	insinto /etc
-	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc6" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
-		keepdir "/var/${subdir}"
-		fowners cyrus:mail "/var/${subdir}"
-		fperms 0750 "/var/${subdir}"
-	done
-	for subdir in imap/{user,quota,sieve} spool/imap ; do
-		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
-			keepdir "/var/${subdir}/${i}"
-			fowners cyrus:mail "/var/${subdir}/${i}"
-			fperms 0750 "/var/${subdir}/${i}"
-		done
-	done
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} ; then
-		elog "For correct logging add the following to /etc/syslog.conf:"
-		elog "    local6.*         /var/log/imapd.log"
-		elog "    auth.debug       /var/log/auth.log"
-		echo
-
-		elog "You have to add user cyrus to the sasldb2. Do this with:"
-		elog "    saslpasswd2 cyrus"
-	fi
-}
-
-pkg_postinst() {
-	# do not install server.{key,pem) if they exist.
-	if use ssl ; then
-		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
-			install_cert /etc/ssl/cyrus/server
-			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
-		fi
-	fi
-}

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.5.8.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.5.8.ebuild
deleted file mode 100644
index 74304b8dccd..00000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.5.8.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools multilib pam ssl-cert user toolchain-funcs
-
-MY_P=${P/_/}
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="http://www.cyrusimap.org/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="afs berkdb clamav http kerberos mysql nntp pam perl postgres \
-	replication +server sieve snmp sqlite ssl static-libs tcpd"
-
-# virtual/mysql-5.5 added for the --variable= option below
-DEPEND="sys-libs/zlib
-	dev-libs/libpcre
-	>=dev-libs/cyrus-sasl-2.1.13
-	dev-libs/jansson
-	afs? ( net-fs/openafs )
-	berkdb? ( >=sys-libs/db-3.2:* )
-	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2 dev-libs/libical )
-	kerberos? ( virtual/krb5 )
-	mysql? ( >=virtual/mysql-5.5 )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-			virtual/pam
-			>=net-mail/mailbase-1
-		)
-	postgres? ( dev-db/postgresql:* )
-	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
-
-# all blockers really needed?
-RDEPEND="${DEPEND}
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap
-	!net-mail/cyrus-imap-admin"
-
-REQUIRED_USE="afs? ( kerberos )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewuser cyrus -1 -1 /usr/cyrus mail
-}
-
-src_prepare() {
-	eapply -p0 "${FILESDIR}/${PN}-db.patch"
-	# Fix master(8)->cyrusmaster(8) manpage.
-	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -i -e 's:master\.8:cyrusmaster.8:g' \
-			-e 's:master(8):cyrusmaster(8):g' \
-			"${i}" || die "sed failed" || die "sed failed"
-	done
-	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
-	sed -i -e "s:MASTER:CYRUSMASTER:g" \
-		-e "s:Master:Cyrusmaster:g" \
-		-e "s:master:cyrusmaster:g" \
-		man/cyrusmaster.8 || die "sed failed"
-
-	# lock.h to afs/lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-	econf \
-		--enable-murder \
-		--enable-netscapehack \
-		--enable-idled \
-		--enable-event-notification \
-		--enable-autocreate \
-		--enable-pcre \
-		--with-service-path=/usr/$(get_libdir)/cyrus \
-		--with-cyrus-user=cyrus \
-		--with-cyrus-group=mail \
-		--with-com_err=yes \
-		--with-sasl \
-		--without-krb \
-		--without-krbdes \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_with berkdb bdb) \
-		$(use_with clamav) \
-		$(use_enable nntp) \
-		$(use_enable http) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with perl) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable server) \
-		$(use_enable sieve) \
-		$(use_with snmp) \
-		$(use_enable static-libs static) \
-		$(use_with tcpd libwrap) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALLDIRS=vendor install
-
-	dodoc README*
-	dodoc -r doc
-	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	rm -f doc/text/Makefile*
-
-	insinto /etc
-	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc6" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
-		keepdir "/var/${subdir}"
-		fowners cyrus:mail "/var/${subdir}"
-		fperms 0750 "/var/${subdir}"
-	done
-	for subdir in imap/{user,quota,sieve} spool/imap ; do
-		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
-			keepdir "/var/${subdir}/${i}"
-			fowners cyrus:mail "/var/${subdir}/${i}"
-			fperms 0750 "/var/${subdir}/${i}"
-		done
-	done
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} ; then
-		elog "For correct logging add the following to /etc/syslog.conf:"
-		elog "    local6.*         /var/log/imapd.log"
-		elog "    auth.debug       /var/log/auth.log"
-		echo
-
-		elog "You have to add user cyrus to the sasldb2. Do this with:"
-		elog "    saslpasswd2 cyrus"
-	fi
-}
-
-pkg_postinst() {
-	# do not install server.{key,pem) if they exist.
-	if use ssl ; then
-		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
-			install_cert /etc/ssl/cyrus/server
-			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
-		fi
-	fi
-}

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.5.9.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.5.9.ebuild
deleted file mode 100644
index 043d1325ab5..00000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.5.9.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools multilib pam ssl-cert user toolchain-funcs
-
-MY_P=${P/_/}
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="http://www.cyrusimap.org/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="afs berkdb clamav http kerberos mysql nntp pam perl postgres \
-	replication +server sieve snmp sqlite ssl static-libs tcpd"
-
-# virtual/mysql-5.5 added for the --variable= option below
-DEPEND="sys-libs/zlib
-	dev-libs/libpcre
-	>=dev-libs/cyrus-sasl-2.1.13
-	dev-libs/jansson
-	afs? ( net-fs/openafs )
-	berkdb? ( >=sys-libs/db-3.2:* )
-	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2 dev-libs/libical )
-	kerberos? ( virtual/krb5 )
-	mysql? ( >=virtual/mysql-5.5 )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-			virtual/pam
-			>=net-mail/mailbase-1
-		)
-	postgres? ( dev-db/postgresql:* )
-	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
-
-# all blockers really needed?
-RDEPEND="${DEPEND}
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap
-	!net-mail/cyrus-imap-admin"
-
-REQUIRED_USE="afs? ( kerberos )
-	http? ( sqlite )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewuser cyrus -1 -1 /usr/cyrus mail
-}
-
-src_prepare() {
-	eapply -p0 "${FILESDIR}/${PN}-db.patch"
-	# Fix master(8)->cyrusmaster(8) manpage.
-	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -i -e 's:master\.8:cyrusmaster.8:g' \
-			-e 's:master(8):cyrusmaster(8):g' \
-			"${i}" || die "sed failed" || die "sed failed"
-	done
-	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
-	sed -i -e "s:MASTER:CYRUSMASTER:g" \
-		-e "s:Master:Cyrusmaster:g" \
-		-e "s:master:cyrusmaster:g" \
-		man/cyrusmaster.8 || die "sed failed"
-
-	# lock.h to afs/lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-	econf \
-		--enable-murder \
-		--enable-netscapehack \
-		--enable-idled \
-		--enable-event-notification \
-		--enable-autocreate \
-		--enable-pcre \
-		--with-service-path=/usr/$(get_libdir)/cyrus \
-		--with-cyrus-user=cyrus \
-		--with-cyrus-group=mail \
-		--with-com_err=yes \
-		--with-sasl \
-		--without-krb \
-		--without-krbdes \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_with berkdb bdb) \
-		$(use_with clamav) \
-		$(use_enable nntp) \
-		$(use_enable http) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with perl) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable server) \
-		$(use_enable sieve) \
-		$(use_with snmp) \
-		$(use_enable static-libs static) \
-		$(use_with tcpd libwrap) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALLDIRS=vendor install
-
-	dodoc README*
-	dodoc -r doc
-	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	rm -f doc/text/Makefile*
-
-	insinto /etc
-	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc6" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
-		keepdir "/var/${subdir}"
-		fowners cyrus:mail "/var/${subdir}"
-		fperms 0750 "/var/${subdir}"
-	done
-	for subdir in imap/{user,quota,sieve} spool/imap ; do
-		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
-			keepdir "/var/${subdir}/${i}"
-			fowners cyrus:mail "/var/${subdir}/${i}"
-			fperms 0750 "/var/${subdir}/${i}"
-		done
-	done
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} ; then
-		elog "For correct logging add the following to /etc/syslog.conf:"
-		elog "    local6.*         /var/log/imapd.log"
-		elog "    auth.debug       /var/log/auth.log"
-		echo
-
-		elog "You have to add user cyrus to the sasldb2. Do this with:"
-		elog "    saslpasswd2 cyrus"
-	fi
-}
-
-pkg_postinst() {
-	# do not install server.{key,pem) if they exist.
-	if use ssl ; then
-		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
-			install_cert /etc/ssl/cyrus/server
-			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
-		fi
-	fi
-}


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2017-05-09  8:23 Eray Aslan
  0 siblings, 0 replies; 85+ messages in thread
From: Eray Aslan @ 2017-05-09  8:23 UTC (permalink / raw
  To: gentoo-commits

commit:     7757a23a9f4c09c4e56200be6452374aa2555d4e
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Tue May  9 08:23:23 2017 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Tue May  9 08:23:23 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7757a23a

net-mail/cyrus-imapd: bump to 2.5.11

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-mail/cyrus-imapd/Manifest                  |   1 +
 net-mail/cyrus-imapd/cyrus-imapd-2.5.11.ebuild | 178 +++++++++++++++++++++++++
 2 files changed, 179 insertions(+)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 680d3857037..3f392aa24cf 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -2,6 +2,7 @@ DIST cyrus-imapd-2.4.16.tar.gz 2484201 SHA256 beac9d6059680bbf65948db60a30c6e8f5
 DIST cyrus-imapd-2.4.17.tar.gz 2486355 SHA256 b3e30052c764ee7163947ffde27bdd58bd4dd2e5697ad144491941e46300a583 SHA512 86ffe1664ca3c3df164ed8fca21cc08ddae12380e1485deccec7da4ec263d8b953a806e05f0b10f6fb7717a0d40fc05669792b77cc66d7c5067061c8506e59ee WHIRLPOOL 22566578217a5901793b886ff020aa1deecbb81bf85f54a524b58de129029e51b0aa358db902a2139584d05f668404cb98ca2ff3fa33803ce986e07b95c69c45
 DIST cyrus-imapd-2.4.18.tar.gz 2495098 SHA256 166a0a1efbf01f71d9d8449569152b3cda4949cd689f299a5e77a38d7026012c SHA512 3b234c1773fe5d57cae35743985930bc7fed2eedaa0919598da8fb19588f95b3beb8ad166d3b4f0c96faf006ff56ed5027ec516fab6007edbe46c4f45572a1ef WHIRLPOOL 1a243a9b3875105dfc414e1092f328691b6bef7c0d04f8bd91824ca0d01c715ebc2449c37bbca2ab86193e4d2dc426b33cfd31a0cdfdea0bacc081fd9010b1df
 DIST cyrus-imapd-2.5.10.tar.gz 3103914 SHA256 b38f4fd72825a298ac47426dcd2a50c8437c2947864ba50d79a9a53fe9845c5f SHA512 78b85e37c63f1dbb60898da229f70f45810326a01244067d23b1317e2c2ae3326e48b6944787d59024e44c48c441ed2b848d6a83c451c192a3bb95c8f37880fa WHIRLPOOL d2167900596c1b6f8e595de7aec499a7fbd6228537d7a27bec4fe0bda6a74b861303c4e9691ca829994972b099f29c362f9692f266df66d76c05a69629b52dfd
+DIST cyrus-imapd-2.5.11.tar.gz 3109188 SHA256 36a79117b320c78d62bc6842c3024d970d3bec7aa12908f862d92cf1d63397d5 SHA512 bbb0e11f31d91d85037306321165e3608f8d5e2699b971fc4fbdd1630ec0a1485c8f6f17900142dec584ab41b0ec0c65c11cfaf8c5bbf1054b194a8f5f361538 WHIRLPOOL e6aaedb642b634d9fc0c56f7ddd06e15130091bd21f4e089ae46168fb2976c7e1fa281f8c6fc0f3e171e70bbfeb5cec8f6cc613f62d5b769fb8b6af4dede6e67
 DIST cyrus-imapd-2.5.7.tar.gz 2928358 SHA256 f06c2c030b16b70145fecdf7edaa0f2ef6bf690b0d8fd6e2c62d95af303d68da SHA512 7514779cb3e36fb76bddfd12c7ec8d986609af671f8a1f0f3ae5007f5a7aa80c3c440bfbc8e7766d4de178dd5aa704076401b35cb5f03a2e25d2ea97ccbc7642 WHIRLPOOL 4db36b3fb27751d15cb74e63272c0adaa8348a90d7e9c4cb9c027837477e22347fce912b3e73c669a30a6b0c9de879644f146f7261eacd90fd237218051e1777
 DIST cyrus-imapd-2.5.8.tar.gz 3069068 SHA256 664dd0a4eccfbf810ec74ccac1766c64e7db87f028f9066ae135390ab0d5c888 SHA512 e9c94696b980c7b10c52ee2c46f2dbdadc633a63ad943ebd5002c2052b13a64d8917e4e0ac4e4ae44a1f553e1fda02010840c9053c936374c06c7e88e09302ef WHIRLPOOL e8dcf43e694a8f91ab610d831ecddd516ebf1773b7543b15ba1b0e32fae7388681a9e0698951862efebb01e4894e6f40b29eae665dd36f16bf26d31583fe9822
 DIST cyrus-imapd-2.5.9.tar.gz 3097555 SHA256 8e1bb6cc373bf318b5895b299c8344eaecbfb83db4566182f5d57f2707bce23d SHA512 aad575b7bf8afb4664bb321c2e9ae2be8d9ec6998341a7ca5582db7d27b2b727376693d5e1ac776c26cbd8dc12d8e299f981a33fc0aab8d802832cbf927e454f WHIRLPOOL 1fb97a70dec59f69b60d72282939d4ff85b820e988b0770c46e2b8d9878dae2c541bd5523042c9a1e9c783e32b7d45fa6c9f668fd2bc5ea2e611ef0d5331563b

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.5.11.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.5.11.ebuild
new file mode 100644
index 00000000000..5ed4f130966
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.5.11.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools multilib pam ssl-cert user toolchain-funcs
+
+MY_P=${P/_/}
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="http://www.cyrusimap.org/"
+SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
+
+LICENSE="BSD-with-attribution"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs berkdb clamav http kerberos mysql nntp pam perl postgres \
+	replication +server sieve snmp sqlite ssl static-libs tcpd"
+
+# virtual/mysql-5.5 added for the --variable= option below
+DEPEND="sys-libs/zlib
+	dev-libs/libpcre
+	>=dev-libs/cyrus-sasl-2.1.13
+	dev-libs/jansson
+	afs? ( net-fs/openafs )
+	berkdb? ( >=sys-libs/db-3.2:* )
+	clamav? ( app-antivirus/clamav )
+	http? ( dev-libs/libxml2 dev-libs/libical )
+	kerberos? ( virtual/krb5 )
+	mysql? ( >=virtual/mysql-5.5 )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+			virtual/pam
+			>=net-mail/mailbase-1
+		)
+	perl? ( dev-lang/perl:= )
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
+
+# all blockers really needed?
+RDEPEND="${DEPEND}
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!net-mail/cyrus-imap-admin"
+
+REQUIRED_USE="afs? ( kerberos )
+	http? ( sqlite )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewuser cyrus -1 -1 /usr/cyrus mail
+}
+
+src_prepare() {
+	eapply -p0 "${FILESDIR}/${PN}-db.patch"
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+	econf \
+		--enable-murder \
+		--enable-netscapehack \
+		--enable-idled \
+		--enable-event-notification \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-service-path=/usr/$(get_libdir)/cyrus \
+		--with-cyrus-user=cyrus \
+		--with-cyrus-group=mail \
+		--with-com_err=yes \
+		--with-sasl \
+		--without-krb \
+		--without-krbdes \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_with berkdb bdb) \
+		$(use_with clamav) \
+		$(use_enable nntp) \
+		$(use_enable http) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_with snmp) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dodoc -r doc
+	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	rm -f doc/text/Makefile*
+
+	insinto /etc
+	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	newinitd "${FILESDIR}/cyrus.rc6" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		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
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist.
+	if use ssl ; then
+		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+}


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2017-01-24 21:16 Jeroen Roovers
  0 siblings, 0 replies; 85+ messages in thread
From: Jeroen Roovers @ 2017-01-24 21:16 UTC (permalink / raw
  To: gentoo-commits

commit:     d343c9711ce58dc9af927fc72115c072f2549e3c
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 21:16:05 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 21:16:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d343c971

net-mail/cyrus-imapd: Stable for HPPA (bug #561884).

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --ignore-arches

 net-mail/cyrus-imapd/cyrus-imapd-2.5.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.5.10.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.5.10.ebuild
index 90cca4c..a1cfa03 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.5.10.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.5.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="afs berkdb clamav http kerberos mysql nntp pam perl postgres \
 	replication +server sieve snmp sqlite ssl static-libs tcpd"
 


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2016-11-25 18:54 Agostino Sarubbo
  0 siblings, 0 replies; 85+ messages in thread
From: Agostino Sarubbo @ 2016-11-25 18:54 UTC (permalink / raw
  To: gentoo-commits

commit:     b86b14bc12a901c2b234d92f210fbdf083254ce9
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 25 18:54:27 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Nov 25 18:54:32 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b86b14bc

net-mail/cyrus-imapd: x86 stable wrt bug #561884

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-mail/cyrus-imapd/cyrus-imapd-2.5.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.5.10.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.5.10.ebuild
index 2b1a2cf..984ea2d 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.5.10.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.5.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="afs berkdb clamav http kerberos mysql nntp pam perl postgres \
 	replication +server sieve snmp sqlite ssl static-libs tcpd"
 


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2016-11-25 18:27 Agostino Sarubbo
  0 siblings, 0 replies; 85+ messages in thread
From: Agostino Sarubbo @ 2016-11-25 18:27 UTC (permalink / raw
  To: gentoo-commits

commit:     5c16f92bca42a3cae1e1cdd806b8b656d91a093b
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 25 18:27:46 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Nov 25 18:27:46 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c16f92b

net-mail/cyrus-imapd: amd64 stable wrt bug #561884

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-mail/cyrus-imapd/cyrus-imapd-2.5.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.5.10.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.5.10.ebuild
index 1d0d736..2b1a2cf 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.5.10.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.5.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="afs berkdb clamav http kerberos mysql nntp pam perl postgres \
 	replication +server sieve snmp sqlite ssl static-libs tcpd"
 


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2016-10-20 14:43 Eray Aslan
  0 siblings, 0 replies; 85+ messages in thread
From: Eray Aslan @ 2016-10-20 14:43 UTC (permalink / raw
  To: gentoo-commits

commit:     b76a7bd05c32727e847a1ec9922ab440fdab22b6
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 20 14:43:27 2016 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Thu Oct 20 14:43:27 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b76a7bd0

net-mail/cyrus-imapd: version bump to 2.5.10

Package-Manager: portage-2.3.2

 net-mail/cyrus-imapd/Manifest                  |   1 +
 net-mail/cyrus-imapd/cyrus-imapd-2.5.10.ebuild | 178 +++++++++++++++++++++++++
 2 files changed, 179 insertions(+)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 778f765..680d385 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,6 +1,7 @@
 DIST cyrus-imapd-2.4.16.tar.gz 2484201 SHA256 beac9d6059680bbf65948db60a30c6e8f59786df4a7821c70dc27b2a225f32c4 SHA512 31931e94ebe869516f10886cee5ab152fb6d6376bf009250718077732c6172a6430f3502370e15e94f6165500e5b4108623bceea7c0dcfb3eb746e9ff0fcffab WHIRLPOOL 1e9916d03448e7f036aa6320af69a7ae57ae37205f98d4cfee8c335d9dcdc1c09ba243f4506036da4ca17f859f5c7eef0cb56443dfe51ad3075f0e4d62874fcb
 DIST cyrus-imapd-2.4.17.tar.gz 2486355 SHA256 b3e30052c764ee7163947ffde27bdd58bd4dd2e5697ad144491941e46300a583 SHA512 86ffe1664ca3c3df164ed8fca21cc08ddae12380e1485deccec7da4ec263d8b953a806e05f0b10f6fb7717a0d40fc05669792b77cc66d7c5067061c8506e59ee WHIRLPOOL 22566578217a5901793b886ff020aa1deecbb81bf85f54a524b58de129029e51b0aa358db902a2139584d05f668404cb98ca2ff3fa33803ce986e07b95c69c45
 DIST cyrus-imapd-2.4.18.tar.gz 2495098 SHA256 166a0a1efbf01f71d9d8449569152b3cda4949cd689f299a5e77a38d7026012c SHA512 3b234c1773fe5d57cae35743985930bc7fed2eedaa0919598da8fb19588f95b3beb8ad166d3b4f0c96faf006ff56ed5027ec516fab6007edbe46c4f45572a1ef WHIRLPOOL 1a243a9b3875105dfc414e1092f328691b6bef7c0d04f8bd91824ca0d01c715ebc2449c37bbca2ab86193e4d2dc426b33cfd31a0cdfdea0bacc081fd9010b1df
+DIST cyrus-imapd-2.5.10.tar.gz 3103914 SHA256 b38f4fd72825a298ac47426dcd2a50c8437c2947864ba50d79a9a53fe9845c5f SHA512 78b85e37c63f1dbb60898da229f70f45810326a01244067d23b1317e2c2ae3326e48b6944787d59024e44c48c441ed2b848d6a83c451c192a3bb95c8f37880fa WHIRLPOOL d2167900596c1b6f8e595de7aec499a7fbd6228537d7a27bec4fe0bda6a74b861303c4e9691ca829994972b099f29c362f9692f266df66d76c05a69629b52dfd
 DIST cyrus-imapd-2.5.7.tar.gz 2928358 SHA256 f06c2c030b16b70145fecdf7edaa0f2ef6bf690b0d8fd6e2c62d95af303d68da SHA512 7514779cb3e36fb76bddfd12c7ec8d986609af671f8a1f0f3ae5007f5a7aa80c3c440bfbc8e7766d4de178dd5aa704076401b35cb5f03a2e25d2ea97ccbc7642 WHIRLPOOL 4db36b3fb27751d15cb74e63272c0adaa8348a90d7e9c4cb9c027837477e22347fce912b3e73c669a30a6b0c9de879644f146f7261eacd90fd237218051e1777
 DIST cyrus-imapd-2.5.8.tar.gz 3069068 SHA256 664dd0a4eccfbf810ec74ccac1766c64e7db87f028f9066ae135390ab0d5c888 SHA512 e9c94696b980c7b10c52ee2c46f2dbdadc633a63ad943ebd5002c2052b13a64d8917e4e0ac4e4ae44a1f553e1fda02010840c9053c936374c06c7e88e09302ef WHIRLPOOL e8dcf43e694a8f91ab610d831ecddd516ebf1773b7543b15ba1b0e32fae7388681a9e0698951862efebb01e4894e6f40b29eae665dd36f16bf26d31583fe9822
 DIST cyrus-imapd-2.5.9.tar.gz 3097555 SHA256 8e1bb6cc373bf318b5895b299c8344eaecbfb83db4566182f5d57f2707bce23d SHA512 aad575b7bf8afb4664bb321c2e9ae2be8d9ec6998341a7ca5582db7d27b2b727376693d5e1ac776c26cbd8dc12d8e299f981a33fc0aab8d802832cbf927e454f WHIRLPOOL 1fb97a70dec59f69b60d72282939d4ff85b820e988b0770c46e2b8d9878dae2c541bd5523042c9a1e9c783e32b7d45fa6c9f668fd2bc5ea2e611ef0d5331563b

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.5.10.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.5.10.ebuild
new file mode 100644
index 00000000..1d0d736
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.5.10.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools multilib pam ssl-cert user toolchain-funcs
+
+MY_P=${P/_/}
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="http://www.cyrusimap.org/"
+SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
+
+LICENSE="BSD-with-attribution"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs berkdb clamav http kerberos mysql nntp pam perl postgres \
+	replication +server sieve snmp sqlite ssl static-libs tcpd"
+
+# virtual/mysql-5.5 added for the --variable= option below
+DEPEND="sys-libs/zlib
+	dev-libs/libpcre
+	>=dev-libs/cyrus-sasl-2.1.13
+	dev-libs/jansson
+	afs? ( net-fs/openafs )
+	berkdb? ( >=sys-libs/db-3.2:* )
+	clamav? ( app-antivirus/clamav )
+	http? ( dev-libs/libxml2 dev-libs/libical )
+	kerberos? ( virtual/krb5 )
+	mysql? ( >=virtual/mysql-5.5 )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+			virtual/pam
+			>=net-mail/mailbase-1
+		)
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
+
+# all blockers really needed?
+RDEPEND="${DEPEND}
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!net-mail/cyrus-imap-admin"
+
+REQUIRED_USE="afs? ( kerberos )
+	http? ( sqlite )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewuser cyrus -1 -1 /usr/cyrus mail
+}
+
+src_prepare() {
+	eapply -p0 "${FILESDIR}/${PN}-db.patch"
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+	econf \
+		--enable-murder \
+		--enable-netscapehack \
+		--enable-idled \
+		--enable-event-notification \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-service-path=/usr/$(get_libdir)/cyrus \
+		--with-cyrus-user=cyrus \
+		--with-cyrus-group=mail \
+		--with-com_err=yes \
+		--with-sasl \
+		--without-krb \
+		--without-krbdes \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_with berkdb bdb) \
+		$(use_with clamav) \
+		$(use_enable nntp) \
+		$(use_enable http) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_with snmp) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dodoc -r doc
+	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	rm -f doc/text/Makefile*
+
+	insinto /etc
+	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	newinitd "${FILESDIR}/cyrus.rc6" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		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
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist.
+	if use ssl ; then
+		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+}


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2016-07-25 10:26 Eray Aslan
  0 siblings, 0 replies; 85+ messages in thread
From: Eray Aslan @ 2016-07-25 10:26 UTC (permalink / raw
  To: gentoo-commits

commit:     b4589d5572d3a3efbfe5ba4263caa30b2bd6d206
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 25 10:26:31 2016 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Mon Jul 25 10:26:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4589d55

net-mail/cyrus-imapd: version bump to cyrus-imapd-2.5.9

Fix: sqlite is required for http - bug 583746

Package-Manager: portage-2.3.0

 net-mail/cyrus-imapd/Manifest                 |   1 +
 net-mail/cyrus-imapd/cyrus-imapd-2.5.9.ebuild | 178 ++++++++++++++++++++++++++
 2 files changed, 179 insertions(+)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 4be7b14..778f765 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -3,3 +3,4 @@ DIST cyrus-imapd-2.4.17.tar.gz 2486355 SHA256 b3e30052c764ee7163947ffde27bdd58bd
 DIST cyrus-imapd-2.4.18.tar.gz 2495098 SHA256 166a0a1efbf01f71d9d8449569152b3cda4949cd689f299a5e77a38d7026012c SHA512 3b234c1773fe5d57cae35743985930bc7fed2eedaa0919598da8fb19588f95b3beb8ad166d3b4f0c96faf006ff56ed5027ec516fab6007edbe46c4f45572a1ef WHIRLPOOL 1a243a9b3875105dfc414e1092f328691b6bef7c0d04f8bd91824ca0d01c715ebc2449c37bbca2ab86193e4d2dc426b33cfd31a0cdfdea0bacc081fd9010b1df
 DIST cyrus-imapd-2.5.7.tar.gz 2928358 SHA256 f06c2c030b16b70145fecdf7edaa0f2ef6bf690b0d8fd6e2c62d95af303d68da SHA512 7514779cb3e36fb76bddfd12c7ec8d986609af671f8a1f0f3ae5007f5a7aa80c3c440bfbc8e7766d4de178dd5aa704076401b35cb5f03a2e25d2ea97ccbc7642 WHIRLPOOL 4db36b3fb27751d15cb74e63272c0adaa8348a90d7e9c4cb9c027837477e22347fce912b3e73c669a30a6b0c9de879644f146f7261eacd90fd237218051e1777
 DIST cyrus-imapd-2.5.8.tar.gz 3069068 SHA256 664dd0a4eccfbf810ec74ccac1766c64e7db87f028f9066ae135390ab0d5c888 SHA512 e9c94696b980c7b10c52ee2c46f2dbdadc633a63ad943ebd5002c2052b13a64d8917e4e0ac4e4ae44a1f553e1fda02010840c9053c936374c06c7e88e09302ef WHIRLPOOL e8dcf43e694a8f91ab610d831ecddd516ebf1773b7543b15ba1b0e32fae7388681a9e0698951862efebb01e4894e6f40b29eae665dd36f16bf26d31583fe9822
+DIST cyrus-imapd-2.5.9.tar.gz 3097555 SHA256 8e1bb6cc373bf318b5895b299c8344eaecbfb83db4566182f5d57f2707bce23d SHA512 aad575b7bf8afb4664bb321c2e9ae2be8d9ec6998341a7ca5582db7d27b2b727376693d5e1ac776c26cbd8dc12d8e299f981a33fc0aab8d802832cbf927e454f WHIRLPOOL 1fb97a70dec59f69b60d72282939d4ff85b820e988b0770c46e2b8d9878dae2c541bd5523042c9a1e9c783e32b7d45fa6c9f668fd2bc5ea2e611ef0d5331563b

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.5.9.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.5.9.ebuild
new file mode 100644
index 0000000..1d0d736
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.5.9.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools multilib pam ssl-cert user toolchain-funcs
+
+MY_P=${P/_/}
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="http://www.cyrusimap.org/"
+SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
+
+LICENSE="BSD-with-attribution"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs berkdb clamav http kerberos mysql nntp pam perl postgres \
+	replication +server sieve snmp sqlite ssl static-libs tcpd"
+
+# virtual/mysql-5.5 added for the --variable= option below
+DEPEND="sys-libs/zlib
+	dev-libs/libpcre
+	>=dev-libs/cyrus-sasl-2.1.13
+	dev-libs/jansson
+	afs? ( net-fs/openafs )
+	berkdb? ( >=sys-libs/db-3.2:* )
+	clamav? ( app-antivirus/clamav )
+	http? ( dev-libs/libxml2 dev-libs/libical )
+	kerberos? ( virtual/krb5 )
+	mysql? ( >=virtual/mysql-5.5 )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+			virtual/pam
+			>=net-mail/mailbase-1
+		)
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
+
+# all blockers really needed?
+RDEPEND="${DEPEND}
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!net-mail/cyrus-imap-admin"
+
+REQUIRED_USE="afs? ( kerberos )
+	http? ( sqlite )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewuser cyrus -1 -1 /usr/cyrus mail
+}
+
+src_prepare() {
+	eapply -p0 "${FILESDIR}/${PN}-db.patch"
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+	econf \
+		--enable-murder \
+		--enable-netscapehack \
+		--enable-idled \
+		--enable-event-notification \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-service-path=/usr/$(get_libdir)/cyrus \
+		--with-cyrus-user=cyrus \
+		--with-cyrus-group=mail \
+		--with-com_err=yes \
+		--with-sasl \
+		--without-krb \
+		--without-krbdes \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_with berkdb bdb) \
+		$(use_with clamav) \
+		$(use_enable nntp) \
+		$(use_enable http) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_with snmp) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dodoc -r doc
+	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	rm -f doc/text/Makefile*
+
+	insinto /etc
+	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	newinitd "${FILESDIR}/cyrus.rc6" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		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
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist.
+	if use ssl ; then
+		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+}


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2016-05-21 14:37 Eray Aslan
  0 siblings, 0 replies; 85+ messages in thread
From: Eray Aslan @ 2016-05-21 14:37 UTC (permalink / raw
  To: gentoo-commits

commit:     6fef20b67b7f21d84a0a80c389cb61c9e04425cc
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Sat May 21 14:36:49 2016 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Sat May 21 14:36:49 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fef20b6

net-mail/cyrus-imapd: remove old

Package-Manager: portage-2.3.0_rc1

 net-mail/cyrus-imapd/Manifest                 |   3 -
 net-mail/cyrus-imapd/cyrus-imapd-2.5.4.ebuild | 176 -------------------------
 net-mail/cyrus-imapd/cyrus-imapd-2.5.5.ebuild | 176 -------------------------
 net-mail/cyrus-imapd/cyrus-imapd-2.5.6.ebuild | 178 --------------------------
 4 files changed, 533 deletions(-)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index ffa756f..4be7b14 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,8 +1,5 @@
 DIST cyrus-imapd-2.4.16.tar.gz 2484201 SHA256 beac9d6059680bbf65948db60a30c6e8f59786df4a7821c70dc27b2a225f32c4 SHA512 31931e94ebe869516f10886cee5ab152fb6d6376bf009250718077732c6172a6430f3502370e15e94f6165500e5b4108623bceea7c0dcfb3eb746e9ff0fcffab WHIRLPOOL 1e9916d03448e7f036aa6320af69a7ae57ae37205f98d4cfee8c335d9dcdc1c09ba243f4506036da4ca17f859f5c7eef0cb56443dfe51ad3075f0e4d62874fcb
 DIST cyrus-imapd-2.4.17.tar.gz 2486355 SHA256 b3e30052c764ee7163947ffde27bdd58bd4dd2e5697ad144491941e46300a583 SHA512 86ffe1664ca3c3df164ed8fca21cc08ddae12380e1485deccec7da4ec263d8b953a806e05f0b10f6fb7717a0d40fc05669792b77cc66d7c5067061c8506e59ee WHIRLPOOL 22566578217a5901793b886ff020aa1deecbb81bf85f54a524b58de129029e51b0aa358db902a2139584d05f668404cb98ca2ff3fa33803ce986e07b95c69c45
 DIST cyrus-imapd-2.4.18.tar.gz 2495098 SHA256 166a0a1efbf01f71d9d8449569152b3cda4949cd689f299a5e77a38d7026012c SHA512 3b234c1773fe5d57cae35743985930bc7fed2eedaa0919598da8fb19588f95b3beb8ad166d3b4f0c96faf006ff56ed5027ec516fab6007edbe46c4f45572a1ef WHIRLPOOL 1a243a9b3875105dfc414e1092f328691b6bef7c0d04f8bd91824ca0d01c715ebc2449c37bbca2ab86193e4d2dc426b33cfd31a0cdfdea0bacc081fd9010b1df
-DIST cyrus-imapd-2.5.4.tar.gz 3070894 SHA256 98839d2865c0ff5c5dc0f59aba54ad111135697c3383919e037651d90f00aaaa SHA512 0bc78bf63560cc0d89f0ef4a5f6a160300cbb1090394d6bc62f51a0d73ea3615a1ecbf95cb6dab9d10c99afd3a95079a6df86a8157042e13bf907bb4eca94423 WHIRLPOOL 02ee9a685e6825473e9643e70ad4e22e22a9b6e263ec81692ff0d9e68c3b1b07b5ed1cdb1bbf4119242429779fe0435d9ae00651fbaec465308ac8bdf96650eb
-DIST cyrus-imapd-2.5.5.tar.gz 2940177 SHA256 6cfd45856c869921fa8f89da9be9d5c640757011a678f964252e95a753182eee SHA512 86a0af8f84172104e1836372e4a0c0503b89dfd391a83e29d18f315162abadf00ddc939c5fcb1ee01a244addaba5a2d90b4c3065313b557edbd977ab8c0b3ce5 WHIRLPOOL 34e887140a0923ce4de9d6142c1ec1ae7c1831746d6c92570876448cfef84368fffbe41c11955912ba4d1e89eaf4255f85a60a26f76f2be7867f8713ca52fa9a
-DIST cyrus-imapd-2.5.6.tar.gz 2938962 SHA256 60f9be717c17497e7d69f468a8da3daf926c49edeac958bc769b4547f10103df SHA512 7f5c758559cfe85217d1ba423004815c9af146e2dffc0b7596713690e00e79c5af971afe086584255163bc2ccc9abf1428899495df4c7584e7fa46b96bab2be8 WHIRLPOOL 5cd152304e029a303cb99a095274288f7093e05b525b9fa4ac55a435910d86d569d803bb00d538c6ebcdb6665bd940ccf30870fb34dfff411fb22ab0547f53c8
 DIST cyrus-imapd-2.5.7.tar.gz 2928358 SHA256 f06c2c030b16b70145fecdf7edaa0f2ef6bf690b0d8fd6e2c62d95af303d68da SHA512 7514779cb3e36fb76bddfd12c7ec8d986609af671f8a1f0f3ae5007f5a7aa80c3c440bfbc8e7766d4de178dd5aa704076401b35cb5f03a2e25d2ea97ccbc7642 WHIRLPOOL 4db36b3fb27751d15cb74e63272c0adaa8348a90d7e9c4cb9c027837477e22347fce912b3e73c669a30a6b0c9de879644f146f7261eacd90fd237218051e1777
 DIST cyrus-imapd-2.5.8.tar.gz 3069068 SHA256 664dd0a4eccfbf810ec74ccac1766c64e7db87f028f9066ae135390ab0d5c888 SHA512 e9c94696b980c7b10c52ee2c46f2dbdadc633a63ad943ebd5002c2052b13a64d8917e4e0ac4e4ae44a1f553e1fda02010840c9053c936374c06c7e88e09302ef WHIRLPOOL e8dcf43e694a8f91ab610d831ecddd516ebf1773b7543b15ba1b0e32fae7388681a9e0698951862efebb01e4894e6f40b29eae665dd36f16bf26d31583fe9822

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.5.4.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.5.4.ebuild
deleted file mode 100644
index ed147aa..0000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.5.4.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils multilib pam ssl-cert user toolchain-funcs
-
-MY_P=${P/_/}
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="http://www.cyrusimap.org/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="afs berkdb clamav http kerberos mysql nntp pam perl postgres \
-	replication +server sieve snmp sqlite ssl static-libs tcpd"
-
-# virtual/mysql-5.5 added for the --variable= option below
-DEPEND="sys-libs/zlib
-	dev-libs/libpcre
-	>=dev-libs/cyrus-sasl-2.1.13
-	dev-libs/jansson
-	afs? ( net-fs/openafs )
-	berkdb? ( >=sys-libs/db-3.2:* )
-	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2 dev-libs/libical )
-	kerberos? ( virtual/krb5 )
-	mysql? ( >=virtual/mysql-5.5 )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-			virtual/pam
-			>=net-mail/mailbase-1
-		)
-	postgres? ( dev-db/postgresql:* )
-	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( >=dev-libs/openssl-1.0.1e:* )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
-
-# all blockers really needed?
-RDEPEND="${DEPEND}
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap"
-
-REQUIRED_USE="afs? ( kerberos )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewuser cyrus -1 -1 /usr/cyrus mail
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-db.patch"
-	# Fix master(8)->cyrusmaster(8) manpage.
-	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -i -e 's:master\.8:cyrusmaster.8:g' \
-			-e 's:master(8):cyrusmaster(8):g' \
-			"${i}" || die "sed failed" || die "sed failed"
-	done
-	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
-	sed -i -e "s:MASTER:CYRUSMASTER:g" \
-		-e "s:Master:Cyrusmaster:g" \
-		-e "s:master:cyrusmaster:g" \
-		man/cyrusmaster.8 || die "sed failed"
-
-	# lock.h to afs/lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-	econf \
-		--enable-murder \
-		--enable-netscapehack \
-		--enable-idled \
-		--enable-event-notification \
-		--enable-autocreate \
-		--enable-pcre \
-		--with-service-path=/usr/$(get_libdir)/cyrus \
-		--with-cyrus-user=cyrus \
-		--with-cyrus-group=mail \
-		--with-com_err=yes \
-		--with-sasl \
-		--without-krb \
-		--without-krbdes \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_with berkdb bdb) \
-		$(use_with clamav) \
-		$(use_enable nntp) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with perl) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable server) \
-		$(use_enable sieve) \
-		$(use_with snmp) \
-		$(use_enable static-libs static) \
-		$(use_with tcpd libwrap) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALLDIRS=vendor install
-
-	dodoc README*
-	dohtml doc/*.html
-	docinto text
-	dodoc doc/text/*
-	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	rm -f doc/text/Makefile*
-
-	insinto /etc
-	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc6" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
-		keepdir "/var/${subdir}"
-		fowners cyrus:mail "/var/${subdir}"
-		fperms 0750 "/var/${subdir}"
-	done
-	for subdir in imap/{user,quota,sieve} spool/imap ; do
-		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
-			keepdir "/var/${subdir}/${i}"
-			fowners cyrus:mail "/var/${subdir}/${i}"
-			fperms 0750 "/var/${subdir}/${i}"
-		done
-	done
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} ; then
-		elog "For correct logging add the following to /etc/syslog.conf:"
-		elog "    local6.*         /var/log/imapd.log"
-		elog "    auth.debug       /var/log/auth.log"
-		echo
-
-		elog "You have to add user cyrus to the sasldb2. Do this with:"
-		elog "    saslpasswd2 cyrus"
-	fi
-}
-
-pkg_postinst() {
-	# do not install server.{key,pem) if they exist.
-	if use ssl ; then
-		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
-			install_cert /etc/ssl/cyrus/server
-			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
-		fi
-	fi
-}

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.5.5.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.5.5.ebuild
deleted file mode 100644
index ed147aa..0000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.5.5.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils multilib pam ssl-cert user toolchain-funcs
-
-MY_P=${P/_/}
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="http://www.cyrusimap.org/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="afs berkdb clamav http kerberos mysql nntp pam perl postgres \
-	replication +server sieve snmp sqlite ssl static-libs tcpd"
-
-# virtual/mysql-5.5 added for the --variable= option below
-DEPEND="sys-libs/zlib
-	dev-libs/libpcre
-	>=dev-libs/cyrus-sasl-2.1.13
-	dev-libs/jansson
-	afs? ( net-fs/openafs )
-	berkdb? ( >=sys-libs/db-3.2:* )
-	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2 dev-libs/libical )
-	kerberos? ( virtual/krb5 )
-	mysql? ( >=virtual/mysql-5.5 )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-			virtual/pam
-			>=net-mail/mailbase-1
-		)
-	postgres? ( dev-db/postgresql:* )
-	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( >=dev-libs/openssl-1.0.1e:* )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
-
-# all blockers really needed?
-RDEPEND="${DEPEND}
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap"
-
-REQUIRED_USE="afs? ( kerberos )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewuser cyrus -1 -1 /usr/cyrus mail
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-db.patch"
-	# Fix master(8)->cyrusmaster(8) manpage.
-	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -i -e 's:master\.8:cyrusmaster.8:g' \
-			-e 's:master(8):cyrusmaster(8):g' \
-			"${i}" || die "sed failed" || die "sed failed"
-	done
-	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
-	sed -i -e "s:MASTER:CYRUSMASTER:g" \
-		-e "s:Master:Cyrusmaster:g" \
-		-e "s:master:cyrusmaster:g" \
-		man/cyrusmaster.8 || die "sed failed"
-
-	# lock.h to afs/lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-	econf \
-		--enable-murder \
-		--enable-netscapehack \
-		--enable-idled \
-		--enable-event-notification \
-		--enable-autocreate \
-		--enable-pcre \
-		--with-service-path=/usr/$(get_libdir)/cyrus \
-		--with-cyrus-user=cyrus \
-		--with-cyrus-group=mail \
-		--with-com_err=yes \
-		--with-sasl \
-		--without-krb \
-		--without-krbdes \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_with berkdb bdb) \
-		$(use_with clamav) \
-		$(use_enable nntp) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with perl) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable server) \
-		$(use_enable sieve) \
-		$(use_with snmp) \
-		$(use_enable static-libs static) \
-		$(use_with tcpd libwrap) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALLDIRS=vendor install
-
-	dodoc README*
-	dohtml doc/*.html
-	docinto text
-	dodoc doc/text/*
-	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	rm -f doc/text/Makefile*
-
-	insinto /etc
-	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc6" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
-		keepdir "/var/${subdir}"
-		fowners cyrus:mail "/var/${subdir}"
-		fperms 0750 "/var/${subdir}"
-	done
-	for subdir in imap/{user,quota,sieve} spool/imap ; do
-		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
-			keepdir "/var/${subdir}/${i}"
-			fowners cyrus:mail "/var/${subdir}/${i}"
-			fperms 0750 "/var/${subdir}/${i}"
-		done
-	done
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} ; then
-		elog "For correct logging add the following to /etc/syslog.conf:"
-		elog "    local6.*         /var/log/imapd.log"
-		elog "    auth.debug       /var/log/auth.log"
-		echo
-
-		elog "You have to add user cyrus to the sasldb2. Do this with:"
-		elog "    saslpasswd2 cyrus"
-	fi
-}
-
-pkg_postinst() {
-	# do not install server.{key,pem) if they exist.
-	if use ssl ; then
-		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
-			install_cert /etc/ssl/cyrus/server
-			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
-		fi
-	fi
-}

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.5.6.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.5.6.ebuild
deleted file mode 100644
index 51937a3..0000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.5.6.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils multilib pam ssl-cert user toolchain-funcs
-
-MY_P=${P/_/}
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="http://www.cyrusimap.org/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="afs berkdb clamav http kerberos mysql nntp pam perl postgres \
-	replication +server sieve snmp sqlite ssl static-libs tcpd"
-
-# virtual/mysql-5.5 added for the --variable= option below
-DEPEND="sys-libs/zlib
-	dev-libs/libpcre
-	>=dev-libs/cyrus-sasl-2.1.13
-	dev-libs/jansson
-	afs? ( net-fs/openafs )
-	berkdb? ( >=sys-libs/db-3.2:* )
-	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2 dev-libs/libical )
-	kerberos? ( virtual/krb5 )
-	mysql? ( >=virtual/mysql-5.5 )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-			virtual/pam
-			>=net-mail/mailbase-1
-		)
-	postgres? ( dev-db/postgresql:* )
-	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( >=dev-libs/openssl-1.0.1e:* )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
-
-# all blockers really needed?
-RDEPEND="${DEPEND}
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap
-	!net-mail/cyrus-imap-admin"
-
-REQUIRED_USE="afs? ( kerberos )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewuser cyrus -1 -1 /usr/cyrus mail
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-db.patch"
-	# Fix master(8)->cyrusmaster(8) manpage.
-	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -i -e 's:master\.8:cyrusmaster.8:g' \
-			-e 's:master(8):cyrusmaster(8):g' \
-			"${i}" || die "sed failed" || die "sed failed"
-	done
-	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
-	sed -i -e "s:MASTER:CYRUSMASTER:g" \
-		-e "s:Master:Cyrusmaster:g" \
-		-e "s:master:cyrusmaster:g" \
-		man/cyrusmaster.8 || die "sed failed"
-
-	# lock.h to afs/lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-	econf \
-		--enable-murder \
-		--enable-netscapehack \
-		--enable-idled \
-		--enable-event-notification \
-		--enable-autocreate \
-		--enable-pcre \
-		--with-service-path=/usr/$(get_libdir)/cyrus \
-		--with-cyrus-user=cyrus \
-		--with-cyrus-group=mail \
-		--with-com_err=yes \
-		--with-sasl \
-		--without-krb \
-		--without-krbdes \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_with berkdb bdb) \
-		$(use_with clamav) \
-		$(use_enable nntp) \
-		$(use_enable http) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with perl) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable server) \
-		$(use_enable sieve) \
-		$(use_with snmp) \
-		$(use_enable static-libs static) \
-		$(use_with tcpd libwrap) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALLDIRS=vendor install
-
-	dodoc README*
-	dohtml doc/*.html
-	docinto text
-	dodoc doc/text/*
-	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	rm -f doc/text/Makefile*
-
-	insinto /etc
-	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc6" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
-		keepdir "/var/${subdir}"
-		fowners cyrus:mail "/var/${subdir}"
-		fperms 0750 "/var/${subdir}"
-	done
-	for subdir in imap/{user,quota,sieve} spool/imap ; do
-		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
-			keepdir "/var/${subdir}/${i}"
-			fowners cyrus:mail "/var/${subdir}/${i}"
-			fperms 0750 "/var/${subdir}/${i}"
-		done
-	done
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} ; then
-		elog "For correct logging add the following to /etc/syslog.conf:"
-		elog "    local6.*         /var/log/imapd.log"
-		elog "    auth.debug       /var/log/auth.log"
-		echo
-
-		elog "You have to add user cyrus to the sasldb2. Do this with:"
-		elog "    saslpasswd2 cyrus"
-	fi
-}
-
-pkg_postinst() {
-	# do not install server.{key,pem) if they exist.
-	if use ssl ; then
-		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
-			install_cert /etc/ssl/cyrus/server
-			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
-		fi
-	fi
-}


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2016-05-21 14:37 Eray Aslan
  0 siblings, 0 replies; 85+ messages in thread
From: Eray Aslan @ 2016-05-21 14:37 UTC (permalink / raw
  To: gentoo-commits

commit:     1a63d671508e189c7d100cb3fb3ea633da963e78
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Sat May 21 14:35:04 2016 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Sat May 21 14:35:04 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a63d671

net-mail/cyrus-imapd: version bump to cyrus-imapd-2.5.8

Package-Manager: portage-2.3.0_rc1

 net-mail/cyrus-imapd/Manifest                 |   1 +
 net-mail/cyrus-imapd/cyrus-imapd-2.5.8.ebuild | 177 ++++++++++++++++++++++++++
 2 files changed, 178 insertions(+)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 4cf7009..ffa756f 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -5,3 +5,4 @@ DIST cyrus-imapd-2.5.4.tar.gz 3070894 SHA256 98839d2865c0ff5c5dc0f59aba54ad11113
 DIST cyrus-imapd-2.5.5.tar.gz 2940177 SHA256 6cfd45856c869921fa8f89da9be9d5c640757011a678f964252e95a753182eee SHA512 86a0af8f84172104e1836372e4a0c0503b89dfd391a83e29d18f315162abadf00ddc939c5fcb1ee01a244addaba5a2d90b4c3065313b557edbd977ab8c0b3ce5 WHIRLPOOL 34e887140a0923ce4de9d6142c1ec1ae7c1831746d6c92570876448cfef84368fffbe41c11955912ba4d1e89eaf4255f85a60a26f76f2be7867f8713ca52fa9a
 DIST cyrus-imapd-2.5.6.tar.gz 2938962 SHA256 60f9be717c17497e7d69f468a8da3daf926c49edeac958bc769b4547f10103df SHA512 7f5c758559cfe85217d1ba423004815c9af146e2dffc0b7596713690e00e79c5af971afe086584255163bc2ccc9abf1428899495df4c7584e7fa46b96bab2be8 WHIRLPOOL 5cd152304e029a303cb99a095274288f7093e05b525b9fa4ac55a435910d86d569d803bb00d538c6ebcdb6665bd940ccf30870fb34dfff411fb22ab0547f53c8
 DIST cyrus-imapd-2.5.7.tar.gz 2928358 SHA256 f06c2c030b16b70145fecdf7edaa0f2ef6bf690b0d8fd6e2c62d95af303d68da SHA512 7514779cb3e36fb76bddfd12c7ec8d986609af671f8a1f0f3ae5007f5a7aa80c3c440bfbc8e7766d4de178dd5aa704076401b35cb5f03a2e25d2ea97ccbc7642 WHIRLPOOL 4db36b3fb27751d15cb74e63272c0adaa8348a90d7e9c4cb9c027837477e22347fce912b3e73c669a30a6b0c9de879644f146f7261eacd90fd237218051e1777
+DIST cyrus-imapd-2.5.8.tar.gz 3069068 SHA256 664dd0a4eccfbf810ec74ccac1766c64e7db87f028f9066ae135390ab0d5c888 SHA512 e9c94696b980c7b10c52ee2c46f2dbdadc633a63ad943ebd5002c2052b13a64d8917e4e0ac4e4ae44a1f553e1fda02010840c9053c936374c06c7e88e09302ef WHIRLPOOL e8dcf43e694a8f91ab610d831ecddd516ebf1773b7543b15ba1b0e32fae7388681a9e0698951862efebb01e4894e6f40b29eae665dd36f16bf26d31583fe9822

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.5.8.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.5.8.ebuild
new file mode 100644
index 0000000..56de5c7
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.5.8.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools multilib pam ssl-cert user toolchain-funcs
+
+MY_P=${P/_/}
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="http://www.cyrusimap.org/"
+SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
+
+LICENSE="BSD-with-attribution"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs berkdb clamav http kerberos mysql nntp pam perl postgres \
+	replication +server sieve snmp sqlite ssl static-libs tcpd"
+
+# virtual/mysql-5.5 added for the --variable= option below
+DEPEND="sys-libs/zlib
+	dev-libs/libpcre
+	>=dev-libs/cyrus-sasl-2.1.13
+	dev-libs/jansson
+	afs? ( net-fs/openafs )
+	berkdb? ( >=sys-libs/db-3.2:* )
+	clamav? ( app-antivirus/clamav )
+	http? ( dev-libs/libxml2 dev-libs/libical )
+	kerberos? ( virtual/krb5 )
+	mysql? ( >=virtual/mysql-5.5 )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+			virtual/pam
+			>=net-mail/mailbase-1
+		)
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
+
+# all blockers really needed?
+RDEPEND="${DEPEND}
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!net-mail/cyrus-imap-admin"
+
+REQUIRED_USE="afs? ( kerberos )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewuser cyrus -1 -1 /usr/cyrus mail
+}
+
+src_prepare() {
+	eapply -p0 "${FILESDIR}/${PN}-db.patch"
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+	econf \
+		--enable-murder \
+		--enable-netscapehack \
+		--enable-idled \
+		--enable-event-notification \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-service-path=/usr/$(get_libdir)/cyrus \
+		--with-cyrus-user=cyrus \
+		--with-cyrus-group=mail \
+		--with-com_err=yes \
+		--with-sasl \
+		--without-krb \
+		--without-krbdes \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_with berkdb bdb) \
+		$(use_with clamav) \
+		$(use_enable nntp) \
+		$(use_enable http) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_with snmp) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dodoc -r doc
+	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	rm -f doc/text/Makefile*
+
+	insinto /etc
+	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	newinitd "${FILESDIR}/cyrus.rc6" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		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
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist.
+	if use ssl ; then
+		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+}


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2015-12-01 16:09 Eray Aslan
  0 siblings, 0 replies; 85+ messages in thread
From: Eray Aslan @ 2015-12-01 16:09 UTC (permalink / raw
  To: gentoo-commits

commit:     b985dc9dce4501a6e0d1649a78f01d64f5d60575
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  1 16:06:56 2015 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Tue Dec  1 16:06:56 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b985dc9d

net-mail/cyrus-imapd: version bump to 2.5.7

Package-Manager: portage-2.2.26

 net-mail/cyrus-imapd/Manifest                 |   1 +
 net-mail/cyrus-imapd/cyrus-imapd-2.5.7.ebuild | 178 ++++++++++++++++++++++++++
 2 files changed, 179 insertions(+)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 0d3ac70..4cf7009 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -4,3 +4,4 @@ DIST cyrus-imapd-2.4.18.tar.gz 2495098 SHA256 166a0a1efbf01f71d9d8449569152b3cda
 DIST cyrus-imapd-2.5.4.tar.gz 3070894 SHA256 98839d2865c0ff5c5dc0f59aba54ad111135697c3383919e037651d90f00aaaa SHA512 0bc78bf63560cc0d89f0ef4a5f6a160300cbb1090394d6bc62f51a0d73ea3615a1ecbf95cb6dab9d10c99afd3a95079a6df86a8157042e13bf907bb4eca94423 WHIRLPOOL 02ee9a685e6825473e9643e70ad4e22e22a9b6e263ec81692ff0d9e68c3b1b07b5ed1cdb1bbf4119242429779fe0435d9ae00651fbaec465308ac8bdf96650eb
 DIST cyrus-imapd-2.5.5.tar.gz 2940177 SHA256 6cfd45856c869921fa8f89da9be9d5c640757011a678f964252e95a753182eee SHA512 86a0af8f84172104e1836372e4a0c0503b89dfd391a83e29d18f315162abadf00ddc939c5fcb1ee01a244addaba5a2d90b4c3065313b557edbd977ab8c0b3ce5 WHIRLPOOL 34e887140a0923ce4de9d6142c1ec1ae7c1831746d6c92570876448cfef84368fffbe41c11955912ba4d1e89eaf4255f85a60a26f76f2be7867f8713ca52fa9a
 DIST cyrus-imapd-2.5.6.tar.gz 2938962 SHA256 60f9be717c17497e7d69f468a8da3daf926c49edeac958bc769b4547f10103df SHA512 7f5c758559cfe85217d1ba423004815c9af146e2dffc0b7596713690e00e79c5af971afe086584255163bc2ccc9abf1428899495df4c7584e7fa46b96bab2be8 WHIRLPOOL 5cd152304e029a303cb99a095274288f7093e05b525b9fa4ac55a435910d86d569d803bb00d538c6ebcdb6665bd940ccf30870fb34dfff411fb22ab0547f53c8
+DIST cyrus-imapd-2.5.7.tar.gz 2928358 SHA256 f06c2c030b16b70145fecdf7edaa0f2ef6bf690b0d8fd6e2c62d95af303d68da SHA512 7514779cb3e36fb76bddfd12c7ec8d986609af671f8a1f0f3ae5007f5a7aa80c3c440bfbc8e7766d4de178dd5aa704076401b35cb5f03a2e25d2ea97ccbc7642 WHIRLPOOL 4db36b3fb27751d15cb74e63272c0adaa8348a90d7e9c4cb9c027837477e22347fce912b3e73c669a30a6b0c9de879644f146f7261eacd90fd237218051e1777

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.5.7.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.5.7.ebuild
new file mode 100644
index 0000000..dbdc249
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.5.7.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils multilib pam ssl-cert user toolchain-funcs
+
+MY_P=${P/_/}
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="http://www.cyrusimap.org/"
+SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
+
+LICENSE="BSD-with-attribution"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs berkdb clamav http kerberos mysql nntp pam perl postgres \
+	replication +server sieve snmp sqlite ssl static-libs tcpd"
+
+# virtual/mysql-5.5 added for the --variable= option below
+DEPEND="sys-libs/zlib
+	dev-libs/libpcre
+	>=dev-libs/cyrus-sasl-2.1.13
+	dev-libs/jansson
+	afs? ( net-fs/openafs )
+	berkdb? ( >=sys-libs/db-3.2:* )
+	clamav? ( app-antivirus/clamav )
+	http? ( dev-libs/libxml2 dev-libs/libical )
+	kerberos? ( virtual/krb5 )
+	mysql? ( >=virtual/mysql-5.5 )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+			virtual/pam
+			>=net-mail/mailbase-1
+		)
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
+
+# all blockers really needed?
+RDEPEND="${DEPEND}
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!net-mail/cyrus-imap-admin"
+
+REQUIRED_USE="afs? ( kerberos )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewuser cyrus -1 -1 /usr/cyrus mail
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-db.patch"
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+	econf \
+		--enable-murder \
+		--enable-netscapehack \
+		--enable-idled \
+		--enable-event-notification \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-service-path=/usr/$(get_libdir)/cyrus \
+		--with-cyrus-user=cyrus \
+		--with-cyrus-group=mail \
+		--with-com_err=yes \
+		--with-sasl \
+		--without-krb \
+		--without-krbdes \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_with berkdb bdb) \
+		$(use_with clamav) \
+		$(use_enable nntp) \
+		$(use_enable http) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_with snmp) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dohtml doc/*.html
+	docinto text
+	dodoc doc/text/*
+	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	rm -f doc/text/Makefile*
+
+	insinto /etc
+	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	newinitd "${FILESDIR}/cyrus.rc6" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		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
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist.
+	if use ssl ; then
+		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+}


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2015-09-17  6:21 Eray Aslan
  0 siblings, 0 replies; 85+ messages in thread
From: Eray Aslan @ 2015-09-17  6:21 UTC (permalink / raw
  To: gentoo-commits

commit:     e457f0a964bb2670d6f189a93400683f193fdd27
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 17 06:20:53 2015 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Thu Sep 17 06:20:53 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e457f0a9

net-mail/cyrus-imapd: Version bump to cyrus-imapd-2.5.6

Fix http USE flag.  Add blocker to net-mail/cyrus-imap-admin.
Bug: 559446

Package-Manager: portage-2.2.20.1

 net-mail/cyrus-imapd/Manifest                 |   1 +
 net-mail/cyrus-imapd/cyrus-imapd-2.5.6.ebuild | 178 ++++++++++++++++++++++++++
 2 files changed, 179 insertions(+)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 8c7fa3d..0d3ac70 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -3,3 +3,4 @@ DIST cyrus-imapd-2.4.17.tar.gz 2486355 SHA256 b3e30052c764ee7163947ffde27bdd58bd
 DIST cyrus-imapd-2.4.18.tar.gz 2495098 SHA256 166a0a1efbf01f71d9d8449569152b3cda4949cd689f299a5e77a38d7026012c SHA512 3b234c1773fe5d57cae35743985930bc7fed2eedaa0919598da8fb19588f95b3beb8ad166d3b4f0c96faf006ff56ed5027ec516fab6007edbe46c4f45572a1ef WHIRLPOOL 1a243a9b3875105dfc414e1092f328691b6bef7c0d04f8bd91824ca0d01c715ebc2449c37bbca2ab86193e4d2dc426b33cfd31a0cdfdea0bacc081fd9010b1df
 DIST cyrus-imapd-2.5.4.tar.gz 3070894 SHA256 98839d2865c0ff5c5dc0f59aba54ad111135697c3383919e037651d90f00aaaa SHA512 0bc78bf63560cc0d89f0ef4a5f6a160300cbb1090394d6bc62f51a0d73ea3615a1ecbf95cb6dab9d10c99afd3a95079a6df86a8157042e13bf907bb4eca94423 WHIRLPOOL 02ee9a685e6825473e9643e70ad4e22e22a9b6e263ec81692ff0d9e68c3b1b07b5ed1cdb1bbf4119242429779fe0435d9ae00651fbaec465308ac8bdf96650eb
 DIST cyrus-imapd-2.5.5.tar.gz 2940177 SHA256 6cfd45856c869921fa8f89da9be9d5c640757011a678f964252e95a753182eee SHA512 86a0af8f84172104e1836372e4a0c0503b89dfd391a83e29d18f315162abadf00ddc939c5fcb1ee01a244addaba5a2d90b4c3065313b557edbd977ab8c0b3ce5 WHIRLPOOL 34e887140a0923ce4de9d6142c1ec1ae7c1831746d6c92570876448cfef84368fffbe41c11955912ba4d1e89eaf4255f85a60a26f76f2be7867f8713ca52fa9a
+DIST cyrus-imapd-2.5.6.tar.gz 2938962 SHA256 60f9be717c17497e7d69f468a8da3daf926c49edeac958bc769b4547f10103df SHA512 7f5c758559cfe85217d1ba423004815c9af146e2dffc0b7596713690e00e79c5af971afe086584255163bc2ccc9abf1428899495df4c7584e7fa46b96bab2be8 WHIRLPOOL 5cd152304e029a303cb99a095274288f7093e05b525b9fa4ac55a435910d86d569d803bb00d538c6ebcdb6665bd940ccf30870fb34dfff411fb22ab0547f53c8

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.5.6.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.5.6.ebuild
new file mode 100644
index 0000000..51937a3
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.5.6.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils multilib pam ssl-cert user toolchain-funcs
+
+MY_P=${P/_/}
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="http://www.cyrusimap.org/"
+SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
+
+LICENSE="BSD-with-attribution"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs berkdb clamav http kerberos mysql nntp pam perl postgres \
+	replication +server sieve snmp sqlite ssl static-libs tcpd"
+
+# virtual/mysql-5.5 added for the --variable= option below
+DEPEND="sys-libs/zlib
+	dev-libs/libpcre
+	>=dev-libs/cyrus-sasl-2.1.13
+	dev-libs/jansson
+	afs? ( net-fs/openafs )
+	berkdb? ( >=sys-libs/db-3.2:* )
+	clamav? ( app-antivirus/clamav )
+	http? ( dev-libs/libxml2 dev-libs/libical )
+	kerberos? ( virtual/krb5 )
+	mysql? ( >=virtual/mysql-5.5 )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+			virtual/pam
+			>=net-mail/mailbase-1
+		)
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( >=dev-libs/openssl-1.0.1e:* )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
+
+# all blockers really needed?
+RDEPEND="${DEPEND}
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!net-mail/cyrus-imap-admin"
+
+REQUIRED_USE="afs? ( kerberos )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewuser cyrus -1 -1 /usr/cyrus mail
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-db.patch"
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+	econf \
+		--enable-murder \
+		--enable-netscapehack \
+		--enable-idled \
+		--enable-event-notification \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-service-path=/usr/$(get_libdir)/cyrus \
+		--with-cyrus-user=cyrus \
+		--with-cyrus-group=mail \
+		--with-com_err=yes \
+		--with-sasl \
+		--without-krb \
+		--without-krbdes \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_with berkdb bdb) \
+		$(use_with clamav) \
+		$(use_enable nntp) \
+		$(use_enable http) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_with snmp) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dohtml doc/*.html
+	docinto text
+	dodoc doc/text/*
+	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	rm -f doc/text/Makefile*
+
+	insinto /etc
+	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	newinitd "${FILESDIR}/cyrus.rc6" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		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
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist.
+	if use ssl ; then
+		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+}


^ permalink raw reply related	[flat|nested] 85+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/
@ 2015-08-10 12:29 Eray Aslan
  0 siblings, 0 replies; 85+ messages in thread
From: Eray Aslan @ 2015-08-10 12:29 UTC (permalink / raw
  To: gentoo-commits

commit:     dd6b2c821e44c8b3e14cd2c01d32beb4dda7f786
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 10 12:28:42 2015 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Mon Aug 10 12:28:42 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd6b2c82

net-mail/cyrus-imapd: version bump

Package-Manager: portage-2.2.20

 net-mail/cyrus-imapd/Manifest                 |   1 +
 net-mail/cyrus-imapd/cyrus-imapd-2.5.5.ebuild | 176 ++++++++++++++++++++++++++
 2 files changed, 177 insertions(+)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 6772d4c..8c7fa3d 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -2,3 +2,4 @@ DIST cyrus-imapd-2.4.16.tar.gz 2484201 SHA256 beac9d6059680bbf65948db60a30c6e8f5
 DIST cyrus-imapd-2.4.17.tar.gz 2486355 SHA256 b3e30052c764ee7163947ffde27bdd58bd4dd2e5697ad144491941e46300a583 SHA512 86ffe1664ca3c3df164ed8fca21cc08ddae12380e1485deccec7da4ec263d8b953a806e05f0b10f6fb7717a0d40fc05669792b77cc66d7c5067061c8506e59ee WHIRLPOOL 22566578217a5901793b886ff020aa1deecbb81bf85f54a524b58de129029e51b0aa358db902a2139584d05f668404cb98ca2ff3fa33803ce986e07b95c69c45
 DIST cyrus-imapd-2.4.18.tar.gz 2495098 SHA256 166a0a1efbf01f71d9d8449569152b3cda4949cd689f299a5e77a38d7026012c SHA512 3b234c1773fe5d57cae35743985930bc7fed2eedaa0919598da8fb19588f95b3beb8ad166d3b4f0c96faf006ff56ed5027ec516fab6007edbe46c4f45572a1ef WHIRLPOOL 1a243a9b3875105dfc414e1092f328691b6bef7c0d04f8bd91824ca0d01c715ebc2449c37bbca2ab86193e4d2dc426b33cfd31a0cdfdea0bacc081fd9010b1df
 DIST cyrus-imapd-2.5.4.tar.gz 3070894 SHA256 98839d2865c0ff5c5dc0f59aba54ad111135697c3383919e037651d90f00aaaa SHA512 0bc78bf63560cc0d89f0ef4a5f6a160300cbb1090394d6bc62f51a0d73ea3615a1ecbf95cb6dab9d10c99afd3a95079a6df86a8157042e13bf907bb4eca94423 WHIRLPOOL 02ee9a685e6825473e9643e70ad4e22e22a9b6e263ec81692ff0d9e68c3b1b07b5ed1cdb1bbf4119242429779fe0435d9ae00651fbaec465308ac8bdf96650eb
+DIST cyrus-imapd-2.5.5.tar.gz 2940177 SHA256 6cfd45856c869921fa8f89da9be9d5c640757011a678f964252e95a753182eee SHA512 86a0af8f84172104e1836372e4a0c0503b89dfd391a83e29d18f315162abadf00ddc939c5fcb1ee01a244addaba5a2d90b4c3065313b557edbd977ab8c0b3ce5 WHIRLPOOL 34e887140a0923ce4de9d6142c1ec1ae7c1831746d6c92570876448cfef84368fffbe41c11955912ba4d1e89eaf4255f85a60a26f76f2be7867f8713ca52fa9a

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.5.5.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.5.5.ebuild
new file mode 100644
index 0000000..ed147aa
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.5.5.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils multilib pam ssl-cert user toolchain-funcs
+
+MY_P=${P/_/}
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="http://www.cyrusimap.org/"
+SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
+
+LICENSE="BSD-with-attribution"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs berkdb clamav http kerberos mysql nntp pam perl postgres \
+	replication +server sieve snmp sqlite ssl static-libs tcpd"
+
+# virtual/mysql-5.5 added for the --variable= option below
+DEPEND="sys-libs/zlib
+	dev-libs/libpcre
+	>=dev-libs/cyrus-sasl-2.1.13
+	dev-libs/jansson
+	afs? ( net-fs/openafs )
+	berkdb? ( >=sys-libs/db-3.2:* )
+	clamav? ( app-antivirus/clamav )
+	http? ( dev-libs/libxml2 dev-libs/libical )
+	kerberos? ( virtual/krb5 )
+	mysql? ( >=virtual/mysql-5.5 )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+			virtual/pam
+			>=net-mail/mailbase-1
+		)
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( >=dev-libs/openssl-1.0.1e:* )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
+
+# all blockers really needed?
+RDEPEND="${DEPEND}
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap"
+
+REQUIRED_USE="afs? ( kerberos )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewuser cyrus -1 -1 /usr/cyrus mail
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-db.patch"
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+	econf \
+		--enable-murder \
+		--enable-netscapehack \
+		--enable-idled \
+		--enable-event-notification \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-service-path=/usr/$(get_libdir)/cyrus \
+		--with-cyrus-user=cyrus \
+		--with-cyrus-group=mail \
+		--with-com_err=yes \
+		--with-sasl \
+		--without-krb \
+		--without-krbdes \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_with berkdb bdb) \
+		$(use_with clamav) \
+		$(use_enable nntp) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_with snmp) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dohtml doc/*.html
+	docinto text
+	dodoc doc/text/*
+	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	rm -f doc/text/Makefile*
+
+	insinto /etc
+	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	newinitd "${FILESDIR}/cyrus.rc6" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		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
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist.
+	if use ssl ; then
+		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+}


^ permalink raw reply related	[flat|nested] 85+ messages in thread
end of thread, other threads:[~2023-07-02 11:14 UTC | newest]

Thread overview: 85+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-13  4:23 [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2023-07-02 11:14 David Seifert
2023-05-05 10:42 Arthur Zamarin
2023-03-25  6:35 Arthur Zamarin
2023-02-13  4:23 Sam James
2022-08-24  5:29 Agostino Sarubbo
2022-08-24  5:25 Agostino Sarubbo
2022-06-27  9:55 Sam James
2022-05-10 16:59 Sam James
2022-05-10 13:47 Agostino Sarubbo
2022-03-22 23:32 Sam James
2022-02-23  2:52 Sam James
2022-02-23  2:52 Sam James
2022-02-21  7:47 Agostino Sarubbo
2022-02-19 19:28 Sam James
2022-02-19 15:47 Jakov Smolić
2021-11-20 15:34 Arthur Zamarin
2021-10-09  3:20 Sam James
2021-10-08 18:49 Agostino Sarubbo
2021-10-08 18:48 Agostino Sarubbo
2021-10-08 18:48 Agostino Sarubbo
2021-09-25 19:08 Sam James
2021-09-16  1:18 Sam James
2021-09-16  1:18 Sam James
2021-09-13 20:30 David Seifert
2021-06-17 22:18 Thomas Deutschmann
2021-06-17 20:32 Thomas Deutschmann
2021-06-13  6:32 Agostino Sarubbo
2021-06-13  6:28 Agostino Sarubbo
2021-06-13  3:45 Sam James
2021-05-10  9:28 Sam James
2021-05-10  9:22 Sam James
2021-05-10  9:22 Sam James
2021-05-07 14:38 Sam James
2021-05-06 23:26 Sam James
2021-05-06 23:26 Sam James
2021-05-06 23:26 Sam James
2021-05-06 23:26 Sam James
2020-12-20 19:07 Thomas Deutschmann
2020-12-17 16:41 Agostino Sarubbo
2020-12-17  8:58 Sam James
2020-09-08  9:21 Eray Aslan
2020-09-08  6:40 Eray Aslan
2020-09-05  4:06 Sam James
2020-05-08  6:38 Agostino Sarubbo
2020-04-09 18:42 Eray Aslan
2019-12-12 14:58 Michał Górny
2019-10-12 21:24 Mikle Kolyada
2019-07-30  6:35 Eray Aslan
2019-06-13 14:54 Agostino Sarubbo
2019-06-13 14:53 Agostino Sarubbo
2019-06-13 14:28 Agostino Sarubbo
2019-06-13 14:12 Agostino Sarubbo
2019-06-09 11:40 Pacho Ramos
2019-06-09 11:40 Pacho Ramos
2019-06-04 19:01 Agostino Sarubbo
2019-06-03 15:00 Agostino Sarubbo
2019-05-28 10:17 Eray Aslan
2019-04-06 22:23 Patrice Clement
2019-03-26 20:17 Aaron Bauman
2019-02-18 20:29 Brian Evans
2018-08-29  5:41 Eray Aslan
2018-08-29  5:41 Eray Aslan
2018-04-30  8:06 Eray Aslan
2018-03-15 11:09 Mikle Kolyada
2018-03-11  2:16 Thomas Deutschmann
2018-01-22 14:21 Eray Aslan
2017-11-26 19:06 Sergei Trofimovich
2017-10-25  9:31 Agostino Sarubbo
2017-10-16 23:28 Sergei Trofimovich
2017-10-15 21:34 Sergei Trofimovich
2017-10-13 15:01 Thomas Deutschmann
2017-06-22  5:22 Eray Aslan
2017-05-17  7:39 Eray Aslan
2017-05-09  8:23 Eray Aslan
2017-01-24 21:16 Jeroen Roovers
2016-11-25 18:54 Agostino Sarubbo
2016-11-25 18:27 Agostino Sarubbo
2016-10-20 14:43 Eray Aslan
2016-07-25 10:26 Eray Aslan
2016-05-21 14:37 Eray Aslan
2016-05-21 14:37 Eray Aslan
2015-12-01 16:09 Eray Aslan
2015-09-17  6:21 Eray Aslan
2015-08-10 12:29 Eray Aslan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox