Index: head/net/dshell/Makefile
===================================================================
--- head/net/dshell/Makefile	(revision 467390)
+++ head/net/dshell/Makefile	(revision 467391)
@@ -1,74 +1,73 @@
 # Created by: Nobutaka Mantani <nobutaka@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	dshell
-PORTVERSION=	3.0.20150220
-PORTREVISION=	1
+PORTVERSION=	3.0.20171116
 CATEGORIES=	net
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Extensible network forensic analysis framework
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	bash:shells/bash \
 		${PYTHON_PKGNAMEPREFIX}pygeoip>0:net/py-pygeoip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dpkt>0:net/py-dpkt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipy>0:net-mgmt/py-ipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pypcap>0:net/py-pypcap@${PY_FLAVOR}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_GITHUB=	yes
 USES=		python:-2.7 shebangfix
 NO_ARCH=	yes
 SHEBANG_FILES=	bin/*.py
 
 GH_ACCOUNT=	USArmyResearchLab
 GH_PROJECT=	Dshell
-GH_TAGNAME=	46e691c
+GH_TAGNAME=	5850adf
 
 OPTIONS_DEFINE=	DOCS
 
 MAKE_ENV+=	PYTHON_CMD=${PYTHON_CMD}
 
 post-patch:
 .for f in bin/generate-dshellrc.py doc/generate-doc.sh
 	${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|' ${WRKSRC}/${f}
 	${REINPLACE_CMD} -e 's|pydoc|${LOCALBASE}/bin/pydoc${PYTHON_VER}|' ${WRKSRC}/${f}
 .endfor
 
 post-build:
 	${RM} -r ${WRKSRC}/lib/${PYTHON_VERSION}
 	${REINPLACE_CMD} -e 's|${WRKSRC}|${ETCDIR}|' ${WRKSRC}/dshell ${WRKSRC}/dshell-decode
 	${REINPLACE_CMD} -e 's|BINPATH=${WRKSRC}/bin|BINPATH=${PREFIX}/libexec/dshell|' \
 		-e 's|DSHELL=${WRKSRC}|DSHELL=${PYTHON_SITELIBDIR}|' \
 		-e 's|DATAPATH=${WRKSRC}/share|DATAPATH=${DATADIR}|' \
 		-e 's|DECODERPATH=${WRKSRC}/decoders|DECODERPATH=${PYTHON_SITELIBDIR}/dshell/decoders|' \
 		-e 's|LIBPATH=${WRKSRC}/lib|LIBPATH=${PYTHON_SITELIBDIR}/dshell|' \
 		${WRKSRC}/.dshellrc
 	(cd ${WRKSRC}/doc; ${REINPLACE_CMD} -e 's|${WRKSRC}|${PYTHON_SITELIBDIR}/dshell|g' *.html)
 
 do-install:
 .for f in dshell dshell-decode
 	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${STAGEDIR}/${PREFIX}/bin
 .endfor
 	${MKDIR} ${STAGEDIR}/${PREFIX}/libexec/dshell
 .for f in decode.py pcapanon.py
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}/${PREFIX}/libexec/dshell
 .endfor
 	(cd ${STAGEDIR}/${PREFIX}/libexec/dshell; \
 		${LN} -sf decode.py decode)
 	${MKDIR} ${STAGEDIR}/${PREFIX}/etc/dshell
 	${INSTALL_DATA} ${WRKSRC}/.dshellrc ${STAGEDIR}/${PREFIX}/etc/dshell
 	(cd ${WRKSRC}/lib; ${COPYTREE_SHARE} . ${STAGEDIR}/${PYTHON_SITELIBDIR}/dshell)
 	(cd ${WRKSRC}/decoders; ${COPYTREE_SHARE} . ${STAGEDIR}/${PYTHON_SITELIBDIR}/dshell/decoders)
 	${MKDIR} ${STAGEDIR}/${DATADIR}/GeoIP
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}/${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}/${DOCSDIR}
 	(cd ${WRKSRC}/doc; ${COPYTREE_SHARE} . ${STAGEDIR}/${DOCSDIR} "-name *\.html")
 
 .include <bsd.port.mk>
Index: head/net/dshell/distinfo
===================================================================
--- head/net/dshell/distinfo	(revision 467390)
+++ head/net/dshell/distinfo	(revision 467391)
@@ -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

Property changes on: head/net/dshell/distinfo
___________________________________________________________________
Modified: fbsd:nokeywords
## -1 +1 ##
-on
\ No newline at end of property
+yes
\ No newline at end of property
Index: head/net/dshell/pkg-plist
===================================================================
--- head/net/dshell/pkg-plist	(revision 467390)
+++ head/net/dshell/pkg-plist	(revision 467391)
@@ -1,128 +1,188 @@
 bin/dshell
 bin/dshell-decode
 %%ETCDIR%%/.dshellrc
 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
 %%PYTHON_SITELIBDIR%%/dshell/decoders/dns/dns-cc.py
 %%PYTHON_SITELIBDIR%%/dshell/decoders/dns/dns-cc.pyc
 %%PYTHON_SITELIBDIR%%/dshell/decoders/dns/dns.py
 %%PYTHON_SITELIBDIR%%/dshell/decoders/dns/dns.pyc
 %%PYTHON_SITELIBDIR%%/dshell/decoders/dns/innuendo-dns.py
 %%PYTHON_SITELIBDIR%%/dshell/decoders/dns/innuendo-dns.pyc
 %%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
 %%PYTHON_SITELIBDIR%%/dshell/decoders/filter/snort.pyc
 %%PYTHON_SITELIBDIR%%/dshell/decoders/filter/track.py
 %%PYTHON_SITELIBDIR%%/dshell/decoders/filter/track.pyc
 %%PYTHON_SITELIBDIR%%/dshell/decoders/flows/__init__.py
 %%PYTHON_SITELIBDIR%%/dshell/decoders/flows/large-flows.py
 %%PYTHON_SITELIBDIR%%/dshell/decoders/flows/large-flows.pyc
 %%PYTHON_SITELIBDIR%%/dshell/decoders/flows/long-flows.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
 %%PYTHON_SITELIBDIR%%/dshell/decoders/misc/grep.py
 %%PYTHON_SITELIBDIR%%/dshell/decoders/misc/grep.pyc
 %%PYTHON_SITELIBDIR%%/dshell/decoders/misc/merge.py
 %%PYTHON_SITELIBDIR%%/dshell/decoders/misc/merge.pyc
 %%PYTHON_SITELIBDIR%%/dshell/decoders/misc/synrst.py
 %%PYTHON_SITELIBDIR%%/dshell/decoders/misc/synrst.pyc
 %%PYTHON_SITELIBDIR%%/dshell/decoders/misc/writer.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
 %%PYTHON_SITELIBDIR%%/dshell/output/netflowout.pyc
 %%PYTHON_SITELIBDIR%%/dshell/output/output.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
 %%PORTDOCS%%%%DOCSDIR%%/httpdecoder.html
 %%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
 %%PORTDOCS%%%%DOCSDIR%%/writer.html
 %%PORTDOCS%%%%DOCSDIR%%/xmlout.html
 %%PORTDOCS%%%%DOCSDIR%%/xor.html
 @dir %%DATADIR%%/GeoIP