gentoo resync : 16.09.2021

7 files changed, 243 insertions, 14 deletions

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index f07b1ed567f4..df985188fe51 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -8,9 +8,11 @@ AUX imapd.conf 1471 BLAKE2B 5373950ac08b630a82fc00b5bf3fed9d400e092458310b64cb66
 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.1.tar.gz 12539102 BLAKE2B f791d26f34a9a5e9896231ec812ae623bb3f5fc85a577ea25deea956bda153f941f2a759f77de10d105d0746827243efed773fe67eea4921200cb2cddf81e049 SHA512 9fd13e93755aca98215c1bd9c21fa3ef3a3db8b1ff48f71dd6070e614e9c68cb591b1cb411fa1319d46ab1d49ddc971f188a41cc0c9a2e2c9df0cc08299f8bfa
-EBUILD cyrus-imapd-3.0.13-r1.ebuild 6071 BLAKE2B 8e88d65790e5a69aed873cc1a5046e4e6ddf3eb7f27cda65c5aec6c36696a1b1a616bfb0d7f5963e392b86cda7e68508b162ccbfe33703962b7385f6f4d1ee6d SHA512 abfe0714a5e181facf6a0bd4a8e478f217920eb5f86d26a06ad43eccfaae320fcb5411f47d0557a3ec7338a924ab6ce5b0beb61dab7eeeb42d446fdf0537bb46
-EBUILD cyrus-imapd-3.0.14-r1.ebuild 6032 BLAKE2B 96915985427fae18071075550b6c45c5f6a9aef97f79a284e1e65578d0823095d88621e2d08850a668da19e172880a73ec12694eb003dfbf01037ade63e42cf7 SHA512 e80d51e697411c1e1e861282a4477e72f14dec93801233c7fa1baa5b9d6345a8b9ba1b24f27c70e17dc76fd85946acf9a18e249d280c105f412082f035efa66e
-EBUILD cyrus-imapd-3.0.15-r1.ebuild 6018 BLAKE2B fef2862da0213b6fa03e752e1f9d8ce16a669d5dc71f9939c998c438c01dfe5925c8228d9f417eb7e91bdd7b82576f6e3f7e255cb820ea9b8ad57b68539fef25 SHA512 210eda7184d8022a68e4a54fb35eaaa393512660744cbd9a098f0bc9ccb8dc65feeadb969d0ba6a8c19bc8141c9f29943ce67d5b27e430d51bd6b407129394d8
-EBUILD cyrus-imapd-3.4.1-r1.ebuild 6111 BLAKE2B a6079dd301b4a5690686415f8c59a7ddf07de860781a5d8cf22aa3d71ce662cc514ca1b91c9a4e6889f994711e81014e051ded03cc3fcab39348cc0584a36ca4 SHA512 3999ddff75b24de82793d9274a843bcfa73a7edbee3afe54c2312b1aa23f2e79c1a8e761422996f51acc567a5ffe3f84b509180bb7ce073ceaf30808731787d2
-MISC metadata.xml 755 BLAKE2B 91a98ad4c523212160a8d64843fbc77a376c13d69c4a0ebf6c2555f546634f6192c40c75f3a0f8c24b23283643e216c33e2d9e3fd52d663b5f90b956d6f6bd9e SHA512 a289dce9ddd43330b438c3096c8b186cfbb1a0e9d0398e76cbcaff28f72b21735d699d3c470164c5dc25cd9a609ba100e794860f03a87286cdbab9e41e2d41bc
+DIST cyrus-imapd-3.0.16.tar.gz 10875516 BLAKE2B 10915418b4de3f460a20d3808274f9ea83bdadc9a9edf2b383081605f7510a3e1563fa009e1dcc203f1c008f26e9db3ffd80f101f546de1dc8c3e714efc13596 SHA512 c17dd940102989d1e329ad8a1c08655bdd8b349ecb08e661f55ab8e602516ece1a86e52313e8cd5677048470f15f4272fcb598e4bbc61d27e5a673c01cb81ca3
+DIST cyrus-imapd-3.4.2.tar.gz 12603768 BLAKE2B 515c36fc3d6a29991283d47a3e523d87a68c3191b4aae85074f40b2416fe3a89793f1991dc5729912a3d56247f6fbf4aed52abcadbc37ca7cc9bf857a8641871 SHA512 4d7d14e222bc1e97b2d8188804139c4c477de66cb621caba475b57533739ee59d88504d4f47735bb6a6b3c9097dbec382ecfa2c678f978791b9a6956a3cd91d6
+EBUILD cyrus-imapd-3.0.13-r2.ebuild 6064 BLAKE2B bf1a1c4c74ffa14c4589b2567113634bf8b095b7277c0e0fb2d8862381c6db7397428344f78c66b4a6397e2f65572537a3ea497330a0a4ebadb7e86cdd5f53ba SHA512 00c690dc8aef5df29986e1aed176a2bf17bdd18353a73bc16f5b880332a1ead1927e5e3b9995cdd4c2c28bc3c533bceb1265dd81dc30c45ec63118f1de1ee184
+EBUILD cyrus-imapd-3.0.14-r2.ebuild 6025 BLAKE2B d471a5946e4cc4d052cd3dc147b3d13e730b7dcf1cd4c2798061a3b7a79d44b7b1c99f78642c431bab576a833ee6dcf155061db2bb0e65cfe58fef94e0299b9d SHA512 11de275e32ebb7d4ed18681fa43b426f140f45d3987c7ba358bd38098cadb264723db1479f9e6ba42b29516f052355ff0fc250271b1e064462e13caf619daeb0
+EBUILD cyrus-imapd-3.0.15-r2.ebuild 6011 BLAKE2B a23c3d69c79476d00ef3a6b60a3ed8d297d9316f4f5b0d83ed5643d8f6a95d057729817ae64b227896c22ed1a0655d00a5269e2765da2a145b62f13b8731d00c SHA512 77aadc470981018cee1ddfc744cf80c38d7a757387196f73cf2386eba39d9b72e998fe8122a6c2654c4908a6cbc57e3ca6d49e9b92e4a12d3374bb2e3edc4e46
+EBUILD cyrus-imapd-3.0.16.ebuild 6014 BLAKE2B 71d75a50701b5010fbe415375a5b4e15573113d1c4fafeeaba7cedb6487de3cd96310f69a0f39d39d5cd2e634905ec03d5eff570ad82ffcecf0c90061914c49b SHA512 74ebf8fd6449e66a05a49ed3741d4dec380417d6c665d2ee17a87ec85ec83382686315c8c82d62c868a1b25b6ebb2d82d5da43bc9e60ef5fabe39c610a30d9ef
+EBUILD cyrus-imapd-3.4.2.ebuild 5951 BLAKE2B 48f7498bbae7fe7a36dd5f561dd2526d6f06a5e923c0541661fa4d42258121f00ab83394c5f306acd0dc7d6b20fe7a4240ea011b13041d4c0d3746d65e42f833 SHA512 b31e04a58d2a07332a0d807aefae710127bc3c7e11714ec964e39b35eaf819aef1868d3ee5e92a81737e9d75c84d923cefad305da011d1194d484b12f1cd9d0a
+MISC metadata.xml 756 BLAKE2B e67e371c0daf545e354680a35bbfda109d5bac966c75d048f3fef045def983410926fb02bd9f36906251b32696cba41733969912c0d5a5496717de0626fd10ae SHA512 0e558ce2562227134bb7c5ebc95b44b353b2e4361744366862708ff8942a1cddffb931d58811fa6c511b7057a083e05c47c76453ba3dfba89d77ba8db0402b7b
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
index 0b1c4623c1df..b43bc8a9c6be 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
index 3affaab2f216..5bbfe2dcd570 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
index 0c07e5648b52..c815c216b760 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.0.16.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16.ebuild
new file mode 100644
index 000000000000..7d03ce6b6864
--- /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
+}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.1-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.2.ebuild
index d3b05eeba469..9f3b5413327e 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.1-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.2.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 )
@@ -113,9 +113,6 @@ src_configure() {
 	# 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 \
diff --git a/net-mail/cyrus-imapd/metadata.xml b/net-mail/cyrus-imapd/metadata.xml
index 07719eba8027..5e5c1ac2074a 100644
--- a/net-mail/cyrus-imapd/metadata.xml
+++ b/net-mail/cyrus-imapd/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<use>