- Sync with lastes p5-Mail-SpamAssassin
PR: 124034 Submitted by: TAOKA Fumiyoshi <fmysh@iijmio-mail.jp> (maintainer)
This commit is contained in:
parent
14b8435765
commit
2f087c2573
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=213933
@ -7,7 +7,7 @@
|
||||
|
||||
PORTNAME= Mail-SpamAssassin
|
||||
PORTVERSION= 3.2.4
|
||||
PORTREVISION= 3
|
||||
PORTREVISION= 4
|
||||
CATEGORIES= japanese mail perl5
|
||||
MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/} \
|
||||
${PATCH_SITES}
|
||||
@ -37,12 +37,14 @@ BUILD_DEPENDS= p5-Net-DNS>=0.63:${PORTSDIR}/dns/p5-Net-DNS \
|
||||
RUN_DEPENDS= ${BUILD_DEPENDS} \
|
||||
${SITE_PERL}/Bundle/LWP.pm:${PORTSDIR}/www/p5-libwww \
|
||||
p5-Archive-Tar>=1.23:${PORTSDIR}/archivers/p5-Archive-Tar \
|
||||
${SITE_PERL}/mach/Encode/Detect.pm:${PORTSDIR}/converters/p5-Encode-Detect
|
||||
${SITE_PERL}/mach/Encode/Detect.pm:${PORTSDIR}/converters/p5-Encode-Detect \
|
||||
${SITE_PERL}/mach/Text/MeCab.pm:${PORTSDIR}/japanese/p5-Text-MeCab
|
||||
|
||||
CONFLICTS= p5-Mail-SpamAssassin-[0-9]*
|
||||
|
||||
PERL_CONFIGURE= yes
|
||||
USE_LDCONFIG= yes
|
||||
MAKE_ENV+= CC="${CC}"
|
||||
CONFIGURE_ARGS= SYSCONFDIR="${PREFIX}/etc" \
|
||||
CONTACT_ADDRESS="${CONTACT_ADDRESS}" \
|
||||
LOCALSTATEDIR="/var/db/spamassassin"
|
||||
@ -107,7 +109,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
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- rules/local.cf.orig Sat Dec 30 07:18:59 2006
|
||||
+++ rules/local.cf Sat Dec 30 07:20:48 2006
|
||||
@@ -51,3 +51,7 @@
|
||||
--- rules/local.cf.orig 2008-01-06 06:11:39.000000000 +0900
|
||||
+++ rules/local.cf 2008-05-27 22:07:58.000000000 +0900
|
||||
@@ -51,3 +51,12 @@
|
||||
# bayes_ignore_header X-Spam-Flag
|
||||
# bayes_ignore_header X-Spam-Status
|
||||
|
||||
@ -8,3 +8,8 @@
|
||||
+# Normalize charset to UTF-8 (default:0)
|
||||
+#
|
||||
+# normalize_charset 1
|
||||
+#
|
||||
+# score FROM_EXCESS_BASE64 0
|
||||
+# score SUBJ_ILLEGAL_CHARS 0
|
||||
+# score MIME_BASE64_TEXT 1.0
|
||||
+# score TVD_SPACE_RATIO 0
|
||||
|
11
japanese/p5-Mail-SpamAssassin/files/patch-spamd_spamd.raw
Normal file
11
japanese/p5-Mail-SpamAssassin/files/patch-spamd_spamd.raw
Normal file
@ -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];
|
Loading…
Reference in New Issue
Block a user