Skip to content

Commit

Permalink
more tweaks more tests
Browse files Browse the repository at this point in the history
  • Loading branch information
ekristen committed Nov 5, 2024
1 parent 9ff4b40 commit c9726a4
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 81 deletions.
4 changes: 2 additions & 2 deletions sift/python3-packages/core.sls
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
include:
- sift.python3-packages.pip
#- sift.python3-packages.pip
- sift.python3-packages.wheel
- sift.python3-packages.setuptools

sift-python3-packages-core:
test.nop:
- name: python3-packages-core
- require:
- sls: sift.python3-packages.pip
#- sls: sift.python3-packages.pip
- sls: sift.python3-packages.wheel
- sls: sift.python3-packages.setuptools
10 changes: 2 additions & 8 deletions sift/python3-packages/init.sls
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
include:
- sift.python3-packages.core
- sift.python3-packages.analyzemft
- sift.python3-packages.pip
- sift.python3-packages.python3-keyring
- sift.python3-packages.argparse
- sift.python3-packages.bitstring
- sift.python3-packages.colorama
- sift.python3-packages.geoip2
- sift.python3-packages.ioc_writer
### - sift.python3-packages.imagemounter
- sift.python3-packages.keyrings-alt
- sift.python3-packages.lxml
- sift.python3-packages.machinae
Expand All @@ -18,28 +17,25 @@ include:
- sift.python3-packages.python-evtx
- sift.python3-packages.python-magic
- sift.python3-packages.python-registry
- sift.python3-packages.setuptools
- sift.python3-packages.setuptools-rust
- sift.python3-packages.six
- sift.python3-packages.stix-validator
- sift.python3-packages.stix
- sift.python3-packages.virustotal-api
- sift.python3-packages.wheel
- sift.python3-packages.yara-python

sift-python3-packages:
test.nop:
- name: sift-python3-packages
- require:
- sls: sift.python3-packages.core
- sls: sift.python3-packages.analyzemft
- sls: sift.python3-packages.pip
- sls: sift.python3-packages.python3-keyring
- sls: sift.python3-packages.argparse
- sls: sift.python3-packages.bitstring
- sls: sift.python3-packages.colorama
- sls: sift.python3-packages.geoip2
- sls: sift.python3-packages.ioc_writer
### - sls: sift.python3-packages.imagemounter
- sls: sift.python3-packages.keyrings-alt
- sls: sift.python3-packages.lxml
- sls: sift.python3-packages.machinae
Expand All @@ -50,11 +46,9 @@ sift-python3-packages:
- sls: sift.python3-packages.python-evtx
- sls: sift.python3-packages.python-magic
- sls: sift.python3-packages.python-registry
- sls: sift.python3-packages.setuptools
- sls: sift.python3-packages.setuptools-rust
- sls: sift.python3-packages.six
- sls: sift.python3-packages.stix-validator
- sls: sift.python3-packages.stix
- sls: sift.python3-packages.virustotal-api
- sls: sift.python3-packages.wheel
- sls: sift.python3-packages.yara-python
39 changes: 3 additions & 36 deletions sift/scripts/exiftool.sls
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# source=https://owl.phy.queensu.ca/~phil/exiftool/
# license=free

{% set exiftool_version = '10.60' -%}
{% set exiftool_sha256 = 'df0988f60e1a6c086799e1f2ecd419e8abbad4dfb5dfa66c6080c78a5cb7acfa' -%}
{% set exiftool_version = '13.01' -%}
{% set exiftool_sha256 = 'ab81649054488b6b7bac79c08bf6cfbfd295ecdf2f20f3db67aabdfc07633391' -%}

include:
- sift.packages.patch

sift-exiftool-source:
file.managed:
- name: /var/cache/sift/archives/Image-ExifTool-{{ exiftool_version }}.tar.gz
- source: https://owl.phy.queensu.ca/~phil/exiftool/Image-ExifTool-{{ exiftool_version }}.tar.gz
- source: https://exiftool.org/Image-ExifTool-{{ exiftool_version }}.tar.gz
- source_hash: sha256={{ exiftool_sha256 }}
- makedirs: True

Expand All @@ -22,44 +22,11 @@ sift-exiftool-extracted:
- watch:
- file: sift-exiftool-source

sift-exiftool-patch-file:
file.managed:
- name: /usr/local/src/exiftool-{{ exiftool_version }}/exiftool.patch
- contents: |
diff --git 1/exiftool 2/exiftool
index eeff10b..a7c1259 100755
--- 1/exiftool
+++ 2/exiftool
@@ -18,7 +18,7 @@ my $version = '10.60';
my $exeDir;
BEGIN {
# get exe directory
- $exeDir = ($0 =~ /(.*)[\\\/]/) ? $1 : '.';
+ $exeDir = "/usr/local/share/exiftool-$version/Image-ExifTool-$version";
# add lib directory at start of include path
unshift @INC, "$exeDir/lib";
# load or disable config file if specified
- watch:
- archive: sift-exiftool-extracted

sift-exiftool-patch:
file.patch:
- name: /usr/local/src/exiftool-{{ exiftool_version }}/Image-ExifTool-{{ exiftool_version }}/exiftool
- source: /usr/local/src/exiftool-{{ exiftool_version }}/exiftool.patch
- hash: sha256=8790e165825aa7028d3a71ce656c876f8430d2505c6ca5aa058e74b16faee611
- require:
- sls: sift.packages.patch
- file: sift-exiftool-patch-file
- watch:
- archive: sift-exiftool-extracted

sift-exiftool-binary:
file.managed:
- name: /usr/local/bin/exiftool
- source: /usr/local/src/exiftool-{{ exiftool_version }}/Image-ExifTool-{{ exiftool_version }}/exiftool
- mode: 755
- watch:
- file: sift-exiftool-patch



35 changes: 0 additions & 35 deletions sift/scripts/plutil.sls

This file was deleted.

0 comments on commit c9726a4

Please sign in to comment.