git: 5725ea1ced84 - main - sysutils/webmin: update to version 2.000

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jimmy Olgeni <olgeni_at_FreeBSD.org>
Date: Sat, 01 Oct 2022 08:37:52 UTC
The branch main has been updated by olgeni:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5725ea1ced84beca8f9eb0481bc61d6af7214373

commit 5725ea1ced84beca8f9eb0481bc61d6af7214373
Author:     Jimmy Olgeni <olgeni@FreeBSD.org>
AuthorDate: 2022-10-01 08:15:05 +0000
Commit:     Jimmy Olgeni <olgeni@FreeBSD.org>
CommitDate: 2022-10-01 08:34:28 +0000

    sysutils/webmin: update to version 2.000
---
 sysutils/webmin/Makefile             |   6 +-
 sysutils/webmin/distinfo             |   6 +-
 sysutils/webmin/files/patch-setup.sh | 159 +++++++++++++++++------------------
 sysutils/webmin/pkg-plist            | 128 +++++++++++++++++++++++-----
 4 files changed, 192 insertions(+), 107 deletions(-)

diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile
index 5e03ecd6706d..30efa19bdcfb 100644
--- a/sysutils/webmin/Makefile
+++ b/sysutils/webmin/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	webmin
-PORTVERSION=	1.997
+PORTVERSION=	2.000
 PORTREVISION=	0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.webmin.com/updates/:up \
@@ -43,7 +43,7 @@ post-extract:
 post-patch:
 	@${REINPLACE_CMD} -e "s@%%PREFIX%%@${PREFIX}@g" ${WRKSRC}/setup.sh
 
-	@${FIND} ${WRKSRC} \( -type f -and \( -name config-freebsd\* -or -name config \) \) \
+	@${FIND} ${WRKSRC} \( -type f -and \( -name config-freebsd\* -or -name config -or -name setup.sh \) \) \
 		-exec ${REINPLACE_CMD} -e "s@/usr/local@${PREFIX}@g" {} \; \
 		-exec ${REINPLACE_CMD} -e "s@%%PREFIX%%@${PREFIX}@g" {} \;
 
@@ -52,8 +52,6 @@ post-patch:
 
 	@${FIND} ${WRKSRC} \( -name "*.orig" -or -name "*.bak" -or -name "*.pyc" \) -delete
 
-	@${PRINTF} "g/^FreeBSD/m0\nwq\n" | ex ${WRKSRC}/os_list.txt
-
 do-build:
 	@${PYTHON_CMD} -mcompileall ${WRKSRC}/ajaxterm/ajaxterm/
 	@${PYTHON_CMD} -O -mcompileall ${WRKSRC}/ajaxterm/ajaxterm/
diff --git a/sysutils/webmin/distinfo b/sysutils/webmin/distinfo
index 1722bcaf9aba..42fd089515f1 100644
--- a/sysutils/webmin/distinfo
+++ b/sysutils/webmin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1659360089
-SHA256 (webmin-1.997.tar.gz) = a7591eef4daa3e65de529dd21cdbbb97e53e7daf5a6aa446c3d7298a1fc717fd
-SIZE (webmin-1.997.tar.gz) = 44723213
+TIMESTAMP = 1664549814
+SHA256 (webmin-2.000.tar.gz) = b7394544543262ab9c614266cf85cc634fd083e2a32b4fb981bcbf0fc53f2aab
+SIZE (webmin-2.000.tar.gz) = 44822732
diff --git a/sysutils/webmin/files/patch-setup.sh b/sysutils/webmin/files/patch-setup.sh
index 17804bd1a726..4146f59d0404 100644
--- a/sysutils/webmin/files/patch-setup.sh
+++ b/sysutils/webmin/files/patch-setup.sh
@@ -1,97 +1,94 @@
---- setup.sh.orig	2022-07-04 19:10:33 UTC
+--- setup.sh.orig	2022-10-01 06:55:59 UTC
 +++ setup.sh
-@@ -105,19 +105,7 @@ echo "Webmin uses separate directories for configurati
- echo "Unless you want to run multiple versions of Webmin at the same time"
- echo "you can just accept the defaults."
+@@ -13,6 +13,13 @@ if [ "$bootscript" = "" ]; then
+ 	bootscript="webmin"
+ fi
+ 
++nostart="yes"
++nostop="yes"
++nochown="yes"
++nouninstall="yes"
++noperlpath="yes"
++atboot=0
++
+ cd `dirname $0`
+ if [ -x /bin/pwd ]; then
+ 	wadir=`/bin/pwd`
+@@ -112,7 +119,7 @@ echo "you can just accept the defaults."
  echo ""
--printf "Config file directory [/etc/webmin]: "
--if [ "$config_dir" = "" ]; then
--	read config_dir
--fi
--if [ "$config_dir" = "" ]; then
+ envetcdir="$config_dir"
+ if [ "$envetcdir" = "" ]; then
+-	envetcdir=/etc/webmin
++	envetcdir=%%PREFIX%%/etc/webmin
+ 	envetcdirnotfound=1
+ fi
+ printf "Config file directory [$envetcdir]: "
+@@ -120,7 +127,7 @@ if [ "$config_dir" = "" ]; then
+ 	read config_dir
+ fi
+ if [ "$config_dir" = "" ]; then
 -	config_dir=/etc/webmin
--fi
--abspath=`echo $config_dir | grep "^/"`
--if [ "$abspath" = "" ]; then
--	echo "Config directory must be an absolute path"
--	echo ""
--	exit 2
--fi
-+config_dir=/usr/local/etc/webmin
- if [ ! -d $config_dir ]; then
- 	mkdir $config_dir;
- 	if [ $? != 0 ]; then
-@@ -212,12 +200,12 @@ else
++	config_dir=%%PREFIX%%/etc/webmin
+ fi
+ abspath=`echo $config_dir | grep "^/"`
+ if [ "$abspath" = "" ]; then
+@@ -214,7 +221,7 @@ if [ "$upgrading" = 1 ]; then
+ 	if [ $? != "0" ]; then
+ 		echo "logout=$config_dir/logout-flag" >> $config_dir/miniserv.conf
  	fi
- 
+-	
++
+ 	# Check for third-party modules in old version
+ 	if [ "$wadir" != "$oldwadir" ]; then
+ 		echo "Checking for third-party modules .."
+@@ -231,7 +238,7 @@ if [ "$upgrading" = 1 ]; then
+ else
+ 	# Config directory exists .. make sure it is not in use
+ 	ls $config_dir | grep -v rpmsave >/dev/null 2>&1
+-	if [ "$?" = "0" -a "$config_dir" != "/etc/webmin" ]; then
++	if [ "$?" = "0" -a "$config_dir" != "%%PREFIX%%/etc/webmin" ]; then
+ 		echo "ERROR: Config directory $config_dir is not empty"
+ 		echo ""
+ 		exit 2
+@@ -240,7 +247,7 @@ else
  	# Ask for log directory
--	printf "Log file directory [/var/webmin]: "
-+	printf "Log file directory [/var/log/webmin]: "
- 	if [ "$var_dir" = "" ]; then
+ 	envvardir="$var_dir"
+ 	if [ "$envvardir" = "" ]; then
+-		envvardir=/var/webmin
++		envvardir=/var/db/webmin
+ 		envvardirnotfound=1
+ 	fi
+ 	printf "Log file directory [$envvardir]: "
+@@ -248,7 +255,7 @@ else
  		read var_dir
  	fi
  	if [ "$var_dir" = "" ]; then
 -		var_dir=/var/webmin
-+		var_dir=/var/log/webmin
++		var_dir=/var/db/webmin
  	fi
  	abspath=`echo $var_dir | grep "^/"`
  	if [ "$abspath" = "" ]; then
-@@ -245,7 +233,9 @@ else
- 	echo "Webmin is written entirely in Perl. Please enter the full path to the"
- 	echo "Perl 5 interpreter on your system."
- 	echo ""
--	if [ -x /usr/bin/perl ]; then
-+	if [ -x %%PERL%% ]; then
-+		perldef=%%PERL%%
-+	elif [ -x /usr/bin/perl ]; then
- 		perldef=/usr/bin/perl
- 	elif [ -x /usr/local/bin/perl ]; then
- 		perldef=/usr/local/bin/perl
-@@ -446,6 +436,7 @@ else
- 		fi
- 	fi
- 
-+	atboot=0
- 	# Ask whether to run at boot time
- 	if [ "$atboot" = "" ]; then
- 		if echo "$os_type" | grep  -q "\-linux$"; then
-@@ -607,6 +598,7 @@ EOF
+@@ -305,7 +312,7 @@ else
  	fi
- fi
+ 	echo ""
  
-+noperlpath="yes"
- if [ "$noperlpath" = "" ]; then
- 	echo "Inserting path to perl into scripts.."
- 	(find "$wadir" -name '*.cgi' -print ; find "$wadir" -name '*.pl' -print) | $perl "$wadir/perlpath.pl" $perl -
-@@ -618,7 +610,6 @@ fi
- echo "Creating start and stop init scripts.."
- # Start main
- echo "#!/bin/sh" >$config_dir/.start-init
--echo "echo Starting Webmin server in $wadir" >>$config_dir/.start-init
- echo "trap '' 1" >>$config_dir/.start-init
- echo "LANG=" >>$config_dir/.start-init
- echo "export LANG" >>$config_dir/.start-init
-@@ -849,6 +840,7 @@ if [ "$?" != "0" ]; then
- 	echo passdelay=1 >> $config_dir/miniserv.conf
- fi
+-	# Test perl 
++	# Test perl
+ 	echo "Testing Perl .."
+ 	if [ ! -x $perl ]; then
+ 		echo "ERROR: Failed to find perl at $perl"
+@@ -780,7 +787,7 @@ if [ -x "$systemctlcmd" ]; then
  
-+nouninstall="yes"
- if [ "$nouninstall" = "" ]; then
- 	echo "Creating uninstall script $config_dir/uninstall.sh .."
- 	cat >$config_dir/uninstall.sh <<EOF
-@@ -886,6 +878,7 @@ for f in miniserv.conf miniserv.pem miniserv.users; do
- 	chmod -R og-rw $config_dir/$f
- done
- chmod +r $config_dir/version
-+nochown="yes"
- if [ "$nochown" = "" ]; then
- 	# Make program directory non-world-writable, but executable
- 	chown -R root "$wadir"
-@@ -938,6 +931,7 @@ if [ -r "$srcdir/setup-post.sh" ]; then
- 	. "$srcdir/setup-post.sh"
+ 	# Fix existing systemd webmin.service file to update start and stop commands
+ 	(cd "$wadir/init" ; WEBMIN_CONFIG=$config_dir WEBMIN_VAR=$var_dir "$wadir/init/updateboot.pl" "$bootscript")
+-	
++
+ 	chmod 755 $config_dir/stop $config_dir/start $config_dir/restart $config_dir/restart-by-force-kill $config_dir/reload $config_dir/.pre-install $config_dir/.post-install
+ else
+ 	# Creating symlinks
+@@ -1053,5 +1060,3 @@ if [ "$oldwadir" != "$wadir" -a "$upgrading" = 1 -a "$
+ 	echo "version."
+ 	echo ""
  fi
- 
-+nostart="yes"
- if [ "$nostart" = "" ]; then
- 	if [ "$inetd" != "1" ]; then
- 		echo "Attempting to start Webmin web server.."
+-
+-
diff --git a/sysutils/webmin/pkg-plist b/sysutils/webmin/pkg-plist
index e2333370f0a9..d127bb0fec6c 100644
--- a/sysutils/webmin/pkg-plist
+++ b/sysutils/webmin/pkg-plist
@@ -1063,7 +1063,9 @@ lib/webmin/apache/change_files.cgi
 lib/webmin/apache/config-AlmaLinux-7.0-ALL
 lib/webmin/apache/config-Amazon-Linux-2-ALL
 lib/webmin/apache/config-CentOS-Linux-7.0-ALL
-lib/webmin/apache/config-Fedora-Linux-20-ALL
+lib/webmin/apache/config-CentOS-Stream-Linux-8.0-ALL
+lib/webmin/apache/config-Fedora-Linux-20.00-ALL
+lib/webmin/apache/config-Oracle-Linux-8.0-ALL
 lib/webmin/apache/config-Redhat-Enterprise-Linux-7.0-ALL
 lib/webmin/apache/config-Rocky-Linux-7.0-ALL
 lib/webmin/apache/config-Scientific-Linux-7.0-ALL
@@ -1072,8 +1074,9 @@ lib/webmin/apache/config-cobalt-linux
 lib/webmin/apache/config-coherent-linux
 lib/webmin/apache/config-corel-linux
 lib/webmin/apache/config-debian-linux
+lib/webmin/apache/config-debian-linux-10.0-ALL
 lib/webmin/apache/config-debian-linux-3.1-6.9
-lib/webmin/apache/config-debian-linux-7.0-ALL
+lib/webmin/apache/config-debian-linux-7.0-9.0
 lib/webmin/apache/config-freebsd
 lib/webmin/apache/config-freebsd-8.0-ALL
 lib/webmin/apache/config-generic-linux
@@ -2425,30 +2428,42 @@ lib/webmin/authentic-theme/images/modules/server-manager/ec2.gif
 lib/webmin/authentic-theme/images/modules/server-manager/images.gif
 lib/webmin/authentic-theme/images/modules/server-manager/keys.gif
 lib/webmin/authentic-theme/images/modules/server-manager/zones.gif
+lib/webmin/authentic-theme/images/modules/servers/alma.svg
 lib/webmin/authentic-theme/images/modules/servers/asianux.gif
 lib/webmin/authentic-theme/images/modules/servers/caldera.gif
 lib/webmin/authentic-theme/images/modules/servers/centos.gif
+lib/webmin/authentic-theme/images/modules/servers/centos.svg
 lib/webmin/authentic-theme/images/modules/servers/cobalt.gif
 lib/webmin/authentic-theme/images/modules/servers/debian.gif
+lib/webmin/authentic-theme/images/modules/servers/debian.svg
 lib/webmin/authentic-theme/images/modules/servers/fedora.gif
+lib/webmin/authentic-theme/images/modules/servers/fedora.svg
 lib/webmin/authentic-theme/images/modules/servers/freebsd.gif
+lib/webmin/authentic-theme/images/modules/servers/freebsd.svg
 lib/webmin/authentic-theme/images/modules/servers/hpux.gif
 lib/webmin/authentic-theme/images/modules/servers/icon.gif
 lib/webmin/authentic-theme/images/modules/servers/irix.gif
 lib/webmin/authentic-theme/images/modules/servers/linux.gif
+lib/webmin/authentic-theme/images/modules/servers/linux.svg
 lib/webmin/authentic-theme/images/modules/servers/mac.gif
 lib/webmin/authentic-theme/images/modules/servers/mandrake.gif
 lib/webmin/authentic-theme/images/modules/servers/msc.gif
 lib/webmin/authentic-theme/images/modules/servers/openbsd.gif
+lib/webmin/authentic-theme/images/modules/servers/oracle.svg
+lib/webmin/authentic-theme/images/modules/servers/raspberry.svg
 lib/webmin/authentic-theme/images/modules/servers/redflag.gif
 lib/webmin/authentic-theme/images/modules/servers/redhat.gif
+lib/webmin/authentic-theme/images/modules/servers/redhat.svg
+lib/webmin/authentic-theme/images/modules/servers/rocky.svg
 lib/webmin/authentic-theme/images/modules/servers/sco.gif
 lib/webmin/authentic-theme/images/modules/servers/slackware.gif
 lib/webmin/authentic-theme/images/modules/servers/smallicon.gif
 lib/webmin/authentic-theme/images/modules/servers/solaris.gif
 lib/webmin/authentic-theme/images/modules/servers/suse.gif
+lib/webmin/authentic-theme/images/modules/servers/suse.svg
 lib/webmin/authentic-theme/images/modules/servers/turbo.gif
 lib/webmin/authentic-theme/images/modules/servers/ubuntu.gif
+lib/webmin/authentic-theme/images/modules/servers/ubuntu.svg
 lib/webmin/authentic-theme/images/modules/servers/unknown.gif
 lib/webmin/authentic-theme/images/modules/servers/windows.gif
 lib/webmin/authentic-theme/images/modules/shell/icon.gif
@@ -2824,6 +2839,7 @@ lib/webmin/authentic-theme/modules/filemin/config.info.de
 lib/webmin/authentic-theme/navigation-lib.pl
 lib/webmin/authentic-theme/pam_login.cgi
 lib/webmin/authentic-theme/password_form.cgi
+lib/webmin/authentic-theme/postinstall-usermin.pl
 lib/webmin/authentic-theme/postinstall.pl
 lib/webmin/authentic-theme/service-worker.js
 lib/webmin/authentic-theme/session_login.cgi
@@ -3192,6 +3208,7 @@ lib/webmin/authentic-theme/unauthenticated/js/photoswipe.min.js.gz
 lib/webmin/authentic-theme/unauthenticated/js/quill.min.js
 lib/webmin/authentic-theme/unauthenticated/js/quill.min.js.gz
 lib/webmin/authentic-theme/unauthenticated/js/service-worker.js
+lib/webmin/authentic-theme/uninstall-usermin.pl
 lib/webmin/authentic-theme/uninstall.pl
 lib/webmin/authentic-theme/xhr-lib.pl
 lib/webmin/authentic-theme/xhr.cgi
@@ -4945,8 +4962,12 @@ lib/webmin/bind8/conf_servers.cgi
 lib/webmin/bind8/conf_trusted.cgi
 lib/webmin/bind8/conf_zonedef.cgi
 lib/webmin/bind8/config-AlmaLinux-6.0-ALL
-lib/webmin/bind8/config-CentOS-Linux-6.0-ALL
-lib/webmin/bind8/config-Redhat-Enterprise-Linux-6.0-ALL
+lib/webmin/bind8/config-CentOS-Linux-6.0-7.0
+lib/webmin/bind8/config-CentOS-Linux-8.0-ALL
+lib/webmin/bind8/config-CentOS-Stream-Linux-8.0-ALL
+lib/webmin/bind8/config-Oracle-Linux-8.0-ALL
+lib/webmin/bind8/config-Redhat-Enterprise-Linux-6.0-7.0
+lib/webmin/bind8/config-Redhat-Enterprise-Linux-8.0-ALL
 lib/webmin/bind8/config-Rocky-Linux-6.0-ALL
 lib/webmin/bind8/config-Scientific-Linux-6.0-ALL
 lib/webmin/bind8/config-aix
@@ -4954,9 +4975,10 @@ lib/webmin/bind8/config-cobalt-linux
 lib/webmin/bind8/config-coherent-linux
 lib/webmin/bind8/config-corel-linux
 lib/webmin/bind8/config-debian-linux
+lib/webmin/bind8/config-debian-linux-10.0-ALL
 lib/webmin/bind8/config-debian-linux-2.2
 lib/webmin/bind8/config-debian-linux-3.0
-lib/webmin/bind8/config-debian-linux-3.1-ALL
+lib/webmin/bind8/config-debian-linux-3.1-9.0
 lib/webmin/bind8/config-freebsd-12.0-ALL
 lib/webmin/bind8/config-freebsd-2.1-2.2
 lib/webmin/bind8/config-freebsd-3.0
@@ -4979,11 +5001,8 @@ lib/webmin/bind8/config-openmamba-linux
 lib/webmin/bind8/config-openserver
 lib/webmin/bind8/config-osf1
 lib/webmin/bind8/config-pardus-linux
-lib/webmin/bind8/config-redhat-linux
-lib/webmin/bind8/config-redhat-linux-10.0
-lib/webmin/bind8/config-redhat-linux-11.0-23.0
-lib/webmin/bind8/config-redhat-linux-24.0-ALL
-lib/webmin/bind8/config-redhat-linux-7.1-9.0
+lib/webmin/bind8/config-redhat-linux-7.0-ALL
+lib/webmin/bind8/config-redhat-linux-ALL-6.0
 lib/webmin/bind8/config-slackware-linux
 lib/webmin/bind8/config-slackware-linux-8.0-ALL
 lib/webmin/bind8/config-sol-linux
@@ -11277,6 +11296,8 @@ lib/webmin/dhcpd/config-Amazon-Linux-2-ALL
 lib/webmin/dhcpd/config-CentOS-Linux-5
 lib/webmin/dhcpd/config-CentOS-Linux-6.0-6.9
 lib/webmin/dhcpd/config-CentOS-Linux-7.0-ALL
+lib/webmin/dhcpd/config-CentOS-Stream-Linux-8.0-ALL
+lib/webmin/dhcpd/config-Oracle-Linux-8.0-ALL
 lib/webmin/dhcpd/config-Redhat-Enterprise-Linux-6.0-6.9
 lib/webmin/dhcpd/config-Redhat-Enterprise-Linux-7.0-ALL
 lib/webmin/dhcpd/config-Rocky-Linux-7.0-ALL
@@ -11636,6 +11657,8 @@ lib/webmin/dovecot/cgi_args.pl
 lib/webmin/dovecot/config
 lib/webmin/dovecot/config-AlmaLinux-7.0-ALL
 lib/webmin/dovecot/config-Amazon-Linux
+lib/webmin/dovecot/config-CentOS-Stream-Linux-8.0-ALL
+lib/webmin/dovecot/config-Oracle-Linux-8.0-ALL
 lib/webmin/dovecot/config-Rocky-Linux-7.0-ALL
 lib/webmin/dovecot/config-debian-linux
 lib/webmin/dovecot/config-freebsd-8.0-8.9
@@ -11921,6 +11944,8 @@ lib/webmin/exports/cgi_args.pl
 lib/webmin/exports/config-AlmaLinux-7.0-ALL
 lib/webmin/exports/config-Amazon-Linux-2-ALL
 lib/webmin/exports/config-CentOS-Linux-7.0-ALL
+lib/webmin/exports/config-CentOS-Stream-Linux-8.0-ALL
+lib/webmin/exports/config-Oracle-Linux-8.0-ALL
 lib/webmin/exports/config-Redhat-Enterprise-Linux-7.0-ALL
 lib/webmin/exports/config-Rocky-Linux-7.0-ALL
 lib/webmin/exports/config-Scientific-Linux-7.0-ALL
@@ -22311,6 +22336,8 @@ lib/webmin/ipsec/config
 lib/webmin/ipsec/config-AlmaLinux-7.0-ALL
 lib/webmin/ipsec/config-Amazon-Linux-2-ALL
 lib/webmin/ipsec/config-CentOS-Linux-7.0-ALL
+lib/webmin/ipsec/config-CentOS-Stream-Linux-8.0-ALL
+lib/webmin/ipsec/config-Oracle-Linux-8.0-ALL
 lib/webmin/ipsec/config-Redhat-Enterprise-Linux-7.0-ALL
 lib/webmin/ipsec/config-Rocky-Linux-7.0-ALL
 lib/webmin/ipsec/config-Scientific-Linux-7.0-ALL
@@ -23188,6 +23215,8 @@ lib/webmin/iscsi-tgtd/config
 lib/webmin/iscsi-tgtd/config-AlmaLinux-7.0-ALL
 lib/webmin/iscsi-tgtd/config-Amazon-Linux-2-ALL
 lib/webmin/iscsi-tgtd/config-CentOS-Linux-7.0-ALL
+lib/webmin/iscsi-tgtd/config-CentOS-Stream-Linux-8.0-ALL
+lib/webmin/iscsi-tgtd/config-Oracle-Linux-8.0-ALL
 lib/webmin/iscsi-tgtd/config-Redhat-Enterprise-Linux-7.0-ALL
 lib/webmin/iscsi-tgtd/config-Rocky-Linux-7.0-ALL
 lib/webmin/iscsi-tgtd/config-Scientific-Linux-7.0-ALL
@@ -24501,6 +24530,8 @@ lib/webmin/ldap-client/check.cgi
 lib/webmin/ldap-client/config-ALL-linux
 lib/webmin/ldap-client/config-AlmaLinux-6.0-ALL
 lib/webmin/ldap-client/config-CentOS-Linux-6.0-ALL
+lib/webmin/ldap-client/config-CentOS-Stream-Linux-8.0-ALL
+lib/webmin/ldap-client/config-Oracle-Linux-8.0-ALL
 lib/webmin/ldap-client/config-Redhat-Enterprise-Linux-6.0-ALL
 lib/webmin/ldap-client/config-Rocky-Linux-6.0-ALL
 lib/webmin/ldap-client/config-Scientific-Linux-6.0-ALL
@@ -24936,6 +24967,8 @@ lib/webmin/ldap-server/config-ALL-linux
 lib/webmin/ldap-server/config-AlmaLinux-7.0-ALL
 lib/webmin/ldap-server/config-Amazon-Linux-2-ALL
 lib/webmin/ldap-server/config-CentOS-Linux-7.0-ALL
+lib/webmin/ldap-server/config-CentOS-Stream-Linux-8.0-ALL
+lib/webmin/ldap-server/config-Oracle-Linux-8.0-ALL
 lib/webmin/ldap-server/config-Redhat-Enterprise-Linux-6.0-6.9
 lib/webmin/ldap-server/config-Redhat-Enterprise-Linux-7.0-ALL
 lib/webmin/ldap-server/config-Rocky-Linux-7.0-ALL
@@ -26180,6 +26213,8 @@ lib/webmin/lpadmin/colour.ps
 lib/webmin/lpadmin/config-AlmaLinux-7.0-ALL
 lib/webmin/lpadmin/config-Amazon-Linux-2-ALL
 lib/webmin/lpadmin/config-CentOS-Linux-7.0-ALL
+lib/webmin/lpadmin/config-CentOS-Stream-Linux-8.0-ALL
+lib/webmin/lpadmin/config-Oracle-Linux-8.0-ALL
 lib/webmin/lpadmin/config-Redhat-Enterprise-Linux-7.0-ALL
 lib/webmin/lpadmin/config-Rocky-Linux-7.0-ALL
 lib/webmin/lpadmin/config-Scientific-Linux-7.0-ALL
@@ -29083,6 +29118,8 @@ lib/webmin/mysql/config
 lib/webmin/mysql/config-AlmaLinux-7.0-ALL
 lib/webmin/mysql/config-Amazon-Linux-2-ALL
 lib/webmin/mysql/config-CentOS-Linux-7.0-ALL
+lib/webmin/mysql/config-CentOS-Stream-Linux-8.0-ALL
+lib/webmin/mysql/config-Oracle-Linux-8.0-ALL
 lib/webmin/mysql/config-Redhat-Enterprise-Linux-7.0-ALL
 lib/webmin/mysql/config-Rocky-Linux-7.0-ALL
 lib/webmin/mysql/config-Scientific-Linux-7.0-ALL
@@ -29092,7 +29129,8 @@ lib/webmin/mysql/config-aix
 lib/webmin/mysql/config-cobalt-linux
 lib/webmin/mysql/config-coherent-linux
 lib/webmin/mysql/config-debian-linux
-lib/webmin/mysql/config-debian-linux-2.2-ALL
+lib/webmin/mysql/config-debian-linux-10.0-ALL
+lib/webmin/mysql/config-debian-linux-2.2-9.0
 lib/webmin/mysql/config-freebsd
 lib/webmin/mysql/config-freebsd-8-ALL
 lib/webmin/mysql/config-gentoo-linux
@@ -32147,8 +32185,10 @@ lib/webmin/phpini/acl_security.pl
 lib/webmin/phpini/backup_config.pl
 lib/webmin/phpini/cgi_args.pl
 lib/webmin/phpini/config
+lib/webmin/phpini/config-Ubuntu-Linux-20.0-ALL
 lib/webmin/phpini/config-debian-linux
-lib/webmin/phpini/config-debian-linux-4.0-ALL
+lib/webmin/phpini/config-debian-linux-10.0-ALL
+lib/webmin/phpini/config-debian-linux-4.0-9.0
 lib/webmin/phpini/config-freebsd
 lib/webmin/phpini/config-openbsd
 lib/webmin/phpini/config-openmamba-linux
@@ -32390,12 +32430,19 @@ lib/webmin/postfix/canonical.cgi
 lib/webmin/postfix/canonical_edit.cgi
 lib/webmin/postfix/client.cgi
 lib/webmin/postfix/config
+lib/webmin/postfix/config-AlmaLinux-8.0-ALL
+lib/webmin/postfix/config-CentOS-Linux-7.0-ALL
+lib/webmin/postfix/config-CentOS-Stream-Linux-8.0-ALL
+lib/webmin/postfix/config-Oracle-Linux-8.0-ALL
+lib/webmin/postfix/config-Rocky-Linux-8.0-ALL
+lib/webmin/postfix/config-debian-linux-10.0-ALL
 lib/webmin/postfix/config-freebsd
 lib/webmin/postfix/config-freebsd-8-ALL
 lib/webmin/postfix/config-mandrake-linux
 lib/webmin/postfix/config-msc-linux
 lib/webmin/postfix/config-netbsd
 lib/webmin/postfix/config-pardus-linux
+lib/webmin/postfix/config-redhat-linux-24.0-ALL
 lib/webmin/postfix/config-syno-linux
 lib/webmin/postfix/config.info
 lib/webmin/postfix/config.info.bg
@@ -39349,13 +39396,16 @@ lib/webmin/postgresql/config
 lib/webmin/postgresql/config-AlmaLinux-7.0-ALL
 lib/webmin/postgresql/config-Amazon-Linux-2-ALL
 lib/webmin/postgresql/config-CentOS-Linux-7.0-ALL
+lib/webmin/postgresql/config-CentOS-Stream-Linux-8.0-ALL
+lib/webmin/postgresql/config-Oracle-Linux-8.0-ALL
 lib/webmin/postgresql/config-Redhat-Enterprise-Linux-7.0-ALL
 lib/webmin/postgresql/config-Rocky-Linux-7.0-ALL
 lib/webmin/postgresql/config-Scientific-Linux-7.0-ALL
 lib/webmin/postgresql/config-cobalt-linux
 lib/webmin/postgresql/config-coherent-linux
 lib/webmin/postgresql/config-debian-linux
-lib/webmin/postgresql/config-debian-linux-4.0-ALL
+lib/webmin/postgresql/config-debian-linux-10.0-ALL
+lib/webmin/postgresql/config-debian-linux-4.0-9.0
 lib/webmin/postgresql/config-freebsd
 lib/webmin/postgresql/config-freebsd-8-ALL
 lib/webmin/postgresql/config-gentoo-linux
@@ -42575,6 +42625,8 @@ lib/webmin/proftpd/config
 lib/webmin/proftpd/config-AlmaLinux-7.0-ALL
 lib/webmin/proftpd/config-Amazon-Linux-2-ALL
 lib/webmin/proftpd/config-CentOS-Linux-7.0-ALL
+lib/webmin/proftpd/config-CentOS-Stream-Linux-8.0-ALL
+lib/webmin/proftpd/config-Oracle-Linux-8.0-ALL
 lib/webmin/proftpd/config-Redhat-Enterprise-Linux-7.0-ALL
 lib/webmin/proftpd/config-Rocky-Linux-7.0-ALL
 lib/webmin/proftpd/config-Scientific-Linux-7.0-ALL
@@ -42582,7 +42634,8 @@ lib/webmin/proftpd/config-Ubuntu-Linux
 lib/webmin/proftpd/config-cobalt-linux
 lib/webmin/proftpd/config-coherent-linux
 lib/webmin/proftpd/config-debian-linux
-lib/webmin/proftpd/config-debian-linux-4.0-ALL
+lib/webmin/proftpd/config-debian-linux-10.0-ALL
+lib/webmin/proftpd/config-debian-linux-4.0-9.0
 lib/webmin/proftpd/config-freebsd
 lib/webmin/proftpd/config-freebsd-8-ALL
 lib/webmin/proftpd/config-gentoo-linux
@@ -44478,6 +44531,8 @@ lib/webmin/samba/conf_smb.cgi
 lib/webmin/samba/config-AlmaLinux-7.0-ALL
 lib/webmin/samba/config-Amazon-Linux-2-ALL
 lib/webmin/samba/config-CentOS-Linux-7.0-ALL
+lib/webmin/samba/config-CentOS-Stream-Linux-8.0-ALL
+lib/webmin/samba/config-Oracle-Linux-8.0-ALL
 lib/webmin/samba/config-Redhat-Enterprise-Linux-7.0-ALL
 lib/webmin/samba/config-Rocky-Linux-7.0-ALL
 lib/webmin/samba/config-Scientific-Linux-7.0-ALL
@@ -44998,6 +45053,8 @@ lib/webmin/sendmail/cgi_args.pl
 lib/webmin/sendmail/config-AlmaLinux-7.0-ALL
 lib/webmin/sendmail/config-Amazon-Linux-2-ALL
 lib/webmin/sendmail/config-CentOS-Linux-7.0-ALL
+lib/webmin/sendmail/config-CentOS-Stream-Linux-8.0-ALL
+lib/webmin/sendmail/config-Oracle-Linux-8.0-ALL
 lib/webmin/sendmail/config-Redhat-Enterprise-Linux-7.0-ALL
 lib/webmin/sendmail/config-Rocky-Linux-7.0-ALL
 lib/webmin/sendmail/config-Scientific-Linux-7.0-ALL
@@ -46751,30 +46808,42 @@ lib/webmin/servers/delete_servs.cgi
 lib/webmin/servers/edit_auto.cgi
 lib/webmin/servers/edit_serv.cgi
 lib/webmin/servers/find.cgi
+lib/webmin/servers/images/alma.svg
 lib/webmin/servers/images/asianux.gif
 lib/webmin/servers/images/caldera.gif
 lib/webmin/servers/images/centos.gif
+lib/webmin/servers/images/centos.svg
 lib/webmin/servers/images/cobalt.gif
 lib/webmin/servers/images/debian.gif
+lib/webmin/servers/images/debian.svg
 lib/webmin/servers/images/fedora.gif
+lib/webmin/servers/images/fedora.svg
 lib/webmin/servers/images/freebsd.gif
+lib/webmin/servers/images/freebsd.svg
 lib/webmin/servers/images/hpux.gif
 lib/webmin/servers/images/icon.gif
 lib/webmin/servers/images/irix.gif
 lib/webmin/servers/images/linux.gif
+lib/webmin/servers/images/linux.svg
 lib/webmin/servers/images/mac.gif
 lib/webmin/servers/images/mandrake.gif
 lib/webmin/servers/images/msc.gif
 lib/webmin/servers/images/openbsd.gif
+lib/webmin/servers/images/oracle.svg
 lib/webmin/servers/images/pi.gif
+lib/webmin/servers/images/raspberry.svg
 lib/webmin/servers/images/redflag.gif
 lib/webmin/servers/images/redhat.gif
+lib/webmin/servers/images/redhat.svg
+lib/webmin/servers/images/rocky.svg
 lib/webmin/servers/images/sco.gif
 lib/webmin/servers/images/slackware.gif
 lib/webmin/servers/images/solaris.gif
 lib/webmin/servers/images/suse.gif
+lib/webmin/servers/images/suse.svg
 lib/webmin/servers/images/turbo.gif
 lib/webmin/servers/images/ubuntu.gif
+lib/webmin/servers/images/ubuntu.svg
 lib/webmin/servers/images/unknown.gif
 lib/webmin/servers/images/windows.gif
 lib/webmin/servers/index-json.cgi
@@ -49863,9 +49932,15 @@ lib/webmin/spam/apply.cgi
 lib/webmin/spam/backup_config.pl
 lib/webmin/spam/cgi_args.pl
 lib/webmin/spam/config
+lib/webmin/spam/config-AlmaLinux-7.0-ALL
+lib/webmin/spam/config-CentOS-Stream-Linux-8.0-ALL
+lib/webmin/spam/config-Oracle-Linux-8.0-ALL
+lib/webmin/spam/config-Rocky-Linux-7.0-ALL
 lib/webmin/spam/config-debian-linux
+lib/webmin/spam/config-debian-linux-10.0-ALL
 lib/webmin/spam/config-freebsd
 lib/webmin/spam/config-pardus-linux
+lib/webmin/spam/config-redhat-linux-24.0-ALL
 lib/webmin/spam/config-syno-linux
 lib/webmin/spam/config.info
 lib/webmin/spam/config.info.ca
@@ -50076,6 +50151,8 @@ lib/webmin/squid/clear.cgi
 lib/webmin/squid/config-AlmaLinux-7.0-ALL
 lib/webmin/squid/config-Amazon-Linux-2-ALL
 lib/webmin/squid/config-CentOS-Linux-7.0-ALL
+lib/webmin/squid/config-CentOS-Stream-Linux-8.0-ALL
+lib/webmin/squid/config-Oracle-Linux-8.0-ALL
 lib/webmin/squid/config-Redhat-Enterprise-Linux-7.0-ALL
 lib/webmin/squid/config-Rocky-Linux-7.0-ALL
 lib/webmin/squid/config-Scientific-Linux-7.0-ALL
@@ -50085,10 +50162,11 @@ lib/webmin/squid/config-cobalt-linux
 lib/webmin/squid/config-coherent-linux
 lib/webmin/squid/config-corel-linux
 lib/webmin/squid/config-debian-linux
+lib/webmin/squid/config-debian-linux-10.0-ALL
 lib/webmin/squid/config-debian-linux-3.0-4.9
 lib/webmin/squid/config-debian-linux-5.0-5.9
 lib/webmin/squid/config-debian-linux-6.0-6.9
-lib/webmin/squid/config-debian-linux-7.0-ALL
+lib/webmin/squid/config-debian-linux-7.0-9.0
 lib/webmin/squid/config-freebsd
 lib/webmin/squid/config-freebsd-8-ALL
 lib/webmin/squid/config-generic-linux
@@ -51072,9 +51150,15 @@ lib/webmin/sshd/apply.cgi
 lib/webmin/sshd/backup_config.pl
 lib/webmin/sshd/cgi_args.pl
 lib/webmin/sshd/config
-lib/webmin/sshd/config-Ubuntu-Linux-10.10-ALL
+lib/webmin/sshd/config-AlmaLinux-8.0-ALL
+lib/webmin/sshd/config-CentOS-Stream-Linux-8.0-ALL
+lib/webmin/sshd/config-Oracle-Linux-8.0-ALL
+lib/webmin/sshd/config-Rocky-Linux-8.0-ALL
+lib/webmin/sshd/config-Ubuntu-Linux-10.10-17.10
+lib/webmin/sshd/config-Ubuntu-Linux-18.04-ALL
 lib/webmin/sshd/config-coherent-linux
-lib/webmin/sshd/config-debian-linux-2.2-ALL
+lib/webmin/sshd/config-debian-linux-10.0-ALL
+lib/webmin/sshd/config-debian-linux-2.2-9.0
 lib/webmin/sshd/config-macos
 lib/webmin/sshd/config-macos-8.1-ALL
 lib/webmin/sshd/config-mandrake-linux-7.1-ALL
@@ -52160,6 +52244,8 @@ lib/webmin/syslog-ng/config
 lib/webmin/syslog-ng/config-AlmaLinux-7.0-ALL
 lib/webmin/syslog-ng/config-Amazon-Linux-2-ALL
 lib/webmin/syslog-ng/config-CentOS-Linux-7.0-ALL
+lib/webmin/syslog-ng/config-CentOS-Stream-Linux-8.0-ALL
+lib/webmin/syslog-ng/config-Oracle-Linux-8.0-ALL
 lib/webmin/syslog-ng/config-Redhat-Enterprise-Linux-7.0-ALL
 lib/webmin/syslog-ng/config-Rocky-Linux-7.0-ALL
 lib/webmin/syslog-ng/config-Scientific-Linux-7.0-ALL
@@ -52593,6 +52679,8 @@ lib/webmin/syslog/backup_config.pl
 lib/webmin/syslog/cgi_args.pl
 lib/webmin/syslog/config-AlmaLinux-6.0-ALL
 lib/webmin/syslog/config-CentOS-Linux-6.0-ALL
+lib/webmin/syslog/config-CentOS-Stream-Linux-8.0-ALL
+lib/webmin/syslog/config-Oracle-Linux-8.0-ALL
 lib/webmin/syslog/config-Redhat-Enterprise-Linux-6.0-ALL
 lib/webmin/syslog/config-Rocky-Linux-6.0-ALL
 lib/webmin/syslog/config-Ubuntu-Linux-10.04-ALL
@@ -52603,7 +52691,8 @@ lib/webmin/syslog/config-corel-linux
 lib/webmin/syslog/config-debian-linux
 lib/webmin/syslog/config-debian-linux-3.1-3.2
 lib/webmin/syslog/config-debian-linux-4.0
-lib/webmin/syslog/config-debian-linux-5.0-ALL
+lib/webmin/syslog/config-debian-linux-5.0-9.0
+lib/webmin/syslog/config-debian-linux-9.0-ALL
 lib/webmin/syslog/config-freebsd
 lib/webmin/syslog/config-generic-linux
 lib/webmin/syslog/config-gentoo-linux
@@ -52619,7 +52708,6 @@ lib/webmin/syslog/config-openserver
 lib/webmin/syslog/config-pardus-linux
 lib/webmin/syslog/config-redhat-linux-16.0-23.0
 lib/webmin/syslog/config-redhat-linux-24.0-ALL
-lib/webmin/syslog/config-redhat-linux-ALL-15.0
 lib/webmin/syslog/config-slackware-linux
 lib/webmin/syslog/config-sol-linux
 lib/webmin/syslog/config-solaris
@@ -58249,6 +58337,8 @@ lib/webmin/xinetd/config
 lib/webmin/xinetd/config-AlmaLinux-7.0-ALL
 lib/webmin/xinetd/config-Amazon-Linux-2-ALL
 lib/webmin/xinetd/config-CentOS-Linux-7.0-ALL
+lib/webmin/xinetd/config-CentOS-Stream-Linux-8.0-ALL
+lib/webmin/xinetd/config-Oracle-Linux-8.0-ALL
 lib/webmin/xinetd/config-Redhat-Enterprise-Linux-7.0-ALL
 lib/webmin/xinetd/config-Rocky-Linux-7.0-ALL
 lib/webmin/xinetd/config-Scientific-Linux-7.0-ALL