commit: 37a0718d96d9cbeab78bc10e4edd9a3ffe4a2298 Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Mon Jan 23 21:40:46 2023 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Mon Jan 23 21:41:25 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37a0718d
mail-filter/maildrop: use net-mail/courier-makedat Bug: https://bugs.gentoo.org/884591 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> .../maildrop/files/maildrop-3.0.2-makedat.patch | 67 ++++++++++ mail-filter/maildrop/maildrop-3.0.2-r1.ebuild | 144 +++++++++++++++++++++ mail-filter/maildrop/metadata.xml | 5 +- 3 files changed, 215 insertions(+), 1 deletion(-) diff --git a/mail-filter/maildrop/files/maildrop-3.0.2-makedat.patch b/mail-filter/maildrop/files/maildrop-3.0.2-makedat.patch new file mode 100644 index 000000000000..db7d30a84c1b --- /dev/null +++ b/mail-filter/maildrop/files/maildrop-3.0.2-makedat.patch @@ -0,0 +1,67 @@ +--- 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=`which lynx 2>/dev/null && echo "lynx -dump -nolist" && exit; echo "links -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\ +@@ -58,7 +58,6 @@ + makemime.html reformail.html reformime.html + + if HAVE_DBLIBRARY +-MAILDROPHTML += makedat.html + endif + + MAILDROPMAN=lockmail.1 maildirmake.1 maildrop.1 mailbot.1 maildropex.7 \ +@@ -66,7 +65,6 @@ + maildropfilter.7 maildropgdbm.7 makemime.1 reformail.1 reformime.1 + + if HAVE_DBLIBRARY +-MAILDROPMAN += makedat.1 + endif + + EXTRA_LTLIBRARIES=librfc822.la librfc2045.la +@@ -86,14 +84,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) +@@ -135,10 +135,6 @@ + $(INSTALL_PROGRAM) libs/maildir/maildirmake $(DESTDIR)$(bindir)/maildirmake + $(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 +@@ -192,7 +192,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_OUTPUT(Makefile dbobj.h dbobj.config maildrop.spec maildrop.lpspec + README.html INSTALL.html) diff --git a/mail-filter/maildrop/maildrop-3.0.2-r1.ebuild b/mail-filter/maildrop/maildrop-3.0.2-r1.ebuild new file mode 100644 index 000000000000..13021dd5ca59 --- /dev/null +++ b/mail-filter/maildrop/maildrop-3.0.2-r1.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2023 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 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~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:= ) + ) + 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.0.0-testsuite.patch + "${FILESDIR}"/${P}-makedat.patch +) + +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" + + default + 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 + 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 +} diff --git a/mail-filter/maildrop/metadata.xml b/mail-filter/maildrop/metadata.xml index d23d74f3b85e..9e9b118b676d 100644 --- a/mail-filter/maildrop/metadata.xml +++ b/mail-filter/maildrop/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>tup...@gentoo.org</email> + <name>Tupone Alfredo</name> + </maintainer> <use> <flag name="authlib">Add courier-authlib support</flag> <flag name="dovecot">Add dovecot authentication support</flag>
