commit: 075a8fd3296a820d22e0b2997818976388f975e8
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 3 06:47:31 2023 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon Apr 3 06:48:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=075a8fd3
mail-filter/maildrop: bump & remove old
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
mail-filter/maildrop/Manifest | 1 +
.../maildrop/files/maildrop-3.1.1-testsuite.patch | 64 ++++++++++++++++++++++
mail-filter/maildrop/maildrop-3.0.2.ebuild | 2 -
...maildrop-3.0.2.ebuild => maildrop-3.1.1.ebuild} | 28 +++++-----
4 files changed, 78 insertions(+), 17 deletions(-)
diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest
index 8496d711a12a..42131584949d 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.0.tar.bz2 2154698 BLAKE2B
8eaec33ccb3f117e0cd069eac2af736f5cc3485314ea14ac594f8e716e68d3f1e20143ba47533c08a835707dda1e8ba0fad2eea5d3bf5845668f8ad375e56387
SHA512
4d4ab1acd9f81beb54af9af86d0f8c3145f962f1ff2fd5e9209e31b63054cc41b3e4a1300965a8855a39dbcfa1cdbdef2ad194af1f12e079c1361b12b293ed56
+DIST maildrop-3.1.1.tar.bz2 2156071 BLAKE2B
fb5656cd44b55d1d4dbcbb9f13c787024fd1a4055499b273637463e135e54d1ecfa106afd7a8e98709aedb51494dc1ff35131a3d52ed8440ae1641111b5dde3c
SHA512
61e5a06d85778519add2250ef395c5a9eb6b96be715ce202405087df8eb67f007007ec9d324c28e3ab21de7e66baa916ec42ba17462cd8a544f634960388cfee
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.0.2.ebuild
b/mail-filter/maildrop/maildrop-3.1.1.ebuild
similarity index 87%
copy from mail-filter/maildrop/maildrop-3.0.2.ebuild
copy to mail-filter/maildrop/maildrop-3.1.1.ebuild
index a58e5d0e0789..4607e76db795 100644
--- a/mail-filter/maildrop/maildrop-3.0.2.ebuild
+++ b/mail-filter/maildrop/maildrop-3.1.1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit flag-o-matic autotools
DESCRIPTION="Mail delivery agent/filter"
@@ -12,28 +12,27 @@ 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"
+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/libpcre
- net-dns/libidn:0=
+ 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 )
- 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
- !mail-mta/mini-qmail
- !mail-mta/qmail-ldap
)"
DEPEND="${CDEPEND}"
RDEPEND="${CDEPEND}
@@ -48,29 +47,28 @@ REQUIRED_USE="
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
- 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}"/${PN}-3.0.0-testsuite.patch
- eapply_user
+ default
eautoreconf
}
src_configure() {
local myeconfargs=(
- $(use_enable fam)
--with-devel
--disable-tempdir
--enable-syslog=1
