This commit was manufactured by cvs2git to create branch 'unlabeled-1.43.2'.

Sprout from master 2006-10-27 18:26:56 UTC Jakub Bogusz <qboosh@pld-linux.org> '- updated dep for /usr/lib/cgi-bin dir (FHS -> filesystem); release 3'
Delete:
    cvsweb-apache.conf
    cvsweb-config.patch
    cvsweb-emptyscript.patch

diff --git a/cvsweb-apache.conf b/cvsweb-apache.conf
deleted file mode 100644 (file)
index 3c80dd9..0000000
--- a/cvsweb-apache.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-
-<Directory /usr/share/cvsweb>
-       AllowOverride None
-       Allow from all
-</Directory>
-
-# Version1 (default): under /cgi-bin/cvsweb.cgi address
-ScriptAlias /cgi-bin/cvsweb.cgi /usr/lib/cgi-bin/cvsweb.cgi
-Alias /cvsweb/ /usr/share/cvsweb/
-<Location /cgi-bin/cvsweb.cgi>
-       Allow from all
-
-       # See also $charset in cvsweb.conf.
-       #AddDefaultCharset UTF-8
-
-       # if using apache2 mod_perl:
-#      <IfModule mod_perl.c>
-#              SetHandler perl-script
-#              PerlResponseHandler ModPerl::Registry
-#              PerlOptions +ParseHeaders
-#              Options ExecCGI
-#      </IfModule>
-</Location>
-
-# Version 2: cvsweb as handler to whole vhost:
-#<VirtualHost *:80>
-#      ServerName cvs
-#
-#      Alias /cvsweb/ /usr/share/cvsweb/
-#      DocumentRoot /usr/lib/cgi-bin/cvsweb.cgi
-#      <Location />
-#              Options ExecCGI
-#              Allow from all
-#      </Location>
-#</VirtualHost>

diff --git a/cvsweb-config.patch b/cvsweb-config.patch
deleted file mode 100644 (file)
index 2a7d396..0000000
--- a/cvsweb-config.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff -Nur cvsweb-3.0.1/cvsweb.cgi cvsweb-3.0.1.new/cvsweb.cgi
---- cvsweb-3.0.1/cvsweb.cgi    2004-05-08 16:13:40.000000000 +0200
-+++ cvsweb-3.0.1.new/cvsweb.cgi        2004-08-19 14:06:58.000000000 +0200
-@@ -214,7 +214,7 @@
- 
- # == EDIT this ==
- # Locations to search for user configuration, in order:
--for (catfile($mydir, 'cvsweb.conf'), '/usr/local/etc/cvsweb/cvsweb.conf') {
-+for (catfile($mydir, 'cvsweb.conf'), '/etc/webapps/cvsweb/cvsweb.conf') {
-   if (-r $_) {
-     $config = $_;
-     last;
-diff -Nur cvsweb-3.0.1/cvsweb.conf cvsweb-3.0.1.new/cvsweb.conf
---- cvsweb-3.0.1/cvsweb.conf   2004-05-05 01:40:50.000000000 +0200
-+++ cvsweb-3.0.1.new/cvsweb.conf       2004-08-19 14:08:34.000000000 +0200
-@@ -19,7 +19,7 @@
- #   cvsgraph (if you enable $allow_graph)
- #   enscript (if you enable $allow_enscript)
- #
--@command_path = qw(/bin /usr/bin /usr/local/bin);
-+@command_path = qw(/bin /usr/bin);
- 
- # Search the above directories for each command (prefer gtar over tar).
- #
-@@ -47,7 +47,7 @@
- # 'symbolic_name' => ['Name to display',  '/path/to/cvsroot']
- #
- @CVSrepositories = (
--        'local'   => ['Local Repository', '/var/cvs'],
-+        'local'   => ['Local Repository', '/home/services/cvsroot'],
- #       'freebsd' => ['FreeBSD',          '/var/ncvs'],
- #       'openbsd' => ['OpenBSD',          '/var/ncvs'],
- #       'netbsd'  => ['NetBSD',           '/var/ncvs'],
-@@ -62,7 +62,7 @@
- # For example:
- #
- #$cvstreedefault = $CVSrepositories[2 * 0];
--#$cvstreedefault = 'local';
-+$cvstreedefault = 'local';
- 
- # Bug tracking system linking options ("PR" means Problem Report, as in GNATS)
- #
-@@ -86,7 +86,7 @@
- # Manual gateway linking.
- #
- $mancgi =
--    "http://www.FreeBSD.org/cgi/man.cgi?apropos=0&sektion=%s&query=%s&manpath=FreeBSD+5.0-current&format=html";
-+    "http://www.FreeBSD.org/cgi/man.cgi?apropos=0&sektion=%s&query=%s&manpath=FreeBSD+5.2-current&format=html";
- 
- # Defaults for user options.
- #
-@@ -202,7 +202,7 @@
- # check out the "mini" versions in the icons/ directory; they have a
- # width/height of 16/16.
- #
--my $iconsdir = '/icons';
-+my $iconsdir = '/cvsweb/icons';
- 
- # format:          TEXT       ICON-URL                  width height
- %ICONS = (
-@@ -216,7 +216,7 @@
- 
- # An URL where to find the CSS.
- #
--$cssurl = '/css/cvsweb.css';
-+$cssurl = '/cvsweb/css/cvsweb.css';
- 
- # The length to which the last log entry should be truncated when shown
- # in the directory view.
-@@ -344,7 +344,7 @@
- # The traditional mime.types file, eg. the one from Apache is fine.
- # See above where this gets used.
- #
--$mime_types = '/usr/local/etc/apache/mime.types';
-+$mime_types = '/etc/mime.types';
- 
- # Charset appended to the Content-Type HTTP header for text/* MIME types.
- # Note that the web server may default to some charset which may take effect
-@@ -470,7 +470,7 @@
- # settings in the configuration file with command line options, see
- # doGraph() and doGraphView() in cvsweb.cgi for details.
- #
--#$cvsgraph_config = "/etc/cvsgraph.conf";
-+#$cvsgraph_config = "/etc/cvsgraph/cvsgraph.conf";
- 
- # URL to the CVSHistory script.  This should be absolute (but does not need
- # to include the host and port if the script is on the same server as
-@@ -610,6 +600,7 @@
-    'nroff'        => qr/\.man$/o,
-    'pascal'       => qr/\.p(as|p)?$/io,
-    'perl'         => qr/\.p(m|(er)?l)$/io,
-+   'php'          => qr/\.php$/io,
-    'postscript'   => qr/\.e?ps$/io,
-    'python'       => qr/\.py$/o,
-    'rfc'          => qr/\b((rfc|draft)\..*\.txt)$/o,

diff --git a/cvsweb-emptyscript.patch b/cvsweb-emptyscript.patch
deleted file mode 100644 (file)
index 23c0563..0000000
--- a/cvsweb-emptyscript.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-fix for cases when SCRIPT_NAME is empty, ie the cvsweb script is handler to whole vhost:
-
-<VirtualHost *:80>
-    ServerName cvs
-
-    DocumentRoot /usr/share/cvsweb/cvsweb.cgi
-    <Location />
-        Options ExecCGI
-    </Location>
-</VirtualHost>
-
---- cvsweb-3.0.6/cvsweb.cgi    2006-01-09 23:56:57.000000000 +0200
-+++ /tmp/cvsweb.cgi    2006-01-10 00:59:36.000000000 +0200
-@@ -299,7 +299,7 @@
- $where         =  $pathinfo;
- $doCheckout    =  $where =~ s|^/$CheckoutMagic/|/|o;
- $where         =~ s|^/||;
--$scriptname    =~ s|^/*|/|;
-+$scriptname    =~ s|^/*|/| if $scriptname;
- 
- # Let's workaround thttpd's stupidity..
- if ($scriptname =~ m|/$|) {