sysutils/webmin: update to 1.994 security release (+)

This release fixes a security issue in versions 1.991 and below.

With hat:	ports-secteam

4 files changed, 57 insertions, 26 deletions

diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile
index ead8cde6714d..7609a3b70732 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.990
+PORTVERSION=	1.994
 PORTREVISION=	0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.webmin.com/updates/:up \
diff --git a/sysutils/webmin/distinfo b/sysutils/webmin/distinfo
index 1854dfcdfbe6..658d35132ded 100644
--- a/sysutils/webmin/distinfo
+++ b/sysutils/webmin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1646381553
-SHA256 (webmin-1.990.tar.gz) = 3e7814cac64fed9a94ad61b3ffda33c0eb81e6a56ac6812623b78b5601d13064
-SIZE (webmin-1.990.tar.gz) = 44585841
+TIMESTAMP = 1653891865
+SHA256 (webmin-1.994.tar.gz) = aee5ae6d73d6fb4904f03215efa8aa485e27fbf65b13aca726a8ab9723fea0ee
+SIZE (webmin-1.994.tar.gz) = 44691491
diff --git a/sysutils/webmin/files/patch-setup.sh b/sysutils/webmin/files/patch-setup.sh
index 387cd32a4f13..293144685590 100644
--- a/sysutils/webmin/files/patch-setup.sh
+++ b/sysutils/webmin/files/patch-setup.sh
@@ -1,6 +1,6 @@
---- setup.sh.orig	2021-03-07 18:10:32 UTC
+--- setup.sh.orig	2022-05-23 20:33:54 UTC
 +++ setup.sh
-@@ -102,19 +102,7 @@ echo "Webmin uses separate directories for configurati
+@@ -103,19 +103,7 @@ echo ""
  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
-@@ -209,12 +197,12 @@ else
+@@ -210,12 +198,12 @@ else
  	fi
  
  	# Ask for log directory
@@ -36,7 +36,7 @@
  	fi
  	abspath=`echo $var_dir | grep "^/"`
  	if [ "$abspath" = "" ]; then
-@@ -242,7 +230,9 @@ else
+@@ -243,7 +231,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
-@@ -443,6 +433,7 @@ else
+@@ -444,6 +434,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
-@@ -594,6 +585,7 @@ EOF
+@@ -595,6 +586,7 @@ fi
  	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 -
-@@ -604,7 +596,6 @@ fi
- echo "Creating start and stop scripts.."
- rm -f $config_dir/stop $config_dir/start $config_dir/restart $config_dir/reload
- echo "#!/bin/sh" >>$config_dir/start
--echo "echo Starting Webmin server in $wadir" >>$config_dir/start
- echo "trap '' 1" >>$config_dir/start
- echo "LANG=" >>$config_dir/start
- echo "export LANG" >>$config_dir/start
-@@ -763,6 +754,7 @@ if [ "$?" != "0" ]; then
+@@ -607,7 +599,6 @@ echo "#!/bin/sh" >>$config_dir/.start-init
+ 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
+@@ -827,6 +818,7 @@ fi
  	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
-@@ -800,6 +792,7 @@ for f in miniserv.conf miniserv.pem miniserv.users; do
+@@ -864,6 +856,7 @@ chmod +r $config_dir/version
  	chmod -R og-rw $config_dir/$f
  done
  chmod +r $config_dir/version
@@ -87,7 +87,7 @@
  if [ "$nochown" = "" ]; then
  	# Make program directory non-world-writable, but executable
  	chown -R root "$wadir"
-@@ -852,6 +845,7 @@ if [ -r "$srcdir/setup-post.sh" ]; then
+@@ -916,6 +909,7 @@ fi
  	. "$srcdir/setup-post.sh"
  fi
  
diff --git a/sysutils/webmin/pkg-plist b/sysutils/webmin/pkg-plist
index c93c70b0a4da..d1422f6e4861 100644
--- a/sysutils/webmin/pkg-plist
+++ b/sysutils/webmin/pkg-plist
@@ -892,20 +892,20 @@ lib/webmin/adsl-client/start.cgi
 lib/webmin/adsl-client/stop.cgi
 lib/webmin/ajaxterm/CHANGELOG
 lib/webmin/ajaxterm/ajaxterm/README.txt
+lib/webmin/ajaxterm/ajaxterm/__pycache__/ajaxterm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+lib/webmin/ajaxterm/ajaxterm/__pycache__/ajaxterm%%PYTHON_EXT_SUFFIX%%.pyc
+lib/webmin/ajaxterm/ajaxterm/__pycache__/qweb%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+lib/webmin/ajaxterm/ajaxterm/__pycache__/qweb%%PYTHON_EXT_SUFFIX%%.pyc
 lib/webmin/ajaxterm/ajaxterm/ajaxterm.1
 lib/webmin/ajaxterm/ajaxterm/ajaxterm.css
 lib/webmin/ajaxterm/ajaxterm/ajaxterm.html
 lib/webmin/ajaxterm/ajaxterm/ajaxterm.js
 lib/webmin/ajaxterm/ajaxterm/ajaxterm.py
-lib/webmin/ajaxterm/ajaxterm/ajaxterm.pyc
-lib/webmin/ajaxterm/ajaxterm/ajaxterm.pyo
 lib/webmin/ajaxterm/ajaxterm/configure
 lib/webmin/ajaxterm/ajaxterm/configure.initd.gentoo
 lib/webmin/ajaxterm/ajaxterm/configure.initd.redhat
 lib/webmin/ajaxterm/ajaxterm/configure.makefile
 lib/webmin/ajaxterm/ajaxterm/qweb.py
-lib/webmin/ajaxterm/ajaxterm/qweb.pyc
-lib/webmin/ajaxterm/ajaxterm/qweb.pyo
 lib/webmin/ajaxterm/ajaxterm/sarissa.js
 lib/webmin/ajaxterm/ajaxterm/sarissa_dhtml.js
 lib/webmin/ajaxterm/config
@@ -1694,7 +1694,6 @@ lib/webmin/authentic-theme/authentic.pl
 lib/webmin/authentic-theme/config
 lib/webmin/authentic-theme/config.cgi
 lib/webmin/authentic-theme/config_save.cgi
-lib/webmin/authentic-theme/extensions/csf.min.js
 lib/webmin/authentic-theme/extensions/csf/csf-lib.pl
 lib/webmin/authentic-theme/extensions/csf/csf.min.css
 lib/webmin/authentic-theme/extensions/csf/csf.min.css.gz
@@ -1725,6 +1724,7 @@ lib/webmin/authentic-theme/extensions/file-manager/http_download.cgi
 lib/webmin/authentic-theme/extensions/file-manager/list-images.cgi
 lib/webmin/authentic-theme/extensions/file-manager/list.cgi
 lib/webmin/authentic-theme/extensions/file-manager/paste.cgi
+lib/webmin/authentic-theme/extensions/file-manager/purge_trash.cgi
 lib/webmin/authentic-theme/extensions/file-manager/rename.cgi
 lib/webmin/authentic-theme/extensions/file-manager/search.cgi
 lib/webmin/authentic-theme/extensions/file-manager/tree.cgi
@@ -2839,6 +2839,7 @@ lib/webmin/authentic-theme/settings-editor_favorites_write.cgi
 lib/webmin/authentic-theme/settings-editor_read.cgi
 lib/webmin/authentic-theme/settings-editor_write.cgi
 lib/webmin/authentic-theme/settings-favorites_save.cgi
+lib/webmin/authentic-theme/settings-lib.pl
 lib/webmin/authentic-theme/settings-logos.cgi
 lib/webmin/authentic-theme/settings-logos_save.cgi
 lib/webmin/authentic-theme/stats.cgi
@@ -4783,9 +4784,11 @@ lib/webmin/bandwidth/lang/ar.auto
 lib/webmin/bandwidth/lang/be.auto
 lib/webmin/bandwidth/lang/bg.auto
 lib/webmin/bandwidth/lang/ca
+lib/webmin/bandwidth/lang/ca.auto
 lib/webmin/bandwidth/lang/cs.auto
 lib/webmin/bandwidth/lang/da.auto
 lib/webmin/bandwidth/lang/de
+lib/webmin/bandwidth/lang/de.auto
 lib/webmin/bandwidth/lang/el.auto
 lib/webmin/bandwidth/lang/en
 lib/webmin/bandwidth/lang/es
@@ -4794,6 +4797,7 @@ lib/webmin/bandwidth/lang/eu.auto
 lib/webmin/bandwidth/lang/fa.auto
 lib/webmin/bandwidth/lang/fi.auto
 lib/webmin/bandwidth/lang/fr
+lib/webmin/bandwidth/lang/fr.auto
 lib/webmin/bandwidth/lang/he.auto
 lib/webmin/bandwidth/lang/hr
 lib/webmin/bandwidth/lang/hr.auto
@@ -4805,10 +4809,14 @@ lib/webmin/bandwidth/lang/ko.auto
 lib/webmin/bandwidth/lang/lt.auto
 lib/webmin/bandwidth/lang/lv.auto
 lib/webmin/bandwidth/lang/ms
+lib/webmin/bandwidth/lang/ms.auto
 lib/webmin/bandwidth/lang/mt.auto
 lib/webmin/bandwidth/lang/nl
+lib/webmin/bandwidth/lang/nl.auto
 lib/webmin/bandwidth/lang/no
+lib/webmin/bandwidth/lang/no.auto
 lib/webmin/bandwidth/lang/pl
+lib/webmin/bandwidth/lang/pl.auto
 lib/webmin/bandwidth/lang/pt.auto
 lib/webmin/bandwidth/lang/pt_BR.auto
 lib/webmin/bandwidth/lang/ro.auto
@@ -8771,10 +8779,12 @@ lib/webmin/cron/lang/be.auto
 lib/webmin/cron/lang/bg
 lib/webmin/cron/lang/bg.auto
 lib/webmin/cron/lang/ca
+lib/webmin/cron/lang/ca.auto
 lib/webmin/cron/lang/cs
 lib/webmin/cron/lang/cs.auto
 lib/webmin/cron/lang/da.auto
 lib/webmin/cron/lang/de
+lib/webmin/cron/lang/de.auto
 lib/webmin/cron/lang/el.auto
 lib/webmin/cron/lang/en
 lib/webmin/cron/lang/es
@@ -8791,6 +8801,7 @@ lib/webmin/cron/lang/hr
 lib/webmin/cron/lang/hr.auto
 lib/webmin/cron/lang/hu
 lib/webmin/cron/lang/hu.UTF-8
+lib/webmin/cron/lang/hu.auto
 lib/webmin/cron/lang/it
 lib/webmin/cron/lang/it.auto
 lib/webmin/cron/lang/ja
@@ -8805,6 +8816,7 @@ lib/webmin/cron/lang/mt.auto
 lib/webmin/cron/lang/nl
 lib/webmin/cron/lang/nl.auto
 lib/webmin/cron/lang/no
+lib/webmin/cron/lang/no.auto
 lib/webmin/cron/lang/pl
 lib/webmin/cron/lang/pl.auto
 lib/webmin/cron/lang/pt
@@ -13146,6 +13158,7 @@ lib/webmin/fail2ban/images/filters.gif
 lib/webmin/fail2ban/images/icon.gif
 lib/webmin/fail2ban/images/jails.gif
 lib/webmin/fail2ban/images/manual.gif
+lib/webmin/fail2ban/images/status.gif
 lib/webmin/fail2ban/index.cgi
 lib/webmin/fail2ban/install_check.pl
 lib/webmin/fail2ban/lang/af.auto
@@ -13157,6 +13170,7 @@ lib/webmin/fail2ban/lang/ca.auto
 lib/webmin/fail2ban/lang/cs.auto
 lib/webmin/fail2ban/lang/da.auto
 lib/webmin/fail2ban/lang/de
+lib/webmin/fail2ban/lang/de.auto
 lib/webmin/fail2ban/lang/el.auto
 lib/webmin/fail2ban/lang/en
 lib/webmin/fail2ban/lang/es.auto
@@ -13177,6 +13191,7 @@ lib/webmin/fail2ban/lang/ms.auto
 lib/webmin/fail2ban/lang/mt.auto
 lib/webmin/fail2ban/lang/nl.auto
 lib/webmin/fail2ban/lang/no
+lib/webmin/fail2ban/lang/no.auto
 lib/webmin/fail2ban/lang/pl
 lib/webmin/fail2ban/lang/pl.auto
 lib/webmin/fail2ban/lang/pt.auto
@@ -13197,6 +13212,7 @@ lib/webmin/fail2ban/lang/zh_TW.auto
 lib/webmin/fail2ban/list_actions.cgi
 lib/webmin/fail2ban/list_filters.cgi
 lib/webmin/fail2ban/list_jails.cgi
+lib/webmin/fail2ban/list_status.cgi
 lib/webmin/fail2ban/log_parser.pl
 lib/webmin/fail2ban/module.info
 lib/webmin/fail2ban/module.info.af
@@ -13287,6 +13303,7 @@ lib/webmin/fail2ban/save_manual.cgi
 lib/webmin/fail2ban/start.cgi
 lib/webmin/fail2ban/stop.cgi
 lib/webmin/fail2ban/syslog_logs.pl
+lib/webmin/fail2ban/unblock_jail.cgi
 lib/webmin/fastrpc.cgi
 lib/webmin/favicon.ico
 lib/webmin/fdisk/CHANGELOG
@@ -15495,6 +15512,7 @@ lib/webmin/firewalld/lang/ar.auto
 lib/webmin/firewalld/lang/be.auto
 lib/webmin/firewalld/lang/bg.auto
 lib/webmin/firewalld/lang/ca
+lib/webmin/firewalld/lang/ca.auto
 lib/webmin/firewalld/lang/cs.auto
 lib/webmin/firewalld/lang/da.auto
 lib/webmin/firewalld/lang/de
@@ -15518,6 +15536,7 @@ lib/webmin/firewalld/lang/ms.auto
 lib/webmin/firewalld/lang/mt.auto
 lib/webmin/firewalld/lang/nl.auto
 lib/webmin/firewalld/lang/no
+lib/webmin/firewalld/lang/no.auto
 lib/webmin/firewalld/lang/pl
 lib/webmin/firewalld/lang/pl.auto
 lib/webmin/firewalld/lang/pt.auto
@@ -15534,6 +15553,7 @@ lib/webmin/firewalld/lang/ur.auto
 lib/webmin/firewalld/lang/vi.auto
 lib/webmin/firewalld/lang/zh.auto
 lib/webmin/firewalld/lang/zh_TW.auto
+lib/webmin/firewalld/list_rules.cgi
 lib/webmin/firewalld/log_parser.pl
 lib/webmin/firewalld/module.info
 lib/webmin/firewalld/module.info.af
@@ -15620,6 +15640,7 @@ lib/webmin/firewalld/restart.cgi
 lib/webmin/firewalld/save_forward.cgi
 lib/webmin/firewalld/save_ifaces.cgi
 lib/webmin/firewalld/save_port.cgi
+lib/webmin/firewalld/save_rules.cgi
 lib/webmin/firewalld/save_serv.cgi
 lib/webmin/firewalld/start.cgi
 lib/webmin/firewalld/stop.cgi
@@ -21546,6 +21567,7 @@ lib/webmin/init/shutdown.cgi
 lib/webmin/init/start_stop.cgi
 lib/webmin/init/syslog_logs.pl
 lib/webmin/init/uninstall.pl
+lib/webmin/init/updateboot.pl
 lib/webmin/init/win32.pl
 lib/webmin/inittab/CHANGELOG
 lib/webmin/inittab/apply.cgi
@@ -42385,6 +42407,7 @@ lib/webmin/procmail/lang/cs
 lib/webmin/procmail/lang/cs.auto
 lib/webmin/procmail/lang/da.auto
 lib/webmin/procmail/lang/de
+lib/webmin/procmail/lang/de.auto
 lib/webmin/procmail/lang/el.auto
 lib/webmin/procmail/lang/en
 lib/webmin/procmail/lang/es
@@ -42397,6 +42420,7 @@ lib/webmin/procmail/lang/fr.auto
 lib/webmin/procmail/lang/he.auto
 lib/webmin/procmail/lang/hr.auto
 lib/webmin/procmail/lang/hu
+lib/webmin/procmail/lang/hu.auto
 lib/webmin/procmail/lang/it
 lib/webmin/procmail/lang/it.auto
 lib/webmin/procmail/lang/ja.auto
@@ -42407,7 +42431,9 @@ lib/webmin/procmail/lang/lv.auto
 lib/webmin/procmail/lang/ms.auto
 lib/webmin/procmail/lang/mt.auto
 lib/webmin/procmail/lang/nl
+lib/webmin/procmail/lang/nl.auto
 lib/webmin/procmail/lang/no
+lib/webmin/procmail/lang/no.auto
 lib/webmin/procmail/lang/pl
 lib/webmin/procmail/lang/pl.auto
 lib/webmin/procmail/lang/pt.auto
@@ -46484,6 +46510,7 @@ lib/webmin/sendmail/lang/cs
 lib/webmin/sendmail/lang/cs.auto
 lib/webmin/sendmail/lang/da.auto
 lib/webmin/sendmail/lang/de
+lib/webmin/sendmail/lang/de.auto
 lib/webmin/sendmail/lang/el.auto
 lib/webmin/sendmail/lang/en
 lib/webmin/sendmail/lang/es
@@ -46496,6 +46523,7 @@ lib/webmin/sendmail/lang/fr.auto
 lib/webmin/sendmail/lang/he.auto
 lib/webmin/sendmail/lang/hr.auto
 lib/webmin/sendmail/lang/hu
+lib/webmin/sendmail/lang/hu.auto
 lib/webmin/sendmail/lang/it.auto
 lib/webmin/sendmail/lang/ja
 lib/webmin/sendmail/lang/ja.auto
@@ -46506,7 +46534,9 @@ lib/webmin/sendmail/lang/lv.auto
 lib/webmin/sendmail/lang/ms.auto
 lib/webmin/sendmail/lang/mt.auto
 lib/webmin/sendmail/lang/nl
+lib/webmin/sendmail/lang/nl.auto
 lib/webmin/sendmail/lang/no
+lib/webmin/sendmail/lang/no.auto
 lib/webmin/sendmail/lang/pl
 lib/webmin/sendmail/lang/pl.auto
 lib/webmin/sendmail/lang/pt
@@ -56894,6 +56924,7 @@ lib/webmin/webmin-debian-pam
 lib/webmin/webmin-init
 lib/webmin/webmin-pam
 lib/webmin/webmin-search-lib.pl
+lib/webmin/webmin-systemd
 lib/webmin/webmin/CHANGELOG
 lib/webmin/webmin/acme_tiny.py
 lib/webmin/webmin/adminupgrade