From 86a5d24bec454788f44900f06fec66c770bf91f0 Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <rohara@redhat.com>
Date: Fri, 30 Oct 2015 03:34:23 -0500
Subject: [PATCH] Update to 1.6.1 (#1276288)

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

diff --git a/.gitignore b/.gitignore
index 040f413..e2d16cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,5 @@ haproxy-1.4.8.tar.gz
 /haproxy-1.5.12.tar.gz
 /haproxy-1.5.13.tar.gz
 /haproxy-1.5.14.tar.gz
+/haproxy-1.6.0.tar.gz
+/haproxy-1.6.1.tar.gz
diff --git a/haproxy.spec b/haproxy.spec
index 933be22..574c96b 100644
--- a/haproxy.spec
+++ b/haproxy.spec
@@ -7,7 +7,7 @@
 %global _hardened_build 1
 
 Name:           haproxy
-Version:        1.5.14
+Version:        1.6.1
 Release:        1%{?dist}
 Summary:        HAProxy reverse proxy for high availability environments
 
@@ -24,7 +24,6 @@ Source5:        halog.1
 
 Patch0:         halog-unused-variables.patch
 Patch1:         iprange-return-type.patch
-Patch2:         haproxy-tcp-user-timeout.patch
 
 BuildRequires:  pcre-devel
 BuildRequires:  zlib-devel
@@ -54,7 +53,6 @@ availability environments. Indeed, it can:
 %setup -q
 %patch0 -p0
 %patch1 -p0
-%patch2 -p1
 
 %build
 regparm_opts=
@@ -140,6 +138,9 @@ exit 0
 %attr(-,%{haproxy_user},%{haproxy_group}) %dir %{haproxy_home}
 
 %changelog
+* Fri Oct 30 2015 Ryan O'Hara <rohara@redhat.com> - 1.6.1-1
+- Update to 1.6.1 (#1276288)
+
 * Mon Jul 06 2015 Ryan O'Hara <rohara@redhat.com> - 1.5.14-1
 - Update to 1.5.14 (CVE-2015-3281, #1239181)
 
diff --git a/sources b/sources
index 0d007f2..e5e6ca7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ad9d7262b96ba85a0f8c6acc6cb9edde  haproxy-1.5.14.tar.gz
+7343def2af8556ebc8972a9748176094  haproxy-1.6.1.tar.gz