3 files changed, 75 insertions, 15 deletions

diff --git a/net/dshell/Makefile b/net/dshell/Makefile
index 51ba8184e80e..0df6f2cfa7ab 100644
--- a/net/dshell/Makefile
+++ b/net/dshell/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dshell
-PORTVERSION=	3.0.20150220
-PORTREVISION=	1
+PORTVERSION=	3.0.20171116
 CATEGORIES=	net
 
 MAINTAINER=	nobutaka@FreeBSD.org
@@ -27,7 +26,7 @@ SHEBANG_FILES=	bin/*.py
 
 GH_ACCOUNT=	USArmyResearchLab
 GH_PROJECT=	Dshell
-GH_TAGNAME=	46e691c
+GH_TAGNAME=	5850adf
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/net/dshell/distinfo b/net/dshell/distinfo
index 9f045170c544..a4702f30b133 100644
--- a/net/dshell/distinfo
+++ b/net/dshell/distinfo
@@ -1,2 +1,3 @@
-SHA256 (USArmyResearchLab-Dshell-3.0.20150220-46e691c_GH0.tar.gz) = 90044ca346c5663aafe27af915fe96734d799350f5cfbcbcba1af716117eb45e
-SIZE (USArmyResearchLab-Dshell-3.0.20150220-46e691c_GH0.tar.gz) = 70814
+TIMESTAMP = 1523795973
+SHA256 (USArmyResearchLab-Dshell-3.0.20171116-5850adf_GH0.tar.gz) = 1f9fca1435409b34d6d52b2100f010a1affefb7cdf07113927585cd98cfba94b
+SIZE (USArmyResearchLab-Dshell-3.0.20171116-5850adf_GH0.tar.gz) = 716609
diff --git a/net/dshell/pkg-plist b/net/dshell/pkg-plist
index b935919dbaf2..e07be96901a3 100644
--- a/net/dshell/pkg-plist
+++ b/net/dshell/pkg-plist
@@ -4,17 +4,10 @@ bin/dshell-decode
 libexec/dshell/decode.py
 libexec/dshell/decode
 libexec/dshell/pcapanon.py
-%%PYTHON_SITELIBDIR%%/dshell/dfile.py
-%%PYTHON_SITELIBDIR%%/dshell/dfile.pyc
-%%PYTHON_SITELIBDIR%%/dshell/dnsdecoder.py
-%%PYTHON_SITELIBDIR%%/dshell/dnsdecoder.pyc
-%%PYTHON_SITELIBDIR%%/dshell/dshell.py
-%%PYTHON_SITELIBDIR%%/dshell/dshell.pyc
-%%PYTHON_SITELIBDIR%%/dshell/httpdecoder.py
-%%PYTHON_SITELIBDIR%%/dshell/httpdecoder.pyc
-%%PYTHON_SITELIBDIR%%/dshell/util.py
-%%PYTHON_SITELIBDIR%%/dshell/util.pyc
 %%PYTHON_SITELIBDIR%%/dshell/decoders/__init__.py
+%%PYTHON_SITELIBDIR%%/dshell/decoders/dhcp/__init__.py
+%%PYTHON_SITELIBDIR%%/dshell/decoders/dhcp/dhcp.py
+%%PYTHON_SITELIBDIR%%/dshell/decoders/dhcp/dhcp.pyc
 %%PYTHON_SITELIBDIR%%/dshell/decoders/dns/__init__.py
 %%PYTHON_SITELIBDIR%%/dshell/decoders/dns/dns-asn.py
 %%PYTHON_SITELIBDIR%%/dshell/decoders/dns/dns-asn.pyc
@@ -27,6 +20,8 @@ libexec/dshell/pcapanon.py
 %%PYTHON_SITELIBDIR%%/dshell/decoders/dns/reservedips.py
 %%PYTHON_SITELIBDIR%%/dshell/decoders/dns/reservedips.pyc
 %%PYTHON_SITELIBDIR%%/dshell/decoders/filter/__init__.py
+%%PYTHON_SITELIBDIR%%/dshell/decoders/filter/asn-filter.py
+%%PYTHON_SITELIBDIR%%/dshell/decoders/filter/asn-filter.pyc
 %%PYTHON_SITELIBDIR%%/dshell/decoders/filter/country.py
 %%PYTHON_SITELIBDIR%%/dshell/decoders/filter/country.pyc
 %%PYTHON_SITELIBDIR%%/dshell/decoders/filter/snort.py
@@ -40,16 +35,30 @@ libexec/dshell/pcapanon.py
 %%PYTHON_SITELIBDIR%%/dshell/decoders/flows/long-flows.pyc
 %%PYTHON_SITELIBDIR%%/dshell/decoders/flows/netflow.py
 %%PYTHON_SITELIBDIR%%/dshell/decoders/flows/netflow.pyc
+%%PYTHON_SITELIBDIR%%/dshell/decoders/flows/reverse-flow.py
+%%PYTHON_SITELIBDIR%%/dshell/decoders/flows/reverse-flow.pyc
 %%PYTHON_SITELIBDIR%%/dshell/decoders/ftp/__init__.py
 %%PYTHON_SITELIBDIR%%/dshell/decoders/ftp/ftp.py
 %%PYTHON_SITELIBDIR%%/dshell/decoders/ftp/ftp.pyc
 %%PYTHON_SITELIBDIR%%/dshell/decoders/http/__init__.py
+%%PYTHON_SITELIBDIR%%/dshell/decoders/http/flash-detect.py
+%%PYTHON_SITELIBDIR%%/dshell/decoders/http/flash-detect.pyc
 %%PYTHON_SITELIBDIR%%/dshell/decoders/http/httpdump.py
 %%PYTHON_SITELIBDIR%%/dshell/decoders/http/httpdump.pyc
+%%PYTHON_SITELIBDIR%%/dshell/decoders/http/joomla-cve-2015-8562.py
+%%PYTHON_SITELIBDIR%%/dshell/decoders/http/joomla-cve-2015-8562.pyc
+%%PYTHON_SITELIBDIR%%/dshell/decoders/http/ms15-034.py
+%%PYTHON_SITELIBDIR%%/dshell/decoders/http/ms15-034.pyc
+%%PYTHON_SITELIBDIR%%/dshell/decoders/http/peht.py
+%%PYTHON_SITELIBDIR%%/dshell/decoders/http/peht.pyc
 %%PYTHON_SITELIBDIR%%/dshell/decoders/http/rip-http.py
 %%PYTHON_SITELIBDIR%%/dshell/decoders/http/rip-http.pyc
 %%PYTHON_SITELIBDIR%%/dshell/decoders/http/web.py
 %%PYTHON_SITELIBDIR%%/dshell/decoders/http/web.pyc
+%%PYTHON_SITELIBDIR%%/dshell/decoders/malware/__init__.py
+%%PYTHON_SITELIBDIR%%/dshell/decoders/malware/emdivi/__init__.py
+%%PYTHON_SITELIBDIR%%/dshell/decoders/malware/emdivi/emdivi_c2.py
+%%PYTHON_SITELIBDIR%%/dshell/decoders/malware/emdivi/emdivi_c2.pyc
 %%PYTHON_SITELIBDIR%%/dshell/decoders/misc/__init__.py
 %%PYTHON_SITELIBDIR%%/dshell/decoders/misc/followstream.py
 %%PYTHON_SITELIBDIR%%/dshell/decoders/misc/followstream.pyc
@@ -63,22 +72,52 @@ libexec/dshell/pcapanon.py
 %%PYTHON_SITELIBDIR%%/dshell/decoders/misc/writer.pyc
 %%PYTHON_SITELIBDIR%%/dshell/decoders/misc/xor.py
 %%PYTHON_SITELIBDIR%%/dshell/decoders/misc/xor.pyc
+%%PYTHON_SITELIBDIR%%/dshell/decoders/nbns/__init__.py
+%%PYTHON_SITELIBDIR%%/dshell/decoders/nbns/nbns.py
+%%PYTHON_SITELIBDIR%%/dshell/decoders/nbns/nbns.pyc
 %%PYTHON_SITELIBDIR%%/dshell/decoders/protocol/__init__.py
+%%PYTHON_SITELIBDIR%%/dshell/decoders/protocol/bitcoin.py
+%%PYTHON_SITELIBDIR%%/dshell/decoders/protocol/bitcoin.pyc
 %%PYTHON_SITELIBDIR%%/dshell/decoders/protocol/ether.py
 %%PYTHON_SITELIBDIR%%/dshell/decoders/protocol/ether.pyc
 %%PYTHON_SITELIBDIR%%/dshell/decoders/protocol/ip.py
 %%PYTHON_SITELIBDIR%%/dshell/decoders/protocol/ip.pyc
 %%PYTHON_SITELIBDIR%%/dshell/decoders/protocol/protocol.py
 %%PYTHON_SITELIBDIR%%/dshell/decoders/protocol/protocol.pyc
+%%PYTHON_SITELIBDIR%%/dshell/decoders/smb/__init__.py
+%%PYTHON_SITELIBDIR%%/dshell/decoders/smb/psexec.py
+%%PYTHON_SITELIBDIR%%/dshell/decoders/smb/psexec.pyc
+%%PYTHON_SITELIBDIR%%/dshell/decoders/smb/rip-smb-uploads.py
+%%PYTHON_SITELIBDIR%%/dshell/decoders/smb/rip-smb-uploads.pyc
+%%PYTHON_SITELIBDIR%%/dshell/decoders/smb/smbfiles.py
+%%PYTHON_SITELIBDIR%%/dshell/decoders/smb/smbfiles.pyc
 %%PYTHON_SITELIBDIR%%/dshell/decoders/templates/PacketDecoder.py
 %%PYTHON_SITELIBDIR%%/dshell/decoders/templates/PacketDecoder.pyc
 %%PYTHON_SITELIBDIR%%/dshell/decoders/templates/SessionDecoder.py
 %%PYTHON_SITELIBDIR%%/dshell/decoders/templates/SessionDecoder.pyc
 %%PYTHON_SITELIBDIR%%/dshell/decoders/templates/__init__.py
+%%PYTHON_SITELIBDIR%%/dshell/decoders/tftp/__init__.py
+%%PYTHON_SITELIBDIR%%/dshell/decoders/tftp/tftp.py
+%%PYTHON_SITELIBDIR%%/dshell/decoders/tftp/tftp.pyc
+%%PYTHON_SITELIBDIR%%/dshell/decoders/voip/__init__.py
+%%PYTHON_SITELIBDIR%%/dshell/decoders/voip/rtp.py
+%%PYTHON_SITELIBDIR%%/dshell/decoders/voip/rtp.pyc
+%%PYTHON_SITELIBDIR%%/dshell/decoders/voip/sip.py
+%%PYTHON_SITELIBDIR%%/dshell/decoders/voip/sip.pyc
+%%PYTHON_SITELIBDIR%%/dshell/dfile.py
+%%PYTHON_SITELIBDIR%%/dshell/dfile.pyc
+%%PYTHON_SITELIBDIR%%/dshell/dnsdecoder.py
+%%PYTHON_SITELIBDIR%%/dshell/dnsdecoder.pyc
+%%PYTHON_SITELIBDIR%%/dshell/dshell.py
+%%PYTHON_SITELIBDIR%%/dshell/dshell.pyc
+%%PYTHON_SITELIBDIR%%/dshell/httpdecoder.py
+%%PYTHON_SITELIBDIR%%/dshell/httpdecoder.pyc
 %%PYTHON_SITELIBDIR%%/dshell/output/colorout.py
 %%PYTHON_SITELIBDIR%%/dshell/output/colorout.pyc
 %%PYTHON_SITELIBDIR%%/dshell/output/csvout.py
 %%PYTHON_SITELIBDIR%%/dshell/output/csvout.pyc
+%%PYTHON_SITELIBDIR%%/dshell/output/elasticout.py
+%%PYTHON_SITELIBDIR%%/dshell/output/elasticout.pyc
 %%PYTHON_SITELIBDIR%%/dshell/output/jsonout.py
 %%PYTHON_SITELIBDIR%%/dshell/output/jsonout.pyc
 %%PYTHON_SITELIBDIR%%/dshell/output/netflowout.py
@@ -87,19 +126,28 @@ libexec/dshell/pcapanon.py
 %%PYTHON_SITELIBDIR%%/dshell/output/output.pyc
 %%PYTHON_SITELIBDIR%%/dshell/output/xmlout.py
 %%PYTHON_SITELIBDIR%%/dshell/output/xmlout.pyc
+%%PYTHON_SITELIBDIR%%/dshell/smbdecoder.py
+%%PYTHON_SITELIBDIR%%/dshell/smbdecoder.pyc
+%%PYTHON_SITELIBDIR%%/dshell/util.py
+%%PYTHON_SITELIBDIR%%/dshell/util.pyc
 %%PORTDOCS%%%%DOCSDIR%%/PacketDecoder.html
 %%PORTDOCS%%%%DOCSDIR%%/README.md
 %%PORTDOCS%%%%DOCSDIR%%/SessionDecoder.html
+%%PORTDOCS%%%%DOCSDIR%%/asn-filter.html
+%%PORTDOCS%%%%DOCSDIR%%/bitcoin.html
 %%PORTDOCS%%%%DOCSDIR%%/colorout.html
 %%PORTDOCS%%%%DOCSDIR%%/country.html
 %%PORTDOCS%%%%DOCSDIR%%/csvout.html
 %%PORTDOCS%%%%DOCSDIR%%/dfile.html
+%%PORTDOCS%%%%DOCSDIR%%/dhcp.html
 %%PORTDOCS%%%%DOCSDIR%%/dns-asn.html
 %%PORTDOCS%%%%DOCSDIR%%/dns-cc.html
 %%PORTDOCS%%%%DOCSDIR%%/dns.html
 %%PORTDOCS%%%%DOCSDIR%%/dnsdecoder.html
 %%PORTDOCS%%%%DOCSDIR%%/dshell.html
+%%PORTDOCS%%%%DOCSDIR%%/emdivi_c2.html
 %%PORTDOCS%%%%DOCSDIR%%/ether.html
+%%PORTDOCS%%%%DOCSDIR%%/flash-detect.html
 %%PORTDOCS%%%%DOCSDIR%%/followstream.html
 %%PORTDOCS%%%%DOCSDIR%%/ftp.html
 %%PORTDOCS%%%%DOCSDIR%%/grep.html
@@ -107,18 +155,30 @@ libexec/dshell/pcapanon.py
 %%PORTDOCS%%%%DOCSDIR%%/httpdump.html
 %%PORTDOCS%%%%DOCSDIR%%/innuendo-dns.html
 %%PORTDOCS%%%%DOCSDIR%%/ip.html
+%%PORTDOCS%%%%DOCSDIR%%/joomla-cve-2015-8562.html
 %%PORTDOCS%%%%DOCSDIR%%/jsonout.html
 %%PORTDOCS%%%%DOCSDIR%%/large-flows.html
 %%PORTDOCS%%%%DOCSDIR%%/long-flows.html
 %%PORTDOCS%%%%DOCSDIR%%/merge.html
+%%PORTDOCS%%%%DOCSDIR%%/ms15-034.html
+%%PORTDOCS%%%%DOCSDIR%%/nbns.html
 %%PORTDOCS%%%%DOCSDIR%%/netflow.html
 %%PORTDOCS%%%%DOCSDIR%%/netflowout.html
 %%PORTDOCS%%%%DOCSDIR%%/output.html
+%%PORTDOCS%%%%DOCSDIR%%/peht.html
 %%PORTDOCS%%%%DOCSDIR%%/protocol.html
+%%PORTDOCS%%%%DOCSDIR%%/psexec.html
 %%PORTDOCS%%%%DOCSDIR%%/reservedips.html
+%%PORTDOCS%%%%DOCSDIR%%/reverse-flow.html
 %%PORTDOCS%%%%DOCSDIR%%/rip-http.html
+%%PORTDOCS%%%%DOCSDIR%%/rip-smb-uploads.html
+%%PORTDOCS%%%%DOCSDIR%%/rtp.html
+%%PORTDOCS%%%%DOCSDIR%%/sip.html
+%%PORTDOCS%%%%DOCSDIR%%/smbdecoder.html
+%%PORTDOCS%%%%DOCSDIR%%/smbfiles.html
 %%PORTDOCS%%%%DOCSDIR%%/snort.html
 %%PORTDOCS%%%%DOCSDIR%%/synrst.html
+%%PORTDOCS%%%%DOCSDIR%%/tftp.html
 %%PORTDOCS%%%%DOCSDIR%%/track.html
 %%PORTDOCS%%%%DOCSDIR%%/util.html
 %%PORTDOCS%%%%DOCSDIR%%/web.html