security/maltrail:

- Update to 0.17
- maltrail does support python3 now

PR:		244019
Submitted by:	Michael Muenz <m.muenz@gmail.com> (maintainer)

3 files changed, 155 insertions, 66 deletions

diff --git a/security/maltrail/Makefile b/security/maltrail/Makefile
index d42c5cd0d408..f589c8238a6d 100644
--- a/security/maltrail/Makefile
+++ b/security/maltrail/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	maltrail
-PORTVERSION=	0.16
+PORTVERSION=	0.17
 CATEGORIES=	security python
 
 MAINTAINER=	m.muenz@gmail.com
@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pcapy>=0:net/py-pcapy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR}
 
-USES=		python:2.7,run
+USES=		python:run
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	stamparm
diff --git a/security/maltrail/distinfo b/security/maltrail/distinfo
index 7b46adcd6321..9af2e592d37c 100644
--- a/security/maltrail/distinfo
+++ b/security/maltrail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1572959931
-SHA256 (stamparm-maltrail-0.16_GH0.tar.gz) = ae0e51aa6f0a6b570676a91f4624a804da4ef45ec39ece28c6d68812005f4ebd
-SIZE (stamparm-maltrail-0.16_GH0.tar.gz) = 2437435
+TIMESTAMP = 1580835647
+SHA256 (stamparm-maltrail-0.17_GH0.tar.gz) = 4d3506de7fd39f5af431209276219de79e1ebeb9adda5dc30e5395711eb22bb0
+SIZE (stamparm-maltrail-0.17_GH0.tar.gz) = 2239424
diff --git a/security/maltrail/pkg-plist b/security/maltrail/pkg-plist
index dae270de2c97..db7e02df77a7 100644
--- a/security/maltrail/pkg-plist
+++ b/security/maltrail/pkg-plist
@@ -5,6 +5,7 @@
 %%DATADIR%%/core/attribdict.py
 %%DATADIR%%/core/common.py
 %%DATADIR%%/core/compat.py
+%%DATADIR%%/core/datatype.py
 %%DATADIR%%/core/enums.py
 %%DATADIR%%/core/httpd.py
 %%DATADIR%%/core/ignore.py
@@ -76,6 +77,8 @@
 %%DATADIR%%/sensor.py
 %%DATADIR%%/server.py
 %%DATADIR%%/thirdparty/__init__.py
+%%DATADIR%%/thirdparty/odict/__init__.py
+%%DATADIR%%/thirdparty/odict/ordereddict.py
 %%DATADIR%%/thirdparty/six/__init__.py
 %%DATADIR%%/trails/custom/__init__.py
 %%DATADIR%%/trails/custom/dprk.txt
@@ -143,29 +146,62 @@
 %%DATADIR%%/trails/feeds/urlhaus.py
 %%DATADIR%%/trails/feeds/urlvir.py
 %%DATADIR%%/trails/feeds/vxvault.py
-%%DATADIR%%/trails/feeds/zeustrackerdns.py
-%%DATADIR%%/trails/feeds/zeustrackerip.py
 %%DATADIR%%/trails/feeds/zeustrackermonitor.py
 %%DATADIR%%/trails/feeds/zeustrackerurl.py
 %%DATADIR%%/trails/static/__init__.py
+%%DATADIR%%/trails/static/malicious/bad_proxy.txt
+%%DATADIR%%/trails/static/malicious/bad_service.txt
+%%DATADIR%%/trails/static/malicious/c2_panel.txt
+%%DATADIR%%/trails/static/malicious/egg_script.txt
+%%DATADIR%%/trails/static/malicious/ek_angler.txt
+%%DATADIR%%/trails/static/malicious/ek_bottle.txt
+%%DATADIR%%/trails/static/malicious/ek_fallout.txt
+%%DATADIR%%/trails/static/malicious/ek_grandsoft.txt
+%%DATADIR%%/trails/static/malicious/ek_greenflash.txt
+%%DATADIR%%/trails/static/malicious/ek_kaixin.txt
+%%DATADIR%%/trails/static/malicious/ek_magnitude.txt
+%%DATADIR%%/trails/static/malicious/ek_neutrino.txt
+%%DATADIR%%/trails/static/malicious/ek_nuclear.txt
+%%DATADIR%%/trails/static/malicious/ek_purplefox.txt
+%%DATADIR%%/trails/static/malicious/ek_radio.txt
+%%DATADIR%%/trails/static/malicious/ek_rig.txt
+%%DATADIR%%/trails/static/malicious/ek_router.txt
+%%DATADIR%%/trails/static/malicious/ek_shade.txt
+%%DATADIR%%/trails/static/malicious/ek_spelevo.txt
+%%DATADIR%%/trails/static/malicious/ek_trillium.txt
+%%DATADIR%%/trails/static/malicious/ek_underminer.txt
+%%DATADIR%%/trails/static/malicious/hta_script.txt
+%%DATADIR%%/trails/static/malicious/js_script.txt
+%%DATADIR%%/trails/static/malicious/magentocore.txt
+%%DATADIR%%/trails/static/malicious/php_script.txt
+%%DATADIR%%/trails/static/malicious/powershell_script.txt
+%%DATADIR%%/trails/static/malicious/proxychanger.txt
+%%DATADIR%%/trails/static/malicious/scareware.txt
+%%DATADIR%%/trails/static/malicious/sms_flooder.txt
+%%DATADIR%%/trails/static/malicious/woof.txt
+%%DATADIR%%/trails/static/malware/404_stealer.txt
 %%DATADIR%%/trails/static/malware/9002.txt
 %%DATADIR%%/trails/static/malware/ab_stealer.txt
 %%DATADIR%%/trails/static/malware/aboc.txt
+%%DATADIR%%/trails/static/malware/acbackdoor.txt
 %%DATADIR%%/trails/static/malware/acridrain.txt
 %%DATADIR%%/trails/static/malware/activeagent.txt
 %%DATADIR%%/trails/static/malware/advisorbot.txt
+%%DATADIR%%/trails/static/malware/adwind.txt
 %%DATADIR%%/trails/static/malware/adylkuzz.txt
 %%DATADIR%%/trails/static/malware/adzok.txt
 %%DATADIR%%/trails/static/malware/agaadex.txt
 %%DATADIR%%/trails/static/malware/agenttesla.txt
-%%DATADIR%%/trails/static/malware/alienspy.txt
+%%DATADIR%%/trails/static/malware/aldibot.txt
 %%DATADIR%%/trails/static/malware/alina.txt
+%%DATADIR%%/trails/static/malware/allakore.txt
 %%DATADIR%%/trails/static/malware/almalocker.txt
 %%DATADIR%%/trails/static/malware/almashreq.txt
 %%DATADIR%%/trails/static/malware/alpha_stealer.txt
 %%DATADIR%%/trails/static/malware/alureon.txt
 %%DATADIR%%/trails/static/malware/amadey.txt
 %%DATADIR%%/trails/static/malware/amavaldo.txt
+%%DATADIR%%/trails/static/malware/amend_miner.txt
 %%DATADIR%%/trails/static/malware/ammyyrat.txt
 %%DATADIR%%/trails/static/malware/android_acecard.txt
 %%DATADIR%%/trails/static/malware/android_adrd.txt
@@ -183,6 +219,7 @@
 %%DATADIR%%/trails/static/malware/android_boxer.txt
 %%DATADIR%%/trails/static/malware/android_buhsam.txt
 %%DATADIR%%/trails/static/malware/android_busygasper.txt
+%%DATADIR%%/trails/static/malware/android_callerspy.txt
 %%DATADIR%%/trails/static/malware/android_camscanner.txt
 %%DATADIR%%/trails/static/malware/android_cerberus.txt
 %%DATADIR%%/trails/static/malware/android_chuli.txt
@@ -190,6 +227,7 @@
 %%DATADIR%%/trails/static/malware/android_clickfraud.txt
 %%DATADIR%%/trails/static/malware/android_cometbot.txt
 %%DATADIR%%/trails/static/malware/android_coolreaper.txt
+%%DATADIR%%/trails/static/malware/android_copycat.txt
 %%DATADIR%%/trails/static/malware/android_counterclank.txt
 %%DATADIR%%/trails/static/malware/android_cyberwurx.txt
 %%DATADIR%%/trails/static/malware/android_dendoroid.txt
@@ -243,7 +281,6 @@
 %%DATADIR%%/trails/static/malware/android_maistealer.txt
 %%DATADIR%%/trails/static/malware/android_malbus.txt
 %%DATADIR%%/trails/static/malware/android_maxit.txt
-%%DATADIR%%/trails/static/malware/android_mobok.txt
 %%DATADIR%%/trails/static/malware/android_mobstspy.txt
 %%DATADIR%%/trails/static/malware/android_monokle.txt
 %%DATADIR%%/trails/static/malware/android_notcompatible.txt
@@ -262,10 +299,10 @@
 %%DATADIR%%/trails/static/malware/android_roidsec.txt
 %%DATADIR%%/trails/static/malware/android_rotexy.txt
 %%DATADIR%%/trails/static/malware/android_samsapo.txt
-%%DATADIR%%/trails/static/malware/android_sandorat.txt
 %%DATADIR%%/trails/static/malware/android_sandrorat.txt
 %%DATADIR%%/trails/static/malware/android_selfmite.txt
 %%DATADIR%%/trails/static/malware/android_shadowvoice.txt
+%%DATADIR%%/trails/static/malware/android_shopper.txt
 %%DATADIR%%/trails/static/malware/android_simbad.txt
 %%DATADIR%%/trails/static/malware/android_simplocker.txt
 %%DATADIR%%/trails/static/malware/android_skullkey.txt
@@ -290,7 +327,9 @@
 %%DATADIR%%/trails/static/malware/android_xhelper.txt
 %%DATADIR%%/trails/static/malware/android_zertsecurity.txt
 %%DATADIR%%/trails/static/malware/android_ztorg.txt
-%%DATADIR%%/trails/static/malware/androm.txt
+%%DATADIR%%/trails/static/malware/andromeda.txt
+%%DATADIR%%/trails/static/malware/antefrigus.txt
+%%DATADIR%%/trails/static/malware/antibot.txt
 %%DATADIR%%/trails/static/malware/anubis.txt
 %%DATADIR%%/trails/static/malware/anuna.txt
 %%DATADIR%%/trails/static/malware/apt_01.txt
@@ -303,14 +342,12 @@
 %%DATADIR%%/trails/static/malware/apt_33.txt
 %%DATADIR%%/trails/static/malware/apt_37.txt
 %%DATADIR%%/trails/static/malware/apt_38.txt
-%%DATADIR%%/trails/static/malware/apt_adwind.txt
 %%DATADIR%%/trails/static/malware/apt_aridviper.txt
 %%DATADIR%%/trails/static/malware/apt_babar.txt
 %%DATADIR%%/trails/static/malware/apt_bahamut.txt
 %%DATADIR%%/trails/static/malware/apt_barium.txt
 %%DATADIR%%/trails/static/malware/apt_bisonal.txt
 %%DATADIR%%/trails/static/malware/apt_bitter.txt
-%%DATADIR%%/trails/static/malware/apt_blackenergy.txt
 %%DATADIR%%/trails/static/malware/apt_blacktech.txt
 %%DATADIR%%/trails/static/malware/apt_blindeagle.txt
 %%DATADIR%%/trails/static/malware/apt_blueprint.txt
@@ -323,6 +360,7 @@
 %%DATADIR%%/trails/static/malware/apt_chafer.txt
 %%DATADIR%%/trails/static/malware/apt_charmingkitten.txt
 %%DATADIR%%/trails/static/malware/apt_cleaver.txt
+%%DATADIR%%/trails/static/malware/apt_cloudatlas.txt
 %%DATADIR%%/trails/static/malware/apt_cobaltdickens.txt
 %%DATADIR%%/trails/static/malware/apt_commentcrew.txt
 %%DATADIR%%/trails/static/malware/apt_copykittens.txt
@@ -340,6 +378,7 @@
 %%DATADIR%%/trails/static/malware/apt_dragonok.txt
 %%DATADIR%%/trails/static/malware/apt_duke.txt
 %%DATADIR%%/trails/static/malware/apt_dustsquad.txt
+%%DATADIR%%/trails/static/malware/apt_energeticbear.txt
 %%DATADIR%%/trails/static/malware/apt_equationgroup.txt
 %%DATADIR%%/trails/static/malware/apt_evapiks.txt
 %%DATADIR%%/trails/static/malware/apt_ezq.txt
@@ -357,7 +396,6 @@
 %%DATADIR%%/trails/static/malware/apt_goldmouse.txt
 %%DATADIR%%/trails/static/malware/apt_gorgon.txt
 %%DATADIR%%/trails/static/malware/apt_gothicpanda.txt
-%%DATADIR%%/trails/static/malware/apt_gravityrat.txt
 %%DATADIR%%/trails/static/malware/apt_gref.txt
 %%DATADIR%%/trails/static/malware/apt_greyenergy.txt
 %%DATADIR%%/trails/static/malware/apt_groundbait.txt
@@ -380,6 +418,7 @@
 %%DATADIR%%/trails/static/malware/apt_machete.txt
 %%DATADIR%%/trails/static/malware/apt_magichound.txt
 %%DATADIR%%/trails/static/malware/apt_menupass.txt
+%%DATADIR%%/trails/static/malware/apt_middleeast.txt
 %%DATADIR%%/trails/static/malware/apt_miniduke.txt
 %%DATADIR%%/trails/static/malware/apt_mudcarp.txt
 %%DATADIR%%/trails/static/malware/apt_muddywater.txt
@@ -394,6 +433,7 @@
 %%DATADIR%%/trails/static/malware/apt_pegasus.txt
 %%DATADIR%%/trails/static/malware/apt_pkplug.txt
 %%DATADIR%%/trails/static/malware/apt_platinum.txt
+%%DATADIR%%/trails/static/malware/apt_pokingthebear.txt
 %%DATADIR%%/trails/static/malware/apt_potao.txt
 %%DATADIR%%/trails/static/malware/apt_quarian.txt
 %%DATADIR%%/trails/static/malware/apt_quasar.txt
@@ -403,6 +443,7 @@
 %%DATADIR%%/trails/static/malware/apt_redoctober.txt
 %%DATADIR%%/trails/static/malware/apt_rnexus.txt
 %%DATADIR%%/trails/static/malware/apt_rocketman.txt
+%%DATADIR%%/trails/static/malware/apt_sandworm.txt
 %%DATADIR%%/trails/static/malware/apt_sauron.txt
 %%DATADIR%%/trails/static/malware/apt_scanbox.txt
 %%DATADIR%%/trails/static/malware/apt_scarcruft.txt
@@ -420,7 +461,9 @@
 %%DATADIR%%/trails/static/malware/apt_stealthfalcon.txt
 %%DATADIR%%/trails/static/malware/apt_stolenpencil.txt
 %%DATADIR%%/trails/static/malware/apt_stonedrill.txt
+%%DATADIR%%/trails/static/malware/apt_strongpity.txt
 %%DATADIR%%/trails/static/malware/apt_stuxnet.txt
+%%DATADIR%%/trails/static/malware/apt_ta2101.txt
 %%DATADIR%%/trails/static/malware/apt_ta428.txt
 %%DATADIR%%/trails/static/malware/apt_tajmahal.txt
 %%DATADIR%%/trails/static/malware/apt_telebots.txt
@@ -448,6 +491,7 @@
 %%DATADIR%%/trails/static/malware/aspire.txt
 %%DATADIR%%/trails/static/malware/asruex.txt
 %%DATADIR%%/trails/static/malware/astaroth.txt
+%%DATADIR%%/trails/static/malware/astrobot.txt
 %%DATADIR%%/trails/static/malware/asyncrat.txt
 %%DATADIR%%/trails/static/malware/athenagorat.txt
 %%DATADIR%%/trails/static/malware/atilla_stealer.txt
@@ -476,6 +520,8 @@
 %%DATADIR%%/trails/static/malware/bankpatch.txt
 %%DATADIR%%/trails/static/malware/banload.txt
 %%DATADIR%%/trails/static/malware/banprox.txt
+%%DATADIR%%/trails/static/malware/banwarum.txt
+%%DATADIR%%/trails/static/malware/barys.txt
 %%DATADIR%%/trails/static/malware/bayrob.txt
 %%DATADIR%%/trails/static/malware/beamwinhttp.txt
 %%DATADIR%%/trails/static/malware/beapy.txt
@@ -486,9 +532,10 @@
 %%DATADIR%%/trails/static/malware/betabot.txt
 %%DATADIR%%/trails/static/malware/bezigaterat.txt
 %%DATADIR%%/trails/static/malware/biskvit.txt
+%%DATADIR%%/trails/static/malware/bitpaymer.txt
 %%DATADIR%%/trails/static/malware/bitshifter.txt
-%%DATADIR%%/trails/static/malware/bizzana.txt
 %%DATADIR%%/trails/static/malware/blackmoon.txt
+%%DATADIR%%/trails/static/malware/blacknet.txt
 %%DATADIR%%/trails/static/malware/blacknixrat.txt
 %%DATADIR%%/trails/static/malware/blackrat.txt
 %%DATADIR%%/trails/static/malware/blackshades.txt
@@ -502,6 +549,7 @@
 %%DATADIR%%/trails/static/malware/bolik.txt
 %%DATADIR%%/trails/static/malware/bondat.txt
 %%DATADIR%%/trails/static/malware/bondnet.txt
+%%DATADIR%%/trails/static/malware/borr_stealer.txt
 %%DATADIR%%/trails/static/malware/bot_mikrotik.txt
 %%DATADIR%%/trails/static/malware/bozokrat.txt
 %%DATADIR%%/trails/static/malware/bredolab.txt
@@ -509,6 +557,7 @@
 %%DATADIR%%/trails/static/malware/brushaloader.txt
 %%DATADIR%%/trails/static/malware/bubnix.txt
 %%DATADIR%%/trails/static/malware/bucriv.txt
+%%DATADIR%%/trails/static/malware/buer.txt
 %%DATADIR%%/trails/static/malware/bulehero.txt
 %%DATADIR%%/trails/static/malware/bunitu.txt
 %%DATADIR%%/trails/static/malware/buran.txt
@@ -517,6 +566,7 @@
 %%DATADIR%%/trails/static/malware/cactustorch.txt
 %%DATADIR%%/trails/static/malware/calfbot.txt
 %%DATADIR%%/trails/static/malware/camerashy.txt
+%%DATADIR%%/trails/static/malware/cannibalrat.txt
 %%DATADIR%%/trails/static/malware/capturatela.txt
 %%DATADIR%%/trails/static/malware/carberp.txt
 %%DATADIR%%/trails/static/malware/cardinalrat.txt
@@ -538,8 +588,10 @@
 %%DATADIR%%/trails/static/malware/clientmeshrat.txt
 %%DATADIR%%/trails/static/malware/clipsa.txt
 %%DATADIR%%/trails/static/malware/cloudatlas.txt
+%%DATADIR%%/trails/static/malware/coalabot.txt
 %%DATADIR%%/trails/static/malware/cobalt.txt
 %%DATADIR%%/trails/static/malware/cobint.txt
+%%DATADIR%%/trails/static/malware/cometer.txt
 %%DATADIR%%/trails/static/malware/conficker.txt
 %%DATADIR%%/trails/static/malware/contopee.txt
 %%DATADIR%%/trails/static/malware/corebot.txt
@@ -561,6 +613,7 @@
 %%DATADIR%%/trails/static/malware/ctblocker.txt
 %%DATADIR%%/trails/static/malware/cutwail.txt
 %%DATADIR%%/trails/static/malware/cybergaterat.txt
+%%DATADIR%%/trails/static/malware/cythosia.txt
 %%DATADIR%%/trails/static/malware/dailyscriptlet.txt
 %%DATADIR%%/trails/static/malware/damoclis.txt
 %%DATADIR%%/trails/static/malware/danabot.txt
@@ -574,7 +627,9 @@
 %%DATADIR%%/trails/static/malware/darkware.txt
 %%DATADIR%%/trails/static/malware/dcrat.txt
 %%DATADIR%%/trails/static/malware/defru.txt
-%%DATADIR%%/trails/static/malware/delshad_ransomeware.txt
+%%DATADIR%%/trails/static/malware/delshad_ransomware.txt
+%%DATADIR%%/trails/static/malware/denizkizi.txt
+%%DATADIR%%/trails/static/malware/deprimon.txt
 %%DATADIR%%/trails/static/malware/destory.txt
 %%DATADIR%%/trails/static/malware/dexter.txt
 %%DATADIR%%/trails/static/malware/diamondfoxrat.txt
@@ -592,33 +647,19 @@
 %%DATADIR%%/trails/static/malware/dorkbot.txt
 %%DATADIR%%/trails/static/malware/dorshel.txt
 %%DATADIR%%/trails/static/malware/dorv.txt
+%%DATADIR%%/trails/static/malware/drahma.txt
 %%DATADIR%%/trails/static/malware/drapion.txt
-%%DATADIR%%/trails/static/malware/dreambot.txt
 %%DATADIR%%/trails/static/malware/dridex.txt
 %%DATADIR%%/trails/static/malware/dropnak.txt
 %%DATADIR%%/trails/static/malware/dualtoy.txt
 %%DATADIR%%/trails/static/malware/dupzom.txt
 %%DATADIR%%/trails/static/malware/dursg.txt
 %%DATADIR%%/trails/static/malware/dyreza.txt
-%%DATADIR%%/trails/static/malware/ek_angler.txt
-%%DATADIR%%/trails/static/malware/ek_fallout.txt
-%%DATADIR%%/trails/static/malware/ek_grandsoft.txt
-%%DATADIR%%/trails/static/malware/ek_greenflash.txt
-%%DATADIR%%/trails/static/malware/ek_magnitude.txt
-%%DATADIR%%/trails/static/malware/ek_neutrino.txt
-%%DATADIR%%/trails/static/malware/ek_nuclear.txt
-%%DATADIR%%/trails/static/malware/ek_purplefox.txt
-%%DATADIR%%/trails/static/malware/ek_radio.txt
-%%DATADIR%%/trails/static/malware/ek_rig.txt
-%%DATADIR%%/trails/static/malware/ek_router.txt
-%%DATADIR%%/trails/static/malware/ek_shade.txt
-%%DATADIR%%/trails/static/malware/ek_spelevo.txt
-%%DATADIR%%/trails/static/malware/ek_trillium.txt
-%%DATADIR%%/trails/static/malware/ek_underminer.txt
 %%DATADIR%%/trails/static/malware/elf_aidra.txt
 %%DATADIR%%/trails/static/malware/elf_amnesiark.txt
 %%DATADIR%%/trails/static/malware/elf_billgates.txt
 %%DATADIR%%/trails/static/malware/elf_chalubo.txt
+%%DATADIR%%/trails/static/malware/elf_chinaz.txt
 %%DATADIR%%/trails/static/malware/elf_coinminer.txt
 %%DATADIR%%/trails/static/malware/elf_darlloz.txt
 %%DATADIR%%/trails/static/malware/elf_ddosman.txt
@@ -633,8 +674,10 @@
 %%DATADIR%%/trails/static/malware/elf_hajime.txt
 %%DATADIR%%/trails/static/malware/elf_hellobot.txt
 %%DATADIR%%/trails/static/malware/elf_hiddenwasp.txt
+%%DATADIR%%/trails/static/malware/elf_hideseek.txt
 %%DATADIR%%/trails/static/malware/elf_httpsd.txt
 %%DATADIR%%/trails/static/malware/elf_iotreaper.txt
+%%DATADIR%%/trails/static/malware/elf_kaiten.txt
 %%DATADIR%%/trails/static/malware/elf_kerberods.txt
 %%DATADIR%%/trails/static/malware/elf_lady.txt
 %%DATADIR%%/trails/static/malware/elf_mayhem.txt
@@ -648,6 +691,7 @@
 %%DATADIR%%/trails/static/malware/elf_qbot.txt
 %%DATADIR%%/trails/static/malware/elf_ransomware.txt
 %%DATADIR%%/trails/static/malware/elf_rekoobe.txt
+%%DATADIR%%/trails/static/malware/elf_roboto.txt
 %%DATADIR%%/trails/static/malware/elf_routex.txt
 %%DATADIR%%/trails/static/malware/elf_shelldos.txt
 %%DATADIR%%/trails/static/malware/elf_skidmap.txt
@@ -664,16 +708,18 @@
 %%DATADIR%%/trails/static/malware/elf_xorddos.txt
 %%DATADIR%%/trails/static/malware/elpman.txt
 %%DATADIR%%/trails/static/malware/email_stealer.txt
+%%DATADIR%%/trails/static/malware/emdivi.txt
 %%DATADIR%%/trails/static/malware/emogen.txt
 %%DATADIR%%/trails/static/malware/emotet.txt
 %%DATADIR%%/trails/static/malware/empirerat.txt
-%%DATADIR%%/trails/static/malware/eredel.txt
+%%DATADIR%%/trails/static/malware/eredel_stealer.txt
 %%DATADIR%%/trails/static/malware/escelar.txt
 %%DATADIR%%/trails/static/malware/esfur.txt
 %%DATADIR%%/trails/static/malware/evilbunny.txt
 %%DATADIR%%/trails/static/malware/evilgrab.txt
 %%DATADIR%%/trails/static/malware/evilnum.txt
 %%DATADIR%%/trails/static/malware/evoltinpos.txt
+%%DATADIR%%/trails/static/malware/evrial_stealer.txt
 %%DATADIR%%/trails/static/malware/expiro.txt
 %%DATADIR%%/trails/static/malware/fakben.txt
 %%DATADIR%%/trails/static/malware/fakeadobe.txt
@@ -697,7 +743,6 @@
 %%DATADIR%%/trails/static/malware/fnumbot.txt
 %%DATADIR%%/trails/static/malware/fobber.txt
 %%DATADIR%%/trails/static/malware/formbook.txt
-%%DATADIR%%/trails/static/malware/forshare.txt
 %%DATADIR%%/trails/static/malware/fox.txt
 %%DATADIR%%/trails/static/malware/fox_stealer.txt
 %%DATADIR%%/trails/static/malware/frankenstein.txt
@@ -708,15 +753,14 @@
 %%DATADIR%%/trails/static/malware/fynloski.txt
 %%DATADIR%%/trails/static/malware/fysna.txt
 %%DATADIR%%/trails/static/malware/gamapos.txt
-%%DATADIR%%/trails/static/malware/gamarue.txt
 %%DATADIR%%/trails/static/malware/gandcrab.txt
 %%DATADIR%%/trails/static/malware/gauss.txt
 %%DATADIR%%/trails/static/malware/gbot.txt
 %%DATADIR%%/trails/static/malware/generic.txt
 %%DATADIR%%/trails/static/malware/germanwiper.txt
 %%DATADIR%%/trails/static/malware/gh0strat.txt
+%%DATADIR%%/trails/static/malware/ghost_miner.txt
 %%DATADIR%%/trails/static/malware/ghostdns.txt
-%%DATADIR%%/trails/static/malware/ghostminer.txt
 %%DATADIR%%/trails/static/malware/glitchpos.txt
 %%DATADIR%%/trails/static/malware/globeimposter.txt
 %%DATADIR%%/trails/static/malware/glupteba.txt
@@ -726,8 +770,9 @@
 %%DATADIR%%/trails/static/malware/goldbrute.txt
 %%DATADIR%%/trails/static/malware/golroted.txt
 %%DATADIR%%/trails/static/malware/gootkit.txt
-%%DATADIR%%/trails/static/malware/gozi.txt
 %%DATADIR%%/trails/static/malware/grand_stealer.txt
+%%DATADIR%%/trails/static/malware/grandoreiro.txt
+%%DATADIR%%/trails/static/malware/gravityrat.txt
 %%DATADIR%%/trails/static/malware/greamerat.txt
 %%DATADIR%%/trails/static/malware/gruntstager.txt
 %%DATADIR%%/trails/static/malware/gtbot.txt
@@ -737,7 +782,7 @@
 %%DATADIR%%/trails/static/malware/hawkball.txt
 %%DATADIR%%/trails/static/malware/hawkeye.txt
 %%DATADIR%%/trails/static/malware/helompy.txt
-%%DATADIR%%/trails/static/malware/hexmen.txt
+%%DATADIR%%/trails/static/malware/heodo_stealer.txt
 %%DATADIR%%/trails/static/malware/hiddenbee.txt
 %%DATADIR%%/trails/static/malware/hiddenbeer.txt
 %%DATADIR%%/trails/static/malware/hiddencobra.txt
@@ -745,6 +790,7 @@
 %%DATADIR%%/trails/static/malware/hiloti.txt
 %%DATADIR%%/trails/static/malware/hinired.txt
 %%DATADIR%%/trails/static/malware/hisoka.txt
+%%DATADIR%%/trails/static/malware/hollow_miner.txt
 %%DATADIR%%/trails/static/malware/honeybee.txt
 %%DATADIR%%/trails/static/malware/hoplight.txt
 %%DATADIR%%/trails/static/malware/houdini.txt
@@ -778,17 +824,20 @@
 %%DATADIR%%/trails/static/malware/jigsaw.txt
 %%DATADIR%%/trails/static/malware/jrat.txt
 %%DATADIR%%/trails/static/malware/jripbot.txt
-%%DATADIR%%/trails/static/malware/jsocket.txt
+%%DATADIR%%/trails/static/malware/jsoutprox.txt
+%%DATADIR%%/trails/static/malware/jssloader.txt
 %%DATADIR%%/trails/static/malware/karkoff.txt
 %%DATADIR%%/trails/static/malware/kasidet.txt
 %%DATADIR%%/trails/static/malware/kazy.txt
+%%DATADIR%%/trails/static/malware/kbot.txt
 %%DATADIR%%/trails/static/malware/kegotip.txt
+%%DATADIR%%/trails/static/malware/keitaro.txt
 %%DATADIR%%/trails/static/malware/kelihos.txt
 %%DATADIR%%/trails/static/malware/keybase.txt
 %%DATADIR%%/trails/static/malware/khrat.txt
 %%DATADIR%%/trails/static/malware/killrabbit.txt
 %%DATADIR%%/trails/static/malware/killua.txt
-%%DATADIR%%/trails/static/malware/kingminer.txt
+%%DATADIR%%/trails/static/malware/king_miner.txt
 %%DATADIR%%/trails/static/malware/kingslayer.txt
 %%DATADIR%%/trails/static/malware/kjw0rm.txt
 %%DATADIR%%/trails/static/malware/kolab.txt
@@ -801,13 +850,16 @@
 %%DATADIR%%/trails/static/malware/kradellsh.txt
 %%DATADIR%%/trails/static/malware/kromagent.txt
 %%DATADIR%%/trails/static/malware/kronos.txt
+%%DATADIR%%/trails/static/malware/krown_stealer.txt
 %%DATADIR%%/trails/static/malware/krugbot.txt
 %%DATADIR%%/trails/static/malware/krypton_stealer.txt
-%%DATADIR%%/trails/static/malware/kuagominer.txt
+%%DATADIR%%/trails/static/malware/kuago_miner.txt
 %%DATADIR%%/trails/static/malware/kulekmoko.txt
 %%DATADIR%%/trails/static/malware/l0rdix.txt
 %%DATADIR%%/trails/static/malware/ladon.txt
+%%DATADIR%%/trails/static/malware/lampion.txt
 %%DATADIR%%/trails/static/malware/latentbot.txt
+%%DATADIR%%/trails/static/malware/legion_loader.txt
 %%DATADIR%%/trails/static/malware/limerat.txt
 %%DATADIR%%/trails/static/malware/litehttp.txt
 %%DATADIR%%/trails/static/malware/loadpcbanker.txt
@@ -819,24 +871,28 @@
 %%DATADIR%%/trails/static/malware/loocipher.txt
 %%DATADIR%%/trails/static/malware/loopbackrat.txt
 %%DATADIR%%/trails/static/malware/lostdoorrat.txt
-%%DATADIR%%/trails/static/malware/loudminer.txt
+%%DATADIR%%/trails/static/malware/loud_miner.txt
+%%DATADIR%%/trails/static/malware/lucifer.txt
 %%DATADIR%%/trails/static/malware/lucky.txt
 %%DATADIR%%/trails/static/malware/luckycat.txt
 %%DATADIR%%/trails/static/malware/luminositylinkrat.txt
 %%DATADIR%%/trails/static/malware/luoxk.txt
 %%DATADIR%%/trails/static/malware/luxnetrat.txt
-%%DATADIR%%/trails/static/malware/madominer.txt
-%%DATADIR%%/trails/static/malware/magentocore.txt
+%%DATADIR%%/trails/static/malware/mado_miner.txt
 %%DATADIR%%/trails/static/malware/magicpos.txt
 %%DATADIR%%/trails/static/malware/magniber.txt
 %%DATADIR%%/trails/static/malware/majikpos.txt
 %%DATADIR%%/trails/static/malware/malwaremustdie.org.csv
 %%DATADIR%%/trails/static/malware/mambashim.txt
+%%DATADIR%%/trails/static/malware/manabot.txt
 %%DATADIR%%/trails/static/malware/mancsyn.txt
+%%DATADIR%%/trails/static/malware/mandaph.txt
 %%DATADIR%%/trails/static/malware/maplebot.txt
 %%DATADIR%%/trails/static/malware/marap.txt
+%%DATADIR%%/trails/static/malware/mariposa.txt
 %%DATADIR%%/trails/static/malware/marmoolak.txt
 %%DATADIR%%/trails/static/malware/marsjoke.txt
+%%DATADIR%%/trails/static/malware/marut.txt
 %%DATADIR%%/trails/static/malware/masad_stealer.txt
 %%DATADIR%%/trails/static/malware/mastermana.txt
 %%DATADIR%%/trails/static/malware/matrix.txt
@@ -847,6 +903,7 @@
 %%DATADIR%%/trails/static/malware/medbot.txt
 %%DATADIR%%/trails/static/malware/medusahttp.txt
 %%DATADIR%%/trails/static/malware/megacortex.txt
+%%DATADIR%%/trails/static/malware/megalodonhttprat.txt
 %%DATADIR%%/trails/static/malware/megaopac.txt
 %%DATADIR%%/trails/static/malware/megumin.txt
 %%DATADIR%%/trails/static/malware/mekotio.txt
@@ -855,15 +912,19 @@
 %%DATADIR%%/trails/static/malware/metamorfo.txt
 %%DATADIR%%/trails/static/malware/midie.txt
 %%DATADIR%%/trails/static/malware/milkyboy.txt
+%%DATADIR%%/trails/static/malware/millionware.txt
 %%DATADIR%%/trails/static/malware/minotaur.txt
 %%DATADIR%%/trails/static/malware/misogow.txt
+%%DATADIR%%/trails/static/malware/mispadu.txt
 %%DATADIR%%/trails/static/malware/miuref.txt
 %%DATADIR%%/trails/static/malware/modirat.txt
 %%DATADIR%%/trails/static/malware/modpos.txt
+%%DATADIR%%/trails/static/malware/monero_backdoor.txt
 %%DATADIR%%/trails/static/malware/monsterinstall.txt
 %%DATADIR%%/trails/static/malware/moonlight.txt
 %%DATADIR%%/trails/static/malware/moreeggs.txt
 %%DATADIR%%/trails/static/malware/morto.txt
+%%DATADIR%%/trails/static/malware/morty_stealer.txt
 %%DATADIR%%/trails/static/malware/muhstik.txt
 %%DATADIR%%/trails/static/malware/mysticalnet.txt
 %%DATADIR%%/trails/static/malware/nampohyu.txt
@@ -892,8 +953,9 @@
 %%DATADIR%%/trails/static/malware/nodersok.txt
 %%DATADIR%%/trails/static/malware/nonbolqu.txt
 %%DATADIR%%/trails/static/malware/notpetya.txt
+%%DATADIR%%/trails/static/malware/notrobin.txt
 %%DATADIR%%/trails/static/malware/novaloader.txt
-%%DATADIR%%/trails/static/malware/novelminer.txt
+%%DATADIR%%/trails/static/malware/novel_miner.txt
 %%DATADIR%%/trails/static/malware/novobot.txt
 %%DATADIR%%/trails/static/malware/novter.txt
 %%DATADIR%%/trails/static/malware/nozelesn.txt
@@ -908,6 +970,8 @@
 %%DATADIR%%/trails/static/malware/optima.txt
 %%DATADIR%%/trails/static/malware/orcusrat.txt
 %%DATADIR%%/trails/static/malware/oski_stealer.txt
+%%DATADIR%%/trails/static/malware/ostap.txt
+%%DATADIR%%/trails/static/malware/osx_bundlore.txt
 %%DATADIR%%/trails/static/malware/osx_coinminer.txt
 %%DATADIR%%/trails/static/malware/osx_coldroot.txt
 %%DATADIR%%/trails/static/malware/osx_generic.txt
@@ -924,30 +988,33 @@
 %%DATADIR%%/trails/static/malware/osx_proton.txt
 %%DATADIR%%/trails/static/malware/osx_salgorea.txt
 %%DATADIR%%/trails/static/malware/osx_shlayer.txt
-%%DATADIR%%/trails/static/malware/osx_tarmac.txt
 %%DATADIR%%/trails/static/malware/osx_trikster.txt
 %%DATADIR%%/trails/static/malware/osx_wirelurker.txt
 %%DATADIR%%/trails/static/malware/padcrypt.txt
-%%DATADIR%%/trails/static/malware/palevo.txt
 %%DATADIR%%/trails/static/malware/pandabanker.txt
+%%DATADIR%%/trails/static/malware/paradoxrat.txt
+%%DATADIR%%/trails/static/malware/parallax.txt
 %%DATADIR%%/trails/static/malware/parasitehttprat.txt
+%%DATADIR%%/trails/static/malware/patchbrowse.txt
 %%DATADIR%%/trails/static/malware/paycrypt.txt
 %%DATADIR%%/trails/static/malware/pcastle.txt
 %%DATADIR%%/trails/static/malware/pcshare.txt
 %%DATADIR%%/trails/static/malware/pdfjsc.txt
 %%DATADIR%%/trails/static/malware/pepperat.txt
 %%DATADIR%%/trails/static/malware/peppyrat.txt
+%%DATADIR%%/trails/static/malware/perl_shellbot.txt
 %%DATADIR%%/trails/static/malware/perseusrat.txt
 %%DATADIR%%/trails/static/malware/petya.txt
 %%DATADIR%%/trails/static/malware/pghost.txt
 %%DATADIR%%/trails/static/malware/phoenix_stealer.txt
 %%DATADIR%%/trails/static/malware/phorpiex.txt
-%%DATADIR%%/trails/static/malware/photominer.txt
+%%DATADIR%%/trails/static/malware/photo_miner.txt
 %%DATADIR%%/trails/static/malware/phpstudyghost.txt
 %%DATADIR%%/trails/static/malware/phytob.txt
 %%DATADIR%%/trails/static/malware/picgoo.txt
 %%DATADIR%%/trails/static/malware/pift.txt
 %%DATADIR%%/trails/static/malware/pinkslipbot.txt
+%%DATADIR%%/trails/static/malware/pipka.txt
 %%DATADIR%%/trails/static/malware/piratematryoshka.txt
 %%DATADIR%%/trails/static/malware/piritebot.txt
 %%DATADIR%%/trails/static/malware/plasmarat.txt
@@ -955,9 +1022,8 @@
 %%DATADIR%%/trails/static/malware/plugx.txt
 %%DATADIR%%/trails/static/malware/plurox.txt
 %%DATADIR%%/trails/static/malware/poisonivy.txt
+%%DATADIR%%/trails/static/malware/poisonrat.txt
 %%DATADIR%%/trails/static/malware/ponmocup.txt
-%%DATADIR%%/trails/static/malware/pony_stealer.txt
-%%DATADIR%%/trails/static/malware/posh.txt
 %%DATADIR%%/trails/static/malware/poshcoder.txt
 %%DATADIR%%/trails/static/malware/pots.txt
 %%DATADIR%%/trails/static/malware/powelike.txt
@@ -965,20 +1031,28 @@
 %%DATADIR%%/trails/static/malware/powershell_injector.txt
 %%DATADIR%%/trails/static/malware/predatory.txt
 %%DATADIR%%/trails/static/malware/proced.txt
+%%DATADIR%%/trails/static/malware/propagate.txt
+%%DATADIR%%/trails/static/malware/prorat.txt
 %%DATADIR%%/trails/static/malware/proslikefan.txt
+%%DATADIR%%/trails/static/malware/prostoclipper.txt
 %%DATADIR%%/trails/static/malware/prostoloader.txt
+%%DATADIR%%/trails/static/malware/protonbot.txt
 %%DATADIR%%/trails/static/malware/prowli.txt
 %%DATADIR%%/trails/static/malware/proxyback.txt
 %%DATADIR%%/trails/static/malware/psixbot.txt
 %%DATADIR%%/trails/static/malware/punisherrat.txt
+%%DATADIR%%/trails/static/malware/pupyrat.txt
+%%DATADIR%%/trails/static/malware/purplefox.txt
 %%DATADIR%%/trails/static/malware/pushdo.txt
 %%DATADIR%%/trails/static/malware/pykspa.txt
 %%DATADIR%%/trails/static/malware/pyleet.txt
 %%DATADIR%%/trails/static/malware/pylocky.txt
+%%DATADIR%%/trails/static/malware/pypi_backdoor.txt
 %%DATADIR%%/trails/static/malware/pyrogenic.txt
+%%DATADIR%%/trails/static/malware/python_injector.txt
 %%DATADIR%%/trails/static/malware/python_xwo.txt
+%%DATADIR%%/trails/static/malware/pyxierat.txt
 %%DATADIR%%/trails/static/malware/qakbot.txt
-%%DATADIR%%/trails/static/malware/qbot.txt
 %%DATADIR%%/trails/static/malware/qeallerrat.txt
 %%DATADIR%%/trails/static/malware/qrat.txt
 %%DATADIR%%/trails/static/malware/quadagent.txt
@@ -988,6 +1062,7 @@
 %%DATADIR%%/trails/static/malware/qulab_stealer.txt
 %%DATADIR%%/trails/static/malware/raasberry.txt
 %%DATADIR%%/trails/static/malware/raccoon.txt
+%%DATADIR%%/trails/static/malware/ragnarok.txt
 %%DATADIR%%/trails/static/malware/rajump.txt
 %%DATADIR%%/trails/static/malware/rakhni.txt
 %%DATADIR%%/trails/static/malware/ramdo.txt
@@ -1025,7 +1100,7 @@
 %%DATADIR%%/trails/static/malware/saefkorat.txt
 %%DATADIR%%/trails/static/malware/sage.txt
 %%DATADIR%%/trails/static/malware/sakabota.txt
-%%DATADIR%%/trails/static/malware/sakari.txt
+%%DATADIR%%/trails/static/malware/sakari_stealer.txt
 %%DATADIR%%/trails/static/malware/sakurel.txt
 %%DATADIR%%/trails/static/malware/sality.txt
 %%DATADIR%%/trails/static/malware/samsam.txt
@@ -1037,6 +1112,7 @@
 %%DATADIR%%/trails/static/malware/scranos.txt
 %%DATADIR%%/trails/static/malware/sdbot.txt
 %%DATADIR%%/trails/static/malware/seaduke.txt
+%%DATADIR%%/trails/static/malware/sectoprat.txt
 %%DATADIR%%/trails/static/malware/sefnit.txt
 %%DATADIR%%/trails/static/malware/selfdel.txt
 %%DATADIR%%/trails/static/malware/severe.txt
@@ -1054,9 +1130,9 @@
 %%DATADIR%%/trails/static/malware/simda.txt
 %%DATADIR%%/trails/static/malware/sinkhole_360netlab.txt
 %%DATADIR%%/trails/static/malware/sinkhole_abuse.txt
-%%DATADIR%%/trails/static/malware/sinkhole_anubis.txt
 %%DATADIR%%/trails/static/malware/sinkhole_arbor.txt
 %%DATADIR%%/trails/static/malware/sinkhole_bitdefender.txt
+%%DATADIR%%/trails/static/malware/sinkhole_bitsight.txt
 %%DATADIR%%/trails/static/malware/sinkhole_blacklab.txt
 %%DATADIR%%/trails/static/malware/sinkhole_bomccss.txt
 %%DATADIR%%/trails/static/malware/sinkhole_botnethunter.txt
@@ -1076,22 +1152,27 @@
 %%DATADIR%%/trails/static/malware/sinkhole_dyre.txt
 %%DATADIR%%/trails/static/malware/sinkhole_farsight.txt
 %%DATADIR%%/trails/static/malware/sinkhole_fbizeus.txt
+%%DATADIR%%/trails/static/malware/sinkhole_fireeye.txt
 %%DATADIR%%/trails/static/malware/sinkhole_fitsec.txt
 %%DATADIR%%/trails/static/malware/sinkhole_fnord.txt
 %%DATADIR%%/trails/static/malware/sinkhole_fraunhofer.txt
+%%DATADIR%%/trails/static/malware/sinkhole_gamaredon.txt
 %%DATADIR%%/trails/static/malware/sinkhole_gameoverzeus.txt
 %%DATADIR%%/trails/static/malware/sinkhole_georgiatech.txt
 %%DATADIR%%/trails/static/malware/sinkhole_gladtech.txt
-%%DATADIR%%/trails/static/malware/sinkhole_honeybot.txt
 %%DATADIR%%/trails/static/malware/sinkhole_hyas.txt
 %%DATADIR%%/trails/static/malware/sinkhole_infosecjp.txt
 %%DATADIR%%/trails/static/malware/sinkhole_kaspersky.txt
 %%DATADIR%%/trails/static/malware/sinkhole_kryptoslogic.txt
+%%DATADIR%%/trails/static/malware/sinkhole_menupass.txt
 %%DATADIR%%/trails/static/malware/sinkhole_microsoft.txt
 %%DATADIR%%/trails/static/malware/sinkhole_noip.txt
+%%DATADIR%%/trails/static/malware/sinkhole_nowdns.txt
 %%DATADIR%%/trails/static/malware/sinkhole_oceanlotus.txt
+%%DATADIR%%/trails/static/malware/sinkhole_opendns.txt
 %%DATADIR%%/trails/static/malware/sinkhole_rsa.txt
 %%DATADIR%%/trails/static/malware/sinkhole_secureworks.txt
+%%DATADIR%%/trails/static/malware/sinkhole_securityscorecard.txt
 %%DATADIR%%/trails/static/malware/sinkhole_shadowserver.txt
 %%DATADIR%%/trails/static/malware/sinkhole_sidnlabs.txt
 %%DATADIR%%/trails/static/malware/sinkhole_sinkdns.txt
@@ -1102,6 +1183,7 @@
 %%DATADIR%%/trails/static/malware/sinkhole_supportintel.txt
 %%DATADIR%%/trails/static/malware/sinkhole_switch.txt
 %%DATADIR%%/trails/static/malware/sinkhole_tech.txt
+%%DATADIR%%/trails/static/malware/sinkhole_torpig.txt
 %%DATADIR%%/trails/static/malware/sinkhole_tsway.txt
 %%DATADIR%%/trails/static/malware/sinkhole_turla.txt
 %%DATADIR%%/trails/static/malware/sinkhole_unknown.txt
@@ -1120,15 +1202,18 @@
 %%DATADIR%%/trails/static/malware/sload.txt
 %%DATADIR%%/trails/static/malware/slserver.txt
 %%DATADIR%%/trails/static/malware/smallnetrat.txt
+%%DATADIR%%/trails/static/malware/smokebot.txt
 %%DATADIR%%/trails/static/malware/smokeloader.txt
 %%DATADIR%%/trails/static/malware/smominru.txt
 %%DATADIR%%/trails/static/malware/smsfakesky.txt
+%%DATADIR%%/trails/static/malware/snatch.txt
 %%DATADIR%%/trails/static/malware/snifula.txt
 %%DATADIR%%/trails/static/malware/snort.org.csv
 %%DATADIR%%/trails/static/malware/sockrat.txt
 %%DATADIR%%/trails/static/malware/sodinokibi.txt
 %%DATADIR%%/trails/static/malware/sohanad.txt
 %%DATADIR%%/trails/static/malware/sonoko.txt
+%%DATADIR%%/trails/static/malware/sorano_stealer.txt
 %%DATADIR%%/trails/static/malware/spideybot_stealer.txt
 %%DATADIR%%/trails/static/malware/spybotpos.txt
 %%DATADIR%%/trails/static/malware/spyeye.txt
@@ -1138,10 +1223,10 @@
 %%DATADIR%%/trails/static/malware/stealer.txt
 %%DATADIR%%/trails/static/malware/stealzilla.txt
 %%DATADIR%%/trails/static/malware/strictor.txt
-%%DATADIR%%/trails/static/malware/strongpity.txt
 %%DATADIR%%/trails/static/malware/supremebot.txt
 %%DATADIR%%/trails/static/malware/surtr.txt
 %%DATADIR%%/trails/static/malware/susafone.txt
+%%DATADIR%%/trails/static/malware/svproxy.txt
 %%DATADIR%%/trails/static/malware/swamprat.txt
 %%DATADIR%%/trails/static/malware/symmi.txt
 %%DATADIR%%/trails/static/malware/syndicasec.txt
@@ -1149,7 +1234,9 @@
 %%DATADIR%%/trails/static/malware/syscon.txt
 %%DATADIR%%/trails/static/malware/sysrat.txt
 %%DATADIR%%/trails/static/malware/systembc.txt
+%%DATADIR%%/trails/static/malware/systemd_miner.txt
 %%DATADIR%%/trails/static/malware/sysworm.txt
+%%DATADIR%%/trails/static/malware/t1087.txt
 %%DATADIR%%/trails/static/malware/ta505.txt
 %%DATADIR%%/trails/static/malware/taskmasters.txt
 %%DATADIR%%/trails/static/malware/tdss.txt
@@ -1173,21 +1260,27 @@
 %%DATADIR%%/trails/static/malware/treasurehunter.txt
 %%DATADIR%%/trails/static/malware/trickbot.txt
 %%DATADIR%%/trails/static/malware/troldesh.txt
+%%DATADIR%%/trails/static/malware/tron.txt
 %%DATADIR%%/trails/static/malware/tscookie.txt
+%%DATADIR%%/trails/static/malware/tuhkit.txt
 %%DATADIR%%/trails/static/malware/tupym.txt
+%%DATADIR%%/trails/static/malware/turkojanrat.txt
 %%DATADIR%%/trails/static/malware/tvrat.txt
 %%DATADIR%%/trails/static/malware/tvspy.txt
 %%DATADIR%%/trails/static/malware/udpos.txt
 %%DATADIR%%/trails/static/malware/unruy.txt
 %%DATADIR%%/trails/static/malware/up007.txt
 %%DATADIR%%/trails/static/malware/upatre.txt
+%%DATADIR%%/trails/static/malware/urausy.txt
 %%DATADIR%%/trails/static/malware/urlzone.txt
 %%DATADIR%%/trails/static/malware/ursnif.txt
 %%DATADIR%%/trails/static/malware/vaimalandra.txt
 %%DATADIR%%/trails/static/malware/varenyky.txt
 %%DATADIR%%/trails/static/malware/vawtrak.txt
 %%DATADIR%%/trails/static/malware/vbcheman.txt
+%%DATADIR%%/trails/static/malware/vbrat.txt
 %%DATADIR%%/trails/static/malware/vidar.txt
+%%DATADIR%%/trails/static/malware/viknok.txt
 %%DATADIR%%/trails/static/malware/vinderuf.txt
 %%DATADIR%%/trails/static/malware/virobot.txt
 %%DATADIR%%/trails/static/malware/virtum.txt
@@ -1214,9 +1307,11 @@
 %%DATADIR%%/trails/static/malware/wndred.txt
 %%DATADIR%%/trails/static/malware/wofeksad.txt
 %%DATADIR%%/trails/static/malware/wolfresearch.txt
+%%DATADIR%%/trails/static/malware/wp-vcd.txt
 %%DATADIR%%/trails/static/malware/xadupi.txt
 %%DATADIR%%/trails/static/malware/xenotix.txt
 %%DATADIR%%/trails/static/malware/xpay.txt
+%%DATADIR%%/trails/static/malware/xshark.txt
 %%DATADIR%%/trails/static/malware/xtbl.txt
 %%DATADIR%%/trails/static/malware/xtrat.txt
 %%DATADIR%%/trails/static/malware/yenibot.txt
@@ -1227,9 +1322,11 @@
 %%DATADIR%%/trails/static/malware/zegost.txt
 %%DATADIR%%/trails/static/malware/zemot.txt
 %%DATADIR%%/trails/static/malware/zeroaccess.txt
+%%DATADIR%%/trails/static/malware/zeropadypt.txt
 %%DATADIR%%/trails/static/malware/zeus.txt
 %%DATADIR%%/trails/static/malware/zherotee.txt
 %%DATADIR%%/trails/static/malware/zlader.txt
+%%DATADIR%%/trails/static/malware/zloader.txt
 %%DATADIR%%/trails/static/malware/zlob.txt
 %%DATADIR%%/trails/static/malware/zombieboy.txt
 %%DATADIR%%/trails/static/malware/zombrari.txt
@@ -1241,7 +1338,7 @@
 %%DATADIR%%/trails/static/suspicious/android_pua.txt
 %%DATADIR%%/trails/static/suspicious/anonymous_web_proxy.txt
 %%DATADIR%%/trails/static/suspicious/bad_history.txt
-%%DATADIR%%/trails/static/suspicious/bad_wpad.txt
+%%DATADIR%%/trails/static/suspicious/badwpad.txt
 %%DATADIR%%/trails/static/suspicious/computrace.txt
 %%DATADIR%%/trails/static/suspicious/crypto_mining.txt
 %%DATADIR%%/trails/static/suspicious/dnspod.txt
@@ -1250,20 +1347,12 @@
 %%DATADIR%%/trails/static/suspicious/dynamic_domain.txt
 %%DATADIR%%/trails/static/suspicious/free_web_hosting.txt
 %%DATADIR%%/trails/static/suspicious/ipinfo.txt
-%%DATADIR%%/trails/static/suspicious/malicious_egg.txt
-%%DATADIR%%/trails/static/suspicious/malicious_hta.txt
-%%DATADIR%%/trails/static/suspicious/malicious_js.txt
-%%DATADIR%%/trails/static/suspicious/malicious_php.txt
-%%DATADIR%%/trails/static/suspicious/malicious_powershell.txt
-%%DATADIR%%/trails/static/suspicious/malicious_proxy.txt
-%%DATADIR%%/trails/static/suspicious/malicious_proxychanger.txt
-%%DATADIR%%/trails/static/suspicious/malicious_service.txt
-%%DATADIR%%/trails/static/suspicious/malicious_с2panel.txt
+%%DATADIR%%/trails/static/suspicious/katyabot.txt
 %%DATADIR%%/trails/static/suspicious/onion.txt
 %%DATADIR%%/trails/static/suspicious/parking_site.txt
 %%DATADIR%%/trails/static/suspicious/pua.txt
 %%DATADIR%%/trails/static/suspicious/rogue_dns.txt
-%%DATADIR%%/trails/static/suspicious/scareware.txt
 %%DATADIR%%/trails/static/suspicious/superfish.txt
 %%DATADIR%%/trails/static/suspicious/suspended_domain.txt
 %%DATADIR%%/trails/static/suspicious/web_shells.txt
+%%DATADIR%%/trails/static/suspicious/xsender_spamtool.txt