Merge from knu-cvsweb 1.105.1.64.

2001-01-13  Akinori MUSHA  <knu@iDaemons.org>

	* cvsweb.conf: Add some knu-cvsweb info.

	* cvsweb.cgi: MFZ: 1.105.

	* README.knu, TODO.knu, cvsweb.cgi, cvsweb.conf,
	cvsweb.conf-freebsd, cvsweb.conf-netbsd, cvsweb.conf-openbsd,
	cvsweb.conf-ruby: Change CVS tags: "Id" -> "Idaemons".
This commit is contained in:
Akinori MUSHA 2001-01-14 08:59:59 +00:00
parent 6073add845
commit d1ede62772
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/www/; revision=8678
5 changed files with 57 additions and 44 deletions

View file

@ -18,7 +18,7 @@
# Copyright (c) 1996-1998 Bill Fenner # Copyright (c) 1996-1998 Bill Fenner
# (c) 1998-1999 Henner Zeller # (c) 1998-1999 Henner Zeller
# (c) 1999 Henrik Nordstrom # (c) 1999 Henrik Nordstrom
# (c) 2000 Akinori MUSHA # (c) 2000-2001 Akinori MUSHA
# All rights reserved. # All rights reserved.
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -42,9 +42,9 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE. # SUCH DAMAGE.
# #
# $zId: cvsweb.cgi,v 1.104 2000/11/01 22:05:12 hnordstrom Exp $ # $Id: cvsweb.cgi,v 1.68 2001-01-14 08:59:59 knu Exp $
# $Id: cvsweb.cgi,v 1.67 2001-01-12 04:26:10 knu Exp $ # $Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.64 2001/01/13 07:48:09 knu Exp $
# $FreeBSD: www/en/cgi/cvsweb.cgi,v 1.66 2001/01/03 07:40:09 knu Exp $ # $FreeBSD: www/en/cgi/cvsweb.cgi,v 1.67 2001/01/12 04:26:10 knu Exp $
# #
### ###
@ -53,6 +53,7 @@ require 5.000;
use strict; use strict;
use vars qw ( use vars qw (
$cvsweb_revision
$mydir $uname $config $allow_version_select $verbose $mydir $uname $config $allow_version_select $verbose
@CVSrepositories @CVSROOT %CVSROOT %CVSROOTdescr @CVSrepositories @CVSROOT %CVSROOT %CVSROOTdescr
%MIRRORS %DEFAULTVALUE %ICONS %MTYPES %MIRRORS %DEFAULTVALUE %ICONS %MTYPES
@ -139,6 +140,10 @@ sub forbidden_module($);
##### Start of Configuration Area ######## ##### Start of Configuration Area ########
delete $ENV{PATH}; delete $ENV{PATH};
$cvsweb_revision = join('.', '1.105', (split(/ /,
q$Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.64 2001/01/13 07:48:09 knu Exp $
))[2]);
use File::Basename; use File::Basename;
($mydir) = (dirname($0) =~ /(.*)/); # untaint ($mydir) = (dirname($0) =~ /(.*)/); # untaint
@ -229,7 +234,7 @@ $LOG_REVSEPARATOR = q/^-{28}$/;
##### End of configuration variables ##### ##### End of configuration variables #####
$cgi_style::hsty_base = 'http://www.FreeBSD.org'; $cgi_style::hsty_base = 'http://www.FreeBSD.org';
$_ = q$FreeBSD: www/en/cgi/cvsweb.cgi,v 1.66 2001/01/03 07:40:09 knu Exp $; $_ = q$FreeBSD: www/en/cgi/cvsweb.cgi,v 1.67 2001/01/12 04:26:10 knu Exp $;
@_ = split; @_ = split;
$cgi_style::hsty_date = "@_[3,4]"; $cgi_style::hsty_date = "@_[3,4]";
@ -262,7 +267,7 @@ $where =~ s|^/||;
$scriptname = defined($ENV{SCRIPT_NAME}) ? $ENV{SCRIPT_NAME} : ''; $scriptname = defined($ENV{SCRIPT_NAME}) ? $ENV{SCRIPT_NAME} : '';
$scriptname =~ s|^/*|/|; $scriptname =~ s|^/*|/|;
# Let's workaround thttpd's stupidness.. # Let's workaround thttpd's stupidity..
if ($scriptname =~ m|/$|) { if ($scriptname =~ m|/$|) {
$pathinfo .= '/'; $pathinfo .= '/';
my $re = quotemeta $pathinfo; my $re = quotemeta $pathinfo;
@ -747,7 +752,8 @@ if (-d $fullname) {
if ($_ eq '..' || -d "$fullname/$_") { if ($_ eq '..' || -d "$fullname/$_") {
next if ($_ eq '..' && $where eq '/'); next if ($_ eq '..' && $where eq '/');
my ($rev,$date,$log,$author,$filename) = @{$fileinfo{$_}} my ($rev,$date,$log,$author,$filename);
($rev,$date,$log,$author,$filename) = @{$fileinfo{$_}}
if (defined($fileinfo{$_})); if (defined($fileinfo{$_}));
printf '<tr bgcolor="%s"><td>', $tabcolors[$dirrow % 2] if $dirtable; printf '<tr bgcolor="%s"><td>', $tabcolors[$dirrow % 2] if $dirtable;
if ($_ eq '..') { if ($_ eq '..') {
@ -2766,14 +2772,19 @@ sub navigateHeader($$$$$) {
my ($swhere,$path,$filename,$rev,$title) = @_; my ($swhere,$path,$filename,$rev,$title) = @_;
$swhere = "" if ($swhere eq $scriptwhere); $swhere = "" if ($swhere eq $scriptwhere);
$swhere = urlencode($filename) if ($swhere eq ""); $swhere = urlencode($filename) if ($swhere eq "");
print qq`<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">`;
print "<HTML>\n<HEAD>\n"; print <<EOF;
print qq`<META name="robots" content="nofollow">\n`; <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
print '<!-- CVSweb $zRevision: 1.104 $ $Revision: 1.67 $ -->'; <HTML>
print "\n<TITLE>$path$filename - $title - $rev</TITLE></HEAD>\n"; <HEAD>
print "$body_tag_for_src\n"; <META name="robots" content="nofollow">
print "<table width=\"100%\" border=0 cellspacing=0 cellpadding=1 bgcolor=\"$navigationHeaderColor\">"; <!-- knu-cvsweb $cvsweb_revision -->
print "<tr valign=bottom><td>"; <TITLE>$path$filename - $title - $rev</TITLE></HEAD>
$body_tag_for_src
<table width="100%" border=0 cellspacing=0 cellpadding=1 bgcolor="$navigationHeaderColor">
<tr valign=bottom><td>
EOF
print &link($backicon, "$swhere$query#rev$rev"); print &link($backicon, "$swhere$query#rev$rev");
print "</a> <b>Return to ", &link("$filename","$swhere$query#rev$rev")," CVS log"; print "</a> <b>Return to ", &link("$filename","$swhere$query#rev$rev")," CVS log";
print "</b> $fileicon</td>"; print "</b> $fileicon</td>";
@ -3164,8 +3175,7 @@ sub http_header(;$) {
sub html_header($) { sub html_header($) {
my ($title) = @_; my ($title) = @_;
my $version = '$zRevision: 1.104 $ $Revision: 1.67 $'; #' http_header("text/html");
http_header(defined($charset) ? "text/html; charset=$charset" : "text/html");
(my $header = &cgi_style::html_header) =~ s/^.*\n\n//; # remove HTTP response header (my $header = &cgi_style::html_header) =~ s/^.*\n\n//; # remove HTTP response header
@ -3173,7 +3183,7 @@ sub html_header($) {
<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN" <!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"
"http://www.w3.org/TR/REC-html40/loose.dtd"> "http://www.w3.org/TR/REC-html40/loose.dtd">
$header $header
<!-- CVSweb $version --> <!-- knu-cvsweb $cvsweb_revision -->
EOH EOH
} }

View file

@ -4,11 +4,11 @@
# #
# (c) 1998-1999 H. Zeller <zeller@think.de> # (c) 1998-1999 H. Zeller <zeller@think.de>
# 1999 H. Nordstrom <hno@hem.passagen.se> # 1999 H. Nordstrom <hno@hem.passagen.se>
# 2000 A. MUSHA <knu@FreeBSD.org> # 2000-2001 A. MUSHA <knu@FreeBSD.org>
# based on work by Bill Fenner <fenner@FreeBSD.org> # based on work by Bill Fenner <fenner@FreeBSD.org>
# $zId: cvsweb.conf,v 1.27 2000/07/27 10:16:39 kcoar Exp $ # $Id: cvsweb.conf,v 1.16 2001-01-14 08:59:59 knu Exp $
# $Id: cvsweb.conf,v 1.15 2001-01-12 04:26:10 knu Exp $ # $Idaemons: /home/cvs/cvsweb/cvsweb.conf,v 1.22 2001/01/13 07:48:09 knu Exp $
# $FreeBSD: www/en/cgi/cvsweb.conf,v 1.14 2001/01/03 07:40:09 knu Exp $ # $FreeBSD: www/en/cgi/cvsweb.conf,v 1.15 2001/01/12 04:26:10 knu Exp $
# #
### ###
@ -173,25 +173,28 @@ a form at the bottom of the page that allows you to
display diffs between arbitrary revisions. display diffs between arbitrary revisions.
</p> </p>
<p> <p>
This script has been written by Bill Fenner This script has been written by Bill Fenner &lt;<a
&lt;<a href="mailto:fenner\@FreeBSD.org">fenner\@FreeBSD.org</a>&gt; href="mailto:fenner\@FreeBSD.org">fenner\@FreeBSD.org</a>&gt; and
and improved by Henner Zeller improved by Henner Zeller &lt;<a
&lt;<a href="mailto:zeller\@think.de">zeller\@think.de</a>&gt;, href="mailto:zeller\@think.de">zeller\@think.de</a>&gt;, Henrik
Henrik Nordstr&ouml;m Nordstr&ouml;m &lt;<a
&lt;<a href="mailto:hno\@hem.passagen.se">hno\@hem.passagen.se</a>&gt;, and href="mailto:hno\@hem.passagen.se">hno\@hem.passagen.se</a>&gt;, and
Ken Coar Ken Coar &lt;<a
&lt;<a href="mailto:Ken.Coar\@Golux.Com">Ken.Coar\@Golux.Com</a>&gt;, then href="mailto:Ken.Coar\@Golux.Com">Ken.Coar\@Golux.Com</a>&gt;, then
Akinori MUSHA &lt;<a href="mailto:knu\@FreeBSD.org">knu\@FreeBSD.org</a>&gt; Akinori MUSHA &lt;<a
brought it back to FreeBSD community and added more facilities; href="mailto:knu\@FreeBSD.org">knu\@FreeBSD.org</a>&gt; brought it
it is covered by the back to FreeBSD community and made further improvements; it is covered
<a href="http://www.opensource.org/licenses/bsd-license.html">BSD-Licence</a>. by the <a
href="http://www.opensource.org/licenses/bsd-license.html">BSD-Licence</a>.
</p> </p>
<p> <p>
If you would like to use this CGI script on your own web server and If you would like to use this CGI script on your own web server and
CVS tree, see Zeller's CVS tree, download the latest version at <a
<a href="http://linux.fh-heilbronn.de/~zeller/cgi/cvsweb.cgi" href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/knu/">here</a>,
>CVSweb distribution site</a>. Bill's original script can be found and also check out Zeller's <a
<a href="http://www.FreeBSD.org/~fenner/cvsweb/">here</a>. href="http://linux.fh-heilbronn.de/~zeller/cgi/cvsweb.cgi" >CVSweb
distribution site</a>. Bill's original script can be found <a
href="http://www.FreeBSD.org/~fenner/cvsweb/">here</a>.
</p> </p>
<p> <p>
Please send any suggestions, comments, etc. to Please send any suggestions, comments, etc. to

View file

@ -2,8 +2,8 @@
# #
# Set up for FreeBSD repo options. # Set up for FreeBSD repo options.
# #
# $Id: cvsweb.conf-freebsd,v 1.6 2001-01-12 04:26:10 knu Exp $ # $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.5 2001/01/02 00:03:51 knu Exp $ # $FreeBSD: www/en/cgi/cvsweb.conf-freebsd,v 1.6 2001/01/12 04:26:10 knu Exp $
if ($uname eq 'FreeBSD') { if ($uname eq 'FreeBSD') {
$ENV{'RCSLOCALID'} = 'FreeBSD=CVSHeader'; $ENV{'RCSLOCALID'} = 'FreeBSD=CVSHeader';

View file

@ -2,8 +2,8 @@
# #
# Set up for NetBSD repo options. # Set up for NetBSD repo options.
# #
# $Id: cvsweb.conf-netbsd,v 1.7 2001-01-12 04:26:10 knu Exp $ # $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.6 2001/01/02 00:03:51 knu Exp $ # $FreeBSD: www/en/cgi/cvsweb.conf-netbsd,v 1.7 2001/01/12 04:26:10 knu Exp $
if ($uname eq 'FreeBSD') { if ($uname eq 'FreeBSD') {
$ENV{'RCSLOCALID'} = 'NetBSD=CVSHeader'; $ENV{'RCSLOCALID'} = 'NetBSD=CVSHeader';

View file

@ -2,8 +2,8 @@
# #
# Set up for OpenBSD repo options. # Set up for OpenBSD repo options.
# #
# $Id: cvsweb.conf-openbsd,v 1.5 2001-01-12 04:26:10 knu Exp $ # $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.4 2001/01/02 00:03:51 knu Exp $ # $FreeBSD: www/en/cgi/cvsweb.conf-openbsd,v 1.5 2001/01/12 04:26:10 knu Exp $
if ($uname eq 'FreeBSD') { if ($uname eq 'FreeBSD') {
$ENV{'RCSLOCALID'} = 'OpenBSD=CVSHeader'; $ENV{'RCSLOCALID'} = 'OpenBSD=CVSHeader';