From 9e6004f26d9b3f55ccc8c39bbab1e7cb522df662 Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Sun, 29 Apr 2012 17:43:29 +1000 Subject: [PATCH 01/46] Obsolete viewvc-httpd and replace with viewvc-httpd-fcgi. Also provide viewvc-httpd-wsgi. --- README.httpd | 9 ++++++-- viewvc-fcgi.conf | 8 +++++++ viewvc-wsgi.conf | 8 +++++++ viewvc.conf | 15 ------------- viewvc.spec | 58 +++++++++++++++++++++++++++++++++++------------- 5 files changed, 66 insertions(+), 32 deletions(-) create mode 100644 viewvc-fcgi.conf create mode 100644 viewvc-wsgi.conf delete mode 100644 viewvc.conf diff --git a/README.httpd b/README.httpd index 6be0588..14ae0c8 100644 --- a/README.httpd +++ b/README.httpd @@ -1,2 +1,7 @@ -In order to run ViewVC under Apache and mod_python, you must install -viewvc-httpd package. +In order to run ViewVC under Apache and mod_fcgid, you should install +viewvc-httpd-fcgi package. This package obsoletes the old view-httpd package. + +In order to run ViewVC under Apache and mod_wsgi, you should install +viewvc-httpd-wsgi package. + +The old mod_python setup is no longer supported in Fedora. diff --git a/viewvc-fcgi.conf b/viewvc-fcgi.conf new file mode 100644 index 0000000..c3f60d5 --- /dev/null +++ b/viewvc-fcgi.conf @@ -0,0 +1,8 @@ +ScriptAlias /viewvc __python_sitelib__/viewvc/bin/wsgi/viewvc.fcgi +Alias /viewvc-static __datadir__/viewvc/templates/docroot + + + Options -Indexes + Order allow,deny + Allow from 127.0.0.1 + diff --git a/viewvc-wsgi.conf b/viewvc-wsgi.conf new file mode 100644 index 0000000..ae32d65 --- /dev/null +++ b/viewvc-wsgi.conf @@ -0,0 +1,8 @@ +WSGIScriptAlias /viewvc __python_sitelib__/viewvc/bin/wsgi/viewvc.wsgi +Alias /viewvc-static __datadir__/viewvc/templates/docroot + + + Options -Indexes + Order allow,deny + Allow from 127.0.0.1 + diff --git a/viewvc.conf b/viewvc.conf deleted file mode 100644 index 6ae3925..0000000 --- a/viewvc.conf +++ /dev/null @@ -1,15 +0,0 @@ -Alias /viewvc __python_sitelib__/viewvc/bin/mod_python/viewvc-mp.py -Alias /viewvc-static __datadir__/viewvc/templates/docroot - - - AddHandler python-program .py - PythonHandler handler - Order allow,deny - Allow from 127.0.0.1 - - - - Options -Indexes - Order allow,deny - Allow from 127.0.0.1 - diff --git a/viewvc.spec b/viewvc.spec index f79bfcb..5a28bf2 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -2,16 +2,17 @@ Name: viewvc Version: 1.1.13 -Release: 1%{?dist} +Release: 2%{?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 +Source1: viewvc-fcgi.conf +Source2: viewvc-wsgi.conf +Source3: README.httpd +Source4: viewvc-lexer-mimetypes.py BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: %{name}-selinux < 1.0.3-13 @@ -33,13 +34,23 @@ 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. -%package httpd -Summary: ViewVC configuration for Apache/mod_python +%package httpd-fcgi +Summary: ViewVC configuration for Apache/mod_fcgid Group: Development/Tools -Requires: httpd, %{name} = %{version}-%{release}, mod_python +Obsoletes: viewvc-httpd <= 1.1.13-1 +Requires: httpd, %{name} = %{version}-%{release}, mod_fcgid, python-flup -%description httpd -ViewVC configuration for Apache/mod_python. This package should provide ViewVC +%description httpd-fcgi +ViewVC configuration for Apache/mod_fcgid. This package should provide ViewVC +with decent performance when run under Apache. + +%package httpd-wsgi +Summary: ViewVC configuration for Apache/mod_wsgi +Group: Development/Tools +Requires: httpd, %{name} = %{version}-%{release}, mod_wsgi + +%description httpd-wsgi +ViewVC configuration for Apache/mod_wsgi. This package should provide ViewVC with decent performance when run under Apache. %prep @@ -65,6 +76,10 @@ with decent performance when run under Apache. -e 's|CONF_PATHNAME =.*|CONF_PATHNAME = r"%{_sysconfdir}/viewvc/viewvc.conf"|g;' \ $(find %{buildroot}%{python_sitelib}/viewvc/ -type f) +# Fix python files shebang for WSGI files +%{__sed} -i -e '1i#!%{_bindir}/python' \ + $(find %{buildroot}%{python_sitelib}/viewvc/ -type f -name '*.wsgi') + # Set mode 755 on executable scripts %{__grep} -rl '^#!' %{buildroot}%{python_sitelib}/viewvc | xargs %{__chmod} 0755 @@ -84,13 +99,16 @@ with decent performance when run under Apache. %{__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 +%{SOURCE4} >> %{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 + -e s,__python_sitelib__,%{python_sitelib}, %{SOURCE1} > viewvc-fcgi.conf +%{__sed} -e s,__datadir__,%{_datadir}, \ + -e s,__python_sitelib__,%{python_sitelib}, %{SOURCE2} > viewvc-wsgi.conf +%{__install} -Dp -m0644 viewvc-fcgi.conf %{buildroot}/etc/httpd/conf.d/viewvc-fcgi.conf +%{__install} -Dp -m0644 viewvc-wsgi.conf %{buildroot}/etc/httpd/conf.d/viewvc-wsgi.conf +%{__cp} %{SOURCE3} README.httpd # mod_python files mustn't be executable since they don't have shebang # make rpmlint happy! @@ -113,12 +131,22 @@ with decent performance when run under Apache. %{python_sitelib}/* %{_datadir}/* -%files httpd +%files httpd-fcgi %defattr(-, root, root, -) -%config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf +%config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc-fcgi.conf +%attr(0700,apache,apache) %{_localstatedir}/spool/viewvc + +%files httpd-wsgi +%defattr(-, root, root, -) +%config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc-wsgi.conf %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog +* Sun Apr 29 2012 Bojan Smojver - 1.1.13-2 +- drop viewvc-httpd package, which depends on mod_python +- introduce viewvc-httpd-fcgi, obsoletes viewvc-httpd +- introduce viewvc-httpd-wsgi + * Tue Jan 24 2012 Bojan Smojver - 1.1.13-1 - bump up to 1.1.13 From 4d10ab929164bd32f0dd8f23fb3ab78167621896 Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Sun, 29 Apr 2012 17:48:49 +1000 Subject: [PATCH 02/46] Fix the obsoletes comparison. --- viewvc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/viewvc.spec b/viewvc.spec index 5a28bf2..bd9530c 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -37,7 +37,7 @@ but much more prettily than the average textual command-line program output. %package httpd-fcgi Summary: ViewVC configuration for Apache/mod_fcgid Group: Development/Tools -Obsoletes: viewvc-httpd <= 1.1.13-1 +Obsoletes: viewvc-httpd < 1.1.13-2 Requires: httpd, %{name} = %{version}-%{release}, mod_fcgid, python-flup %description httpd-fcgi From 16942886fa41ea27c8ca877be491636ea6887fde Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Wed, 13 Jun 2012 06:48:53 +1000 Subject: [PATCH 03/46] Bump up to 1.1.14. --- .gitignore | 1 + sources | 2 +- viewvc.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e8454c7..efbddd4 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ viewvc-1.1.6.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 diff --git a/sources b/sources index a637821..7b57204 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c6710daca7bbd161ab68d5921757cd21 viewvc-1.1.13.tar.gz +ba8af23f4a524625441840f779c30086 viewvc-1.1.14.tar.gz diff --git a/viewvc.spec b/viewvc.spec index bd9530c..0ab1148 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: viewvc -Version: 1.1.13 -Release: 2%{?dist} +Version: 1.1.14 +Release: 1%{?dist} Summary: Browser interface for CVS and SVN version control repositories Group: Development/Tools @@ -142,6 +142,9 @@ with decent performance when run under Apache. %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog +* Wed Jun 13 2012 Bojan Smojver - 1.1.14-1 +- bump up to 1.1.14 + * Sun Apr 29 2012 Bojan Smojver - 1.1.13-2 - drop viewvc-httpd package, which depends on mod_python - introduce viewvc-httpd-fcgi, obsoletes viewvc-httpd From 9aa14d4ee28396cdc3256990d2359ff42f09cfd5 Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Sat, 23 Jun 2012 12:15:40 +1000 Subject: [PATCH 04/46] Bump up to 1.1.15. --- .gitignore | 1 + sources | 2 +- viewvc.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index efbddd4..4f315f0 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ viewvc-1.1.6.tar.gz /viewvc-1.1.12.tar.gz /viewvc-1.1.13.tar.gz /viewvc-1.1.14.tar.gz +/viewvc-1.1.15.tar.gz diff --git a/sources b/sources index 7b57204..11bab84 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ba8af23f4a524625441840f779c30086 viewvc-1.1.14.tar.gz +dc390f3f0005b2d72065026f62559011 viewvc-1.1.15.tar.gz diff --git a/viewvc.spec b/viewvc.spec index 0ab1148..63241e5 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: viewvc -Version: 1.1.14 +Version: 1.1.15 Release: 1%{?dist} Summary: Browser interface for CVS and SVN version control repositories @@ -142,6 +142,9 @@ with decent performance when run under Apache. %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog +* Sat Jun 23 2012 Bojan Smojver - 1.1.15-1 +- bump up to 1.1.15 + * Wed Jun 13 2012 Bojan Smojver - 1.1.14-1 - bump up to 1.1.14 From f2765127dffdc0210c554eb343ef588f56c2c5fc Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 21:42:14 -0500 Subject: [PATCH 05/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- viewvc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/viewvc.spec b/viewvc.spec index 63241e5..5c606fe 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -2,7 +2,7 @@ Name: viewvc Version: 1.1.15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Browser interface for CVS and SVN version control repositories Group: Development/Tools @@ -142,6 +142,9 @@ with decent performance when run under Apache. %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 1.1.15-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Jun 23 2012 Bojan Smojver - 1.1.15-1 - bump up to 1.1.15 From d0b5791b9b06e413a2c527eba851d3baa4751f9d Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Mon, 22 Oct 2012 12:06:07 +1100 Subject: [PATCH 06/46] Patch CVE-2012-4533, bug #868606. --- viewvc-1.1.5-CVE-2012-4533-xss.patch | 13 +++++++++++++ viewvc.spec | 7 ++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 viewvc-1.1.5-CVE-2012-4533-xss.patch diff --git a/viewvc-1.1.5-CVE-2012-4533-xss.patch b/viewvc-1.1.5-CVE-2012-4533-xss.patch new file mode 100644 index 0000000..2419244 --- /dev/null +++ b/viewvc-1.1.5-CVE-2012-4533-xss.patch @@ -0,0 +1,13 @@ +Index: viewvc-1.1.5/lib/viewvc.py +=================================================================== +--- viewvc-1.1.5.orig/lib/viewvc.py 2012-10-20 17:50:09.000000000 -0300 ++++ viewvc-1.1.5/lib/viewvc.py 2012-10-20 17:51:24.000000000 -0300 +@@ -2819,7 +2819,7 @@ + return _item(type='header', + line_info_left=match.group(1), + line_info_right=match.group(2), +- line_info_extra=match.group(3)) ++ line_info_extra=self._format_text(match.group(3))) + + if line[0] == '\\': + # \ No newline at end of file diff --git a/viewvc.spec b/viewvc.spec index 5c606fe..544839f 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -2,7 +2,7 @@ Name: viewvc Version: 1.1.15 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Browser interface for CVS and SVN version control repositories Group: Development/Tools @@ -13,6 +13,7 @@ Source1: viewvc-fcgi.conf Source2: viewvc-wsgi.conf Source3: README.httpd Source4: viewvc-lexer-mimetypes.py +Patch1: viewvc-1.1.5-CVE-2012-4533-xss.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: %{name}-selinux < 1.0.3-13 @@ -55,6 +56,7 @@ with decent performance when run under Apache. %prep %setup -q +%patch1 -p1 -b .CVE-2012-4533-xss %build @@ -142,6 +144,9 @@ with decent performance when run under Apache. %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog +* Mon Oct 22 2012 Bojan Smojver - 1.1.15-3 +- patch CVE-2012-4533, bug #868606 + * Sun Jul 22 2012 Fedora Release Engineering - 1.1.15-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From cd76f5f609bed473b75c93f44645ef25530c05ad Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Thu, 25 Oct 2012 09:49:01 +1100 Subject: [PATCH 07/46] Bump up to 1.1.16. --- .gitignore | 1 + sources | 2 +- viewvc-1.1.5-CVE-2012-4533-xss.patch | 13 ------------- viewvc.spec | 10 ++++++---- 4 files changed, 8 insertions(+), 18 deletions(-) delete mode 100644 viewvc-1.1.5-CVE-2012-4533-xss.patch diff --git a/.gitignore b/.gitignore index 4f315f0..a64453e 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ viewvc-1.1.6.tar.gz /viewvc-1.1.13.tar.gz /viewvc-1.1.14.tar.gz /viewvc-1.1.15.tar.gz +/viewvc-1.1.16.tar.gz diff --git a/sources b/sources index 11bab84..d871842 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dc390f3f0005b2d72065026f62559011 viewvc-1.1.15.tar.gz +766bcc89da8d6a51343c1be4f39f9c7e viewvc-1.1.16.tar.gz diff --git a/viewvc-1.1.5-CVE-2012-4533-xss.patch b/viewvc-1.1.5-CVE-2012-4533-xss.patch deleted file mode 100644 index 2419244..0000000 --- a/viewvc-1.1.5-CVE-2012-4533-xss.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: viewvc-1.1.5/lib/viewvc.py -=================================================================== ---- viewvc-1.1.5.orig/lib/viewvc.py 2012-10-20 17:50:09.000000000 -0300 -+++ viewvc-1.1.5/lib/viewvc.py 2012-10-20 17:51:24.000000000 -0300 -@@ -2819,7 +2819,7 @@ - return _item(type='header', - line_info_left=match.group(1), - line_info_right=match.group(2), -- line_info_extra=match.group(3)) -+ line_info_extra=self._format_text(match.group(3))) - - if line[0] == '\\': - # \ No newline at end of file diff --git a/viewvc.spec b/viewvc.spec index 544839f..fbe059a 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: viewvc -Version: 1.1.15 -Release: 3%{?dist} +Version: 1.1.16 +Release: 1%{?dist} Summary: Browser interface for CVS and SVN version control repositories Group: Development/Tools @@ -13,7 +13,6 @@ Source1: viewvc-fcgi.conf Source2: viewvc-wsgi.conf Source3: README.httpd Source4: viewvc-lexer-mimetypes.py -Patch1: viewvc-1.1.5-CVE-2012-4533-xss.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: %{name}-selinux < 1.0.3-13 @@ -56,7 +55,6 @@ with decent performance when run under Apache. %prep %setup -q -%patch1 -p1 -b .CVE-2012-4533-xss %build @@ -144,6 +142,10 @@ with decent performance when run under Apache. %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog +* Thu Oct 25 2012 Bojan Smojver - 1.1.16-1 +- bump up to 1.1.16 +- drop patch for CVE-2012-4533, part of the release + * Mon Oct 22 2012 Bojan Smojver - 1.1.15-3 - patch CVE-2012-4533, bug #868606 From 6e79bd54ba01d23dbb060b02a90bde7f73ce65ba Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Fri, 26 Oct 2012 07:25:49 +1100 Subject: [PATCH 08/46] Bump up to 1.1.17. --- .gitignore | 1 + sources | 2 +- viewvc.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a64453e..a7a65f7 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ viewvc-1.1.6.tar.gz /viewvc-1.1.14.tar.gz /viewvc-1.1.15.tar.gz /viewvc-1.1.16.tar.gz +/viewvc-1.1.17.tar.gz diff --git a/sources b/sources index d871842..f2b4564 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -766bcc89da8d6a51343c1be4f39f9c7e viewvc-1.1.16.tar.gz +74a80be7e300c84381042d67df6d7c3f viewvc-1.1.17.tar.gz diff --git a/viewvc.spec b/viewvc.spec index fbe059a..e48f383 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: viewvc -Version: 1.1.16 +Version: 1.1.17 Release: 1%{?dist} Summary: Browser interface for CVS and SVN version control repositories @@ -142,6 +142,9 @@ with decent performance when run under Apache. %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog +* Fri Oct 26 2012 Bojan Smojver - 1.1.17-1 +- bump up to 1.1.17 + * Thu Oct 25 2012 Bojan Smojver - 1.1.16-1 - bump up to 1.1.16 - drop patch for CVE-2012-4533, part of the release From ebe56bfde6248699def95e16b9e4aa779761a6ab Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Wed, 31 Oct 2012 17:11:40 +1100 Subject: [PATCH 09/46] Fix bug #871492. --- viewvc-fcgi.conf | 12 ++++++++++-- viewvc-wsgi.conf | 12 ++++++++++-- viewvc.spec | 5 ++++- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/viewvc-fcgi.conf b/viewvc-fcgi.conf index c3f60d5..a2fd927 100644 --- a/viewvc-fcgi.conf +++ b/viewvc-fcgi.conf @@ -3,6 +3,14 @@ Alias /viewvc-static __datadir__/viewvc/templates/docroot Options -Indexes - Order allow,deny - Allow from 127.0.0.1 + + # Apache 2.4 + Require local + + + # Apache 2.2 + Order allow,deny + Allow from 127.0.0.1 + Allow from ::1 + diff --git a/viewvc-wsgi.conf b/viewvc-wsgi.conf index ae32d65..4fe0725 100644 --- a/viewvc-wsgi.conf +++ b/viewvc-wsgi.conf @@ -3,6 +3,14 @@ Alias /viewvc-static __datadir__/viewvc/templates/docroot Options -Indexes - Order allow,deny - Allow from 127.0.0.1 + + # Apache 2.4 + Require local + + + # Apache 2.2 + Order allow,deny + Allow from 127.0.0.1 + Allow from ::1 + diff --git a/viewvc.spec b/viewvc.spec index e48f383..4639691 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -2,7 +2,7 @@ Name: viewvc Version: 1.1.17 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Browser interface for CVS and SVN version control repositories Group: Development/Tools @@ -142,6 +142,9 @@ with decent performance when run under Apache. %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog +* Wed Oct 31 2012 Bojan Smojver - 1.1.17-2 +- fix bug #871492 + * Fri Oct 26 2012 Bojan Smojver - 1.1.17-1 - bump up to 1.1.17 From 2e1cd2445bc3df3267f00ac9d31f4f39640c0f94 Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Sat, 12 Jan 2013 20:31:52 +1100 Subject: [PATCH 10/46] Add default authorisation for CGI scripts too. --- viewvc-fcgi.conf | 15 +++++++++++++++ viewvc-wsgi.conf | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/viewvc-fcgi.conf b/viewvc-fcgi.conf index a2fd927..d51a7ff 100644 --- a/viewvc-fcgi.conf +++ b/viewvc-fcgi.conf @@ -1,6 +1,21 @@ ScriptAlias /viewvc __python_sitelib__/viewvc/bin/wsgi/viewvc.fcgi Alias /viewvc-static __datadir__/viewvc/templates/docroot + + Options -Indexes + + + # Apache 2.4 + Require local + + + # Apache 2.2 + Order allow,deny + Allow from 127.0.0.1 + Allow from ::1 + + + Options -Indexes diff --git a/viewvc-wsgi.conf b/viewvc-wsgi.conf index 4fe0725..9207b84 100644 --- a/viewvc-wsgi.conf +++ b/viewvc-wsgi.conf @@ -1,6 +1,21 @@ WSGIScriptAlias /viewvc __python_sitelib__/viewvc/bin/wsgi/viewvc.wsgi Alias /viewvc-static __datadir__/viewvc/templates/docroot + + Options -Indexes + + + # Apache 2.4 + Require local + + + # Apache 2.2 + Order allow,deny + Allow from 127.0.0.1 + Allow from ::1 + + + Options -Indexes From f051700bd1a7c655cb0701e7a7795c3445dd65e3 Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Sat, 12 Jan 2013 20:33:47 +1100 Subject: [PATCH 11/46] Bump up the release number for rebuild. --- viewvc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/viewvc.spec b/viewvc.spec index 4639691..5a41221 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -2,7 +2,7 @@ Name: viewvc Version: 1.1.17 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Browser interface for CVS and SVN version control repositories Group: Development/Tools @@ -142,6 +142,9 @@ with decent performance when run under Apache. %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog +* Sat Jan 12 2013 Bojan Smojver - 1.1.17-3 +- add default authorisation for CGI scripts too + * Wed Oct 31 2012 Bojan Smojver - 1.1.17-2 - fix bug #871492 From 44e415e37e37a39c8729ce64c00af1ade1460197 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 20:46:42 -0600 Subject: [PATCH 12/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- viewvc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/viewvc.spec b/viewvc.spec index 5a41221..e14ef56 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -2,7 +2,7 @@ Name: viewvc Version: 1.1.17 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Browser interface for CVS and SVN version control repositories Group: Development/Tools @@ -142,6 +142,9 @@ with decent performance when run under Apache. %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 1.1.17-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sat Jan 12 2013 Bojan Smojver - 1.1.17-3 - add default authorisation for CGI scripts too From 2e1cffe4f49621f9ad947e4d2712d652ea90ca77 Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Fri, 1 Mar 2013 11:31:59 +1100 Subject: [PATCH 13/46] Bump up to 1.1.18. --- .gitignore | 1 + sources | 2 +- viewvc.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a7a65f7..a593caf 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ viewvc-1.1.6.tar.gz /viewvc-1.1.15.tar.gz /viewvc-1.1.16.tar.gz /viewvc-1.1.17.tar.gz +/viewvc-1.1.18.tar.gz diff --git a/sources b/sources index f2b4564..66dfd87 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -74a80be7e300c84381042d67df6d7c3f viewvc-1.1.17.tar.gz +2a352e48c60eed6ad55efc2c73ed7a56 viewvc-1.1.18.tar.gz diff --git a/viewvc.spec b/viewvc.spec index e14ef56..55f7037 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: viewvc -Version: 1.1.17 -Release: 4%{?dist} +Version: 1.1.18 +Release: 1%{?dist} Summary: Browser interface for CVS and SVN version control repositories Group: Development/Tools @@ -142,6 +142,9 @@ with decent performance when run under Apache. %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog +* Fri Mar 1 2013 Bojan Smojver - 1.1.18-1 +- bump up to 1.1.18 + * Fri Feb 15 2013 Fedora Release Engineering - 1.1.17-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 462af714eb97d0441aa0969d5f889a4fc57dbe57 Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Tue, 23 Apr 2013 08:36:57 +1000 Subject: [PATCH 14/46] Bump up to 1.1.19. --- .gitignore | 1 + sources | 2 +- viewvc.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a593caf..b5dbeb9 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ viewvc-1.1.6.tar.gz /viewvc-1.1.16.tar.gz /viewvc-1.1.17.tar.gz /viewvc-1.1.18.tar.gz +/viewvc-1.1.19.tar.gz diff --git a/sources b/sources index 66dfd87..c242028 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2a352e48c60eed6ad55efc2c73ed7a56 viewvc-1.1.18.tar.gz +96f569951d8f2e49760c880775357d43 viewvc-1.1.19.tar.gz diff --git a/viewvc.spec b/viewvc.spec index 55f7037..c910302 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: viewvc -Version: 1.1.18 +Version: 1.1.19 Release: 1%{?dist} Summary: Browser interface for CVS and SVN version control repositories @@ -142,6 +142,9 @@ with decent performance when run under Apache. %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog +* Tue Apr 23 2013 Bojan Smojver - 1.1.19-1 +- bump up to 1.1.19 + * Fri Mar 1 2013 Bojan Smojver - 1.1.18-1 - bump up to 1.1.18 From 64701c6113b559cfcf4d2912ea78e119a74c39da Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Thu, 25 Apr 2013 07:26:27 +1000 Subject: [PATCH 15/46] Bump up to 1.1.20. --- .gitignore | 1 + sources | 2 +- viewvc.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b5dbeb9..b4d42ac 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ viewvc-1.1.6.tar.gz /viewvc-1.1.17.tar.gz /viewvc-1.1.18.tar.gz /viewvc-1.1.19.tar.gz +/viewvc-1.1.20.tar.gz diff --git a/sources b/sources index c242028..d877bea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -96f569951d8f2e49760c880775357d43 viewvc-1.1.19.tar.gz +f046a2b438a331a393015f3056650632 viewvc-1.1.20.tar.gz diff --git a/viewvc.spec b/viewvc.spec index c910302..7513661 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: viewvc -Version: 1.1.19 +Version: 1.1.20 Release: 1%{?dist} Summary: Browser interface for CVS and SVN version control repositories @@ -142,6 +142,9 @@ with decent performance when run under Apache. %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog +* Thu Apr 25 2013 Bojan Smojver - 1.1.20-1 +- bump up to 1.1.20 + * Tue Apr 23 2013 Bojan Smojver - 1.1.19-1 - bump up to 1.1.19 From eae6a943c412ac84a3c903bc5a69f8d51e05ea7d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 01:10:54 -0500 Subject: [PATCH 16/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- viewvc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/viewvc.spec b/viewvc.spec index 7513661..fdc7836 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -2,7 +2,7 @@ Name: viewvc Version: 1.1.20 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Browser interface for CVS and SVN version control repositories Group: Development/Tools @@ -142,6 +142,9 @@ with decent performance when run under Apache. %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 1.1.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu Apr 25 2013 Bojan Smojver - 1.1.20-1 - bump up to 1.1.20 From 7fc3b8cc6ed4cc0ddc9a707d395f0419369ca2a6 Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Sat, 14 Sep 2013 18:08:15 +1000 Subject: [PATCH 17/46] Bump up to 1.1.21. --- .gitignore | 1 + sources | 2 +- viewvc.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b4d42ac..d96a92d 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ viewvc-1.1.6.tar.gz /viewvc-1.1.18.tar.gz /viewvc-1.1.19.tar.gz /viewvc-1.1.20.tar.gz +/viewvc-1.1.21.tar.gz diff --git a/sources b/sources index d877bea..241bd18 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f046a2b438a331a393015f3056650632 viewvc-1.1.20.tar.gz +f9ead703a9510c386f86f4ee52329a5b viewvc-1.1.21.tar.gz diff --git a/viewvc.spec b/viewvc.spec index fdc7836..1549774 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: viewvc -Version: 1.1.20 -Release: 2%{?dist} +Version: 1.1.21 +Release: 1%{?dist} Summary: Browser interface for CVS and SVN version control repositories Group: Development/Tools @@ -142,6 +142,9 @@ with decent performance when run under Apache. %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog +* Sat Sep 14 2013 Bojan Smojver - 1.1.21-1 +- bump up to 1.1.21 + * Sun Aug 04 2013 Fedora Release Engineering - 1.1.20-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From cad42a78191a4002b3246f287851f9c87e4e4101 Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Wed, 15 Jan 2014 08:41:58 +1100 Subject: [PATCH 18/46] Bump up to 1.1.22. --- .gitignore | 1 + sources | 2 +- viewvc.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d96a92d..810183e 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ viewvc-1.1.6.tar.gz /viewvc-1.1.19.tar.gz /viewvc-1.1.20.tar.gz /viewvc-1.1.21.tar.gz +/viewvc-1.1.22.tar.gz diff --git a/sources b/sources index 241bd18..52a9605 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f9ead703a9510c386f86f4ee52329a5b viewvc-1.1.21.tar.gz +6d0a4dcf572958463ca66e0fcc2764c9 viewvc-1.1.22.tar.gz diff --git a/viewvc.spec b/viewvc.spec index 1549774..151c2fb 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: viewvc -Version: 1.1.21 +Version: 1.1.22 Release: 1%{?dist} Summary: Browser interface for CVS and SVN version control repositories @@ -142,6 +142,9 @@ with decent performance when run under Apache. %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog +* Wed Jan 15 2014 Bojan Smojver - 1.1.22-1 +- bump up to 1.1.22 + * Sat Sep 14 2013 Bojan Smojver - 1.1.21-1 - bump up to 1.1.21 From bc2d4a240d3a4799eb53c721b5852f8c3b6c7094 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 22:38:54 -0500 Subject: [PATCH 19/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- viewvc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/viewvc.spec b/viewvc.spec index 151c2fb..ba3d033 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -2,7 +2,7 @@ Name: viewvc Version: 1.1.22 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Browser interface for CVS and SVN version control repositories Group: Development/Tools @@ -142,6 +142,9 @@ with decent performance when run under Apache. %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 1.1.22-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Wed Jan 15 2014 Bojan Smojver - 1.1.22-1 - bump up to 1.1.22 From 4f9be4658a90fb64a44e673c9409a4a23e1f9c62 Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Thu, 6 Nov 2014 07:33:25 +1100 Subject: [PATCH 20/46] Bump up to 1.1.23. --- .gitignore | 1 + sources | 2 +- viewvc.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 810183e..e8f047e 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ viewvc-1.1.6.tar.gz /viewvc-1.1.20.tar.gz /viewvc-1.1.21.tar.gz /viewvc-1.1.22.tar.gz +/viewvc-1.1.23.tar.gz diff --git a/sources b/sources index 52a9605..5e1308c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6d0a4dcf572958463ca66e0fcc2764c9 viewvc-1.1.22.tar.gz +796aacdfcd8ab87a196d97df2691cd3f viewvc-1.1.23.tar.gz diff --git a/viewvc.spec b/viewvc.spec index ba3d033..44474c7 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: viewvc -Version: 1.1.22 -Release: 2%{?dist} +Version: 1.1.23 +Release: 1%{?dist} Summary: Browser interface for CVS and SVN version control repositories Group: Development/Tools @@ -142,6 +142,9 @@ with decent performance when run under Apache. %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog +* Thu Nov 6 2014 Bojan Smojver - 1.1.23-1 +- bump up to 1.1.23 + * Sun Jun 08 2014 Fedora Release Engineering - 1.1.22-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From cbc348f45693c597edc1cc2787b4939c1a561d9d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 01:59:30 +0000 Subject: [PATCH 21/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- viewvc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/viewvc.spec b/viewvc.spec index 44474c7..5ce2415 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -2,7 +2,7 @@ Name: viewvc Version: 1.1.23 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Browser interface for CVS and SVN version control repositories Group: Development/Tools @@ -142,6 +142,9 @@ with decent performance when run under Apache. %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 1.1.23-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Thu Nov 6 2014 Bojan Smojver - 1.1.23-1 - bump up to 1.1.23 From 28ecc3412c5d2724408ef2430e7eee9311e4cf4f Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Tue, 6 Oct 2015 08:05:33 +1100 Subject: [PATCH 22/46] Bump up to 1.1.24. --- .gitignore | 1 + sources | 2 +- viewvc.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e8f047e..f11c391 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ viewvc-1.1.6.tar.gz /viewvc-1.1.21.tar.gz /viewvc-1.1.22.tar.gz /viewvc-1.1.23.tar.gz +/viewvc-1.1.24.tar.gz diff --git a/sources b/sources index 5e1308c..9ec950b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -796aacdfcd8ab87a196d97df2691cd3f viewvc-1.1.23.tar.gz +a4e46f20c4441bfdca0b1f1bcac446de viewvc-1.1.24.tar.gz diff --git a/viewvc.spec b/viewvc.spec index 5ce2415..67d8690 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: viewvc -Version: 1.1.23 -Release: 2%{?dist} +Version: 1.1.24 +Release: 1%{?dist} Summary: Browser interface for CVS and SVN version control repositories Group: Development/Tools @@ -142,6 +142,9 @@ with decent performance when run under Apache. %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog +* Tue Oct 6 2014 Bojan Smojver - 1.1.24-1 +- bump up to 1.1.24 + * Fri Jun 19 2015 Fedora Release Engineering - 1.1.23-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 3abf1f1bc9fd33aaf8fada62fa7cd0cfe02d5cef Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Tue, 6 Oct 2015 08:06:53 +1100 Subject: [PATCH 23/46] Fix changelog date. --- viewvc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/viewvc.spec b/viewvc.spec index 67d8690..4f6299b 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -142,7 +142,7 @@ with decent performance when run under Apache. %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog -* Tue Oct 6 2014 Bojan Smojver - 1.1.24-1 +* Tue Oct 6 2015 Bojan Smojver - 1.1.24-1 - bump up to 1.1.24 * Fri Jun 19 2015 Fedora Release Engineering - 1.1.23-2 From bf086ca325327b0876a0ec21a1d2db2d8bcb640d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 02:41:27 +0000 Subject: [PATCH 24/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- viewvc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/viewvc.spec b/viewvc.spec index 4f6299b..7ddcdb4 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -2,7 +2,7 @@ Name: viewvc Version: 1.1.24 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Browser interface for CVS and SVN version control repositories Group: Development/Tools @@ -142,6 +142,9 @@ with decent performance when run under Apache. %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 1.1.24-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Oct 6 2015 Bojan Smojver - 1.1.24-1 - bump up to 1.1.24 From 5dee3af49240101a04611f527c10fbebe466cec3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 19 Jul 2016 13:06:51 +0000 Subject: [PATCH 25/46] - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages --- viewvc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/viewvc.spec b/viewvc.spec index 7ddcdb4..3bf4981 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -2,7 +2,7 @@ Name: viewvc Version: 1.1.24 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Browser interface for CVS and SVN version control repositories Group: Development/Tools @@ -142,6 +142,9 @@ with decent performance when run under Apache. %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog +* Tue Jul 19 2016 Fedora Release Engineering - 1.1.24-3 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + * Fri Feb 05 2016 Fedora Release Engineering - 1.1.24-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From c2ca9ec72232d147761e1aa58d67edd05fcf14c3 Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Wed, 20 Jul 2016 17:09:16 +1000 Subject: [PATCH 26/46] Add perl to build requirements. --- viewvc.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/viewvc.spec b/viewvc.spec index 3bf4981..9cb2f53 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -2,7 +2,7 @@ Name: viewvc Version: 1.1.24 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Browser interface for CVS and SVN version control repositories Group: Development/Tools @@ -19,7 +19,7 @@ Obsoletes: %{name}-selinux < 1.0.3-13 Conflicts: selinux-policy < 2.5.10-2 BuildArch: noarch -BuildRequires: python-devel >= 2.0, python-pygments +BuildRequires: python-devel >= 2.0, python-pygments, perl Requires: rcs, diffutils Requires: subversion >= 1.2 Requires: subversion-python >= 1.2 @@ -142,6 +142,9 @@ with decent performance when run under Apache. %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog +* Wed Jul 20 2016 Bojan Smojver - 1.1.24-4 +- add perl to build requirements + * Tue Jul 19 2016 Fedora Release Engineering - 1.1.24-3 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages From 62b0486cd0089a51499818aae49765381d98c3cf Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Tue, 31 Jan 2017 07:10:27 +1100 Subject: [PATCH 27/46] Bump up to 1.1.26. --- .gitignore | 1 + sources | 2 +- viewvc.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f11c391..386b9a5 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ viewvc-1.1.6.tar.gz /viewvc-1.1.22.tar.gz /viewvc-1.1.23.tar.gz /viewvc-1.1.24.tar.gz +/viewvc-1.1.26.tar.gz diff --git a/sources b/sources index 9ec950b..5f9c1a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a4e46f20c4441bfdca0b1f1bcac446de viewvc-1.1.24.tar.gz +SHA512 (viewvc-1.1.26.tar.gz) = af70d4344fe92f942debb407b6fad909e250ba2656499f5229e1c2f018dfbd783d0cebd28c49a429bd7b155bb6db02cead602384f91b99b7ced6aa365e32bb8e diff --git a/viewvc.spec b/viewvc.spec index 9cb2f53..979ca48 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: viewvc -Version: 1.1.24 -Release: 4%{?dist} +Version: 1.1.26 +Release: 1%{?dist} Summary: Browser interface for CVS and SVN version control repositories Group: Development/Tools @@ -142,6 +142,9 @@ with decent performance when run under Apache. %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog +* Tue Jan 31 2017 Bojan Smojver - 1.1.26-1 +- bump up to 1.1.26 + * Wed Jul 20 2016 Bojan Smojver - 1.1.24-4 - add perl to build requirements From ff7db20da74c51ccb2ddda6857bf02ec8639907a Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Tue, 31 Jan 2017 07:32:27 +1100 Subject: [PATCH 28/46] Change LICENSE.html to LICENSE. --- viewvc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/viewvc.spec b/viewvc.spec index 979ca48..8d5ddaa 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -126,7 +126,7 @@ with decent performance when run under Apache. %files %defattr(-, root, root, -) -%doc CHANGES README README.httpd INSTALL COMMITTERS LICENSE.html docs +%doc CHANGES README README.httpd INSTALL COMMITTERS LICENSE docs %config(noreplace) %{_sysconfdir}/viewvc %{python_sitelib}/* %{_datadir}/* From 4c87fa2982fb371033b6e20cb5bf30eb2a94d652 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:03:58 +0000 Subject: [PATCH 29/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- viewvc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/viewvc.spec b/viewvc.spec index 8d5ddaa..7a9ab71 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -2,7 +2,7 @@ Name: viewvc Version: 1.1.26 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Browser interface for CVS and SVN version control repositories Group: Development/Tools @@ -142,6 +142,9 @@ with decent performance when run under Apache. %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 1.1.26-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Jan 31 2017 Bojan Smojver - 1.1.26-1 - bump up to 1.1.26 From 88285d63d09c725c782984e55478407aa4b3e060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 12 Jul 2017 14:47:08 +0200 Subject: [PATCH 30/46] perl dependency renamed to perl-interpreter --- viewvc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/viewvc.spec b/viewvc.spec index 7a9ab71..5a5d9b1 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -19,7 +19,7 @@ Obsoletes: %{name}-selinux < 1.0.3-13 Conflicts: selinux-policy < 2.5.10-2 BuildArch: noarch -BuildRequires: python-devel >= 2.0, python-pygments, perl +BuildRequires: python-devel >= 2.0, python-pygments, perl-interpreter Requires: rcs, diffutils Requires: subversion >= 1.2 Requires: subversion-python >= 1.2 From 036d60986cc384a5fc5987dc04f4bbc0aa7f0aa6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:18:05 +0000 Subject: [PATCH 31/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- viewvc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/viewvc.spec b/viewvc.spec index 5a5d9b1..65f7329 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -2,7 +2,7 @@ Name: viewvc Version: 1.1.26 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Browser interface for CVS and SVN version control repositories Group: Development/Tools @@ -142,6 +142,9 @@ with decent performance when run under Apache. %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1.1.26-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 1.1.26-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From f91956307d02284e014a93bb1f452a79481944c0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 20:29:32 +0000 Subject: [PATCH 32/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- viewvc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/viewvc.spec b/viewvc.spec index 65f7329..787b3bd 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -2,7 +2,7 @@ Name: viewvc Version: 1.1.26 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Browser interface for CVS and SVN version control repositories Group: Development/Tools @@ -142,6 +142,9 @@ with decent performance when run under Apache. %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1.1.26-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 1.1.26-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 8607c23b29a6931e2a1d1ff855c67fba1c9eaa7c Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 00:47:41 +0100 Subject: [PATCH 33/46] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- viewvc.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/viewvc.spec b/viewvc.spec index 787b3bd..ddd5391 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -13,7 +13,6 @@ Source1: viewvc-fcgi.conf Source2: viewvc-wsgi.conf Source3: README.httpd Source4: 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 From 9e1c638b7133e64f0233d009aaea77ed265cc4ac Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 09:13:55 +0100 Subject: [PATCH 34/46] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- viewvc.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/viewvc.spec b/viewvc.spec index ddd5391..18715f3 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -120,9 +120,6 @@ with decent performance when run under Apache. # 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 docs From 55947540cf3c10033f15306a9100d76b20bec492 Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Wed, 14 Feb 2018 17:25:09 +0100 Subject: [PATCH 35/46] Update Python 2 dependency declarations to new packaging standards --- viewvc.spec | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/viewvc.spec b/viewvc.spec index 18715f3..8429a72 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -2,7 +2,7 @@ Name: viewvc Version: 1.1.26 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Browser interface for CVS and SVN version control repositories Group: Development/Tools @@ -18,12 +18,12 @@ Obsoletes: %{name}-selinux < 1.0.3-13 Conflicts: selinux-policy < 2.5.10-2 BuildArch: noarch -BuildRequires: python-devel >= 2.0, python-pygments, perl-interpreter +BuildRequires: python2-devel >= 2.0, python2-pygments, perl-interpreter Requires: rcs, diffutils Requires: subversion >= 1.2 -Requires: subversion-python >= 1.2 +Requires: python2-subversion >= 1.2 Requires: cvsgraph -Requires: python-pygments +Requires: python2-pygments %description ViewVC is a browser interface for CVS and Subversion version control @@ -37,7 +37,7 @@ but much more prettily than the average textual command-line program output. Summary: ViewVC configuration for Apache/mod_fcgid Group: Development/Tools Obsoletes: viewvc-httpd < 1.1.13-2 -Requires: httpd, %{name} = %{version}-%{release}, mod_fcgid, python-flup +Requires: httpd, %{name} = %{version}-%{release}, mod_fcgid, python2-flup %description httpd-fcgi ViewVC configuration for Apache/mod_fcgid. This package should provide ViewVC @@ -46,7 +46,7 @@ with decent performance when run under Apache. %package httpd-wsgi Summary: ViewVC configuration for Apache/mod_wsgi Group: Development/Tools -Requires: httpd, %{name} = %{version}-%{release}, mod_wsgi +Requires: httpd, %{name} = %{version}-%{release}, python2-mod_wsgi %description httpd-wsgi ViewVC configuration for Apache/mod_wsgi. This package should provide ViewVC @@ -138,6 +138,10 @@ with decent performance when run under Apache. %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog +* Wed Feb 14 2018 Iryna Shcherbina - 1.1.26-5 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Fri Feb 09 2018 Fedora Release Engineering - 1.1.26-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From c8eccfb0b7565743f7eccface69e05fed96cd620 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 01:42:42 -0500 Subject: [PATCH 36/46] Remove needless use of %defattr --- viewvc.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/viewvc.spec b/viewvc.spec index 8429a72..8880002 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -121,19 +121,16 @@ with decent performance when run under Apache. %{__mkdir} -p %{buildroot}%{_localstatedir}/spool/viewvc %files -%defattr(-, root, root, -) %doc CHANGES README README.httpd INSTALL COMMITTERS LICENSE docs %config(noreplace) %{_sysconfdir}/viewvc %{python_sitelib}/* %{_datadir}/* %files httpd-fcgi -%defattr(-, root, root, -) %config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc-fcgi.conf %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %files httpd-wsgi -%defattr(-, root, root, -) %config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc-wsgi.conf %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc From 393e392b7c2e59cfef23ed7ac2ee476db210497a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:31:47 +0000 Subject: [PATCH 37/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- viewvc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/viewvc.spec b/viewvc.spec index 8880002..e3ef6c0 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -2,7 +2,7 @@ Name: viewvc Version: 1.1.26 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Browser interface for CVS and SVN version control repositories Group: Development/Tools @@ -135,6 +135,9 @@ with decent performance when run under Apache. %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 1.1.26-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 14 2018 Iryna Shcherbina - 1.1.26-5 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) From 5c39c0a9b778d6048022298e1ea18cabb3aaa3a4 Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Sat, 21 Jul 2018 23:20:37 +1000 Subject: [PATCH 38/46] Use correct python2 macros and binaries. --- viewvc.spec | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/viewvc.spec b/viewvc.spec index e3ef6c0..300bc03 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -1,4 +1,4 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python2_sitelib: %define python2_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: viewvc Version: 1.1.26 @@ -59,28 +59,28 @@ with decent performance when run under Apache. %install %{__rm} -rf %{buildroot} -%{__python} viewvc-install --destdir="%{buildroot}" --prefix="%{python_sitelib}/viewvc" +%{__python2} viewvc-install --destdir="%{buildroot}" --prefix="%{python2_sitelib}/viewvc" # Remove unneeded files -%{__rm} -f %{buildroot}%{python_sitelib}/viewvc/bin/mod_python/.htaccess +%{__rm} -f %{buildroot}%{python2_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 +%{__mv} %{buildroot}%{python2_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|/usr/local/bin/python|%{_bindir}/python2|g;' \ + -e 's|\s*/usr/bin/env python|%{_bindir}/python2|g;' \ -e 's|CONF_PATHNAME =.*|CONF_PATHNAME = r"%{_sysconfdir}/viewvc/viewvc.conf"|g;' \ - $(find %{buildroot}%{python_sitelib}/viewvc/ -type f) + $(find %{buildroot}%{python2_sitelib}/viewvc/ -type f) # Fix python files shebang for WSGI files -%{__sed} -i -e '1i#!%{_bindir}/python' \ - $(find %{buildroot}%{python_sitelib}/viewvc/ -type f -name '*.wsgi') +%{__sed} -i -e '1i#!%{_bindir}/python2' \ + $(find %{buildroot}%{python2_sitelib}/viewvc/ -type f -name '*.wsgi') # Set mode 755 on executable scripts -%{__grep} -rl '^#!' %{buildroot}%{python_sitelib}/viewvc | xargs %{__chmod} 0755 +%{__grep} -rl '^#!' %{buildroot}%{python2_sitelib}/viewvc | xargs %{__chmod} 0755 # Fix paths in configuration %{__perl} -pi \ @@ -88,34 +88,34 @@ with decent performance when run under Apache. -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 + %{buildroot}%{python2_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 +%{__install} -Dp -m0644 %{buildroot}%{python2_sitelib}/viewvc/viewvc.conf %{buildroot}%{_sysconfdir}/viewvc/viewvc.conf +%{__rm} -f %{buildroot}%{python2_sitelib}/viewvc/viewvc.conf +%{__install} -Dp -m0644 %{buildroot}%{python2_sitelib}/viewvc/cvsgraph.conf %{buildroot}%{_sysconfdir}/viewvc/cvsgraph.conf +%{__rm} -f %{buildroot}%{python2_sitelib}/viewvc/cvsgraph.conf +%{__install} -Dp -m0644 %{buildroot}%{python2_sitelib}/viewvc/mimetypes.conf %{buildroot}%{_sysconfdir}/viewvc/mimetypes.conf +%{__rm} -f %{buildroot}%{python2_sitelib}/viewvc/mimetypes.conf %{SOURCE4} >> %{buildroot}%{_sysconfdir}/viewvc/mimetypes.conf # Install Apache configuration and README %{__sed} -e s,__datadir__,%{_datadir}, \ - -e s,__python_sitelib__,%{python_sitelib}, %{SOURCE1} > viewvc-fcgi.conf + -e s,__python2_sitelib__,%{python2_sitelib}, %{SOURCE1} > viewvc-fcgi.conf %{__sed} -e s,__datadir__,%{_datadir}, \ - -e s,__python_sitelib__,%{python_sitelib}, %{SOURCE2} > viewvc-wsgi.conf + -e s,__python2_sitelib__,%{python2_sitelib}, %{SOURCE2} > viewvc-wsgi.conf %{__install} -Dp -m0644 viewvc-fcgi.conf %{buildroot}/etc/httpd/conf.d/viewvc-fcgi.conf %{__install} -Dp -m0644 viewvc-wsgi.conf %{buildroot}/etc/httpd/conf.d/viewvc-wsgi.conf %{__cp} %{SOURCE3} 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 +%{__chmod} 0644 %{buildroot}%{python2_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 +%{__mv} %{buildroot}%{python2_sitelib}/viewvc/bin/mod_python/viewvc.py \ + %{buildroot}%{python2_sitelib}/viewvc/bin/mod_python/viewvc-mp.py # Make spool directory for temp files %{__mkdir} -p %{buildroot}%{_localstatedir}/spool/viewvc @@ -123,7 +123,7 @@ with decent performance when run under Apache. %files %doc CHANGES README README.httpd INSTALL COMMITTERS LICENSE docs %config(noreplace) %{_sysconfdir}/viewvc -%{python_sitelib}/* +%{python2_sitelib}/* %{_datadir}/* %files httpd-fcgi From 748748d7e29423af49e059f71788ef930add03c2 Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Sat, 21 Jul 2018 23:29:11 +1000 Subject: [PATCH 39/46] Fix more paths, bump up release number. --- viewvc-fcgi.conf | 4 ++-- viewvc-lexer-mimetypes.py | 2 +- viewvc-wsgi.conf | 4 ++-- viewvc.spec | 5 ++++- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/viewvc-fcgi.conf b/viewvc-fcgi.conf index d51a7ff..faff311 100644 --- a/viewvc-fcgi.conf +++ b/viewvc-fcgi.conf @@ -1,7 +1,7 @@ -ScriptAlias /viewvc __python_sitelib__/viewvc/bin/wsgi/viewvc.fcgi +ScriptAlias /viewvc __python2_sitelib__/viewvc/bin/wsgi/viewvc.fcgi Alias /viewvc-static __datadir__/viewvc/templates/docroot - + Options -Indexes diff --git a/viewvc-lexer-mimetypes.py b/viewvc-lexer-mimetypes.py index 0faf8ac..59f74cc 100755 --- a/viewvc-lexer-mimetypes.py +++ b/viewvc-lexer-mimetypes.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 import sys import re diff --git a/viewvc-wsgi.conf b/viewvc-wsgi.conf index 9207b84..3061f46 100644 --- a/viewvc-wsgi.conf +++ b/viewvc-wsgi.conf @@ -1,7 +1,7 @@ -WSGIScriptAlias /viewvc __python_sitelib__/viewvc/bin/wsgi/viewvc.wsgi +WSGIScriptAlias /viewvc __python2_sitelib__/viewvc/bin/wsgi/viewvc.wsgi Alias /viewvc-static __datadir__/viewvc/templates/docroot - + Options -Indexes diff --git a/viewvc.spec b/viewvc.spec index 300bc03..51d24d1 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -2,7 +2,7 @@ Name: viewvc Version: 1.1.26 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Browser interface for CVS and SVN version control repositories Group: Development/Tools @@ -135,6 +135,9 @@ with decent performance when run under Apache. %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog +* Sat Jul 21 2018 Bojan Smojver - 1.1.26-7 +- use correct python2 macros and binaries + * Sat Jul 14 2018 Fedora Release Engineering - 1.1.26-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 67a6ccce98cf2eaac5ee4e1f3ad1e280b7ce7706 Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Tue, 11 Sep 2018 07:20:47 +1000 Subject: [PATCH 40/46] Explicitly change shebang lines to use python2. --- viewvc-1.1.26-explicit-python2.patch | 45 ++++++++++++++++++++++++++++ viewvc.spec | 3 +- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 viewvc-1.1.26-explicit-python2.patch diff --git a/viewvc-1.1.26-explicit-python2.patch b/viewvc-1.1.26-explicit-python2.patch new file mode 100644 index 0000000..1d25b2a --- /dev/null +++ b/viewvc-1.1.26-explicit-python2.patch @@ -0,0 +1,45 @@ +diff -ruN viewvc-1.1.26-v/bin/wsgi/query.fcgi viewvc-1.1.26/bin/wsgi/query.fcgi +--- viewvc-1.1.26-v/bin/wsgi/query.fcgi 2017-01-25 10:07:15.000000000 +1100 ++++ viewvc-1.1.26/bin/wsgi/query.fcgi 2018-09-11 07:08:20.308379973 +1000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # -*-python-*- + # + # Copyright (C) 1999-2017 The ViewCVS Group. All Rights Reserved. +diff -ruN viewvc-1.1.26-v/bin/wsgi/viewvc.fcgi viewvc-1.1.26/bin/wsgi/viewvc.fcgi +--- viewvc-1.1.26-v/bin/wsgi/viewvc.fcgi 2017-01-25 10:07:15.000000000 +1100 ++++ viewvc-1.1.26/bin/wsgi/viewvc.fcgi 2018-09-11 07:08:25.568361070 +1000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # -*-python-*- + # + # Copyright (C) 1999-2017 The ViewCVS Group. All Rights Reserved. +diff -ruN viewvc-1.1.26-v/lib/py2html.py viewvc-1.1.26/lib/py2html.py +--- viewvc-1.1.26-v/lib/py2html.py 2017-01-25 10:07:15.000000000 +1100 ++++ viewvc-1.1.26/lib/py2html.py 2018-09-11 07:08:35.838324166 +1000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python -u ++#!/usr/bin/python2 -u + + """ Python Highlighter Version: 0.8 + +diff -ruN viewvc-1.1.26-v/lib/vclib/ccvs/rcsparse/parse_rcs_file.py viewvc-1.1.26/lib/vclib/ccvs/rcsparse/parse_rcs_file.py +--- viewvc-1.1.26-v/lib/vclib/ccvs/rcsparse/parse_rcs_file.py 2017-01-25 10:07:15.000000000 +1100 ++++ viewvc-1.1.26/lib/vclib/ccvs/rcsparse/parse_rcs_file.py 2018-09-11 07:08:39.990309245 +1000 +@@ -1,4 +1,4 @@ +-#! /usr/bin/python ++#! /usr/bin/python2 + + # (Be in -*- python -*- mode.) + # +diff -ruN viewvc-1.1.26-v/lib/vclib/ccvs/rcsparse/run-tests.py viewvc-1.1.26/lib/vclib/ccvs/rcsparse/run-tests.py +--- viewvc-1.1.26-v/lib/vclib/ccvs/rcsparse/run-tests.py 2017-01-25 10:07:15.000000000 +1100 ++++ viewvc-1.1.26/lib/vclib/ccvs/rcsparse/run-tests.py 2018-09-11 07:08:50.617271056 +1000 +@@ -1,4 +1,4 @@ +-#! /usr/bin/python ++#! /usr/bin/python2 + + # (Be in -*- python -*- mode.) + # diff --git a/viewvc.spec b/viewvc.spec index 51d24d1..9a0aff0 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -13,6 +13,7 @@ Source1: viewvc-fcgi.conf Source2: viewvc-wsgi.conf Source3: README.httpd Source4: viewvc-lexer-mimetypes.py +Patch0: viewvc-1.1.26-explicit-python2.patch Obsoletes: %{name}-selinux < 1.0.3-13 Conflicts: selinux-policy < 2.5.10-2 @@ -53,7 +54,7 @@ ViewVC configuration for Apache/mod_wsgi. This package should provide ViewVC with decent performance when run under Apache. %prep -%setup -q +%autosetup %build From cf1e462fccabffdb96395f9c3ae0a8256a8de12a Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Tue, 11 Sep 2018 07:24:03 +1000 Subject: [PATCH 41/46] Bump up the release number, create changelog. --- viewvc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/viewvc.spec b/viewvc.spec index 9a0aff0..ffd3373 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -2,7 +2,7 @@ Name: viewvc Version: 1.1.26 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Browser interface for CVS and SVN version control repositories Group: Development/Tools @@ -136,6 +136,9 @@ with decent performance when run under Apache. %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog +* Tue Sep 11 2018 Bojan Smojver - 1.1.26-8 +- explicitly change shebang lines to use python2 + * Sat Jul 21 2018 Bojan Smojver - 1.1.26-7 - use correct python2 macros and binaries From bf3b59b05cf9c84bd69324a71e7d7478da5bee0b Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Tue, 11 Sep 2018 07:27:15 +1000 Subject: [PATCH 42/46] Specify the -p1 option for patching. --- viewvc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/viewvc.spec b/viewvc.spec index ffd3373..09dd416 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -54,7 +54,7 @@ ViewVC configuration for Apache/mod_wsgi. This package should provide ViewVC with decent performance when run under Apache. %prep -%autosetup +%autosetup -p1 %build From 2807372af1f3006d8ed50e1bc5366c6a0d2b5581 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:29 +0100 Subject: [PATCH 43/46] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- viewvc.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/viewvc.spec b/viewvc.spec index 09dd416..bc16481 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -5,7 +5,6 @@ Version: 1.1.26 Release: 8%{?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 @@ -36,7 +35,6 @@ but much more prettily than the average textual command-line program output. %package httpd-fcgi Summary: ViewVC configuration for Apache/mod_fcgid -Group: Development/Tools Obsoletes: viewvc-httpd < 1.1.13-2 Requires: httpd, %{name} = %{version}-%{release}, mod_fcgid, python2-flup @@ -46,7 +44,6 @@ with decent performance when run under Apache. %package httpd-wsgi Summary: ViewVC configuration for Apache/mod_wsgi -Group: Development/Tools Requires: httpd, %{name} = %{version}-%{release}, python2-mod_wsgi %description httpd-wsgi From 56a8333f0e78acf6a2481d4f9257f0e0ea9c686d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 11:16:01 +0000 Subject: [PATCH 44/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- viewvc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/viewvc.spec b/viewvc.spec index bc16481..e2d95fd 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -2,7 +2,7 @@ Name: viewvc Version: 1.1.26 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Browser interface for CVS and SVN version control repositories License: BSD @@ -133,6 +133,9 @@ with decent performance when run under Apache. %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 1.1.26-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Sep 11 2018 Bojan Smojver - 1.1.26-8 - explicitly change shebang lines to use python2 From bdf40fbfa048273d389602919d6ec9a05cafdc97 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 02:58:11 +0000 Subject: [PATCH 45/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- viewvc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/viewvc.spec b/viewvc.spec index e2d95fd..9924861 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -2,7 +2,7 @@ Name: viewvc Version: 1.1.26 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Browser interface for CVS and SVN version control repositories License: BSD @@ -133,6 +133,9 @@ with decent performance when run under Apache. %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 1.1.26-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 1.1.26-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 88fc2ab310363c31c534314c5da49e5b92e8b331 Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Fri, 9 Aug 2019 20:20:26 +1000 Subject: [PATCH 46/46] Python 2 is being removed, so retire this package. --- .gitignore | 20 -- README.httpd | 7 - dead.package | 1 + sources | 1 - viewvc-1.1.26-explicit-python2.patch | 45 --- viewvc-fcgi.conf | 31 --- viewvc-lexer-mimetypes.py | 49 ---- viewvc-wsgi.conf | 31 --- viewvc.spec | 396 --------------------------- 9 files changed, 1 insertion(+), 580 deletions(-) delete mode 100644 .gitignore delete mode 100644 README.httpd create mode 100644 dead.package delete mode 100644 sources delete mode 100644 viewvc-1.1.26-explicit-python2.patch delete mode 100644 viewvc-fcgi.conf delete mode 100755 viewvc-lexer-mimetypes.py delete mode 100644 viewvc-wsgi.conf delete mode 100644 viewvc.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 386b9a5..0000000 --- a/.gitignore +++ /dev/null @@ -1,20 +0,0 @@ -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 -/viewvc-1.1.15.tar.gz -/viewvc-1.1.16.tar.gz -/viewvc-1.1.17.tar.gz -/viewvc-1.1.18.tar.gz -/viewvc-1.1.19.tar.gz -/viewvc-1.1.20.tar.gz -/viewvc-1.1.21.tar.gz -/viewvc-1.1.22.tar.gz -/viewvc-1.1.23.tar.gz -/viewvc-1.1.24.tar.gz -/viewvc-1.1.26.tar.gz diff --git a/README.httpd b/README.httpd deleted file mode 100644 index 14ae0c8..0000000 --- a/README.httpd +++ /dev/null @@ -1,7 +0,0 @@ -In order to run ViewVC under Apache and mod_fcgid, you should install -viewvc-httpd-fcgi package. This package obsoletes the old view-httpd package. - -In order to run ViewVC under Apache and mod_wsgi, you should install -viewvc-httpd-wsgi package. - -The old mod_python setup is no longer supported in Fedora. diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..013a367 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Python 2 is being removed, so retire this package. diff --git a/sources b/sources deleted file mode 100644 index 5f9c1a3..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (viewvc-1.1.26.tar.gz) = af70d4344fe92f942debb407b6fad909e250ba2656499f5229e1c2f018dfbd783d0cebd28c49a429bd7b155bb6db02cead602384f91b99b7ced6aa365e32bb8e diff --git a/viewvc-1.1.26-explicit-python2.patch b/viewvc-1.1.26-explicit-python2.patch deleted file mode 100644 index 1d25b2a..0000000 --- a/viewvc-1.1.26-explicit-python2.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -ruN viewvc-1.1.26-v/bin/wsgi/query.fcgi viewvc-1.1.26/bin/wsgi/query.fcgi ---- viewvc-1.1.26-v/bin/wsgi/query.fcgi 2017-01-25 10:07:15.000000000 +1100 -+++ viewvc-1.1.26/bin/wsgi/query.fcgi 2018-09-11 07:08:20.308379973 +1000 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python2 - # -*-python-*- - # - # Copyright (C) 1999-2017 The ViewCVS Group. All Rights Reserved. -diff -ruN viewvc-1.1.26-v/bin/wsgi/viewvc.fcgi viewvc-1.1.26/bin/wsgi/viewvc.fcgi ---- viewvc-1.1.26-v/bin/wsgi/viewvc.fcgi 2017-01-25 10:07:15.000000000 +1100 -+++ viewvc-1.1.26/bin/wsgi/viewvc.fcgi 2018-09-11 07:08:25.568361070 +1000 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python2 - # -*-python-*- - # - # Copyright (C) 1999-2017 The ViewCVS Group. All Rights Reserved. -diff -ruN viewvc-1.1.26-v/lib/py2html.py viewvc-1.1.26/lib/py2html.py ---- viewvc-1.1.26-v/lib/py2html.py 2017-01-25 10:07:15.000000000 +1100 -+++ viewvc-1.1.26/lib/py2html.py 2018-09-11 07:08:35.838324166 +1000 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -u -+#!/usr/bin/python2 -u - - """ Python Highlighter Version: 0.8 - -diff -ruN viewvc-1.1.26-v/lib/vclib/ccvs/rcsparse/parse_rcs_file.py viewvc-1.1.26/lib/vclib/ccvs/rcsparse/parse_rcs_file.py ---- viewvc-1.1.26-v/lib/vclib/ccvs/rcsparse/parse_rcs_file.py 2017-01-25 10:07:15.000000000 +1100 -+++ viewvc-1.1.26/lib/vclib/ccvs/rcsparse/parse_rcs_file.py 2018-09-11 07:08:39.990309245 +1000 -@@ -1,4 +1,4 @@ --#! /usr/bin/python -+#! /usr/bin/python2 - - # (Be in -*- python -*- mode.) - # -diff -ruN viewvc-1.1.26-v/lib/vclib/ccvs/rcsparse/run-tests.py viewvc-1.1.26/lib/vclib/ccvs/rcsparse/run-tests.py ---- viewvc-1.1.26-v/lib/vclib/ccvs/rcsparse/run-tests.py 2017-01-25 10:07:15.000000000 +1100 -+++ viewvc-1.1.26/lib/vclib/ccvs/rcsparse/run-tests.py 2018-09-11 07:08:50.617271056 +1000 -@@ -1,4 +1,4 @@ --#! /usr/bin/python -+#! /usr/bin/python2 - - # (Be in -*- python -*- mode.) - # diff --git a/viewvc-fcgi.conf b/viewvc-fcgi.conf deleted file mode 100644 index faff311..0000000 --- a/viewvc-fcgi.conf +++ /dev/null @@ -1,31 +0,0 @@ -ScriptAlias /viewvc __python2_sitelib__/viewvc/bin/wsgi/viewvc.fcgi -Alias /viewvc-static __datadir__/viewvc/templates/docroot - - - Options -Indexes - - - # Apache 2.4 - Require local - - - # Apache 2.2 - Order allow,deny - Allow from 127.0.0.1 - Allow from ::1 - - - - - Options -Indexes - - # Apache 2.4 - Require local - - - # Apache 2.2 - Order allow,deny - Allow from 127.0.0.1 - Allow from ::1 - - diff --git a/viewvc-lexer-mimetypes.py b/viewvc-lexer-mimetypes.py deleted file mode 100755 index 59f74cc..0000000 --- a/viewvc-lexer-mimetypes.py +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/python2 - -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:] diff --git a/viewvc-wsgi.conf b/viewvc-wsgi.conf deleted file mode 100644 index 3061f46..0000000 --- a/viewvc-wsgi.conf +++ /dev/null @@ -1,31 +0,0 @@ -WSGIScriptAlias /viewvc __python2_sitelib__/viewvc/bin/wsgi/viewvc.wsgi -Alias /viewvc-static __datadir__/viewvc/templates/docroot - - - Options -Indexes - - - # Apache 2.4 - Require local - - - # Apache 2.2 - Order allow,deny - Allow from 127.0.0.1 - Allow from ::1 - - - - - Options -Indexes - - # Apache 2.4 - Require local - - - # Apache 2.2 - Order allow,deny - Allow from 127.0.0.1 - Allow from ::1 - - diff --git a/viewvc.spec b/viewvc.spec deleted file mode 100644 index 9924861..0000000 --- a/viewvc.spec +++ /dev/null @@ -1,396 +0,0 @@ -%{!?python2_sitelib: %define python2_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} - -Name: viewvc -Version: 1.1.26 -Release: 10%{?dist} -Summary: Browser interface for CVS and SVN version control repositories - -License: BSD -URL: http://www.viewvc.org/ -Source0: http://www.viewvc.org/%{name}-%{version}.tar.gz -Source1: viewvc-fcgi.conf -Source2: viewvc-wsgi.conf -Source3: README.httpd -Source4: viewvc-lexer-mimetypes.py -Patch0: viewvc-1.1.26-explicit-python2.patch - -Obsoletes: %{name}-selinux < 1.0.3-13 -Conflicts: selinux-policy < 2.5.10-2 - -BuildArch: noarch -BuildRequires: python2-devel >= 2.0, python2-pygments, perl-interpreter -Requires: rcs, diffutils -Requires: subversion >= 1.2 -Requires: python2-subversion >= 1.2 -Requires: cvsgraph -Requires: python2-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. - -%package httpd-fcgi -Summary: ViewVC configuration for Apache/mod_fcgid -Obsoletes: viewvc-httpd < 1.1.13-2 -Requires: httpd, %{name} = %{version}-%{release}, mod_fcgid, python2-flup - -%description httpd-fcgi -ViewVC configuration for Apache/mod_fcgid. This package should provide ViewVC -with decent performance when run under Apache. - -%package httpd-wsgi -Summary: ViewVC configuration for Apache/mod_wsgi -Requires: httpd, %{name} = %{version}-%{release}, python2-mod_wsgi - -%description httpd-wsgi -ViewVC configuration for Apache/mod_wsgi. This package should provide ViewVC -with decent performance when run under Apache. - -%prep -%autosetup -p1 - -%build - -%install -%{__rm} -rf %{buildroot} -%{__python2} viewvc-install --destdir="%{buildroot}" --prefix="%{python2_sitelib}/viewvc" - -# Remove unneeded files -%{__rm} -f %{buildroot}%{python2_sitelib}/viewvc/bin/mod_python/.htaccess - -# Move non-python to /usr/share -%{__mkdir} -p %{buildroot}%{_datadir}/viewvc -%{__mv} %{buildroot}%{python2_sitelib}/viewvc/templates %{buildroot}%{_datadir}/viewvc - -# Fix python files shebang and CONF_PATHNAME -%{__perl} -pi \ - -e 's|/usr/local/bin/python|%{_bindir}/python2|g;' \ - -e 's|\s*/usr/bin/env python|%{_bindir}/python2|g;' \ - -e 's|CONF_PATHNAME =.*|CONF_PATHNAME = r"%{_sysconfdir}/viewvc/viewvc.conf"|g;' \ - $(find %{buildroot}%{python2_sitelib}/viewvc/ -type f) - -# Fix python files shebang for WSGI files -%{__sed} -i -e '1i#!%{_bindir}/python2' \ - $(find %{buildroot}%{python2_sitelib}/viewvc/ -type f -name '*.wsgi') - -# Set mode 755 on executable scripts -%{__grep} -rl '^#!' %{buildroot}%{python2_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}%{python2_sitelib}/viewvc/viewvc.conf - -# Install config to sysconf directory -%{__install} -Dp -m0644 %{buildroot}%{python2_sitelib}/viewvc/viewvc.conf %{buildroot}%{_sysconfdir}/viewvc/viewvc.conf -%{__rm} -f %{buildroot}%{python2_sitelib}/viewvc/viewvc.conf -%{__install} -Dp -m0644 %{buildroot}%{python2_sitelib}/viewvc/cvsgraph.conf %{buildroot}%{_sysconfdir}/viewvc/cvsgraph.conf -%{__rm} -f %{buildroot}%{python2_sitelib}/viewvc/cvsgraph.conf -%{__install} -Dp -m0644 %{buildroot}%{python2_sitelib}/viewvc/mimetypes.conf %{buildroot}%{_sysconfdir}/viewvc/mimetypes.conf -%{__rm} -f %{buildroot}%{python2_sitelib}/viewvc/mimetypes.conf - -%{SOURCE4} >> %{buildroot}%{_sysconfdir}/viewvc/mimetypes.conf - -# Install Apache configuration and README -%{__sed} -e s,__datadir__,%{_datadir}, \ - -e s,__python2_sitelib__,%{python2_sitelib}, %{SOURCE1} > viewvc-fcgi.conf -%{__sed} -e s,__datadir__,%{_datadir}, \ - -e s,__python2_sitelib__,%{python2_sitelib}, %{SOURCE2} > viewvc-wsgi.conf -%{__install} -Dp -m0644 viewvc-fcgi.conf %{buildroot}/etc/httpd/conf.d/viewvc-fcgi.conf -%{__install} -Dp -m0644 viewvc-wsgi.conf %{buildroot}/etc/httpd/conf.d/viewvc-wsgi.conf -%{__cp} %{SOURCE3} README.httpd - -# mod_python files mustn't be executable since they don't have shebang -# make rpmlint happy! -%{__chmod} 0644 %{buildroot}%{python2_sitelib}/viewvc/bin/mod_python/*.py - -# Rename viewvc.py to viewvc-mp.py for mod_python to avoid import cycle errors -%{__mv} %{buildroot}%{python2_sitelib}/viewvc/bin/mod_python/viewvc.py \ - %{buildroot}%{python2_sitelib}/viewvc/bin/mod_python/viewvc-mp.py - -# Make spool directory for temp files -%{__mkdir} -p %{buildroot}%{_localstatedir}/spool/viewvc - -%files -%doc CHANGES README README.httpd INSTALL COMMITTERS LICENSE docs -%config(noreplace) %{_sysconfdir}/viewvc -%{python2_sitelib}/* -%{_datadir}/* - -%files httpd-fcgi -%config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc-fcgi.conf -%attr(0700,apache,apache) %{_localstatedir}/spool/viewvc - -%files httpd-wsgi -%config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc-wsgi.conf -%attr(0700,apache,apache) %{_localstatedir}/spool/viewvc - -%changelog -* Sat Jul 27 2019 Fedora Release Engineering - 1.1.26-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 1.1.26-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Sep 11 2018 Bojan Smojver - 1.1.26-8 -- explicitly change shebang lines to use python2 - -* Sat Jul 21 2018 Bojan Smojver - 1.1.26-7 -- use correct python2 macros and binaries - -* Sat Jul 14 2018 Fedora Release Engineering - 1.1.26-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 14 2018 Iryna Shcherbina - 1.1.26-5 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Fri Feb 09 2018 Fedora Release Engineering - 1.1.26-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.1.26-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1.1.26-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Jan 31 2017 Bojan Smojver - 1.1.26-1 -- bump up to 1.1.26 - -* Wed Jul 20 2016 Bojan Smojver - 1.1.24-4 -- add perl to build requirements - -* Tue Jul 19 2016 Fedora Release Engineering - 1.1.24-3 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Fri Feb 05 2016 Fedora Release Engineering - 1.1.24-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Oct 6 2015 Bojan Smojver - 1.1.24-1 -- bump up to 1.1.24 - -* Fri Jun 19 2015 Fedora Release Engineering - 1.1.23-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu Nov 6 2014 Bojan Smojver - 1.1.23-1 -- bump up to 1.1.23 - -* Sun Jun 08 2014 Fedora Release Engineering - 1.1.22-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed Jan 15 2014 Bojan Smojver - 1.1.22-1 -- bump up to 1.1.22 - -* Sat Sep 14 2013 Bojan Smojver - 1.1.21-1 -- bump up to 1.1.21 - -* Sun Aug 04 2013 Fedora Release Engineering - 1.1.20-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Apr 25 2013 Bojan Smojver - 1.1.20-1 -- bump up to 1.1.20 - -* Tue Apr 23 2013 Bojan Smojver - 1.1.19-1 -- bump up to 1.1.19 - -* Fri Mar 1 2013 Bojan Smojver - 1.1.18-1 -- bump up to 1.1.18 - -* Fri Feb 15 2013 Fedora Release Engineering - 1.1.17-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sat Jan 12 2013 Bojan Smojver - 1.1.17-3 -- add default authorisation for CGI scripts too - -* Wed Oct 31 2012 Bojan Smojver - 1.1.17-2 -- fix bug #871492 - -* Fri Oct 26 2012 Bojan Smojver - 1.1.17-1 -- bump up to 1.1.17 - -* Thu Oct 25 2012 Bojan Smojver - 1.1.16-1 -- bump up to 1.1.16 -- drop patch for CVE-2012-4533, part of the release - -* Mon Oct 22 2012 Bojan Smojver - 1.1.15-3 -- patch CVE-2012-4533, bug #868606 - -* Sun Jul 22 2012 Fedora Release Engineering - 1.1.15-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jun 23 2012 Bojan Smojver - 1.1.15-1 -- bump up to 1.1.15 - -* Wed Jun 13 2012 Bojan Smojver - 1.1.14-1 -- bump up to 1.1.14 - -* Sun Apr 29 2012 Bojan Smojver - 1.1.13-2 -- drop viewvc-httpd package, which depends on mod_python -- introduce viewvc-httpd-fcgi, obsoletes viewvc-httpd -- introduce viewvc-httpd-wsgi - -* Tue Jan 24 2012 Bojan Smojver - 1.1.13-1 -- bump up to 1.1.13 - -* Sat Jan 14 2012 Fedora Release Engineering - 1.1.12-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Fri Nov 4 2011 Bojan Smojver - 1.1.12-1 -- bump up to 1.1.12 - -* Tue Nov 1 2011 Bojan Smojver - 1.1.11-3 -- require subversion-python - -* Wed Jun 1 2011 Bojan Smojver - 1.1.11-2 -- 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 - 1.1.11-1 -- bump up to 1.1.11 - -* Wed Mar 16 2011 Bojan Smojver - 1.1.10-1 -- bump up to 1.1.10 - -* Mon Feb 21 2011 Bojan Smojver - 1.1.9-1 -- bump up to 1.1.9 - -* Mon Feb 07 2011 Fedora Release Engineering - 1.1.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Dec 6 2010 Bojan Smojver - 1.1.8-1 -- bump up to 1.1.8 - -* Fri Sep 10 2010 Bojan Smojver - 1.1.7-1 -- bump up to 1.1.7 -- address bug #565805, allow access to templates from localhost - -* Thu Jul 22 2010 David Malcolm - 1.1.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Thu Jun 3 2010 Bojan Smojver - 1.1.6-1 -- bump up to 1.1.6 -- drop patch for upstream issue #454 - -* Tue May 25 2010 Bojan Smojver - 1.1.5-2 -- patch upstream issue #454 - -* Tue Mar 30 2010 Bojan Smojver - 1.1.5-1 -- bump up to 1.1.5 - -* Thu Mar 11 2010 Bojan Smojver - 1.1.4-1 -- bump up to 1.1.4 - -* Fri Jan 8 2010 Bojan Smojver - 1.1.3-2 -- patch upstream issue #445 - -* Wed Dec 23 2009 Bojan Smojver - 1.1.3-1 -- bump up to 1.1.3 -- drop patch for upstream issue #427 - -* Wed Sep 23 2009 Bojan Smojver - 1.1.2-5 -- patch upstream issue #427 - -* Thu Aug 13 2009 Bojan Smojver - 1.1.2-4 -- try one more time - -* Thu Aug 13 2009 Bojan Smojver - 1.1.2-3 -- better mimetypes.conf generation script - -* Wed Aug 12 2009 Bojan Smojver - 1.1.2-2 -- fix replacement of various config variables - -* Wed Aug 12 2009 Bojan Smojver - 1.1.2-1 -- bump up to 1.1.2 -- security fix: validate the 'view' parameter to avoid XSS attack -- security fix: avoid printing illegal parameter names and values - -* Tue Aug 11 2009 Bojan Smojver - 1.1.1-3 -- install mimetypes.conf -- populate mimetypes.conf with what pygments understands - -* Sun Jul 26 2009 Fedora Release Engineering - 1.1.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Jun 4 2009 Bojan Smojver - 1.1.1-1 -- Bump up to 1.1.1 - -* Thu May 14 2009 Bojan Smojver - 1.1.0-1 -- Final 1.1.0 - -* Wed Feb 25 2009 Fedora Release Engineering - 1.1.0-0.beta1.1.2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 1.1.0-0.beta1.1.1 -- Rebuild for Python 2.6 - -* Thu Nov 6 2008 Bojan Smojver - 1.1.0-0.beta1.1 -- Rebase to 1.1.x - -* Mon Oct 27 2008 Bojan Smojver - 1.0.7-2 -- Depend on webserver to avoid pulling in Apache/mod_python (bug #457691) -- Provide viewvc-httpd package for mod_python specific configuration - -* Wed Oct 15 2008 Bojan Smojver - 1.0.7-1 -- Bump up to 1.0.7 - -* Fri Sep 19 2008 Bojan Smojver - 1.0.6-1 -- Bump up to 1.0.6 - -* Fri Feb 29 2008 Bojan Smojver - 1.0.5-1 -- Bump up to 1.0.5 - -* Sun Jun 3 2007 Bojan Smojver - 1.0.4-2 -- Avoid import cycle errors (temporary fix) - -* Tue May 15 2007 Bojan Smojver - 1.0.4-1 -- Bump up to 1.0.4 - -* Wed Mar 28 2007 Bojan Smojver - 1.0.3-13 -- Supply obsoletes/conflicts - (suggestions by Peter Gordon, Bernard Johnson and Ville Skyttä) - -* Thu Mar 22 2007 Bojan Smojver - 1.0.3-12 -- Drop selinux package, required context now in official policy - -* Fri Mar 09 2007 Bojan Smojver - 1.0.3-11 -- Bump for tag - -* Tue Mar 06 2007 Bojan Smojver - 1.0.3-10 -- Enable enscript only when available - -* Tue Mar 06 2007 Bojan Smojver - 1.0.3-9 -- Enable cvsgraph - -* Sun Mar 04 2007 Bojan Smojver - 1.0.3-8 -- EPEL support patch by Bernard Johnson - -* Sat Mar 03 2007 Bojan Smojver - 1.0.3-7 -- Incorporate suggestions from package review process by Bernard Johnson - -* Sat Mar 03 2007 Bojan Smojver - 1.0.3-6 -- Use restorecon instead of chcon - -* Fri Mar 02 2007 Bojan Smojver - 1.0.3-5 -- SELinux integration - -* Fri Mar 02 2007 Bojan Smojver - 1.0.3-4 -- Incorporate suggestions from package review process by Bernard Johnson - -* Fri Mar 02 2007 Bojan Smojver - 1.0.3-3 -- Move non-python files out of %%{python_sitelib} - -* Thu Mar 01 2007 Bojan Smojver - 1.0.3-2 -- Incorporate suggestions from package review process by Bernard Johnson - -* Thu Mar 01 2007 Bojan Smojver - 1.0.3-1 -- Initial release, 1.0.3 -- Based on package provided by Dag Wieers