Package: spamassassin
Version: 3.3.2-8
Severity: normal
Tags: upstream patch

The xxx TLD is not included in the current set in spamassassin 3.3.2,
additionally, xxx is used as a "fake" TLD in the URI tests and since it's not
fake anymore, URI tests will fail on that TLD.

The attached patch that we've included in the Ubuntu package is from the
upstream change.

Scott K
Re-add missing xxx domain that somehow fell out of the list upstream.
https://issues.apache.org/SpamAssassin/show_bug.cgi?id=4385
Thanks to Julian Mehnle for the patch
Updated Feb 14 2014 to include uri_text.t fix from upstream.

Index: spamassassin-3.3.2/lib/Mail/SpamAssassin/Util/RegistrarBoundaries.pm
===================================================================
--- spamassassin-3.3.2.orig/lib/Mail/SpamAssassin/Util/RegistrarBoundaries.pm	2011-06-06 19:59:16.000000000 -0400
+++ spamassassin-3.3.2/lib/Mail/SpamAssassin/Util/RegistrarBoundaries.pm	2014-02-13 12:35:34.000000000 -0500
@@ -58,7 +58,7 @@
   nf ng ni nl no np nr nu nz om org pa pe pf pg ph pk pl pn pr pro ps
   pt pw py qa re ro rs ru rw sa sb sc sd se sg sh si sk sl sm sn
   sr st su sv sy sz tc td tel tf tg th tj tk tl tm tn to tp tr travel tt
-  tv tw tz ua ug uk us uy uz va vc ve vg vi vn vu wf ws ye za
+  tv tw tz ua ug uk us uy uz va vc ve vg vi vn vu wf ws xxx ye za
   zm zw
   /) { 
   $VALID_TLDS{$_} = 1;
Index: spamassassin-3.3.2/t/uri_text.t
===================================================================
--- spamassassin-3.3.2.orig/t/uri_text.t	2011-06-06 19:59:19.000000000 -0400
+++ spamassassin-3.3.2/t/uri_text.t	2014-02-13 12:38:06.276143072 -0500
@@ -290,7 +290,7 @@
 
 # first confirm that it will not match on not a TLD
 example.foo	!^http://example.foo$
-example.xxx	!^http://example.xxx$
+example.zzf	!^http://example.zzf$
 
 example.ac	^http://example.ac$
 example.ad	^http://example.ad$
@@ -566,7 +566,7 @@
 # with www. prefix tests a different table of TLDs
 
 www.example.foo	!^http://www.example.foo$
-www.example.xxx	!^http://www.example.xxx$
+www.example.zzf	!^http://www.example.zzf$
 
 www.example.ac	^http://www.example.ac$
 www.example.ad	^http://www.example.ad$

Reply via email to