From 0d02512e9f535fc775d094ca9d0a37ad2a63e9ab Mon Sep 17 00:00:00 2001
From: digitalsleuth <corey@digitalsleuth.ca>
Date: Sun, 19 Jan 2025 22:11:58 +0000
Subject: [PATCH 1/2] Update libafflib for 24

---
 sift/packages/libafflib-dev.sls | 10 +++++++++-
 sift/packages/libafflib.sls     | 20 +++++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/sift/packages/libafflib-dev.sls b/sift/packages/libafflib-dev.sls
index 3254cb9f..f35364f7 100644
--- a/sift/packages/libafflib-dev.sls
+++ b/sift/packages/libafflib-dev.sls
@@ -1,2 +1,10 @@
+# Name: AFFLIBv3
+# Website: https://github.com/sshock/AFFLIBv3
+# Description: Development file for AFFLIB
+# Category:
+# Author: Simson L. Garfinkel / Phillip Hellewell et al (https://github.com/sshock/AFFLIBv3/blob/master/AUTHORS)
+# License: Multiple Licenses (https://github.com/sshock/AFFLIBv3/blob/master/COPYING)
+# Notes:
+
 libafflib-dev:
-  pkg.installed
\ No newline at end of file
+  pkg.installed
diff --git a/sift/packages/libafflib.sls b/sift/packages/libafflib.sls
index e6c810c5..e8304765 100644
--- a/sift/packages/libafflib.sls
+++ b/sift/packages/libafflib.sls
@@ -1,3 +1,21 @@
-libafflib:
+# Name: AFFLIBv3
+# Website: https://github.com/sshock/AFFLIBv3
+# Description: AFF is an open and extensible file format to store disk images
+# Category:
+# Author: Simson L. Garfinkel / Phillip Hellewell et al (https://github.com/sshock/AFFLIBv3/blob/master/AUTHORS)
+# License: Multiple Licenses (https://github.com/sshock/AFFLIBv3/blob/master/COPYING)
+# Notes:
+
+{% if grains['oscodename'] == 'jammy' %}
+
+sift-package-libafflib0v5:
   pkg.installed:
     - name: libafflib0v5
+
+{% elif grains['oscodename'] == 'noble' %}
+
+sift-package-libafflib0t64:
+  pkg.installed:
+    - name: libafflib0t64
+
+{% endif %}

From 5ea15102102f985edac4fc92e598eb820dc605da Mon Sep 17 00:00:00 2001
From: digitalsleuth <corey@digitalsleuth.ca>
Date: Tue, 21 Jan 2025 02:06:25 +0000
Subject: [PATCH 2/2] Update state to have package names dependent on OS, but
 state title remains the same

---
 sift/packages/libafflib.sls | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/sift/packages/libafflib.sls b/sift/packages/libafflib.sls
index e8304765..3a598dc9 100644
--- a/sift/packages/libafflib.sls
+++ b/sift/packages/libafflib.sls
@@ -7,15 +7,11 @@
 # Notes:
 
 {% if grains['oscodename'] == 'jammy' %}
-
-sift-package-libafflib0v5:
-  pkg.installed:
-    - name: libafflib0v5
-
+  {% set package = 'libafflib0v5' %}
 {% elif grains['oscodename'] == 'noble' %}
+  {% set package = 'libafflib0t64' %}
+{% endif %}
 
-sift-package-libafflib0t64:
+sift-package-libafflib:
   pkg.installed:
-    - name: libafflib0t64
-
-{% endif %}
+    - name: {{ package }}