From daa470672758580ceb7f7cb6b795e2c725c7240c Mon Sep 17 00:00:00 2001
From: Jamie Nguyen <jamie@tomoyolinux.co.uk>
Date: Thu, 15 Mar 2012 21:15:30 +0000
Subject: [PATCH] Update to 1.0.14 for CVE-2012-1180

---
 .gitignore | 3 +--
 nginx.spec | 6 +++++-
 sources    | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index db83f73..4af487d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,4 @@ x86_64/
 .*.log
 *swp
 *.rpm
-/nginx-1.0.12.tar.gz
-/nginx-1.0.13.tar.gz
+/nginx-1.0.14.tar.gz
diff --git a/nginx.spec b/nginx.spec
index bc857e5..b941fa2 100644
--- a/nginx.spec
+++ b/nginx.spec
@@ -8,7 +8,7 @@
 %global  nginx_webroot       %{nginx_datadir}/html
 
 Name:              nginx
-Version:           1.0.13
+Version:           1.0.14
 Release:           1%{?dist}
 
 Summary:           A high performance web server and reverse proxy server
@@ -206,6 +206,10 @@ fi
 
 
 %changelog
+* Thu Mar 15 2012 Jamie Nguyen <jamie@tomoyolinux.co.uk> - 1.0.14-1
+- update to upstream release 1.0.14
+- CVE-2012-1180 (#803856)
+
 * Tue Mar 03 2012 Jamie Nguyen <jamie@tomoyolinux.co.uk> - 1.0.13-1
 - update to upstream release 1.0.13
 - general spec file cleanup to match rawhide (for easier diff), including:
diff --git a/sources b/sources
index 3242b66..ae5b8b4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-58360774e4875e8fc4c4286448cb54d0  nginx-1.0.13.tar.gz
+019844e48c34952253ca26dd6e28c35c  nginx-1.0.14.tar.gz