Compare commits

..

29 commits

Author SHA1 Message Date
Bojan Smojver
6d350b6e4f Bump up to 1.1.14.
Conflicts:
	viewvc.spec
2012-06-13 10:28:48 +10:00
Bojan Smojver
81bdb98a5e Merge branch 'master' into el4
Conflicts:
	.gitignore
	sources
	viewvc.spec
2012-01-24 15:40:34 +11:00
Bojan Smojver
a03fa0b592 Bump up to 1.1.12.
Conflicts:

	viewvc.spec
2011-11-04 10:35:28 +11:00
Bojan Smojver
6324a16288 Merge branch 'master' into el4
Conflicts:
	viewvc.spec
2011-06-03 10:31:51 +10:00
Bojan Smojver
d5ec7497e3 Bump for rebuild. 2011-05-18 16:13:56 +10:00
Bojan Smojver
ac63f734ba Remove duplicate section in conf. 2011-05-18 16:12:49 +10:00
Bojan Smojver
914dab69dc OOPS! Merged httpd package bit by mistake. 2011-05-18 15:58:24 +10:00
Bojan Smojver
8890a8cb65 Merge branch 'master' into el4
Conflicts:
	.gitignore
	sources
	viewvc.spec
2011-05-18 15:54:52 +10:00
Bojan Smojver
e94fee2c0c Bump up to 1.1.10. 2011-03-16 13:44:01 +11:00
Bojan Smojver
539551c6ca Bump up to 1.1.9.
Allow access to templates from localhost.
2011-03-08 09:57:03 +11:00
Bojan Smojver
2bc4d52990 Fix sources. 2010-12-07 10:23:50 +11:00
Bojan Smojver
9d9cd663e1 Bump up to 1.1.8. 2010-12-07 10:01:02 +11:00
Fedora Release Engineering
734e5f9004 dist-git conversion 2010-07-29 14:58:36 +00:00
97d10782f9 Bump up to 1.1.6. 2010-06-02 23:14:35 +00:00
168fd540ca Fix upstream issue #454. 2010-05-25 08:53:54 +00:00
4eab227705 Anything below 1.1.0 should be obsoleted by viewvc-httpd. 2010-03-31 21:43:22 +00:00
e91b9f1911 Pull in viewvc-httpd on upgrade from 1.0.x. 2010-03-31 20:54:06 +00:00
3ccf05a027 Bump up to 1.1.5. 2010-03-29 20:50:45 +00:00
aff7858df0 Bump up to 1.1.4. 2010-03-11 03:04:05 +00:00
80c771a8c2 Really add README.httpd 2010-02-02 02:35:16 +00:00
2491177af5 Fix sources. 2010-02-02 02:32:00 +00:00
c77c2701d5 Bump up to 1.1.3 (supported branch). Patch upstream issue #445. 2010-02-02 02:27:39 +00:00
Bill Nottingham
8b51db1448 Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-26 01:13:48 +00:00
5fd9626a17 Bump up to 1.0.9. Two security fixes. 2009-08-11 22:26:33 +00:00
7b18d03192 Bump up to 1.0.8. 2009-05-07 06:58:40 +00:00
5c264bc93b Bump up to 1.0.7. 2008-10-14 23:46:35 +00:00
d6f8129408 Bump up to 1.0.6. 2008-09-19 00:31:58 +00:00
b5e0aa9cae Bump up to 1.0.5. 2008-02-28 22:12:24 +00:00
0fd8832889 Initialize branch EL-4 for viewvc 2007-12-19 02:15:56 +00:00
7 changed files with 325 additions and 1 deletions

9
.gitignore vendored Normal file
View file

@ -0,0 +1,9 @@
viewvc-1.1.6.tar.gz
/viewvc-1.1.7.tar.gz
/viewvc-1.1.8.tar.gz
/viewvc-1.1.9.tar.gz
/viewvc-1.1.10.tar.gz
/viewvc-1.1.11.tar.gz
/viewvc-1.1.12.tar.gz
/viewvc-1.1.13.tar.gz
/viewvc-1.1.14.tar.gz

2
README.httpd Normal file
View file

@ -0,0 +1,2 @@
In order to run ViewVC under Apache and mod_python, you must install
viewvc-httpd package.

View file

@ -1 +0,0 @@
Python 2 is being removed, so retire this package.

1
sources Normal file
View file

@ -0,0 +1 @@
ba8af23f4a524625441840f779c30086 viewvc-1.1.14.tar.gz

49
viewvc-lexer-mimetypes.py Executable file
View file

@ -0,0 +1,49 @@
#!/usr/bin/python
import sys
import re
from pygments.lexers import get_all_lexers
for fullname, names, exts, mimetype in get_all_lexers():
if len(exts) > len(mimetype):
for j in range(len(mimetype)):
line=0
for i in range(len(exts)):
if re.match('\*\.',exts[i]):
if i == 0:
print mimetype[j],
line=1
if re.search('\[[0-9]+\]',exts[i]):
s=re.search('\[[0-9]+\]',exts[i]).span()[0]+1
e=re.search('\[[0-9]+\]',exts[i]).span()[1]-1
for k in range(s,e):
print exts[i][2:s-1]+exts[i][k]+exts[i][e+1:],
else:
print exts[i][2:],
if line==1 and i == len(exts)-1:
print
elif len(exts) == 1:
for i in range(len(mimetype)):
if re.match('\*\.',exts[0]):
if re.search('\[[0-9]+\]',exts[0]):
s=re.search('\[[0-9]+\]',exts[0]).span()[0]+1
e=re.search('\[[0-9]+\]',exts[0]).span()[1]-1
print mimetype[i],
for k in range(s,e):
print exts[0][2:s-1]+exts[0][k]+exts[0][e+1:],
print
else:
print mimetype[i], exts[0][2:]
else:
for i in range(len(mimetype)):
if len(exts) > i:
if re.match('\*\.',exts[i]):
if re.search('\[[0-9]+\]',exts[i]):
s=re.search('\[[0-9]+\]',exts[i]).span()[0]+1
e=re.search('\[[0-9]+\]',exts[i]).span()[1]-1
print mimetype[i],
for k in range(s,e):
print exts[i][2:s-1]+exts[i][k]+exts[i][e+1:],
print
else:
print mimetype[i], exts[i][2:]

16
viewvc.conf Normal file
View file

@ -0,0 +1,16 @@
Alias /viewvc __python_sitelib__/viewvc/bin/mod_python/viewvc-mp.py
Alias /viewvc-static __datadir__/viewvc/templates/docroot
<Directory __python_sitelib__/viewvc/bin/mod_python>
AddHandler python-program .py
PythonHandler handler
PythonPath "sys.path+['__python_sitelib__/viewvc/bin/mod_python']"
Order allow,deny
Allow from 127.0.0.1
</Directory>
<Directory __datadir__/viewvc/templates/docroot>
Options -Indexes
Order allow,deny
Allow from 127.0.0.1
</Directory>

248
viewvc.spec Normal file
View file

@ -0,0 +1,248 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
# EL4 has a subversion that does not meet the minimum reqs for subversion
%if 0%{?rhel} && "%rhel" < "5"
%define with_subversion 0
%else
%define with_subversion 1
%endif
Name: viewvc
Version: 1.1.14
Release: 1%{?dist}
Summary: Browser interface for CVS and SVN version control repositories
Group: Development/Tools
License: BSD
URL: http://www.viewvc.org/
Source0: http://www.viewvc.org/%{name}-%{version}.tar.gz
Source1: viewvc.conf
Source2: README.httpd
Source3: viewvc-lexer-mimetypes.py
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Obsoletes: %{name}-selinux < 1.0.3-13
Conflicts: selinux-policy < 2.5.10-2
BuildArch: noarch
BuildRequires: python-devel >= 2.0, python-pygments
Requires: rcs, diffutils
%if 0%{with_subversion}
Requires: subversion >= 1.2
%endif
Requires: cvsgraph
Requires: python-pygments
%description
ViewVC is a browser interface for CVS and Subversion version control
repositories. It generates templatized HTML to present navigable directory,
revision, and change log listings. It can display specific versions of files
as well as diffs between those versions. Basically, ViewVC provides the bulk
of the report-like functionality you expect out of your version control tool,
but much more prettily than the average textual command-line program output.
%if 0%{!?with_subversion}
This version only supports CVS repositories.
%endif
%package httpd
Summary: ViewVC configuration for Apache/mod_python
Group: Development/Tools
Requires: httpd, %{name} = %{version}-%{release}, mod_python
Obsoletes: viewvc < 1.1.0
%description httpd
ViewVC configuration for Apache/mod_python. This package should provide ViewVC
with decent performance when run under Apache.
%prep
%setup -q
%build
%install
%{__rm} -rf %{buildroot}
%{__python} viewvc-install --destdir="%{buildroot}" --prefix="%{python_sitelib}/viewvc"
# Remove unneeded files
%{__rm} -f %{buildroot}%{python_sitelib}/viewvc/bin/mod_python/.htaccess
# Move non-python to /usr/share
%{__mkdir} -p %{buildroot}%{_datadir}/viewvc
%{__mv} %{buildroot}%{python_sitelib}/viewvc/templates %{buildroot}%{_datadir}/viewvc
# Fix python files shebang and CONF_PATHNAME
%{__perl} -pi \
-e 's|/usr/local/bin/python|%{_bindir}/python|g;' \
-e 's|\s*/usr/bin/env python|%{_bindir}/python|g;' \
-e 's|CONF_PATHNAME =.*|CONF_PATHNAME = r"%{_sysconfdir}/viewvc/viewvc.conf"|g;' \
$(find %{buildroot}%{python_sitelib}/viewvc/ -type f)
# Set mode 755 on executable scripts
%{__grep} -rl '^#!' %{buildroot}%{python_sitelib}/viewvc | xargs %{__chmod} 0755
# Fix paths in configuration
%{__perl} -pi \
-e 's|^#* *template_dir = .*|template_dir = %{_datadir}/viewvc/templates|g;' \
-e 's|^#* *docroot = .*|docroot = /viewvc-static|;' \
-e 's|^#* *cvsgraph_conf = .*|cvsgraph_conf = %{_sysconfdir}/viewvc/cvsgraph.conf|;' \
-e 's|^#* *use_cvsgraph = .*|use_cvsgraph = 1|;' \
%{buildroot}%{python_sitelib}/viewvc/viewvc.conf
# Install config to sysconf directory
%{__install} -Dp -m0644 %{buildroot}%{python_sitelib}/viewvc/viewvc.conf %{buildroot}%{_sysconfdir}/viewvc/viewvc.conf
%{__rm} -f %{buildroot}%{python_sitelib}/viewvc/viewvc.conf
%{__install} -Dp -m0644 %{buildroot}%{python_sitelib}/viewvc/cvsgraph.conf %{buildroot}%{_sysconfdir}/viewvc/cvsgraph.conf
%{__rm} -f %{buildroot}%{python_sitelib}/viewvc/cvsgraph.conf
%{__install} -Dp -m0644 %{buildroot}%{python_sitelib}/viewvc/mimetypes.conf %{buildroot}%{_sysconfdir}/viewvc/mimetypes.conf
%{__rm} -f %{buildroot}%{python_sitelib}/viewvc/mimetypes.conf
%{SOURCE3} >> %{buildroot}%{_sysconfdir}/viewvc/mimetypes.conf
# Install Apache configuration and README
%{__sed} -e s,__datadir__,%{_datadir}, \
-e s,__python_sitelib__,%{python_sitelib}, %{SOURCE1} > viewvc.conf
%{__install} -Dp -m0644 viewvc.conf %{buildroot}/etc/httpd/conf.d/viewvc.conf
%{__cp} %{SOURCE2} README.httpd
# mod_python files mustn't be executable since they don't have shebang
# make rpmlint happy!
%{__chmod} 0644 %{buildroot}%{python_sitelib}/viewvc/bin/mod_python/*.py
# Rename viewvc.py to viewvc-mp.py for mod_python to avoid import cycle errors
%{__mv} %{buildroot}%{python_sitelib}/viewvc/bin/mod_python/viewvc.py \
%{buildroot}%{python_sitelib}/viewvc/bin/mod_python/viewvc-mp.py
# Make spool directory for temp files
%{__mkdir} -p %{buildroot}%{_localstatedir}/spool/viewvc
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(-, root, root, -)
%doc CHANGES README README.httpd INSTALL COMMITTERS LICENSE.html docs
%config(noreplace) %{_sysconfdir}/viewvc
%{python_sitelib}/*
%{_datadir}/*
%files httpd
%defattr(-, root, root, -)
%config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf
%attr(0700,apache,apache) %{_localstatedir}/spool/viewvc
%changelog
* Wed Jun 13 2012 Bojan Smojver <bojan@rexursive.com> - 1.1.14-1
- bump up to 1.1.14
* Tue Jan 24 2012 Bojan Smojver <bojan@rexursive.com> - 1.1.13-1
- bump up to 1.1.13
* Fri Nov 4 2011 Bojan Smojver <bojan@rexursive.com> - 1.1.12-1
- bump up to 1.1.12
* Wed Jun 1 2011 Bojan Smojver <bojan@rexursive.com> - 1.1.11-3
- in response to bug #708721:
- remove webserver dependency, can run standalone
- require httpd for httpd package
- move spool directory to httpd package
* Wed May 18 2011 Bojan Smojver <bojan@rexursive.com> - 1.1.11-2
- remove duplicate conf section
* Wed May 18 2011 Bojan Smojver <bojan@rexursive.com> - 1.1.11-1
- bump up to 1.1.11
* Wed Mar 16 2011 Bojan Smojver <bojan@rexursive.com> - 1.1.10-1
- bump up to 1.1.10
* Tue Mar 8 2011 Bojan Smojver <bojan@rexursive.com> - 1.1.9-1
- bump up to 1.1.9
* Tue Dec 7 2010 Bojan Smojver <bojan@rexursive.com> - 1.1.8-1
- bump up to 1.1.8
* Thu Jun 3 2010 Bojan Smojver <bojan@rexursive.com> - 1.1.6-1
- bump up to 1.1.6
- drop patch for upstream issue #454
* Tue May 25 2010 Bojan Smojver <bojan@rexursive.com> - 1.1.5-3
- patch upstream issue #454
* Thu Apr 1 2010 Bojan Smojver <bojan@rexursive.com> - 1.1.5-2
- pull in viewvc-httpd on upgrade from 1.0.x
* Tue Mar 30 2010 Bojan Smojver <bojan@rexursive.com> - 1.1.5-1
- bump up to 1.1.5
* Thu Mar 11 2010 Bojan Smojver <bojan@rexursive.com> - 1.1.4-1
- bump up to 1.1.4
* Tue Feb 2 2010 Bojan Smojver <bojan@rexursive.com> - 1.1.3-1
- bump up to 1.1.3
- patch upstream issue #445
* Wed Aug 12 2009 Bojan Smojver <bojan@rexursive.com> - 1.0.9-1
- bump up to 1.0.9
- security fix: validate the 'view' parameter to avoid XSS attack
- security fix: avoid printing illegal parameter names and values
* Thu May 7 2009 Bojan Smojver <bojan@rexursive.com> - 1.0.8-1
- Bump up to 1.0.8
* Wed Oct 15 2008 Bojan Smojver <bojan@rexursive.com> - 1.0.7-1
- Bump up to 1.0.7
* Fri Sep 19 2008 Bojan Smojver <bojan@rexursive.com> - 1.0.6-1
- Bump up to 1.0.6
* Fri Feb 29 2008 Bojan Smojver <bojan@rexursive.com> - 1.0.5-1
- Bump up to 1.0.5
* Sun Jun 3 2007 Bojan Smojver <bojan@rexursive.com> - 1.0.4-2
- Avoid import cycle errors (temporary fix)
* Tue May 15 2007 Bojan Smojver <bojan@rexursive.com> - 1.0.4-1
- Bump up to 1.0.4
* Wed Mar 28 2007 Bojan Smojver <bojan@rexursive.com> - 1.0.3-13
- Supply obsoletes/conflicts
(suggestions by Peter Gordon, Bernard Johnson and Ville Skyttä)
* Thu Mar 22 2007 Bojan Smojver <bojan@rexursive.com> - 1.0.3-12
- Drop selinux package, required context now in official policy
* Fri Mar 09 2007 Bojan Smojver <bojan@rexursive.com> - 1.0.3-11
- Bump for tag
* Tue Mar 06 2007 Bojan Smojver <bojan@rexursive.com> - 1.0.3-10
- Enable enscript only when available
* Tue Mar 06 2007 Bojan Smojver <bojan@rexursive.com> - 1.0.3-9
- Enable cvsgraph
* Sun Mar 04 2007 Bojan Smojver <bojan@rexursive.com> - 1.0.3-8
- EPEL support patch by Bernard Johnson
* Sat Mar 03 2007 Bojan Smojver <bojan@rexursive.com> - 1.0.3-7
- Incorporate suggestions from package review process by Bernard Johnson
* Sat Mar 03 2007 Bojan Smojver <bojan@rexursive.com> - 1.0.3-6
- Use restorecon instead of chcon
* Fri Mar 02 2007 Bojan Smojver <bojan@rexursive.com> - 1.0.3-5
- SELinux integration
* Fri Mar 02 2007 Bojan Smojver <bojan@rexursive.com> - 1.0.3-4
- Incorporate suggestions from package review process by Bernard Johnson
* Fri Mar 02 2007 Bojan Smojver <bojan@rexursive.com> - 1.0.3-3
- Move non-python files out of %%{python_sitelib}
* Thu Mar 01 2007 Bojan Smojver <bojan@rexursive.com> - 1.0.3-2
- Incorporate suggestions from package review process by Bernard Johnson
* Thu Mar 01 2007 Bojan Smojver <bojan@rexursive.com> - 1.0.3-1
- Initial release, 1.0.3
- Based on package provided by Dag Wieers