2 files changed, 19 insertions, 3 deletions

diff --git a/japanese/p5-Mail-SpamAssassin/files/patch-rules-local.cf b/japanese/p5-Mail-SpamAssassin/files/patch-rules-local.cf
index 7490415eb8c1..29979a03ee9f 100644
--- a/japanese/p5-Mail-SpamAssassin/files/patch-rules-local.cf
+++ b/japanese/p5-Mail-SpamAssassin/files/patch-rules-local.cf
@@ -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
diff --git a/japanese/p5-Mail-SpamAssassin/files/patch-spamd_spamd.raw b/japanese/p5-Mail-SpamAssassin/files/patch-spamd_spamd.raw
new file mode 100644
index 000000000000..414efc7b2141
--- /dev/null
+++ b/japanese/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];