===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 4.26
retrieving revision 4.30
diff -u -p -r4.26 -r4.30
--- cvsweb/cvsweb.cgi	2019/11/26 12:04:55	4.26
+++ cvsweb/cvsweb.cgi	2019/11/29 14:29:48	4.30
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: cvsweb.cgi,v 4.26 2019/11/26 12:04:55 schwarze Exp $
+# $Id: cvsweb.cgi,v 4.30 2019/11/29 14:29:48 schwarze Exp $
 # $knu: cvsweb.cgi,v 1.299 2010/11/13 16:37:18 simon
 #
 # cvsweb - a CGI interface to CVS trees.
@@ -57,7 +57,7 @@ use vars qw (
   $VERSION $CheckoutMagic $MimeTypes $DEBUG
   $config $allow_version_select
   @CVSrepositories @CVSROOT %CVSROOT %CVSROOTdescr
-  %MIRRORS %DEFAULTVALUE %ICONS %MTYPES
+  %DEFAULTVALUE %ICONS %MTYPES
   %DIFF_COMMANDS @DIFFTYPES %DIFFTYPES @LOGSORTKEYS %LOGSORTKEYS
   %alltags %fileinfo %tags @branchnames %nameprinted
   %symrev %revsym @allrevisions %date %author @revdisplayorder
@@ -67,8 +67,7 @@ use vars qw (
   $is_links $is_lynx $is_w3m $is_msie $is_mozilla3 $is_textbased
   %input $query $barequery $sortby $bydate $byrev $byauthor
   $bylog $byfile $defaultDiffType $logsort $cvstree $cvsroot
-  $charset $output_filter
-  @command_path %CMD $allow_compress $backicon $diricon $fileicon
+  $charset $output_filter %CMD $allow_compress $backicon $diricon $fileicon
   $fullname $logo $defaulttitle $address $binfileicon
   $long_intro $short_instruction $shortLogLen $show_author
   $tablepadding $hr_breakable $showfunc $hr_ignwhite $hr_ignkeysubst
@@ -79,7 +78,7 @@ use vars qw (
   $tabstop $state $annTable $sel @ForbiddenFiles
   $use_descriptions %descriptions $dwhere
   $use_moddate $gzip_open $file_list_len
-  $allow_tar @tar_options @gzip_options @cvs_options
+  $allow_tar @tar_options @cvs_options
   @annotate_options @rcsdiff_options
   $HTML_DOCTYPE $HTML_META $cssurl $CSS
 );
@@ -129,6 +128,8 @@ EOM
   $MimeTypes = undef if $@;
 
   $CheckoutMagic = '~checkout~';
+  $CMD{$_} = "/usr/bin/$_" for (qw(cvs rcsdiff rlog));
+  $CMD{tar} = "/bin/tar";
 }
 
 # -----------------------------------------------------------------------------
@@ -167,7 +168,6 @@ sub plural_write($$);
 sub readableTime($$);
 sub clickablePath($$);
 sub chooseCVSRoot();
-sub chooseMirror();
 sub fileSortCmp();
 sub download_url($$;$);
 sub download_link($$$;$);
@@ -195,7 +195,7 @@ $config = '/conf/cvsweb/cvsweb.conf';
 
 ######## Configuration parameters #########
 
-@CVSrepositories = @CVSROOT = %CVSROOT = %MIRRORS = %DEFAULTVALUE = %ICONS =
+@CVSrepositories = @CVSROOT = %CVSROOT = %DEFAULTVALUE = %ICONS =
   %MTYPES = %tags = %alltags = %fileinfo = %DIFF_COMMANDS = ();
 
 $logo = $defaulttitle =
@@ -645,12 +645,8 @@ if ($input{tarball}) {
           'You cannot download the top level directory.');
   }
 
-  my $istar = $ext eq '.tar.gz' || $ext eq '.tgz';
-  if ($istar) {
-    fatal('500 Internal Error', 'tar command not found.') unless $CMD{tar};
-    fatal('500 Internal Error', 'gzip command not found.') unless $CMD{gzip};
-  } else {
-    fatal('500 Internal Error', 'Unsupported archive type.');
+  unless ($ext eq '.tar.gz' || $ext eq '.tgz') {
+    fatal('404 Not Found', 'Unsupported archive type.');
   }
 
   my $tmpexportdir;
@@ -682,24 +678,13 @@ if ($input{tarball}) {
       ('500 Internal Error',
        'Export failure (exit status %s), output: <pre>%s</pre>',
        $errcode, $err || $export_err);
-
   } else {
-
     $| = 1;    # Essential to get the buffering right.
     local (*TAR_OUT);
-
-    my (@cmd, $ctype);
-    if ($istar) {
-      my @tar = ($CMD{tar}, @tar_options, '-cf', '-', $basedir);
-      my @gzip = ($CMD{gzip}, @gzip_options, '-c');
-      push(@cmd, \@tar, '|', \@gzip);
-      $ctype = 'application/x-gzip';
-    }
-    push(@cmd, '>pipe', \*TAR_OUT);
-
-    my ($h, $err) = startproc(@cmd);
+    my ($h, $err) = startproc($CMD{tar}, @tar_options, '-czf', '-',
+      $basedir, '>pipe', \*TAR_OUT);
     if ($h) {
-      print "Content-Type: $ctype\r\n\r\n";
+      print "Content-Type: application/x-gzip\r\n\r\n";
       local $/ = undef;
       print <TAR_OUT>;
       $h->finish();
@@ -788,9 +773,7 @@ if (-d $fullname) {
 
   # give direct access to dirs
   if ($where eq '/') {
-    chooseMirror();
     chooseCVSRoot();
-
   } else {
     print '<p>Current directory: <b>', clickablePath($where, 0), '</b>';
     print "</p>\n";
@@ -1097,8 +1080,7 @@ EOF
 
   if ($allow_tar && $filesfound) {
     my ($basefile) = ($where =~ m,(?:.*/)?([^/]+),);
-    my $havetar = $CMD{tar} && $CMD{gzip};
-    if (defined($basefile) && $basefile ne '' && $havetar) {
+    if (defined($basefile) && $basefile ne '') {
       my $q = ($query ? "$query;" : '?') . 'tarball=1';
       print "<hr />\n",
         '<div style="text-align: center">Download this directory in ';
@@ -1575,20 +1557,6 @@ sub safeglob($)
 
 
 #
-# Searches @command_path for the given executable file.
-#
-sub search_path($)
-{
-  my ($command) = @_;
-  for my $d (@command_path) {
-    my $cmd = catfile($d, $command);
-    return $cmd if (-x $cmd && !-d _);
-  }
-  return '';
-}
-
-
-#
 # Gets the MIME type for the given file name.
 #
 sub getMimeType($;$)
@@ -2427,10 +2395,9 @@ sub getDirLogs($$@)
 
   if ($linesread == 0) {
     fatal('500 Internal Error',
-          'Failed to spawn GNU rlog on <em>"%s"</em>.<br /><br />Did you set the <b><code>@command_path</code></b> in your configuration file correctly? (Currently: "<code>%s</code>")',
-          htmlquote(join(', ', @files)), join(':', @command_path));
+          'Failed to spawn rlog on <em>"%s"</em>',
+          htmlquote(join(', ', @files)));
   }
-
   return @unreadable;
 }
 
@@ -3479,27 +3446,6 @@ Module path or alias:
 </p>
 </form>
 EOF
-}
-
-
-sub chooseMirror()
-{
-  # This code comes from the original BSD-cvsweb
-  # and may not be useful for your site; If you don't
-  # set %MIRRORS this won't show up, anyway.
-  scalar(%MIRRORS) or return;
-
-  # Should perhaps exclude the current site somehow...
-  print "\n<p>\nThis CVSweb is mirrored in\n";
-
-  my @tmp = map(&link(htmlquote($_), $MIRRORS{$_}), sort keys %MIRRORS);
-  my $tmp = pop (@tmp);
-
-  if (scalar(@tmp)) {
-    print join (', ', @tmp), ' and ';
-  }
-
-  print "$tmp.\n</p>\n";
 }