gentoo resync : 31.12.2018

4 files changed, 208 insertions, 0 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index e9630200fba4..ec56d77c921a 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest
index 796134695a4a..4693dc0d863f 100644
--- a/mail-filter/maildrop/Manifest
+++ b/mail-filter/maildrop/Manifest
@@ -1,10 +1,13 @@
+AUX maildrop-3.0.0-testsuite.patch 1948 BLAKE2B fcfdfd488873fa4f14c7087ee54bbc2e2d1544532ccdd586b6913958a9b934b5cd31b3295c72afc881ee79aaf26985b21d930925d7e5612e75d5f2788c228916 SHA512 49b1bd03df4df4337acbc135f86b058a0def9cb320b9cf8e0033f134d967f600db5c5afa9832efc99f1b0dead422f3e8348c57db3f6794295b27039af54d6d51
 AUX maildrop-disable-fam.patch 2291 BLAKE2B dd57e9c6d176fd7ca6cedafb9c0f497dd4454920e60d8d2799f105fd98f51b5a0faa4ecc9d8a688aa4cc9022a6b62b434389d5516bd06abd273e02bf32926b57 SHA512 547f78a9e5dce501ac61584912a2e74b43e36b2189bab27d1811af7718def5e07d3683fb2ef0937ae026bd53cffc68b735319322c089bcfff0a17a6edebed1fb
 AUX maildrop-testsuite-r3.patch 2591 BLAKE2B 597c04ed270b1e7a2e54861942dbf40a76844b4c6ee2192b4c4c337ca0a689655060c11ca160113e7e3177956945098818bc37de6af41e1a820c40d2e1d3a476 SHA512 92626418bb1f51bed7bf549e411035db4134f7cf328cfc2922078d909b6e8b8471a8e9f07e9990b5e4baed1423124d2641d80bfbb841aa966f5259ecd8c58e1e
 AUX maildroprc 58 BLAKE2B b9ee443f0e9223690f077983541de86dd55c8b36ae2bafdea69563f74dff60ba4234c8388fe257045a36d61bc5f1db4c5a89c56678cbb8b0d4f187120e70a4cb SHA512 3077160382882db22d095dff4b27368e7482b63a9756a3cf7a61e8470ed933af0fdb04a61ebae155b14a7b1fafc598a4cdd1bb660d957f00190b95eb41e81f4e
 DIST maildrop-2.8.3.tar.bz2 1992695 BLAKE2B be17fa1ac38f8a54670e40f2b4207c2ee5e8976f20e29c6a528ccf50a716c8b4aedb0546a9722f1147573afd9d43f8a8caa59aec8bf9069ef833226cb2ea0562 SHA512 25168945764eda5c74641e205e3c784ca2ae27c15a5a6ddfe7a1c7b238cd6c3d5b0a3f7ce8b405b578d067f6f2aae5d7d6110da8bc89f91ac1c7fdc224ffd054
 DIST maildrop-2.8.5.tar.bz2 2072987 BLAKE2B e067e0ef77f850fd9ce97584893dd5301a7a91fcebea02351da8b22d3d7f0b74f3809cdc3874b29117a62d5c496962f72a5254470cd5f92b787b80d066f1fec1 SHA512 c04120af29ee8e72aeabd211301c5052fe4a2dc0f337074e1fa57b8adb9652512cd744e0bba3894a8b0e3b21a3511bbf4a4f045faec3536edb8be0f8bdc84cf5
 DIST maildrop-2.9.0.tar.bz2 2075698 BLAKE2B 2a918214e471a4a54aa7e0412e062ca85ac3ce4757bf4642fb0c0a9776a7c1b1bc417ef426c9bd7767d99b9d783085bf6c67f402ea43b0e7eba10c82d98b5619 SHA512 366a04d1e6e10ef1c824fbb5dfe406ff74fe17b80a46619fd8aa8cde3b4fef9a10b4ed3cc6329ed04632582d58104aaf16134c6dc82e17917b82fb6f18316dd6
+DIST maildrop-3.0.0.tar.bz2 2091018 BLAKE2B 3c8e3ae5c2c2f636b0223e2bafadcb88bf34be63c792a177febac5c41ccd50cab04755f14a26731c38a35531abea1faa70d4af5587a6e68a21735f050f2d46d8 SHA512 1f1e1682ec7c2d0c1f2e71059f186d9a9d3118194b1e558d3a6e5826721fb14a661f4d75df42ce2626430ac072b50e723b563ae00c1ebdeb4da96abfeb534eff
 EBUILD maildrop-2.8.3.ebuild 3850 BLAKE2B 2092ce2c1d6850859e9594175debc4698b943ce744896250c694aff98727f2c97cad0b542c707745544a802f46c1b19c72a4546901be0a87bb5e4bef2041070a SHA512 4c667ca6fc6c8c62f6b70035f2c86704089c276fc361ec3bd8e28f58fdc01c29bc455a7936eb64f40c8c0c728a9bda7f463561e64fdf9a3c0aa6a81257d213d2
 EBUILD maildrop-2.8.5.ebuild 3853 BLAKE2B 6a7aac741d903d1569a70564724c522f8259d2840ad6c2536399e4739b036e1747f8b4770d665a2ac0570cf57ade6c5120c4424065572e7540d2cd1c32f33c62 SHA512 fbd3aa6e7a07ae7ecb718eb32ccb15d5db1efb6b77405c1a34e2f487546dca2e487f58b7591cb637e74d03a1fc7d5ede0181f17bc8cb9b27374894df1d413cc5
 EBUILD maildrop-2.9.0.ebuild 3713 BLAKE2B 9c8a9cd45f85e373d17a1a1e5a00d158d19fbecc843ac2bbc82eee0659cc7b03a526fab5d172858750738ee802b819e126f8e73888428ce291c2fb841a265c61 SHA512 9ff32d6f39bbeeaea6a0cee7a660c1db66b257fc4012501f7f77e72600a8aa48b4e38130970373452331f2df51f6f6daf40d990b6ff7212bd6da86fdff7bf01c
+EBUILD maildrop-3.0.0.ebuild 3716 BLAKE2B 45c254821a57f2506ef042bef15fa63e566fbbd2d34450923415a63fcebffd89b7be0c8a03a8bc0227e8d391586bd794c58871db87f1618fc0054929cab5f5e4 SHA512 50a83fbf6a04bab4e229c6768fa81629937184c5735fb03a3d60abaeeea8536663e8368186707e75d14786da247012d17cd897be1060ee8d896cd3aac6a6d35d
 MISC metadata.xml 635 BLAKE2B d3989e006ccb289ba903bac2da96dc77a0c88931bea754356e7fb412a41c57cfe4cf453f96124dcc573eb48db1a91cbb9632b855dc4cbbe0811fbae7eefec97c SHA512 305d4c8e32b7ab6b64d55b381f57d3844124db49d8e20d35f307ccf3707c965322dcc6344afbeded9cb5b963b802cd0e54e9358067fb36e80b5ff6f3acafe64d
diff --git a/mail-filter/maildrop/files/maildrop-3.0.0-testsuite.patch b/mail-filter/maildrop/files/maildrop-3.0.0-testsuite.patch
new file mode 100644
index 000000000000..a6aa1626e1b7
--- /dev/null
+++ b/mail-filter/maildrop/files/maildrop-3.0.0-testsuite.patch
@@ -0,0 +1,65 @@
+Force en_US locale for certain tests.
+
+--- maildrop-3.0.0/libs/maildrop/Makefile.am
++++ maildrop-3.0.0/libs/maildrop/Makefile.am
+@@ -69,9 +69,11 @@
+ 	maildrop.lsm testsuite.txt.idn testsuite2
+ 
+ check-am:
++if HAS_EN_US
+ 	@chmod +x testsuite
+ 	./testsuite | cmp -s - $(srcdir)/testsuite.txt.idn
+ 	@SHELL@ $(srcdir)/testsuite2
++endif
+ 
+ noinst_DATA=maildrop.html maildrop.1 maildropfilter.html maildropfilter.7 \
+ 	maildropgdbm.html maildropgdbm.7
+--- maildrop-3.0.0/libs/maildrop/configure.ac
++++ maildrop-3.0.0/libs/maildrop/configure.ac
+@@ -195,6 +195,15 @@
+ AC_DEFINE_UNQUOTED(MAXLONGSIZE, $MAXLONGSIZE,
+ 				[ Maximum character size of a long ])
+ 
++dnl check for en_US locale
++check_en_US() {
++	locale -a | grep en_US.utf8 > /dev/null
++	return $?
++}
++AC_MSG_CHECKING([for en_US.utf8])
++AM_CONDITIONAL([HAS_EN_US], [check_en_US])
++AM_COND_IF([HAS_EN_US],[AC_MSG_RESULT([yes])],[AC_MSG_RESULT([not found])])
++
+ dnl Checks for library functions.
+ 
+ AC_FUNC_CLOSEDIR_VOID
+--- maildrop-3.0.0/libs/rfc2045/Makefile.am
++++ maildrop-3.0.0/libs/rfc2045/Makefile.am
+@@ -84,7 +84,10 @@
+ endif
+ 
+ check-am:
++if HAS_EN_US
+ 	@SHELL@ $(srcdir)/testsuite | cmp -s - $(srcdir)/$(TESTSUITE)
+ 	@SHELL@ $(srcdir)/testsuitemm | cmp -s - $(srcdir)/testsuitemm.txt
+ 	@SHELL@ $(srcdir)/testrfc3676parsersuite | diff -U 3 $(srcdir)/testrfc3676parsersuite.txt -
+ 	./testrfc6533parser
++endif
++
+--- maildrop-3.0.0/libs/rfc2045/configure.ac
++++ maildrop-3.0.0/libs/rfc2045/configure.ac
+@@ -62,6 +62,15 @@
+ AC_CHECK_FUNC(strncasecmp,,CFLAGS="$CFLAGS -Dstrncasecmp=strnicmp")
+ AC_CHECK_FUNC(strcasecmp,,CFLAGS="$CFLAGS -Dstrcasecmp=stricmp")
+ 
++dnl check for en_US locale
++check_en_US() {
++	locale -a | grep en_US.utf8 > /dev/null
++	return $?
++}
++AC_MSG_CHECKING([for en_US.utf8])
++AM_CONDITIONAL([HAS_EN_US], [check_en_US])
++AM_COND_IF([HAS_EN_US],[AC_MSG_RESULT([yes])],[AC_MSG_RESULT([not found])])
++
+ AC_ARG_WITH(package, [], package="$withval",
+ 	[
+ 		package="$PACKAGE"
diff --git a/mail-filter/maildrop/maildrop-3.0.0.ebuild b/mail-filter/maildrop/maildrop-3.0.0.ebuild
new file mode 100644
index 000000000000..ede047b099fd
--- /dev/null
+++ b/mail-filter/maildrop/maildrop-3.0.0.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic autotools
+
+DESCRIPTION="Mail delivery agent/filter"
+[[ -z ${PV/?.?/}   ]] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+[[ -z ${PV/?.?.?/} ]] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+[[ -z ${SRC_URI}   ]] && SRC_URI="https://www.courier-mta.org/beta/${PN}/${P%%_pre}.tar.bz2"
+HOMEPAGE="https://www.courier-mta.org/maildrop/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="berkdb debug dovecot fam gdbm ldap mysql postgres static-libs authlib +tools trashquota"
+
+CDEPEND="!mail-mta/courier
+	net-mail/mailbase
+	dev-libs/libpcre
+	net-dns/libidn:0=
+	>=net-libs/courier-unicode-2.0
+	gdbm?     ( >=sys-libs/gdbm-1.8.0 )
+	mysql?    ( net-libs/courier-authlib )
+	postgres? ( net-libs/courier-authlib )
+	ldap?     ( net-libs/courier-authlib )
+	authlib?  ( net-libs/courier-authlib )
+	fam?      ( virtual/fam )
+	!gdbm? (
+		berkdb? ( >=sys-libs/db-3:= )
+	)
+	tools? (
+		!mail-mta/netqmail
+		!net-mail/courier-imap
+		!mail-mta/mini-qmail
+		!mail-mta/qmail-ldap
+	)"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	dev-lang/perl
+	dovecot? ( net-mail/dovecot )"
+REQUIRED_USE="
+	mysql? ( authlib )
+	postgres? ( authlib )
+	ldap? ( authlib )"
+
+S=${WORKDIR}/${P%%_pre}
+
+src_prepare() {
+	# Prefer gdbm over berkdb
+	if use gdbm ; then
+		use berkdb && elog "Both gdbm and berkdb selected. Using gdbm."
+	fi
+
+	if ! use fam ; then
+		eapply -p0 "${FILESDIR}"/${PN}-disable-fam.patch
+	fi
+
+	# no need to error out if no default - it will be given to econf anyway
+	sed -i -e \
+		's~AC_MSG_ERROR(Cannot determine default mailbox)~SPOOLDIR="./.maildir"~' \
+		"${S}"/libs/maildrop/configure.ac || die "sed failed"
+
+	eapply "${FILESDIR}"/${P}-testsuite.patch
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable fam)
+		--with-devel
+		--disable-tempdir
+		--enable-syslog=1
+		--enable-use-flock=1
+		--enable-use-dotlock=1
+		--enable-restrict-trusted=1
+		--enable-maildrop-uid=root
+		--enable-maildrop-gid=mail
+		--enable-sendmail=/usr/sbin/sendmail
+		--cache-file="${S}"/configuring.cache
+		$(use_enable static-libs static)
+		$(use_enable dovecot dovecotauth)
+		$(use_with trashquota)
+	)
+
+	local mytrustedusers="apache dspam root mail fetchmail"
+	mytrustedusers+=" daemon postmaster qmaild mmdf vmail alias"
+	myeconfargs+=( --enable-trusted-users="${mytrustedusers}" )
+
+	# These flags make maildrop cry
+	replace-flags -Os -O2
+	filter-flags -fomit-frame-pointer
+
+	if use gdbm ; then
+		myeconfargs+=( --with-db=gdbm )
+	elif use berkdb ; then
+		myeconfargs+=( --with-db=db )
+	else
+		myeconfargs+=( --without-db )
+	fi
+
+	if ! use mysql && ! use postgres && ! use ldap && ! use authlib ; then
+		myeconfargs+=( --disable-authlib )
+	fi
+
+	# default mailbox is $HOME/.maildir for Gentoo
+	maildrop_cv_SYS_INSTALL_MBOXDIR="./.maildir" econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use authlib ; then
+		fperms 4755 /usr/bin/maildrop
+	fi
+
+	dodoc AUTHORS ChangeLog INSTALL NEWS README \
+		README.postfix README.dovecotauth UPGRADE \
+		maildroptips.txt
+	docinto maildir
+	dodoc libs/maildir/AUTHORS libs/maildir/INSTALL \
+		libs/maildir/README*.txt libs/maildir/*.html
+
+	# bugs 61116, 374009, and 639124
+	if ! use tools ; then
+		for tool in "maildirmake" "deliverquota"; do
+			rm "${D}/usr/bin/${tool}" || die
+			rm "${D}/usr/share/man/man"[0-9]"/${tool}."[0-9] || die
+			rm "${D}/usr/share/maildrop/html/${tool}.html" || die
+		done
+		rm "${D}/usr/share/man/man5/maildir.5" || die
+	fi
+
+	insinto /etc
+	doins "${FILESDIR}"/maildroprc
+
+	use static-libs || find "${D}"/usr/lib* -name '*.la' -delete
+}