From 1e1f5c406e8c5028ea6430c977b514215a72dcff Mon Sep 17 00:00:00 2001 From: digitalsleuth Date: Wed, 28 Oct 2026 22:13:05 +0000 Subject: [PATCH 1/2] Final updates for 26 support --- sift/packages/build-essential.sls | 5 +++-- sift/packages/cmake.sls | 3 +++ sift/packages/init.sls | 4 ++++ sift/packages/libjpeg-dev.sls | 3 +++ sift/packages/outguess.sls | 12 ++++++++++-- sift/packages/pev.sls | 12 ++++++++++-- sift/packages/python3-fuse.sls | 7 +++++++ sift/packages/python3-pyfuse3.sls | 11 +++++++++++ sift/packages/rar.sls | 8 ++++++++ sift/packages/tcptrace.sls | 12 ++++++++++-- sift/python3-packages/imagemounter.sls | 7 +++++++ sift/python3-packages/mac-apt.sls | 2 ++ sift/python3-packages/ufade.sls | 4 ++++ sift/python3-packages/volatility3.sls | 2 ++ sift/repos/adoptium.sls | 2 +- 15 files changed, 85 insertions(+), 9 deletions(-) create mode 100644 sift/packages/cmake.sls create mode 100644 sift/packages/libjpeg-dev.sls create mode 100644 sift/packages/python3-pyfuse3.sls diff --git a/sift/packages/build-essential.sls b/sift/packages/build-essential.sls index e53be3de..34e3cbfb 100644 --- a/sift/packages/build-essential.sls +++ b/sift/packages/build-essential.sls @@ -1,2 +1,3 @@ -build-essential: - pkg.installed \ No newline at end of file +sift-package-build-essential: + pkg.installed: + - name: build-essential diff --git a/sift/packages/cmake.sls b/sift/packages/cmake.sls new file mode 100644 index 00000000..c7f4b5bf --- /dev/null +++ b/sift/packages/cmake.sls @@ -0,0 +1,3 @@ +sift-package-cmake: + pkg.installed: + - name: cmake diff --git a/sift/packages/init.sls b/sift/packages/init.sls index a46e57c0..8a4a071a 100644 --- a/sift/packages/init.sls +++ b/sift/packages/init.sls @@ -20,6 +20,7 @@ include: - sift.packages.cifs-utils - sift.packages.clamav - sift.packages.claude-code + - sift.packages.cmake - sift.packages.cmospwd # - sift.packages.cryptcat - sift.packages.cryptsetup @@ -147,6 +148,7 @@ include: - sift.packages.python3-fuse - sift.packages.python3-pefile - sift.packages.python3-pip + - sift.packages.python3-pyfuse3 - sift.packages.python3-pypff - sift.packages.python3-pyqt5 - sift.packages.python3-redis @@ -229,6 +231,7 @@ sift-packages: - sls: sift.packages.cifs-utils - sls: sift.packages.clamav - sls: sift.packages.claude-code + - sls: sift.packages.cmake - sls: sift.packages.cmospwd # - sls: sift.packages.cryptcat - sls: sift.packages.cryptsetup @@ -356,6 +359,7 @@ sift-packages: - sls: sift.packages.python3-fuse - sls: sift.packages.python3-pefile - sls: sift.packages.python3-pip + - sls: sift.packages.python3-pyfuse3 - sls: sift.packages.python3-pypff - sls: sift.packages.python3-pyqt5 - sls: sift.packages.python3-redis diff --git a/sift/packages/libjpeg-dev.sls b/sift/packages/libjpeg-dev.sls new file mode 100644 index 00000000..32ca5864 --- /dev/null +++ b/sift/packages/libjpeg-dev.sls @@ -0,0 +1,3 @@ +sift-package-libjpeg-dev: + pkg.installed: + - name: libjpeg-dev diff --git a/sift/packages/outguess.sls b/sift/packages/outguess.sls index 2860ee1f..447d3e27 100644 --- a/sift/packages/outguess.sls +++ b/sift/packages/outguess.sls @@ -1,2 +1,10 @@ -outguess: - pkg.installed \ No newline at end of file +{% if grains['oscodename'] == 'resolute' %} +outguess is not available on Ubuntu Resolute: + test.nop +{% else %} + +sift-package-outguess: + pkg.installed: + - name: outguess + +{% endif %} diff --git a/sift/packages/pev.sls b/sift/packages/pev.sls index 14c8e4e3..d66fe33d 100644 --- a/sift/packages/pev.sls +++ b/sift/packages/pev.sls @@ -1,2 +1,10 @@ -pev: - pkg.installed \ No newline at end of file +{% if grains['oscodename'] == 'resolute' %} +pev is not available on Ubuntu Resolute: + test.nop +{% else %} + +sift-package-pev: + pkg.installed: + - name: pev + +{% endif %} diff --git a/sift/packages/python3-fuse.sls b/sift/packages/python3-fuse.sls index 952db931..5221a883 100644 --- a/sift/packages/python3-fuse.sls +++ b/sift/packages/python3-fuse.sls @@ -1,3 +1,10 @@ +{% if grains['oscodename'] == 'resolute' %} +python3-fuse is not available in Ubuntu Resolute: + test.nop +{% else %} + sift-package-python3-fuse: pkg.installed: - name: python3-fuse + +{% endif %} diff --git a/sift/packages/python3-pyfuse3.sls b/sift/packages/python3-pyfuse3.sls new file mode 100644 index 00000000..abc2b156 --- /dev/null +++ b/sift/packages/python3-pyfuse3.sls @@ -0,0 +1,11 @@ +# Name: python3-pyfuse3 +# Website: https://github.com/libfuse/pyfuse3 +# Description: Python3 bindings for libfuse3 +# Category: +# Author: Nikolaus Rath +# License: GNU Lesser General Public License v2.1 (https://github.com/libfuse/pyfuse3/blob/main/LICENSE) +# Notes: + +sift-package-python3-pyfuse3: + pkg.installed: + - name: python3-pyfuse3 diff --git a/sift/packages/rar.sls b/sift/packages/rar.sls index 8ae1623d..19cc9bd0 100644 --- a/sift/packages/rar.sls +++ b/sift/packages/rar.sls @@ -1,3 +1,9 @@ + +{% if grains["osarch"] in ["arm64", "aarch64"] %} +rar is not available on arm64 systems: + test.nop +{% else %} + include: - sift.repos.ubuntu-multiverse @@ -6,3 +12,5 @@ sift-package-rar: - name: rar - require: - sls: sift.repos.ubuntu-multiverse + +{% endif %} diff --git a/sift/packages/tcptrace.sls b/sift/packages/tcptrace.sls index d1d7514f..e15d7233 100644 --- a/sift/packages/tcptrace.sls +++ b/sift/packages/tcptrace.sls @@ -1,2 +1,10 @@ -tcptrace: - pkg.installed \ No newline at end of file +{% if grains['oscodename'] == 'resolute' %} +tcptrace is not available on Ubuntu Resolute: + test.nop +{% else %} + +sift-package-tcptrace: + pkg.installed: + - name: tcptrace + +{% endif %} diff --git a/sift/python3-packages/imagemounter.sls b/sift/python3-packages/imagemounter.sls index 4225997f..f9b17874 100644 --- a/sift/python3-packages/imagemounter.sls +++ b/sift/python3-packages/imagemounter.sls @@ -6,6 +6,11 @@ # License: MIT License (https://github.com/ralphje/imagemounter/blob/master/LICENSE) # Notes: imount +{% if grains['oscodename'] == 'resolute' %} +imagemounter requirements are not available on Ubuntu Resolute: + test.nop +{% else %} + include: - sift.packages.python3-virtualenv - sift.packages.afflib-tools @@ -81,3 +86,5 @@ sift-python3-package-imagemounter-symlink: - makedirs: False - require: - pip: sift-python3-package-imagemounter + +{% endif %} diff --git a/sift/python3-packages/mac-apt.sls b/sift/python3-packages/mac-apt.sls index 9b6fdda8..48053b6c 100644 --- a/sift/python3-packages/mac-apt.sls +++ b/sift/python3-packages/mac-apt.sls @@ -14,6 +14,7 @@ include: - sift.packages.libbz2-dev - sift.packages.zlib1g-dev - sift.packages.git + - sift.packages.build-essential sift-python3-package-mac-apt-venv: virtualenv.managed: @@ -29,6 +30,7 @@ sift-python3-package-mac-apt-venv: - sls: sift.packages.python3-dev - sls: sift.packages.libbz2-dev - sls: sift.packages.zlib1g-dev + - sls: sift.packages.build-essential sift-python3-package-mac-apt-git: git.latest: diff --git a/sift/python3-packages/ufade.sls b/sift/python3-packages/ufade.sls index be3f15ae..23c2565e 100644 --- a/sift/python3-packages/ufade.sls +++ b/sift/python3-packages/ufade.sls @@ -18,6 +18,8 @@ include: - sift.packages.pkg-config - sift.packages.python3-dev - sift.packages.libssl-dev + - sift.packages.cmake + - sift.packages.build-essential sift-python3-package-ufade-virtualenv: virtualenv.managed: @@ -56,6 +58,8 @@ sift-python3-package-ufade-virtualenv: - sls: sift.packages.pkg-config - sls: sift.packages.python3-dev - sls: sift.packages.libssl-dev + - sls: sift.packages.cmake + - sls: sift.packages.build-essential sift-python3-package-ufade-git: git.latest: diff --git a/sift/python3-packages/volatility3.sls b/sift/python3-packages/volatility3.sls index 356b9d31..a26f6637 100644 --- a/sift/python3-packages/volatility3.sls +++ b/sift/python3-packages/volatility3.sls @@ -12,6 +12,7 @@ include: - sift.packages.python3-virtualenv - sift.packages.libusb-dev - sift.packages.pkg-config + - sift.packages.libjpeg-dev sift-python3-package-volatility3-venv: virtualenv.managed: @@ -32,6 +33,7 @@ sift-python3-package-volatility3-venv: - sls: sift.packages.python3-virtualenv - sls: sift.packages.libusb-dev - sls: sift.packages.pkg-config + - sls: sift.packages.libjpeg-dev sift-python3-package-volatility3: pip.installed: diff --git a/sift/repos/adoptium.sls b/sift/repos/adoptium.sls index 999f1119..889afe8c 100644 --- a/sift/repos/adoptium.sls +++ b/sift/repos/adoptium.sls @@ -25,7 +25,7 @@ sift-adoptium-repo: Suites: {{ grains['lsb_distrib_codename'] }} Components: main Signed-By: /usr/share/keyrings/ADOPTIUM.asc - Architectures: amd64 + Architectures: amd64 arm64 - require: - file: sift-adoptium-key - pkgrepo: sift-adoptium-openjdk-repo-cleanup From 6bef3deb05bcb7f007dac80bc5602a267d7496c0 Mon Sep 17 00:00:00 2001 From: digitalsleuth Date: Wed, 28 Oct 2026 22:24:18 +0000 Subject: [PATCH 2/2] Update format for consistency --- sift/packages/outguess.sls | 5 +++-- sift/packages/pev.sls | 5 +++-- sift/packages/python3-fuse.sls | 5 +++-- sift/packages/tcptrace.sls | 5 +++-- sift/python3-packages/imagemounter.sls | 5 +++-- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/sift/packages/outguess.sls b/sift/packages/outguess.sls index 447d3e27..7eaf4c9f 100644 --- a/sift/packages/outguess.sls +++ b/sift/packages/outguess.sls @@ -1,6 +1,7 @@ {% if grains['oscodename'] == 'resolute' %} -outguess is not available on Ubuntu Resolute: - test.nop +sift-package-outguess: + test.nop: + - name: outguess is not available on ubuntu resolute {% else %} sift-package-outguess: diff --git a/sift/packages/pev.sls b/sift/packages/pev.sls index d66fe33d..0ee80702 100644 --- a/sift/packages/pev.sls +++ b/sift/packages/pev.sls @@ -1,6 +1,7 @@ {% if grains['oscodename'] == 'resolute' %} -pev is not available on Ubuntu Resolute: - test.nop +sift-package-pev: + test.nop: + - name: pev is not available on ubuntu resolute {% else %} sift-package-pev: diff --git a/sift/packages/python3-fuse.sls b/sift/packages/python3-fuse.sls index 5221a883..15a1053d 100644 --- a/sift/packages/python3-fuse.sls +++ b/sift/packages/python3-fuse.sls @@ -1,6 +1,7 @@ {% if grains['oscodename'] == 'resolute' %} -python3-fuse is not available in Ubuntu Resolute: - test.nop +sift-package-python3-fuse: + test.nop: + - name: python3-fuse is not available in ubuntu resolute {% else %} sift-package-python3-fuse: diff --git a/sift/packages/tcptrace.sls b/sift/packages/tcptrace.sls index e15d7233..9950d52c 100644 --- a/sift/packages/tcptrace.sls +++ b/sift/packages/tcptrace.sls @@ -1,6 +1,7 @@ {% if grains['oscodename'] == 'resolute' %} -tcptrace is not available on Ubuntu Resolute: - test.nop +sift-package-tcptrace: + test.nop: + - name: tcptrace is not available on ubuntu resolute {% else %} sift-package-tcptrace: diff --git a/sift/python3-packages/imagemounter.sls b/sift/python3-packages/imagemounter.sls index f9b17874..9b5b3302 100644 --- a/sift/python3-packages/imagemounter.sls +++ b/sift/python3-packages/imagemounter.sls @@ -7,8 +7,9 @@ # Notes: imount {% if grains['oscodename'] == 'resolute' %} -imagemounter requirements are not available on Ubuntu Resolute: - test.nop +sift-python3-package-imagemounter: + test.nop: + - name: imagemounter requirements are not available on ubuntu resolute {% else %} include: