4edef92
diff -Naru cvsweb-3.0.5.orig/cvsweb.cgi cvsweb-3.0.5/cvsweb.cgi
4edef92
--- cvsweb-3.0.5.orig/cvsweb.cgi	2005-01-22 14:43:55.000000000 +0200
4edef92
+++ cvsweb-3.0.5/cvsweb.cgi	2005-04-11 20:27:52.545557318 +0300
4edef92
@@ -208,22 +208,8 @@
4edef92
 # (think mod_perl)...
cvsextras 9dbb60a
 delete(@ENV{qw(PATH IFS CDPATH ENV BASH_ENV)});
cvsextras 9dbb60a
 
cvsextras 9dbb60a
-my ($mydir) = (dirname($0) =~ /(.*)/);    # untaint
cvsextras 9dbb60a
-
4edef92
-##### Start of Configuration Area ########
4edef92
-
cvsextras 9dbb60a
-# == EDIT this ==
cvsextras 9dbb60a
-# Locations to search for user configuration, in order:
cvsextras 9dbb60a
-for (catfile($mydir, 'cvsweb.conf'), '/usr/local/etc/cvsweb/cvsweb.conf') {
cvsextras 9dbb60a
-  if (-r $_) {
cvsextras 9dbb60a
-    $config = $_;
cvsextras 9dbb60a
-    last;
cvsextras 9dbb60a
-  }
cvsextras 9dbb60a
-}
4edef92
-
4edef92
-##### End of Configuration Area   ########
4edef92
-
cvsextras 9dbb60a
-undef $mydir;
cvsextras 9dbb60a
+# Path to the configuration file.
cvsextras 9dbb60a
+$config = '/etc/cvsweb/cvsweb.conf';
cvsextras 9dbb60a
 
4edef92
 ######## Configuration parameters #########
4edef92
 
4edef92
diff -Naru cvsweb-3.0.5.orig/cvsweb.conf cvsweb-3.0.5/cvsweb.conf
4edef92
--- cvsweb-3.0.5.orig/cvsweb.conf	2005-01-08 21:38:57.000000000 +0200
4edef92
+++ cvsweb-3.0.5/cvsweb.conf	2005-04-11 20:28:43.252899470 +0300
4edef92
@@ -24,7 +24,7 @@
cvsextras 9dbb60a
 #   cvsgraph (if you enable $allow_graph)
cvsextras 9dbb60a
 #   enscript (if you enable $allow_enscript)
cvsextras 9dbb60a
 #
cvsextras 9dbb60a
-@command_path = qw(/bin /usr/bin /usr/local/bin);
cvsextras 9dbb60a
+@command_path = qw(/bin /usr/bin);
cvsextras 9dbb60a
 
cvsextras 9dbb60a
 # Search the above directories for each command (prefer gtar over tar).
cvsextras 9dbb60a
 #
4edef92
@@ -226,14 +226,14 @@
cvsextras 9dbb60a
 # check out the "mini" versions in the icons/ directory; they have a
cvsextras 9dbb60a
 # width/height of 16/16.
cvsextras 9dbb60a
 #
cvsextras 9dbb60a
-my $iconsdir = '/icons';
cvsextras 9dbb60a
+my $iconsdir = '/icons/small';
cvsextras 9dbb60a
 
cvsextras 9dbb60a
 # format:          TEXT       ICON-URL                  width height
cvsextras 9dbb60a
 %ICONS = (
cvsextras 9dbb60a
-     back    => [('[BACK]',   "$iconsdir/back.gif",      20,   22)],
cvsextras 9dbb60a
-     dir     => [('[DIR]',    "$iconsdir/dir.gif",       20,   22)],
cvsextras 9dbb60a
-     file    => [('[TXT]',    "$iconsdir/text.gif",      20,   22)],
cvsextras 9dbb60a
-     binfile => [('[BIN]',    "$iconsdir/binary.gif",    20,   22)],
cvsextras 9dbb60a
+     back    => [('[BACK]',   "$iconsdir/back.gif",      16,   16)],
cvsextras 9dbb60a
+     dir     => [('[DIR]',    "$iconsdir/dir.gif",       16,   16)],
cvsextras 9dbb60a
+     file    => [('[TXT]',    "$iconsdir/text.gif",      16,   16)],
cvsextras 9dbb60a
+     binfile => [('[BIN]',    "$iconsdir/binary.gif",    16,   16)],
cvsextras 9dbb60a
      graph   => [('[GRAPH]',  "$iconsdir/minigraph.png", 16,   16)],
cvsextras 9dbb60a
 );
cvsextras 9dbb60a
 undef $iconsdir;
4edef92
@@ -368,7 +368,7 @@
cvsextras 9dbb60a
 # The traditional mime.types file, eg. the one from Apache is fine.
cvsextras 9dbb60a
 # See above where this gets used.
cvsextras 9dbb60a
 #
cvsextras 9dbb60a
-$mime_types = '/usr/local/etc/apache/mime.types';
cvsextras 9dbb60a
+$mime_types = '/etc/mime.types';
cvsextras 9dbb60a
 
cvsextras 9dbb60a
 # Charset appended to the Content-Type HTTP header for text/* MIME types.
cvsextras 9dbb60a
 # Note that the web server may default to some charset which may take effect
4edef92
@@ -518,7 +518,7 @@
cvsextras 9dbb60a
 # versions, the user account running CVSweb needs write access to
cvsextras 9dbb60a
 # CVSROOT/val-tags.  See also the tar, gzip and zip options below.
cvsextras 9dbb60a
 #
cvsextras 9dbb60a
-#$allow_tar = (($CMD{tar} && $CMD{gzip}) || $CMD{zip}) ? 1 : 0;
cvsextras 9dbb60a
+$allow_tar = (($CMD{tar} && $CMD{gzip}) || $CMD{zip}) ? 1 : 0;
cvsextras 9dbb60a
 
cvsextras 9dbb60a
 # Options to pass to tar(1).
cvsextras 9dbb60a
 # For example: @tar_options = qw(--ignore-failed-read);
4edef92
@@ -526,7 +526,7 @@
cvsextras 9dbb60a
 # Other useful options include "--owner=0" and "--group=0", see
cvsextras 9dbb60a
 # the tar(1) (or gtar(1)) manpage for details.
cvsextras 9dbb60a
 #
cvsextras 9dbb60a
-@tar_options = qw();
cvsextras 9dbb60a
+@tar_options = qw(--owner=0 --group=0);
cvsextras 9dbb60a
 
cvsextras 9dbb60a
 # Options to pass to gzip(1) when compressing a tarball to download.
cvsextras 9dbb60a
 # For example: @gzip_options = qw(-3);
4edef92
@@ -564,7 +564,7 @@
cvsextras 9dbb60a
 # To make annotate work against a read only repository, add -n, ie.:
cvsextras 9dbb60a
 # @annotate_options = (@cvs_options, '-n');
cvsextras 9dbb60a
 #
cvsextras 9dbb60a
-@annotate_options = @cvs_options;
cvsextras 9dbb60a
+@annotate_options = (@cvs_options, '-n');
cvsextras 9dbb60a
 
cvsextras 9dbb60a
 # Options to pass to rcsdiff(1).
cvsextras 9dbb60a
 # Probably the only useful one here is -q (suppress diagnostic output).
4edef92
@@ -641,7 +641,7 @@
4edef92
 # specific configuration without having to modify this "master" configuration
4edef92
 # file (except for enabling this functionality below :)
4edef92
 #
4edef92
-if (0) {
4edef92
+if (1) {
4edef92
   my $confdir = catdir(dirname(__FILE__), 'conf.d');
4edef92
   if (opendir(CONFD, $confdir)) {
4edef92
     my @files = sort(map(catfile($confdir, $_), readdir(CONFD)));