rpms/cvsweb/FC-3 .cvsignore, 1.3, 1.4 cvsweb-fedora-config.patch, 1.1, 1.2 cvsweb.spec, 1.2, 1.3 sources, 1.3, 1.4

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/cvsweb/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17473/FC-3

Modified Files:
	.cvsignore cvsweb-fedora-config.patch cvsweb.spec sources 
Log Message:
3.0.5, don't run with mod_perl by default even if it is installed.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cvsweb/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Nov 2004 16:30:31 -0000	1.3
+++ .cvsignore	29 May 2005 09:08:37 -0000	1.4
@@ -1,2 +1 @@
-cvsweb-3.0.2.tar.gz
-cvsweb-3.0.4.tar.gz
+cvsweb-3.0.5.tar.gz

cvsweb-fedora-config.patch:

Index: cvsweb-fedora-config.patch
===================================================================
RCS file: /cvs/extras/rpms/cvsweb/FC-3/cvsweb-fedora-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cvsweb-fedora-config.patch	8 Nov 2004 04:12:41 -0000	1.1
+++ cvsweb-fedora-config.patch	29 May 2005 09:08:37 -0000	1.2
@@ -1,12 +1,14 @@
-diff -Naru cvsweb-3.0.2.orig/cvsweb.cgi cvsweb-3.0.2/cvsweb.cgi
---- cvsweb-3.0.2.orig/cvsweb.cgi	2004-08-20 21:28:44.000000000 +0300
-+++ cvsweb-3.0.2/cvsweb.cgi	2004-08-20 21:35:41.527868818 +0300
-@@ -208,17 +208,8 @@
- # Get rid of unsafe environment vars.  Don't do this in BEGIN...
+diff -Naru cvsweb-3.0.5.orig/cvsweb.cgi cvsweb-3.0.5/cvsweb.cgi
+--- cvsweb-3.0.5.orig/cvsweb.cgi	2005-01-22 14:43:55.000000000 +0200
++++ cvsweb-3.0.5/cvsweb.cgi	2005-04-11 20:27:52.545557318 +0300
+@@ -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') {
@@ -15,16 +17,19 @@
 -    last;
 -  }
 -}
+-
+-##### End of Configuration Area   ########
+-
 -undef $mydir;
 +# Path to the configuration file.
 +$config = '/etc/cvsweb/cvsweb.conf';
  
- # == Configuration defaults ==
- # Defaults for configuration variables that shouldn't need
-diff -Naru cvsweb-3.0.2.orig/cvsweb.conf cvsweb-3.0.2/cvsweb.conf
---- cvsweb-3.0.2.orig/cvsweb.conf	2004-08-10 23:13:40.000000000 +0300
-+++ cvsweb-3.0.2/cvsweb.conf	2004-08-20 21:35:35.912596956 +0300
-@@ -19,7 +19,7 @@
+ ######## Configuration parameters #########
+ 
+diff -Naru cvsweb-3.0.5.orig/cvsweb.conf cvsweb-3.0.5/cvsweb.conf
+--- cvsweb-3.0.5.orig/cvsweb.conf	2005-01-08 21:38:57.000000000 +0200
++++ cvsweb-3.0.5/cvsweb.conf	2005-04-11 20:28:43.252899470 +0300
+@@ -24,7 +24,7 @@
  #   cvsgraph (if you enable $allow_graph)
  #   enscript (if you enable $allow_enscript)
  #
@@ -33,7 +38,7 @@
  
  # Search the above directories for each command (prefer gtar over tar).
  #
-@@ -210,14 +210,14 @@
+@@ -226,14 +226,14 @@
  # check out the "mini" versions in the icons/ directory; they have a
  # width/height of 16/16.
  #
@@ -53,7 +58,7 @@
       graph   => [('[GRAPH]',  "$iconsdir/minigraph.png", 16,   16)],
  );
  undef $iconsdir;
-@@ -352,7 +352,7 @@
+@@ -368,7 +368,7 @@
  # The traditional mime.types file, eg. the one from Apache is fine.
  # See above where this gets used.
  #
@@ -62,7 +67,7 @@
  
  # 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
-@@ -491,7 +491,7 @@
+@@ -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.
  #
@@ -71,7 +76,7 @@
  
  # Options to pass to tar(1).
  # For example: @tar_options = qw(--ignore-failed-read);
-@@ -499,7 +499,7 @@
+@@ -526,7 +526,7 @@
  # Other useful options include "--owner=0" and "--group=0", see
  # the tar(1) (or gtar(1)) manpage for details.
  #
@@ -80,7 +85,7 @@
  
  # Options to pass to gzip(1) when compressing a tarball to download.
  # For example: @gzip_options = qw(-3);
-@@ -537,7 +537,7 @@
+@@ -564,7 +564,7 @@
  # To make annotate work against a read only repository, add -n, ie.:
  # @annotate_options = (@cvs_options, '-n');
  #
@@ -89,3 +94,12 @@
  
  # Options to pass to rcsdiff(1).
  # Probably the only useful one here is -q (suppress diagnostic output).
+@@ -641,7 +641,7 @@
+ # specific configuration without having to modify this "master" configuration
+ # file (except for enabling this functionality below :)
+ #
+-if (0) {
++if (1) {
+   my $confdir = catdir(dirname(__FILE__), 'conf.d');
+   if (opendir(CONFD, $confdir)) {
+     my @files = sort(map(catfile($confdir, $_), readdir(CONFD)));


Index: cvsweb.spec
===================================================================
RCS file: /cvs/extras/rpms/cvsweb/FC-3/cvsweb.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cvsweb.spec	27 Nov 2004 16:30:31 -0000	1.2
+++ cvsweb.spec	29 May 2005 09:08:37 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           cvsweb
-Version:        3.0.4
+Version:        3.0.5
 Release:        1
 Epoch:          0
 Summary:        Web interface for CVS repositories
@@ -7,7 +7,7 @@
 License:        BSD
 Group:          Development/Tools
 URL:            http://www.freebsd.org/projects/cvsweb.html
-Source0:        http://people.freebsd.org/~scop/cvsweb/cvsweb-3.0.4.tar.gz
+Source0:        http://people.freebsd.org/~scop/cvsweb/%{name}-%{version}.tar.gz
 Patch0:         %{name}-fedora-config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -40,8 +40,6 @@
   $RPM_BUILD_ROOT%{_sysconfdir}/cvsweb/cvsweb.conf
 install -dm 755 $RPM_BUILD_ROOT%{_datadir}/enscript/hl
 install -pm 644 enscript/lang_cvsweb*.st $RPM_BUILD_ROOT%{_datadir}/enscript/hl
-install -Dpm 644 samples/cvsweb-httpd.conf \
-  $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/zzz-cvsweb.conf
 install -Dpm 644 icons/minigraph.png \
   $RPM_BUILD_ROOT%{_localstatedir}/www/icons/small/minigraph.png
 
@@ -50,27 +48,22 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
-if [ $1 -eq 1 ] ; then
-  %{_initrddir}/httpd reload >/dev/null || :
-fi
-
-%postun
-%{_initrddir}/httpd reload >/dev/null || :
-
-
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog NEWS README TODO INSTALL
-%config(noreplace) %{_sysconfdir}/cvsweb
-%config %{_sysconfdir}/httpd/conf.d/zzz-cvsweb.conf
+%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/icons/small/minigraph.png
-%{_datadir}/enscript
+%{_datadir}/enscript/
 
 
 %changelog
+* Sun May 29 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:3.0.5-1
+- 3.0.5.
+- Install the sample httpd.conf as doc instead of into place; running
+  cvsweb with mod_perl does not play nicely with SELinux.
+
 * Sat Nov  6 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:3.0.4-1
 - Update to 3.0.4.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cvsweb/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Nov 2004 16:30:31 -0000	1.3
+++ sources	29 May 2005 09:08:37 -0000	1.4
@@ -1 +1 @@
-c77280df12609b9270ec13172ef49a8c  cvsweb-3.0.4.tar.gz
+572dbb2d66ad6487c0a3536f93023086  cvsweb-3.0.5.tar.gz