Merge from FreeBSD-cvsweb 2.0.3.

2002-05-22  Akinori MUSHA  <knu@iDaemons.org>

	* cvsweb.cgi: Read configuration files with `do' instead of
	`require' to unbreak mod_perl support.
	[Submitted by: "Khachaturov, Vassilii" <vassilii@tarunz.org>]

	* cvsweb.cgi: Cosmetic fixes.  Use and/or rather than &&/|| to
	connect sentences.

	* cvsweb.cgi: Exit with -1 if exec() fails.

	* cvsweb.cgi: Do not print a redundant `Diff' for rev.1.1.
	[Submitted by:	Ville Skytt,Ad(B <ville.skytta@iki.fi>]

	* cvsweb.cgi: Prevent cross-site scripting.
	[Submitted by: Motoyuki Konno <motoyuki@bsdclub.org> (modified)]

	* cvsweb.cgi: Skip a possible `locked by' clause and extract a
	revision number out of a log entry properly.
	[Submitted by: "Khachaturov, Vassilii" <vassilii@tarunz.org>]

	* cvsweb.cgi: Apply some HTML cleanups and use CSS instead of
	ancient HTML 3/4 tags and attributes.
	[Submitted by:	Ville Skytt,Ad(B <ville.skytta@iki.fi>]

	* cvsweb.cgi: Pass `use' features to import to make it more memory
	efficient.
	[Submitted by: Ville Skytt,Ad(B <ville.skytta@iki.fi>]

	* cvsweb.cgi: Add new configuration variables: $allow_log_extra,
	$allow_dir_extra, and $allow_source_extra.
	[Submitted by: "Khachaturov, Vassilii" <vassilii@tarunz.org>]

	* cvsweb.cgi: Release as FreeBSD-cvsweb 2.0.2.

	* cvsweb.cgi: Previous fixes against cross-site scripting
	vulnerabilities were insufficient and buggy (error messages were
	messed up).  Revamp fatal() to HTML-quote automatically and fix
	error message output.

	* cvsweb.cgi: Release as FreeBSD-cvsweb 2.0.3.

2002-05-11  Akinori MUSHA  <knu@iDaemons.org>

	* cvsweb.cgi: There are no spaces at EOL in modern rlog output.
	[Submitted by: "Khachaturov, Vassilii" <vassilii@tarunz.org>]

2002-05-08  Motoyuki Konno <motoyuki@FreeBSD.org>

	* cvsweb.cgi: Fix a cross-site scripting vulnerablity.

2002-05-07  Akinori MUSHA  <knu@iDaemons.org>

	* cvsweb.conf-netbsd, cvsweb.conf-openbsd: NetBSD and OpenBSD
	don't use $CVSHeader$ but $Id$.
	[Submitted by: motoyuki@FreeBSD.org]

	* cvsweb.cgi: Work around a bug of cvs -p; expand symlinks in a
	cvsroot.
	[Submitted by: motoyuki@FreeBSD.org]

	* cvsweb.cgi: Fix parsing in 'tags' state.
	[Submitted by: "Khachaturov, Vassilii" <vassilii@tarunz.org>]
This commit is contained in:
Akinori MUSHA 2002-05-22 08:31:06 +00:00
parent b1bd7917d2
commit ba1109f417
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/www/; revision=13191
4 changed files with 409 additions and 310 deletions

File diff suppressed because it is too large Load diff

View file

@ -7,9 +7,9 @@
# 2000-2002 A. MUSHA <knu@FreeBSD.org>
# based on work by Bill Fenner <fenner@FreeBSD.org>
#
# $Id: cvsweb.conf,v 1.26 2002-04-10 20:13:19 knu Exp $
# $Id: cvsweb.conf,v 1.27 2002-05-22 08:31:06 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.25 2002/03/09 20:55:39 wosch Exp $
# $FreeBSD: www/en/cgi/cvsweb.conf,v 1.26 2002/04/10 20:13:19 knu Exp $
#
###
@ -42,7 +42,7 @@ chomp($uname = `$CMD{uname}`);
# 'symbolic_name' => ['name_to_display', 'path_to_the_actual_repository']
# Listed in the order specified:
@CVSrepositories = (
'freebsd' => ['FreeBSD', '/c/ncvs'],
'freebsd' => ['FreeBSD', '/home/ncvs'],
'openbsd' => ['OpenBSD', '/usr/local/www/cvsroot/OpenBSD'],
'netbsd' => ['NetBSD', '/usr/local/www/cvsroot/NetBSD'],
'44bsdlite' => ['4.4BSD-Lite', '/e/4.4BSD-Lite/4.4BSD-Lite-CVS'],
@ -408,6 +408,15 @@ $allow_annotate = 1;
# allow pretty-printed version of files
$allow_markup = 1;
# allow extra hlink formatting (such as PR xrefs) in logs
$allow_log_extra = 1; # default: enabled
# allow extra hlink formatting (such as PR xrefs) in directories
$allow_dir_extra = 1;
# allow extra hlink formatting in source code/formatted diff views
$allow_source_extra = 1;
# allow compression with gzip
# of output if the Browser accepts
# it (HTTP_ACCEPT_ENCODING=gzip)

View file

@ -3,10 +3,10 @@
# Set up for NetBSD repo options.
#
# $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.10 2001/11/07 21:25:16 knu Exp $
# $FreeBSD: www/en/cgi/cvsweb.conf-netbsd,v 1.11 2002/04/10 20:13:19 knu Exp $
if ($uname eq 'FreeBSD') {
$ENV{'RCSLOCALID'} = 'NetBSD=CVSHeader';
$ENV{'RCSLOCALID'} = 'NetBSD=Id';
$ENV{'RCSINCEXC'} = 'iNetBSD';
} else {
$ENV{'RCSLOCALID'} = 'NetBSD';

View file

@ -3,10 +3,10 @@
# Set up for OpenBSD repo options.
#
# $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.8 2001/11/07 21:25:16 knu Exp $
# $FreeBSD: www/en/cgi/cvsweb.conf-openbsd,v 1.9 2002/04/10 20:13:19 knu Exp $
if ($uname eq 'FreeBSD') {
$ENV{'RCSLOCALID'} = 'OpenBSD=CVSHeader';
$ENV{'RCSLOCALID'} = 'OpenBSD=Id';
$ENV{'RCSINCEXC'} = 'iOpenBSD';
} else {
$ENV{'RCSLOCALID'} = 'OpenBSD';