Merge remote-tracking branch 'origin/master' into epel7

2 files changed, 9 insertions, 5 deletions

diff --git a/cgit.spec b/cgit.spec
index 44816f8..06974fb 100644
--- a/cgit.spec
+++ b/cgit.spec
@@ -1,6 +1,6 @@
 # Review bug: https://bugzilla.redhat.com/479723
 
-%global gitver      2.3.2
+%global gitver      2.7.0
 %global cachedir    %{_localstatedir}/cache/%{name}
 %global filterdir   %{_libexecdir}/%{name}/filters
 %global scriptdir   %{_localstatedir}/www/cgi-bin
@@ -35,8 +35,8 @@ make V=1 %{?_smp_mflags} \\\
      prefix=%{_prefix}
 
 Name:           cgit
-Version:        0.11.2
-Release:        3%{?dist}
+Version:        0.12
+Release:        1%{?dist}
 Summary:        A fast web interface for git
 
 Group:          Development/Tools
@@ -158,6 +158,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Jan 16 2016 Kevin Fenzi <kevin@scrye.com> - 0.12-1
+- Update to 0.12. Fixes bug #1298912
+- Fixes CVE-2016-1899 CVE-2016-1900 CVE-2016-1901
+
 * Sat Sep 05 2015 Kevin Fenzi <kevin@scrye.com> 0.11.2-3
 - Fix up logic around webserver and httpd.
 - On Fedora require webserver and httpd-filesystem
diff --git a/sources b/sources
index 6d3dfcb..338a61f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-dbafc4e19c715c5ee9ed0cd9d0fda9fa  cgit-0.11.2.tar.xz
-56701b3b1815c8bbfd7b43b4773adad7  git-2.3.2.tar.xz
+0214e04f7041f835c5c38f2b78eccced  git-2.7.0.tar.xz
+192efcca82bf3bf07cd2746685a9f87a  cgit-0.12.tar.xz