Update to 1.5.13 (#1236056)

.gitignore

@@ -22,3 +22,4 @@ haproxy-1.4.8.tar.gz
 /haproxy-1.5.10.tar.gz
 /haproxy-1.5.11.tar.gz
 /haproxy-1.5.12.tar.gz
+/haproxy-1.5.13.tar.gz

haproxy-tcp-user-timeout.patch

@@ -1,7 +1,7 @@
-From 285871db151bd030d6247e8ee12b415a75c1566e Mon Sep 17 00:00:00 2001
+From efc843e57ea96ea198c63398c454430bc9e6cbcc Mon Sep 17 00:00:00 2001
 From: Willy Tarreau <w@1wt.eu>
 Date: Wed, 4 Feb 2015 00:45:58 +0100
-Subject: [PATCH 3/3] MEDIUM: tcp: implement tcp-ut bind option to set
+Subject: [PATCH] MEDIUM: tcp: implement tcp-ut bind option to set
  TCP_USER_TIMEOUT
 
 On Linux since 2.6.37, it's possible to set the socket timeout for
@@ -23,10 +23,10 @@ Thanks to Thijs Houtenbos and John Eckersberg for the suggestion.
  3 files changed, 55 insertions(+), 1 deletion(-)
 
 diff --git a/doc/configuration.txt b/doc/configuration.txt
-index 3ae6624..634f71a 100644
+index d5ecf6c..b4b7701 100644
 --- a/doc/configuration.txt
 +++ b/doc/configuration.txt
-@@ -8585,6 +8585,19 @@ strict-sni
+@@ -8637,6 +8637,19 @@ strict-sni
    a certificate. The default certificate is not used.
    See the "crt" option for more information.
  

haproxy.spec

@@ -7,8 +7,8 @@
 %global _hardened_build 1
 
 Name:           haproxy
-Version:        1.5.12
-Release:        3%{?dist}
+Version:        1.5.13
+Release:        1%{?dist}
 Summary:        HAProxy reverse proxy for high availability environments
 
 Group:          System Environment/Daemons
@@ -140,6 +140,9 @@ exit 0
 %attr(-,%{haproxy_user},%{haproxy_group}) %dir %{haproxy_home}
 
 %changelog
+* Fri Jun 26 2015 Ryan O'Hara <rohara@redhat.com> - 1.5.13-1
+- Update to 1.5.13 (#1236056)
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.12-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 

sources

@@ -1 +1 @@
-4b94b257f16d88c315716b062b22e48a  haproxy-1.5.12.tar.gz
+30cf07875ecae4fd6c4c309627afa8f1  haproxy-1.5.13.tar.gz