Browse Source

webmin: Updated (1.410 -> 1.550)

stable/0.2
Christian Wiese 14 years ago
parent
commit
764c701335
  1. 26
      network/webmin/nodefuser.patch
  2. 6
      network/webmin/webmin.desc

26
network/webmin/nodefuser.patch

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# Filename: package/.../webmin/nodefuser.patch # Filename: package/.../webmin/nodefuser.patch
# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2008 - 2011 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
# #
@ -16,10 +16,9 @@
# version. # version.
# --- SDE-COPYRIGHT-NOTE-END --- # --- SDE-COPYRIGHT-NOTE-END ---
diff -Nur webmin-1.410-orig/setup.sh webmin-1.410/setup.sh --- webmin-1.550/setup.sh.orig 2011-04-27 00:18:38.000000000 +0200
--- webmin-1.410-orig/setup.sh 2008-04-20 14:07:39.000000000 +0000 +++ webmin-1.550/setup.sh 2011-05-19 13:12:54.876002344 +0200
+++ webmin-1.410/setup.sh 2008-04-20 14:13:43.000000000 +0000 @@ -453,7 +453,6 @@
@@ -456,7 +456,6 @@
echo "Webmin does not support being started at boot time on your system." echo "Webmin does not support being started at boot time on your system."
fi fi
fi fi
@ -27,7 +26,7 @@ diff -Nur webmin-1.410-orig/setup.sh webmin-1.410/setup.sh
# Copy files to target directory # Copy files to target directory
echo "***********************************************************************" echo "***********************************************************************"
@@ -473,8 +472,8 @@ @@ -470,8 +469,8 @@
echo "Creating web server config files.." echo "Creating web server config files.."
cfile=$config_dir/miniserv.conf cfile=$config_dir/miniserv.conf
echo "port=$port" >> $cfile echo "port=$port" >> $cfile
@ -38,7 +37,7 @@ diff -Nur webmin-1.410-orig/setup.sh webmin-1.410/setup.sh
echo "addtype_cgi=internal/cgi" >> $cfile echo "addtype_cgi=internal/cgi" >> $cfile
echo "realm=Webmin Server" >> $cfile echo "realm=Webmin Server" >> $cfile
echo "logfile=$var_dir/miniserv.log" >> $cfile echo "logfile=$var_dir/miniserv.log" >> $cfile
@@ -517,15 +516,7 @@ @@ -516,15 +515,7 @@
md5pass=`$perl -e 'print crypt("test", "\\$1\\$A9wB3O18\\$zaZgqrEmb9VNltWTL454R/") eq "\\$1\\$A9wB3O18\\$zaZgqrEmb9VNltWTL454R/" ? "1\n" : "0\n"'` md5pass=`$perl -e 'print crypt("test", "\\$1\\$A9wB3O18\\$zaZgqrEmb9VNltWTL454R/") eq "\\$1\\$A9wB3O18\\$zaZgqrEmb9VNltWTL454R/" ? "1\n" : "0\n"'`
ufile=$config_dir/miniserv.users ufile=$config_dir/miniserv.users
@ -55,20 +54,20 @@ diff -Nur webmin-1.410-orig/setup.sh webmin-1.410/setup.sh
chmod 600 $ufile chmod 600 $ufile
echo "userfile=$ufile" >> $cfile echo "userfile=$ufile" >> $cfile
@@ -562,11 +553,7 @@ @@ -561,11 +552,7 @@
echo "Creating access control file.." echo "Creating access control file.."
afile=$config_dir/webmin.acl afile=$config_dir/webmin.acl
rm -f $afile rm -f $afile
- if [ "$defaultmods" = "" ]; then - if [ "$defaultmods" = "" ]; then
- echo $login: $defaultallmods >> $afile - echo "$login: $allmods" >> $afile
- else - else
- echo $login: $defaultmods >> $afile - echo "$login: $defaultmods" >> $afile
- fi - fi
+ touch $afile + touch $afile
chmod 600 $afile chmod 600 $afile
echo "..done" echo "..done"
echo "" echo ""
@@ -587,7 +574,7 @@ @@ -586,7 +573,7 @@
echo "Creating start and stop scripts.." echo "Creating start and stop scripts.."
rm -f $config_dir/stop $config_dir/start $config_dir/restart $config_dir/reload rm -f $config_dir/stop $config_dir/start $config_dir/restart $config_dir/reload
echo "#!/bin/sh" >>$config_dir/start echo "#!/bin/sh" >>$config_dir/start
@ -77,7 +76,7 @@ diff -Nur webmin-1.410-orig/setup.sh webmin-1.410/setup.sh
echo "trap '' 1" >>$config_dir/start echo "trap '' 1" >>$config_dir/start
echo "LANG=" >>$config_dir/start echo "LANG=" >>$config_dir/start
echo "export LANG" >>$config_dir/start echo "export LANG" >>$config_dir/start
@@ -598,13 +585,13 @@ @@ -597,13 +584,13 @@
echo "export PERLLIB" >>$config_dir/start echo "export PERLLIB" >>$config_dir/start
uname -a | grep -i 'HP/*UX' >/dev/null uname -a | grep -i 'HP/*UX' >/dev/null
if [ $? = "0" ]; then if [ $? = "0" ]; then
@ -92,4 +91,5 @@ diff -Nur webmin-1.410-orig/setup.sh webmin-1.410/setup.sh
-echo "echo Stopping Webmin server in $wadir" >>$config_dir/stop -echo "echo Stopping Webmin server in $wadir" >>$config_dir/stop
+echo "echo Stopping Webmin server in $prefix" >>$config_dir/stop +echo "echo Stopping Webmin server in $prefix" >>$config_dir/stop
echo "pidfile=\`grep \"^pidfile=\" $config_dir/miniserv.conf | sed -e 's/pidfile=//g'\`" >>$config_dir/stop echo "pidfile=\`grep \"^pidfile=\" $config_dir/miniserv.conf | sed -e 's/pidfile=//g'\`" >>$config_dir/stop
echo "kill \`cat \$pidfile\`" >>$config_dir/stop echo "kill \`cat \$pidfile\`" >>$config_dir/stop

6
network/webmin/webmin.desc

@ -2,7 +2,7 @@
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY] [COPY]
[COPY] Filename: package/.../webmin/webmin.desc [COPY] Filename: package/.../webmin/webmin.desc
[COPY] Copyright (C) 2006 - 2008 The OpenSDE Project [COPY] Copyright (C) 2006 - 2011 The OpenSDE Project
[COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
[COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] Copyright (C) 1998 - 2003 Clifford Wolf
[COPY] [COPY]
@ -34,7 +34,7 @@
[L] BSD [L] BSD
[S] Stable [S] Stable
[V] 1.410 [V] 1.550
[P] X -----5---9 163.300 [P] X -----5---9 163.300
[D] 2161036824 webmin-1.410.tar.gz http://dl.sourceforge.net/sourceforge/webadmin/ [D] 2241116449 webmin-1.550.tar.gz http://dl.sourceforge.net/sourceforge/webadmin/

Loading…
Cancel
Save