[gentoo-commits] repo/gentoo:master commit in: mail-filter/maildrop/, mail-filter/maildrop/files/
commit: 3256b72ab582a5647ca8a40a08f9f081e88d8920 Author: Alfredo Tupone gentoo org> AuthorDate: Sun Feb 18 05:56:18 2024 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Feb 18 05:57:07 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3256b72a mail-filter/maildrop: drop valgrind usage on test Closes: https://bugs.gentoo.org/924748 Signed-off-by: Alfredo Tupone gentoo.org> .../maildrop/files/maildrop-3.1.6-valgrind.patch | 31 ++ mail-filter/maildrop/maildrop-3.1.6-r2.ebuild | 1 + 2 files changed, 32 insertions(+) diff --git a/mail-filter/maildrop/files/maildrop-3.1.6-valgrind.patch b/mail-filter/maildrop/files/maildrop-3.1.6-valgrind.patch new file mode 100644 index ..f4b22914f395 --- /dev/null +++ b/mail-filter/maildrop/files/maildrop-3.1.6-valgrind.patch @@ -0,0 +1,31 @@ +--- a/libs/maildrop/Makefile.am2024-02-18 06:43:15.291095955 +0100 b/libs/maildrop/Makefile.am2024-02-18 06:43:37.317830695 +0100 +@@ -73,7 +73,7 @@ + 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 ++ 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.6-r2.ebuild b/mail-filter/maildrop/maildrop-3.1.6-r2.ebuild index 0bdf1c83bc3e..f98f115db911 100644 --- a/mail-filter/maildrop/maildrop-3.1.6-r2.ebuild +++ b/mail-filter/maildrop/maildrop-3.1.6-r2.ebuild @@ -50,6 +50,7 @@ S=${WORKDIR}/${P%%_pre} PATCHES=( "${FILESDIR}"/${PN}-3.1.1-testsuite.patch + "${FILESDIR}"/${P}-valgrind.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: mail-filter/maildrop/, mail-filter/maildrop/files/
commit: 075a8fd3296a820d22e0b2997818976388f975e8 Author: Alfredo Tupone gentoo org> AuthorDate: Mon Apr 3 06:47:31 2023 + Commit: Alfredo Tupone gentoo org> CommitDate: Mon Apr 3 06:48:09 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=075a8fd3 mail-filter/maildrop: bump & remove old Signed-off-by: Alfredo Tupone 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 fb5656cd44b55d1d4dbcbb9f13c787024fd1a4055499b273637463e135e54d1ecfa106afd7a8e98709aedb51494dc1ff35131a3d52ed8440ae164b5dde3c 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 ..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-fi
[gentoo-commits] repo/gentoo:master commit in: mail-filter/maildrop/, mail-filter/maildrop/files/
commit: 7a9a1e95090d8c20172dbe7f51d267240cde2bd4 Author: Tim Harder gentoo org> AuthorDate: Tue Dec 25 19:18:21 2018 + Commit: Tim Harder gentoo org> CommitDate: Tue Dec 25 19:28:57 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a9a1e95 mail-filter/maildrop: version bump to 3.0.0 Closes: https://bugs.gentoo.org/582928 Closes: https://bugs.gentoo.org/639124 Closes: https://bugs.gentoo.org/657288 Signed-off-by: Tim Harder gentoo.org> mail-filter/maildrop/Manifest | 1 + .../maildrop/files/maildrop-3.0.0-testsuite.patch | 65 ++ mail-filter/maildrop/maildrop-3.0.0.ebuild | 140 + 3 files changed, 206 insertions(+) diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest index 80b622eee8d..1fdcf5a5137 100644 --- a/mail-filter/maildrop/Manifest +++ b/mail-filter/maildrop/Manifest @@ -1,3 +1,4 @@ DIST maildrop-2.8.3.tar.bz2 1992695 BLAKE2B be17fa1ac38f8a54670e40f2b4207c2ee5e8976f20e29c6a528ccf50a716c8b4aedb0546a9722f1147573afd9d43f8a8caa59aec8bf9069ef833226cb2ea0562 SHA512 25168945764eda5c74641e205e3c784ca2ae27c15a5a6ddfe7a1c7b238cd6c3d5b0a3f7ce8b405b578d067f6f2aae5d7d6110da8bc89f91ac1c7fdc224ffd054 DIST maildrop-2.8.5.tar.bz2 2072987 BLAKE2B e067e0ef77f850fd9ce97584893dd5301a7a91fcebea02351da8b22d3d7f0b74f3809cdc3874b29117a62d5c496962f72a5254470cd5f92b787b80d066f1fec1 SHA512 c04120af29ee8e72aeabd211301c5052fe4a2dc0f337074e1fa57b8adb9652512cd744e0bba3894a8b0e3b21a3511bbf4a4f045faec3536edb8be0f8bdc84cf5 DIST maildrop-2.9.0.tar.bz2 2075698 BLAKE2B 2a918214e471a4a54aa7e0412e062ca85ac3ce4757bf4642fb0c0a9776a7c1b1bc417ef426c9bd7767d99b9d783085bf6c67f402ea43b0e7eba10c82d98b5619 SHA512 366a04d1e6e10ef1c824fbb5dfe406ff74fe17b80a46619fd8aa8cde3b4fef9a10b4ed3cc6329ed04632582d58104aaf16134c6dc82e17917b82fb6f18316dd6 +DIST maildrop-3.0.0.tar.bz2 2091018 BLAKE2B 3c8e3ae5c2c2f636b0223e2bafadcb88bf34be63c792a177febac5c41ccd50cab04755f14a26731c38a35531abea1faa70d4af5587a6e68a21735f050f2d46d8 SHA512 1f1e1682ec7c2d0c1f2e71059f186d9a9d3118194b1e558d3a6e5826721fb14a661f4d75df42ce2626430ac072b50e723b563ae00c1ebdeb4da96abfeb534eff diff --git a/mail-filter/maildrop/files/maildrop-3.0.0-testsuite.patch b/mail-filter/maildrop/files/maildrop-3.0.0-testsuite.patch new file mode 100644 index 000..a6aa1626e1b --- /dev/null +++ b/mail-filter/maildrop/files/maildrop-3.0.0-testsuite.patch @@ -0,0 +1,65 @@ +Force en_US locale for certain tests. + +--- maildrop-3.0.0/libs/maildrop/Makefile.am maildrop-3.0.0/libs/maildrop/Makefile.am +@@ -69,9 +69,11 @@ + maildrop.lsm testsuite.txt.idn testsuite2 + + check-am: ++if HAS_EN_US + @chmod +x testsuite + ./testsuite | cmp -s - $(srcdir)/testsuite.txt.idn + @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 +@@ -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 +--- 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.0.ebuild b/mail-filter/maildrop/maildrop-3.0.0.ebuild new file mode 100644 index 000..ede047b099f --- /dev/null +++ b/mail-filter/maildrop/maildrop-3.0.0.ebuild @@ -0,0 +1,140 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit flag-o-matic autotools + +DESCRIPTION="Mail de
[gentoo-commits] repo/gentoo:master commit in: mail-filter/maildrop/, mail-filter/maildrop/files/
commit: 61e7f2fa40106c4af4cfddcc8d9ff9f8a52f95b9 Author: Tony Vroon gentoo org> AuthorDate: Tue Jul 25 22:31:18 2017 + Commit: Tony Vroon gentoo org> CommitDate: Tue Jul 25 22:31:18 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61e7f2fa mail-filter/maildrop: Unbreak testsuite patch, closes bug #617992 by Ooblick. Package-Manager: portage-2.3.6 ...tsuite-r2.patch => maildrop-testsuite-r3.patch} | 28 +++--- mail-filter/maildrop/maildrop-2.8.3.ebuild | 2 +- mail-filter/maildrop/maildrop-2.8.5.ebuild | 2 +- mail-filter/maildrop/maildrop-2.9.0.ebuild | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/mail-filter/maildrop/files/maildrop-testsuite-r2.patch b/mail-filter/maildrop/files/maildrop-testsuite-r3.patch similarity index 57% rename from mail-filter/maildrop/files/maildrop-testsuite-r2.patch rename to mail-filter/maildrop/files/maildrop-testsuite-r3.patch index 479a8f5fcea..fd6d729370a 100644 --- a/mail-filter/maildrop/files/maildrop-testsuite-r2.patch +++ b/mail-filter/maildrop/files/maildrop-testsuite-r3.patch @@ -1,5 +1,6 @@ libs/maildrop/configure.ac 2015-06-27 17:55:08.0 + -+++ libs/maildrop/configure.ac 2015-09-22 05:23:33.0 + +diff -uNr maildrop-2.8.3.ORIG/libs/maildrop/configure.ac maildrop-2.8.3/libs/maildrop/configure.ac +--- maildrop-2.8.3.ORIG/libs/maildrop/configure.ac 2017-07-25 22:49:44.044032091 +0100 maildrop-2.8.3/libs/maildrop/configure.ac 2017-07-25 22:50:48.205113368 +0100 @@ -195,6 +195,15 @@ AC_DEFINE_UNQUOTED(MAXLONGSIZE, $MAXLONGSIZE, [ Maximum character size of a long ]) @@ -16,9 +17,10 @@ dnl Checks for library functions. AC_FUNC_CLOSEDIR_VOID libs/maildrop/Makefile.am 2015-06-27 17:55:08.0 + -+++ libs/maildrop/Makefile.am 2015-09-22 05:24:29.0 + -@@ -75,9 +75,13 @@ +diff -uNr maildrop-2.8.3.ORIG/libs/maildrop/Makefile.am maildrop-2.8.3/libs/maildrop/Makefile.am +--- maildrop-2.8.3.ORIG/libs/maildrop/Makefile.am 2017-07-25 22:49:44.054032259 +0100 maildrop-2.8.3/libs/maildrop/Makefile.am 2017-07-25 22:51:13.335536823 +0100 +@@ -75,9 +75,11 @@ maildrop.lsm testsuite.txt.idn testsuite.txt.noidn testsuite2 check-am: @@ -26,14 +28,13 @@ @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.0 + -+++ libs/rfc2045/configure.ac 2015-09-22 05:28:18.0 + +diff -uNr maildrop-2.8.3.ORIG/libs/rfc2045/configure.ac maildrop-2.8.3/libs/rfc2045/configure.ac +--- maildrop-2.8.3.ORIG/libs/rfc2045/configure.ac 2017-07-25 22:49:44.054032259 +0100 maildrop-2.8.3/libs/rfc2045/configure.ac 2017-07-25 22:50:48.205113368 +0100 @@ -60,6 +60,15 @@ AC_CHECK_FUNC(strncasecmp,,CFLAGS="$CFLAGS -Dstrncasecmp=strnicmp") AC_CHECK_FUNC(strcasecmp,,CFLAGS="$CFLAGS -Dstrcasecmp=stricmp") @@ -50,9 +51,10 @@ AC_ARG_WITH(package, [], package="$withval", [ package="$PACKAGE" libs/rfc2045/Makefile.am 2015-02-28 17:59:41.0 + -+++ libs/rfc2045/Makefile.am 2015-09-22 05:29:08.0 + -@@ -76,6 +76,10 @@ +diff -uNr maildrop-2.8.3.ORIG/libs/rfc2045/Makefile.am maildrop-2.8.3/libs/rfc2045/Makefile.am +--- maildrop-2.8.3.ORIG/libs/rfc2045/Makefile.am 2017-07-25 22:49:44.054032259 +0100 maildrop-2.8.3/libs/rfc2045/Makefile.am2017-07-25 22:51:26.555759572 +0100 +@@ -76,6 +76,8 @@ endif check-am: @@ -60,6 +62,4 @@ @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 index df6a2e2ea4f..eddb63a2c95 100644 --- a/mail-filter/maildrop/maildrop-2.8.3.ebuild +++ b/mail-filter/maildrop/maildrop-2.8.3.ebuild @@ -60,7 +60,7 @@ src_prepare() { 's~AC_MSG_ERROR(Cannot determine default mailbox)~SPOOLDIR="./.maildir"~' \ "${S}"/libs/maildrop/configure.ac || die "sed failed" - epatch "${FILESDIR}"/${PN}-testsuite-r2.patch + epatch "${FILESDIR}"/${PN}-testsuite-r3.patch eautoreconf } diff --git a/mail-filter/maildrop/maildrop-2.8.5.ebuild b/mail-filter/maildrop/maildrop-2.8.5.ebuild index 708cb9ef735..965ee203aed 100644 --- a/mail-filter/maildrop/maildrop-2.8.5.ebuild +++ b/mail-filter/maildrop/maildrop-2.8.5.ebuild @@ -60,7 +60,7 @@ src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: mail-filter/maildrop/, mail-filter/maildrop/files/
commit: d2639702a4386c7b0d8bb19e32f5ad6c740022d5 Author: Eray Aslan gentoo org> AuthorDate: Tue Sep 22 19:02:12 2015 + Commit: Eray Aslan gentoo org> CommitDate: Tue Sep 22 19:02:12 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2639702 mail-filter/maildrop: fix building with -fam USE flag Gentoo-Bug: 561184 Package-Manager: portage-2.2.21 .../maildrop/files/maildrop-disable-fam.patch | 54 ++ mail-filter/maildrop/maildrop-2.8.3.ebuild | 5 +- 2 files changed, 56 insertions(+), 3 deletions(-) diff --git a/mail-filter/maildrop/files/maildrop-disable-fam.patch b/mail-filter/maildrop/files/maildrop-disable-fam.patch new file mode 100644 index 000..fb8a5dd --- /dev/null +++ b/mail-filter/maildrop/files/maildrop-disable-fam.patch @@ -0,0 +1,54 @@ +--- configure.ac 2005-05-12 16:45:57.0 +0200 configure.ac 2005-09-10 20:05:28.0 +0200 +@@ -145,6 +145,7 @@ + --enable-tempdir=.tmpdirectory for temp files (in user's home dir) + --disable-tempdirdisable temp files in home directory (use +the tmpfile function) ++ --disable-famdisable 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 line termination +--- libs/maildir/configure.ac 2005-03-21 13:11:24.0 +0100 libs/maildir/configure.ac 2005-09-10 20:10:55.0 +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/maildrop-2.8.3.ebuild b/mail-filter/maildrop/maildrop-2.8.3.ebuild index afc63ac..34635b8 100644 --- a/mail-filter/maildrop/maildrop-2.8.3.ebuild +++ b/mail-filter/maildrop/maildrop-2.8.3.ebuild @@ -50,18 +50,17 @@ 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 + epatch "${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" + epatch "${FILESDIR}"/${PN}-testsuite-r2.patch eautoreconf }