From ac600ac9d2a35c7be58af9b84566aada72d8178c Mon Sep 17 00:00:00 2001
From: Joe Cooper <swelljoe@gmail.com>
Date: Thu, 14 Sep 2017 17:46:53 -0500
Subject: [PATCH] Add cyrus-sasl-plain because everything fails without it

---
 virtualmin-centos-6-comps.xml  | 20 ++++++++++++--------
 virtualmin-centos-7-comps.xml  | 12 ++++++++----
 virtualmin-fedora-25-comps.xml |  4 ++--
 virtualmin-fedora-26-comps.xml |  6 ++++--
 4 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/virtualmin-centos-6-comps.xml b/virtualmin-centos-6-comps.xml
index 9de8661..802f6aa 100644
--- a/virtualmin-centos-6-comps.xml
+++ b/virtualmin-centos-6-comps.xml
@@ -64,7 +64,7 @@
       <packagereq type="default">clamav</packagereq>
       <packagereq type="default">cyrus-sasl</packagereq>
       <packagereq type="default">cyrus-sasl-gssapi</packagereq>
-      <packagereq type="default">opendkim</packagereq>
+      <packagereq type="default">cyrus-sasl-plain</packagereq>
       <packagereq type="default">dovecot</packagereq>
       <packagereq type="default">fail2ban</packagereq>
       <packagereq type="default">jailkit</packagereq>
@@ -73,6 +73,7 @@
       <packagereq type="default">mysql</packagereq>
       <packagereq type="default">mysql-devel</packagereq>
       <packagereq type="default">mysql-server</packagereq>
+      <packagereq type="default">opendkim</packagereq>
       <packagereq type="default">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>
       <packagereq type="default">php-xmlrpc</packagereq>
@@ -130,7 +131,9 @@
       <packagereq type="mandatory">unzip</packagereq>
       <packagereq type="default">ca-certificates</packagereq>
       <packagereq type="default">clamav</packagereq>
-      <packagereq type="default">opendkim</packagereq>
+      <packagereq type="default">cyrus-sasl</packagereq>
+      <packagereq type="default">cyrus-sasl-gssapi</packagereq>
+      <packagereq type="default">cyrus-sasl-plain</packagereq>
       <packagereq type="default">fail2ban</packagereq>
       <packagereq type="default">jailkit</packagereq>
       <packagereq type="default">logrotate</packagereq>
@@ -138,6 +141,7 @@
       <packagereq type="default">mysql</packagereq>
       <packagereq type="default">mysql-devel</packagereq>
       <packagereq type="default">mysql-server</packagereq>
+      <packagereq type="default">opendkim</packagereq>
       <packagereq type="default">perl-Config-IniFiles</packagereq>
       <packagereq type="default">php</packagereq>
       <packagereq type="default">php-mbstring</packagereq>
@@ -149,8 +153,6 @@
       <packagereq type="default">proftpd</packagereq>
       <packagereq type="default">spamassassin</packagereq>
       <packagereq type="optional">awstats</packagereq>
-      <packagereq type="optional">cyrus-sasl</packagereq>
-      <packagereq type="optional">cyrus-sasl-gssapi</packagereq>
       <packagereq type="optional">dovecot</packagereq>
       <packagereq type="optional">perl-DBD-Pg</packagereq>
       <packagereq type="optional">php-pgsql</packagereq>
@@ -202,11 +204,12 @@
       <packagereq type="default">clamav</packagereq>
       <packagereq type="default">cyrus-sasl</packagereq>
       <packagereq type="default">cyrus-sasl-gssapi</packagereq>
-      <packagereq type="default">opendkim</packagereq>
+      <packagereq type="default">cyrus-sasl-plain</packagereq>
       <packagereq type="default">dovecot</packagereq>
       <packagereq type="default">fail2ban</packagereq>
       <packagereq type="default">jailkit</packagereq>
       <packagereq type="default">logrotate</packagereq>
+      <packagereq type="default">opendkim</packagereq>
       <packagereq type="default">php</packagereq>
       <packagereq type="default">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>
@@ -265,7 +268,9 @@
       <packagereq type="mandatory">wbm-virtualmin-nginx-ssl</packagereq>
       <packagereq type="default">ca-certificates</packagereq>
       <packagereq type="default">clamav</packagereq>
-      <packagereq type="default">opendkim</packagereq>
+      <packagereq type="default">cyrus-sasl</packagereq>
+      <packagereq type="default">cyrus-sasl-gssapi</packagereq>
+      <packagereq type="default">cyrus-sasl-plain</packagereq>
       <packagereq type="default">fail2ban</packagereq>
       <packagereq type="default">jailkit</packagereq>
       <packagereq type="default">logrotate</packagereq>
@@ -273,6 +278,7 @@
       <packagereq type="default">mysql</packagereq>
       <packagereq type="default">mysql-devel</packagereq>
       <packagereq type="default">mysql-server</packagereq>
+      <packagereq type="default">opendkim</packagereq>
       <packagereq type="default">perl-Config-IniFiles</packagereq>
       <packagereq type="default">php</packagereq>
       <packagereq type="default">php-mbstring</packagereq>
@@ -284,8 +290,6 @@
       <packagereq type="default">proftpd</packagereq>
       <packagereq type="default">spamassassin</packagereq>
       <packagereq type="optional">awstats</packagereq>
-      <packagereq type="optional">cyrus-sasl</packagereq>
-      <packagereq type="optional">cyrus-sasl-gssapi</packagereq>
       <packagereq type="optional">dovecot</packagereq>
       <packagereq type="optional">perl-DBD-Pg</packagereq>
       <packagereq type="optional">php-pgsql</packagereq>
diff --git a/virtualmin-centos-7-comps.xml b/virtualmin-centos-7-comps.xml
index 3feb5aa..6902cc3 100644
--- a/virtualmin-centos-7-comps.xml
+++ b/virtualmin-centos-7-comps.xml
@@ -67,7 +67,7 @@
       <packagereq type="default">clamav-server-systemd</packagereq>
       <packagereq type="default">cyrus-sasl</packagereq>
       <packagereq type="default">cyrus-sasl-gssapi</packagereq>
-      <packagereq type="default">opendkim</packagereq>
+      <packagereq type="default">cyrus-sasl-plain</packagereq>
       <packagereq type="default">dovecot</packagereq>
       <packagereq type="default">fail2ban-firewalld</packagereq>
       <packagereq type="default">fail2ban-server</packagereq>
@@ -78,6 +78,7 @@
       <packagereq type="default">mariadb-devel</packagereq>
       <packagereq type="default">mariadb-server</packagereq>
       <packagereq type="default">mod_fcgid</packagereq>
+      <packagereq type="default">opendkim</packagereq>
       <packagereq type="default">perl-Config-IniFiles</packagereq>
       <packagereq type="default">php</packagereq>
       <packagereq type="default">php-opcache</packagereq>
@@ -140,7 +141,7 @@
       <packagereq type="default">clamav</packagereq>
       <packagereq type="default">cyrus-sasl</packagereq>
       <packagereq type="default">cyrus-sasl-gssapi</packagereq>
-      <packagereq type="default">opendkim</packagereq>
+      <packagereq type="default">cyrus-sasl-plain</packagereq>
       <packagereq type="default">dovecot</packagereq>
       <packagereq type="default">fail2ban-firewalld</packagereq>
       <packagereq type="default">fail2ban-server</packagereq>
@@ -151,6 +152,7 @@
       <packagereq type="default">mariadb-devel</packagereq>
       <packagereq type="default">mariadb-server</packagereq>
       <packagereq type="default">mod_fcgid</packagereq>
+      <packagereq type="default">opendkim</packagereq>
       <packagereq type="default">perl-Config-IniFiles</packagereq>
       <packagereq type="default">php</packagereq>
       <packagereq type="default">php-opcache</packagereq>
@@ -221,7 +223,7 @@
       <packagereq type="default">clamav-server-systemd</packagereq>
       <packagereq type="default">cyrus-sasl</packagereq>
       <packagereq type="default">cyrus-sasl-gssapi</packagereq>
-      <packagereq type="default">opendkim</packagereq>
+      <packagereq type="default">cyrus-sasl-plain</packagereq>
       <packagereq type="default">dovecot</packagereq>
       <packagereq type="default">fail2ban-firewalld</packagereq>
       <packagereq type="default">fail2ban-server</packagereq>
@@ -230,6 +232,7 @@
       <packagereq type="default">mariadb</packagereq>
       <packagereq type="default">mariadb-devel</packagereq>
       <packagereq type="default">mariadb-server</packagereq>
+      <packagereq type="default">opendkim</packagereq>
       <packagereq type="default">perl-Config-IniFiles</packagereq>
       <packagereq type="default">php</packagereq>
       <packagereq type="default">php-odbc</packagereq>
@@ -292,7 +295,7 @@
       <packagereq type="default">clamav</packagereq>
       <packagereq type="default">cyrus-sasl</packagereq>
       <packagereq type="default">cyrus-sasl-gssapi</packagereq>
-      <packagereq type="default">opendkim</packagereq>
+      <packagereq type="default">cyrus-sasl-plain</packagereq>
       <packagereq type="default">dovecot</packagereq>
       <packagereq type="default">fail2ban-firewalld</packagereq>
       <packagereq type="default">fail2ban-server</packagereq>
@@ -303,6 +306,7 @@
       <packagereq type="default">mariadb-devel</packagereq>
       <packagereq type="default">mariadb-server</packagereq>
       <packagereq type="default">mod_fcgid</packagereq>
+      <packagereq type="default">opendkim</packagereq>
       <packagereq type="default">perl-Config-IniFiles</packagereq>
       <packagereq type="default">php</packagereq>
       <packagereq type="default">php-opcache</packagereq>
diff --git a/virtualmin-fedora-25-comps.xml b/virtualmin-fedora-25-comps.xml
index 802b7f8..191592f 100644
--- a/virtualmin-fedora-25-comps.xml
+++ b/virtualmin-fedora-25-comps.xml
@@ -45,7 +45,6 @@
       <packagereq type="default">clamav-server-systemd</packagereq>
       <packagereq type="default">cyrus-sasl</packagereq>
       <packagereq type="default">cyrus-sasl-gssapi</packagereq>
-      <packagereq type="default">opendkim</packagereq>
       <packagereq type="default">dovecot</packagereq>
       <packagereq type="default">fail2ban-firewalld</packagereq>
       <packagereq type="default">fail2ban-server</packagereq>
@@ -56,6 +55,7 @@
       <packagereq type="default">mariadb-devel</packagereq>
       <packagereq type="default">mariadb-server</packagereq>
       <packagereq type="default">mod_fcgid</packagereq>
+      <packagereq type="default">opendkim</packagereq>
       <packagereq type="default">php</packagereq>
       <packagereq type="default">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>
@@ -120,7 +120,6 @@
       <packagereq type="default">clamav-server-systemd</packagereq>
       <packagereq type="default">cyrus-sasl</packagereq>
       <packagereq type="default">cyrus-sasl-gssapi</packagereq>
-      <packagereq type="default">opendkim</packagereq>
       <packagereq type="default">dovecot</packagereq>
       <packagereq type="default">fail2ban-firewalld</packagereq>
       <packagereq type="default">fail2ban-server</packagereq>
@@ -129,6 +128,7 @@
       <packagereq type="default">mariadb</packagereq>
       <packagereq type="default">mariadb-devel</packagereq>
       <packagereq type="default">mariadb-server</packagereq>
+      <packagereq type="default">opendkim</packagereq>
       <packagereq type="default">php</packagereq>
       <packagereq type="default">php-odbc</packagereq>
       <packagereq type="default">php-opcache</packagereq>
diff --git a/virtualmin-fedora-26-comps.xml b/virtualmin-fedora-26-comps.xml
index 802b7f8..d879fdd 100644
--- a/virtualmin-fedora-26-comps.xml
+++ b/virtualmin-fedora-26-comps.xml
@@ -45,7 +45,7 @@
       <packagereq type="default">clamav-server-systemd</packagereq>
       <packagereq type="default">cyrus-sasl</packagereq>
       <packagereq type="default">cyrus-sasl-gssapi</packagereq>
-      <packagereq type="default">opendkim</packagereq>
+      <packagereq type="default">cyrus-sasl-plain</packagereq>
       <packagereq type="default">dovecot</packagereq>
       <packagereq type="default">fail2ban-firewalld</packagereq>
       <packagereq type="default">fail2ban-server</packagereq>
@@ -56,6 +56,7 @@
       <packagereq type="default">mariadb-devel</packagereq>
       <packagereq type="default">mariadb-server</packagereq>
       <packagereq type="default">mod_fcgid</packagereq>
+      <packagereq type="default">opendkim</packagereq>
       <packagereq type="default">php</packagereq>
       <packagereq type="default">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>
@@ -120,7 +121,7 @@
       <packagereq type="default">clamav-server-systemd</packagereq>
       <packagereq type="default">cyrus-sasl</packagereq>
       <packagereq type="default">cyrus-sasl-gssapi</packagereq>
-      <packagereq type="default">opendkim</packagereq>
+      <packagereq type="default">cyrus-sasl-plain</packagereq>
       <packagereq type="default">dovecot</packagereq>
       <packagereq type="default">fail2ban-firewalld</packagereq>
       <packagereq type="default">fail2ban-server</packagereq>
@@ -129,6 +130,7 @@
       <packagereq type="default">mariadb</packagereq>
       <packagereq type="default">mariadb-devel</packagereq>
       <packagereq type="default">mariadb-server</packagereq>
+      <packagereq type="default">opendkim</packagereq>
       <packagereq type="default">php</packagereq>
       <packagereq type="default">php-odbc</packagereq>
       <packagereq type="default">php-opcache</packagereq>