From 4e16a7af0d13d11f6cb7f2f42a4adf5ae1ba8678ba10b43615907804760b9284 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Tue, 4 Nov 2014 16:28:50 +0000
Subject: [PATCH] Accepting request 259237 from network:ha-clustering:Factory

1

OBS-URL: https://build.opensuse.org/request/show/259237
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/haproxy?expand=0&rev=18
---
 haproxy-1.5.6.tar.gz |  3 ---
 haproxy-1.5.8.tar.gz |  3 +++
 haproxy.changes      | 42 ++++++++++++++++++++++++++++++++++++++++++
 haproxy.spec         |  3 ++-
 4 files changed, 47 insertions(+), 4 deletions(-)
 delete mode 100644 haproxy-1.5.6.tar.gz
 create mode 100644 haproxy-1.5.8.tar.gz

diff --git a/haproxy-1.5.6.tar.gz b/haproxy-1.5.6.tar.gz
deleted file mode 100644
index e22a813..0000000
--- a/haproxy-1.5.6.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:214ab89dad7e0a43cc0f1c46367ca6803cd869e1717a4fa6b99451713f91f717
-size 1337511
diff --git a/haproxy-1.5.8.tar.gz b/haproxy-1.5.8.tar.gz
new file mode 100644
index 0000000..14339a9
--- /dev/null
+++ b/haproxy-1.5.8.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:db54b3cf08e530fdd5b67100153bb88293e8d6e179e7aa837412d8ea36a03539
+size 1338741
diff --git a/haproxy.changes b/haproxy.changes
index 2468bab..7fd64c7 100644
--- a/haproxy.changes
+++ b/haproxy.changes
@@ -1,3 +1,45 @@
+-------------------------------------------------------------------
+Fri Oct 31 22:24:27 UTC 2014 - mrueckert@suse.de
+
+- update to 1.5.8
+  - BUG/MAJOR: buffer: check the space left is enough or not when
+    input data in a buffer is wrapped
+  - BUG/BUILD: revert accidental change in the makefile from latest
+    SSL fix
+- changes in 1.5.7
+  - BUG/MEDIUM: regex: fix pcre_study error handling
+  - BUG/MINOR: log: fix request flags when keep-alive is enabled
+  - MINOR: ssl: add fetchs 'ssl_c_der' and 'ssl_f_der' to return
+    DER formatted certs
+  - MINOR: ssl: add statement to force some ssl options in global.
+  - BUG/MINOR: ssl: correctly initialize ssl ctx for invalid
+    certificates
+  - BUG/MEDIUM: http: don't dump debug headers on MSG_ERROR
+  - BUG/MAJOR: cli: explicitly call cli_release_handler() upon
+    error
+  - BUG/MEDIUM: tcp: fix outgoing polling based on proxy protocol
+  - BUG/MEDIUM: tcp: don't use SO_ORIGINAL_DST on non-AF_INET
+    sockets
+- Dropped patches:
+  - 0001-BUG-MEDIUM-http-don-t-dump-debug-headers-on-MSG_ERRO.patch
+  - 0002-BUG-MAJOR-cli-explicitly-call-cli_release_handler-up.patch
+  - 0003-BUG-MINOR-log-fix-request-flags-when-keep-alive-is-e.patch
+  - 0004-BUG-MEDIUM-tcp-fix-outgoing-polling-based-on-proxy-p.patch
+
+-------------------------------------------------------------------
+Wed Oct 29 08:07:07 UTC 2014 - kgronlund@suse.com
+
+- BUG/MEDIUM: http: don't dump debug headers on MSG_ERROR
+- BUG/MAJOR: cli: explicitly call cli_release_handler() upon error
+- BUG/MINOR: log: fix request flags when keep-alive is enabled
+- BUG/MEDIUM: tcp: fix outgoing polling based on proxy protocol
+
+- Added patches:
+  - 0001-BUG-MEDIUM-http-don-t-dump-debug-headers-on-MSG_ERRO.patch
+  - 0002-BUG-MAJOR-cli-explicitly-call-cli_release_handler-up.patch
+  - 0003-BUG-MINOR-log-fix-request-flags-when-keep-alive-is-e.patch
+  - 0004-BUG-MEDIUM-tcp-fix-outgoing-polling-based-on-proxy-p.patch
+
 -------------------------------------------------------------------
 Sat Oct 18 18:23:29 UTC 2014 - mrueckert@suse.de
 
diff --git a/haproxy.spec b/haproxy.spec
index 6467bc0..ab2b3f2 100644
--- a/haproxy.spec
+++ b/haproxy.spec
@@ -33,7 +33,7 @@
 %bcond_without  apparmor
 
 Name:           haproxy
-Version:        1.5.6
+Version:        1.5.8
 Release:        0
 #
 #
@@ -60,6 +60,7 @@ Source4:        local.usr.sbin.haproxy.apparmor
 Patch1:         haproxy-1.2.16_config_haproxy_user.patch
 Patch2:         haproxy-makefile_lib.patch
 Patch3:         sec-options.patch
+
 Source99:       haproxy-rpmlintrc
 #
 Summary:        The Reliable, High Performance TCP/HTTP Load Balancer