diff options
Diffstat (limited to 'sysutils/webmin/files/patch-aa')
| -rw-r--r-- | sysutils/webmin/files/patch-aa | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/sysutils/webmin/files/patch-aa b/sysutils/webmin/files/patch-aa index 92d5509242cb..7040aca38b72 100644 --- a/sysutils/webmin/files/patch-aa +++ b/sysutils/webmin/files/patch-aa @@ -3,7 +3,7 @@ $FreeBSD$ --- setup.sh.orig +++ setup.sh -@@ -15,16 +15,8 @@ +@@ -17,16 +17,8 @@ srcdir=$wadir ver=`cat "$wadir/version"` @@ -22,7 +22,7 @@ $FreeBSD$ echo "***********************************************************************" echo "* Welcome to the Webmin setup script, version $ver *" -@@ -95,19 +87,7 @@ +@@ -97,19 +89,7 @@ echo "Unless you want to run multiple versions of Webmin at the same time" echo "you can just accept the defaults." echo "" @@ -43,7 +43,7 @@ $FreeBSD$ if [ ! -d $config_dir ]; then mkdir $config_dir; if [ $? != 0 ]; then -@@ -207,12 +187,12 @@ +@@ -209,12 +189,12 @@ fi # Ask for log directory @@ -58,7 +58,7 @@ $FreeBSD$ fi abspath=`echo $var_dir | grep "^/"` if [ "$abspath" = "" ]; then -@@ -240,7 +220,9 @@ +@@ -242,7 +222,9 @@ echo "Webmin is written entirely in Perl. Please enter the full path to the" echo "Perl 5 interpreter on your system." echo "" @@ -69,7 +69,7 @@ $FreeBSD$ perldef=/usr/bin/perl elif [ -x /usr/local/bin/perl ]; then perldef=/usr/local/bin/perl -@@ -439,22 +421,6 @@ +@@ -441,22 +423,6 @@ fi fi @@ -92,7 +92,7 @@ $FreeBSD$ # Copy files to target directory echo "***********************************************************************" if [ "$wadir" != "$srcdir" ]; then -@@ -576,6 +542,7 @@ +@@ -578,6 +544,7 @@ fi fi @@ -100,7 +100,7 @@ $FreeBSD$ 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 - -@@ -586,7 +553,6 @@ +@@ -588,7 +555,6 @@ 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 @@ -108,7 +108,7 @@ $FreeBSD$ echo "trap '' 1" >>$config_dir/start echo "LANG=" >>$config_dir/start echo "export LANG" >>$config_dir/start -@@ -734,6 +700,7 @@ +@@ -724,6 +690,7 @@ echo passdelay=1 >> $config_dir/miniserv.conf fi @@ -116,7 +116,15 @@ $FreeBSD$ if [ "$nouninstall" = "" ]; then echo "Creating uninstall script $config_dir/uninstall.sh .." cat >$config_dir/uninstall.sh <<EOF -@@ -823,6 +790,7 @@ +@@ -761,6 +728,7 @@ + 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" +@@ -813,6 +781,7 @@ . "$srcdir/setup-post.sh" fi |