From b9d488c0e4e99c7536602cd2245e908c4bc90e87 Mon Sep 17 00:00:00 2001
From: Jamie Nguyen <j@jamielinux.com>
Date: Tue, 26 Jan 2016 16:38:46 +0000
Subject: [PATCH] Update to upstream release 1.8.1

---
 .gitignore | 42 ++----------------------------------------
 nginx.spec | 10 ++++++++--
 sources    |  4 ++--
 3 files changed, 12 insertions(+), 44 deletions(-)

diff --git a/.gitignore b/.gitignore
index cf01ba4..7782987 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,43 +4,5 @@ x86_64/
 .*.log
 *swp
 *.rpm
-/nginx-1.0.14.tar.gz
-/nginx-1.0.15.tar.gz
-/nginx-1.2.0.tar.gz
-/nginx-1.2.1.tar.gz
-/nginx-1.2.3.tar.gz
-/nginx-1.2.4.tar.gz
-/nginx-1.2.5.tar.gz
-/nginx-1.2.6.tar.gz
-/nginx-1.2.7.tar.gz
-/nginx-1.2.7.tar.gz.asc
-/nginx-1.2.8.tar.gz
-/nginx-1.2.8.tar.gz.asc
-/nginx-1.4.0.tar.gz
-/nginx-1.4.0.tar.gz.asc
-/nginx-1.4.1.tar.gz
-/nginx-1.4.1.tar.gz.asc
-/nginx-1.4.2.tar.gz
-/nginx-1.4.2.tar.gz.asc
-/nginx-1.4.3.tar.gz
-/nginx-1.4.3.tar.gz.asc
-/nginx-1.4.4.tar.gz
-/nginx-1.4.4.tar.gz.asc
-/nginx-1.4.5.tar.gz
-/nginx-1.4.5.tar.gz.asc
-/nginx-1.4.6.tar.gz
-/nginx-1.4.6.tar.gz.asc
-/nginx-1.4.7.tar.gz
-/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
-/nginx-1.6.2.tar.gz
-/nginx-1.6.2.tar.gz.asc
-/nginx-1.7.10.tar.gz
-/nginx-1.7.10.tar.gz.asc
-/nginx-1.7.12.tar.gz
-/nginx-1.7.12.tar.gz.asc
-/nginx-1.8.0.tar.gz
-/nginx-1.8.0.tar.gz.asc
+/nginx-*.tar.gz
+/nginx-*.tar.gz.asc
diff --git a/nginx.spec b/nginx.spec
index 283d595..54ca2f1 100644
--- a/nginx.spec
+++ b/nginx.spec
@@ -24,8 +24,8 @@
 
 Name:              nginx
 Epoch:             1
-Version:           1.8.0
-Release:           14%{?dist}
+Version:           1.8.1
+Release:           1%{?dist}
 
 Summary:           A high performance web server and reverse proxy server
 Group:             System Environment/Daemons
@@ -270,6 +270,12 @@ fi
 
 
 %changelog
+* Tue Jan 26 2016 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.8.1-1
+- update to upstream release 1.8.1
+- CVE-2016-0747: Insufficient limits of CNAME resolution in resolver
+- CVE-2016-0746: Use-after-free during CNAME response processing in resolver
+- CVE-2016-0742: Invalid pointer dereference in resolver
+
 * Sun Oct 04 2015 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.8.0-14
 - consistently use '%%global with_foo' style of logic
 - remove PID file before starting nginx (#1268621)
diff --git a/sources b/sources
index 0654353..762f82f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-3ca4a37931e9fa301964b8ce889da8cb  nginx-1.8.0.tar.gz
-0c4369502b2229edbf95cacc786a806a  nginx-1.8.0.tar.gz.asc
+2e91695074dbdfbf1bcec0ada9fda462  nginx-1.8.1.tar.gz
+d42b5f2607ab8ab3b766f77e342c7f80  nginx-1.8.1.tar.gz.asc