From 0665cdd28b89c25def0849f7b29fc29980331600 Mon Sep 17 00:00:00 2001
From: Joe Cooper <joe@virtualmin.com>
Date: Mon, 1 Aug 2022 01:31:16 +0000
Subject: [PATCH] Sort and validate

---
 virtualmin-comps.xml | 56 ++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/virtualmin-comps.xml b/virtualmin-comps.xml
index 0fb694f..dc1f4ae 100644
--- a/virtualmin-comps.xml
+++ b/virtualmin-comps.xml
@@ -9,8 +9,8 @@
     <name>Virtualmin LAMP Stack</name>
     <description>Virtualmin with Apache, MariaDB, and PHP, Perl, Python, Ruby</description>
     <packagelist>
-      <packagereq type="mandatory">bind-utils</packagereq>
       <packagereq type="mandatory">bind</packagereq>
+      <packagereq type="mandatory">bind-utils</packagereq>
       <packagereq type="mandatory">ca-certificates</packagereq>
       <packagereq type="mandatory">httpd</packagereq>
       <packagereq type="mandatory">iptables</packagereq>
@@ -40,13 +40,13 @@
       <packagereq type="default">awstats</packagereq>
       <packagereq type="default">bzip2</packagereq>
       <packagereq type="default">certbot</packagereq>
-      <packagereq type="default">clamav-update</packagereq>
       <packagereq type="default">clamav</packagereq>
+      <packagereq type="default">clamav-update</packagereq>
       <packagereq type="default">clamd</packagereq>
       <packagereq type="default">cronie</packagereq>
+      <packagereq type="default">cyrus-sasl</packagereq>
       <packagereq type="default">cyrus-sasl-gssapi</packagereq>
       <packagereq type="default">cyrus-sasl-plain</packagereq>
-      <packagereq type="default">cyrus-sasl</packagereq>
       <packagereq type="default">dovecot</packagereq>
       <packagereq type="default">etckeeper</packagereq>
       <packagereq type="default">fail2ban-firewalld</packagereq>
@@ -55,16 +55,16 @@
       <packagereq type="default">firewalld</packagereq>
       <packagereq type="default">jailkit</packagereq>
       <packagereq type="default">logrotate</packagereq>
-      <packagereq type="default">mariadb-server</packagereq>
       <packagereq type="default">mariadb</packagereq>
+      <packagereq type="default">mariadb-server</packagereq>
       <packagereq type="default">milter-greylist</packagereq>
       <packagereq type="default">mod_fcgid</packagereq>
       <packagereq type="default">opendkim</packagereq>
       <packagereq type="default">p7zip</packagereq>
       <packagereq type="default">perl-Authen-OATH</packagereq>
       <packagereq type="default">perl-Config-IniFiles</packagereq>
-      <packagereq type="default">perl-File-Path</packagereq>
       <packagereq type="default">perl-File-Basename</packagereq>
+      <packagereq type="default">perl-File-Path</packagereq>
       <packagereq type="default">perl-IO-Tty</packagereq>
       <packagereq type="default">perl-lib</packagereq>
       <packagereq type="default">perl-open</packagereq>
@@ -76,8 +76,8 @@
       <packagereq type="default">php-xmlrpc</packagereq>
       <packagereq type="default">postfix</packagereq>
       <packagereq type="default">postgrey</packagereq>
-      <packagereq type="default">procmail-wrapper</packagereq>
       <packagereq type="default">procmail</packagereq>
+      <packagereq type="default">procmail-wrapper</packagereq>
       <packagereq type="default">proftpd</packagereq>
       <packagereq type="default">rsync</packagereq>
       <packagereq type="default">ruby</packagereq>
@@ -91,8 +91,8 @@
       <packagereq type="optional">php-odbc</packagereq>
       <packagereq type="optional">php-pgsql</packagereq>
       <packagereq type="optional">php-snmp</packagereq>
-      <packagereq type="optional">postgresql-server</packagereq>
       <packagereq type="optional">postgresql</packagereq>
+      <packagereq type="optional">postgresql-server</packagereq>
     </packagelist>
   </group>
   <group>
@@ -128,29 +128,29 @@
       <packagereq type="mandatory">quota</packagereq>
       <packagereq type="mandatory">unzip</packagereq>
       <packagereq type="mandatory">zip</packagereq>
-      <packagereq type="default">bind-utils</packagereq>
       <packagereq type="default">bind</packagereq>
+      <packagereq type="default">bind-utils</packagereq>
       <packagereq type="default">bzip2</packagereq>
       <packagereq type="default">certbot</packagereq>
       <packagereq type="default">cronie</packagereq>
+      <packagereq type="default">cyrus-sasl</packagereq>
       <packagereq type="default">cyrus-sasl-gssapi</packagereq>
       <packagereq type="default">cyrus-sasl-plain</packagereq>
-      <packagereq type="default">cyrus-sasl</packagereq>
       <packagereq type="default">dovecot</packagereq>
       <packagereq type="default">etckeeper</packagereq>
       <packagereq type="default">fcgiwrap</packagereq>
       <packagereq type="default">firewalld</packagereq>
       <packagereq type="default">jailkit</packagereq>
       <packagereq type="default">logrotate</packagereq>
-      <packagereq type="default">mariadb-server</packagereq>
       <packagereq type="default">mariadb</packagereq>
+      <packagereq type="default">mariadb-server</packagereq>
       <packagereq type="default">mod_fcgid</packagereq>
       <packagereq type="default">opendkim</packagereq>
       <packagereq type="default">p7zip</packagereq>
       <packagereq type="default">perl-Authen-OATH</packagereq>
       <packagereq type="default">perl-Config-IniFiles</packagereq>
-      <packagereq type="default">perl-File-Path</packagereq>
       <packagereq type="default">perl-File-Basename</packagereq>
+      <packagereq type="default">perl-File-Path</packagereq>
       <packagereq type="default">perl-IO-Tty</packagereq>
       <packagereq type="default">perl-lib</packagereq>
       <packagereq type="default">perl-open</packagereq>
@@ -162,8 +162,8 @@
       <packagereq type="default">php-xmlrpc</packagereq>
       <packagereq type="default">postfix</packagereq>
       <packagereq type="default">postgrey</packagereq>
-      <packagereq type="default">procmail-wrapper</packagereq>
       <packagereq type="default">procmail</packagereq>
+      <packagereq type="default">procmail-wrapper</packagereq>
       <packagereq type="default">proftpd</packagereq>
       <packagereq type="default">rsync</packagereq>
       <packagereq type="default">spamassassin</packagereq>
@@ -177,8 +177,8 @@
       <packagereq type="optional">php-odbc</packagereq>
       <packagereq type="optional">php-pgsql</packagereq>
       <packagereq type="optional">php-snmp</packagereq>
-      <packagereq type="optional">postgresql-server</packagereq>
       <packagereq type="optional">postgresql</packagereq>
+      <packagereq type="optional">postgresql-server</packagereq>
       <packagereq type="optional">ruby</packagereq>
       <packagereq type="optional">rubygems</packagereq>
       <packagereq type="optional">wbm-virtualmin-awstats</packagereq>
@@ -192,8 +192,8 @@
     <name>Virtualmin LEMP Stack</name>
     <description>Virtualmin with Nginx, MariaDB, and PHP, Perl, Python, Ruby</description>
     <packagelist>
-      <packagereq type="mandatory">bind-utils</packagereq>
       <packagereq type="mandatory">bind</packagereq>
+      <packagereq type="mandatory">bind-utils</packagereq>
       <packagereq type="mandatory">iptables</packagereq>
       <packagereq type="mandatory">nginx</packagereq>
       <packagereq type="mandatory">openssl</packagereq>
@@ -216,21 +216,21 @@
       <packagereq type="mandatory">python</packagereq>
       <packagereq type="mandatory">quota</packagereq>
       <packagereq type="mandatory">unzip</packagereq>
-      <packagereq type="mandatory">wbm-virtualmin-nginx-ssl</packagereq>
       <packagereq type="mandatory">wbm-virtualmin-nginx</packagereq>
+      <packagereq type="mandatory">wbm-virtualmin-nginx-ssl</packagereq>
       <packagereq type="mandatory">zip</packagereq>
       <packagereq type="default">awscli</packagereq>
       <packagereq type="default">awstats</packagereq>
       <packagereq type="default">bzip2</packagereq>
       <packagereq type="default">ca-certificates</packagereq>
       <packagereq type="default">certbot</packagereq>
-      <packagereq type="default">clamav-update</packagereq>
       <packagereq type="default">clamav</packagereq>
+      <packagereq type="default">clamav-update</packagereq>
       <packagereq type="default">clamd</packagereq>
       <packagereq type="default">cronie</packagereq>
+      <packagereq type="default">cyrus-sasl</packagereq>
       <packagereq type="default">cyrus-sasl-gssapi</packagereq>
       <packagereq type="default">cyrus-sasl-plain</packagereq>
-      <packagereq type="default">cyrus-sasl</packagereq>
       <packagereq type="default">dovecot</packagereq>
       <packagereq type="default">etckeeper</packagereq>
       <packagereq type="default">fail2ban-firewalld</packagereq>
@@ -238,15 +238,15 @@
       <packagereq type="default">fcgiwrap</packagereq>
       <packagereq type="default">jailkit</packagereq>
       <packagereq type="default">logrotate</packagereq>
-      <packagereq type="default">mariadb-server</packagereq>
       <packagereq type="default">mariadb</packagereq>
+      <packagereq type="default">mariadb-server</packagereq>
       <packagereq type="default">milter-greylist</packagereq>
       <packagereq type="default">opendkim</packagereq>
       <packagereq type="default">p7zip</packagereq>
       <packagereq type="default">perl-Authen-OATH</packagereq>
       <packagereq type="default">perl-Config-IniFiles</packagereq>
-      <packagereq type="default">perl-File-Path</packagereq>
       <packagereq type="default">perl-File-Basename</packagereq>
+      <packagereq type="default">perl-File-Path</packagereq>
       <packagereq type="default">perl-IO-Tty</packagereq>
       <packagereq type="default">perl-lib</packagereq>
       <packagereq type="default">perl-open</packagereq>
@@ -259,8 +259,8 @@
       <packagereq type="default">php-xmlrpc</packagereq>
       <packagereq type="default">postfix</packagereq>
       <packagereq type="default">postgrey</packagereq>
-      <packagereq type="default">procmail-wrapper</packagereq>
       <packagereq type="default">procmail</packagereq>
+      <packagereq type="default">procmail-wrapper</packagereq>
       <packagereq type="default">proftpd</packagereq>
       <packagereq type="default">rsync</packagereq>
       <packagereq type="default">ruby</packagereq>
@@ -273,8 +273,8 @@
       <packagereq type="optional">perl-DBD-Pg</packagereq>
       <packagereq type="optional">php-pgsql</packagereq>
       <packagereq type="optional">php-snmp</packagereq>
-      <packagereq type="optional">postgresql-server</packagereq>
       <packagereq type="optional">postgresql</packagereq>
+      <packagereq type="optional">postgresql-server</packagereq>
     </packagelist>
   </group>
   <group>
@@ -308,31 +308,31 @@
       <packagereq type="mandatory">python</packagereq>
       <packagereq type="mandatory">quota</packagereq>
       <packagereq type="mandatory">unzip</packagereq>
-      <packagereq type="mandatory">wbm-virtualmin-nginx-ssl</packagereq>
       <packagereq type="mandatory">wbm-virtualmin-nginx</packagereq>
+      <packagereq type="mandatory">wbm-virtualmin-nginx-ssl</packagereq>
       <packagereq type="mandatory">zip</packagereq>
-      <packagereq type="default">bind-utils</packagereq>
       <packagereq type="default">bind</packagereq>
+      <packagereq type="default">bind-utils</packagereq>
       <packagereq type="default">bzip2</packagereq>
       <packagereq type="default">certbot</packagereq>
       <packagereq type="default">cronie</packagereq>
+      <packagereq type="default">cyrus-sasl</packagereq>
       <packagereq type="default">cyrus-sasl-gssapi</packagereq>
       <packagereq type="default">cyrus-sasl-plain</packagereq>
-      <packagereq type="default">cyrus-sasl</packagereq>
       <packagereq type="default">dovecot</packagereq>
       <packagereq type="default">etckeeper</packagereq>
       <packagereq type="default">fcgiwrap</packagereq>
       <packagereq type="default">firewalld</packagereq>
       <packagereq type="default">jailkit</packagereq>
       <packagereq type="default">logrotate</packagereq>
-      <packagereq type="default">mariadb-server</packagereq>
       <packagereq type="default">mariadb</packagereq>
+      <packagereq type="default">mariadb-server</packagereq>
       <packagereq type="default">opendkim</packagereq>
       <packagereq type="default">p7zip</packagereq>
       <packagereq type="default">perl-Authen-OATH</packagereq>
       <packagereq type="default">perl-Config-IniFiles</packagereq>
-      <packagereq type="default">perl-File-Path</packagereq>
       <packagereq type="default">perl-File-Basename</packagereq>
+      <packagereq type="default">perl-File-Path</packagereq>
       <packagereq type="default">perl-IO-Tty</packagereq>
       <packagereq type="default">perl-lib</packagereq>
       <packagereq type="default">perl-open</packagereq>
@@ -344,8 +344,8 @@
       <packagereq type="default">php-xmlrpc</packagereq>
       <packagereq type="default">postfix</packagereq>
       <packagereq type="default">postgrey</packagereq>
-      <packagereq type="default">procmail-wrapper</packagereq>
       <packagereq type="default">procmail</packagereq>
+      <packagereq type="default">procmail-wrapper</packagereq>
       <packagereq type="default">proftpd</packagereq>
       <packagereq type="default">rsync</packagereq>
       <packagereq type="default">spamassassin</packagereq>
@@ -359,8 +359,8 @@
       <packagereq type="optional">php-odbc</packagereq>
       <packagereq type="optional">php-pgsql</packagereq>
       <packagereq type="optional">php-snmp</packagereq>
-      <packagereq type="optional">postgresql-server</packagereq>
       <packagereq type="optional">postgresql</packagereq>
+      <packagereq type="optional">postgresql-server</packagereq>
       <packagereq type="optional">ruby</packagereq>
       <packagereq type="optional">rubygems</packagereq>
       <packagereq type="optional">wbm-virtualmin-awstats</packagereq>