Browse Source

Andreas V. Meier:


			
			
				rocklinux
			
			
		
Andreas V. 'netrunner' Meier 20 years ago
parent
commit
7efce83d03
2 changed files with 44 additions and 22 deletions
  1. +42
    -20
      package/alessandro/webmin/nodefuser.patch
  2. +2
    -2
      package/alessandro/webmin/webmin.desc

+ 42
- 20
package/alessandro/webmin/nodefuser.patch

@ -17,17 +17,19 @@
# #
# --- ROCK-COPYRIGHT-NOTE-END --- # --- ROCK-COPYRIGHT-NOTE-END ---
--- ./setup.sh 2003-02-20 11:40:14.000000000 +0000
+++ ./setup.sh 2003-04-05 16:37:29.000000000 +0000
@@ -382,7 +382,6 @@
diff -ruN webmin-1.180/setup.sh webmin-1.180-new/setup.sh
--- webmin-1.180/setup.sh 2005-01-24 23:15:16.000000000 +0100
+++ webmin-1.180-new/setup.sh 2005-01-29 15:07:12.515588416 +0100
@@ -438,7 +438,7 @@
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
- makeboot=$atboot - makeboot=$atboot
+ #ROCK makeboot=$atboot
# Create webserver config file
echo $perl > $config_dir/perl-path
@@ -391,8 +390,8 @@
# Copy files to target directory
echo "***********************************************************************"
@@ -455,8 +455,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,41 +40,61 @@
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
@@ -461,12 +460,8 @@
fi
@@ -490,15 +490,16 @@
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
- if [ "$crypt" != "" ]; then - if [ "$crypt" != "" ]; then
- echo "$login:$crypt:0" > $ufile - echo "$login:$crypt:0" > $ufile
- else - else
- $perl -e 'print "$ARGV[0]:",crypt($ARGV[1], "XX"),":0\n"' "$login" "$password" > $ufile
- if [ "$md5pass" = "1" ]; then
- $perl -e 'print "$ARGV[0]:",crypt($ARGV[1], "\$1\$XXXXXXXX"),":0\n"' "$login" "$password" > $ufile
- else
- $perl -e 'print "$ARGV[0]:",crypt($ARGV[1], "XX"),":0\n"' "$login" "$password" > $ufile
- fi
- fi - fi
- chmod 600 $ufile
+#ROCK if [ "$crypt" != "" ]; then
+#ROCK echo "$login:$crypt:0" > $ufile
+#ROCK else
+#ROCK if [ "$md5pass" = "1" ]; then
+#ROCK $perl -e 'print "$ARGV[0]:",crypt($ARGV[1], "\$1\$XXXXXXXX"),":0\n"' "$login" "$password" > $ufile
+#ROCK else
+#ROCK $perl -e 'print "$ARGV[0]:",crypt($ARGV[1], "XX"),":0\n"' "$login" "$password" > $ufile
+#ROCK fi
+#ROCK fi
+ touch $ufile + touch $ufile
+ chmod 600 $ufile
chmod 600 $ufile
echo "userfile=$ufile" >> $cfile echo "userfile=$ufile" >> $cfile
kfile=$config_dir/miniserv.pem
@@ -502,7 +497,7 @@
@@ -535,11 +536,12 @@
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
- echo "$login: $allmods" >> $afile
+ touch $afile
- if [ "$defaultmods" = "" ]; then
- echo "$login: $allmods" >> $afile
- else
- echo "$login: $defaultmods" >> $afile
- fi
+#ROCK if [ "$defaultmods" = "" ]; then
+#ROCK echo "$login: $allmods" >> $afile
+#ROCK else
+#ROCK echo "$login: $defaultmods" >> $afile
+#ROCK fi
+ touch $afile
chmod 600 $afile chmod 600 $afile
echo "..done" echo "..done"
echo "" echo ""
@@ -523,7 +518,7 @@
@@ -560,7 +562,7 @@
echo "Creating start and stop scripts.." echo "Creating start and stop scripts.."
rm -f $config_dir/stop $config_dir/start
rm -f $config_dir/stop $config_dir/start $config_dir/restart
echo "#!/bin/sh" >>$config_dir/start echo "#!/bin/sh" >>$config_dir/start
-echo "echo Starting Webmin server in $wadir" >>$config_dir/start -echo "echo Starting Webmin server in $wadir" >>$config_dir/start
+echo "echo Starting Webmin server in $prefix" >>$config_dir/start +echo "echo Starting Webmin server in $prefix" >>$config_dir/start
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
@@ -531,13 +526,13 @@
echo "export PERLIO" >>$config_dir/start
@@ -571,13 +573,13 @@
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
- echo "exec '$wadir/miniserv.pl' $config_dir/miniserv.conf &" >>$config_dir/start - echo "exec '$wadir/miniserv.pl' $config_dir/miniserv.conf &" >>$config_dir/start
@ -87,4 +109,4 @@
+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
chmod 755 $config_dir/start $config_dir/stop

+ 2
- 2
package/alessandro/webmin/webmin.desc

@ -41,8 +41,8 @@
[L] BSD [L] BSD
[S] Stable [S] Stable
[V] 1.100
[V] 1.180
[P] X -?---5---9 163.300 [P] X -?---5---9 163.300
[D] 4045119311 webmin-1.100.tar.gz http://dl.sourceforge.net/sourceforge/webadmin/
[D] 103221259 webmin-1.180.tar.gz http://dl.sourceforge.net/sourceforge/webadmin/

Loading…
Cancel
Save