From 4c87fa2982fb371033b6e20cb5bf30eb2a94d652 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:03:58 +0000 Subject: [PATCH 01/23] - 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 02/23] 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 03/23] - 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 04/23] - 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 05/23] 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 06/23] 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 07/23] 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 08/23] 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 09/23] - 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 10/23] 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 11/23] 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 12/23] 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 13/23] 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 14/23] 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 15/23] 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 16/23] - 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 17/23] - 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 18/23] 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 From 10ee55bbd678a03312cf444a668ce4c986e2afed Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Wed, 6 May 2020 23:17:15 +1000 Subject: [PATCH 19/23] Bump up to 1.1.28. CVE-2020-5283. --- sources | 2 +- viewvc.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 5f9c1a3..b525457 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (viewvc-1.1.26.tar.gz) = af70d4344fe92f942debb407b6fad909e250ba2656499f5229e1c2f018dfbd783d0cebd28c49a429bd7b155bb6db02cead602384f91b99b7ced6aa365e32bb8e +SHA512 (viewvc-1.1.28.tar.gz) = 719baebd31fa321e7f069a60f6d77f09c0b1b4cfbb0c332ba091be0de97b4f9f439b65f15ef03bb11d515b37ef142937967974030acd9257a883208d191e3833 diff --git a/viewvc.spec b/viewvc.spec index 8d5ddaa..26991a5 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.26 +Version: 1.1.28 Release: 1%{?dist} Summary: Browser interface for CVS and SVN version control repositories @@ -142,6 +142,10 @@ with decent performance when run under Apache. %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog +* Wed May 6 2020 Bojan Smojver - 1.1.28-1 +- bump up to 1.1.28 +- CVE-2020-5283 + * Tue Jan 31 2017 Bojan Smojver - 1.1.26-1 - bump up to 1.1.26 From e52ebf51358671fa7aa8f30f16b42acb606dc0c9 Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Wed, 4 Jan 2023 10:10:29 +1100 Subject: [PATCH 20/23] Bump up to 1.1.29, CVE-2023-22456. --- .gitignore | 1 + sources | 2 +- viewvc.spec | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 386b9a5..ce5405c 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ viewvc-1.1.6.tar.gz /viewvc-1.1.23.tar.gz /viewvc-1.1.24.tar.gz /viewvc-1.1.26.tar.gz +/viewvc-1.1.29.tar.gz diff --git a/sources b/sources index b525457..b88ad3f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (viewvc-1.1.28.tar.gz) = 719baebd31fa321e7f069a60f6d77f09c0b1b4cfbb0c332ba091be0de97b4f9f439b65f15ef03bb11d515b37ef142937967974030acd9257a883208d191e3833 +SHA512 (viewvc-1.1.29.tar.gz) = f4dacad46d3802dcdf8ff0cba9fc72516bb9ef590ad986a1854fb485faa055277287f9aa145c4dc077cc44763db4c61658f58da7423b2dd8926e9872a1c33ca6 diff --git a/viewvc.spec b/viewvc.spec index 26991a5..978581f 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.28 +Version: 1.1.29 Release: 1%{?dist} Summary: Browser interface for CVS and SVN version control repositories @@ -142,6 +142,10 @@ with decent performance when run under Apache. %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog +* Wed Jan 4 2023 Bojan Smojver - 1.1.29-1 +- bump up to 1.1.29 +- CVE-2023-22456 + * Wed May 6 2020 Bojan Smojver - 1.1.28-1 - bump up to 1.1.28 - CVE-2020-5283 From 151153f409836312c8de5dd8cba9fdadb843d7ea Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Wed, 4 Jan 2023 10:15:22 +1100 Subject: [PATCH 21/23] Define __python to be python2 explicitly. --- viewvc.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/viewvc.spec b/viewvc.spec index 978581f..281e61d 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -1,3 +1,4 @@ +%define __python /usr/bin/python2 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: viewvc From c493afd6e05d9ec8b9ed926b33b1cdbeb4a30015 Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Thu, 5 Jan 2023 11:26:49 +1100 Subject: [PATCH 22/23] Update to 1.1.30, CVE-2023-22464. --- viewvc.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/viewvc.spec b/viewvc.spec index 281e61d..da23069 100644 --- a/viewvc.spec +++ b/viewvc.spec @@ -1,8 +1,8 @@ -%define __python /usr/bin/python2 +%global __python /usr/bin/python2 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: viewvc -Version: 1.1.29 +Version: 1.1.30 Release: 1%{?dist} Summary: Browser interface for CVS and SVN version control repositories @@ -143,6 +143,10 @@ with decent performance when run under Apache. %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc %changelog +* Thu Jan 5 2023 Bojan Smojver - 1.1.30-1 +- bump up to 1.1.30 +- CVE-2023-22464 + * Wed Jan 4 2023 Bojan Smojver - 1.1.29-1 - bump up to 1.1.29 - CVE-2023-22456 From 8e3e3f6b1e5d913283a7a639e5d332dffcda1a83 Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Thu, 5 Jan 2023 11:30:24 +1100 Subject: [PATCH 23/23] Upload new source tarball. --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index ce5405c..287af3d 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ viewvc-1.1.6.tar.gz /viewvc-1.1.24.tar.gz /viewvc-1.1.26.tar.gz /viewvc-1.1.29.tar.gz +/viewvc-1.1.30.tar.gz diff --git a/sources b/sources index b88ad3f..3e122b6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (viewvc-1.1.29.tar.gz) = f4dacad46d3802dcdf8ff0cba9fc72516bb9ef590ad986a1854fb485faa055277287f9aa145c4dc077cc44763db4c61658f58da7423b2dd8926e9872a1c33ca6 +SHA512 (viewvc-1.1.30.tar.gz) = 389e09a0605f684879a20e00c9a90b91ec7c3720eefba611407d981fa342ca2f9787e7cda527fcc93581fbc0cdb712cd3e0ce768eb006575b88a09c87fda4a47