gentoo auto-resync : 03:04:2023 - 11:20:10

5 files changed, 206 insertions, 3 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 889df589b7be..97ea17d4e3af 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest
index d914c4f49433..89b0405f0cd0 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-3.0.2-makedat.patch 2817 BLAKE2B 59c74dffa5228f395a0140c92cc83d801a2394e90eb22be01045e3bcd02e36c44ce91b3d120832f0441f7b2ae25d22f09b452bf5735562b72926954dac1eb0a4 SHA512 5554632cc28e2bbc1d436c7e0c7d9dfcf5e39cf40327845e6d5695d938ad60dfddb479fd069e6944fded07e82a913e1f63d4a41e33d58d8525b5b8f2896c6388
+AUX maildrop-3.1.1-testsuite.patch 2133 BLAKE2B fa01a9c8c9b9a419970b6aa7bd947e6c18915ba651282013fb5c322670d82ca601c5de20b4648dc5cfc0f14574338b898e96e4aa05e49d8a829b17ac8ddfe6e0 SHA512 52ef3fc663d465cc96a0c863d138fd96a39aee4b9e5070bc470e6d52bdc1d450acef428bf1d007c194e7698e4e9b84195b486d4feaf39f35422c7d8afd7ea6c8
 AUX maildrop-disable-fam.patch 2291 BLAKE2B dd57e9c6d176fd7ca6cedafb9c0f497dd4454920e60d8d2799f105fd98f51b5a0faa4ecc9d8a688aa4cc9022a6b62b434389d5516bd06abd273e02bf32926b57 SHA512 547f78a9e5dce501ac61584912a2e74b43e36b2189bab27d1811af7718def5e07d3683fb2ef0937ae026bd53cffc68b735319322c089bcfff0a17a6edebed1fb
 AUX maildroprc 58 BLAKE2B b9ee443f0e9223690f077983541de86dd55c8b36ae2bafdea69563f74dff60ba4234c8388fe257045a36d61bc5f1db4c5a89c56678cbb8b0d4f187120e70a4cb SHA512 3077160382882db22d095dff4b27368e7482b63a9756a3cf7a61e8470ed933af0fdb04a61ebae155b14a7b1fafc598a4cdd1bb660d957f00190b95eb41e81f4e
 DIST maildrop-3.0.2.tar.bz2 2129406 BLAKE2B 10572c9c0fcb7a31f10fdfb005562afd425d157fe515f31d7fc6721247b0a5d5d381b51da39f0161de0c8722af89da225273728928510fd9d79c18c18b5759e5 SHA512 a2e6ad9c6982e468b4f778fe6956312aa1da54c93269311922f247a89ede49349a6cbce869b08ced22354d18259ebc043e4f4adf1e0b364d8e110797b24efbc8
 DIST maildrop-3.1.0.tar.bz2 2154698 BLAKE2B 8eaec33ccb3f117e0cd069eac2af736f5cc3485314ea14ac594f8e716e68d3f1e20143ba47533c08a835707dda1e8ba0fad2eea5d3bf5845668f8ad375e56387 SHA512 4d4ab1acd9f81beb54af9af86d0f8c3145f962f1ff2fd5e9209e31b63054cc41b3e4a1300965a8855a39dbcfa1cdbdef2ad194af1f12e079c1361b12b293ed56
+DIST maildrop-3.1.1.tar.bz2 2156071 BLAKE2B fb5656cd44b55d1d4dbcbb9f13c787024fd1a4055499b273637463e135e54d1ecfa106afd7a8e98709aedb51494dc1ff35131a3d52ed8440ae1641111b5dde3c SHA512 61e5a06d85778519add2250ef395c5a9eb6b96be715ce202405087df8eb67f007007ec9d324c28e3ab21de7e66baa916ec42ba17462cd8a544f634960388cfee
 EBUILD maildrop-3.0.2-r1.ebuild 3771 BLAKE2B 38cec99a43f0ba0a7a61ae3dafc443cbe498a97d74031b891930abe895b0602c6dd783c4854e0fec75d8a28ba9c68476039100cb0d9a228e124f5442ed58cf2a SHA512 0bdb6b0e7cffda19ba848eb07ba77675f22947694d0bb419f9cc7bbaa4f9c3ecfff478d306f7a0b6040b552fe3c2df5fc8387e4e632b6e75550370c969fa31ed
-EBUILD maildrop-3.0.2.ebuild 3678 BLAKE2B 5b43ea26940bb799684bc9ad8a5aef34553b0dab8bdcfa45dd8b5adda3adf26dfed5134fa35bb1341891f26471156a89843b94c7d411077db3b3ccd413b5b665 SHA512 70c76a7568d024273aae485ff95ccfb0f5166bfae8021a60f578c906b1ad46e36f884232cea77f08a75f61ec3a88669ad86f304cb019c57f8892e991fd6b80f5
+EBUILD maildrop-3.0.2.ebuild 3632 BLAKE2B 05db139cdc26c5b5ca8086561fef8cafc180c28f3e541c4e1e93f6bb4a6835927d2cf7b3bde7e7df5665d2babde4bbbf70134ee10e7ba9a12378806f9ac8e656 SHA512 7b4cfb665022a88f8195f527a41c8f67b38c334df3aec52d280772e4e620addef6e4ef63b31f554aeb45e50d6f39563bf7bd00055262f192904af387d949f09b
 EBUILD maildrop-3.1.0-r1.ebuild 3651 BLAKE2B 32b2fa64ed4620648609c63105eef1bc0e716308246fc3598f93217895f81900b763b8897925fba3b071f816255b58410db643126a42078581bc7e02b413a62f SHA512 4d4458e220bdec023b26713958a83ae8c01b0ffc99ec576a4243726631a2bc586e53fa37910a0d713c28ead59fbea0c7899ae9d188c1f173d23723d288c508e8
+EBUILD maildrop-3.1.1.ebuild 3644 BLAKE2B 60b65c20818a15661c8caadffae1bf19a25ec814590bd07672d8f04ce5c10026f12c03346599c6d3ba85b34ec2cc30e54513369480c1117b234c0a23678fa86d SHA512 e2b2633699d1430c0868e6568cc4c1bfa313286d74dee51158bc53c63a461239d50a09243e466cc2cc3214fff6ca67e693ffab41380579e693de9e8885dbdfbd
 MISC metadata.xml 639 BLAKE2B 7b97d1b0ecf5622dcb89729dcfb27480f05c764df98d7d22e0477fbc1498911cdecf47ea5544cdca325e85126fa07d139cc019774ec8e988b4eff5dd4ace29f8 SHA512 077c7066f2ac3e44ccecf1e45a76e293d20c1ff858455e32599fb0b7348d4b5ef8da6c3f55f44b3e2368f9c9c6d3d2b538e12fd3bc82fab983181e2a694a4d49
diff --git a/mail-filter/maildrop/files/maildrop-3.1.1-testsuite.patch b/mail-filter/maildrop/files/maildrop-3.1.1-testsuite.patch
new file mode 100644
index 000000000000..08e549d1769c
--- /dev/null
+++ b/mail-filter/maildrop/files/maildrop-3.1.1-testsuite.patch
@@ -0,0 +1,64 @@
+Force en_US locale for certain tests.
+
+--- maildrop-3.0.0/libs/maildrop/Makefile.am
++++ maildrop-3.0.0/libs/maildrop/Makefile.am
+@@ -71,8 +71,10 @@
+ 	maildrop.lsm testsuite.txt.idn testsuite2
+ 
+ check-am: testsuite
++if HAS_EN_US
+ 	VALGRIND="`which valgrind 2>/dev/null`"; export VALGRIND; @SHELL@ ./testsuite >testsuite.diff || exit 1; diff -U 3 testsuite.diff $(srcdir)/testsuite.txt.idn || exit 1; rm -f testsuite.diff
+ 	VALGRIND="`which valgrind 2>/dev/null`"; export VALGRIND; @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
+@@ -201,6 +201,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.2.ebuild b/mail-filter/maildrop/maildrop-3.0.2.ebuild
index a58e5d0e0789..b392ea48accb 100644
--- a/mail-filter/maildrop/maildrop-3.0.2.ebuild
+++ b/mail-filter/maildrop/maildrop-3.0.2.ebuild
@@ -32,8 +32,6 @@ CDEPEND="!mail-mta/courier
 	tools? (
 		!mail-mta/netqmail
 		!net-mail/courier-imap
-		!mail-mta/mini-qmail
-		!mail-mta/qmail-ldap
 	)"
 DEPEND="${CDEPEND}"
 RDEPEND="${CDEPEND}
diff --git a/mail-filter/maildrop/maildrop-3.1.1.ebuild b/mail-filter/maildrop/maildrop-3.1.1.ebuild
new file mode 100644
index 000000000000..4607e76db795
--- /dev/null
+++ b/mail-filter/maildrop/maildrop-3.1.1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+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 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="berkdb debug dovecot gdbm ldap mysql postgres static-libs authlib +tools trashquota"
+
+CDEPEND="!mail-mta/courier
+	net-mail/mailbase
+	dev-libs/libpcre2
+	net-dns/libidn2:=
+	>=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 )
+	!gdbm? (
+		berkdb? ( >=sys-libs/db-3:= )
+	)
+	gdbm? ( net-mail/courier-imap[gdbm?,berkdb?] )
+	berkdb? ( net-mail/courier-imap[gdbm?,berkdb?] )
+	tools? (
+		!mail-mta/netqmail
+		!net-mail/courier-imap
+	)"
+DEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}
+	dev-lang/perl
+	dovecot? ( net-mail/dovecot )"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="
+	mysql? ( authlib )
+	postgres? ( authlib )
+	ldap? ( authlib )"
+
+S=${WORKDIR}/${P%%_pre}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-testsuite.patch
+	"${FILESDIR}"/${PN}-3.0.2-makedat.patch
+)
+
+src_prepare() {
+	# Prefer gdbm over berkdb
+	if use gdbm ; then
+		use berkdb && elog "Both gdbm and berkdb selected. Using gdbm."
+	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"
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--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
+		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
+}