INSTALL | 2 1 + 1 - 0 !
README | 10 5 + 5 - 0 !
USAGE | 4 2 + 2 - 0 !
ldap/README | 2 1 + 1 - 0 !
lib/Mail/SpamAssassin/Conf.pm | 4 2 + 2 - 0 !
lib/Mail/SpamAssassin/Plugin/Phishing.pm | 8 4 + 4 - 0 !
lib/Mail/SpamAssassin/Plugin/Test.pm | 2 1 + 1 - 0 !
lib/spamassassin-run.pod | 4 2 + 2 - 0 !
rules/init.pre | 2 1 + 1 - 0 !
rules/v310.pre | 2 1 + 1 - 0 !
rules/v312.pre | 2 1 + 1 - 0 !
rules/v320.pre | 2 1 + 1 - 0 !
rules/v330.pre | 2 1 + 1 - 0 !
rules/v340.pre | 2 1 + 1 - 0 !
rules/v341.pre | 2 1 + 1 - 0 !
rules/v342.pre | 2 1 + 1 - 0 !
rules/v343.pre | 2 1 + 1 - 0 !
rules/v400.pre | 2 1 + 1 - 0 !
sa-compile.raw | 4 2 + 2 - 0 !
sa-learn.raw | 2 1 + 1 - 0 !
spamc/spamc.pod | 4 2 + 2 - 0 !
spamd/README | 2 1 + 1 - 0 !
spamd/README.vpopmail | 2 1 + 1 - 0 !
spamd/spamd.raw | 2 1 + 1 - 0 !
sql/README | 2 1 + 1 - 0 !
sql/README.awl | 2 1 + 1 - 0 !
t/data/testplugin.pm | 2 1 + 1 - 0 !
27 files changed, 39 insertions(+), 39 deletions(-)

---

spamc/spamc.pod | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

---

sa-check_spamd.raw | 5 5 + 0 - 0 !
1 file changed, 5 insertions(+)

---

lib/Mail/SpamAssassin/Conf.pm | 2 1 + 1 - 0 !
lib/Mail/SpamAssassin/Plugin/MIMEEval.pm | 34 32 + 2 - 0 !
2 files changed, 33 insertions(+), 3 deletions(-)

---

.gitignore | 50 50 + 0 - 0 !
1 file changed, 50 insertions(+)

---

spamassassin.raw | 22 1 + 21 - 0 !
1 file changed, 1 insertion(+), 21 deletions(-)

 update site-specific configuration path in man page
 In Debian, there is exactly one site-specific configuration directory, and it
 is known in advance.  So we can safely remove the list of possible paths from
 the man page in order to avoid confusion.

t/config_tree_recurse.t | 4 3 + 1 - 0 !
1 file changed, 3 insertions(+), 1 deletion(-)

 skip config_tree_recurse test

 The default behavior of File::Find will automatically untaint directories with
 "safe" names.  The '~' (tilde) character is not considered a safe name.
 Because Debian source package names use '~' to denote pre-release versions, the
 test will fail with a message similar to the following:
 .
 t/config_tree_recurse.t ........... _get_cf_pre_files_in_dir error: directory /home/admin/spamassassin-3.4.3~rc6+1/t/log/localrules.tmp is still tainted at /usr/share/perl/5.30/File/Find.pm line 558. at ../lib/Mail/SpamAssassin.pm line 2096.
 .
 The solution to this is either to modify lib/Mail/SpamAssassin.pm to consider
 '~' a safe character, or skip the test altogether.  Because the former would
 impact all installations, and the latter is limited to test coverage, we will
 skip the test.

lib/Mail/SpamAssassin/Util.pm | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

---

t/SATest.pm | 6 6 + 0 - 0 !
1 file changed, 6 insertions(+)

 add some debug output to tests
 Tests are failing on Debian buildd hosts with IPv6-only network configuration.
 However, I've been unable to reproduce this outside the buildd environment.
 Adding some debugging output to try to collect more details.
 .
 This patch can be dropped when the sitution is resolved.

spamd/spamd.raw | 22 15 + 7 - 0 !
1 file changed, 15 insertions(+), 7 deletions(-)

 disable ai_addrconfig when passing ipv4 literals to getaddrinfo
 AI_ADDRCONFIG skips the loopback interface, but if it's the only one with IPv4
 addresses configured, then it won't be returned by getaddrinfo and spamd won't
 end up listening anywhere.
 .