gentoo auto-resync : 19:05:2023 - 22:16:25

4 files changed, 245 insertions, 0 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 32344ae5f9da..a69ca806d254 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest
index 1a7b4331eca3..1f1b648bc5e7 100644
--- a/mail-filter/maildrop/Manifest
+++ b/mail-filter/maildrop/Manifest
@@ -1,11 +1,14 @@
 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-3.1.5-common.patch 3927 BLAKE2B 120ab95a1693daf204ced6f542a9e69598648b569e47d8a9083f40c549e6cb42388822702cecd6c405c65f7b86f22d111cc08c93692cf923696caa1a177cd353 SHA512 121f48555d72a997841310c2562192d1c06e8beb7e6d8801e77e58c9d9417ac7a1d23aae30138e0cbba7fc6d6e23c7551eca6ed80663bfe64ce934bb44886ddb
 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.4.tar.bz2 2156148 BLAKE2B e7de4e30ee23d8d2f88de7b0398a41c84af6d34207e9f26fd7b22e7ac1b5171c309c6304b312a75e621bc860e5a2d3f59613e47ff5a73ae6412761179f787f53 SHA512 b8f373e142c61ba9cdf32fd939aa7fc5c24ec873f734be048e94561e35977b6fb663ff4a1c35fc22dc7dc2075e04e4c4a09e37c0e7c7c0dd96555fcda9c7fd26
+DIST maildrop-3.1.5.tar.bz2 2156334 BLAKE2B 374c0436a0e5954171bf942d824123d610057269739f5f76f4353b75065a964fe92d95a80209a07187d3ebcfe59a6d92d54c71fa52325fc4968e10c1b8eeaada SHA512 f722cbdf9aeb628ff68dcd280de5d7d37a3fae3692b7de5483cf0563631ff9b2eba9ef9baf3b3e3f6108d40e19b55dabddacaa3a064e6b71210b18f200bc67b7
 EBUILD maildrop-3.0.2-r1.ebuild 3771 BLAKE2B 38cec99a43f0ba0a7a61ae3dafc443cbe498a97d74031b891930abe895b0602c6dd783c4854e0fec75d8a28ba9c68476039100cb0d9a228e124f5442ed58cf2a SHA512 0bdb6b0e7cffda19ba848eb07ba77675f22947694d0bb419f9cc7bbaa4f9c3ecfff478d306f7a0b6040b552fe3c2df5fc8387e4e632b6e75550370c969fa31ed
 EBUILD maildrop-3.0.2.ebuild 3632 BLAKE2B 05db139cdc26c5b5ca8086561fef8cafc180c28f3e541c4e1e93f6bb4a6835927d2cf7b3bde7e7df5665d2babde4bbbf70134ee10e7ba9a12378806f9ac8e656 SHA512 7b4cfb665022a88f8195f527a41c8f67b38c334df3aec52d280772e4e620addef6e4ef63b31f554aeb45e50d6f39563bf7bd00055262f192904af387d949f09b
 EBUILD maildrop-3.1.4.ebuild 3651 BLAKE2B c769ced131f857405ac2b96cf3dc59b906438fc8e577d0fb11f157e4def90ea543f5c427918b5a94478bedc9ea1c75edab5273d913fc79bf34842b5bcc4d4b1c SHA512 9b345cfe4c5f3bf9f3a1bfe467ac93e820a34d234b862a79a5970a63dbc592e4ee2817ed628d1837a6958e1f79f185a6f3e3d9dc6bf607d2667e15ac680652db
+EBUILD maildrop-3.1.5.ebuild 3683 BLAKE2B b8236ccf742801c31877b21498a5d324f265f50e38e0722bd42713667a29a1fc3f9f1cb6dc9010bebc974f899614988b8b9703f6b900417ad3dbe65474bb0b2d SHA512 0edcc3d4f5df234619f78b5a33b2435667dfa824fb026acc08c8d0170aff1bdc966dfe112b350d5ebc164ff21ef0f62f91638215f2febf1d1ff434899eb726a1
 MISC metadata.xml 639 BLAKE2B 7b97d1b0ecf5622dcb89729dcfb27480f05c764df98d7d22e0477fbc1498911cdecf47ea5544cdca325e85126fa07d139cc019774ec8e988b4eff5dd4ace29f8 SHA512 077c7066f2ac3e44ccecf1e45a76e293d20c1ff858455e32599fb0b7348d4b5ef8da6c3f55f44b3e2368f9c9c6d3d2b538e12fd3bc82fab983181e2a694a4d49
diff --git a/mail-filter/maildrop/files/maildrop-3.1.5-common.patch b/mail-filter/maildrop/files/maildrop-3.1.5-common.patch
new file mode 100644
index 000000000000..9a9342ca8c53
--- /dev/null
+++ b/mail-filter/maildrop/files/maildrop-3.1.5-common.patch
@@ -0,0 +1,103 @@
+--- a/Makefile.am	2023-01-23 22:21:20.376505977 +0100
++++ b/Makefile.am	2023-01-23 22:22:18.655565802 +0100
+@@ -10,9 +10,9 @@
+ 
+ HTML2TXT=elinks -dump -no-numbering -no-references
+ 
+-SUBDIRS=libs/numlib libs/liblock libs/rfc822 libs/rfc2045 @DBSUBDIR@ libs/makedat libs/maildir libs/maildrop
++SUBDIRS=libs/numlib libs/liblock libs/rfc822 libs/rfc2045 @DBSUBDIR@ libs/maildir libs/maildrop
+ 
+-DIST_SUBDIRS=libs/numlib libs/liblock libs/rfc822 libs/rfc2045 libs/gdbmobj libs/bdbobj libs/makedat libs/maildir libs/maildrop
++DIST_SUBDIRS=libs/numlib libs/liblock libs/rfc822 libs/rfc2045 libs/gdbmobj libs/bdbobj libs/maildir libs/maildrop
+ 
+ HTMLWWW=index.html documentation.html download.html links.html
+ EXTRA_DIST=README.html INSTALL.html UPGRADE.html README.postfix\
+@@ -31,7 +31,7 @@
+ DELIVERQUOTAHTMLSOURCE=maildirquota.html deliverquota.html
+ 
+ DELIVERQUOTAHTML=$(DELIVERQUOTAHTMLSOURCE)
+-DELIVERQUOTAMAN=maildirquota.7 deliverquota.8
++DELIVERQUOTAMAN=maildirquota.7
+ 
+ #  Install deliverquota into libdir/bin
+ #
+@@ -51,7 +51,7 @@
+ uninstall-deliverquota:
+ 	rm -f $(DESTDIR)$(bindir)/deliverquota
+ 
+-MAILDROPHTML=lockmail.html maildiracl.html maildirkw.html \
++MAILDROPHTML=lockmail.html maildiracl.html \
+ 	maildirwatch.html \
+ 	maildirmake.html maildropex.html \
+ 	maildir.html \
+@@ -59,11 +59,10 @@
+ 	makemime.html reformail.html reformime.html
+ 
+ if HAVE_DBLIBRARY
+-MAILDROPHTML += makedat.html
+ endif
+ 
+ MAILDROPMAN=lockmail.1 maildirmake.1 maildrop.1 mailbot.1 maildropex.7 \
+-	maildirkw.1 maildirwatch.1 \
++	maildirwatch.1 \
+ 	maildir.5 \
+ 	maildropfilter.7 maildropgdbm.7 makemime.1 reformail.1 reformime.1
+ 
+@@ -68,7 +67,6 @@
+ 	maildropfilter.7 maildropgdbm.7 makemime.1 reformail.1 reformime.1
+ 
+ if HAVE_DBLIBRARY
+-MAILDROPMAN += makedat.1
+ endif
+ 
+ EXTRA_LTLIBRARIES=librfc822.la librfc2045.la
+@@ -88,14 +86,12 @@
+ html_DATA=$(htmldataclean) manpage.css
+ 
+ if !HAVE_DBLIBRARY
+-html_DATA += makedat.html
+ endif
+ 
+ man_MANS=$(DELIVERQUOTAMAN) \
+ 	$(MAILDROPMAN) $(DEVEL_MAN)
+ 
+ if !HAVE_DBLIBRARY
+-man_MANS += makedat.1
+ endif
+ 
+ DISTCLEANFILES=$(htmldataclean) $(man_MANS)
+@@ -104,7 +104,7 @@
+ librfc822_la_LDFLAGS=-rpath $(libdir) -version-info @LIBVERSION_INFO@
+ librfc2045_la_LDFLAGS=-rpath $(libdir) -version-info @LIBVERSION_INFO@
+ 
+-install-data-local: install-man install-deliverquota install-maildrop
++install-data-local: install-man install-maildrop
+ 
+ uninstall-local: uninstall-deliverquota uninstall-maildrop
+ 
+@@ -131,14 +131,9 @@
+ 	done
+ 	$(INSTALL_PROGRAM) libs/liblock/lockmail $(DESTDIR)$(bindir)/lockmail
+ 	$(INSTALL_PROGRAM) libs/maildir/maildirmake $(DESTDIR)$(bindir)/maildirmake
+-	$(INSTALL_PROGRAM) libs/maildir/maildirkw $(DESTDIR)$(bindir)/maildirkw
+ 	$(INSTALL_PROGRAM) libs/maildir/maildirwatch $(DESTDIR)$(bindir)/maildirwatch
+ 	$(INSTALL_PROGRAM) libs/rfc2045/reformime $(DESTDIR)$(bindir)/reformime
+ 	$(INSTALL_PROGRAM) libs/rfc2045/makemime $(DESTDIR)$(bindir)/makemime
+-	test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
+-		$(INSTALL_PROGRAM) libs/makedat/makedatprog $(DESTDIR)$(bindir)/makedatprog
+-	test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
+-		$(INSTALL_SCRIPT)  libs/makedat/makedat     $(DESTDIR)$(bindir)/makedat
+ 	. libs/maildrop/uidgid ; test -z "$$gid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chgrp $$gid maildrop lockmail
+ 	. libs/maildrop/uidgid ; test -z "$$uid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chown $$uid maildrop lockmail && chmod 755 maildrop lockmail
+ 
+--- a/configure.ac	2023-01-23 22:19:39.236136459 +0100
++++ b/configure.ac	2023-01-23 22:22:33.810321247 +0100
+@@ -203,7 +203,7 @@
+ 
+ AC_SUBST(REPOSITORY)
+ 
+-AC_CONFIG_SUBDIRS(libs/numlib libs/liblock libs/rfc822 libs/rfc2045 libs/gdbmobj libs/bdbobj libs/makedat libs/maildir libs/maildrop)
++AC_CONFIG_SUBDIRS(libs/numlib libs/liblock libs/rfc822 libs/rfc2045 libs/gdbmobj libs/bdbobj libs/maildir libs/maildrop)
+ 
+ AC_CONFIG_FILES([Makefile
+ 	courier-debuild
diff --git a/mail-filter/maildrop/maildrop-3.1.5.ebuild b/mail-filter/maildrop/maildrop-3.1.5.ebuild
new file mode 100644
index 000000000000..320e66ca5380
--- /dev/null
+++ b/mail-filter/maildrop/maildrop-3.1.5.ebuild
@@ -0,0 +1,139 @@
+# 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:=
+	net-mail/courier-common[berkdb?,gdbm?]
+	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}"/${PN}-3.1.1-testsuite.patch
+	"${FILESDIR}"/${P}-common.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
+}