From 1afd84e703276a72c46882e59df76a6b435530d8 Mon Sep 17 00:00:00 2001
From: Joe Cooper <swelljoe@gmail.com>
Date: Sun, 6 Aug 2017 07:50:25 -0500
Subject: [PATCH] Allow receiving mail, but not scanning it locally

---
 virtualmin-centos-6-comps.xml  | 20 ++++++++++++--------
 virtualmin-centos-7-comps.xml  |  4 ++++
 virtualmin-fedora-25-comps.xml |  2 ++
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/virtualmin-centos-6-comps.xml b/virtualmin-centos-6-comps.xml
index e723c49..06efc61 100644
--- a/virtualmin-centos-6-comps.xml
+++ b/virtualmin-centos-6-comps.xml
@@ -76,6 +76,7 @@
       <packagereq type="default">php-xml</packagereq>
       <packagereq type="default">php-xmlrpc</packagereq>
       <packagereq type="default">postgrey</packagereq>
+      <packagereq type="default">procmail</packagereq>
       <packagereq type="default">procmail-wrapper</packagereq>
       <packagereq type="default">proftpd</packagereq>
       <packagereq type="default">ruby</packagereq>
@@ -125,6 +126,8 @@
       <packagereq type="mandatory">python</packagereq>
       <packagereq type="mandatory">quota</packagereq>
       <packagereq type="default">ca-certificates</packagereq>
+      <packagereq type="default">clamav</packagereq>
+      <packagereq type="default">dkim-milter</packagereq>
       <packagereq type="default">fail2ban</packagereq>
       <packagereq type="default">jailkit</packagereq>
       <packagereq type="default">logrotate</packagereq>
@@ -137,12 +140,13 @@
       <packagereq type="default">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>
       <packagereq type="default">php-xmlrpc</packagereq>
+      <packagereq type="default">procmail</packagereq>
+      <packagereq type="default">procmail-wrapper</packagereq>
       <packagereq type="default">proftpd</packagereq>
+      <packagereq type="default">spamassassin</packagereq>
       <packagereq type="optional">awstats</packagereq>
-      <packagereq type="optional">clamav</packagereq>
       <packagereq type="optional">cyrus-sasl</packagereq>
       <packagereq type="optional">cyrus-sasl-gssapi</packagereq>
-      <packagereq type="optional">dkim-milter</packagereq>
       <packagereq type="optional">dovecot</packagereq>
       <packagereq type="optional">perl-DBD-Pg</packagereq>
       <packagereq type="optional">php-pgsql</packagereq>
@@ -151,8 +155,6 @@
       <packagereq type="optional">postgresql-devel</packagereq>
       <packagereq type="optional">postgresql-server</packagereq>
       <packagereq type="optional">postgrey</packagereq>
-      <packagereq type="optional">procmail-wrapper</packagereq>
-      <packagereq type="optional">spamassassin</packagereq>
       <packagereq type="optional">webalizer</packagereq>
     </packagelist>
   </group>
@@ -202,6 +204,7 @@
       <packagereq type="default">php-xml</packagereq>
       <packagereq type="default">php-xmlrpc</packagereq>
       <packagereq type="default">postgrey</packagereq>
+      <packagereq type="default">procmail</packagereq>
       <packagereq type="default">procmail-wrapper</packagereq>
       <packagereq type="default">proftpd</packagereq>
       <packagereq type="default">ruby</packagereq>
@@ -249,6 +252,8 @@
       <packagereq type="mandatory">python</packagereq>
       <packagereq type="mandatory">quota</packagereq>
       <packagereq type="default">ca-certificates</packagereq>
+      <packagereq type="default">clamav</packagereq>
+      <packagereq type="default">dkim-milter</packagereq>
       <packagereq type="default">fail2ban</packagereq>
       <packagereq type="default">jailkit</packagereq>
       <packagereq type="default">logrotate</packagereq>
@@ -261,12 +266,13 @@
       <packagereq type="default">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>
       <packagereq type="default">php-xmlrpc</packagereq>
+      <packagereq type="default">procmail</packagereq>
+      <packagereq type="default">procmail-wrapper</packagereq>
       <packagereq type="default">proftpd</packagereq>
+      <packagereq type="default">spamassassin</packagereq>
       <packagereq type="optional">awstats</packagereq>
-      <packagereq type="optional">clamav</packagereq>
       <packagereq type="optional">cyrus-sasl</packagereq>
       <packagereq type="optional">cyrus-sasl-gssapi</packagereq>
-      <packagereq type="optional">dkim-milter</packagereq>
       <packagereq type="optional">dovecot</packagereq>
       <packagereq type="optional">perl-DBD-Pg</packagereq>
       <packagereq type="optional">php-pgsql</packagereq>
@@ -275,8 +281,6 @@
       <packagereq type="optional">postgresql-devel</packagereq>
       <packagereq type="optional">postgresql-server</packagereq>
       <packagereq type="optional">postgrey</packagereq>
-      <packagereq type="optional">procmail-wrapper</packagereq>
-      <packagereq type="optional">spamassassin</packagereq>
       <packagereq type="optional">webalizer</packagereq>
     </packagelist>
   </group>
diff --git a/virtualmin-centos-7-comps.xml b/virtualmin-centos-7-comps.xml
index 79804aa..5155d04 100644
--- a/virtualmin-centos-7-comps.xml
+++ b/virtualmin-centos-7-comps.xml
@@ -81,6 +81,7 @@
       <packagereq type="default">php-xml</packagereq>
       <packagereq type="default">php-xmlrpc</packagereq>
       <packagereq type="default">postgrey</packagereq>
+      <packagereq type="default">procmail</packagereq>
       <packagereq type="default">procmail-wrapper</packagereq>
       <packagereq type="default">proftpd</packagereq>
       <packagereq type="default">ruby</packagereq>
@@ -150,6 +151,7 @@
       <packagereq type="default">php-xml</packagereq>
       <packagereq type="default">php-xmlrpc</packagereq>
       <packagereq type="default">postgrey</packagereq>
+      <packagereq type="default">procmail</packagereq>
       <packagereq type="default">procmail-wrapper</packagereq>
       <packagereq type="default">proftpd</packagereq>
       <packagereq type="default">spamassassin</packagereq>
@@ -225,6 +227,7 @@
       <packagereq type="default">php-xml</packagereq>
       <packagereq type="default">php-xmlrpc</packagereq>
       <packagereq type="default">postgrey</packagereq>
+      <packagereq type="default">procmail</packagereq>
       <packagereq type="default">procmail-wrapper</packagereq>
       <packagereq type="default">proftpd</packagereq>
       <packagereq type="default">ruby</packagereq>
@@ -291,6 +294,7 @@
       <packagereq type="default">php-xml</packagereq>
       <packagereq type="default">php-xmlrpc</packagereq>
       <packagereq type="default">postgrey</packagereq>
+      <packagereq type="default">procmail</packagereq>
       <packagereq type="default">procmail-wrapper</packagereq>
       <packagereq type="default">proftpd</packagereq>
       <packagereq type="default">spamassassin</packagereq>
diff --git a/virtualmin-fedora-25-comps.xml b/virtualmin-fedora-25-comps.xml
index bb7dc21..b8abff2 100644
--- a/virtualmin-fedora-25-comps.xml
+++ b/virtualmin-fedora-25-comps.xml
@@ -58,6 +58,7 @@
       <packagereq type="default">php-xml</packagereq>
       <packagereq type="default">php-xmlrpc</packagereq>
       <packagereq type="default">postgrey</packagereq>
+      <packagereq type="default">procmail</packagereq>
       <packagereq type="default">procmail-wrapper</packagereq>
       <packagereq type="default">proftpd</packagereq>
       <packagereq type="default">ruby</packagereq>
@@ -129,6 +130,7 @@
       <packagereq type="default">php-xml</packagereq>
       <packagereq type="default">php-xmlrpc</packagereq>
       <packagereq type="default">postgrey</packagereq>
+      <packagereq type="default">procmail</packagereq>
       <packagereq type="default">procmail-wrapper</packagereq>
       <packagereq type="default">proftpd</packagereq>
       <packagereq type="default">ruby</packagereq>