diff --git a/en/cgi/cvsweb.cgi b/en/cgi/cvsweb.cgi
index 44a7445fa9..3340360cb7 100755
--- a/en/cgi/cvsweb.cgi
+++ b/en/cgi/cvsweb.cgi
@@ -18,7 +18,7 @@
# Copyright (c) 1996-1998 Bill Fenner
# (c) 1998-1999 Henner Zeller
# (c) 1999 Henrik Nordstrom
-# (c) 2000 Akinori MUSHA
+# (c) 2000-2001 Akinori MUSHA
# All rights reserved.
#
# 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
# SUCH DAMAGE.
#
-# $zId: cvsweb.cgi,v 1.104 2000/11/01 22:05:12 hnordstrom Exp $
-# $Id: cvsweb.cgi,v 1.67 2001-01-12 04:26:10 knu Exp $
-# $FreeBSD: www/en/cgi/cvsweb.cgi,v 1.66 2001/01/03 07:40:09 knu Exp $
+# $Id: cvsweb.cgi,v 1.68 2001-01-14 08:59:59 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.67 2001/01/12 04:26:10 knu Exp $
#
###
@@ -53,6 +53,7 @@ require 5.000;
use strict;
use vars qw (
+ $cvsweb_revision
$mydir $uname $config $allow_version_select $verbose
@CVSrepositories @CVSROOT %CVSROOT %CVSROOTdescr
%MIRRORS %DEFAULTVALUE %ICONS %MTYPES
@@ -139,6 +140,10 @@ sub forbidden_module($);
##### Start of Configuration Area ########
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;
($mydir) = (dirname($0) =~ /(.*)/); # untaint
@@ -229,7 +234,7 @@ $LOG_REVSEPARATOR = q/^-{28}$/;
##### End of configuration variables #####
$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;
$cgi_style::hsty_date = "@_[3,4]";
@@ -262,7 +267,7 @@ $where =~ s|^/||;
$scriptname = defined($ENV{SCRIPT_NAME}) ? $ENV{SCRIPT_NAME} : '';
$scriptname =~ s|^/*|/|;
-# Let's workaround thttpd's stupidness..
+# Let's workaround thttpd's stupidity..
if ($scriptname =~ m|/$|) {
$pathinfo .= '/';
my $re = quotemeta $pathinfo;
@@ -747,7 +752,8 @@ if (-d $fullname) {
if ($_ eq '..' || -d "$fullname/$_") {
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{$_}));
printf '<tr bgcolor="%s"><td>', $tabcolors[$dirrow % 2] if $dirtable;
if ($_ eq '..') {
@@ -2766,14 +2772,19 @@ sub navigateHeader($$$$$) {
my ($swhere,$path,$filename,$rev,$title) = @_;
$swhere = "" if ($swhere eq $scriptwhere);
$swhere = urlencode($filename) if ($swhere eq "");
- print qq`<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">`;
- print "<HTML>\n<HEAD>\n";
- print qq`<META name="robots" content="nofollow">\n`;
- print '<!-- CVSweb $zRevision: 1.104 $ $Revision: 1.67 $ -->';
- print "\n<TITLE>$path$filename - $title - $rev</TITLE></HEAD>\n";
- print "$body_tag_for_src\n";
- print "<table width=\"100%\" border=0 cellspacing=0 cellpadding=1 bgcolor=\"$navigationHeaderColor\">";
- print "<tr valign=bottom><td>";
+
+ print <<EOF;
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD>
+<META name="robots" content="nofollow">
+<!-- knu-cvsweb $cvsweb_revision -->
+<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 "</a> <b>Return to ", &link("$filename","$swhere$query#rev$rev")," CVS log";
print "</b> $fileicon</td>";
@@ -3164,8 +3175,7 @@ sub http_header(;$) {
sub html_header($) {
my ($title) = @_;
- my $version = '$zRevision: 1.104 $ $Revision: 1.67 $'; #'
- http_header(defined($charset) ? "text/html; charset=$charset" : "text/html");
+ http_header("text/html");
(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"
"http://www.w3.org/TR/REC-html40/loose.dtd">
$header
-<!-- CVSweb $version -->
+<!-- knu-cvsweb $cvsweb_revision -->
EOH
}
diff --git a/en/cgi/cvsweb.conf b/en/cgi/cvsweb.conf
index dda45ec8f4..d8e56a1ddd 100644
--- a/en/cgi/cvsweb.conf
+++ b/en/cgi/cvsweb.conf
@@ -4,11 +4,11 @@
#
# (c) 1998-1999 H. Zeller <zeller@think.de>
# 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>
-# $zId: cvsweb.conf,v 1.27 2000/07/27 10:16:39 kcoar Exp $
-# $Id: cvsweb.conf,v 1.15 2001-01-12 04:26:10 knu Exp $
-# $FreeBSD: www/en/cgi/cvsweb.conf,v 1.14 2001/01/03 07:40:09 knu Exp $
+# $Id: cvsweb.conf,v 1.16 2001-01-14 08:59:59 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.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.
</p>
<p>
-This script has been written by Bill Fenner
-<<a href="mailto:fenner\@FreeBSD.org">fenner\@FreeBSD.org</a>>
-and improved by Henner Zeller
-<<a href="mailto:zeller\@think.de">zeller\@think.de</a>>,
-Henrik Nordström
-<<a href="mailto:hno\@hem.passagen.se">hno\@hem.passagen.se</a>>, and
-Ken Coar
-<<a href="mailto:Ken.Coar\@Golux.Com">Ken.Coar\@Golux.Com</a>>, then
-Akinori MUSHA <<a href="mailto:knu\@FreeBSD.org">knu\@FreeBSD.org</a>>
-brought it back to FreeBSD community and added more facilities;
-it is covered by the
-<a href="http://www.opensource.org/licenses/bsd-license.html">BSD-Licence</a>.
+This script has been written by Bill Fenner <<a
+href="mailto:fenner\@FreeBSD.org">fenner\@FreeBSD.org</a>> and
+improved by Henner Zeller <<a
+href="mailto:zeller\@think.de">zeller\@think.de</a>>, Henrik
+Nordström <<a
+href="mailto:hno\@hem.passagen.se">hno\@hem.passagen.se</a>>, and
+Ken Coar <<a
+href="mailto:Ken.Coar\@Golux.Com">Ken.Coar\@Golux.Com</a>>, then
+Akinori MUSHA <<a
+href="mailto:knu\@FreeBSD.org">knu\@FreeBSD.org</a>> brought it
+back to FreeBSD community and made further improvements; it is covered
+by the <a
+href="http://www.opensource.org/licenses/bsd-license.html">BSD-Licence</a>.
</p>
<p>
If you would like to use this CGI script on your own web server and
-CVS tree, see Zeller's
-<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>.
+CVS tree, download the latest version at <a
+href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/knu/">here</a>,
+and also check out Zeller's <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>
Please send any suggestions, comments, etc. to
diff --git a/en/cgi/cvsweb.conf-freebsd b/en/cgi/cvsweb.conf-freebsd
index bf3e856624..6a8f817111 100644
--- a/en/cgi/cvsweb.conf-freebsd
+++ b/en/cgi/cvsweb.conf-freebsd
@@ -2,8 +2,8 @@
#
# Set up for FreeBSD repo options.
#
-# $Id: cvsweb.conf-freebsd,v 1.6 2001-01-12 04:26:10 knu Exp $
-# $FreeBSD: www/en/cgi/cvsweb.conf-freebsd,v 1.5 2001/01/02 00:03:51 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.6 2001/01/12 04:26:10 knu Exp $
if ($uname eq 'FreeBSD') {
$ENV{'RCSLOCALID'} = 'FreeBSD=CVSHeader';
diff --git a/en/cgi/cvsweb.conf-netbsd b/en/cgi/cvsweb.conf-netbsd
index 0c50d81656..dfd7eed58b 100644
--- a/en/cgi/cvsweb.conf-netbsd
+++ b/en/cgi/cvsweb.conf-netbsd
@@ -2,8 +2,8 @@
#
# Set up for NetBSD repo options.
#
-# $Id: cvsweb.conf-netbsd,v 1.7 2001-01-12 04:26:10 knu Exp $
-# $FreeBSD: www/en/cgi/cvsweb.conf-netbsd,v 1.6 2001/01/02 00:03:51 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.7 2001/01/12 04:26:10 knu Exp $
if ($uname eq 'FreeBSD') {
$ENV{'RCSLOCALID'} = 'NetBSD=CVSHeader';
diff --git a/en/cgi/cvsweb.conf-openbsd b/en/cgi/cvsweb.conf-openbsd
index 4f25f114e1..135654029e 100644
--- a/en/cgi/cvsweb.conf-openbsd
+++ b/en/cgi/cvsweb.conf-openbsd
@@ -2,8 +2,8 @@
#
# Set up for OpenBSD repo options.
#
-# $Id: cvsweb.conf-openbsd,v 1.5 2001-01-12 04:26:10 knu Exp $
-# $FreeBSD: www/en/cgi/cvsweb.conf-openbsd,v 1.4 2001/01/02 00:03:51 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.5 2001/01/12 04:26:10 knu Exp $
if ($uname eq 'FreeBSD') {
$ENV{'RCSLOCALID'} = 'OpenBSD=CVSHeader';