From cb348eae96c408caf117818cab8c32aa33a52196 Mon Sep 17 00:00:00 2001
From: Bojan Smojver <bojan@rexursive.com>
Date: Tue, 24 Jan 2012 15:02:33 +1100
Subject: [PATCH 1/2] Do not carry F-17 log entry.

---
 viewvc.spec | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/viewvc.spec b/viewvc.spec
index f79bfcb..e74c97a 100644
--- a/viewvc.spec
+++ b/viewvc.spec
@@ -122,9 +122,6 @@ with decent performance when run under Apache.
 * Tue Jan 24 2012 Bojan Smojver <bojan@rexursive.com> - 1.1.13-1
 - bump up to 1.1.13
 
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.12-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
 * Fri Nov  4 2011 Bojan Smojver <bojan@rexursive.com> - 1.1.12-1
 - bump up to 1.1.12
 

From 15d1127765ae45c94e21667cecf1856c6a98448d Mon Sep 17 00:00:00 2001
From: Bojan Smojver <bojan@rexursive.com>
Date: Thu, 25 Oct 2012 09:49:01 +1100
Subject: [PATCH 2/2] 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 e06e751..cea19cf 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 <bojan@rexursive.com> - 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 <bojan@rexursive.com> - 1.1.15-3
 - patch CVE-2012-4533, bug #868606