sysutils/webmin: update to version 1.996

4 files changed, 60 insertions, 37 deletions

diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile
index 7609a3b70732..65487f0e1419 100644
--- a/sysutils/webmin/Makefile
+++ b/sysutils/webmin/Makefile
@@ -1,7 +1,7 @@
 # Created by: Andreas Klemm <andreas@klemm.gtn.com>
 
 PORTNAME=	webmin
-PORTVERSION=	1.994
+PORTVERSION=	1.996
 PORTREVISION=	0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.webmin.com/updates/:up \
diff --git a/sysutils/webmin/distinfo b/sysutils/webmin/distinfo
index 658d35132ded..c36a71c56026 100644
--- a/sysutils/webmin/distinfo
+++ b/sysutils/webmin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1653891865
-SHA256 (webmin-1.994.tar.gz) = aee5ae6d73d6fb4904f03215efa8aa485e27fbf65b13aca726a8ab9723fea0ee
-SIZE (webmin-1.994.tar.gz) = 44691491
+TIMESTAMP = 1657104952
+SHA256 (webmin-1.996.tar.gz) = 9d60b449f3cd439acc513c4293274d26e6ca1fb6dbeeb9eca538f9d820072c53
+SIZE (webmin-1.996.tar.gz) = 44725939
diff --git a/sysutils/webmin/files/patch-setup.sh b/sysutils/webmin/files/patch-setup.sh
index 293144685590..17804bd1a726 100644
--- a/sysutils/webmin/files/patch-setup.sh
+++ b/sysutils/webmin/files/patch-setup.sh
@@ -1,6 +1,6 @@
---- setup.sh.orig	2022-05-23 20:33:54 UTC
+--- setup.sh.orig	2022-07-04 19:10:33 UTC
 +++ setup.sh
-@@ -103,19 +103,7 @@ echo ""
+@@ -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."
  echo ""
@@ -21,7 +21,7 @@
  if [ ! -d $config_dir ]; then
  	mkdir $config_dir;
  	if [ $? != 0 ]; then
-@@ -210,12 +198,12 @@ else
+@@ -212,12 +200,12 @@ else
  	fi
  
  	# Ask for log directory
@@ -36,7 +36,7 @@
  	fi
  	abspath=`echo $var_dir | grep "^/"`
  	if [ "$abspath" = "" ]; then
-@@ -243,7 +231,9 @@ else
+@@ -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 ""
@@ -47,7 +47,7 @@
  		perldef=/usr/bin/perl
  	elif [ -x /usr/local/bin/perl ]; then
  		perldef=/usr/local/bin/perl
-@@ -444,6 +434,7 @@ else
+@@ -446,6 +436,7 @@ else
  		fi
  	fi
  
@@ -55,7 +55,7 @@
  	# Ask whether to run at boot time
  	if [ "$atboot" = "" ]; then
  		if echo "$os_type" | grep  -q "\-linux$"; then
-@@ -595,6 +586,7 @@ fi
+@@ -607,6 +598,7 @@ EOF
  	fi
  fi
  
@@ -63,15 +63,15 @@
  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 -
-@@ -607,7 +599,6 @@ echo "#!/bin/sh" >>$config_dir/.start-init
+@@ -618,7 +610,6 @@ fi
  echo "Creating start and stop init scripts.."
  # Start main
- echo "#!/bin/sh" >>$config_dir/.start-init
+ 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
-@@ -827,6 +818,7 @@ fi
+@@ -849,6 +840,7 @@ if [ "$?" != "0" ]; then
  	echo passdelay=1 >> $config_dir/miniserv.conf
  fi
  
@@ -79,7 +79,7 @@
  if [ "$nouninstall" = "" ]; then
  	echo "Creating uninstall script $config_dir/uninstall.sh .."
  	cat >$config_dir/uninstall.sh <<EOF
-@@ -864,6 +856,7 @@ chmod +r $config_dir/version
+@@ -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
@@ -87,11 +87,11 @@
  if [ "$nochown" = "" ]; then
  	# Make program directory non-world-writable, but executable
  	chown -R root "$wadir"
-@@ -916,6 +909,7 @@ fi
+@@ -938,6 +931,7 @@ if [ -r "$srcdir/setup-post.sh" ]; then
  	. "$srcdir/setup-post.sh"
  fi
  
 +nostart="yes"
  if [ "$nostart" = "" ]; then
  	if [ "$inetd" != "1" ]; then
- 		echo "Attempting to start Webmin mini web server.."
+ 		echo "Attempting to start Webmin web server.."
diff --git a/sysutils/webmin/pkg-plist b/sysutils/webmin/pkg-plist
index d1422f6e4861..62315756c91d 100644
--- a/sysutils/webmin/pkg-plist
+++ b/sysutils/webmin/pkg-plist
@@ -1060,7 +1060,7 @@ lib/webmin/apache/cache.pl
 lib/webmin/apache/cgi_args.pl
 lib/webmin/apache/change_dir.cgi
 lib/webmin/apache/change_files.cgi
-lib/webmin/apache/config-AlmaLinux-Linux-7.0-ALL
+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
@@ -3326,7 +3326,7 @@ lib/webmin/backup-config/lang/tr.auto
 lib/webmin/backup-config/lang/uk.auto
 lib/webmin/backup-config/lang/ur.auto
 lib/webmin/backup-config/lang/vi.auto
-lib/webmin/backup-config/lang/zh.auto
+lib/webmin/backup-config/lang/zh
 lib/webmin/backup-config/lang/zh_TW.auto
 lib/webmin/backup-config/log_parser.pl
 lib/webmin/backup-config/module.info
@@ -3404,7 +3404,6 @@ lib/webmin/backup-config/module.info.ur.auto
 lib/webmin/backup-config/module.info.vi
 lib/webmin/backup-config/module.info.vi.auto
 lib/webmin/backup-config/module.info.zh
-lib/webmin/backup-config/module.info.zh.auto
 lib/webmin/backup-config/module.info.zh_TW
 lib/webmin/backup-config/module.info.zh_TW.auto
 lib/webmin/backup-config/restore.cgi
@@ -4923,6 +4922,7 @@ lib/webmin/bin/enable-proxy
 lib/webmin/bin/language-manager
 lib/webmin/bin/list-config
 lib/webmin/bin/passwd
+lib/webmin/bin/server
 lib/webmin/bin/set-config
 lib/webmin/bin/update-devel
 lib/webmin/bin/webmin
@@ -4949,7 +4949,7 @@ lib/webmin/bind8/conf_rndc.cgi
 lib/webmin/bind8/conf_servers.cgi
 lib/webmin/bind8/conf_trusted.cgi
 lib/webmin/bind8/conf_zonedef.cgi
-lib/webmin/bind8/config-AlmaLinux-Linux-6.0-ALL
+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-Rocky-Linux-6.0-ALL
@@ -4962,10 +4962,11 @@ lib/webmin/bind8/config-debian-linux
 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-freebsd-12.0-ALL
 lib/webmin/bind8/config-freebsd-2.1-2.2
 lib/webmin/bind8/config-freebsd-3.0
 lib/webmin/bind8/config-freebsd-3.1-3.5
-lib/webmin/bind8/config-freebsd-4.0-ALL
+lib/webmin/bind8/config-freebsd-4.0-11.0
 lib/webmin/bind8/config-generic-linux
 lib/webmin/bind8/config-gentoo-linux
 lib/webmin/bind8/config-hpux
@@ -11276,7 +11277,7 @@ lib/webmin/dhcpd/CHANGELOG
 lib/webmin/dhcpd/acl_security.pl
 lib/webmin/dhcpd/backup_config.pl
 lib/webmin/dhcpd/cgi_args.pl
-lib/webmin/dhcpd/config-AlmaLinux-Linux-7.0-ALL
+lib/webmin/dhcpd/config-AlmaLinux-7.0-ALL
 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
@@ -11638,7 +11639,9 @@ lib/webmin/dovecot/backup_config.pl
 lib/webmin/dovecot/bootup.cgi
 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-Rocky-Linux-7.0-ALL
 lib/webmin/dovecot/config-debian-linux
 lib/webmin/dovecot/config-freebsd-8.0-8.9
 lib/webmin/dovecot/config-freebsd-9-ALL
@@ -11920,7 +11923,7 @@ lib/webmin/exim/module.info.zh_TW.auto
 lib/webmin/exports/CHANGELOG
 lib/webmin/exports/backup_config.pl
 lib/webmin/exports/cgi_args.pl
-lib/webmin/exports/config-AlmaLinux-Linux-7.0-ALL
+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-Redhat-Enterprise-Linux-7.0-ALL
@@ -14801,10 +14804,12 @@ lib/webmin/filter/lang/ar.auto
 lib/webmin/filter/lang/be.auto
 lib/webmin/filter/lang/bg.auto
 lib/webmin/filter/lang/ca
+lib/webmin/filter/lang/ca.auto
 lib/webmin/filter/lang/cs
 lib/webmin/filter/lang/cs.auto
 lib/webmin/filter/lang/da.auto
 lib/webmin/filter/lang/de
+lib/webmin/filter/lang/de.auto
 lib/webmin/filter/lang/el
 lib/webmin/filter/lang/el.auto
 lib/webmin/filter/lang/en
@@ -14828,6 +14833,7 @@ lib/webmin/filter/lang/mt.auto
 lib/webmin/filter/lang/nl
 lib/webmin/filter/lang/nl.auto
 lib/webmin/filter/lang/no
+lib/webmin/filter/lang/no.auto
 lib/webmin/filter/lang/pl
 lib/webmin/filter/lang/pl.auto
 lib/webmin/filter/lang/pt.auto
@@ -22307,7 +22313,7 @@ lib/webmin/ipsec/CHANGELOG
 lib/webmin/ipsec/backup_config.pl
 lib/webmin/ipsec/bootup.cgi
 lib/webmin/ipsec/config
-lib/webmin/ipsec/config-AlmaLinux-Linux-7.0-ALL
+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-Redhat-Enterprise-Linux-7.0-ALL
@@ -23184,7 +23190,7 @@ lib/webmin/iscsi-target/up_allow.cgi
 lib/webmin/iscsi-tgtd/CHANGELOG
 lib/webmin/iscsi-tgtd/atboot.cgi
 lib/webmin/iscsi-tgtd/config
-lib/webmin/iscsi-tgtd/config-AlmaLinux-Linux-7.0-ALL
+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-Redhat-Enterprise-Linux-7.0-ALL
@@ -24498,7 +24504,7 @@ lib/webmin/ldap-client/atboot.cgi
 lib/webmin/ldap-client/browser.cgi
 lib/webmin/ldap-client/check.cgi
 lib/webmin/ldap-client/config-ALL-linux
-lib/webmin/ldap-client/config-AlmaLinux-Linux-6.0-ALL
+lib/webmin/ldap-client/config-AlmaLinux-6.0-ALL
 lib/webmin/ldap-client/config-CentOS-Linux-6.0-ALL
 lib/webmin/ldap-client/config-Redhat-Enterprise-Linux-6.0-ALL
 lib/webmin/ldap-client/config-Rocky-Linux-6.0-ALL
@@ -24932,7 +24938,7 @@ lib/webmin/ldap-server/bootup.cgi
 lib/webmin/ldap-server/cgi_args.pl
 lib/webmin/ldap-server/config
 lib/webmin/ldap-server/config-ALL-linux
-lib/webmin/ldap-server/config-AlmaLinux-Linux-7.0-ALL
+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-Redhat-Enterprise-Linux-6.0-6.9
@@ -26145,6 +26151,21 @@ lib/webmin/logrotate/module.info.zh_TW.auto
 lib/webmin/logrotate/prefs.info
 lib/webmin/logrotate/save_log.cgi
 lib/webmin/logrotate/save_sched.cgi
+lib/webmin/logviewer/CHANGELOG
+lib/webmin/logviewer/acl_security.pl
+lib/webmin/logviewer/backup_config.pl
+lib/webmin/logviewer/config
+lib/webmin/logviewer/config.info
+lib/webmin/logviewer/defaultacl
+lib/webmin/logviewer/images/icon.gif
+lib/webmin/logviewer/index.cgi
+lib/webmin/logviewer/install_check.pl
+lib/webmin/logviewer/lang/en
+lib/webmin/logviewer/logviewer-lib.pl
+lib/webmin/logviewer/module.info
+lib/webmin/logviewer/prefs.info
+lib/webmin/logviewer/safeacl
+lib/webmin/logviewer/view_log.cgi
 lib/webmin/lpadmin/CHANGELOG
 lib/webmin/lpadmin/acl_security.pl
 lib/webmin/lpadmin/aix-lib.pl
@@ -26161,7 +26182,7 @@ lib/webmin/lpadmin/cluster_add.cgi
 lib/webmin/lpadmin/cluster_delete.cgi
 lib/webmin/lpadmin/colour.fig
 lib/webmin/lpadmin/colour.ps
-lib/webmin/lpadmin/config-AlmaLinux-Linux-7.0-ALL
+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-Redhat-Enterprise-Linux-7.0-ALL
@@ -26564,6 +26585,8 @@ lib/webmin/lvm/module.info.zh_TW
 lib/webmin/lvm/module.info.zh_TW.auto
 lib/webmin/lvm/prefs.info
 lib/webmin/lvm/pvmove.cgi
+lib/webmin/lvm/raid_create.cgi
+lib/webmin/lvm/raid_form.cgi
 lib/webmin/lvm/save_lv.cgi
 lib/webmin/lvm/save_pv.cgi
 lib/webmin/lvm/save_vg.cgi
@@ -29059,7 +29082,7 @@ lib/webmin/mysql/backup_db.cgi
 lib/webmin/mysql/backup_form.cgi
 lib/webmin/mysql/cgi_args.pl
 lib/webmin/mysql/config
-lib/webmin/mysql/config-AlmaLinux-Linux-7.0-ALL
+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-Redhat-Enterprise-Linux-7.0-ALL
@@ -39325,7 +39348,7 @@ lib/webmin/postgresql/backup_config.pl
 lib/webmin/postgresql/backup_form.cgi
 lib/webmin/postgresql/cgi_args.pl
 lib/webmin/postgresql/config
-lib/webmin/postgresql/config-AlmaLinux-Linux-7.0-ALL
+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-Redhat-Enterprise-Linux-7.0-ALL
@@ -42551,7 +42574,7 @@ lib/webmin/proftpd/anon_index.cgi
 lib/webmin/proftpd/apply.cgi
 lib/webmin/proftpd/backup_config.pl
 lib/webmin/proftpd/config
-lib/webmin/proftpd/config-AlmaLinux-Linux-7.0-ALL
+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-Redhat-Enterprise-Linux-7.0-ALL
@@ -44454,7 +44477,7 @@ lib/webmin/samba/conf_net.cgi
 lib/webmin/samba/conf_pass.cgi
 lib/webmin/samba/conf_print.cgi
 lib/webmin/samba/conf_smb.cgi
-lib/webmin/samba/config-AlmaLinux-Linux-7.0-ALL
+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-Redhat-Enterprise-Linux-7.0-ALL
@@ -44974,7 +44997,7 @@ lib/webmin/sendmail/backup_config.pl
 lib/webmin/sendmail/boxes-lib.pl
 lib/webmin/sendmail/build.cgi
 lib/webmin/sendmail/cgi_args.pl
-lib/webmin/sendmail/config-AlmaLinux-Linux-7.0-ALL
+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-Redhat-Enterprise-Linux-7.0-ALL
@@ -50052,7 +50075,7 @@ lib/webmin/squid/calamaris.cgi
 lib/webmin/squid/cgi_args.pl
 lib/webmin/squid/chown.cgi
 lib/webmin/squid/clear.cgi
-lib/webmin/squid/config-AlmaLinux-Linux-7.0-ALL
+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-Redhat-Enterprise-Linux-7.0-ALL
@@ -52136,7 +52159,7 @@ lib/webmin/syslog-ng/CHANGELOG
 lib/webmin/syslog-ng/apply.cgi
 lib/webmin/syslog-ng/backup_config.pl
 lib/webmin/syslog-ng/config
-lib/webmin/syslog-ng/config-AlmaLinux-Linux-7.0-ALL
+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-Redhat-Enterprise-Linux-7.0-ALL
@@ -52570,7 +52593,7 @@ lib/webmin/syslog/CHANGELOG
 lib/webmin/syslog/acl_security.pl
 lib/webmin/syslog/backup_config.pl
 lib/webmin/syslog/cgi_args.pl
-lib/webmin/syslog/config-AlmaLinux-Linux-6.0-ALL
+lib/webmin/syslog/config-AlmaLinux-6.0-ALL
 lib/webmin/syslog/config-CentOS-Linux-6.0-ALL
 lib/webmin/syslog/config-Redhat-Enterprise-Linux-6.0-ALL
 lib/webmin/syslog/config-Rocky-Linux-6.0-ALL
@@ -58227,7 +58250,7 @@ lib/webmin/xinetd/CHANGELOG
 lib/webmin/xinetd/backup_config.pl
 lib/webmin/xinetd/cgi_args.pl
 lib/webmin/xinetd/config
-lib/webmin/xinetd/config-AlmaLinux-Linux-7.0-ALL
+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-Redhat-Enterprise-Linux-7.0-ALL