gentoo resync : 19.03.2019

3 files changed, 256 insertions, 0 deletions

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index ec4c5a632df2..6ff87795b114 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,5 +1,6 @@
 AUX cyrus-imapd-db.patch 2193 BLAKE2B 6b8b2601e4eb7fd124d8cfb1f6409a8f42a3b8b35781034d5258bc820e27da8b0a963cf7904b0d731ca614f1104550b9437d48005c26a174e2347da7e632bd3e SHA512 a756552c0f1dd548661b4402e170474977484f3a4b32e765f8648d02109dc131d313e924b07bb3ad704f34cab4aef079b206b6d1e8d97911657886bd2476910c
 AUX cyrus-imapd-fix-tests.patch 471 BLAKE2B b527a435ef74b42dc1e68ac0089dd2050a2cdfbdf11264fc7097b39c16db9a690000f397bf29cdd3e8003d3e15546e9f67c9c9aeb505d50976a3568404bafddd SHA512 ab967c8f493d902510f25268d3d63c3c60246cfd2661ae3a19e5a89cd238028ac3eac4369736b51fc2a0c27407958963ffb1e6f8ba19b5d19b53a680d3737fa0
+AUX cyrus-imapd-libcap-libs-r1.patch 2175 BLAKE2B 7160b277538c43f2304f676b8d7d67034fe3724d3dfc52f6111a4191aeeb502eaaaf209c6c2cf90bf3b61a8a1dc8c536b926a7df20a6740e36b0e8ba18d5faa5 SHA512 395c07b905745a7b6318aad1a17116df90fa9aadc49d1957289bf3c5afe1c94b63723304087488f0d81b16e6875e5c261fe398c2be18c1a356982609a75034b6
 AUX cyrus-imapd-libcap-libs.patch 2251 BLAKE2B 2caa105c2f5608468e89f0c533cd0942ef286f93f941ab5163e53ab9302f3e68c7ba72969f4fcd13efa41e1d99a239f946f2970d0b34583e3a33331bfe3d4adb SHA512 c8f6676549f1e4e91be40da22a3061ae9b660d159c0d64e4848f0550214c190e7d1357dce20ba181ea2d8425e21552ce44faa04213b862740da62bf3f2f09b14
 AUX cyrus-imapd-sieve-libs-v4.patch 5751 BLAKE2B 016a21356199580e431f86b6a594576679dc8b586668fcf333d65ae570dd129fb8fb4174d26965e09d398729c7a8205bc89167442e4d43228942298bb402b844 SHA512 cd9f5c23f79720d768b3b8a089b3f5c078825465b3b0f28b7b629bc07415598f9195218e35bb7bebaca3499bdfdd30a137ea6a3a455a84386e9d02de41abba51
 AUX cyrus-imapd-sieve-libs.patch 2207 BLAKE2B f9d508fdc11d4309687e921d193f0c5b3ea0f6ae78d98623974d0decabcc685c5f05b105597896d59df5f44273090644086b3f936191d398048390ba201d848e SHA512 1d198945b8522f587a84f6241dffe7e3390b4904b187d4d7b121a509f6d5d47270c2609eb6f3ffc0aa5a792cb576fd8e5572884439337f05485ada3533f81484
@@ -15,10 +16,12 @@ DIST cyrus-imapd-3.0.4.tar.gz 10819487 BLAKE2B 209e379731c996ee083b0de61d6122b37
 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
 EBUILD cyrus-imapd-2.5.10.ebuild 4676 BLAKE2B 4e3960ade8b08e85a9beec894dd11bd144b218ca665fb4ddd762db8e881dbaa8a1f814fdf8e811e7d54e5d4f6456d601898f2fd1b7065be6edfa6c38dd83b965 SHA512 80bd9c18c80d5408862f4ad20b4f0f82c21b3a11f5ef54e504cdea454e0a7fde5f0cd8ffbf455665b0a907eadc243c45d5ccae9a08dde5faca7ff2f9cddb1ceb
 EBUILD cyrus-imapd-2.5.11-r1.ebuild 4772 BLAKE2B 72c2a8d1927728dfb638eac22ed3ecff4651dcee12250e169683dc910c8132320ec23b09408eace65799be99629c529a37298f5cb51d91817fa7c44899d02fac SHA512 c14ac12b41bb9594b7686ff6f1fe44e9af160f8eed4cfa7e1c94d1c5098fb55ec160b7b6bfe30bfca494278d18bfd3c9c37a8ed3991e02889512d43f9dd4ceb1
 EBUILD cyrus-imapd-3.0.4.ebuild 5896 BLAKE2B 933086d8d6d45ec33a5a82a0a4a90b1c83848a9d59e39d2027da4ea52a28e9302040e39f61a28ef6112d012cd7bd4b9934506993cb2b8d6a1de75a15a59828d0 SHA512 e0ebe34958c93003798a045c64287dda83d97d1d829889f4601446567ac2f0334a03acd554f0cacdd86b90fbf167f13c020e5b3edbdf78f3d9f9a9d871ea140f
 EBUILD cyrus-imapd-3.0.5.ebuild 5944 BLAKE2B 43fa76c0bda73b8e67440692b3f5586c6bd4435a852c90c63b986db724eca95c12056182e6f52bbdab827aea004e75257a6bf7ff5b0d1ae66d54a865c5b22d5b SHA512 2e9f38bb940bf33982b5879e39106e195dadc47c75772951cfc077873c40d38bcbf479c42ab915b620c1d442d454fc8314f10a98400464f11d2798ced74fa536
 EBUILD cyrus-imapd-3.0.6.ebuild 5946 BLAKE2B 39e6abd36bcc447a79b6b6e34f051090237ee96996f00980e3f1ebf70fa66b1791ac2ad3ed42f1038ffcbf32a650b3d9e29b3d19e5aede7c960ce11d23377a7f SHA512 66fd355b5c1f3f1b99f96829de8f5d670edaaa0cc4129a8a08d8b30509b86104456fcb912f1a444bba2132d0724530b7978d1d9dab220a5cdfc906506583c8e1
 EBUILD cyrus-imapd-3.0.8-r1.ebuild 5818 BLAKE2B 552068a64832e0576e3ec639b588ed572b97c5ba0f33c12bd06af54afde4dd274d96642d014ffeeff2e36ad71753c1968031ca6bda696cb33f05ae5baab30614 SHA512 6db81146d2a2930f7b73e975130e61ba9da1c9e511ab8ff838c79a834732191dcb61376bea6e4db557d6921daad8e58f1af106c4be3730c5c8d91d86c3386f75
+EBUILD cyrus-imapd-3.0.9.ebuild 5951 BLAKE2B 555fd5360af28bf6163302399727986d47e829148cc5e8f9ef88a7b703be4378928d82d4ecf4143c8d0cd80dd20546fc2e52f9020b72312e6c71e28363bc6342 SHA512 74d3e09860e5dd723e6f8952d3de8048318f248e701eb314962240b1940c39019968bb432513fb5c136b876264e04ab2618674f449cb895eddc89948912406e1
 MISC metadata.xml 871 BLAKE2B 4fe48aebf6e59d75cf53cafc92d5bf4668c4a489dba3a43d6df6c4efaeb74590c49f083e03ee9d5eed32ee09b324d8116bcb0fc77576f8aa77a96c56a739dfae SHA512 25449c1218dfad7b692b37b799a659b6a10e0e31bb003fbed27b3b43ce3610f9ee5f17a995cf9244d5027ad84889a8e79a774f63101bb6ea35054ce9dbb1fe20
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.9.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.9.ebuild
new file mode 100644
index 000000000000..c6ba07699dff
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.9.ebuild
@@ -0,0 +1,218 @@
+# 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="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? ( 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 http://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "for upgrade instructions."
+	echo
+}
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-libcap-libs-r1.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-libcap-libs-r1.patch
new file mode 100644
index 000000000000..4b1a51056f53
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-libcap-libs-r1.patch
@@ -0,0 +1,35 @@
+--- a/configure.ac	2017-07-15 07:26:38.375295969 +0200
++++ b/configure.ac	2017-07-15 07:28:33.250194410 +0200
+@@ -1351,7 +1351,9 @@
+                 AC_CHECK_HEADERS([sys/capability.h sys/prctl.h], , have_libcap=no)
+                 if test "$have_libcap" = "yes"; then
+                         AC_DEFINE(HAVE_LIBCAP, [], [Do we have libcap system capabilities handling (Linux systems only)?])
+-                        LIBS="$LIBS -lcap"
++                        LIBCAP="-lcap"
++                        AC_SUBST(LIBCAP)
++                        LIBS="$LIBS $LIBCAP"
+                 fi
+         fi
+         ;;
+--- a/perl/imap/Makefile.PL.in	2019-02-25 15:43:44.370676803 +0100
++++ b/perl/imap/Makefile.PL.in	2019-02-25 15:44:02.595285944 +0100
+@@ -90,7 +90,7 @@
+     'clean'	=> {'FILES' => 'libcyrperl.a cyradm'},
+     'OBJECT'    => 'IMAP.o',
+     'MYEXTLIB'  => '@top_builddir@/perl/.libs/libcyrus.a @top_builddir@/perl/.libs/libcyrus_min.a',
+-    'LIBS'	=> [ "$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @ZLIB@"],
++    'LIBS'	=> [ "$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @ZLIB@ @LIBCAP@"],
+     'DEFINE'	=> '-DPERL_POLLUTE',    # e.g., '-DHAVE_SOMETHING' 
+     'INC'	=> "-I@top_srcdir@ -I@top_srcdir@/com_err/et @SASLFLAGS@ @SSL_CPPFLAGS@ -I@top_srcdir@/perl/imap", 
+     'EXE_FILES' => [cyradm],
+--- a/perl/sieve/managesieve/Makefile.PL.in	2019-02-25 15:42:40.852554632 +0100
++++ b/perl/sieve/managesieve/Makefile.PL.in	2019-02-25 15:43:05.029362231 +0100
+@@ -69,7 +69,7 @@
+     'ABSTRACT'  => 'Cyrus Sieve management interface',
+     'VERSION_FROM' => "@top_srcdir@/perl/sieve/managesieve/managesieve.pm", # finds $VERSION
+     'MYEXTLIB'  => '../lib/.libs/libisieve.a @top_builddir@/perl/.libs/libcyrus.a @top_builddir@/perl/.libs/libcyrus_min.a',
+-    'LIBS'	=> ["$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @ZLIB@ @SQLITE_LIBADD@ @MYSQL_LIBADD@ @PGSQL_LIBADD@"],
++    'LIBS'	=> ["$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @ZLIB@ @SQLITE_LIBADD@ @MYSQL_LIBADD@ @PGSQL_LIBADD@ @LIBCAP@"],
+     'CCFLAGS'	=> '@GCOV_CFLAGS@',
+     'DEFINE'	=> '-DPERL_POLLUTE',     # e.g., '-DHAVE_SOMETHING' 
+     'INC'	=> "-I@top_srcdir@/lib -I@top_srcdir@/perl/sieve -I@top_srcdir@/perl/sieve/lib @SASLFLAGS@ @SSL_CPPFLAGS@",