From 06ded6839c74007687b0dee81cf3bcf76c3c27d4 Mon Sep 17 00:00:00 2001
From: Dima Panov <fluffy@FreeBSD.org>
Date: Mon, 30 May 2022 10:45:21 +0300
Subject: sysutils/webmin: update to 1.994 security release (+)

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

With hat:	ports-secteam
---
 sysutils/webmin/files/patch-setup.sh | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'sysutils/webmin/files/patch-setup.sh')

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
  
-- 
cgit v1.2.3