From 6217ec93c0b08d9bbc62cdb108e9e25b196077e0 Mon Sep 17 00:00:00 2001
From: Joe Cooper <swelljoe@gmail.com>
Date: Thu, 5 Oct 2017 01:36:29 -0500
Subject: [PATCH] Add some compression tools for extract in File Manager

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

diff --git a/virtualmin-centos-6-comps.xml b/virtualmin-centos-6-comps.xml
index 76997b6..fbad8e0 100644
--- a/virtualmin-centos-6-comps.xml
+++ b/virtualmin-centos-6-comps.xml
@@ -60,6 +60,7 @@
       <packagereq type="mandatory">quota</packagereq>
       <packagereq type="mandatory">unzip</packagereq>
       <packagereq type="default">awstats</packagereq>
+      <packagereq type="default">bzip2</packagereq>
       <packagereq type="default">ca-certificates</packagereq>
       <packagereq type="default">clamav</packagereq>
       <packagereq type="default">cyrus-sasl</packagereq>
@@ -69,11 +70,13 @@
       <packagereq type="default">fail2ban</packagereq>
       <packagereq type="default">jailkit</packagereq>
       <packagereq type="default">logrotate</packagereq>
+      <packagereq type="default">milter-greylist</packagereq>
       <packagereq type="default">mod_fcgid</packagereq>
       <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">p7zip</packagereq>
       <packagereq type="default">php</packagereq>
       <packagereq type="default">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>
@@ -87,7 +90,7 @@
       <packagereq type="default">rubygems</packagereq>
       <packagereq type="default">spamassassin</packagereq>
       <packagereq type="default">webalizer</packagereq>
-      <packagereq type="default">milter-greylist</packagereq>
+      <packagereq type="default">xz</packagereq>
       <packagereq type="optional">perl-DBD-Pg</packagereq>
       <packagereq type="optional">php-odbc</packagereq>
       <packagereq type="optional">php-pgsql</packagereq>
@@ -131,6 +134,7 @@
       <packagereq type="mandatory">python</packagereq>
       <packagereq type="mandatory">quota</packagereq>
       <packagereq type="mandatory">unzip</packagereq>
+      <packagereq type="default">bzip2</packagereq>
       <packagereq type="default">ca-certificates</packagereq>
       <packagereq type="default">clamav</packagereq>
       <packagereq type="default">cyrus-sasl</packagereq>
@@ -144,6 +148,7 @@
       <packagereq type="default">mysql-devel</packagereq>
       <packagereq type="default">mysql-server</packagereq>
       <packagereq type="default">opendkim</packagereq>
+      <packagereq type="default">p7zip</packagereq>
       <packagereq type="default">perl-Config-IniFiles</packagereq>
       <packagereq type="default">php-mbstring</packagereq>
       <packagereq type="default">php-opcache</packagereq>
@@ -153,8 +158,10 @@
       <packagereq type="default">procmail-wrapper</packagereq>
       <packagereq type="default">proftpd</packagereq>
       <packagereq type="default">spamassassin</packagereq>
+      <packagereq type="default">xz</packagereq>
       <packagereq type="optional">awstats</packagereq>
       <packagereq type="optional">fail2ban</packagereq>
+      <packagereq type="optional">milter-greylist</packagereq>
       <packagereq type="optional">perl-DBD-Pg</packagereq>
       <packagereq type="optional">php-pgsql</packagereq>
       <packagereq type="optional">php-snmp</packagereq>
@@ -163,7 +170,6 @@
       <packagereq type="optional">postgresql-server</packagereq>
       <packagereq type="optional">postgrey</packagereq>
       <packagereq type="optional">webalizer</packagereq>
-      <packagereq type="optional">milter-greylist</packagereq>
     </packagelist>
   </group>
   <group>
@@ -202,6 +208,7 @@
       <packagereq type="mandatory">wbm-virtualmin-nginx</packagereq>
       <packagereq type="mandatory">wbm-virtualmin-nginx-ssl</packagereq>
       <packagereq type="default">awstats</packagereq>
+      <packagereq type="default">bzip2</packagereq>
       <packagereq type="default">ca-certificates</packagereq>
       <packagereq type="default">clamav</packagereq>
       <packagereq type="default">cyrus-sasl</packagereq>
@@ -211,7 +218,9 @@
       <packagereq type="default">fail2ban</packagereq>
       <packagereq type="default">jailkit</packagereq>
       <packagereq type="default">logrotate</packagereq>
+      <packagereq type="default">milter-greylist</packagereq>
       <packagereq type="default">opendkim</packagereq>
+      <packagereq type="default">p7zip</packagereq>
       <packagereq type="default">php</packagereq>
       <packagereq type="default">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>
@@ -225,7 +234,7 @@
       <packagereq type="default">rubygems</packagereq>
       <packagereq type="default">spamassassin</packagereq>
       <packagereq type="default">webalizer</packagereq>
-      <packagereq type="default">milter-greylist</packagereq>
+      <packagereq type="default">xz</packagereq>
       <packagereq type="optional">perl-DBD-Pg</packagereq>
       <packagereq type="optional">php-odbc</packagereq>
       <packagereq type="optional">php-pgsql</packagereq>
@@ -269,6 +278,7 @@
       <packagereq type="mandatory">unzip</packagereq>
       <packagereq type="mandatory">wbm-virtualmin-nginx</packagereq>
       <packagereq type="mandatory">wbm-virtualmin-nginx-ssl</packagereq>
+      <packagereq type="default">bzip2</packagereq>
       <packagereq type="default">ca-certificates</packagereq>
       <packagereq type="default">clamav</packagereq>
       <packagereq type="default">cyrus-sasl</packagereq>
@@ -281,6 +291,7 @@
       <packagereq type="default">mysql-devel</packagereq>
       <packagereq type="default">mysql-server</packagereq>
       <packagereq type="default">opendkim</packagereq>
+      <packagereq type="default">p7zip</packagereq>
       <packagereq type="default">perl-Config-IniFiles</packagereq>
       <packagereq type="default">php-mbstring</packagereq>
       <packagereq type="default">php-opcache</packagereq>
@@ -290,8 +301,10 @@
       <packagereq type="default">procmail-wrapper</packagereq>
       <packagereq type="default">proftpd</packagereq>
       <packagereq type="default">spamassassin</packagereq>
+      <packagereq type="default">xz</packagereq>
       <packagereq type="optional">awstats</packagereq>
       <packagereq type="optional">fail2ban</packagereq>
+      <packagereq type="optional">milter-greylist</packagereq>
       <packagereq type="optional">perl-DBD-Pg</packagereq>
       <packagereq type="optional">php-pgsql</packagereq>
       <packagereq type="optional">php-snmp</packagereq>
@@ -300,7 +313,6 @@
       <packagereq type="optional">postgresql-server</packagereq>
       <packagereq type="optional">postgrey</packagereq>
       <packagereq type="optional">webalizer</packagereq>
-      <packagereq type="optional">milter-greylist</packagereq>
     </packagelist>
   </group>
 </comps>
diff --git a/virtualmin-centos-7-comps.xml b/virtualmin-centos-7-comps.xml
index 09dc7a1..a1ed766 100644
--- a/virtualmin-centos-7-comps.xml
+++ b/virtualmin-centos-7-comps.xml
@@ -61,6 +61,7 @@
       <packagereq type="mandatory">quota</packagereq>
       <packagereq type="mandatory">unzip</packagereq>
       <packagereq type="default">awstats</packagereq>
+      <packagereq type="default">bzip2</packagereq>
       <packagereq type="default">clamav</packagereq>
       <packagereq type="default">clamav-scanner-systemd</packagereq>
       <packagereq type="default">clamav-server</packagereq>
@@ -77,8 +78,10 @@
       <packagereq type="default">mariadb</packagereq>
       <packagereq type="default">mariadb-devel</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-Config-IniFiles</packagereq>
       <packagereq type="default">php</packagereq>
       <packagereq type="default">php-opcache</packagereq>
@@ -93,6 +96,7 @@
       <packagereq type="default">rubygems</packagereq>
       <packagereq type="default">spamassassin</packagereq>
       <packagereq type="default">webalizer</packagereq>
+      <packagereq type="default">xz</packagereq>
       <packagereq type="optional">perl-DBD-Pg</packagereq>
       <packagereq type="optional">php-odbc</packagereq>
       <packagereq type="optional">php-pgsql</packagereq>
@@ -100,7 +104,6 @@
       <packagereq type="optional">postgresql</packagereq>
       <packagereq type="optional">postgresql-devel</packagereq>
       <packagereq type="optional">postgresql-server</packagereq>
-      <packagereq type="default">milter-greylist</packagereq>
     </packagelist>
   </group>
   <group>
@@ -139,6 +142,7 @@
       <packagereq type="mandatory">unzip</packagereq>
       <packagereq type="default">bind</packagereq>
       <packagereq type="default">bind-utils</packagereq>
+      <packagereq type="default">bzip2</packagereq>
       <packagereq type="default">clamav</packagereq>
       <packagereq type="default">cyrus-sasl</packagereq>
       <packagereq type="default">cyrus-sasl-gssapi</packagereq>
@@ -152,6 +156,7 @@
       <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-Config-IniFiles</packagereq>
       <packagereq type="default">php</packagereq>
       <packagereq type="default">php-opcache</packagereq>
@@ -162,12 +167,14 @@
       <packagereq type="default">procmail-wrapper</packagereq>
       <packagereq type="default">proftpd</packagereq>
       <packagereq type="default">spamassassin</packagereq>
+      <packagereq type="default">xz</packagereq>
       <packagereq type="optional">awstats</packagereq>
       <packagereq type="optional">clamav-scanner-systemd</packagereq>
       <packagereq type="optional">clamav-server</packagereq>
       <packagereq type="optional">clamav-server-systemd</packagereq>
       <packagereq type="optional">fail2ban-firewalld</packagereq>
       <packagereq type="optional">fail2ban-server</packagereq>
+      <packagereq type="optional">milter-greylist</packagereq>
       <packagereq type="optional">perl-DBD-Pg</packagereq>
       <packagereq type="optional">php-odbc</packagereq>
       <packagereq type="optional">php-pgsql</packagereq>
@@ -178,7 +185,6 @@
       <packagereq type="optional">ruby</packagereq>
       <packagereq type="optional">ruby-devel</packagereq>
       <packagereq type="optional">rubygems</packagereq>
-      <packagereq type="optional">milter-greylist</packagereq>
       <packagereq type="optional">webalizer</packagereq>
     </packagelist>
   </group>
@@ -218,6 +224,7 @@
       <packagereq type="mandatory">wbm-virtualmin-nginx</packagereq>
       <packagereq type="mandatory">wbm-virtualmin-nginx-ssl</packagereq>
       <packagereq type="default">awstats</packagereq>
+      <packagereq type="default">bzip2</packagereq>
       <packagereq type="default">ca-certificates</packagereq>
       <packagereq type="default">clamav</packagereq>
       <packagereq type="default">clamav-scanner-systemd</packagereq>
@@ -234,7 +241,9 @@
       <packagereq type="default">mariadb</packagereq>
       <packagereq type="default">mariadb-devel</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-Config-IniFiles</packagereq>
       <packagereq type="default">php-odbc</packagereq>
       <packagereq type="default">php-opcache</packagereq>
@@ -249,7 +258,7 @@
       <packagereq type="default">rubygems</packagereq>
       <packagereq type="default">spamassassin</packagereq>
       <packagereq type="default">webalizer</packagereq>
-      <packagereq type="default">milter-greylist</packagereq>
+      <packagereq type="default">xz</packagereq>
       <packagereq type="optional">perl-DBD-Pg</packagereq>
       <packagereq type="optional">php-pgsql</packagereq>
       <packagereq type="optional">php-snmp</packagereq>
@@ -294,6 +303,7 @@
       <packagereq type="mandatory">wbm-virtualmin-nginx-ssl</packagereq>
       <packagereq type="default">bind</packagereq>
       <packagereq type="default">bind-utils</packagereq>
+      <packagereq type="default">bzip2</packagereq>
       <packagereq type="default">clamav</packagereq>
       <packagereq type="default">cyrus-sasl</packagereq>
       <packagereq type="default">cyrus-sasl-gssapi</packagereq>
@@ -306,6 +316,7 @@
       <packagereq type="default">mariadb-devel</packagereq>
       <packagereq type="default">mariadb-server</packagereq>
       <packagereq type="default">opendkim</packagereq>
+      <packagereq type="default">p7zip</packagereq>
       <packagereq type="default">perl-Config-IniFiles</packagereq>
       <packagereq type="default">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>
@@ -315,12 +326,14 @@
       <packagereq type="default">procmail-wrapper</packagereq>
       <packagereq type="default">proftpd</packagereq>
       <packagereq type="default">spamassassin</packagereq>
+      <packagereq type="default">xz</packagereq>
       <packagereq type="optional">awstats</packagereq>
       <packagereq type="optional">clamav-scanner-systemd</packagereq>
       <packagereq type="optional">clamav-server</packagereq>
       <packagereq type="optional">clamav-server-systemd</packagereq>
       <packagereq type="optional">fail2ban-firewalld</packagereq>
       <packagereq type="optional">fail2ban-server</packagereq>
+      <packagereq type="optional">milter-greylist</packagereq>
       <packagereq type="optional">perl-DBD-Pg</packagereq>
       <packagereq type="optional">php-odbc</packagereq>
       <packagereq type="optional">php-pgsql</packagereq>
@@ -332,7 +345,6 @@
       <packagereq type="optional">ruby-devel</packagereq>
       <packagereq type="optional">rubygems</packagereq>
       <packagereq type="optional">webalizer</packagereq>
-      <packagereq type="optional">milter-greylist</packagereq>
     </packagelist>
   </group>
 </comps>
diff --git a/virtualmin-fedora-25-comps.xml b/virtualmin-fedora-25-comps.xml
index ce60898..20d9ab9 100644
--- a/virtualmin-fedora-25-comps.xml
+++ b/virtualmin-fedora-25-comps.xml
@@ -39,6 +39,7 @@
       <packagereq type="mandatory">quota</packagereq>
       <packagereq type="mandatory">unzip</packagereq>
       <packagereq type="default">awstats</packagereq>
+      <packagereq type="default">bzip2</packagereq>
       <packagereq type="default">clamav</packagereq>
       <packagereq type="default">clamav-scanner-systemd</packagereq>
       <packagereq type="default">clamav-server</packagereq>
@@ -54,8 +55,10 @@
       <packagereq type="default">mariadb</packagereq>
       <packagereq type="default">mariadb-devel</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">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>
       <packagereq type="default">php-xmlrpc</packagereq>
@@ -68,6 +71,7 @@
       <packagereq type="default">rubygems</packagereq>
       <packagereq type="default">spamassassin</packagereq>
       <packagereq type="default">webalizer</packagereq>
+      <packagereq type="default">xz</packagereq>
       <packagereq type="optional">perl-DBD-Pg</packagereq>
       <packagereq type="optional">php-odbc</packagereq>
       <packagereq type="optional">php-pgsql</packagereq>
@@ -75,7 +79,6 @@
       <packagereq type="optional">postgresql</packagereq>
       <packagereq type="optional">postgresql-devel</packagereq>
       <packagereq type="optional">postgresql-server</packagereq>
-      <packagereq type="default">milter-greylist</packagereq>
     </packagelist>
   </group>
   <group>
@@ -113,6 +116,7 @@
       <packagereq type="mandatory">quota</packagereq>
       <packagereq type="mandatory">unzip</packagereq>
       <packagereq type="default">awstats</packagereq>
+      <packagereq type="default">bzip2</packagereq>
       <packagereq type="default">ca-certificates</packagereq>
       <packagereq type="default">clamav</packagereq>
       <packagereq type="default">clamav-scanner-systemd</packagereq>
@@ -128,7 +132,9 @@
       <packagereq type="default">mariadb</packagereq>
       <packagereq type="default">mariadb-devel</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">php-odbc</packagereq>
       <packagereq type="default">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>
@@ -142,13 +148,13 @@
       <packagereq type="default">rubygems</packagereq>
       <packagereq type="default">spamassassin</packagereq>
       <packagereq type="default">webalizer</packagereq>
+      <packagereq type="default">xz</packagereq>
       <packagereq type="optional">perl-DBD-Pg</packagereq>
       <packagereq type="optional">php-pgsql</packagereq>
       <packagereq type="optional">php-snmp</packagereq>
       <packagereq type="optional">postgresql</packagereq>
       <packagereq type="optional">postgresql-devel</packagereq>
       <packagereq type="optional">postgresql-server</packagereq>
-      <packagereq type="default">milter-greylist</packagereq>
     </packagelist>
   </group>
 </comps>
diff --git a/virtualmin-fedora-26-comps.xml b/virtualmin-fedora-26-comps.xml
index 269a6b8..150c485 100644
--- a/virtualmin-fedora-26-comps.xml
+++ b/virtualmin-fedora-26-comps.xml
@@ -39,6 +39,7 @@
       <packagereq type="mandatory">quota</packagereq>
       <packagereq type="mandatory">unzip</packagereq>
       <packagereq type="default">awstats</packagereq>
+      <packagereq type="default">bzip2</packagereq>
       <packagereq type="default">clamav</packagereq>
       <packagereq type="default">clamav-scanner-systemd</packagereq>
       <packagereq type="default">clamav-server</packagereq>
@@ -55,8 +56,10 @@
       <packagereq type="default">mariadb</packagereq>
       <packagereq type="default">mariadb-devel</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">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>
       <packagereq type="default">php-xmlrpc</packagereq>
@@ -69,6 +72,7 @@
       <packagereq type="default">rubygems</packagereq>
       <packagereq type="default">spamassassin</packagereq>
       <packagereq type="default">webalizer</packagereq>
+      <packagereq type="default">xz</packagereq>
       <packagereq type="optional">perl-DBD-Pg</packagereq>
       <packagereq type="optional">php-odbc</packagereq>
       <packagereq type="optional">php-pgsql</packagereq>
@@ -76,7 +80,6 @@
       <packagereq type="optional">postgresql</packagereq>
       <packagereq type="optional">postgresql-devel</packagereq>
       <packagereq type="optional">postgresql-server</packagereq>
-      <packagereq type="default">milter-greylist</packagereq>
     </packagelist>
   </group>
   <group>
@@ -113,8 +116,8 @@
       <packagereq type="mandatory">python</packagereq>
       <packagereq type="mandatory">quota</packagereq>
       <packagereq type="mandatory">unzip</packagereq>
-      <packagereq type="default">milter-greylist</packagereq>
       <packagereq type="default">awstats</packagereq>
+      <packagereq type="default">bzip2</packagereq>
       <packagereq type="default">ca-certificates</packagereq>
       <packagereq type="default">clamav</packagereq>
       <packagereq type="default">clamav-scanner-systemd</packagereq>
@@ -131,7 +134,9 @@
       <packagereq type="default">mariadb</packagereq>
       <packagereq type="default">mariadb-devel</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">php-odbc</packagereq>
       <packagereq type="default">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>
@@ -145,6 +150,7 @@
       <packagereq type="default">rubygems</packagereq>
       <packagereq type="default">spamassassin</packagereq>
       <packagereq type="default">webalizer</packagereq>
+      <packagereq type="default">xz</packagereq>
       <packagereq type="optional">perl-DBD-Pg</packagereq>
       <packagereq type="optional">php-pgsql</packagereq>
       <packagereq type="optional">php-snmp</packagereq>