diff options
author | Tobias Scherbaum <dertobi123@gentoo.org> | 2008-06-15 10:22:21 +0000 |
---|---|---|
committer | Tobias Scherbaum <dertobi123@gentoo.org> | 2008-06-15 10:22:21 +0000 |
commit | 4f88f863cf213af8e9d98e28273bac30d74467d6 (patch) | |
tree | 7f7cdfc07d989d1439af75a17546e2c03bc4f7ea /mail-filter | |
parent | Bug #226505 - For compatibility with phase execution order in (diff) | |
download | historical-4f88f863cf213af8e9d98e28273bac30d74467d6.tar.gz historical-4f88f863cf213af8e9d98e28273bac30d74467d6.tar.bz2 historical-4f88f863cf213af8e9d98e28273bac30d74467d6.zip |
fix lockfile perms (#121221), fix locking issues w/ NFS (#156493), fix memory allocation when piping mail through a filter (#200006), unset MAILSPOOLHOME (#108869)
Package-Manager: portage-2.1.5.5
Diffstat (limited to 'mail-filter')
-rw-r--r-- | mail-filter/procmail/ChangeLog | 13 | ||||
-rw-r--r-- | mail-filter/procmail/Manifest | 5 | ||||
-rw-r--r-- | mail-filter/procmail/files/gentoo-maildir3.diff | 12 | ||||
-rw-r--r-- | mail-filter/procmail/files/procmail-pipealloc.diff | 21 | ||||
-rw-r--r-- | mail-filter/procmail/procmail-3.22-r9.ebuild | 85 |
5 files changed, 133 insertions, 3 deletions
diff --git a/mail-filter/procmail/ChangeLog b/mail-filter/procmail/ChangeLog index 471ae9a031c0..b69655aea6ac 100644 --- a/mail-filter/procmail/ChangeLog +++ b/mail-filter/procmail/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for mail-filter/procmail -# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/procmail/ChangeLog,v 1.28 2007/02/22 01:00:33 peper Exp $ +# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/mail-filter/procmail/ChangeLog,v 1.29 2008/06/15 10:22:20 dertobi123 Exp $ + +*procmail-3.22-r9 (15 Jun 2008) + + 15 Jun 2008; Tobias Scherbaum <dertobi123@gentoo.org> + +files/gentoo-maildir3.diff, +files/procmail-pipealloc.diff, + +procmail-3.22-r9.ebuild: + fix lockfile perms (#121221), fix locking issues w/ NFS (#156493), fix + memory allocation when piping mail through a filter (#200006), unset + MAILSPOOLHOME (#108869) 22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog: Transition to Manifest2. diff --git a/mail-filter/procmail/Manifest b/mail-filter/procmail/Manifest index c48269c5d763..eb87d283554f 100644 --- a/mail-filter/procmail/Manifest +++ b/mail-filter/procmail/Manifest @@ -1,9 +1,12 @@ AUX gentoo-maildir2.diff 797 RMD160 3bba3a5e93b754dbd90fd74506731ef1957e7083 SHA1 131f6ce4806b5bbd88b43eeb013e572de70945a0 SHA256 80ebd16b7fec85a231d40066a3d112141c5000954f878cb6789c30872681af8c +AUX gentoo-maildir3.diff 461 RMD160 8cf4b6139b178e415402eff34923207a937d657d SHA1 3b0df435f8215d49585883f1eac382e615a17197 SHA256 b4cf36c3b5c9f73ca1877e1c424f5e7100908ba6997410c68a945d5d2fb65a3e AUX procmail-comsat-segfault.diff 822 RMD160 13049da7c6ee55a42ff197a14ba3cc65899f4051 SHA1 975b9d87ef5071c37f737663fe99bf567337077d SHA256 16a8c19b44b2f0eba0afd276d8b8af255efa31385c88942e4a1b251556afc23f AUX procmail-lazy-bindings.diff 622 RMD160 3ced5004cabd094d0efe99c219f636bfea543e16 SHA1 f195f26d0a546c077b62d2f11e667eeceb009932 SHA256 756beda1e188ca3e4eab2d6c57180226e4e6953f6a51b370b7e9652c8104e380 AUX procmail-maxprocs-fix.diff 465 RMD160 edfd9d379cbdf95692c5fa152fc18e32b3b2d555 SHA1 be4704c5ade711615af53cf0e251905c7b33579a SHA256 08c2a210d6936a63f29d93f2c57daa92740fb011d916ddcbba16475f03ed2d2b +AUX procmail-pipealloc.diff 825 RMD160 3334414d128d2eb0358a55caa06ad37570e052ba SHA1 87e6cb76f6c091d3a5afc528e31d18a3e9e73bd7 SHA256 bc2c755c287252d252fb46a60a86850074ca1020d4f0d0d272615c89db11d4ba DIST procmail-3.22.tar.gz 226817 RMD160 e609ec94ea9ab3b93629c62b3e29add497806483 SHA1 cd4e44c15559816453fd60349e5a32289f6f2965 SHA256 087c75b34dd33d8b9df5afe9e42801c9395f4bf373a784d9bc97153b0062e117 EBUILD procmail-3.22-r7.ebuild 1869 RMD160 97598553d4ff1755d394b456aad54c95fe1006f8 SHA1 8204f50d7e57cbf5ec1e323c51a74e39d4fa21e0 SHA256 f78938982e83e63c4b9b7c6171ef7cd6b3c06dc1b279466a46815b2bfd327abf EBUILD procmail-3.22-r8.ebuild 1973 RMD160 e5228239c247905743c8178b3e8bfd320810149b SHA1 8adcc0e4b7f33fa8f9b403a619518c5ebb41f01a SHA256 97ea65368073dd2924abcb7db4b89b98721f59f0a9c0f1375152eeeb46fb8812 -MISC ChangeLog 7626 RMD160 c02d1f4eb8cdc45ffc8ca695e3d69a48abc211cb SHA1 1a2db6cb875397a3f3b51c4ea3932cc11be13c49 SHA256 da001ff09d73d6ed5790c0ca8f86fcc4cace80c38aa72040d3dce68bdb172d63 +EBUILD procmail-3.22-r9.ebuild 2343 RMD160 c5f6764d15838606ad1ee49fca8fc5dd0c0def0d SHA1 377c0c4f529556c20dc6f8149785636d3284ba15 SHA256 b69362c9570516cb4d80a903b52a624edb2106fa10657bbf5734a5ebc502c11c +MISC ChangeLog 7982 RMD160 c152dece1a7071bde6112bc8393804b7e8991389 SHA1 278392d4100e510627bdce0d1dcb45946167d849 SHA256 8e952c546d29648691f177d7612bed15a1c3f669bbe8bc1042fda5c2518b3e99 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 diff --git a/mail-filter/procmail/files/gentoo-maildir3.diff b/mail-filter/procmail/files/gentoo-maildir3.diff new file mode 100644 index 000000000000..51dfef64ae8b --- /dev/null +++ b/mail-filter/procmail/files/gentoo-maildir3.diff @@ -0,0 +1,12 @@ +--- procmail-3.22/src/authenticate.c.orig 2002-07-26 20:38:52.000000000 -0400 ++++ procmail-3.22/src/authenticate.c 2002-07-26 20:57:56.000000000 -0400 +@@ -39,7 +39,7 @@ + #include "authenticate.h" + + #ifndef MAILSPOOLDIR +-#define MAILSPOOLDIR "/var/spool/mail/" /* watch the trailing / */ ++#define MAILSPOOLDIR "" /* watch the trailing / */ + #endif + #ifndef MAILSPOOLSUFFIX + #define MAILSPOOLSUFFIX "" /* suffix to force maildir or MH style */ + diff --git a/mail-filter/procmail/files/procmail-pipealloc.diff b/mail-filter/procmail/files/procmail-pipealloc.diff new file mode 100644 index 000000000000..fdd5cc97328a --- /dev/null +++ b/mail-filter/procmail/files/procmail-pipealloc.diff @@ -0,0 +1,21 @@ +diff -rc procmail-3.22/src/pipes.c procmail-3.22-fixed/src/pipes.c +*** procmail-3.22/src/pipes.c Tue Sep 11 00:58:44 2001 +--- procmail-3.22-fixed/src/pipes.c Wed Nov 21 23:53:39 2007 +*************** +*** 194,200 **** + makeblock(&temp,Stdfilled); + tmemmove(temp.p,Stdout,Stdfilled); + readdyn(&temp,&Stdfilled,Stdfilled+backlen+1); +! Stdout=realloc(Stdout,&Stdfilled+1); + tmemmove(Stdout,temp.p,Stdfilled+1); + freeblock(&temp); + retStdout(Stdout,pwait&&pipw,!backblock); +--- 194,200 ---- + makeblock(&temp,Stdfilled); + tmemmove(temp.p,Stdout,Stdfilled); + readdyn(&temp,&Stdfilled,Stdfilled+backlen+1); +! Stdout=realloc(Stdout,Stdfilled+1); + tmemmove(Stdout,temp.p,Stdfilled+1); + freeblock(&temp); + retStdout(Stdout,pwait&&pipw,!backblock); + diff --git a/mail-filter/procmail/procmail-3.22-r9.ebuild b/mail-filter/procmail/procmail-3.22-r9.ebuild new file mode 100644 index 000000000000..0721d92fbfc6 --- /dev/null +++ b/mail-filter/procmail/procmail-3.22-r9.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-filter/procmail/procmail-3.22-r9.ebuild,v 1.1 2008/06/15 10:22:20 dertobi123 Exp $ + +inherit eutils flag-o-matic + +DESCRIPTION="Mail delivery agent/filter" +HOMEPAGE="http://www.procmail.org/" +SRC_URI="http://www.procmail.org/${P}.tar.gz" + +LICENSE="|| ( Artistic GPL-2 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="mbox selinux" + +DEPEND="virtual/libc virtual/mta" +RDEPEND="virtual/libc + selinux? ( sec-policy/selinux-procmail )" +PROVIDE="virtual/mda" + +src_compile() { + # -finline-functions (implied by -O3) leaves strstr() in an infinite loop. + # To work around this, we append -fno-inline-functions to CFLAGS + append-flags -fno-inline-functions + + sed -e "s:CFLAGS0 = -O:CFLAGS0 = ${CFLAGS}:" \ + -e "s:LOCKINGTEST=__defaults__:#LOCKINGTEST=__defaults__:" \ + -e "s:#LOCKINGTEST=/tmp:LOCKINGTEST=/tmp:" \ + -i Makefile || die "sed failed" + + # disable flock, using both fcntl and flock style locking + # doesn't work with NFS with 2.6.17+ kernels, bug #156493 + + sed -e "s:/\*#define NO_flock_LOCK:#define NO_flock_LOCK:" \ + -i config.h || die "sed failed" + + if ! use mbox ; then + echo "# Use maildir-style mailbox in user's home directory" > "${S}"/procmailrc + echo 'DEFAULT=$HOME/.maildir/' >> "${S}"/procmailrc + cd "${S}" + epatch "${FILESDIR}/gentoo-maildir3.diff" + else + echo '# Use mbox-style mailbox in /var/spool/mail' > "${S}"/procmailrc + echo 'DEFAULT=/var/spool/mail/$LOGNAME' >> "${S}"/procmailrc + fi + + # Do not use lazy bindings on lockfile and procmail + epatch "${FILESDIR}/${PN}-lazy-bindings.diff" + + # Fix for bug #102340 + epatch "${FILESDIR}/${PN}-comsat-segfault.diff" + + # Fix for bug #119890 + epatch "${FILESDIR}/${PN}-maxprocs-fix.diff" + + # Fix for bug #200006 + epatch "${FILESDIR}/${PN}-pipealloc.diff" + + emake || die +} + +src_install() { + cd "${S}"/new + insinto /usr/bin + insopts -m 6755 + doins procmail || die + + doins lockfile || die + fowners root:mail /usr/bin/lockfile + fperms 2775 /usr/bin/lockfile + + dobin formail mailstat || die + insopts -m 0644 + + doman *.1 *.5 + + cd "${S}" + dodoc Artistic FAQ FEATURES HISTORY INSTALL KNOWN_BUGS README + + insinto /etc + doins procmailrc || die + + docinto examples + dodoc examples/* +} |