mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

90 lines
3.3 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/alessandro/webmin/nodefuser.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. --- ./setup.sh 2003-02-20 11:40:14.000000000 +0000
  20. +++ ./setup.sh 2003-04-05 16:37:29.000000000 +0000
  21. @@ -382,7 +382,6 @@
  22. echo "Webmin does not support being started at boot time on your system."
  23. fi
  24. fi
  25. - makeboot=$atboot
  26. # Create webserver config file
  27. echo $perl > $config_dir/perl-path
  28. @@ -391,8 +390,8 @@
  29. echo "Creating web server config files.."
  30. cfile=$config_dir/miniserv.conf
  31. echo "port=$port" >> $cfile
  32. - echo "root=$wadir" >> $cfile
  33. - echo "mimetypes=$wadir/mime.types" >> $cfile
  34. + echo "root=$prefix" >> $cfile
  35. + echo "mimetypes=$prefix/mime.types" >> $cfile
  36. echo "addtype_cgi=internal/cgi" >> $cfile
  37. echo "realm=Webmin Server" >> $cfile
  38. echo "logfile=$var_dir/miniserv.log" >> $cfile
  39. @@ -461,12 +460,8 @@
  40. fi
  41. ufile=$config_dir/miniserv.users
  42. - if [ "$crypt" != "" ]; then
  43. - echo "$login:$crypt:0" > $ufile
  44. - else
  45. - $perl -e 'print "$ARGV[0]:",crypt($ARGV[1], "XX"),":0\n"' "$login" "$password" > $ufile
  46. - fi
  47. - chmod 600 $ufile
  48. + touch $ufile
  49. + chmod 600 $ufile
  50. echo "userfile=$ufile" >> $cfile
  51. kfile=$config_dir/miniserv.pem
  52. @@ -502,7 +497,7 @@
  53. echo "Creating access control file.."
  54. afile=$config_dir/webmin.acl
  55. rm -f $afile
  56. - echo "$login: $allmods" >> $afile
  57. + touch $afile
  58. chmod 600 $afile
  59. echo "..done"
  60. echo ""
  61. @@ -523,7 +518,7 @@
  62. echo "Creating start and stop scripts.."
  63. rm -f $config_dir/stop $config_dir/start
  64. echo "#!/bin/sh" >>$config_dir/start
  65. -echo "echo Starting Webmin server in $wadir" >>$config_dir/start
  66. +echo "echo Starting Webmin server in $prefix" >>$config_dir/start
  67. echo "trap '' 1" >>$config_dir/start
  68. echo "LANG=" >>$config_dir/start
  69. echo "export LANG" >>$config_dir/start
  70. @@ -531,13 +526,13 @@
  71. echo "export PERLIO" >>$config_dir/start
  72. uname -a | grep -i 'HP/*UX' >/dev/null
  73. if [ $? = "0" ]; then
  74. - echo "exec '$wadir/miniserv.pl' $config_dir/miniserv.conf &" >>$config_dir/start
  75. + echo "exec '$prefix/miniserv.pl' $config_dir/miniserv.conf &" >>$config_dir/start
  76. else
  77. - echo "exec '$wadir/miniserv.pl' $config_dir/miniserv.conf" >>$config_dir/start
  78. + echo "exec '$prefix/miniserv.pl' $config_dir/miniserv.conf" >>$config_dir/start
  79. fi
  80. echo "#!/bin/sh" >>$config_dir/stop
  81. -echo "echo Stopping Webmin server in $wadir" >>$config_dir/stop
  82. +echo "echo Stopping Webmin server in $prefix" >>$config_dir/stop
  83. echo "pidfile=\`grep \"^pidfile=\" $config_dir/miniserv.conf | sed -e 's/pidfile=//g'\`" >>$config_dir/stop
  84. echo "kill \`cat \$pidfile\`" >>$config_dir/stop
  85. chmod 755 $config_dir/start $config_dir/stop