* [gentoo-commits] repo/gentoo:master commit in: mail-filter/maildrop/files/, mail-filter/maildrop/
@ 2015-09-22 5:46 Eray Aslan
0 siblings, 0 replies; 6+ messages in thread
From: Eray Aslan @ 2015-09-22 5:46 UTC (permalink / raw
To: gentoo-commits
commit: 3c9a4aadc606b9c5a55baa847c3cfd6bf353594b
Author: Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 22 05:44:06 2015 +0000
Commit: Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Tue Sep 22 05:44:06 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c9a4aad
mail-filter/maildrop: version bump. do not setuid unnecessarily
Gentoo-Bug: 560678
mail-filter/maildrop/Manifest | 1 +
.../maildrop/files/maildrop-testsuite-r2.patch | 65 +++++++++
mail-filter/maildrop/maildrop-2.8.3.ebuild | 145 +++++++++++++++++++++
mail-filter/maildrop/metadata.xml | 1 +
4 files changed, 212 insertions(+)
diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest
index 35a7797..ddefc26 100644
--- a/mail-filter/maildrop/Manifest
+++ b/mail-filter/maildrop/Manifest
@@ -1 +1,2 @@
DIST maildrop-2.6.0.tar.bz2 2174922 SHA256 afc115119b2d3197c565002e158c2cb69d525288bf72c71919c3c74096b824a9 SHA512 210841add8aff389589802f15ea74776815ecfd0dd9d5fb4f244d101e3d3f5dbb833a38f1d539b869c49685cfe34b0e6e014a5888c2537c9d89c68d754248db4 WHIRLPOOL c6d8f2be69a02fa757ac4dd653c22c79c8da6c2c1c112d48e0d4c491238d20e4c093d01f728ea337b1ba12bc75d88c5a252ff036114fe2339666776f2be44e80
+DIST maildrop-2.8.3.tar.bz2 1992695 SHA256 58245ccd759382761c4cdbeaefbd37622e01f1c48e71251b06ea085a890ce6c9 SHA512 25168945764eda5c74641e205e3c784ca2ae27c15a5a6ddfe7a1c7b238cd6c3d5b0a3f7ce8b405b578d067f6f2aae5d7d6110da8bc89f91ac1c7fdc224ffd054 WHIRLPOOL 9d8ea100ad125e814663c76539b41f208448b3259193008fade1291de7ec98efe8cf5b9f8b7f267acc9be78ccba1b28a8165d99d59d7d6ada4b99aa10cd163ea
diff --git a/mail-filter/maildrop/files/maildrop-testsuite-r2.patch b/mail-filter/maildrop/files/maildrop-testsuite-r2.patch
new file mode 100644
index 0000000..479a8f5
--- /dev/null
+++ b/mail-filter/maildrop/files/maildrop-testsuite-r2.patch
@@ -0,0 +1,65 @@
+--- libs/maildrop/configure.ac 2015-06-27 17:55:08.000000000 +0000
++++ libs/maildrop/configure.ac 2015-09-22 05:23:33.000000000 +0000
+@@ -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
+--- libs/maildrop/Makefile.am 2015-06-27 17:55:08.000000000 +0000
++++ libs/maildrop/Makefile.am 2015-09-22 05:24:29.000000000 +0000
+@@ -75,9 +75,13 @@
+ maildrop.lsm testsuite.txt.idn testsuite.txt.noidn testsuite2
+
+ check-am:
++if HAS_EN_US
+ @chmod +x testsuite
+ ./testsuite | cmp -s - $(srcdir)/$(TESTSUITE)
+ @SHELL@ $(srcdir)/testsuite2
++else
++ echo ' Need en_US.utf8 to run tests'
++endif
+
+ noinst_DATA=maildrop.html maildrop.1 maildropfilter.html maildropfilter.7 \
+ maildropgdbm.html maildropgdbm.7
+--- libs/rfc2045/configure.ac 2014-02-16 09:00:13.000000000 +0000
++++ libs/rfc2045/configure.ac 2015-09-22 05:28:18.000000000 +0000
+@@ -60,6 +60,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"
+--- libs/rfc2045/Makefile.am 2015-02-28 17:59:41.000000000 +0000
++++ libs/rfc2045/Makefile.am 2015-09-22 05:29:08.000000000 +0000
+@@ -76,6 +76,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 -
++else
++ echo ' Need en_US.utf8 to run tests'
++endif
diff --git a/mail-filter/maildrop/maildrop-2.8.3.ebuild b/mail-filter/maildrop/maildrop-2.8.3.ebuild
new file mode 100644
index 0000000..afc63ac
--- /dev/null
+++ b/mail-filter/maildrop/maildrop-2.8.3.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils 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="http://www.courier-mta.org/beta/${PN}/${P%%_pre}.tar.bz2"
+HOMEPAGE="http://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
+ net-libs/courier-unicode
+ 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
+ )"
+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."
+ elif use berkdb ; then
+ epatch "${FILESDIR}"/${PN}-2.5.1-db.patch
+ fi
+
+ if ! use fam ; then
+ epatch "${FILESDIR}"/${PN}-1.8.1-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"
+ epatch "${FILESDIR}"/${PN}-testsuite-r2.patch
+ eautoreconf
+}
+
+src_configure() {
+ local myconf
+ local mytrustedusers="apache dspam root mail fetchmail"
+ mytrustedusers+=" daemon postmaster qmaild mmdf vmail alias"
+
+ # These flags make maildrop cry
+ replace-flags -Os -O2
+ filter-flags -fomit-frame-pointer
+
+ if use gdbm ; then
+ myconf="${myconf} --with-db=gdbm"
+ elif use berkdb ; then
+ myconf="${myconf} --with-db=db"
+ else
+ myconf="${myconf} --without-db"
+ fi
+
+ if ! use mysql && ! use postgres && ! use ldap && ! use authlib ; then
+ myconf="${myconf} --disable-authlib"
+ fi
+
+ # Default mailbox is $HOME/.maildir for Gentoo
+ maildrop_cv_SYS_INSTALL_MBOXDIR="./.maildir" econf \
+ $(use_enable fam) \
+ --disable-dependency-tracker \
+ --with-devel \
+ --disable-tempdir \
+ --enable-syslog=1 \
+ --enable-use-flock=1 \
+ --enable-use-dotlock=1 \
+ --enable-restrict-trusted=1 \
+ --enable-trusted-users="${mytrustedusers}" \
+ --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) \
+ ${myconf}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ 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
+
+ # bugs #61116 #374009
+ if ! use tools ; then
+ for tool in "maildirmake" "deliverquota"; do
+ rm "${D}/usr/bin/${tool}"
+ rm "${D}/usr/share/man/man"[0-9]"/${tool}."[0-9]
+ rm "${D}/usr/share/maildrop/html/${tool}.html"
+ done
+ rm "${D}/usr/share/man/man5/maildir.5"
+ fi
+
+ dodir "/usr/share/doc/${PF}"
+ mv "${D}/usr/share/doc/maildrop/html" "${D}/usr/share/doc/${PF}/" || die
+ rm -rf "${D}"/usr/share/doc/maildrop
+
+ dohtml *.html libs/maildir/*.html
+
+ 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 75e94b2..58142c1 100644
--- a/mail-filter/maildrop/metadata.xml
+++ b/mail-filter/maildrop/metadata.xml
@@ -4,6 +4,7 @@
<herd>net-mail</herd>
<use>
<flag name="authlib">Add courier-authlib support</flag>
+ <flag name="dovecot">Add dovecot authentication support</flag>
<flag name="tools">Install maildirmake and deliverquota tools</flag>
<flag name="trashquota">Count deleted messages as part of the maildir quota</flag>
</use>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-filter/maildrop/files/, mail-filter/maildrop/
@ 2017-07-03 14:10 Eray Aslan
0 siblings, 0 replies; 6+ messages in thread
From: Eray Aslan @ 2017-07-03 14:10 UTC (permalink / raw
To: gentoo-commits
commit: 6771adfdca1762538d9ad72b1f70efde880c99dd
Author: Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 3 14:05:28 2017 +0000
Commit: Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Mon Jul 3 14:10:40 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6771adfd
mail-filter/maildrop: remove old
Package-Manager: Portage-2.3.6, Repoman-2.3.2
mail-filter/maildrop/Manifest | 1 -
.../files/maildrop-1.8.1-disable-fam.patch | 56 ---------
mail-filter/maildrop/files/maildrop-2.5.1-db.patch | 63 ----------
.../maildrop/files/maildrop-testsuite.patch | 67 ----------
mail-filter/maildrop/maildrop-2.6.0.ebuild | 140 ---------------------
5 files changed, 327 deletions(-)
diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest
index 8aea720df07..56e66ed9048 100644
--- a/mail-filter/maildrop/Manifest
+++ b/mail-filter/maildrop/Manifest
@@ -1,4 +1,3 @@
-DIST maildrop-2.6.0.tar.bz2 2174922 SHA256 afc115119b2d3197c565002e158c2cb69d525288bf72c71919c3c74096b824a9 SHA512 210841add8aff389589802f15ea74776815ecfd0dd9d5fb4f244d101e3d3f5dbb833a38f1d539b869c49685cfe34b0e6e014a5888c2537c9d89c68d754248db4 WHIRLPOOL c6d8f2be69a02fa757ac4dd653c22c79c8da6c2c1c112d48e0d4c491238d20e4c093d01f728ea337b1ba12bc75d88c5a252ff036114fe2339666776f2be44e80
DIST maildrop-2.8.3.tar.bz2 1992695 SHA256 58245ccd759382761c4cdbeaefbd37622e01f1c48e71251b06ea085a890ce6c9 SHA512 25168945764eda5c74641e205e3c784ca2ae27c15a5a6ddfe7a1c7b238cd6c3d5b0a3f7ce8b405b578d067f6f2aae5d7d6110da8bc89f91ac1c7fdc224ffd054 WHIRLPOOL 9d8ea100ad125e814663c76539b41f208448b3259193008fade1291de7ec98efe8cf5b9f8b7f267acc9be78ccba1b28a8165d99d59d7d6ada4b99aa10cd163ea
DIST maildrop-2.8.5.tar.bz2 2072987 SHA256 c21174ef882aeb169031bb5886b55959687074415153232f4c60695405fcddb1 SHA512 c04120af29ee8e72aeabd211301c5052fe4a2dc0f337074e1fa57b8adb9652512cd744e0bba3894a8b0e3b21a3511bbf4a4f045faec3536edb8be0f8bdc84cf5 WHIRLPOOL 03ba0c152fd8738f8d34a48062cc0a27c3580d2dd8bcfafb4fbde7c87ae420d6a82ad59cc644606129b4e8c983785846684d92e93ef0ae9b43832d39f12ea140
DIST maildrop-2.9.0.tar.bz2 2075698 SHA256 6f1b2db822a34d8256d9cc2a011e5a2c6b7e6dd01ed66881cd6fce6f4eb5981c SHA512 366a04d1e6e10ef1c824fbb5dfe406ff74fe17b80a46619fd8aa8cde3b4fef9a10b4ed3cc6329ed04632582d58104aaf16134c6dc82e17917b82fb6f18316dd6 WHIRLPOOL 688802e8c9e2652e5350d117b1ebdfd6334de217e37387a9199a48da018f05deb18d84003ac36618aaa16fe03df504461d5adeeef0534f0b0c8708cf83fa5c19
diff --git a/mail-filter/maildrop/files/maildrop-1.8.1-disable-fam.patch b/mail-filter/maildrop/files/maildrop-1.8.1-disable-fam.patch
deleted file mode 100644
index 49d1cc7a532..00000000000
--- a/mail-filter/maildrop/files/maildrop-1.8.1-disable-fam.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -ruBb maildrop-1.8.1.orig/configure.in maildrop-1.8.1/configure.in
---- maildrop-1.8.1.orig/configure.in 2005-05-12 16:45:57.000000000 +0200
-+++ maildrop-1.8.1/configure.in 2005-09-10 20:05:28.000000000 +0200
-@@ -145,6 +145,7 @@
- --enable-tempdir=.tmp directory for temp files (in user's home dir)
- --disable-tempdir disable temp files in home directory (use
- the tmpfile function)
-+ --disable-fam disable libfam.a for maildir operations
- --enable-smallmsg=8192 size of buffer for small messages
- --enable-global-timeout=300 global watchdog timer (seconds)
- --enable-crlf-term=0 enable <CR><LF> line termination
-diff -ruBb maildrop-1.8.1.orig/maildir/configure.in maildrop-1.8.1/maildir/configure.in
---- maildrop-1.8.1.orig/maildir/configure.in 2005-03-21 13:11:24.000000000 +0100
-+++ maildrop-1.8.1/maildir/configure.in 2005-09-10 20:10:55.000000000 +0200
-@@ -58,26 +58,30 @@
- AC_STRUCT_TM
-
- dnl Checks for library functions.
--AC_CHECK_HEADER(fam.h, :, :)
--AC_CHECK_FUNCS(symlink readlink strcasecmp utime utimes)
--AC_CHECK_LIB(fam, FAMOpen, [
-+AC_ARG_ENABLE(fam, [ --disable-fam Do not use libfam.a library.])
-+if test x$enableval = xyes
-+then
-+ AC_CHECK_HEADER(fam.h, :, :)
-+ AC_CHECK_FUNCS(symlink readlink strcasecmp utime utimes)
-+ AC_CHECK_LIB(fam, FAMOpen, [
- LIBFAM=-lfam
- AC_DEFINE_UNQUOTED(HAVE_FAM,1,
- [ Whether libfam.a is available ])
-
- AC_CHECK_HEADER(fam.h, : , [
--AC_MSG_WARN([[The development header files and libraries for fam,]])
--AC_MSG_WARN([[the File Alteration Monitor, are not installed.]])
--AC_MSG_WARN([[You appear to have the FAM runtime libraries installed,]])
--AC_MSG_WARN([[so you need to simply install the additional development]])
--AC_MSG_WARN([[package for your operating system.]])
--AC_MSG_ERROR([[FAM development libraries not found.]]) ]
-+ AC_MSG_WARN([[The development header files and libraries for fam,]])
-+ AC_MSG_WARN([[the File Alteration Monitor, are not installed.]])
-+ AC_MSG_WARN([[You appear to have the FAM runtime libraries installed,]])
-+ AC_MSG_WARN([[so you need to simply install the additional development]])
-+ AC_MSG_WARN([[package for your operating system.]])
-+ AC_MSG_ERROR([[FAM development libraries not found.]]) ]
- )
- ])
-
--AC_SUBST(LIBFAM)
-+ AC_SUBST(LIBFAM)
-
--echo "$LIBFAM" >maildir.libdeps
-+ echo "$LIBFAM" >maildir.libdeps
-+fi
-
- AC_CACHE_CHECK([for missing gethostname prototype],maildir_cv_SYS_GETHOSTNAME,
-
diff --git a/mail-filter/maildrop/files/maildrop-2.5.1-db.patch b/mail-filter/maildrop/files/maildrop-2.5.1-db.patch
deleted file mode 100644
index 4930fb0d155..00000000000
--- a/mail-filter/maildrop/files/maildrop-2.5.1-db.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- maildrop/bdbobj/configure.in
-+++ maildrop/bdbobj/configure.in
-@@ -23,15 +23,19 @@
- dnl Checks for libraries.
-
- saveLIBS="$LIBS"
--AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],
-- AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],
-- AC_CHECK_LIB(db, db_env_create, [ LIBDB=-ldb; LIBS="-ldb $LIBS"])
-- ))
-+for dbname in db-5.2 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
-+ do
-+ AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+ AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+ AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+ AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))
-
-+ done
- FOUND_DB=0
--AC_CHECK_FUNC(dbopen, FOUND_DB=1)
--AC_CHECK_FUNC(db_open, FOUND_DB=1)
--AC_CHECK_FUNC(db_env_create, FOUND_DB=1)
-+AC_CHECK_FUNC(db_create, FOUND_DB=1)
-+AC_CHECK_FUNC(db_create_4002, FOUND_DB=1)
-+AC_CHECK_FUNC(db_create_4001, FOUND_DB=1)
-+AC_CHECK_FUNC(db_create_4000, FOUND_DB=1)
-
- LIBS="$saveLIBS"
-
---- maildrop/configure.in
-+++ maildrop/configure.in
-@@ -115,18 +115,21 @@
- USE_GDBM=1
- ;;
- db)
-- AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],
-- AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],
-- AC_CHECK_LIB(db, db_env_create,
-- [ LIBDB=-ldb; LIBS="-ldb $LIBS"])
-- ))
--
-- AC_CHECK_FUNC(dbopen, HAVE_BDB=1)
-- AC_CHECK_FUNC(db_open, HAVE_BDB=1)
-- AC_CHECK_FUNC(db_env_create, HAVE_BDB=1)
-+ for dbname in db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
-+ do
-+ AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+ AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+ AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+ AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))
-+ done
-+ AC_CHECK_FUNC(db_create, HAVE_BDB=1)
-+ AC_CHECK_FUNC(db_create_4002, HAVE_BDB=1)
-+ AC_CHECK_FUNC(db_create_4001, HAVE_BDB=1)
-+ AC_CHECK_FUNC(db_create_4000, HAVE_BDB=1)
-+
- if test "$HAVE_BDB" != "1"
- then
-- AC_MSG_ERROR(GDBM library not found)
-+ AC_MSG_ERROR(DB library not found)
- fi
- dblibrary=bdbobj/libbdbobj.la
- USE_DB=1
diff --git a/mail-filter/maildrop/files/maildrop-testsuite.patch b/mail-filter/maildrop/files/maildrop-testsuite.patch
deleted file mode 100644
index 377fb19d151..00000000000
--- a/mail-filter/maildrop/files/maildrop-testsuite.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Need en_US.utf8 to run some tests - bug #376667
-
---- maildrop/Makefile.am 2011-04-04 15:58:58.000000000 +0000
-+++ maildrop/Makefile.am 2011-07-28 10:29:43.000000000 +0000
-@@ -75,8 +75,12 @@
- maildrop.lsm testsuite.txt.idn testsuite.txt.noidn
-
- check-am:
-+if HAS_EN_US
- @chmod +x testsuite
- ./testsuite | cmp -s - $(srcdir)/$(TESTSUITE)
-+else
-+ echo ' Need en_US.utf8 to run tests'
-+endif
-
- noinst_DATA=maildrop.html maildrop.1 maildropfilter.html maildropfilter.7 \
- maildropgdbm.html maildropgdbm.7
---- maildrop/configure.in 2011-05-17 20:36:04.000000000 +0000
-+++ maildrop/configure.in 2011-07-28 10:58:57.000000000 +0000
-@@ -200,6 +200,15 @@
- AC_TYPE_SIGNAL
- AC_CHECK_FUNCS(setgroups setlocale)
-
-+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_CHECK_FUNC(getpgrp, HAS_GETPGRP=1, HAS_GETPGRP=0)
- AC_DEFINE_UNQUOTED(HAS_GETPGRP,$HAS_GETPGRP,
- [ Whether getpgrp() is available ])
---- rfc2045/Makefile.am 2011-04-04 15:59:47.000000000 +0000
-+++ rfc2045/Makefile.am 2011-07-29 09:28:41.000000000 +0000
-@@ -76,7 +76,11 @@
- TESTSUITE=testsuite.txt.noidn
- endif
-
-+if HAS_EN_US
- check-am:
- @SHELL@ $(srcdir)/testsuite | cmp -s - $(srcdir)/$(TESTSUITE)
- @SHELL@ $(srcdir)/testsuitemm | cmp -s - $(srcdir)/testsuitemm.txt
- @SHELL@ $(srcdir)/testrfc3676parsersuite | diff -U 3 $(srcdir)/testrfc3676parsersuite.txt -
-+else
-+ echo ' Need en_US.utf8 to run tests'
-+endif
---- rfc2045/configure.in 2011-04-04 15:59:47.000000000 +0000
-+++ rfc2045/configure.in 2011-07-29 09:28:34.000000000 +0000
-@@ -59,6 +59,15 @@
- AC_CHECK_FUNC(strncasecmp,,CFLAGS="$CFLAGS -Dstrncasecmp=strnicmp")
- AC_CHECK_FUNC(strcasecmp,,CFLAGS="$CFLAGS -Dstrcasecmp=stricmp")
-
-+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-2.6.0.ebuild b/mail-filter/maildrop/maildrop-2.6.0.ebuild
deleted file mode 100644
index a4ad3a5b1fb..00000000000
--- a/mail-filter/maildrop/maildrop-2.6.0.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils 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="http://www.courier-mta.org/beta/${PN}/${P%%_pre}.tar.bz2"
-HOMEPAGE="http://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 fam gdbm ldap mysql postgres static-libs authlib +tools trashquota"
-
-CDEPEND="!mail-mta/courier
- net-mail/mailbase
- dev-libs/libpcre
- net-dns/libidn
- 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
- )"
-DEPEND="${CDEPEND}
- virtual/pkgconfig"
-RDEPEND="${CDEPEND}
- dev-lang/perl"
-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."
- elif use berkdb ; then
- epatch "${FILESDIR}"/${PN}-2.5.1-db.patch
- fi
-
- if ! use fam ; then
- epatch "${FILESDIR}"/${PN}-1.8.1-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}"/maildrop/configure.in || die "sed failed"
- epatch "${FILESDIR}"/${PN}-testsuite.patch
- eautoreconf
-}
-
-src_configure() {
- local myconf
- local mytrustedusers="apache dspam root mail fetchmail"
- mytrustedusers+=" daemon postmaster qmaild mmdf vmail alias"
-
- # These flags make maildrop cry
- replace-flags -Os -O2
- filter-flags -fomit-frame-pointer
-
- if use gdbm ; then
- myconf="${myconf} --with-db=gdbm"
- elif use berkdb ; then
- myconf="${myconf} --with-db=db"
- else
- myconf="${myconf} --without-db"
- fi
-
- if ! use mysql && ! use postgres && ! use ldap && ! use authlib ; then
- myconf="${myconf} --disable-authlib"
- fi
-
- # Default mailbox is $HOME/.maildir for Gentoo
- maildrop_cv_SYS_INSTALL_MBOXDIR="./.maildir" econf \
- $(use_enable fam) \
- --disable-dependency-tracker \
- --with-devel \
- --disable-tempdir \
- --enable-syslog=1 \
- --enable-use-flock=1 \
- --enable-use-dotlock=1 \
- --enable-restrict-trusted=1 \
- --enable-trusted-users="${mytrustedusers}" \
- --enable-maildrop-uid=root \
- --enable-maildrop-gid=mail \
- --enable-sendmail=/usr/sbin/sendmail \
- --cache-file="${S}"/configuring.cache \
- $(use_enable static-libs static) \
- $(use_with trashquota) \
- ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- fperms 4755 /usr/bin/maildrop
-
- dodoc AUTHORS ChangeLog INSTALL NEWS README \
- README.postfix UPGRADE maildroptips.txt
- docinto unicode
- dodoc unicode/README
- docinto maildir
- dodoc maildir/AUTHORS maildir/INSTALL maildir/README*.txt
-
- # bugs #61116 #374009
- if ! use tools ; then
- for tool in "maildirmake" "deliverquota"; do
- rm "${D}/usr/bin/${tool}"
- rm "${D}/usr/share/man/man"[0-9]"/${tool}."[0-9]
- rm "${D}/usr/share/maildrop/html/${tool}.html"
- done
- rm "${D}/usr/share/man/man5/maildir.5"
- fi
-
- dodir "/usr/share/doc/${PF}"
- mv "${D}/usr/share/maildrop/html" "${D}/usr/share/doc/${PF}/" || die
- rm -rf "${D}"/usr/share/maildrop
-
- dohtml *.html maildir/*.html
-
- insinto /etc
- doins "${FILESDIR}"/maildroprc
-
- use static-libs || find "${D}"/usr/lib* -name '*.la' -delete
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-filter/maildrop/files/, mail-filter/maildrop/
@ 2023-01-23 21:41 Alfredo Tupone
0 siblings, 0 replies; 6+ messages in thread
From: Alfredo Tupone @ 2023-01-23 21:41 UTC (permalink / raw
To: gentoo-commits
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>tupone@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>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-filter/maildrop/files/, mail-filter/maildrop/
@ 2023-05-19 19:24 Alfredo Tupone
0 siblings, 0 replies; 6+ messages in thread
From: Alfredo Tupone @ 2023-05-19 19:24 UTC (permalink / raw
To: gentoo-commits
commit: 7601b5f762afeacbd46073ea792f95ff0a6f1f60
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri May 19 19:23:38 2023 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri May 19 19:24:06 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7601b5f7
mail-filter/maildrop: add 3.1.5
Closes: https://bugs.gentoo.org/906612
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
mail-filter/maildrop/Manifest | 1 +
.../maildrop/files/maildrop-3.1.5-common.patch | 103 +++++++++++++++
mail-filter/maildrop/maildrop-3.1.5.ebuild | 139 +++++++++++++++++++++
3 files changed, 243 insertions(+)
diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest
index 31415703bc04..0a4e6c4b39b0 100644
--- a/mail-filter/maildrop/Manifest
+++ b/mail-filter/maildrop/Manifest
@@ -1,2 +1,3 @@
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
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
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-filter/maildrop/files/, mail-filter/maildrop/
@ 2024-02-19 19:56 Alfredo Tupone
0 siblings, 0 replies; 6+ messages in thread
From: Alfredo Tupone @ 2024-02-19 19:56 UTC (permalink / raw
To: gentoo-commits
commit: 4653e8239c756dcb9b134241e5352dc5a977e3f0
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 19 19:55:23 2024 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon Feb 19 19:56:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4653e823
mail-filter/maildrop: removing a test to forward to example.com
Closes: https://bugs.gentoo.org/924852
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
mail-filter/maildrop/files/maildrop-3.1.6-test.patch | 18 ++++++++++++++++++
mail-filter/maildrop/maildrop-3.1.6-r2.ebuild | 1 +
2 files changed, 19 insertions(+)
diff --git a/mail-filter/maildrop/files/maildrop-3.1.6-test.patch b/mail-filter/maildrop/files/maildrop-3.1.6-test.patch
new file mode 100644
index 000000000000..d99f9dc56c5f
--- /dev/null
+++ b/mail-filter/maildrop/files/maildrop-3.1.6-test.patch
@@ -0,0 +1,18 @@
+--- a/libs/maildrop/testsuite.in 2024-02-19 20:41:35.888525818 +0100
++++ b/libs/maildrop/testsuite.in 2024-02-19 20:42:11.215101211 +0100
+@@ -131,7 +131,6 @@
+ SENDMAIL='./testsuite.chk'
+ to "! nobody@example.com"
+ EOF
+-echo "Subject: test-forward" | $VALGRIND ./maildrop testsuite.recipe
+
+ rm -rf testsuite.maildir
+ cat >testsuite.recipe <<EOF
+--- a/libs/maildrop/testsuite.txt.idn 2024-02-19 20:50:55.607599959 +0100
++++ b/libs/maildrop/testsuite.txt.idn 2024-02-19 20:51:03.904494616 +0100
+@@ -1,5 +1,3 @@
+-Parameters: -f nobody@example.com
+-Subject: test-forward
+ Subject: msg1
+
+
diff --git a/mail-filter/maildrop/maildrop-3.1.6-r2.ebuild b/mail-filter/maildrop/maildrop-3.1.6-r2.ebuild
index f98f115db911..d3e1e4b2ae63 100644
--- a/mail-filter/maildrop/maildrop-3.1.6-r2.ebuild
+++ b/mail-filter/maildrop/maildrop-3.1.6-r2.ebuild
@@ -51,6 +51,7 @@ S=${WORKDIR}/${P%%_pre}
PATCHES=(
"${FILESDIR}"/${PN}-3.1.1-testsuite.patch
"${FILESDIR}"/${P}-valgrind.patch
+ "${FILESDIR}"/${P}-test.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-filter/maildrop/files/, mail-filter/maildrop/
@ 2024-07-26 19:19 Alfredo Tupone
0 siblings, 0 replies; 6+ messages in thread
From: Alfredo Tupone @ 2024-07-26 19:19 UTC (permalink / raw
To: gentoo-commits
commit: b2458332b5628cff1a0a5eda3b9ee41b22bd2dec
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 26 19:18:09 2024 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Jul 26 19:18:51 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2458332
mail-filter/maildrop: add 3.1.7
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
mail-filter/maildrop/Manifest | 1 +
.../maildrop/files/maildrop-3.1.7-testsuite.patch | 68 ++++++++++
.../maildrop/files/maildrop-3.1.7-valgrind.patch | 31 +++++
mail-filter/maildrop/maildrop-3.1.7.ebuild | 151 +++++++++++++++++++++
4 files changed, 251 insertions(+)
diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest
index 5951b1492bb5..f956e56f745f 100644
--- a/mail-filter/maildrop/Manifest
+++ b/mail-filter/maildrop/Manifest
@@ -2,3 +2,4 @@ DIST maildrop-3.0.2.tar.bz2 2129406 BLAKE2B 10572c9c0fcb7a31f10fdfb005562afd425d
DIST maildrop-3.1.4.tar.bz2 2156148 BLAKE2B e7de4e30ee23d8d2f88de7b0398a41c84af6d34207e9f26fd7b22e7ac1b5171c309c6304b312a75e621bc860e5a2d3f59613e47ff5a73ae6412761179f787f53 SHA512 b8f373e142c61ba9cdf32fd939aa7fc5c24ec873f734be048e94561e35977b6fb663ff4a1c35fc22dc7dc2075e04e4c4a09e37c0e7c7c0dd96555fcda9c7fd26
DIST maildrop-3.1.5.tar.bz2 2156334 BLAKE2B 374c0436a0e5954171bf942d824123d610057269739f5f76f4353b75065a964fe92d95a80209a07187d3ebcfe59a6d92d54c71fa52325fc4968e10c1b8eeaada SHA512 f722cbdf9aeb628ff68dcd280de5d7d37a3fae3692b7de5483cf0563631ff9b2eba9ef9baf3b3e3f6108d40e19b55dabddacaa3a064e6b71210b18f200bc67b7
DIST maildrop-3.1.6.tar.bz2 2156136 BLAKE2B fddb718e81d66a393f3bce720edb73c3638c255504d90f7613c05910a3a96ca2ad9ab350167096a2677d51770d26799f8bd89f287dda464163f82c5da8d8b28a SHA512 93364747c603d1d566f756e7ba8b10fd38d10749b269f1bf64596a56fe2b06f529f4b59b6256a5be0c44169f2c8cc9dcd7de91b3cc03288719ffee5db330b1d5
+DIST maildrop-3.1.7.tar.bz2 2156082 BLAKE2B 734380f8b76882a7b9c04203e971c72544eba6fc0b0a74ed4f48f5c3c1b5c2f2817fa8eff7268c934b840471a554ffe9ce159fc9c232a3c9b717f956c8862474 SHA512 972f3891d6f1daca97971d6cc3e09e4f78ce7bf8bb4520ed2836b8d7d9394546d403a0dd709e6b2e34706f67aae2563523bbc0953a9971cc2107fc0838fa095e
diff --git a/mail-filter/maildrop/files/maildrop-3.1.7-testsuite.patch b/mail-filter/maildrop/files/maildrop-3.1.7-testsuite.patch
new file mode 100644
index 000000000000..5f6b6605ecd5
--- /dev/null
+++ b/mail-filter/maildrop/files/maildrop-3.1.7-testsuite.patch
@@ -0,0 +1,68 @@
+Force en_US locale for certain tests.
+
+--- maildrop-3.0.0/libs/maildrop/Makefile.am
++++ maildrop-3.0.0/libs/maildrop/Makefile.am
+@@ -71,12 +71,14 @@
+ 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; \
+ sed '/^Message envelope sender/d' <testsuite.diff | \
+ diff -U 3 - $(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/files/maildrop-3.1.7-valgrind.patch b/mail-filter/maildrop/files/maildrop-3.1.7-valgrind.patch
new file mode 100644
index 000000000000..d0056625576c
--- /dev/null
+++ b/mail-filter/maildrop/files/maildrop-3.1.7-valgrind.patch
@@ -0,0 +1,31 @@
+--- a/libs/maildrop/Makefile.am 2024-02-18 06:43:15.291095955 +0100
++++ b/libs/maildrop/Makefile.am 2024-02-18 06:43:37.317830695 +0100
+@@ -77,7 +77,7 @@
+ sed '/^Message envelope sender/d' <testsuite.diff | \
+ diff -U 3 - $(srcdir)/testsuite.txt.idn || exit 1; \
+ rm -f testsuite.diff
+- VALGRIND="`which valgrind 2>/dev/null`"; export VALGRIND; @SHELL@ $(srcdir)/testsuite2
++ VALGRIND=""; export VALGRIND; @SHELL@ $(srcdir)/testsuite2
+ endif
+
+ noinst_DATA=maildrop.html maildrop.1 maildropfilter.html maildropfilter.7 \
+--- a/libs/maildir/Makefile.am 2024-02-18 06:48:31.305134721 +0100
++++ b/libs/maildir/Makefile.am 2024-02-18 06:49:56.223057434 +0100
+@@ -152,17 +152,11 @@
+ test "@PCRE_LDFLAGS@" != "" || exit 0 ; @SHELL@ $(srcdir)/testsuite2 2>&1 | cmp - $(srcdir)/testsuite2.txt
+ LC_ALL=C; export LC_ALL; ./maildirkwtest | cmp -s - $(srcdir)/maildirkwtest.txt
+ LC_ALL=C; export LC_ALL; ./maildiraclttest
+- VALGRIND="`which valgrind 2>/dev/null`"; test "$$VALGRIND" != "" || exit 0; \
+- LC_ALL=C; export LC_ALL; valgrind --tool=memcheck --leak-check=yes --error-exitcode=1 ./maildiraclttest
+- VALGRIND="`which valgrind 2>/dev/null`"; test "$$VALGRIND" != "" || exit 0; \
+- LC_ALL=C; export LC_ALL; valgrind --tool=memcheck --leak-check=yes --error-exitcode=1 ./maildirkwtest
+ ./testmaildirsearch iso-8859-1 needle haystack; test $$? = 2 && exit 0; exit 1
+ ./testmaildirsearch iso-8859-1 nEEdle needlE
+ ./testmaildirsearch iso-8859-1 "abra cadAbra" "abra cadabra"
+ ./testmaildirsearch iso-8859-1 " abra cadAbra " " abra cadabra"
+ ./testmaildirsearch iso-8859-1 " abra cadAbra " " abra cadabra "
+- VALGRIND="`which valgrind 2>/dev/null`"; test "$$VALGRIND" != "" || exit 0; \
+- LC_ALL=C; export LC_ALL; export VALGRIND="@SHELL@ $(srcdir)/testsuitevalgrind"; rm -f confmdtesterror; @SHELL@ $(srcdir)/testsuite 2>&1 | tee testsuite.out; test ! -f confmdtesterror
+ rm -rf testsuite.out
+
+ if HAVE_SGML
diff --git a/mail-filter/maildrop/maildrop-3.1.7.ebuild b/mail-filter/maildrop/maildrop-3.1.7.ebuild
new file mode 100644
index 000000000000..644f2d25aaf5
--- /dev/null
+++ b/mail-filter/maildrop/maildrop-3.1.7.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2024 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="https://downloads.sourceforge.net/courier/${P}.tar.bz2"
+[[ -z ${PV/?.?.?/} ]] && SRC_URI="https://downloads.sourceforge.net/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/"
+
+S=${WORKDIR}/${P%%_pre}
+
+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:=
+ gdbm? ( sys-libs/gdbm:= )
+ 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:= )
+ )
+ gdbm? ( net-mail/courier-imap[gdbm?,berkdb?] )
+ berkdb? ( net-mail/courier-imap[gdbm?,berkdb?] )
+ tools? (
+ !mail-mta/netqmail
+ !<net-mail/courier-imap-5.2.6
+ net-mail/courier-common
+ )"
+DEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}
+ dev-lang/perl
+ dovecot? ( net-mail/dovecot )"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="
+ mysql? ( authlib )
+ postgres? ( authlib )
+ ldap? ( authlib )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-testsuite.patch
+ "${FILESDIR}"/${P}-valgrind.patch
+ "${FILESDIR}"/${PN}-3.1.6-test.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
+
+ # Moved to courier-common
+ rm "${D}"/usr/bin/deliverquota || die
+ rm "${D}"/usr/bin/maildirkw || die
+ if use gdbm; then
+ rm "${D}"/usr/bin/makedat || die
+ rm "${D}"/usr/bin/makedatprog || die
+ fi
+ rm "${D}"/usr/share/man/man1/maildirkw.1 || die
+ rm "${D}"/usr/share/man/man1/makedat.1 || die
+ rm "${D}"/usr/share/man/man8/deliverquota.8 || die
+
+ 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, 639124
+ if ! use tools ; then
+ for tool in "maildirmake" "maildirwatch"; 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
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-07-26 19:19 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-22 5:46 [gentoo-commits] repo/gentoo:master commit in: mail-filter/maildrop/files/, mail-filter/maildrop/ Eray Aslan
-- strict thread matches above, loose matches on Subject: below --
2017-07-03 14:10 Eray Aslan
2023-01-23 21:41 Alfredo Tupone
2023-05-19 19:24 Alfredo Tupone
2024-02-19 19:56 Alfredo Tupone
2024-07-26 19:19 Alfredo Tupone
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox