Updates for libimobile

dist/checksums.txt

@@ -0,0 +1,2 @@
+32e7d002c6db9b0ac681b6ca886d399cb3665388b6370e8ecc622772049bc8567b87bc75800f5d067cd0f61a689452c81d91262304189e9e0b85bf82e8ab3b63 digitalsleuth-mat-salt-v2023.1.3-0-g14d9185.tar.gz
+99773ccf3d10c953178d82133da3f4600e1df0c717bb2901d541538d5e2e33154518310cbf8b2b466d4d7d1657a6a2927caad3bbcdd7589387187966b3328ef0 manifest.yml

dist/manifest.yml

@@ -0,0 +1,19 @@
+version: 2
+name: mat
+base_dir: mat
+modes:
+    - name: addon
+      state: mat.addon
+      default: true
+    - name: dedicated
+      state: mat.dedicated
+saltstack:
+    pillars:
+        mat_user_template: '{{ .User }}'
+supported_os:
+    - id: ubuntu
+      release: "22.04"
+      codename: jammy
+    - id: ubuntu
+      release: "20.04"
+      codename: focal

mat/VERSION

@@ -1 +1 @@
-v2023.1.3
+v2023.2.0

mat/repos/docker.sls

@@ -1,13 +1,21 @@
 include:
   - mat.apt-packages.software-properties-common
 
+mat-repos-docker-key:
+  file.managed:
+    - name: /usr/share/keyrings/DOCKER-PGP-KEY.asc
+    - source: https://download.docker.com/linux/ubuntu/gpg
+    - skip_verify: True
+    - makedirs: True
+
 mat-repos-docker:
   pkgrepo.managed:
     - humanname: Docker
-    - name: deb [arch=amd64] https://download.docker.com/linux/ubuntu {{ grains['lsb_distrib_codename'] }} stable
+    - name: deb [arch=amd64 signed-by=/usr/share/keyrings/DOCKER-PGP-KEY.asc] https://download.docker.com/linux/ubuntu {{ grains['lsb_distrib_codename'] }} stable
     - dist: {{ grains['lsb_distrib_codename'] }}
     - file: /etc/apt/sources.list.d/docker.list
-    - key_url: https://download.docker.com/linux/ubuntu/gpg
     - refresh: true
+    - clean_file: True
     - require:
       - sls: mat.apt-packages.software-properties-common
+      - file: mat-repos-docker-key

mat/repos/gift.sls

@@ -1,7 +1,16 @@
+mat-gift-key:
+  file.managed:
+    - name: /usr/share/keyrings/GIFT-GPG-KEY.asc
+    - source: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x5e80511b10c598b8
+    - skip_verify: True
+    - makedirs: True
+
 gift-repo:
   pkgrepo.managed:
-    - humanname: gift
-    - ppa: gift/stable
+    - name: deb [arch=amd64 signed-by=/usr/share/keyrings/GIFT-GPG-KEY.asc] http://ppa.launchpad.net/gift/stable/ubuntu {{ grains['lsb_distrib_codename'] }} main
+    - dist: {{ grains['lsb_distrib_codename'] }}
+    - file: /etc/apt/sources.list.d/gift-ubunt-stable-{{ grains['lsb_distrib_codename'] }}.list
     - refresh: true
-    - key_url: salt://mat.repos.keys/GIFT-GPG-KEY.asc
-    - gpgcheck: 1
+    - clean_file: True
+    - require:
+      - file: mat-gift-key

mat/repos/giuspen.sls

@@ -1,5 +1,17 @@
+mat-giuspen-key:
+  file.managed:
+    - name: /usr/share/keyrings/GIUSPEN-GPG-KEY.asc
+    - source: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xb8668b055fe1efe4
+    - skip_verify: True
+    - makedirs: True
+
 mat-repos-giuspen:
   pkgrepo.managed:
-    - ppa: giuspen/ppa
+    - humanname: giuspen
+    - name: deb [arch=amd64 signed-by=/usr/share/keyrings/GIUSPEN-GPG-KEY.asc] https://ppa.launchpadcontent.net/giuspen/ppa/ubuntu {{ grains['lsb_distrib_codename'] }} main
+    - dist: {{ grains['lsb_distrib_codename'] }}
+    - file: /etc/apt/sources.list.d/giuspen.list
     - refresh: True
-    - keyid_ppa: True
+    - clean_file: True
+    - require:
+      - file: mat-giuspen-key

mat/repos/linuxgndu.sls

@@ -1,7 +1,17 @@
+mat-linuxgndu-key:
+  file.managed:
+    - name: /usr/share/keyrings/LINUXGNDU-GPG.asc
+    - source: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xb0c3f48a7f2583ea
+    - skip_verify: True
+    - makedirs: True
+
 linuxgndu:
   pkgrepo.managed:
     - humanname: linuxgndu
-    - ppa: linuxgndu/sqlitebrowser
+    - name: deb [arch=amd64 signed-by=/usr/share/keyrings/LINUXGNDU-GPG.asc] https://ppa.launchpadcontent.net/linuxgndu/sqlitebrowser/ubuntu {{ grains['lsb_distrib_codename'] }} main
+    - dist: {{ grains['lsb_distrib_codename'] }}
+    - file: /etc/apt/sources.list.d/linuxgndu.list
     - refresh: True
-    - key_url: salt://mat/repos/keys/LINUXGNDU-GPG-KEY.asc
-    - gpgcheck: 1
+    - clean_file: True
+    - require:
+      - file: mat-linuxgndu-key

mat/repos/nodejs.sls

@@ -1,8 +1,22 @@
+mat-nodejs-key:
+  file.managed:
+    - name: /usr/share/keyrings/NODESOURCE-GPG.KEY
+    - source: http://deb.nodesource.com/gpgkey/nodesource.gpg.key
+    - skip_verify: True
+    - makedirs: True
+
+mat-nodejs-repo-cleanup:
+  pkgrepo.absent:
+    - name: deb https://deb.nodesource.com/node_14.x {{ grains['lsb_distrib_codename'] }} main
+    - refresh: true
+
 nodejs-repo:
   pkgrepo.managed:
     - humanname: nodejs
-    - name: deb https://deb.nodesource.com/node_14.x {{ grains['lsb_distrib_codename'] }} main
+    - name: deb [signed-by=/usr/share/keyrings/NODESOURCE-GPG.KEY] https://deb.nodesource.com/node_14.x {{ grains['lsb_distrib_codename'] }} main
     - file: /etc/apt/sources.list.d/nodesource.list
-    - key_url: https://deb.nodesource.com/gpgkey/nodesource.gpg.key
-    - gpgcheck: 1
     - refresh: true
+    - clean_file: True
+    - require:
+      - file: mat-nodejs-key
+      - pkgrepo: mat-nodejs-repo-cleanup

mat/repos/remnux.sls

@@ -1,5 +1,15 @@
-mat-repos-remnux:
+mat-remnux-repo-key:
+  file.managed:
+    - name: /usr/share/keyrings/REMNUX-GPG-KEY.asc
+    - source: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xbff45016788de115
+    - skip_verify: True
+    - makedirs: True
+
+mat-remnux-repo:
   pkgrepo.managed:
-    - ppa: remnux/stable
-    - refresh: true
-    - keyid_ppa: true
+    - name: deb [signed-by=/usr/share/keyrings/REMNUX-GPG-KEY.asc] https://ppa.launchpadcontent.net/remnux/stable/ubuntu/ {{ grains['lsb_distrib_codename'] }} main
+    - file: /etc/apt/sources.list.d/remnux-stable-{{ grains['lsb_distrib_codename'] }}.list
+    - refresh: True
+    - clean_file: True
+    - require:
+      - file: mat-remnux-repo-key

mat/repos/sift.sls

@@ -1,5 +1,31 @@
-mat-repos-sift:
-  pkgrepo.managed:
+{%- set version = salt['grains.get']('mat_version', 'stable') -%}
+
+{%- if version == "stable" %}
+
+sift-dev:
+  pkgrepo.absent:
+    - ppa: sift/dev
+
+{%- else %}
+
+sift-stable:
+  pkgrepo.absent:
     - ppa: sift/stable
-    - refresh: true
-    - keyid_ppa: true
+
+{%- endif %}
+
+sift-repo-key:
+  file.managed:
+    - name: /usr/share/keyrings/SIFT-GPG-KEY.asc
+    - source: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xb2a668dd0744bec3
+    - skip_verify: True
+    - makedirs: True
+
+sift-repo:
+  pkgrepo.managed:
+    - name: deb [signed-by=/usr/share/keyrings/SIFT-GPG-KEY.asc] https://ppa.launchpad.net/sift/stable/ubuntu {{ grains['lsb_distrib_codename'] }} main
+    - file: /etc/apt/sources.list.d/sift-stable-{{ grains['lsb_distrib_codename'] }}.list
+    - refresh: True
+    - clean_file: True
+    - require:
+      - file: sift-repo-key

mat/tools/libimobile.sls

@@ -42,6 +42,7 @@ clone-{{ repo }}:
   git.latest:
     - name: {{ repo_base }}/{{ repo }}
     - target: /usr/local/src/libimobile/{{ repo }}
+    - force_reset: True
     - require:
       - sls: mat.apt-packages.git
 
@@ -83,4 +84,3 @@ make-install-{{ repo }}:
 
 ldconfig:
   cmd.run
-