Compare commits

...
Sign in to create a new pull request.

3 commits

Author SHA1 Message Date
Bojan Smojver
6da101f5c8 Rework python2 patch to match 1.1.28. 2020-05-06 22:55:01 +10:00
Bojan Smojver
871f703201 Remove patch for py2html.py - no longer exists. 2020-05-06 22:48:20 +10:00
Bojan Smojver
41678ed709 Bump up to 1.1.28. CVE-2020-5283. 2020-05-06 22:39:43 +10:00
4 changed files with 11 additions and 15 deletions

1
.gitignore vendored
View file

@ -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.28.tar.gz

View file

@ -1 +1 @@
SHA512 (viewvc-1.1.26.tar.gz) = af70d4344fe92f942debb407b6fad909e250ba2656499f5229e1c2f018dfbd783d0cebd28c49a429bd7b155bb6db02cead602384f91b99b7ced6aa365e32bb8e
SHA512 (viewvc-1.1.28.tar.gz) = 719baebd31fa321e7f069a60f6d77f09c0b1b4cfbb0c332ba091be0de97b4f9f439b65f15ef03bb11d515b37ef142937967974030acd9257a883208d191e3833

View file

@ -6,7 +6,7 @@ diff -ruN viewvc-1.1.26-v/bin/wsgi/query.fcgi viewvc-1.1.26/bin/wsgi/query.fcgi
+#!/usr/bin/python2
# -*-python-*-
#
# Copyright (C) 1999-2017 The ViewCVS Group. All Rights Reserved.
# Copyright (C) 1999-2020 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
@ -15,16 +15,7 @@ diff -ruN viewvc-1.1.26-v/bin/wsgi/viewvc.fcgi viewvc-1.1.26/bin/wsgi/viewvc.fcg
+#!/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
# Copyright (C) 1999-2020 The ViewCVS Group. All Rights Reserved.
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

View file

@ -1,8 +1,8 @@
%{!?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: 9%{?dist}
Version: 1.1.28
Release: 1%{?dist}
Summary: Browser interface for CVS and SVN version control repositories
License: BSD
@ -12,7 +12,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
Patch0: viewvc-1.1.28-explicit-python2.patch
Obsoletes: %{name}-selinux < 1.0.3-13
Conflicts: selinux-policy < 2.5.10-2
@ -133,6 +133,10 @@ with decent performance when run under Apache.
%attr(0700,apache,apache) %{_localstatedir}/spool/viewvc
%changelog
* Wed May 6 2020 Bojan Smojver <bojan@rexursive.com> - 1.1.28-1
- bump up to 1.1.28
- CVE-2020-5283
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.26-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild