From 18d563cd4bad6554c4e5b153739499da7750dd9cf941b9cf1aa43e4494d8f3bb Mon Sep 17 00:00:00 2001
From: Kristoffer Gronlund <kgronlund@suse.com>
Date: Thu, 10 Jan 2019 08:51:30 +0000
Subject: [PATCH] Accepting request 664292 from
 home:KGronlund:branches:server:http

- Update to version 1.8.17~git0.e89d25b2 (bsc#1121283) (CVE-2018-20615):
  * BUG/CRITICAL: mux-h2: re-check the frame length when PRIORITY is used
  * BUG/MEDIUM: lua: dead lock when Lua tasks are trigerred
  * BUG/MINOR: lua: bad args are returned for Lua actions
  * BUG/MINOR: lua: Return an error if a legacy HTTP applet doesn't send anything
  * BUG/MEDIUM: cli: make "show sess" really thread-safe
  * MINOR: stream/cli: report more info about the HTTP messages on "show sess all"
  * MINOR: stream/cli: fix the location of the waiting flag in "show sess all"
  * MINOR: lb: allow redispatch when using consistent hash
  * BUG/MEDIUM: server: Also copy "check-sni" for server templates.
  * BUG/MEDIUM: mux-h2: mark that we have too many CS once we have more than the max
  * MINOR: mux-h2: only increase the connection window with the first update
  * BUG/MAJOR: stream-int: Update the stream expiration date in stream_int_notify()
  * BUG/MEDIUM: dns: overflowed dns name start position causing invalid dns error
  * BUG/MEDIUM: dns: Don't prevent reading the last byte of the payload in dns_validate_response()
  * BUG/MINOR: logs: leave startup-logs global and not per-thread

OBS-URL: https://build.opensuse.org/request/show/664292
OBS-URL: https://build.opensuse.org/package/show/server:http/haproxy?expand=0&rev=179
---
 _service                            |  2 +-
 _servicedata                        |  2 +-
 haproxy-1.8.15~git0.6b6a350a.tar.gz |  3 ---
 haproxy-1.8.17~git0.e89d25b2.tar.gz |  3 +++
 haproxy.changes                     | 20 ++++++++++++++++++++
 haproxy.spec                        |  2 +-
 6 files changed, 26 insertions(+), 6 deletions(-)
 delete mode 100644 haproxy-1.8.15~git0.6b6a350a.tar.gz
 create mode 100644 haproxy-1.8.17~git0.e89d25b2.tar.gz

diff --git a/_service b/_service
index 7cf3e1a..2dcd3cd 100644
--- a/_service
+++ b/_service
@@ -6,7 +6,7 @@
     <param name="versionformat">@PARENT_TAG@~git@TAG_OFFSET@.%h</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="versionrewrite-replacement">\1</param>    
-    <param name="revision">v1.8.15</param>
+    <param name="revision">v1.8.17</param>
     <param name="changesgenerate">enable</param>
   </service>
 
diff --git a/_servicedata b/_servicedata
index ccea970..3a26135 100644
--- a/_servicedata
+++ b/_servicedata
@@ -5,4 +5,4 @@
             <param name="url">http://git.haproxy.org/git/haproxy-1.7.git</param>
           <param name="changesrevision">640d526f8cdad00f7f5043b51f6a34f3f6ebb49f</param></service><service name="tar_scm">
                 <param name="url">http://git.haproxy.org/git/haproxy-1.8.git</param>
-              <param name="changesrevision">6b6a350afe3b08a1a60c80fe9120a1c9d10448ef</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">e89d25b22da1eefa88ef5aa8ad6fa21e1bd4c801</param></service></servicedata>
\ No newline at end of file
diff --git a/haproxy-1.8.15~git0.6b6a350a.tar.gz b/haproxy-1.8.15~git0.6b6a350a.tar.gz
deleted file mode 100644
index dab352b..0000000
--- a/haproxy-1.8.15~git0.6b6a350a.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:954781a7635954548bb190e1bf4fd75a193710e5194a1540055cff3f4703284d
-size 2134976
diff --git a/haproxy-1.8.17~git0.e89d25b2.tar.gz b/haproxy-1.8.17~git0.e89d25b2.tar.gz
new file mode 100644
index 0000000..1927e84
--- /dev/null
+++ b/haproxy-1.8.17~git0.e89d25b2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:50043f997c24eb13075562131ba42f8d173e09964f231995a8c5309eadeacf55
+size 2137195
diff --git a/haproxy.changes b/haproxy.changes
index c03711f..0ce1e58 100644
--- a/haproxy.changes
+++ b/haproxy.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Thu Jan 10 08:42:33 UTC 2019 - kgronlund@suse.com
+
+- Update to version 1.8.17~git0.e89d25b2 (bsc#1121283) (CVE-2018-20615):
+  * BUG/CRITICAL: mux-h2: re-check the frame length when PRIORITY is used
+  * BUG/MEDIUM: lua: dead lock when Lua tasks are trigerred
+  * BUG/MINOR: lua: bad args are returned for Lua actions
+  * BUG/MINOR: lua: Return an error if a legacy HTTP applet doesn't send anything
+  * BUG/MEDIUM: cli: make "show sess" really thread-safe
+  * MINOR: stream/cli: report more info about the HTTP messages on "show sess all"
+  * MINOR: stream/cli: fix the location of the waiting flag in "show sess all"
+  * MINOR: lb: allow redispatch when using consistent hash
+  * BUG/MEDIUM: server: Also copy "check-sni" for server templates.
+  * BUG/MEDIUM: mux-h2: mark that we have too many CS once we have more than the max
+  * MINOR: mux-h2: only increase the connection window with the first update
+  * BUG/MAJOR: stream-int: Update the stream expiration date in stream_int_notify()
+  * BUG/MEDIUM: dns: overflowed dns name start position causing invalid dns error
+  * BUG/MEDIUM: dns: Don't prevent reading the last byte of the payload in dns_validate_response()
+  * BUG/MINOR: logs: leave startup-logs global and not per-thread
+
 -------------------------------------------------------------------
 Mon Dec 17 09:42:18 UTC 2018 - kgronlund@suse.com
 
diff --git a/haproxy.spec b/haproxy.spec
index 8deda2d..0c866e7 100644
--- a/haproxy.spec
+++ b/haproxy.spec
@@ -47,7 +47,7 @@
 %endif
 
 Name:           haproxy
-Version:        1.8.15~git0.6b6a350a
+Version:        1.8.17~git0.e89d25b2
 Release:        0
 #
 #