From 5a305d683ae8ca62c8c76b6484fb979f773869ea Mon Sep 17 00:00:00 2001
From: Jamie Nguyen <j@jamielinux.com>
Date: Tue, 5 Aug 2014 15:40:38 +0100
Subject: [PATCH] Update to upstream release 1.6.1 (CVE-2014-3556)

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

diff --git a/.gitignore b/.gitignore
index 089d32c..7779b9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,5 @@ x86_64/
 /nginx-1.4.7.tar.gz.asc
 /nginx-1.6.0.tar.gz
 /nginx-1.6.0.tar.gz.asc
+/nginx-1.6.1.tar.gz
+/nginx-1.6.1.tar.gz.asc
diff --git a/nginx.spec b/nginx.spec
index 83a87c1..4da8b4a 100644
--- a/nginx.spec
+++ b/nginx.spec
@@ -20,8 +20,8 @@
 
 Name:              nginx
 Epoch:             1
-Version:           1.6.0
-Release:           3%{?dist}
+Version:           1.6.1
+Release:           1%{?dist}
 
 Summary:           A high performance web server and reverse proxy server
 Group:             System Environment/Daemons
@@ -275,6 +275,10 @@ fi
 
 
 %changelog
+* Tue Aug 05 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.6.1-1
+- update to upstream release 1.6.1
+- (#1126891) CVE-2014-3556: SMTP STARTTLS plaintext injection flaw
+
 * Wed Jul 02 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 1:1.6.0-3
 - Fix FTBFS on aarch64 (#1115559)
 
diff --git a/sources b/sources
index 620e58a..4ca60ec 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-8efa354f1c3c2ccf434a50d3fbe82340  nginx-1.6.0.tar.gz
-eb2ce9c6d9ba8bdcbf3f80287b868fc8  nginx-1.6.0.tar.gz.asc
+45e5a11f48b001644676f7767980a2bf  nginx-1.6.1.tar.gz
+0d93ec092a87924ed2ba29ee4ff24334  nginx-1.6.1.tar.gz.asc