You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jq...@apache.org on 2015/09/02 15:30:55 UTC
svn commit: r1700812 - in /spamassassin/trunk: rules/20_aux_tlds.cf
t/uri_text.t
Author: jquinn
Date: Wed Sep 2 13:30:55 2015
New Revision: 1700812
URL: http://svn.apache.org/r1700812
Log:
Latest version of TLDs, and updated unit tests for removal of .an ccTLD
Modified:
spamassassin/trunk/rules/20_aux_tlds.cf
spamassassin/trunk/t/uri_text.t
Modified: spamassassin/trunk/rules/20_aux_tlds.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_aux_tlds.cf?rev=1700812&r1=1700811&r2=1700812&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_aux_tlds.cf (original)
+++ spamassassin/trunk/rules/20_aux_tlds.cf Wed Sep 2 13:30:55 2015
@@ -76,64 +76,76 @@ endif
# For an up to date list of TLDs that can be pasted into this block, run this command:
# wget http://data.iana.org/TLD/tlds-alpha-by-domain.txt -O - | tail -n+2 | grep -vi 'xn--' | tr '\n' ' ' | fold -w 80 -s | perl -e 's/^/util_rb_tld / && print lc while <>' && echo
-util_rb_tld abbott abogado ac academy accountant accountants active actor ad ads adult ae
-util_rb_tld aero af afl ag agency ai airforce al allfinanz alsace am amsterdam an android
-util_rb_tld ao apartments aq aquarelle ar archi army arpa as asia associates at attorney au
-util_rb_tld auction audio autos aw ax axa az ba band bank bar barclaycard barclays bargains
-util_rb_tld bauhaus bayern bb bbc bd be beer berlin best bf bg bh bi bid bike bingo bio biz
-util_rb_tld bj black blackfriday bloomberg blue bm bmw bn bnpparibas bo boats bond boo
-util_rb_tld boutique br brussels bs bt budapest build builders business buzz bv bw by bz
-util_rb_tld bzh ca cab cafe cal camera camp cancerresearch canon capetown capital caravan
-util_rb_tld cards care career careers cartier casa cash casino cat catering cbn cc cd
-util_rb_tld center ceo cern cf cfd cg ch channel chat cheap chloe christmas chrome church
-util_rb_tld ci citic city ck cl claims cleaning click clinic clothing club cm cn co coach
-util_rb_tld codes coffee college cologne com community company computer condos construction
-util_rb_tld consulting contractors cooking cool coop country courses cr credit creditcard
-util_rb_tld cricket crs cruises cu cuisinella cv cw cx cy cymru cyou cz dabur dad dance
-util_rb_tld date dating datsun day dclk de deals degree delivery democrat dental dentist
-util_rb_tld desi design dev diamonds diet digital direct directory discount dj dk dm dnp do
-util_rb_tld docs doha domains doosan download durban dvag dz eat ec edu education ee eg
-util_rb_tld email emerck energy engineer engineering enterprises epson equipment er erni es
-util_rb_tld esq estate et eu eurovision eus events everbank exchange expert exposed express
-util_rb_tld fail faith fan fans farm fashion feedback fi film finance financial firmdale
-util_rb_tld fish fishing fit fitness fj fk flights florist flowers flsmidth fly fm fo foo
-util_rb_tld football forex forsale foundation fr frl frogans fund furniture futbol ga gal
-util_rb_tld gallery garden gb gbiz gd gdn ge gent gf gg ggee gh gi gift gifts gives gl
-util_rb_tld glass gle global globo gm gmail gmo gmx gn gold goldpoint golf goo goog google
-util_rb_tld gop gov gp gq gr graphics gratis green gripe gs gt gu guge guide guitars guru
-util_rb_tld gw gy hamburg hangout haus healthcare help here hermes hiphop hiv hk hm hn
-util_rb_tld holdings holiday homes horse host hosting house how hr ht hu ibm id ie ifm il
-util_rb_tld im immo immobilien in industries infiniti info ing ink institute insure int
-util_rb_tld international investments io iq ir irish is it iwc java jcb je jetzt jm jo jobs
-util_rb_tld joburg jp juegos kaufen kddi ke kg kh ki kim kitchen kiwi km kn koeln komatsu
-util_rb_tld kp kr krd kred kw ky kyoto kz la lacaixa land lat latrobe lawyer lb lc lds
-util_rb_tld lease leclerc legal lgbt li lidl life lighting limited limo link lk loan loans
-util_rb_tld london lotte lotto love lr ls lt ltda lu luxe luxury lv ly ma madrid maif
-util_rb_tld maison management mango market marketing markets marriott mc md me media meet
-util_rb_tld melbourne meme memorial menu mg mh miami mil mini mk ml mm mma mn mo mobi moda
-util_rb_tld moe monash money mormon mortgage moscow motorcycles mov movie mp mq mr ms mt
-util_rb_tld mtn mtpc mu museum mv mw mx my mz na nagoya name navy nc ne net network neustar
-util_rb_tld new news nexus nf ng ngo nhk ni nico ninja nissan nl no np nr nra nrw ntt nu
-util_rb_tld nyc nz okinawa om one ong onl online ooo oracle org organic osaka otsuka ovh pa
-util_rb_tld page panerai paris partners parts party pe pf pg ph pharmacy photo photography
-util_rb_tld photos physio piaget pics pictet pictures pink pizza pk pl place plumbing plus
-util_rb_tld pm pn pohl poker porn post pr praxi press pro prod productions prof properties
-util_rb_tld property ps pt pub pw py qa qpon quebec racing re realtor recipes red redstone
-util_rb_tld rehab reise reisen reit ren rentals repair report republican rest restaurant
-util_rb_tld review reviews rich rio rip ro rocks rodeo rs rsvp ru ruhr rw ryukyu sa
-util_rb_tld saarland sale samsung sap sarl saxo sb sc sca scb schmidt scholarships school
-util_rb_tld schule schwarz science scot sd se services sew sexy sg sh shiksha shoes shriram
-util_rb_tld si singles site sj sk sky sl sm sn so social software sohu solar solutions soy
-util_rb_tld space spiegel spreadbetting sr st study style su sucks supplies supply support
-util_rb_tld surf surgery suzuki sv sx sy sydney systems sz taipei tatar tattoo tax tc td
-util_rb_tld tech technology tel temasek tennis tf tg th tickets tienda tips tires tirol tj
-util_rb_tld tk tl tm tn to today tokyo tools top toshiba tours town toys tr trade trading
-util_rb_tld training travel trust tt tui tv tw tz ua ug uk university uno uol us uy uz va
-util_rb_tld vacations vc ve vegas ventures versicherung vet vg vi viajes video villas
-util_rb_tld vision vlaanderen vn vodka vote voting voto voyage vu wales wang watch webcam
-util_rb_tld website wed wedding wf whoswho wien wiki williamhill win wme work works world
-util_rb_tld ws wtc wtf xin xxx xyz yachts yandex ye yodobashi yoga yokohama youtube yt za
-util_rb_tld zip zm zone zuerich zw
+util_rb_tld aaa abb abbott abogado ac academy accenture accountant accountants aco active
+util_rb_tld actor ad ads adult ae aeg aero af afl ag agency ai aig airforce airtel al
+util_rb_tld allfinanz alsace am amica amsterdam android ao apartments app aq aquarelle ar
+util_rb_tld archi army arpa as asia associates at attorney au auction audio auto autos aw
+util_rb_tld ax axa az azure ba band bank bar barcelona barclaycard barclays bargains
+util_rb_tld bauhaus bayern bb bbc bbva bcn bd be beer bentley berlin best bet bf bg bh
+util_rb_tld bharti bi bible bid bike bing bingo bio biz bj black blackfriday bloomberg blue
+util_rb_tld bm bmw bn bnl bnpparibas bo boats bond boo boots boutique br bradesco
+util_rb_tld bridgestone broker brother brussels bs bt budapest build builders business buzz
+util_rb_tld bv bw by bz bzh ca cab cafe cal camera camp cancerresearch canon capetown
+util_rb_tld capital caravan cards care career careers cars cartier casa cash casino cat
+util_rb_tld catering cba cbn cc cd ceb center ceo cern cf cfa cfd cg ch chanel channel chat
+util_rb_tld cheap chloe christmas chrome church ci cisco citic city ck cl claims cleaning
+util_rb_tld click clinic clothing cloud club cm cn co coach codes coffee college cologne
+util_rb_tld com commbank community company computer condos construction consulting
+util_rb_tld contractors cooking cool coop corsica country coupons courses cr credit
+util_rb_tld creditcard cricket crown crs cruises cu cuisinella cv cw cx cy cymru cyou cz
+util_rb_tld dabur dad dance date dating datsun day dclk de deals degree delivery delta
+util_rb_tld democrat dental dentist desi design dev diamonds diet digital direct directory
+util_rb_tld discount dj dk dm dnp do docs dog doha domains doosan download drive durban
+util_rb_tld dvag dz earth eat ec edu education ee eg email emerck energy engineer
+util_rb_tld engineering enterprises epson equipment er erni es esq estate et eu eurovision
+util_rb_tld eus events everbank exchange expert exposed express fage fail faith family fan
+util_rb_tld fans farm fashion feedback fi film finance financial firmdale fish fishing fit
+util_rb_tld fitness fj fk flights florist flowers flsmidth fly fm fo foo football forex
+util_rb_tld forsale forum foundation fr frl frogans fund furniture futbol fyi ga gal
+util_rb_tld gallery game garden gb gbiz gd gdn ge gea gent genting gf gg ggee gh gi gift
+util_rb_tld gifts gives giving gl glass gle global globo gm gmail gmo gmx gn gold goldpoint
+util_rb_tld golf goo goog google gop gov gp gq gr graphics gratis green gripe group gs gt
+util_rb_tld gu guge guide guitars guru gw gy hamburg hangout haus healthcare help here
+util_rb_tld hermes hiphop hitachi hiv hk hm hn hockey holdings holiday homedepot homes
+util_rb_tld honda horse host hosting hoteles hotmail house how hr hsbc ht hu ibm icbc ice
+util_rb_tld icu id ie ifm iinet il im immo immobilien in industries infiniti info ing ink
+util_rb_tld institute insure int international investments io ipiranga iq ir irish is ist
+util_rb_tld istanbul it itau iwc java jcb je jetzt jewelry jlc jll jm jo jobs joburg jp
+util_rb_tld jprs juegos kaufen kddi ke kg kh ki kim kitchen kiwi km kn koeln komatsu kp kr
+util_rb_tld krd kred kw ky kyoto kz la lacaixa lancaster land lasalle lat latrobe law
+util_rb_tld lawyer lb lc lds lease leclerc legal lexus lgbt li liaison lidl life lighting
+util_rb_tld limited limo link live lixil lk loan loans lol london lotte lotto love lr ls lt
+util_rb_tld ltda lu lupin luxe luxury lv ly ma madrid maif maison man management mango
+util_rb_tld market marketing markets marriott mba mc md me media meet melbourne meme
+util_rb_tld memorial men menu mg mh miami microsoft mil mini mk ml mm mma mn mo mobi moda
+util_rb_tld moe mom monash money montblanc mormon mortgage moscow motorcycles mov movie
+util_rb_tld movistar mp mq mr ms mt mtn mtpc mu museum mv mw mx my mz na nadex nagoya name
+util_rb_tld navy nc ne nec net netbank network neustar new news nexus nf ng ngo nhk ni nico
+util_rb_tld ninja nissan nl no nokia np nr nra nrw ntt nu nyc nz office okinawa om omega
+util_rb_tld one ong onl online ooo oracle orange org organic osaka otsuka ovh pa page
+util_rb_tld panerai paris partners parts party pe pet pf pg ph pharmacy philips photo
+util_rb_tld photography photos physio piaget pics pictet pictures pink pizza pk pl place
+util_rb_tld play plumbing plus pm pn pohl poker porn post pr praxi press pro prod
+util_rb_tld productions prof properties property ps pt pub pw py qa qpon quebec racing re
+util_rb_tld realtor realty recipes red redstone rehab reise reisen reit ren rent rentals
+util_rb_tld repair report republican rest restaurant review reviews rich ricoh rio rip ro
+util_rb_tld rocks rodeo rs rsvp ru ruhr run rw ryukyu sa saarland sakura sale samsung
+util_rb_tld sandvik sandvikcoromant sanofi sap sarl saxo sb sc sca scb schmidt scholarships
+util_rb_tld school schule schwarz science scor scot sd se seat seek sener services sew sex
+util_rb_tld sexy sg sh shiksha shoes show shriram si singles site sj sk ski sky skype sl sm
+util_rb_tld sn sncf so soccer social software sohu solar solutions sony soy space spiegel
+util_rb_tld spreadbetting sr srl st starhub statoil stc stcgroup studio study style su
+util_rb_tld sucks supplies supply support surf surgery suzuki sv swatch swiss sx sy sydney
+util_rb_tld systems sz taipei tatamotors tatar tattoo tax taxi tc td team tech technology
+util_rb_tld tel telefonica temasek tennis tf tg th thd theater tickets tienda tips tires
+util_rb_tld tirol tj tk tl tm tn to today tokyo tools top toray toshiba tours town toyota
+util_rb_tld toys tr trade trading training travel trust tt tui tv tw tz ua ubs ug uk
+util_rb_tld university uno uol us uy uz va vacations vc ve vegas ventures versicherung vet
+util_rb_tld vg vi viajes video villas vin vision vista vistaprint viva vlaanderen vn vodka
+util_rb_tld vote voting voto voyage vu wales walter wang watch webcam website wed wedding
+util_rb_tld weir wf whoswho wien wiki williamhill win windows wine wme work works world ws
+util_rb_tld wtc wtf xbox xerox xin xperia xxx xyz yachts yandex ye yodobashi yoga yokohama
+util_rb_tld youtube yt za zip zm zone zuerich zw
#
Modified: spamassassin/trunk/t/uri_text.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/uri_text.t?rev=1700812&r1=1700811&r2=1700812&view=diff
==============================================================================
--- spamassassin/trunk/t/uri_text.t (original)
+++ spamassassin/trunk/t/uri_text.t Wed Sep 2 13:30:55 2015
@@ -304,7 +304,7 @@ example.ag ^http://example\.ag$
example.ai ^http://example\.ai$
example.al ^http://example\.al$
example.am ^http://example\.am$
-example.an ^http://example\.an$
+example.an !^http://example\.an$
example.ao ^http://example\.ao$
example.aq ^http://example\.aq$
example.ar ^http://example\.ar$
@@ -580,7 +580,7 @@ www.example.ag ^http://www\.example\.ag$
www.example.ai ^http://www\.example\.ai$
www.example.al ^http://www\.example\.al$
www.example.am ^http://www\.example\.am$
-www.example.an ^http://www\.example\.an$
+www.example.an !^http://www\.example\.an$
www.example.ao ^http://www\.example\.ao$
www.example.aq ^http://www\.example\.aq$
www.example.ar ^http://www\.example\.ar$