Update included fallback maps with data from maps.rspamd.com

diff --git a/conf/maps.d/dmarc_whitelist.inc b/conf/maps.d/dmarc_whitelist.inc
index ca8c2148d373aec4dabe147bf43a5637756ca6b3..e0c47f34776da99534dca3feba560d8d11b3e470 100644 (file)
--- a/conf/maps.d/dmarc_whitelist.inc
+++ b/conf/maps.d/dmarc_whitelist.inc
@@ -1,70 +1,794 @@
+
 # Domains with valid DMARC and DKIM
 # These domains come from some top visited sites that have restrictive dmarc policy
+# This file is intended for Rspamd version 1.8.1+
+# Keep sorted when editing to simplify tracks
 
+18f.gov
+1password.com
+2gis.com
 4chan.org
-adp.com
+4pda.ru
+9-11commission.gov
+911.gov
+aberdeenshire.gov.uk
+abilityone.gov
+absolutbank.ru
+access-board.gov
+acquisition.gov
+acus.gov
+ada.gov
+adf.gov
+adidas.co.kr
+adidas.com.au
+adidas.com.br
+adidas.com.hk
+adidas.fi
+adidas.fr
+admongo.gov
+adobe.dk
+adobe.es
+adobeawards.com
+adp.com both:1.0
 advice.hmrc.gov.uk
+aerocivil.gov.co
+aerocivil.gov.co
+afreximbank.com
+agingstats.gov
+agro.ru
+ahcpr.gov
+aids.gov
+airbnb.co.uk
 airbnb.com
+airbnb.com.tr
+airbnb.cz
+airbnb.de
+airbnb.fi
+airbnb.fr
+airbnb.pl
+airbnb.ru
+airbnb.se
+airnow.gov
 airtel.in
+alfabank.com
+alfabank.ru both:1.0
+alfastrah.ru
 alibaba.com
-aliexpress.com
+aliexpress.com bl:1.0
 alipay.com
-americanexpress.com
+alkupone.ru
+alzheimers.gov
+amazon.co.uk both:1.0
+amazon.com both:1.0
+amazon.com.br both:1.0
+amberalert.gov
+americanexpress.com both:1.0
+ameslab.gov
+angus.gov.uk
+anidub.com
+annapolis.gov
+anstaskforce.gov
+apple.com.au
+apple.com.cn
+apps.gov
+archives.gov
+arctic.gov
+arionbanki.is
+asg.com
+asic.gov.au
+askona.ru
+asos.com
+assist.ru
+atf.gov
+avast.com
 avg.com
 avito.ru
-badoo.com
+avtoradio.ru
+axisbank.com
+badoo.com bl:1.0
+baltbank.ru
+bank.lv
+banki.ru
+bankofamerica.com
+barclaycard.co.uk both:1.0
+barclays.co.uk both:1.0
+barclays.com both:1.0
 battle.net
+beeline.kz
 beeline.ru
+benefits.gov
+betfaq.ru
+biglion.ru
+binary.com
+binbank.ru
+bioethics.gov
+biometrics.gov
+biopreferred.gov
+birminghampost.net
+bishopsmove.com
+bitbank.cc
+bjs.gov
+blizzard.com
+blog.gov.uk
+bls.gov
+bluestarindia.com
+boemre.gov
+bolsover.gov.uk
+bolton.gov.uk
 booking.com
+bookmate.com
+books.ru
+bournemouth.gov.uk
 box.com
+bpa.gov
+brandshop.ru
+bridgend.gov.uk
+brighton-hove.gov.uk
+britishembassy.gov.uk
+broadbandmap.gov
+bromley.gov.uk
+bts.gov
+business.gov
+caerphilly.gov.uk
+caixa.gov.br both:1.0
+cambridge-news.co.uk
+campaign.gov.uk
+cancer.gov
+cannockchasedc.gov.uk
+capitalone.co.uk
+cardiff.gov.uk
+carecredit.com
+cbp.gov
+cdfifund.gov
+centralbedfordshire.gov.uk
+ceredigion.gov.uk
+cesg.gov.uk
+cfda.gov
+cfo.gov
+challenge.gov
+change.org
 chase.com
+chcoc.gov
+childstats.gov
+cio.gov
+circle.com
+citibank.ae
+citibank.co.in
+citibank.co.uk
+citibank.com.my
+citibank.hu
+citibank.pl
+cloud.gov
+cloudflare.com
+cms.gov
+co-operativebank.co.uk
+colgate.com.br
+collegedrinkingprevention.gov
+companies-house.gov.uk
+comuneap.gov.it
+conab.gov.br both:1.0
+concerts.com
 consultant.ru
+contact-sys.com
+copeland.gov.uk
+cosla.gov.uk
+courtservice.gov.uk
+coventry.gov.uk
+cre.gov.uk
+csosa.gov
+cuidadodesalud.gov
+culturarecreacionydeporte.gov.co
+customs.gov.my
+customs.gov.ua
+cybercrime.gov
+dailypost.co.uk
+danskebank.dk
+danskebank.fi
+danskebank.ie
+danskebank.no
+dartford.gov.uk
+dartmoor.gov.uk
+dataprotection.gov.uk
+daventrydc.gov.uk
+dellin.ru
+denbighshire.gov.uk
+deutsche-bank.de
+deutschebank.be
+deutschebank.co.in
+dh.gov.uk
 dhl.com
+dhs.gov
+diablo3.com
+digital.gov
+digitalgov.gov
+digitalliteracy.gov
+disability.gov
+disability.gov.uk
+dnfsb.gov
+docker.com
+docusign.net
+doe.gov
+doioig.gov
+dol.gov
+doleta.gov
+domofond.ru
+drought.gov
+drugabuse.gov
+dsns.gov.ua
+dtv.gov
+dudley.gov.uk
+dyslexiaida.org
+e-boks.dk
+e-verify.gov
+eastdunbarton.gov.uk
+eaststaffsbc.gov.uk
+eastsuffolk.gov.uk
+ebay.be
+ebay.ca
+ebay.ch
+ebay.co.uk both:1.0
+ebay.com
+ebay.com.au
+ebay.com.cn
+ebay.de
+ebay.es
+ebay.eu
+ebay.fr
+ebay.in
+ebay.it
+ebay.se
+economy.gov.tr
+econsumer.gov
+ed.gov
+eftps.gov
+ehsni.gov.uk
+eia.gov
+ejob.gov.tw
+elance.com
+eldorado.ru
+email-ee.co.uk
+email.tektorg.ru
 emarsys.com
+ems.gov
+energystar.gov
+erewash.gov.uk
 esetnod32.ru
+essex-fire.gov.uk
+eubank.kz
 evernote.com
+everychildmatters.gov.uk
+evus.gov
+exist.ru
+expediamail.com
 facebook.com
 facebookmail.com
+fbi.gov
+fcc.gov both:1.0
+fco.gov.uk
+fdic.gov
+feb.gov
+federalreserve.gov
 fedex.com
+fedramp.gov
+fedshirevets.gov
+feedthefuture.gov
+fema.gov
+ferc.gov
+fhfa.gov
+fhfaoig.gov
+fife.gov.uk
+financialresearch.gov
+financialstability.gov
+firstbankpb.bank
+firstbankpb.com
+firstnet.gov
+firstresponder.gov
+fishwatch.gov
+fitness.gov
+flagma.ua
+flamp.ru
+fletc.gov
+fmc.gov both:1.0
+fmcs.gov both:1.0
+foia.gov
+food.gov.uk
 force.com
+fordlibrarymuseum.gov
+foreignassistance.gov
+foreigntrade.gov.tr
+franklinwi.gov
+ftc.gov
+ftccomplaintassistant.gov
+gamereactor.dk
+gap.com
 garant.ru
+geekbrains.ru
+geektimes.ru
+getsmartaboutdrugs.gov
+gibraltar.gov.uk
+gitlab.com
+globalentry.gov
+globalhealth.gov
+globe.gov
+gloucestershire.gov.uk
+goes-r.gov
 gosuslugi.ru
+gov.uk both:1.0
+groupon.es
+groupon.hk
+groupon.it
+gsa.gov
+gsaadvantage.gov
+gsaauctions.gov
+gsaig.gov
+gtbank.com
+guideline.gov
+guidelines.gov
+gwynedd.gov.uk
+habr.com
+hambleton.gov.uk
+harp.gov
+hawaiicounty.gov
+hdfcbank.com
+hdrezka.ag
+healthcare.gov
+healthypeople.gov
+hertfordshire.gov.uk
+hh.kz
 hh.ru
+highland.gov.uk
+highwaycode.gov.uk
+hillingdon.gov.uk
+hiv.gov
 hmrc.gov.uk
+homeoffice.gov.uk
+homesales.gov
+hotels.com
+hounslow.gov.uk
+howto.gov
+hru.gov
+huduser.gov
+hurricanes.gov
+iba.gov.au
+ice.gov
+idmanagement.gov
+ikea.ch
+ikea.co.uk
+ikea.com
+ikea.de
+ikea.fr
+ikea.gr
+ikea.nl
+ikea.pl
+imgur.com
+incometaxindiaefiling.gov.in
+ing.com
+inl.gov
+inlandrevenue.gov.uk
+insider.co.uk
+insolvency.gov.uk
 instagram.com
+insurekidsnow.gov
+invasivespeciesinfo.gov
+investor.gov
+irda.gov.in
+itunes.com
+jccbi.gov
+jd.ru
+jet.com
+jimmycarterlibrary.gov
+job.com
+johnsonsbaby.co.uk
+joybuy.com
+jpmorgan.com
+jpmorgansecurities.com
+judiciary.gov.uk
+justice.gov
+justice.gov.az
+justice.gov.uk
+jyskebank.dk
+kassy.ru
+kent.gov.uk
+keys.openpgp.org
+kids.gov
+kingston.gov.uk
+kivra.com
+klarna.com
+klarna.se
+kpk.gov.pl
+lacoast.gov
+landsbanki.is
+lanl.gov
+lbhf.gov.uk
+lcd.gov.uk
+learningcurve.gov.uk
+leeds.gov.uk
+leroymerlin.es
+lichfielddc.gov.uk
+lincoln.gov.uk
+lincolnshire.gov.uk
 linkedin.com
 livejournal.com
+llnl.gov
+lloydsbank.com
+locatorplus.gov
+lostfilm.tv
+louisvilleco.gov
+love.ru
 lufthansa-group.com
+lufthansa.com
 mackeeper.com
+mailgun.net bl:1.0
+mak.com
+mandtbank.com
+mcc.gov
+mcga.gov.uk
+mchenrycountyil.gov
+mecknc.gov
+mediamarkt.se
+medicaid.gov
+medicare.gov
+medium.com
 megafon.ru
+megaplan.ru
 mercadolibre.com.ar
 mercadolivre.com.br
+merseyfire.gov.uk
+merthyr.gov.uk
+meshok.ru
 messenger.com
+microsoft.net
+middlesbrough.gov.uk
+midlothian.gov.uk
+mil.ru
+mincit.gov.co
+minhacienda.gov.co
+minsvyaz.ru
+mintic.gov.co
+mirrorfootball.co.uk
+mkb.ru
+mlg.ru
+mlg.tv
+mns.gov.ua
+mod.gov.az
+molisa.gov.vn
+monobank.ua
+mos.ru
+mosoblbank.ru
+mosreg.ru
+motinfo.gov.uk
+movavi.com
+msha.gov
+mspb.gov
+msport.gov.pl
+murfreesborotn.gov
 mvideo.ru
+mxtoolbox.com
+mymoney.gov
+myplate.gov
+myra.gov
+myshared.ru
+n-kesteven.gov.uk
+n-somerset.gov.uk
+nads.gov.ua
+nalog.ru
+namus.gov
+nasa.gov
+nationalarchives.gov.uk
+nationalservice.gov
+nationsreportcard.gov
+nbr.gov.bd
+nbtbank.com
+ncifcrf.gov
+ncpw.gov
+nctb.gov.bd
+ne-derbyshire.gov.uk
+nea.gov
+nelincs.gov.uk
 neobux.com
+neolane.net
 netflix.com
 newegg.com
+newmoney.gov
+nga.gov
+ngu.gov.ua
+nhtsa.gov
 nic.ru
-paypal.com
+nidw.gov.bd
+nij.gov
+nio.gov.uk
+niscc.gov.uk
+nist.gov
+nixonlibrary.gov
+nkh.gov.hu
+noaa.gov
+nordea.dk
+nordea.com
+nordea.fi
+nordea.no
+nordea.se
+north-ayrshire.gov.uk
+north-norfolk.gov.uk
+northlincs.gov.uk
+norwich.gov.uk
+notifications.service.gov.uk
+nottinghamcity.gov.uk
+nrc-gateway.gov
+nrc.gov
+nrel.gov
+nsf.gov
+nsopr.gov
+nsopw.gov
+nwtrb.gov
+oculus.com
+ofcm.gov
+office.com
+officemag.ru
+ok.ru
+omb.gov
+ombudsman.gov.tr
+onedrive.com
+onguardonline.gov
+opengl.org
+openinternet.gov
+ordsvy.gov.uk
+ornl.gov
+oshrc.gov
+osti.gov
+oxfordshire.gov.uk
+ozon.ru
+paauditor.gov
+paccar.com
+paddle8.com
+pandemicflu.gov
+passport.gov.uk
+payeer.com
+paymentaccuracy.gov
+paypal-community.com
+paypal.be both:1.0
+paypal.cn both:1.0
+paypal.co.il both:1.0
+paypal.co.uk both:1.0
+paypal.com both:1.0
+paypal.com.au both:1.0
+paypal.com.br both:1.0
+paypal.com.mx both:1.0
+paypal.de both:1.0
+paypal.dk both:1.0
+paypal.es both:1.0
+paypal.fr both:1.0
+paypal.nl both:1.0
+paypal.se both:1.0
+pb.ua
+pbgc.gov
+pc.gov.au
 pch.com
+penanghill.gov.my
+pepfar.gov
+performance.gov
+pinterest.co.kr
 pinterest.com
+pinterest.de
+pinterest.jp
+pinterest.se
+pkc.gov.uk
+planeta.ru
+platron.ru
+plymouth.gov.uk
+pm.gov.uk
+pmf.gov
+pmi.gov
+pncbank.com
+pokerstars.com
+pokerstars.fr
+pokerstars.it
+pokerstars.net
+priorbank.by
+privatbank.ua
+prospertx.gov
+prostocash.com
+provident.bank
+psbank.ru
+psc.gov
+punjab.gov.in
+puzzle-english.com
+qiwi.com
+qiwi.ru
+rabota.ru
+rbkc.gov.uk
+ready.gov
+reaganlibrary.gov
+redbridge.gov.uk
+reddit.com
+reebok.es
+reebok.nl
+reginfo.gov
+regulations.gov
+reisebank.de
+renfrewshire.gov.uk
+rentonwa.gov
+reportband.gov
+rgs.ru
+richmond.gov.uk
+rivers.gov
+rkn.gov.ru
+ros.gov.uk
+roseltorg.ru
 rostelecom.ru
+roundrocktexas.gov
+royalmail.com
+rozetka.com.ua
+rt.com
 rt.ru
+rushcliffe.gov.uk
+rutubeinfo.ru
+sacn.gov.uk
+safercar.gov
+samhsa.gov
+sanmarcostx.gov
 sberbank.ru
+sberbank-ast.ru
+sbir.gov
+sbis.ru
+scality.com
+scdhhs.gov
+science360.gov
+sciencebase.gov
+scijinks.gov
+sec.gov
+secretservice.gov
+section508.gov
+semnan.ac.ir
+senate.gov
+sendgrid.net bl:1
+seniorcorps.gov
+serpro.gov.br both:1.0
+service.gov.uk
+sftool.gov
+shetland.gov.uk
+shropshire-cc.gov.uk
+shutterstock.com
+sigtarp.gov
+sk.ru
+skat.dk
+skatteverket.se
+skbbank.ru
+skittles.com
+skydio.com
+skype.com
+slideshare.com
+smart.gov
+smida.gov.ua
+smokefree.gov
+snickers.com
+solardecathlon.gov
+sourceforge.net
+south-ayrshire.gov.uk
+sovest.ru
+spbrealty.ru
 sportmaster.ru
 squarespace.com
+sravni.ru
+srs.gov
+staffordbc.gov.uk
+stat.gov.az
+stedmundsbury.gov.uk
+sthelens.gov.uk
+stihl.ru
+stopalcoholabuse.gov
+stopfraud.gov
+studentloans.gov
 subscribe.ru
+suffolkcc.gov.uk
+suncorpbank.com.au
+sundaymirror.co.uk
+sunlight.net
 superjob.ru
+surestart.gov.uk
+sutton.gov.uk
+swansea.gov.uk
+swift.com
+symantec.com
+synologynotification.com
+taobao.com
+tatar.ru
+tauntondeane.gov.uk
+tda.gov.uk
+tdk.gov.tr
+tdscpc.gov.in
+telework.gov
+tenders.gov.au
+textmagic.com
+tfhrc.gov
+thebell.io
+thecoolspot.gov
+thinkroadsafety.gov.uk
+tiaabank.com
+ticketland.ru
+tinder.com
+tinkoff.ru
+tomsk.gov.ru
+torbay.gov.uk
+tradingstandards.gov.uk
+treas.gov
+trial-sport.ru
+tsa.gov
+tst.gov.br both:1.0
+tuba.gov.tr
+turystyka.gov.pl
+tutu.ru
+twitch.tv
 twitter.com
+twix.com
 uber.com
+ucarecdn.com
+ucrdatatool.gov
+udall.gov
+ukvisas.gov.uk
 ulmart.ru
+unicor.gov
+uniras.gov.uk
 ups.com
+uralairlines.ru
+us-cert.gov
+usa.gov
+usadf.gov
+usaid.gov
+usap.gov
+uscg.gov
+usconsulate.gov
+usmission.gov
+usphs.gov
+uspis.gov
 usps.com
+usps.gov
+ustreas.gov
 utair.ru
+utkonos.ru
+vaccines.gov
+valeofglamorgan.gov.uk
 verizonwireless.com
-vk.com
+vigoda.ru
+visa.co.uk
+visa.com
+visa.com.ar
+visa.com.br both:1.0
+visa.com.cn
+visa.com.tw
+visa.pl
+vistacampus.gov
+vk.com bl:1.0 
 vkrugudruzei.ru
+vkusnyblog.ru
+vmc.gov.in
+voa.gov.uk
+volunteer.gov
+vote.gov
+walsall.gov.uk
+wandsworth.gov.uk
+wartimecontracting.gov
+warwickdc.gov.uk
+wealden.gov.uk
+wellingtonfl.gov
+west-lindsey.gov.uk
 westernunion.com
+westernunion.ru
+westlothian.gov.uk
 whatsapp.com
+whistleblowers.gov
+wirral.gov.uk
+wlga.gov.uk
+womenshealth.gov
+wrexham.gov.uk
+wrigley.com
+wrp.gov
+yandex-team.ru
+york.gov.uk
+youla.ru
+youth.gov
+youthrules.gov
+youtube.com
+zcts.ru
 zendesk.com
+zionsbank.com
 zomato.com

diff --git a/conf/maps.d/mid.inc b/conf/maps.d/mid.inc
index aeb54542e776a6953f8097ceb73e25fbe6da6e3a..acd1d65aa9fe52bd5fd238938669170f5615fd65 100644 (file)
--- a/conf/maps.d/mid.inc
+++ b/conf/maps.d/mid.inc
@@ -1,22 +1,45 @@
 # Known invalid or missed Message-IDs
 # 'domain' 'Message-ID regexp'
 
+1c-bitrix.ru
 alibaba.com /^[a-f0-9]{8}(?:-[a-f0-9]{4}){3}-[a-f0-9]{12}-0$/
-aliexpress.com /^(?:(?:[0-9]{14,15}|[a-z]{4}UTT_[0-9]{5,6}_(?:[0-9]{8}_)?)[$])?[a-f0-9]{32}$/
+aliexpress.com /^(?:(?:[0-9]{14,16}|[a-z]{4}(?:COWS|UTT)_[0-9]{3,6}_(?:(?:[0-9]{7,8}|0)_)?)[$])?[a-f0-9]{32}$/
 beeline.ru /^<[A-z0-9+]{18}>$/
+cdek.ru
+citilink.ru
 noreply.esphere.ru
+etpgpb.ru
 noreply.etprf.ru
+fedsfm.ru
+freshports.org
 rkn.gov.ru
 garant.ru
 is-zakupki.com
+kassir.ru
+mail-us.jira.com /^[a-f0-9]{8}(?:-[a-f0-9]{4}){3}-[a-f0-9]{12}$/
 mirtesen.ru
+mts.ru
 fcod.nalog.ru
+www.nalog.ru
 otc.ru
+news.ozon.ru /^[A-z0-9+/]{32}$/
+sender.ozon.ru /^[A-z0-9+/]{32}$/
+professionali.ru
+psbank.ru
 qiwi.ru
+robokassa.ru
 client.rostelecom.ru
+rts-tender.ru
 sberbank-ast.ru
+taxcom.ru
 crm.taxcom.ru
 wildberries.ru /^[a-f0-9]{8}(?:-[a-f0-9]{4}){3}-[a-f0-9]{12}$/
 promo.wildberries.ru /^[A-F0-9]{8}(?:-[A-F0-9]{4}){3}-[A-F0-9]{12}$/
 taxi.yandex.ru /^[a-f0-9]{32}$/
+mail.youdo.com
 online.zcts.ru
+mail.authorize.net
+craigslist.org
+maersk.com
+monster.com
+teamviewer.com

diff --git a/conf/maps.d/mime_types.inc b/conf/maps.d/mime_types.inc
index 7dd5d893863fd3fc47e7017c3c8335fc0290c34c..d1fd782a12295fb22de68f98e65ccaae29d72997 100644 (file)
--- a/conf/maps.d/mime_types.inc
+++ b/conf/maps.d/mime_types.inc
@@ -199,14 +199,13 @@ application/p2p-overlay+xml 0
 application/patch-ops-error+xml 0
 application/pdf 0
 application/pgp-encrypted 0
-application/pgp-keys 0
 application/pgp-signature 0
 application/pidf+xml 0
 application/pidf-diff+xml 0
 application/pkcs10 0
 application/pkcs12 0
-application/pkcs7-mime -1
-application/pkcs7-signature -1
+application/pkcs7-mime 0
+application/pkcs7-signature 0
 application/pkcs8 0
 application/pkix-attr-cert 0
 application/pkix-cert 0
@@ -226,6 +225,7 @@ application/prs.plucker 0
 application/prs.rdf-xml-crypt 0
 application/prs.xsf+xml 0
 application/pskc+xml 0
+application/rar 0
 application/raptorfec 0
 application/rdap+json 0
 application/rdf+xml 0
@@ -1126,11 +1126,14 @@ application/wita 0
 application/wordperfect5.1 0
 application/wsdl+xml 0
 application/wspolicy+xml 0
+application/x-excel 0
+application/x-gzip 0
 application/x-msdownload 0
 application/x-pkcs12 0
 application/x-www-form-urlencoded 0
 application/x-tar 0
 application/x-x509-ca-cert 0
+application/x-7z-compressed 0
 application/x-zip-compressed 0
 application/x400-bp 0
 application/xacml+xml 0
@@ -1239,6 +1242,7 @@ audio/mobile-xmf 0
 audio/mp4 0
 audio/mpa-robust 0
 audio/mpeg 0
+audio/mpeg3 0
 audio/mpeg4-generic 0
 audio/ogg 0
 audio/opus 0
@@ -1293,8 +1297,12 @@ audio/vnd.rhetorex.32kadpcm 0
 audio/vnd.rip 0
 audio/vnd.sealedmedia.softseal-mpeg 0
 audio/vnd.vmx.cvsd 0
+audio/vnd.wave 0
 audio/vorbis 0
 audio/vorbis-config 0
+audio/wav 0
+audio/x-mpeg-3 0
+audio/x-wav 0
 image/bmp 0
 image/cgm 0
 image/example 0
@@ -1342,6 +1350,7 @@ image/vnd.tencent.tap 0
 image/vnd.valve.source.texture 0
 image/vnd.xiff 0
 image/vnd.zbrush.pcx 0
+image/webp 0
 image/wmf 0
 image/x-wmf 0
 message/CPIM 0

diff --git a/conf/maps.d/redirectors.inc b/conf/maps.d/redirectors.inc
index c7d7f2549c1850850066f1b199d79e95b3208e29..5cf1200e1893b5f66784486b460ecc1ed2d4b89f 100644 (file)
--- a/conf/maps.d/redirectors.inc
+++ b/conf/maps.d/redirectors.inc
@@ -4,6 +4,8 @@
 0lv.ru
 0pen.me
 0rz.tw
+1-url.net
+1-url.ru
 10r.us
 123url.org
 140.uz
@@ -17,28 +19,26 @@
 1link.in
 1url.com
 1url.in
-1-url.net
-1-url.ru
+2.gp
+2.ly
 2big.at
 2dwww.com
-2.gp
 2it.info
-2.ly
 2mb.eu
 2qu.ru
 2sms.ru
 2tu.me
 2tu.us
 2url.org
+3.ly
+3.vu
 307.to
 3fw.ru
 3le.ru
-3.ly
-3.vu
 3x.si
 4.gg
-4job.ru
 4.ly
+4job.ru
 4ms.me
 4p5.com
 4ry.ru
@@ -51,14 +51,14 @@
 5pl.us
 5url.net
 5z8.info
-6fr.ru
 6.ly
+6fr.ru
 6pn.com
 6url.com
 6yo.org
+7.ly
 70.ru
 74job.ru
-7.ly
 7ly.ru
 7pisem.ru
 7ruh.com
@@ -66,35 +66,38 @@
 7xu.org
 8.ly
 8q.ro
-9mp.com
 9-n.org
+9mp.com
 9xi.ru
+a.gg
+a.md
+a.nf
 a1.tc
 a2k.in
 aa.cx
 aafter.us
 abe5.com
 access.im
+acemlnb.com
 action-emails.ru
+ad.vu
 ad4.us
 adf.ly
 adjix.com
 adsbeta.net
-ad.vu
 afx.cc
-a.gg
 ah.ae
 aipro.ru
 airs.ru
 aka-url.com
+aka.ms
 alic.at
+all-top.ru
 all.fuseurl.com
 allshort.ru
-all-top.ru
 alturl.com
-a.md
 amzn.to
-a.nf
+apac01.safelinks.protection.outlook.com
 apeurl.com
 api.m3653.net
 apsense.cc
@@ -103,29 +106,37 @@ ar.gy
 arm.in
 arst.ch
 atiny.me
+attentivemail.com
 atto.co.za
 atu.ca
 autodesk.com
 avast.com
+avg.com
 avoo.net
+awstrack.me
 azc.cc
 b23.ru
 b2l.me
 backupurl.com
 bacn.me
 bai.lu
+bbe.li
 bcool.bz
+benchurl.com
 bezurl.com
 bi.gl
-binged.it
 bin.nu
-bitby.net
+binged.it
 bit.do
 bit.gy
 bit.ly
+bit.uz
+bitby.net
+bitleyco.cc
 bitly.com
+bitly.ws
+bitrix24.ru
 biturl.net
-bit.uz
 bizj.us
 bloat.me
 bmu.li
@@ -135,9 +146,9 @@ bravo.ly
 briefurl.pl
 bsa.ly
 bsndsy.ru
+bu.tt
 budurl.com
 bun.ru
-bu.tt
 byst.ro
 byyb.net
 bz9.com
@@ -152,23 +163,29 @@ cctv.ws
 cd.vg
 cektkp.com
 cha.la
+checkpoint.com
 chilp.it
 chzb.gr
 cjb.net
 cjt99.tk
+cl.lk
+cl.ly
 clck.ru
+cleverreach.com
+cli.gs
 cliccami.info
-click2.info
+click-me.us
 click.email4customers.com
 click.emailinfo.mail.hpe.com
+click.txn-email.account.sony.com
 click.icptrack.com
-click-me.us
+click.mlsend.com
+click2.info
+clicks.biletix.ru
+clicks.citilink.ru
 clickthru.ca
 clickv.tk
-cli.gs
 clkit.co
-cl.lk
-cl.ly
 clme.ru
 cloakreferer.com
 clockurl.com
@@ -178,11 +195,19 @@ cmylink.com
 cnect.us
 comyonet.com
 conta.cc
+convertkit-mail1.com
+convertkit-mail2.com
+convertkit-mail3.com
+convertkit-mail4.com
+convertkit-mail5.com
+convertkit-mail6.com
+convertkit-mail.com
 coolestone.com
 cort.as
 cortas.elpais.com
 cot.ag
 cowurl.com
+cp20.com
 cp.bitrix.ru
 cr.am
 createurl.com
@@ -192,21 +217,24 @@ crop.im
 crum.pl
 ctvr.us
 cug.kr
-cut4.me
+customeriomail.com
 cut.by
+cut4.me
 cuthut.com
+cutt.ly
 cutt.us
 d2u.us
 d8z.ru
-dai.ly
 da.lc
+dai.ly
 ddp.net
 decenturl.com
+delivery-status.com
 delivr.com
 dev0.ru
 dft.ba
-digbig.com
 di.gd
+digbig.com
 digg.com
 digidns.net
 din.gy
@@ -215,38 +243,53 @@ disq.us
 dld.bz
 dlvr.it
 dmanalytics1.com
-doiop.com
 do.my
+doiop.com
 dopen.us
 dot.tk
+dr.tl
 dr2.biz
 driz.ru
-dr.tl
 durlz.info
+dynamics.com
+e.mail.ru
 easyuri.com
 easyurl.jp
 easyurl.net
 eepurl.com
+eur01.safelinks.protection.outlook.com
+eur02.safelinks.protection.outlook.com
+eur03.safelinks.protection.outlook.com
+eur04.safelinks.protection.outlook.com
+eur05.safelinks.protection.outlook.com
 ej.uz
 elurl.com
+em.digium.com
+emea01.safelinks.protection.outlook.com
+emailpartners.net
 email.account.2gis.com
+email.advisera.com
 email.mail.ostrovok.ru
+email.mxtoolbox.com
 email.news.ostrovok.ru
-e.mail.ru
 emap.ws
-em.digium.com
+emlnk9.com
+emlstart.com
+esclick.me
 etdurl.com
+etiny.io
+etrack01.com
 eweri.com
 exa.im
 f1ru.net
 fa.by
 fanta.linkatty.com
 fav.me
-fbi.pp.ua
 fb.me
+fbi.pp.ua
 fbshare.me
-fff.to
 ff.im
+fff.to
 ffs.cc
 fi.gd
 fire.to
@@ -259,16 +302,16 @@ flic.kr
 flq.us
 flx.im
 fly2.ws
-folo.me
 fo.my
+folo.me
 fon.gs
 forex-trade.be
 fqav.com
 freak.to
-freepl.us
 free-redirect.tk
-freeurl.me
 free-url-redirection.com.ru
+freepl.us
+freeurl.me
 fur.ly
 fuseurl.com
 fuzzy.to
@@ -277,14 +320,18 @@ fwds.me
 fwib.net
 fyad.org
 fyn.im
+g.ro.lt
+g.ua
 g00.me
 gadaf.fi
 game-url.com
 gentleurl.net
-geteml.com
-getlink.info
 get.sh
 get.tf
+geteml.com
+getlink.info
+getresponse.com
+getsendmail.com
 gho.co
 gig140.com
 gizmo.do
@@ -294,50 +341,54 @@ gltw.ru
 gmetzner.de
 gmy.su
 gnu.su
-go2-url.com
+go-links.net
+go-url.ru
 go.9nl.com
+go.it
+go.ly
+go.qb.by
+go.usa.gov
+go2-url.com
 go9.us
 goandgrab.info
 gog.tc
-go.it
-go-links.net
 golook.at
-go.ly
-good.ly
+goo.by
 goo.gl
 goo.pm
-go.qb.by
+goo.su
+good.ly
+googleads.g.doubleclick.net
 goshrink.com
 gosite.in
 goto.pattayacitythailand.com
 gourl.ca
 gourl.gr
 gourl.it
-go-url.ru
-go.usa.gov
 gri.bz
-g.ro.lt
+groteck.com
 gtgg.us
-g.ua
 gu.ma
 gurl.es
 haqm.com
 hex.io
 hhvx.com
+hi.kg
 hiderefer.com
 hijw.com
-hi.kg
 hit.kg
 hj.to
 hlurl.com
 hmm.ph
 ho.io
-hop.clickbank.net
-hopclicks.com
 ho.pe
+hop.clickbank.net
 hop.kz
+hopclicks.com
+hornetsecurity.com
 href.in
 hsblinks.com
+hs-sales-engage.com
 htxt.it
 hubb.me
 huff.to
@@ -356,38 +407,44 @@ ih3.ru
 ikeafamilynews.ru
 ilix.in
 ilnk.me
+informamail01.com
+informamail02.com
+informamail03.com
 informer.ru
 innogam.es
 ino.me
 int.kz
+inxmail.com
 ipsha.ru
 ir.pe
 is.gd
 is.gs
 issuu.com
-itshrunk.com
 its.my
+itshrunk.com
 iurlz.com
 ix.lt
 ixr.be
+j.mp
 j3w.it
 ja.cx
 jdem.cz
 jewi.sh
 jijr.com
 jmb.tw
-j.mp
 jom.la
 joo.ru
 just.as
 juu.cc
 keep2.me
+ki.tl
 kickurl.com
 kipq.com
 kisaurl.com
-ki.tl
 kl.am
 klck.me
+klclick1.com
+klclick.com
 klik.sihitam.com
 klx.co
 knb.im
@@ -399,70 +456,84 @@ kr1n.ru
 krunchd.com
 krz.ch
 ktzr.us
+l.pr
 l24.cm
 l3ss.me
 l9k.net
 lat.ms
 lavvs.com
+lc.cx
 lcut.us
 leeturl.net
+letsignit.com
 leto.tk
+li.ru
 liip.to
 liltext.com
 lin.io
-link2me.ru
+link.abusix.com
 link.ac
+link.from.homecredit.ru
+link.hhut.ru
+link.mail.1fd-system.ru
+link.mail.e-gazeta-unp.ru
+link.mail.e.glavbukh-mail.ru
+link.mail.fd-online.ru
+link.mail.glavbukh-mail.ru
+link.mail.unp-client.ru
+link.redsift.com
+link.rengo.ru
+link.sendsay.ru
+link2me.ru
 linkbee.com
 linkbun.ch
 linkcash.biz
 linkde.info
 linkee.com
-link.hhut.ru
 linkl.ru
-link.mail.e.glavbukh-mail.ru
-link.rengo.ru
-link.sendsay.ru
+links.customers.instacartemail.com
 linkslash.ca
 linkunion.de
 linkx.me
 linkyy.com
 linkzip.net
 lip.tc
-li.ru
+list-manage.com
 list-manage1.com
 list-manage2.com
-list-manage.com
 little.im
 littleurl.net
 liurl.cn
 livehoster.org
 llinks.net
+ln-s.net
+ln-s.ru
+ln.run
 ln0.ru
 ln4.me
 lnk.by
 lnk.cm
 lnk.co
-lnkd.in
 lnk.gd
 lnk.in
 lnk.ly
 lnk.ms
-lnks.it
 lnk.sk
+lnkd.in
+lnkiy.in
+lnks.gd
+lnks.it
 lnkstts.com
 lnkurl.com
-ln-s.net
-ln-s.ru
 loh.ru
 loo.gl
 lovebyt.es
 low.cc
-l.pr
 lr.tc
 lru.jp
 lrwk.com
-ltos.ru
 lt.tl
+ltos.ru
 lul.es
 lurl.no
 lx2.net
@@ -470,15 +541,24 @@ ly9.net
 m4u.in
 m7a.org
 macte.ch
+mailersend.net
+mailanyone.net
+mailinblack.com
+maillist-manage.com
+maillist-manage.in
 mail.rambler.ru
 mandrillapp.com
 mash.to
 mee.la
 merky.de
+mention.net
 metamark.net
 micurl.com
 migre.me
 miliuner.com
+mimecast.com
+mimecastprotect.com
+mimecast-offshore.com
 miniurl.com
 miniurl.net.ru
 miniurl.pl
@@ -489,35 +569,48 @@ minyurl.org
 mislead.in
 miud.in
 mixe.me
+mj.am
+mj.is
+mjt.lu
 mke.me
 mlcampaignru.com
+mljt.tech
+mlsend.com
 mlsendru.com
 mmt.su
-mobotix-news.com
 mo.by
+mobotix-news.com
 moby.to
 mockurl.com
 moourl.com
 mp77.com
 mrte.ch
+msonw.net
 mtp.pl
 mty.in
 mug.gs
 murl.kz
+musvc2.net
 mvp.im
-mylink4u.info
 mylink.to
+mylink4u.info
 myloc.me
 myooo.info
 mypaqe.com
 mypl.us
+mysig.io
 mytinyurl.net
 myurl.in
 myurl.si
 myxx.me
 mzan.si
+n.pr
 n3n.in
 n3r.ru
+n9.cl
+nam11.safelinks.protection.outlook.com
+nam12.safelinks.protection.outlook.com
+nam.safelink.emails.azure.net
 nbc.co
 nblo.gs
 nbold.com
@@ -531,25 +624,27 @@ nik.im
 niurl.com
 nl.cr
 nn.nf
-no1.in
 no.io
+no1.in
 nonameno.com
 normalurl.com
-notlong.com
 not.my
+notlong.com
 now.am
-n.pr
 nsfw.in
 nutshellurl.com
 nxy.in
+nylas.com
 nyti.ms
+o-x.fr
+o.ly
 oc1.us
 oeeq.com
 oiurl.com
-o.ly
-omf.gd
 om.ly
+omf.gd
 omoikane.net
+onpdr.com
 on.cnn.com
 on.mktw.net
 oogyah.com
@@ -561,9 +656,12 @@ ourgplus.at
 out.houseofgaga.ru
 ovr.me
 ow.ly
-o-x.fr
+p.ly
+p.tl
 p1.fr
+page.link
 pathto.net
+paypal-communication.com
 pb8.ru
 pburl.com
 pcw.ro
@@ -576,11 +674,12 @@ pendek.in
 penting.web.id
 pfat.de
 pho.se
-phpm.ru
 php-ru.info
+phpm.ru
 pi90.com
 picourl.ru
 piks.nl
+pipedrive.email
 ping.fm
 pli.gs
 plink.es
@@ -588,7 +687,6 @@ plo.cc
 ploshadka.ru
 plugin.name
 plusphp.com
-p.ly
 pnt.me
 pobierz-film.tk
 politi.co
@@ -603,9 +701,10 @@ privacy-surf.com
 proext.com
 professionali.ru
 profile.to
+proofpoint.com
 prourl.de
+pstmrk.it
 ptiturl.com
-p.tl
 pub.vitrue.com
 punyurl.com
 purl.org
@@ -624,27 +723,32 @@ qlql.ru
 qnh.pl
 qr.cx
 qr.ee
-qrf.in
 qr.net
+qrf.in
 qru.ru
 qte.me
 qtwk.com
+qu.tc
 quik.in
 qurl.com
-qu.tc
 qz.bz
-rb6.me
+r-ss.de
+rs6.net
 r.delphicomponent.ru
-rdrct.us
+r.im
+rb.gy
+rb6.me
 rdr.to
+rdrct.us
 read.bi
 readthis.ca
 reallytinyurl.com
 redir.ec
+redire.ru
+redirect.subscribe.ru
+redirect.viglink.com
 redirectingat.com
 redirects.ca
-redirect.subscribe.ru
-redire.ru
 redirx.com
 reduc.in
 referer.us
@@ -652,65 +756,80 @@ retweet.cc
 retwt.me
 reurl.org
 rhwm.eu
-rickroll.it
-r.im
 ri.ms
+rickroll.it
 riz.gd
 rlu.ru
 rmse.ru
 rnd.ru
 romb.su
-r-ss.de
 rt.nu
-rubyurl.com
 ru.ly
+rubyurl.com
 rurl.org
 rurl.ru
 rurls.ru
 rustech.org
 rww.tw
+s-m.co
+s.coop
 s0bu.ru
 s0e.ru
 s4c.in
 s7y.us
 s8.hk
-safe.mn
 saf.li
+safe.mn
+safelinks.protection.outlook.com
 sami.24.gg
 sayabit.com
-s.coop
+sbrf.link.info.sberbank.ru
+scanmailx.com
 scurtare-url.hi2.ro
 sdut.us
 securityexpert.ru
 securl.ru
+sendassets.io
 sendgrid.net
+sendibm1.com
+sendibm2.com
+sendibm3.com
 sendit.in
+sendpdr.com
+sendpul.se
 sendsay.ru
+sendsmaily.net
 sendurl.info
-sg4d.com
 sg-url.tk
+sg4d.com
 shadyurl.com
-share.flocktory.com
 shar.es
+share.flocktory.com
 shink.de
 shiturl.com
 shli.de
 shorl.com
-shortb.net
-shorten.im
-shorten.ws
+short-me.com
+short-url.co.uk
 short.ie
 short.im
-shortlinks.co.uk
-short-me.com
-shortner.com
-shortn.me
 short.nr
 short.su
 short.to
+shortb.net
+shortener.live
+shorten.ee
+shorten.im
+shorten.ws
+shorter.me
+shortlinks.co.uk
+shortn.me
+shortner.com
 shorturl.asia
+shorturl.at
 shorturl.com
-short-url.co.uk
+shorturl.me
+shorturl.net
 shorturls.co.uk
 shortz.me
 shout.to
@@ -718,42 +837,46 @@ show.my
 shrinkee.com
 shrinkify.com
 shrinkr.com
-shrten.com
 shrt.fr
-shrtl.com
 shrt.st
+shrten.com
+shrtl.com
 shrunkin.com
 shx.in
 simplesite.com
 simurl.com
 sitefwd.com
 sk9.pl
+sl.to
 slate.me
 sli.su
 slki.ru
-sl.to
+smai.ly
 smallr.com
 smallurl.in
 smallurl.ru
 smalur.com
-s-m.co
 smsh.me
 smurl.ca
 smurl.name
-sn9.ru
 sn.im
+sn9.ru
 snipr.com
 snipurl.com
+snrlink-page.com
 snurl.com
+so.vg
 softlinemail.ru
 sokrati.ru
 somexyz.com
 song.ly
+sophos.com
 sorturl.net
-so.vg
 sp2.ro
 spedr.com
 speed-tester.info
+spmailtechnol.com
+spmailtechnolo.com
 sq6.ru
 srclick.ru
 srcom.net
@@ -764,66 +887,71 @@ starts.com
 starturl.com
 stat-pulse.com
 stnx.at
+streaklinks.com
 stump.ws
 su.ly
 su.pr
 surl.co.uk
 surl.hu
+surl.li
 surl.me
 surs.nl
 susurl.com
 swturl.com
+t.cn
+t.co
+t.lh.com
+t.ly
 t1ny.net
 ta.gd
 ta.gg
 tagiturl.com
 taourl.com
+tbank.ru
 tbd.ly
-t.cn
-t.co
 tcrn.ch
 techto.us
 tez.co
 tgl.net
 tgr.me
 tgr.ph
+th.ly
 th8.us
 thexyz.org
 thinfi.com
-th.ly
 thnlnk.com
 thurl.in
 tie.ly
 tighturl.com
 tin.cc
 tiniuri.com
-tiny9.com
-tinyarro.ws
 tiny.by
 tiny.cc
-tinyit.cc
-tinylink.ca
-tinylink.in
 tiny.ly
 tiny.pl
 tiny.ps
+tiny9.com
+tinyarro.ws
+tinyit.cc
+tinylink.ca
+tinylink.in
 tinyuri.ca
 tinyurl.com
 tinyurl.ru
+titanhq.com
 tki.me
-tldr.in
 tl.gd
-t.lh.com
+tldr.in
 tlim.ru
 tllg.net
 tmi.me
 tnij.org
 tny.com
 tny.tc
-to8.cc
-togoto.us
 to.je
 to.ly
+to8.cc
+togoto.us
 toma.ai
 tos.co
 totc.us
@@ -831,13 +959,22 @@ tourl.fr
 toysr.us
 tozm.com
 tpm.ly
+tr.im
 tra.kz
+trcmlsrvcs.com
+trendmicro.com
+track-mail.skbkontur.ru
 trg.li
 trii.us
-tr.im
 trimurl.me
+trk.emlbest.com
+trk.klclick.com
+trk.klclick1.com
+trk.klclick2.com
+trk.klclick3.com
 trunc.it
 trusteml.com
+trustwave.com
 tty.su
 tuckinfo.com
 tux-pla.net
@@ -854,99 +991,108 @@ twiu.ru
 twurl.cc
 twurl.nl
 tyny.me
+u.info-mg.ru
+u.mavrev.com
+u.nu
+u.to
 u2s.in
 u76.org
 ub0.cc
-u.info-mg.ru
 ukril.ru
 ulk.me
 ulmart.ru
 ulo.me
 ulu.lu
-u.mavrev.com
+ulvis.net
 umenytt.se
 unfake.it
-u.nu
 updating.me
+ur.ly
 ur1.ca
 ur3.us
 ural-tender.ru
+url-go.com
+url-zip.com
+url.az
+url.b24.am
+url.cn
+url.co.uk
+url.dflix.net
+url.g4team.com
+url.ie
+url.lotpatrol.com
+url.mk.ua
+url.shinri.biz
+url.vsofte.ru
+url.yanclex.com
+url1.io
 url2.ru
-url360.me
 url3.ru
+url360.me
 url4.eu
 url4.ru
 url4t.com
 url5.ru
 url66.com
 urla.ru
-url.az
-url.b24.am
 urlbit.us
 urlborg.com
 urlbrief.com
+urlc.net
 urlcantik.com
 urlclick.ru
-url.cn
 urlcorta.es
-url.co.uk
 urlcover.com
 urlcut.com
 urldefender.com
+urldefense.com
 urldepo.ru
-url.dflix.net
+urle.us
 urlel.com
 urlenco.de
-urle.us
-url.g4team.com
+urlg.in
 urlgator.com
 urlgeo.me
-urlg.in
-url-go.com
 urlgo.ru
-url.ie
+urli.nl
 urlin.it
 urlink.eu
-urli.nl
+urlis.net
+urlisolation.com
 urlite.de
-url.lotpatrol.com
 urlmint.com
-url.mk.ua
 urlms.com
 urloid.com
 urloo.com
 urlot.com
 urlredo.com
-urlscott.com
 urls.co.za
-url.shinri.biz
-urlshorteningservicefortwitter.com
-urlshort.me
 urls.im
+urls.vg
+urlscott.com
+urlshort.me
+urlshorteningservicefortwitter.com
 urlsim.com
 urlsnip.com
 urlsp.in
 urlsqueeze.com
-urls.vg
 urltwit.com
 urlu.ms
 urlus.ru
-url.vsofte.ru
 urlx.ie
 urlxs.fr
-ur.ly
-url.yanclex.com
 urlz.at
-urlzen.com
-url-zip.com
+urlz.fr
 urlz.ro
+urlzen.com
+urlzs.com
 usat.ly
 use.my
-u.to
 uud.in
 uuu.su
 uww.me
 uyurl.com
+vadesecure.com
 vani.sh
 vash-repetitor.ru
 vb.ly
@@ -958,13 +1104,16 @@ vl.am
 vll.me
 vog.me
 vovka.com
+voxmail.it
 vst.tv
+vu.fr
 w3t.org
 w55.de
 wa.la
 wapo.st
 wapurl.co.uk
 warble.co
+wc4.net
 webformyself.com
 weblist.kharkov.ua
 weburl.me
@@ -987,7 +1136,11 @@ wuw.su
 ww.tl
 www.clickmeeting.com
 www.grandstreamnetworks.ru
+www.reg.ru
+www.shorturl.at
 wz.ae
+x-url.com
+x.vu
 x2t.com
 xaa.su
 xav.cc
@@ -1000,16 +1153,15 @@ xops.fr
 xp.cm
 xr.com
 xrl.in
-xrls.tk
 xrl.us
-x-url.com
+xrls.tk
 xurl.es
 xurl.jp
-x.vu
 xvx.su
 xw6.com
 xxsurl.de
 xxw.me
+y-url.ru
 y.ahoo.it
 yatuc.com
 ydn.ru
@@ -1019,10 +1171,10 @@ yfrog.com
 yhoo.it
 yi.pe
 yiyd.com
+ymlpsend9.net
 ysu.me
 yuarel.com
 yurl.in
-y-url.ru
 yurl.ru
 z0p.de
 z2z.ca
@@ -1041,5 +1193,5 @@ zti.me
 zud.me
 zurl.ws
 zxc9.com
-zzang.kr
 zz.gd
+zzang.kr

diff --git a/conf/maps.d/spf_dkim_whitelist.inc b/conf/maps.d/spf_dkim_whitelist.inc
index 09ceba89b3b294f163e2e6259eda2c33824d461a..79d3169251f0a7a857afeeddf0d8265d2ebc8d62 100644 (file)
--- a/conf/maps.d/spf_dkim_whitelist.inc
+++ b/conf/maps.d/spf_dkim_whitelist.inc
@@ -1,5 +1,6 @@
 # Domains with valid SPF and DKIM
 
+1cfresh.com
 4chan.org
 6pm.com
 about.com
@@ -52,7 +53,6 @@ change.org
 chase.com
 cisco.com
 citi.com
-constantcontact.com
 costco.com
 craigslist.org
 custhelp.com
@@ -63,6 +63,7 @@ discovercard.com
 disqus.com
 dropbox.com
 drweb.com
+e-boks.dk
 ebay.ca
 ebay.com
 ebay.com.au
@@ -128,6 +129,7 @@ mercadolivre.com.br
 messenger.com
 microsoft.com
 microsoftonline.com
+minmyndighetspost.se
 moikrug.ru
 mts.ru
 neobux.com
@@ -139,6 +141,7 @@ nikkeibp.co.jp
 nyaa.se
 nytimes.com
 odnoklassniki.ru
+ofd.yandex.ru
 ok.ru
 olx.ua
 overstock.com
@@ -160,7 +163,6 @@ pch.com
 pinterest.com
 porn.com
 priceline.com
-qq.com
 quora.com
 rakuten.co.jp
 reddit.com
@@ -168,6 +170,9 @@ researchgate.net
 salesforce.com
 sciencedirect.com
 shopify.com
+skanetrafiken.se
+skat.dk
+skatteverket.se
 slack.com
 slideshare.net
 so-net.ne.jp
@@ -188,6 +193,7 @@ taringa.net
 taxi.yandex.ru
 tele2.ru
 thekitchn.com
+tochka.com
 tokopedia.com
 trello.com
 tribunnews.com
@@ -228,5 +234,6 @@ zappos.com
 zendesk.com
 zippyshare.com
 zomato.com
+zoom.us
 zulily.com
 zwift.com

diff --git a/conf/maps.d/surbl-whitelist.inc b/conf/maps.d/surbl-whitelist.inc
index 479c929aa5f23e588c42af55fee183740f54f916..aa9b45fc4a9d021b918750938ea054f4149ef55c 100644 (file)
--- a/conf/maps.d/surbl-whitelist.inc
+++ b/conf/maps.d/surbl-whitelist.inc
@@ -34,7 +34,6 @@ americanexpress.ch
 americanexpress.com
 anadolubank.nl
 ancestry.com
-anpdm.com
 anz.com
 anz.co.nz
 aol.com
@@ -229,6 +228,7 @@ closebrothers.co.uk
 clubsc.ch
 cnet.com
 cnn.com
+co.kg
 colpatria.com
 colpatria.com.co
 comcast.net
@@ -295,7 +295,6 @@ discovery.co.za
 dnbnord.lt
 domain.com
 doubleclick.com
-dovecot.org
 dresdner-bank.de
 dsbbank.sr
 dsbl.org
@@ -316,7 +315,6 @@ egroups.com
 e-gulfbank.com
 emode.com
 esunbank.com.tw
-exacttarget.com
 example.com
 example.net
 example.org
@@ -352,7 +350,6 @@ generali.es
 genevoise.ch
 gentoo.org
 geocities.com
-github.com
 gkb.ch
 gmail.com
 gmx.net
@@ -420,7 +417,6 @@ isbank.de
 isbank.ge
 isbank.iq
 isbankkosova.com
-isc.org
 itau.com.br
 ivillage.com
 joingevalia.com
@@ -449,8 +445,6 @@ lcl.com
 lcl.fr
 li.ru
 list.ru
-lists.isc.org
-lists.roundcube.net
 liveinternet.ru
 livejournal.com
 lloydsbank.com
@@ -704,7 +698,6 @@ subscribe.ru
 sun.com
 suncorpbank.com.au
 suntrust.com
-svn.apache.org
 swedbank.com
 swedbank.ee
 swedbank.lt
@@ -715,7 +708,6 @@ swisscaution.ch
 swissquote.ch
 sydbank.dk
 sympatico.ca
-taggedmail.com
 tails.nl
 tangerine.ca
 tcb-bank.com.tw
@@ -735,7 +727,6 @@ top4top.ru
 tsbbank.co.nz
 tsb.co.nz
 tsb.co.uk
-tumblr.com
 tux.org
 twitter.com
 ubibanca.com
@@ -769,8 +760,6 @@ visa.com.br
 visaeurope.ch
 visaeurope.com
 viseca.ch
-vistaprint.com
-vistaprint.dk
 volksbank.de
 volkswagenbank.de
 vpbank.com
@@ -825,6 +814,18 @@ zdnet.com
 zenithbank.com
 zkb.ch
 zugerkb.ch
+vistaprint.dk
+vistaprint.com
+anpdm.com
+dovecot.org
+exacttarget.com
+github.com
+isc.org
 # list-manage1.com # grey
 # list-manage2.com # grey
 # list-manage.com # grey
+lists.isc.org
+lists.roundcube.net
+svn.apache.org
+taggedmail.com
+tumblr.com