diff --git a/sift/packages/bulk-extractor.sls b/sift/packages/bulk-extractor.sls index fb0b545f..ffae6288 100644 --- a/sift/packages/bulk-extractor.sls +++ b/sift/packages/bulk-extractor.sls @@ -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 diff --git a/sift/packages/hydra-gtk.sls b/sift/packages/hydra-gtk.sls index 301b3027..661ee645 100644 --- a/sift/packages/hydra-gtk.sls +++ b/sift/packages/hydra-gtk.sls @@ -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 %} diff --git a/sift/packages/init.sls b/sift/packages/init.sls index 960255a9..a46e57c0 100644 --- a/sift/packages/init.sls +++ b/sift/packages/init.sls @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/sift/packages/libafflib.sls b/sift/packages/libafflib.sls index 3a598dc9..f49bdf98 100644 --- a/sift/packages/libafflib.sls +++ b/sift/packages/libafflib.sls @@ -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 %} diff --git a/sift/packages/libext2fs2.sls b/sift/packages/libext2fs2.sls index 73938ad3..2ec56b67 100644 --- a/sift/packages/libext2fs2.sls +++ b/sift/packages/libext2fs2.sls @@ -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 %} diff --git a/sift/packages/libgirepository.sls b/sift/packages/libgirepository.sls index 895864e1..bf88851a 100644 --- a/sift/packages/libgirepository.sls +++ b/sift/packages/libgirepository.sls @@ -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 %} diff --git a/sift/packages/libnet.sls b/sift/packages/libnet.sls new file mode 100644 index 00000000..222265df --- /dev/null +++ b/sift/packages/libnet.sls @@ -0,0 +1,9 @@ +{% if grains['oscodename'] == 'resolute' %} + {% set package = 'libnet9' %} +{% else %} + {% set package = 'libnet1' %} +{% endif %} + +sift-package-libnet: + pkg.installed: + - name: {{ package }} diff --git a/sift/packages/libnet1.sls b/sift/packages/libnet1.sls deleted file mode 100644 index 9f26c886..00000000 --- a/sift/packages/libnet1.sls +++ /dev/null @@ -1,2 +0,0 @@ -libnet1: - pkg.installed \ No newline at end of file diff --git a/sift/packages/libpff.sls b/sift/packages/libpff.sls index 0cca7323..9c05f34e 100644 --- a/sift/packages/libpff.sls +++ b/sift/packages/libpff.sls @@ -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 %} diff --git a/sift/packages/openjdk.sls b/sift/packages/openjdk.sls deleted file mode 100644 index 5517c1f3..00000000 --- a/sift/packages/openjdk.sls +++ /dev/null @@ -1,9 +0,0 @@ -include: - - sift.repos.openjdk - -openjdk: - pkg.installed: - - name: openjdk-8-jdk - - require: - - sls: sift.repos.openjdk - diff --git a/sift/packages/p7zip-full.sls b/sift/packages/p7zip-full.sls index 208fb14d..a60f6d22 100644 --- a/sift/packages/p7zip-full.sls +++ b/sift/packages/p7zip-full.sls @@ -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 }}: diff --git a/sift/packages/rar.sls b/sift/packages/rar.sls index 573ea90c..8ae1623d 100644 --- a/sift/packages/rar.sls +++ b/sift/packages/rar.sls @@ -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 -%} diff --git a/sift/packages/temurin-jdk.sls b/sift/packages/temurin-jdk.sls new file mode 100644 index 00000000..ec132ff6 --- /dev/null +++ b/sift/packages/temurin-jdk.sls @@ -0,0 +1,9 @@ +include: + - sift.repos.adoptium + +sift-package-temurin-jdk: + pkg.installed: + - name: temurin-8-jdk + - require: + - sls: sift.repos.adoptium + diff --git a/sift/packages/wine.sls b/sift/packages/wine.sls index b7f7369e..caf69da6 100644 --- a/sift/packages/wine.sls +++ b/sift/packages/wine.sls @@ -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 }} diff --git a/sift/python3-packages/indxparse.sls b/sift/python3-packages/indxparse.sls index 5de38625..3bbb1c63 100644 --- a/sift/python3-packages/indxparse.sls +++ b/sift/python3-packages/indxparse.sls @@ -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'] %} diff --git a/sift/python3-packages/init.sls b/sift/python3-packages/init.sls index 9d536557..b1391356 100644 --- a/sift/python3-packages/init.sls +++ b/sift/python3-packages/init.sls @@ -9,7 +9,7 @@ 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 @@ -17,7 +17,7 @@ include: - 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 @@ -38,7 +38,7 @@ 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 @@ -46,7 +46,7 @@ sift-python3-packages: - 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 diff --git a/sift/python3-packages/python-evtx.sls b/sift/python3-packages/python-evtx.sls index d55b8d2c..90931e07 100644 --- a/sift/python3-packages/python-evtx.sls +++ b/sift/python3-packages/python-evtx.sls @@ -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' %} diff --git a/sift/repos/adoptium.sls b/sift/repos/adoptium.sls new file mode 100644 index 00000000..999f1119 --- /dev/null +++ b/sift/repos/adoptium.sls @@ -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 + diff --git a/sift/repos/init.sls b/sift/repos/init.sls index f4c68885..962cb4a6 100644 --- a/sift/repos/init.sls +++ b/sift/repos/init.sls @@ -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 @@ -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 diff --git a/sift/repos/openjdk.sls b/sift/repos/openjdk.sls deleted file mode 100644 index df6ab49b..00000000 --- a/sift/repos/openjdk.sls +++ /dev/null @@ -1,11 +0,0 @@ -include: - - sift.packages.software-properties-common - -openjdk-repo: - pkgrepo.managed: - - ppa: openjdk-r/ppa - - keyid: DA1A4A13543B466853BAF164EB9B1D8886F44E2A - - keyserver: keyserver.ubuntu.com - - refresh: true - - require: - - sls: sift.packages.software-properties-common