Merge from knu-cvsweb 1.112.1.82.
2001-08-01 Akinori MUSHA <knu@iDaemons.org> * cvsweb.cgi: perltidy -i=8 -t -pt=2 -bt=2 -sbt=2 -ci=4 -noll -sfs -nasc -ce * cvsweb.conf, cvsweb.conf-freebsd, cvsweb.conf-netbsd, cvsweb.conf-openbsd, cvsweb.conf-ruby: perltidy -i=8 -t -pt=2 -bt=2 -sbt=2 -ci=4 -noll -sfs -nasc -ce * cvsweb.cgi, cvsweb.conf: MFZ 1.111, but introduce @ForbiddenFiles instead of @DissallowRead to forbid user to cvs checkout/diff/annotate specified files. * cvsweb.cgi: MFZ 1.112: A couple of trivial fixes. 2001-07-26 Akinori MUSHA <knu@iDaemons.org> * cvsweb.cgi: Chdir to TMPDIR so it works even when the cgi-bin directory is unreadable. [Submitted by: Dmitry Morozovsky <marck@rinet.ru>] * cvsweb.cgi: Let the module/path box appear and work properly when there is only one repository. [Submitted by: Dmitry Morozovsky <marck@rinet.ru>]
This commit is contained in:
		
							parent
							
								
									4f95a0576a
								
							
						
					
					
						commit
						500c71f667
					
				
				
				Notes:
				
					svn2git
				
				2020-12-08 03:00:23 +00:00 
				
			
			svn path=/www/; revision=10118
					 5 changed files with 2654 additions and 2313 deletions
				
			
		
							
								
								
									
										1716
									
								
								en/cgi/cvsweb.cgi
									
										
									
									
									
								
							
							
						
						
									
										1716
									
								
								en/cgi/cvsweb.cgi
									
										
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load diff
											
										
									
								
							|  | @ -6,9 +6,9 @@ | |||
| #     1999      H. Nordstrom <hno@hem.passagen.se> | ||||
| #     2000-2001 A. MUSHA     <knu@FreeBSD.org> | ||||
| #          based on work by Bill Fenner  <fenner@FreeBSD.org> | ||||
| # $Id: cvsweb.conf,v 1.21 2001-07-06 09:58:17 knu Exp $ | ||||
| # $Idaemons: /home/cvs/cvsweb/cvsweb.conf,v 1.25 2001/07/06 09:44:28 knu Exp $ | ||||
| # $FreeBSD: www/en/cgi/cvsweb.conf,v 1.20 2001/06/18 22:27:55 peter Exp $ | ||||
| # $Id: cvsweb.conf,v 1.22 2001-08-01 10:41:47 knu Exp $ | ||||
| # $Idaemons: /home/cvs/cvsweb/cvsweb.conf,v 1.27 2001/08/01 09:48:39 knu Exp $ | ||||
| # $FreeBSD: www/en/cgi/cvsweb.conf,v 1.21 2001/07/06 09:58:17 knu Exp $ | ||||
| # | ||||
| ### | ||||
| 
 | ||||
|  | @ -46,7 +46,7 @@ chomp($uname = `$CMD{uname}`); | |||
| 	'netbsd'    => ['NetBSD',           '/usr/local/www/cvsroot/NetBSD'], | ||||
| 	'44bsdlite' => ['4.4BSD-Lite',      '/e/4.4BSD-Lite/4.4BSD-Lite-CVS'], | ||||
| 	'learn'     => ['Learn',            '/c/learncvs'], | ||||
| 		   ); | ||||
| ); | ||||
| 
 | ||||
| # This tree is enabled by default when | ||||
| # you enter the page | ||||
|  | @ -81,7 +81,8 @@ $cvstreedefault = $CVSrepositories[2 * 0];	# The first one | |||
| #    pending | ||||
| #    ports | ||||
| #    sparc | ||||
| #		  ); | ||||
| #); | ||||
| 
 | ||||
| # | ||||
| #$prcgi = "http://www.FreeBSD.org/cgi/query-pr.cgi?pr=%s"; | ||||
| # | ||||
|  | @ -90,12 +91,14 @@ $cvstreedefault = $CVSrepositories[2 * 0];	# The first one | |||
| ############## | ||||
| # Manual gateway | ||||
| ############## | ||||
| $mancgi = "http://www.FreeBSD.org/cgi/man.cgi?apropos=0&sektion=%s&query=%s&manpath=FreeBSD+5.0-current&format=html"; | ||||
| $mancgi = | ||||
|     "http://www.FreeBSD.org/cgi/man.cgi?apropos=0&sektion=%s&query=%s&manpath=FreeBSD+5.0-current&format=html"; | ||||
| 
 | ||||
| ############## | ||||
| # Defaults for UserSettings | ||||
| ############## | ||||
| %DEFAULTVALUE = ( | ||||
| 
 | ||||
| 	# sortby: File sort order | ||||
| 	#   file   Sort by filename | ||||
| 	#   rev    Sort by revision number | ||||
|  | @ -223,12 +226,13 @@ EOT | |||
| # If these icons are too large, check out the miniicons in the | ||||
| # icons/ directory; they have a width/height of 16/16 | ||||
| my $iconsdir = "/icons"; | ||||
| 
 | ||||
| # format:             TEXT      ICON-URL              width height | ||||
| %ICONS = ( | ||||
| 	   back => [ ("[BACK]", "$iconsdir/back.gif", 20,   22) ], | ||||
| 	   dir  => [ ("[DIR]",  "$iconsdir/dir.gif",  20,   22) ], | ||||
| 	   file => [ ("[TXT]",  "$iconsdir/text.gif", 20,   22) ], | ||||
| 	  ); | ||||
| 	back => [("[BACK]", "$iconsdir/back.gif", 20, 22)], | ||||
| 	dir  => [("[DIR]",  "$iconsdir/dir.gif",  20, 22)], | ||||
| 	file => [("[TXT]",  "$iconsdir/text.gif", 20, 22)], | ||||
| ); | ||||
| undef $iconsdir; | ||||
| 
 | ||||
| # the length to which the last logentry should | ||||
|  | @ -268,7 +272,20 @@ $tableBorderColor = '#cccccc'; | |||
| # nor by explicit path specification. | ||||
| # | ||||
| @HideModules = ( | ||||
| 	       ); | ||||
| #	"^my/secret/module", | ||||
| ); | ||||
| 
 | ||||
| # | ||||
| # Files matching these pathnames shouldn't be checked out with cvsweb, | ||||
| # since they may contain sensitive information. Simple file name based | ||||
| # filter. Often, the CVSROOT/passwd is exposed and some people tend | ||||
| # to check in their .cvspass, though this is a bad idea. These files | ||||
| # shouldn't be readable by default. Thanks to Damian Gryski to point | ||||
| # this out. | ||||
| @ForbiddenFiles = ( | ||||
| 	"^CVSROOT/passwd\$",   # CVSROOT/passwd should not be cvs add'ed, though | ||||
| 	"/\\.cvspass\$",       # Ditto.  Just in case. | ||||
| ); | ||||
| 
 | ||||
| # | ||||
| # Use CVSROOT/CVSROOT/descriptions for describing the directories/modules | ||||
|  | @ -308,7 +325,7 @@ $showfunc = 1; | |||
| %funcline_regexp = ( | ||||
| 	"\\.(4th|fr)\$" => "\\(^\\|[ \t]\\): ", | ||||
| 	"\\.rb\$"       => "^[\t ]*\\(class\\|module\\|def\\) ", | ||||
| 		   ); | ||||
| ); | ||||
| 
 | ||||
| # ignore whitespaces for human readable diffs | ||||
| # (indendation and stuff ..) | ||||
|  | @ -358,10 +375,11 @@ $mime_types = '/usr/local/etc/apache/mime.types'; | |||
| 	"png"   => "image/png", | ||||
| 	"xpm"   => "image/xpm", | ||||
| 	"*"     => "text/plain", | ||||
| 	  ); | ||||
| ); | ||||
| 
 | ||||
| # Charset for HTML output | ||||
| $charset = ''; | ||||
| 
 | ||||
| # e.g. | ||||
| #$charset = $where =~ m,/ru[/_-], ? 'koi8-r' | ||||
| #  : $where =~ m,/zh[/_-], ? 'big5' | ||||
|  | @ -463,17 +481,20 @@ $allow_tar = ''; | |||
| 
 | ||||
| # Options to pass to tar(1). | ||||
| @tar_options = qw(--ignore-failed-read); | ||||
| 
 | ||||
| # e.g. @tar_options = qw(--ignore-failed-read); | ||||
| #      GNU tar has some useful options against unexpected errors. | ||||
| 
 | ||||
| # Options to pass to gzip(1) when compressing a tarball to download. | ||||
| @gzip_options = qw(); | ||||
| 
 | ||||
| # e.g. @gzip_options = qw(-3); | ||||
| #      Try lower compression level than 6 (default) if you want faster | ||||
| #      compression, or higher, for better compression. | ||||
| 
 | ||||
| # Options to pass to zip(1) when compressing a zip archive to download. | ||||
| @zip_options = qw(); | ||||
| 
 | ||||
| # e.g. @zip_options = qw(-3); | ||||
| #      Try lower compression level than 6 (default) if you want faster | ||||
| #      compression, or higher, for better compression. | ||||
|  | @ -482,8 +503,10 @@ $allow_tar = ''; | |||
| @cvs_options = qw(-l); | ||||
| 
 | ||||
| push @cvs_options, '-R' if ($uname eq 'FreeBSD' || $uname eq 'OpenBSD'); | ||||
| 
 | ||||
| #      Only FreeBSD's and OpenBSD's cvs(1) supports -R (read only access | ||||
| #      mode) option, which considerably speeds up checkouts over NFS. | ||||
| 
 | ||||
| 1; | ||||
| 
 | ||||
| #EOF | ||||
|  |  | |||
|  | @ -2,8 +2,8 @@ | |||
| # | ||||
| # Set up for FreeBSD repo options. | ||||
| # | ||||
| # $Idaemons: /home/cvs/cvsweb/cvsweb.conf-freebsd,v 1.4 2001/01/13 07:48:09 knu Exp $ | ||||
| # $FreeBSD: www/en/cgi/cvsweb.conf-freebsd,v 1.6 2001/01/12 04:26:10 knu Exp $ | ||||
| # $Idaemons: /home/cvs/cvsweb/cvsweb.conf-freebsd,v 1.5 2001/08/01 09:32:22 knu Exp $ | ||||
| # $FreeBSD: www/en/cgi/cvsweb.conf-freebsd,v 1.7 2001/01/14 08:59:59 knu Exp $ | ||||
| 
 | ||||
| if ($uname eq 'FreeBSD') { | ||||
| 	$ENV{'RCSLOCALID'} = 'FreeBSD=CVSHeader'; | ||||
|  | @ -25,13 +25,14 @@ if ($uname eq 'FreeBSD') { | |||
|     pending | ||||
|     ports | ||||
|     sparc | ||||
| 		  ); | ||||
| ); | ||||
| 
 | ||||
| $prcgi = "http://www.FreeBSD.org/cgi/query-pr.cgi?pr=%s"; | ||||
| 
 | ||||
| $prkeyword = "PR"; | ||||
| 
 | ||||
| $mancgi = "http://www.FreeBSD.org/cgi/man.cgi?apropos=0&sektion=%s&query=%s&manpath=FreeBSD+5.0-current&format=html"; | ||||
| $mancgi = | ||||
|     "http://www.FreeBSD.org/cgi/man.cgi?apropos=0&sektion=%s&query=%s&manpath=FreeBSD+5.0-current&format=html"; | ||||
| 
 | ||||
| # Allow downloading a tarball of a port | ||||
| $allow_tar = ($where =~ m,^ports/[^/]+/[^/]+/,); | ||||
|  |  | |||
|  | @ -2,8 +2,8 @@ | |||
| # | ||||
| # Set up for NetBSD repo options. | ||||
| # | ||||
| # $Idaemons: /home/cvs/cvsweb/cvsweb.conf-netbsd,v 1.4 2001/01/13 07:48:09 knu Exp $ | ||||
| # $FreeBSD: www/en/cgi/cvsweb.conf-netbsd,v 1.7 2001/01/12 04:26:10 knu Exp $ | ||||
| # $Idaemons: /home/cvs/cvsweb/cvsweb.conf-netbsd,v 1.5 2001/08/01 09:32:22 knu Exp $ | ||||
| # $FreeBSD: www/en/cgi/cvsweb.conf-netbsd,v 1.8 2001/01/14 08:59:59 knu Exp $ | ||||
| 
 | ||||
| if ($uname eq 'FreeBSD') { | ||||
| 	$ENV{'RCSLOCALID'} = 'NetBSD=CVSHeader'; | ||||
|  | @ -59,7 +59,7 @@ if ($uname eq 'FreeBSD') { | |||
|     test | ||||
|     xsrc | ||||
|     y2k | ||||
| 		  ); | ||||
| ); | ||||
| 
 | ||||
| $prcgi = "http://www.NetBSD.org/cgi-bin/query-pr-single.pl?number=%s"; | ||||
| 
 | ||||
|  |  | |||
|  | @ -2,8 +2,8 @@ | |||
| # | ||||
| # Set up for OpenBSD repo options. | ||||
| # | ||||
| # $Idaemons: /home/cvs/cvsweb/cvsweb.conf-openbsd,v 1.4 2001/01/13 07:48:09 knu Exp $ | ||||
| # $FreeBSD: www/en/cgi/cvsweb.conf-openbsd,v 1.5 2001/01/12 04:26:10 knu Exp $ | ||||
| # $Idaemons: /home/cvs/cvsweb/cvsweb.conf-openbsd,v 1.5 2001/08/01 09:32:22 knu Exp $ | ||||
| # $FreeBSD: www/en/cgi/cvsweb.conf-openbsd,v 1.6 2001/01/14 08:59:59 knu Exp $ | ||||
| 
 | ||||
| if ($uname eq 'FreeBSD') { | ||||
| 	$ENV{'RCSLOCALID'} = 'OpenBSD=CVSHeader'; | ||||
|  | @ -29,13 +29,14 @@ if ($uname eq 'FreeBSD') { | |||
|     system | ||||
|     user | ||||
|     vax | ||||
| 		  ); | ||||
| ); | ||||
| 
 | ||||
| $prcgi = "http://cvs.openbsd.org/cgi-bin/wwwgnats.pl/full?pr=%s"; | ||||
| 
 | ||||
| $prkeyword = "PR"; | ||||
| 
 | ||||
| $mancgi = "http://www.openbsd.org/cgi-bin/man.cgi?apropos=0&sektion=%s&query=%s&manpath=OpenBSD+Current&arch=i386&format=html"; | ||||
| $mancgi = | ||||
|     "http://www.openbsd.org/cgi-bin/man.cgi?apropos=0&sektion=%s&query=%s&manpath=OpenBSD+Current&arch=i386&format=html"; | ||||
| 
 | ||||
| # Allow downloading a tarball of a port | ||||
| $allow_tar = ($where =~ m,^ports/[^/]+/[^/]+/,); | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue