[cgit/el5/master: 2/7] Update to 0.9

[Todd Zullinger]

commit a94947b458229eef750191c79984f66d2388ebf9
Author: Todd Zullinger <tmz at pobox.com>
Date:   Sun Mar 6 11:29:53 2011 -0500

    Update to 0.9
    
    - Fixes: CVE-2011-1027
      http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-1027

 .gitignore                       |    7 +++++--
 cgit-0.8.2.1-CVE-2010-2542.patch |   12 ------------
 cgit.spec                        |   28 +++++++++++++++-------------
 sources                          |    4 ++--
 4 files changed, 22 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index db6ba5f..f12ecca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
-cgit-0.8.2.1.tar.bz2
-git-1.6.1.1.tar.bz2
+*~
+*.rpm
+*.tar.bz2
+/.build*.log
+/cgit-*/
diff --git a/cgit.spec b/cgit.spec
index d7b0218..4ccc176 100644
--- a/cgit.spec
+++ b/cgit.spec
@@ -1,11 +1,11 @@
 # Review bug: https://bugzilla.redhat.com/479723
 
-%define gitver      1.6.1.1
-%define cachedir    %{_localstatedir}/cache/cgit
-%define scriptdir   %{_localstatedir}/www/cgi-bin
-%define cgitdata    %{_datadir}/cgit
+%global gitver      1.7.4
+%global cachedir    %{_localstatedir}/cache/%{name}
+%global scriptdir   %{_localstatedir}/www/cgi-bin
+%global cgitdata    %{_datadir}/%{name}
 
-%define make_cgit \
+%global make_cgit \
 export CFLAGS="%{optflags}" \
 make V=1 %{?_smp_mflags} \\\
      DESTDIR=%{buildroot} \\\
@@ -16,9 +16,9 @@ make V=1 %{?_smp_mflags} \\\
      CGIT_DATA_PATH=%{cgitdata}
 
 Name:           cgit
-Version:        0.8.2.1
-Release:        5%{?dist}
-Summary:        A fast webinterface for git
+Version:        0.9
+Release:        1%{?dist}
+Summary:        A fast web interface for git
 
 Group:          Development/Tools
 License:        GPLv2
@@ -28,7 +28,6 @@ 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}
@@ -40,8 +39,7 @@ BuildRequires:  openssl-devel
 Requires:       httpd
 
 %description
-This is an attempt to create a fast web interface for the git scm,
-using a builtin cache to decrease server io-pressure.
+Cgit is a fast web interface for git.  It uses caching to increase performance.
 
 %prep
 %setup -q -a 1
@@ -51,8 +49,6 @@ rm -rf git
 mv git-%{gitver} git
 sed -i 's/^\(CFLAGS = \).*/\1%{optflags}/' git/Makefile
 
-%patch0 -p1
-
 # add README.SELinux
 cp -p %{SOURCE4} .
 
@@ -69,6 +65,7 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/cgitrc
 install -p -m0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/httpd/conf.d/cgit.conf
 install -d -m0755 %{buildroot}%{cachedir}
 
+
 %clean
 rm -rf %{buildroot}
 
@@ -84,6 +81,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Mar 06 2011 Todd Zullinger <tmz at pobox.com> - 0.9-1
+- Update to 0.9
+- Fixes: CVE-2011-1027
+  http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-1027
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.2.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 68fa011..e7a7dd3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-33e56f0621e53327f89233c7ccb7d8be  cgit-0.8.2.1.tar.bz2
-d2b6925cb03e1e33911fdf9392946747  git-1.6.1.1.tar.bz2
+b55f953c5c8a418bca72b3de3c297270  cgit-0.9.tar.bz2
+fa24dc1ef0b663327ea0fe1981365b39  git-1.7.4.tar.bz2