aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorale <ale@FreeBSD.org>2008-04-28 21:30:57 +0800
committerale <ale@FreeBSD.org>2008-04-28 21:30:57 +0800
commit67862ddc560c6c304f909f39c2ff3e099da66d11 (patch)
tree0b48e7b7196330d573515176406f2286d940ea9f
parent637487058459f66f0ce46d66db1c5ebbc60596fe (diff)
downloadfreebsd-ports-gnome-67862ddc560c6c304f909f39c2ff3e099da66d11.tar.gz
freebsd-ports-gnome-67862ddc560c6c304f909f39c2ff3e099da66d11.tar.zst
freebsd-ports-gnome-67862ddc560c6c304f909f39c2ff3e099da66d11.zip
Fix spamd integration with vpopmail virtual users.
Approved by: maintainer
-rw-r--r--mail/p5-Mail-SpamAssassin/Makefile4
-rw-r--r--mail/p5-Mail-SpamAssassin/files/patch-spamd_spamd.raw11
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];