3 files changed, 79 insertions, 60 deletions

diff --git a/security/log2timeline/Makefile b/security/log2timeline/Makefile
index 91eaac997922..df5146dfd150 100644
--- a/security/log2timeline/Makefile
+++ b/security/log2timeline/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	log2timeline
-PORTVERSION=	0.62
-PORTREVISION=	1
+PORTVERSION=	0.64
 CATEGORIES=	security
 MASTER_SITES=	http://log2timeline.net/files/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -20,6 +19,7 @@ LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
+		p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS \
 		p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
 		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
 		p5-Carp-Assert>=0:${PORTSDIR}/devel/p5-Carp-Assert \
@@ -28,7 +28,6 @@ BUILD_DEPENDS=	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
 		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
 		p5-DateTime-Format-Strptime>=0:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
 		p5-DateTime-TimeZone>=0:${PORTSDIR}/devel/p5-DateTime-TimeZone \
-		p5-Glib2>=0:${PORTSDIR}/devel/p5-Glib2 \
 		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
 		p5-Mac-PropertyList>=0:${PORTSDIR}/devel/p5-Mac-PropertyList \
 		p5-Parse-Win32Registry>=0:${PORTSDIR}/devel/p5-Parse-Win32Registry \
@@ -40,8 +39,7 @@ BUILD_DEPENDS=	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
 		p5-File-Mork>=0:${PORTSDIR}/www/p5-File-Mork \
 		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
 		p5-HTML-Scrubber>=0:${PORTSDIR}/www/p5-HTML-Scrubber \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
@@ -62,6 +60,7 @@ MAN3=	Log2Timeline.3 \
 	Log2t::input::ff_bookmark.3 \
 	Log2t::input::firefox2.3 \
 	Log2t::input::ftk_dirlisting.3 \
+	Log2t::input::iehistory.3 \
 	Log2t::input::jp_ntfs_change.3 \
 	Log2t::input::mcafee.3 \
 	Log2t::input::mcafeefireup.3 \
@@ -81,8 +80,9 @@ MAN3=	Log2Timeline.3 \
 	Log2t::output::cef.3 \
 	Log2t::output::cftl.3 \
 	Log2t::output::csv.3 \
+	Log2t::output::serialize.3 \
 	Log2t::output::tab.3 \
-	Parse::Evtx.3 \
-	Parse::Evtx::Chunk.3
+	Parse::Evtx2.3 \
+	Parse::Evtx2::Chunk.3
 
 .include <bsd.port.mk>
diff --git a/security/log2timeline/distinfo b/security/log2timeline/distinfo
index 6e7cf3a0ccc9..b77bd2499563 100644
--- a/security/log2timeline/distinfo
+++ b/security/log2timeline/distinfo
@@ -1,2 +1,2 @@
-SHA256 (log2timeline_0.62.tgz) = d441b1d3209af0bd139eb3c74ddf36b1476bd34cf4b9174002d1fa5e8fb0e240
-SIZE (log2timeline_0.62.tgz) = 489513
+SHA256 (log2timeline_0.64.tgz) = 31ad2197d78dc63416eab15689dcbf8a026a7ed252c3f0198bd9a35228a48a11
+SIZE (log2timeline_0.64.tgz) = 1071979
diff --git a/security/log2timeline/pkg-plist b/security/log2timeline/pkg-plist
index f7d390198679..c5af10f5cf3b 100644
--- a/security/log2timeline/pkg-plist
+++ b/security/log2timeline/pkg-plist
@@ -1,7 +1,6 @@
 bin/l2t_process
 bin/log2timeline
 bin/timescanner
-bin/update_log2timeline
 %%SITE_PERL%%/Log2Timeline.pm
 %%SITE_PERL%%/Log2t/BinRead.pm
 %%SITE_PERL%%/Log2t/Common.pm
@@ -34,6 +33,8 @@ bin/update_log2timeline
 %%SITE_PERL%%/Log2t/input/jp_ntfs_change.pm
 %%SITE_PERL%%/Log2t/input/l2t_csv.pm
 %%SITE_PERL%%/Log2t/input/linux.lst
+%%SITE_PERL%%/Log2t/input/ls_quarantine.pm
+%%SITE_PERL%%/Log2t/input/macosx.lst
 %%SITE_PERL%%/Log2t/input/mactime.pm
 %%SITE_PERL%%/Log2t/input/mcafee.pm
 %%SITE_PERL%%/Log2t/input/mcafeefireup.pm
@@ -79,67 +80,85 @@ bin/update_log2timeline
 %%SITE_PERL%%/Log2t/output/csv.pm
 %%SITE_PERL%%/Log2t/output/mactime.pm
 %%SITE_PERL%%/Log2t/output/mactime_l.pm
+%%SITE_PERL%%/Log2t/output/serialize.pm
 %%SITE_PERL%%/Log2t/output/simile.pm
 %%SITE_PERL%%/Log2t/output/sqlite.pm
 %%SITE_PERL%%/Log2t/output/tab.pm
 %%SITE_PERL%%/Log2t/output/tln.pm
 %%SITE_PERL%%/Log2t/output/tlnx.pm
-%%SITE_PERL%%/Parse/Evtx.pm
-%%SITE_PERL%%/Parse/Evtx/BXmlNode.pm
-%%SITE_PERL%%/Parse/Evtx/BXmlNode/NameString.pm
-%%SITE_PERL%%/Parse/Evtx/BXmlNode/Node0x00.pm
-%%SITE_PERL%%/Parse/Evtx/BXmlNode/Node0x01.pm
-%%SITE_PERL%%/Parse/Evtx/BXmlNode/Node0x02.pm
-%%SITE_PERL%%/Parse/Evtx/BXmlNode/Node0x03.pm
-%%SITE_PERL%%/Parse/Evtx/BXmlNode/Node0x04.pm
-%%SITE_PERL%%/Parse/Evtx/BXmlNode/Node0x05.pm
-%%SITE_PERL%%/Parse/Evtx/BXmlNode/Node0x06.pm
-%%SITE_PERL%%/Parse/Evtx/BXmlNode/Node0x0c.pm
-%%SITE_PERL%%/Parse/Evtx/BXmlNode/Node0x0d.pm
-%%SITE_PERL%%/Parse/Evtx/BXmlNode/Node0x0e.pm
-%%SITE_PERL%%/Parse/Evtx/BXmlNode/Node0x0f.pm
-%%SITE_PERL%%/Parse/Evtx/BXmlNode/Root.pm
-%%SITE_PERL%%/Parse/Evtx/BXmlNode/SubstArray.pm
-%%SITE_PERL%%/Parse/Evtx/BXmlNode/Template.pm
-%%SITE_PERL%%/Parse/Evtx/Chunk.pm
-%%SITE_PERL%%/Parse/Evtx/Const.pm
-%%SITE_PERL%%/Parse/Evtx/Event.pm
-%%SITE_PERL%%/Parse/Evtx/VariantType.pm
-%%SITE_PERL%%/Parse/Evtx/VariantType/Type0x00.pm
-%%SITE_PERL%%/Parse/Evtx/VariantType/Type0x01.pm
-%%SITE_PERL%%/Parse/Evtx/VariantType/Type0x02.pm
-%%SITE_PERL%%/Parse/Evtx/VariantType/Type0x03.pm
-%%SITE_PERL%%/Parse/Evtx/VariantType/Type0x04.pm
-%%SITE_PERL%%/Parse/Evtx/VariantType/Type0x05.pm
-%%SITE_PERL%%/Parse/Evtx/VariantType/Type0x06.pm
-%%SITE_PERL%%/Parse/Evtx/VariantType/Type0x07.pm
-%%SITE_PERL%%/Parse/Evtx/VariantType/Type0x08.pm
-%%SITE_PERL%%/Parse/Evtx/VariantType/Type0x09.pm
-%%SITE_PERL%%/Parse/Evtx/VariantType/Type0x0a.pm
-%%SITE_PERL%%/Parse/Evtx/VariantType/Type0x0b.pm
-%%SITE_PERL%%/Parse/Evtx/VariantType/Type0x0c.pm
-%%SITE_PERL%%/Parse/Evtx/VariantType/Type0x0d.pm
-%%SITE_PERL%%/Parse/Evtx/VariantType/Type0x0e.pm
-%%SITE_PERL%%/Parse/Evtx/VariantType/Type0x0f.pm
-%%SITE_PERL%%/Parse/Evtx/VariantType/Type0x10.pm
-%%SITE_PERL%%/Parse/Evtx/VariantType/Type0x11.pm
-%%SITE_PERL%%/Parse/Evtx/VariantType/Type0x12.pm
-%%SITE_PERL%%/Parse/Evtx/VariantType/Type0x13.pm
-%%SITE_PERL%%/Parse/Evtx/VariantType/Type0x14.pm
-%%SITE_PERL%%/Parse/Evtx/VariantType/Type0x15.pm
-%%SITE_PERL%%/Parse/Evtx/VariantType/Type0x21.pm
-%%SITE_PERL%%/Parse/Evtx/VariantType/Type0x81.pm
-%%SITE_PERL%%/Parse/Evtx/VariantType/Type0x94.pm
-%%SITE_PERL%%/Parse/Evtx/VariantType/Type0x95.pm
+%%SITE_PERL%%/Parse/Evtx2.pm
+%%SITE_PERL%%/Parse/Evtx2/BXmlNode.pm
+%%SITE_PERL%%/Parse/Evtx2/BXmlNode/NameString.pm
+%%SITE_PERL%%/Parse/Evtx2/BXmlNode/Node0x00.pm
+%%SITE_PERL%%/Parse/Evtx2/BXmlNode/Node0x01.pm
+%%SITE_PERL%%/Parse/Evtx2/BXmlNode/Node0x02.pm
+%%SITE_PERL%%/Parse/Evtx2/BXmlNode/Node0x03.pm
+%%SITE_PERL%%/Parse/Evtx2/BXmlNode/Node0x04.pm
+%%SITE_PERL%%/Parse/Evtx2/BXmlNode/Node0x05.pm
+%%SITE_PERL%%/Parse/Evtx2/BXmlNode/Node0x06.pm
+%%SITE_PERL%%/Parse/Evtx2/BXmlNode/Node0x07.pm
+%%SITE_PERL%%/Parse/Evtx2/BXmlNode/Node0x09.pm
+%%SITE_PERL%%/Parse/Evtx2/BXmlNode/Node0x0a.pm
+%%SITE_PERL%%/Parse/Evtx2/BXmlNode/Node0x0b.pm
+%%SITE_PERL%%/Parse/Evtx2/BXmlNode/Node0x0c.pm
+%%SITE_PERL%%/Parse/Evtx2/BXmlNode/Node0x0d.pm
+%%SITE_PERL%%/Parse/Evtx2/BXmlNode/Node0x0e.pm
+%%SITE_PERL%%/Parse/Evtx2/BXmlNode/Node0x0f.pm
+%%SITE_PERL%%/Parse/Evtx2/BXmlNode/Root.pm
+%%SITE_PERL%%/Parse/Evtx2/BXmlNode/SubstArray.pm
+%%SITE_PERL%%/Parse/Evtx2/BXmlNode/Template.pm
+%%SITE_PERL%%/Parse/Evtx2/Chunk.pm
+%%SITE_PERL%%/Parse/Evtx2/Const.pm
+%%SITE_PERL%%/Parse/Evtx2/Event.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x00.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x01.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x02.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x03.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x04.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x05.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x06.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x07.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x08.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x09.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x0a.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x0b.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x0c.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x0d.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x0e.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x0f.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x10.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x11.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x12.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x13.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x14.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x15.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x21.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x81.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x83.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x84.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x85.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x86.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x87.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x88.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x89.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x8a.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x8b.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x8c.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x8f.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x91.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x92.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x94.pm
+%%SITE_PERL%%/Parse/Evtx2/VariantType/Type0x95.pm
 %%SITE_PERL%%/mach/auto/Log2t/.packlist
 @dirrm %%SITE_PERL%%/Log2t/PreProc
 @dirrm %%SITE_PERL%%/Log2t/base
 @dirrm %%SITE_PERL%%/Log2t/input
 @dirrm %%SITE_PERL%%/Log2t/output
 @dirrm %%SITE_PERL%%/Log2t
-@dirrm %%SITE_PERL%%/Parse/Evtx/BXmlNode
-@dirrm %%SITE_PERL%%/Parse/Evtx/VariantType
-@dirrm %%SITE_PERL%%/Parse/Evtx
+@dirrm %%SITE_PERL%%/Parse/Evtx2/BXmlNode
+@dirrm %%SITE_PERL%%/Parse/Evtx2/VariantType
+@dirrm %%SITE_PERL%%/Parse/Evtx2
 @dirrm %%SITE_PERL%%/mach/auto/Log2t
 @dirrmtry %%SITE_PERL%%/Parse
 @dirrmtry %%SITE_PERL%%/mach/auto/Parse/Win32Registry