rpms/cvsweb/devel cvsweb-3.0.6-fedora-config.patch, NONE, 1.1 cvsweb.spec, 1.7, 1.8 cvsweb-fedora-config.patch, 1.2, NONE
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Sun Jan 8 22:55:34 UTC 2006
Author: scop
Update of /cvs/extras/rpms/cvsweb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30502
Modified Files:
cvsweb.spec
Added Files:
cvsweb-3.0.6-fedora-config.patch
Removed Files:
cvsweb-fedora-config.patch
Log Message:
* Mon Jan 9 2006 Ville Skyttä <ville.skytta at iki.fi> - 3.0.6-2
- Use enscript by default if it's installed (enscript >= 1.6.3 in FC5+).
- Fix cvsweb.css permissions.
cvsweb-3.0.6-fedora-config.patch:
--- NEW FILE cvsweb-3.0.6-fedora-config.patch ---
--- cvsweb-3.0.6/cvsweb.conf.fedora-config 2005-06-19 12:13:50.000000000 +0300
+++ cvsweb-3.0.6/cvsweb.conf 2006-01-09 00:34:39.000000000 +0200
@@ -24,7 +24,7 @@
# cvsgraph (if you enable $allow_graph)
# enscript (if you enable $allow_enscript)
#
- at command_path = qw(/bin /usr/bin /usr/local/bin);
+ at command_path = qw(/bin /usr/bin);
# Search the above directories for each command (prefer gtar over tar).
#
@@ -226,14 +226,14 @@
# check out the "mini" versions in the icons/ directory; they have a
# width/height of 16/16.
#
-my $iconsdir = '/icons';
+my $iconsdir = '/icons/small';
# format: TEXT ICON-URL width height
%ICONS = (
- back => [('[BACK]', "$iconsdir/back.gif", 20, 22)],
- dir => [('[DIR]', "$iconsdir/dir.gif", 20, 22)],
- file => [('[TXT]', "$iconsdir/text.gif", 20, 22)],
- binfile => [('[BIN]', "$iconsdir/binary.gif", 20, 22)],
+ back => [('[BACK]', "$iconsdir/back.gif", 16, 16)],
+ dir => [('[DIR]', "$iconsdir/dir.gif", 16, 16)],
+ file => [('[TXT]', "$iconsdir/text.gif", 16, 16)],
+ binfile => [('[BIN]', "$iconsdir/binary.gif", 16, 16)],
graph => [('[GRAPH]', "$iconsdir/minigraph.png", 16, 16)],
);
undef $iconsdir;
@@ -368,7 +368,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
@@ -518,7 +518,7 @@
# versions, the user account running CVSweb needs write access to
# CVSROOT/val-tags. See also the tar, gzip and zip options below.
#
-#$allow_tar = (($CMD{tar} && $CMD{gzip}) || $CMD{zip}) ? 1 : 0;
+$allow_tar = (($CMD{tar} && $CMD{gzip}) || $CMD{zip}) ? 1 : 0;
# Options to pass to tar(1).
# For example: @tar_options = qw(--ignore-failed-read);
@@ -526,7 +526,7 @@
# Other useful options include "--owner=0" and "--group=0", see
# the tar(1) (or gtar(1)) manpage for details.
#
- at tar_options = qw();
+ at tar_options = qw(--owner=0 --group=0);
# Options to pass to gzip(1) when compressing a tarball to download.
# For example: @gzip_options = qw(-3);
@@ -564,7 +564,7 @@
# To make annotate work against a read only repository, add -n, ie.:
# @annotate_options = (@cvs_options, '-n');
#
- at annotate_options = @cvs_options;
+ at annotate_options = (@cvs_options, '-n');
# Options to pass to rcsdiff(1).
# Probably the only useful one here is -q (suppress diagnostic output).
@@ -574,7 +574,7 @@
# Enables syntax highlighting using GNU Enscript if set.
# You will need GNU Enscript version 1.6.3 or newer for this to work.
#
-#$allow_enscript = $CMD{enscript} ? 1 : 0;
+$allow_enscript = $CMD{enscript} ? 1 : 0;
# Options to pass to enscript(1).
# Do not set the -q, --language, -o or --highlight options here.
@@ -639,9 +639,9 @@
# Enable this to let CVSweb load extra configuration files from the "conf.d"
# subdirectory of the directory this file is located in. This enables site
# specific configuration without having to modify this "master" configuration
-# file (except for enabling this functionality below :)
+# file.
#
-if (0) {
+if (1) {
my $confdir = catdir(dirname(__FILE__), 'conf.d');
if (opendir(CONFD, $confdir)) {
my @files = sort(map(catfile($confdir, $_), readdir(CONFD)));
--- cvsweb-3.0.6/cvsweb.cgi.fedora-config 2005-09-25 23:28:51.000000000 +0300
+++ cvsweb-3.0.6/cvsweb.cgi 2006-01-09 00:33:32.000000000 +0200
@@ -208,22 +208,8 @@
# (think mod_perl)...
delete(@ENV{qw(PATH IFS CDPATH ENV BASH_ENV)});
-my ($mydir) = (dirname($0) =~ /(.*)/); # untaint
-
-##### Start of Configuration Area ########
-
-# == EDIT this ==
-# Locations to search for user configuration, in order:
-for (catfile($mydir, 'cvsweb.conf'), '/usr/local/etc/cvsweb/cvsweb.conf') {
- if (-r $_) {
- $config = $_;
- last;
- }
-}
-
-##### End of Configuration Area ########
-
-undef $mydir;
+# Path to the configuration file.
+$config = '/etc/cvsweb/cvsweb.conf';
######## Configuration parameters #########
Index: cvsweb.spec
===================================================================
RCS file: /cvs/extras/rpms/cvsweb/devel/cvsweb.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cvsweb.spec 25 Sep 2005 21:02:24 -0000 1.7
+++ cvsweb.spec 8 Jan 2006 22:55:34 -0000 1.8
@@ -1,13 +1,13 @@
Name: cvsweb
Version: 3.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Web interface for CVS repositories
License: BSD
Group: Development/Tools
URL: http://www.freebsd.org/projects/cvsweb.html
Source0: http://people.freebsd.org/~scop/cvsweb/%{name}-%{version}.tar.gz
-Patch0: %{name}-fedora-config.patch
+Patch0: %{name}-3.0.6-fedora-config.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -34,7 +34,7 @@
rm -rf $RPM_BUILD_ROOT
install -Dpm 755 cvsweb.cgi \
$RPM_BUILD_ROOT%{_localstatedir}/www/cgi-bin/cvsweb.cgi
-install -Dpm 755 css/cvsweb.css \
+install -Dpm 644 css/cvsweb.css \
$RPM_BUILD_ROOT%{_localstatedir}/www/html/css/cvsweb.css
install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/cvsweb/conf.d
install -pm 644 cvsweb.conf $RPM_BUILD_ROOT%{_sysconfdir}/cvsweb
@@ -53,12 +53,16 @@
%doc ChangeLog NEWS README TODO INSTALL samples/cvsweb-httpd.conf
%config(noreplace) %{_sysconfdir}/cvsweb/
%{_localstatedir}/www/cgi-bin/cvsweb.cgi
-%{_localstatedir}/www/html/css
+%{_localstatedir}/www/html/css/
%{_localstatedir}/www/icons/small/minigraph.png
%{_datadir}/enscript/
%changelog
+* Mon Jan 9 2006 Ville Skyttä <ville.skytta at iki.fi> - 3.0.6-2
+- Use enscript by default if it's installed (enscript >= 1.6.3 in FC5+).
+- Fix cvsweb.css permissions.
+
* Sun Sep 25 2005 Ville Skyttä <ville.skytta at iki.fi> - 3.0.6-1
- 3.0.6.
--- cvsweb-fedora-config.patch DELETED ---
More information about the fedora-extras-commits
mailing list