diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2008-04-28 13:30:57 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2008-04-28 13:30:57 +0000 |
| commit | 1066f56582a3b1cecb8c77c603d92f14c068ee18 (patch) | |
| tree | 4f5bb8508b49e069c174c60b0c7bbdb748228a91 /mail | |
| parent | Add some doc (diff) | |
Fix spamd integration with vpopmail virtual users.
Approved by: maintainer
Notes
Notes:
svn path=/head/; revision=212167
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/p5-Mail-SpamAssassin/Makefile | 4 | ||||
| -rw-r--r-- | mail/p5-Mail-SpamAssassin/files/patch-spamd_spamd.raw | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile index 97ec7cde5e8d..b266e50b896c 100644 --- a/mail/p5-Mail-SpamAssassin/Makefile +++ b/mail/p5-Mail-SpamAssassin/Makefile @@ -7,7 +7,7 @@ PORTNAME= Mail-SpamAssassin PORTVERSION= 3.2.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail perl5 MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/} MASTER_SITE_SUBDIR= spamassassin/source/:apache Mail/:cpan @@ -99,7 +99,7 @@ RUN_DEPENDS+= razor-agents>=2.84:${PORTSDIR}/mail/razor-agents .endif .if defined(WITH_DKIM) -RUN_DEPENDS+= p5-Mail-DKIM>=.20:${PORTSDIR}/mail/p5-Mail-DKIM +RUN_DEPENDS+= p5-Mail-DKIM>=0.31:${PORTSDIR}/mail/p5-Mail-DKIM RUN_DEPENDS+= ${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL RUN_DEPENDS+= p5-Crypt-OpenSSL-RSA>=0.24:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA .endif diff --git a/mail/p5-Mail-SpamAssassin/files/patch-spamd_spamd.raw b/mail/p5-Mail-SpamAssassin/files/patch-spamd_spamd.raw new file mode 100644 index 000000000000..414efc7b2141 --- /dev/null +++ b/mail/p5-Mail-SpamAssassin/files/patch-spamd_spamd.raw @@ -0,0 +1,11 @@ +--- spamd/spamd.raw.orig 2008-04-24 09:50:46.000000000 +0200 ++++ spamd/spamd.raw 2008-04-24 09:52:55.000000000 +0200 +@@ -2075,7 +2075,7 @@ + if ( $opt{'user-config'} ) { + my $prefsfrom = $username; # the one passed, NOT $opt{username} + +- if ($prefsfrom eq $suidto) { ++ if ($prefsfrom eq $suidto || $opt{'vpopmail'}) { + $userdir = $suiddir; # reuse the already-looked-up info + } else { + $userdir = (getpwnam($prefsfrom))[7]; |