Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sift/packages/bulk-extractor.sls
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@

include:
- sift.repos.sift
- sift.repos.openjdk
- sift.repos.adoptium

sift-package-bulk-extractor:
pkg.installed:
- name: bulk-extractor
- require:
- pkgrepo: sift-repo
- pkgrepo: openjdk-repo
- sls: sift.repos.adoptium
9 changes: 9 additions & 0 deletions sift/packages/hydra-gtk.sls
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,14 @@
# License: GNU General Public License v2 (https://github.com/vanhauser-thc/thc-hydra/blob/master/hydra-gtk/COPYING)
# Notes:

{% if grains['oscodename'] == 'resolute' %}

hydra-gtk-not-available-in-resolute:
test.nop

{% else %}

hydra-gtk:
pkg.installed

{% endif %}
14 changes: 6 additions & 8 deletions sift/packages/init.sls
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ include:
- sift.packages.aws-cli
- sift.packages.avfs
- sift.packages.binutils
- sift.packages.bless
- sift.packages.blt
- sift.packages.build-essential
- sift.packages.bulk-extractor
Expand All @@ -22,7 +21,7 @@ include:
- sift.packages.clamav
- sift.packages.claude-code
- sift.packages.cmospwd
- sift.packages.cryptcat
# - sift.packages.cryptcat
- sift.packages.cryptsetup
- sift.packages.curl
- sift.packages.dc3dd
Expand Down Expand Up @@ -92,7 +91,7 @@ include:
- sift.packages.liblightgrep
- sift.packages.libmsiecf
- sift.packages.libncurses
- sift.packages.libnet1
- sift.packages.libnet
- sift.packages.libolecf
- sift.packages.libparse-win32registry-perl
- sift.packages.libpff
Expand Down Expand Up @@ -126,7 +125,6 @@ include:
- sift.packages.okular
- sift.packages.onboard
- sift.packages.open-iscsi
- sift.packages.openjdk
- sift.packages.ophcrack
- sift.packages.ophcrack-cli
- sift.packages.orca
Expand Down Expand Up @@ -185,6 +183,7 @@ include:
- sift.packages.tcptrace
- sift.packages.tcptrack
- sift.packages.tcpxtract
- sift.packages.temurin-jdk
- sift.packages.testdisk
- sift.packages.tofrodos
- sift.packages.transmission
Expand Down Expand Up @@ -221,7 +220,6 @@ sift-packages:
- sls: sift.packages.aws-cli
- sls: sift.packages.avfs
- sls: sift.packages.binutils
- sls: sift.packages.bless
- sls: sift.packages.blt
- sls: sift.packages.build-essential
- sls: sift.packages.bulk-extractor
Expand All @@ -232,7 +230,7 @@ sift-packages:
- sls: sift.packages.clamav
- sls: sift.packages.claude-code
- sls: sift.packages.cmospwd
- sls: sift.packages.cryptcat
# - sls: sift.packages.cryptcat
- sls: sift.packages.cryptsetup
- sls: sift.packages.curl
- sls: sift.packages.dc3dd
Expand Down Expand Up @@ -302,7 +300,7 @@ sift-packages:
- sls: sift.packages.liblightgrep
- sls: sift.packages.libmsiecf
- sls: sift.packages.libncurses
- sls: sift.packages.libnet1
- sls: sift.packages.libnet
- sls: sift.packages.libolecf
- sls: sift.packages.libparse-win32registry-perl
- sls: sift.packages.libpff
Expand Down Expand Up @@ -336,7 +334,6 @@ sift-packages:
- sls: sift.packages.okular
- sls: sift.packages.onboard
- sls: sift.packages.open-iscsi
- sls: sift.packages.openjdk
- sls: sift.packages.ophcrack
- sls: sift.packages.ophcrack-cli
- sls: sift.packages.orca
Expand Down Expand Up @@ -395,6 +392,7 @@ sift-packages:
- sls: sift.packages.tcptrace
- sls: sift.packages.tcptrack
- sls: sift.packages.tcpxtract
- sls: sift.packages.temurin-jdk
- sls: sift.packages.testdisk
- sls: sift.packages.tofrodos
- sls: sift.packages.transmission
Expand Down
2 changes: 1 addition & 1 deletion sift/packages/libafflib.sls
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

{% if grains['oscodename'] == 'jammy' %}
{% set package = 'libafflib0v5' %}
{% elif grains['oscodename'] == 'noble' %}
{% elif grains['oscodename'] == 'noble' or grains['oscodename'] == 'resolute' %}
{% set package = 'libafflib0t64' %}
{% endif %}

Expand Down
2 changes: 1 addition & 1 deletion sift/packages/libext2fs2.sls
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

{% if grains['oscodename'] == 'jammy' %}
{% set package = 'libext2fs2' %}
{% elif grains['oscodename'] == 'noble' %}
{% elif grains['oscodename'] == 'noble' or grains['oscodename'] == 'resolute' %}
{% set package = 'libext2fs2t64' %}
{% endif %}

Expand Down
2 changes: 2 additions & 0 deletions sift/packages/libgirepository.sls
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@ sift-package-libgirepository:
- name: libgirepository1.0-dev
{% elif grains['oscodename'] == "noble" %}
- name: libgirepository-2.0-dev
{% elif grains['oscodename'] == "resolute" %}
- name: libgirepository-2.0-dev
{% endif %}
9 changes: 9 additions & 0 deletions sift/packages/libnet.sls
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{% if grains['oscodename'] == 'resolute' %}
{% set package = 'libnet9' %}
{% else %}
{% set package = 'libnet1' %}
{% endif %}

sift-package-libnet:
pkg.installed:
- name: {{ package }}
2 changes: 0 additions & 2 deletions sift/packages/libnet1.sls

This file was deleted.

2 changes: 1 addition & 1 deletion sift/packages/libpff.sls
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

{% if grains['oscodename'] == 'jammy' %}
{% set package = 'libpff1' %}
{% elif grains['oscodename'] == 'noble' %}
{% elif grains['oscodename'] == 'noble' or grains['oscodename'] == 'resolute' %}
{% set package = 'libpff1t64' %}
{% endif %}

Expand Down
9 changes: 0 additions & 9 deletions sift/packages/openjdk.sls

This file was deleted.

4 changes: 2 additions & 2 deletions sift/packages/p7zip-full.sls
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% if grains['oscodename'] == 'resolute' %}
{% set package = '7zip' %}
{% set package = '7zip' %}
{% else %}
{% set package = 'p7zip-full' %}
{% set package = 'p7zip-full' %}
{% endif %}

sift-package-{{ package }}:
Expand Down
7 changes: 1 addition & 6 deletions sift/packages/rar.sls
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
{%- if grains["oscodename"] == "noble" -%}
sift-rar:
test.nop
{%- else -%}
include:
- sift.repos.ubuntu-multiverse

sift-rar:
sift-package-rar:
pkg.installed:
- name: rar
- require:
- sls: sift.repos.ubuntu-multiverse
{%- endif -%}
9 changes: 9 additions & 0 deletions sift/packages/temurin-jdk.sls
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
include:
- sift.repos.adoptium

sift-package-temurin-jdk:
pkg.installed:
- name: temurin-8-jdk
- require:
- sls: sift.repos.adoptium

8 changes: 7 additions & 1 deletion sift/packages/wine.sls
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
{% if grains['oscodename'] == 'resolute' %}
{% set package = 'wine' %}
{% else %}
{% set package = 'wine-stable' %}
{% endif %}

sift-package-wine:
pkg.latest:
- name: wine-stable
- name: {{ package }}
2 changes: 2 additions & 0 deletions sift/python3-packages/indxparse.sls
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
{% set py_ver = '3.10' %}
{% elif grains['oscodename'] == 'noble' %}
{% set py_ver = '3.12' %}
{% elif grains['oscodename'] == 'resolute' %}
{% set py_ver = '3.14' %}
{% endif %}
{%- set commit = "038e8ec836cf23600124db74b40757b7184c08c5" -%}
{% set files = ['INDXParse.py','MFTINDX.py','MFTView.py','SDS_get_index.py','extract_mft_record_slack.py','get_file_info.py','list_mft.py','fuse-mft.py','tree_mft.py'] %}
Expand Down
8 changes: 4 additions & 4 deletions sift/python3-packages/init.sls
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ include:
- sift.python3-packages.java-idx-parser
- sift.python3-packages.mac-apt
- sift.python3-packages.machinae
- sift.python3-packages.mulder
# - sift.python3-packages.mulder
- sift.python3-packages.mvt
- sift.python3-packages.page-brute
- sift.python3-packages.pe-carver
- sift.python3-packages.pe-scanner
- sift.python3-packages.python-evtx
- sift.python3-packages.sqlite-carver
- sift.python3-packages.stix-validator
- sift.python3-packages.trudi
# - sift.python3-packages.trudi
- sift.python3-packages.ufade
- sift.python3-packages.usbdeviceforensics
- sift.python3-packages.usnparser
Expand All @@ -38,15 +38,15 @@ sift-python3-packages:
- sls: sift.python3-packages.java-idx-parser
- sls: sift.python3-packages.mac-apt
- sls: sift.python3-packages.machinae
- sls: sift.python3-packages.mulder
# - sls: sift.python3-packages.mulder
- sls: sift.python3-packages.mvt
- sls: sift.python3-packages.page-brute
- sls: sift.python3-packages.pe-carver
- sls: sift.python3-packages.pe-scanner
- sls: sift.python3-packages.python-evtx
- sls: sift.python3-packages.sqlite-carver
- sls: sift.python3-packages.stix-validator
- sls: sift.python3-packages.trudi
# - sls: sift.python3-packages.trudi
- sls: sift.python3-packages.ufade
- sls: sift.python3-packages.usbdeviceforensics
- sls: sift.python3-packages.usnparser
Expand Down
4 changes: 3 additions & 1 deletion sift/python3-packages/python-evtx.sls
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@

{% set files = ['evtx_dump','evtx_dump_chunk_slack','evtx_dump_json','evtx_eid_record_numbers','evtx_extract_record','evtx_filter_records','evtx_info','evtx_record_structure','evtx_structure','evtx_templates'] %}
{% set commit = '1a1357accd3a75524794a6d6dcdec03c09e1660d' %}
{% if grains['oscodename'] == 'noble' %}
{% if grains['oscodename'] == 'resolute' %}
{% set py_ver = '3.14' %}
{% elif grains['oscodename'] == 'noble' %}
{% set py_ver = '3.12' %}
{% elif grains['oscodename'] == 'jammy' %}
{% set py_ver = '3.10' %}
Expand Down
33 changes: 33 additions & 0 deletions sift/repos/adoptium.sls
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
sift-adoptium-key:
file.managed:
- name: /usr/share/keyrings/ADOPTIUM.asc
- source: https://packages.adoptium.net/artifactory/api/gpg/key/public
- skip_verify: True
- makedirs: True

sift-adoptium-openjdk-repo-cleanup:
pkgrepo.absent:
- name: openjdk-r/ppa
- refresh: True

sift-adoptium-openjdk-list-absent:
file.absent:
- name: /etc/apt/sources.list.d/openjdk-r-ubuntu-ppa-{{ grains['lsb_distrib_codename'] }}.sources
- require:
- pkgrepo: sift-adoptium-openjdk-repo-cleanup

sift-adoptium-repo:
file.managed:
- name: /etc/apt/sources.list.d/adoptium.sources
- contents: |
Types: deb
URIs: https://packages.adoptium.net/artifactory/deb
Suites: {{ grains['lsb_distrib_codename'] }}
Components: main
Signed-By: /usr/share/keyrings/ADOPTIUM.asc
Architectures: amd64
- require:
- file: sift-adoptium-key
- pkgrepo: sift-adoptium-openjdk-repo-cleanup
- file: sift-adoptium-openjdk-list-absent

4 changes: 2 additions & 2 deletions sift/repos/init.sls
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include:
- sift.repos.docker
- sift.repos.gift
- sift.repos.sift
- sift.repos.openjdk
- sift.repos.adoptium
- sift.repos.ubuntu-multiverse
- sift.repos.ubuntu-universe
- sift.repos.dotnet-backports
Expand All @@ -16,7 +16,7 @@ sift-repos:
- sls: sift.repos.docker
- sls: sift.repos.gift
- sls: sift.repos.sift
- sls: sift.repos.openjdk
- sls: sift.repos.adoptium
- sls: sift.repos.ubuntu-multiverse
- sls: sift.repos.ubuntu-universe
- sls: sift.repos.dotnet-backports
Expand Down
11 changes: 0 additions & 11 deletions sift/repos/openjdk.sls

This file was deleted.

Loading