plaso to py3, fix indxparse

sift/packages/absent/plaso.sls

@@ -43,3 +43,11 @@ python-dfvfs-20160108-removed:
     - allow_updates: True
     - require:
       - pkg: python-plaso-1.4.0-removed
+
+python-plaso-py2-removed:
+  pkg.removed:
+    - name: python-plaso
+    - version: 20191203-1ppa1~bionic
+    - hold: False
+    - update_holds: True
+    - allow_updates: True

sift/packages/init.sls

@@ -142,14 +142,14 @@ include:
   - sift.packages.python-nids
   - sift.packages.python-pefile
   - sift.packages.python-pip
-  - sift.packages.python-plaso
   - sift.packages.python-pytsk3
   - sift.packages.python-qt4
   - sift.packages.python-tk
   - sift.packages.python-virtualenv
   - sift.packages.python-yara
   - sift.packages.python3
   - sift.packages.python3-pip
+  - sift.packages.python3-plaso
   - sift.packages.qemu
   - sift.packages.qemu-utils
   - sift.packages.radare2
@@ -340,7 +340,7 @@ sift-packages:
       - sls: sift.packages.python-nids
       - sls: sift.packages.python-pefile
       - sls: sift.packages.python-pip
-      - sls: sift.packages.python-plaso
+      - sls: sift.packages.python3-plaso
       - sls: sift.packages.python-pytsk3
       - sls: sift.packages.python-qt4
       - sls: sift.packages.python-tk

sift/packages/plaso-tools.sls

@@ -1,10 +1,10 @@
 include:
   - sift.repos.gift
-  - sift.packages.python-plaso
+  - sift.packages.python3-plaso
 
 plaso-tools:
   pkg.latest:
     - name: plaso-tools
     - require:
       - sls: sift.repos.gift
-      - sls: sift.packages.python-plaso
+      - sls: sift.packages.python3-plaso

sift/packages/python-wxgtk3.sls

@@ -0,0 +1,8 @@
+include:
+  - sift.packages.python
+
+sift-package-python-wxgtk3:
+  pkg.installed:
+    - name: python-wxgtk3.0
+    - require:
+      - sls: sift.packages.python

sift/packages/python-plaso.sls → sift/packages/python3-plaso.sls

@@ -6,9 +6,9 @@ include:
   - sift.packages.python-xlsxwriter
   - sift.packages.python-dfvfs
 
-python-plaso:
+sift-package-python3-plaso:
   pkg.installed:
-    - name: python-plaso
+    - name: python3-plaso
     - version: latest
     - hold: False
     - refresh: True
@@ -18,6 +18,6 @@ python-plaso:
       - sls: sift.packages.absent.plaso
       - sls: sift.repos.sift
       - sls: sift.repos.gift
-      - sls: sift.packages.python
+      - sls: sift.packages.python3
       - sls: sift.packages.python-xlsxwriter
       - sls: sift.packages.python-dfvfs

sift/python-packages/indxparse.sls

@@ -1,18 +1,25 @@
 {%- set user = salt['pillar.get']('sift_user', 'sansforensics') -%}
-{%- set commit = "1b32736cf9f15d916f7c026346be068fdbe86cf2" -%}
+{%- set commit = "ca08236b0f70798cb6f89785820c9b82ee0c66ff" -%}
 
 include:
-  - ..packages.git
-  - ..packages.pkg-config
-  - ..packages.python-pip
+  - sift.packages.git
+  - sift.packages.g++
+  - sift.packages.libfuse-dev
+  - sift.packages.pkg-config
+  - sift.packages.python
+  - sift.packages.python-pip
+  - sift.packages.python-wxgtk3
 
 sift-python-package-indxparse:
   pip.installed:
     - name: git+https://github.com/williballenthin/INDXParse.git@{{ commit }}
     - require:
-      - pkg: git
-      - pkg: pkg-config
-      - pkg: python-pip
+      - sls: sift.packages.git
+      - sls: sift.packages.g++
+      - sls: sift.packages.pkg-config
+      - sls: sift.packages.python-pip
+      - sls: sift.packages.libfuse-dev
+      - sls: sift.packages.python-wxgtk3
 
 sift-python-package-indxparse-shebang:
   file.prepend:

sift/tests/gift.sls

@@ -23,7 +23,7 @@ include:
   - sift.packages.libvshadow-tools
   - sift.packages.plaso-data
   - sift.packages.plaso-tools
-  - sift.packages.python-plaso
+  - sift.packages.python3-plaso
 
 sift-tests-gift:
   test.nop:
@@ -53,4 +53,4 @@ sift-tests-gift:
         - sls: sift.packages.libvshadow-tools
         - sls: sift.packages.plaso-data
         - sls: sift.packages.plaso-tools
-        - sls: sift.packages.python-plaso
+        - sls: sift.packages.python3-plaso

sift/tests/libewf.sls

@@ -7,7 +7,7 @@ include:
   - sift.packages.python
   - sift.packages.python-xlsxwriter
   - sift.packages.python-dfvfs
-  - sift.packages.python-plaso
+  - sift.packages.python3-plaso
   - sift.packages.sleuthkit
   - sift.packages.xmount
 
@@ -23,6 +23,6 @@ sift-tests-libewf:
       - sls: sift.packages.python
       - sls: sift.packages.python-xlsxwriter
       - sls: sift.packages.python-dfvfs
-      - sls: sift.packages.python-plaso
+      - sls: sift.packages.python3-plaso
       - sls: sift.packages.sleuthkit
       - sls: sift.packages.xmount