Split core.utils, require glibc and update some of the groups

sls/core/utils.sls

@@ -1,81 +1,9 @@
-utils-purged:
-  pkg.purged:
-    - pkgs:
-      - net-misc/telnet-bsd
-      - www-client/elinks
-      - www-client/links
-      {% if salt['grains.get']('diskless', False) %}
-      - sys-apps/hdparm
-      - sys-apps/smartmontools
-      {% endif %}
-
-util-linux:
-  portage_config.flags:
-    - name: "sys-apps/util-linux"
-    - use:
-      - tty-helpers
-      - fdformat
-
-# Add mailutils here
-
-utils-latest:
-  pkg.latest:
-    - require:
-      - pkg: utils-purged
-      - portage_config: util-linux
-    - pkgs:
-      - app-arch/bzip2
-      - app-arch/gzip
-      - app-arch/tar
-      - app-arch/xz-utils
-      - app-text/tree
-      - net-analyzer/mtr
-      - net-analyzer/tcpdump
-      - net-analyzer/traceroute
-      - net-analyzer/iftop
-      - net-ftp/ftp
-      - net-misc/curl: "[ssl,adns]"
-      - net-misc/iputils
-      - net-misc/rsync
-      - net-misc/netkit-telnetd
-      - net-misc/wget: "~"
-      - net-misc/whois 
-      - sys-apps/attr
-      - sys-apps/coreutils
-      - sys-apps/diffutils
-      - sys-apps/elfix
-      - sys-apps/file
-      - sys-apps/findutils
-      - sys-apps/gawk
-      - sys-apps/grep
-      - sys-apps/iproute2
-      - sys-apps/kbd
-      - sys-apps/less
-      - sys-apps/man-pages
-      - sys-apps/net-tools
-      - sys-apps/sed
-      - sys-apps/util-linux: "[tty-helpers,fdformat]"
-      - sys-apps/which
-      - sys-process/atop: "~>=2.2"
-      - sys-process/iotop
-      - sys-process/lsof
-      - sys-process/ftop
-      - sys-process/procps
-      - sys-process/psmisc
-      - app-misc/screen
-      - app-shells/zsh
-      - app-doc/zsh-lovers
-      - app-admin/killproc
-      - sys-devel/bc
-      {% if not salt['grains.get']('diskless', False) %}
-      - sys-fs/e2fsprogs
-      - sys-fs/xfsprogs
-      - sys-apps/hdparm
-      - sys-apps/smartmontools
-      {% endif %}
-      {% if salt['grains.get']('fibrechannel', False)
-      or salt['grains.get']('iscsi', False)
-      or salt['grains.get']('scsi', False) %}
-      - sys-apps/sg3_utils
-      - sys-apps/rescan-scsi-bus
-      {% endif %}
+include:
+  - util.core
+  - util.arch
+  - util.shell
+  - util.ldns-utils
+  - util.net
+  - util.disk
+  - util.jq
+  - util.mailutils

sls/util/arch.sls

@@ -0,0 +1,17 @@
+include:
+  - lib.glibc
+
+util-arch:
+  pkg.latest:
+    - require:
+      - pkg: sys-libs/glibc
+    - pkgs:
+      - app-arch/tar
+      - app-arch/unzip
+      - app-arch/cpio
+      - app-arch/libarchive
+      - app-arch/gzip
+      - app-arch/bzip2
+      - app-arch/xz-utils
+      - app-arch/lz4
+      - app-arch/zstd

sls/util/core.sls

@@ -0,0 +1,29 @@
+include:
+  - lib.glibc
+
+util-core:
+  pkg.latest:
+    - require:
+      - pkg: sys-libs/glibc
+    - pkgs:
+      - app-text/tree
+      - sys-apps/attr
+      - sys-apps/coreutils
+      - sys-apps/diffutils
+      - sys-apps/elfix
+      - sys-apps/file
+      - sys-apps/findutils
+      - sys-apps/gawk
+      - sys-apps/grep
+      - sys-apps/kbd
+      - sys-apps/less
+      - sys-apps/man-pages
+      - sys-apps/sed
+      - sys-apps/util-linux: "[tty-helpers,fdformat]"
+      - sys-apps/which
+      - sys-process/atop: "~>=2.2"
+      - sys-process/iotop
+      - sys-process/lsof
+      - sys-process/ftop
+      - sys-process/procps
+      - sys-process/psmisc

sls/util/disk.sls

@@ -0,0 +1,31 @@
+include:
+  - lib.glibc
+
+{% if salt['grains.get']('diskless', False) %}
+util-disk-purged:
+  pkg.purged:
+    - pkgs:
+      - sys-apps/hdparm
+      - sys-apps/smartmontools
+{% endif %}
+
+util-disk:
+  pkg.latest:
+    - require:
+      - pkg: sys-libs/glibc
+      {% if salt['grains.get']('diskless', False) %}
+      - pkg: util-disk-purged
+      {% endif %}
+    - pkgs:
+      {% if not salt['grains.get']('diskless', False) %}
+      - sys-fs/e2fsprogs
+      - sys-fs/xfsprogs
+      - sys-apps/hdparm
+      - sys-apps/smartmontools
+      {% endif %}
+      {% if salt['grains.get']('fibrechannel', False)
+      or salt['grains.get']('iscsi', False)
+      or salt['grains.get']('scsi', False) %}
+      - sys-apps/sg3_utils
+      - sys-apps/rescan-scsi-bus
+      {% endif %}

sls/util/mailutils.sls

@@ -0,0 +1,9 @@
+include:
+  - lib.glibc
+  - ssl.openssl
+
+net-mail/mailutils:
+  pkg.latest:
+    - require:
+      - pkg: sys-libs/glibc
+      - pkg: openssl

sls/util/net.sls

@@ -0,0 +1,30 @@
+util-net-purged:
+  pkg.purged:
+    - pkgs:
+      - net-misc/telnet-bsd
+      - www-client/elinks
+      - www-client/links
+      - net-analyzer/netcat6
+
+util-net:
+  pkg.latest:
+    - require:
+      - pkg: sys-libs/glibc
+      - pkg: openssl
+      - pkg: util-net-purged
+    - pkgs:
+      - net-analyzer/mtr
+      - net-analyzer/tcpdump
+      - net-analyzer/traceroute
+      - net-analyzer/iftop
+      - net-ftp/ftp
+      - net-analyzer/netcat
+      - net-misc/curl: "[ssl,adns]"
+      - net-misc/iputils
+      - net-misc/rsync
+      - net-misc/netkit-telnetd
+      - net-misc/wget: "~"
+      - net-misc/whois 
+      - sys-apps/iproute2
+      - sys-apps/net-tools
+

sls/util/shell.sls

@@ -0,0 +1,16 @@
+include:
+  - lib.glibc
+
+util-shell:
+  pkg.latest:
+    - require:
+      - pkg: sys-libs/glibc
+    - pkgs:
+      - app-shells/bash
+      - app-shells/bash-completion
+      - sys-apps/miscfiles
+      - app-shells/zsh
+      - app-doc/zsh-lovers
+      - app-misc/screen
+      - app-admin/killproc
+      - sys-devel/bc