From 637b84512621d124edd19df2f1d33dc3d89f76f1 Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz@pobox.com>
Date: Mon, 27 Sep 2010 18:18:30 -0400
Subject: Appy upstream git patch for CVE-2010-2542 (#618108)

---
 cgit.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'cgit.spec')

diff --git a/cgit.spec b/cgit.spec
index 48bbacf..2572bfa 100644
--- a/cgit.spec
+++ b/cgit.spec
@@ -17,7 +17,7 @@ make V=1 %{?_smp_mflags} \\\
 
 Name:           cgit
 Version:        0.8.2.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A fast webinterface for git
 
 Group:          Development/Tools
@@ -28,6 +28,7 @@ Source1:        http://www.kernel.org/pub/software/scm/git/git-%{gitver}.tar.bz2
 Source2:        cgitrc
 Source3:        cgit.httpd
 Source4:        README.SELinux
+Patch0:         cgit-0.8.2.1-CVE-2010-2542.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %if 0%{?fedora}
@@ -50,6 +51,8 @@ rm -rf git
 mv git-%{gitver} git
 sed -i 's/^\(CFLAGS = \).*/\1%{optflags}/' git/Makefile
 
+%patch0 -p1
+
 # add README.SELinux
 cp -p %{SOURCE4} .
 
@@ -81,6 +84,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Sep 27 2010 Todd Zullinger <tmz@pobox.com> - 0.8.2.1-4
+- Appy upstream git patch for CVE-2010-2542 (#618108)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 0.8.2.1-3
 - rebuilt with new openssl
 
-- 
cgit