From da47bd97cb7a2c168fa02a52a57085d971e7475ab9f1dcf7023cfab6979b3122 Mon Sep 17 00:00:00 2001
From: Marcus Rueckert <mrueckert@suse.com>
Date: Fri, 2 Dec 2016 11:21:32 +0000
Subject: [PATCH] Accepting request 443139 from
 home:KGronlund:branches:server:http

- Update to version 1.7.0:
  * BUG/MEDIUM: proxy: return "none" and "unknown" for unknown LB algos
  * BUG/MINOR: stats: make field_str() return an empty string on NULL
  * BUG/MEDIUM: http: Fix tunnel mode when the CONNECT method is used
  * BUG/MINOR: http: Keep the same behavior between 1.6 and 1.7 for tunneled txn
  * BUG/MINOR: filters: Protect args in macros HAS_DATA_FILTERS and IS_DATA_FILTER
  * BUG/MINOR: filters: Invert evaluation order of HTTP_XFER_BODY and XFER_DATA analyzers
  * BUG/MINOR: http: Call XFER_DATA analyzer when HTTP txn is switched in tunnel mode

OBS-URL: https://build.opensuse.org/request/show/443139
OBS-URL: https://build.opensuse.org/package/show/server:http/haproxy?expand=0&rev=138
---
 _service             |  4 ++--
 _servicedata         |  4 +++-
 haproxy-1.6.9.tar.gz |  3 ---
 haproxy-1.7.0.tar.gz |  3 +++
 haproxy.changes      | 33 +++++++++++++++++++++++++++++++++
 haproxy.spec         |  2 +-
 6 files changed, 42 insertions(+), 7 deletions(-)
 delete mode 100644 haproxy-1.6.9.tar.gz
 create mode 100644 haproxy-1.7.0.tar.gz

diff --git a/_service b/_service
index 86982b1..81a3dff 100644
--- a/_service
+++ b/_service
@@ -1,9 +1,9 @@
 <services>
   <service name="tar_scm" mode="disabled">
-    <param name="url">http://git.haproxy.org/git/haproxy-1.6.git</param>
+    <param name="url">http://git.haproxy.org/git/haproxy-1.7.git</param>
     <param name="scm">git</param>
     <param name="filename">haproxy</param>
-    <param name="versionformat">1.6.9</param>
+    <param name="versionformat">1.7.0</param>
     <param name="revision">master</param>
     <param name="changesgenerate">enable</param>
   </service>
diff --git a/_servicedata b/_servicedata
index 318c1b8..5d4f245 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,6 @@
 <servicedata>
 <service name="tar_scm">
             <param name="url">http://git.haproxy.org/git/haproxy-1.6.git</param>
-          <param name="changesrevision">ab45181e36b6c4f7d31c5284035937c2d0be37eb</param></service></servicedata>
\ No newline at end of file
+          <param name="changesrevision">864bf78c3b6898eb12ece5f0a44032090f26f57f</param></service><service name="tar_scm">
+            <param name="url">http://git.haproxy.org/git/haproxy-1.7.git</param>
+          <param name="changesrevision">5961fb820a9484c0b5ff83583bdeacef0b5d42f0</param></service></servicedata>
\ No newline at end of file
diff --git a/haproxy-1.6.9.tar.gz b/haproxy-1.6.9.tar.gz
deleted file mode 100644
index a520087..0000000
--- a/haproxy-1.6.9.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cf7d2fa891d2ae4aa6489fc43a9cadf68c42f9cb0de4801afad45d32e7dda133
-size 1566715
diff --git a/haproxy-1.7.0.tar.gz b/haproxy-1.7.0.tar.gz
new file mode 100644
index 0000000..422bcdf
--- /dev/null
+++ b/haproxy-1.7.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f28cd789875088863bf60bb9c026e6639af2389154d69602ec5dad7d89a54529
+size 1779460
diff --git a/haproxy.changes b/haproxy.changes
index ebbae2e..5d92ac2 100644
--- a/haproxy.changes
+++ b/haproxy.changes
@@ -1,3 +1,36 @@
+-------------------------------------------------------------------
+Fri Dec 02 07:31:16 UTC 2016 - kgronlund@suse.com
+
+- Update to version 1.7.0:
+  * BUG/MEDIUM: proxy: return "none" and "unknown" for unknown LB algos
+  * BUG/MINOR: stats: make field_str() return an empty string on NULL
+  * BUG/MEDIUM: http: Fix tunnel mode when the CONNECT method is used
+  * BUG/MINOR: http: Keep the same behavior between 1.6 and 1.7 for tunneled txn
+  * BUG/MINOR: filters: Protect args in macros HAS_DATA_FILTERS and IS_DATA_FILTER
+  * BUG/MINOR: filters: Invert evaluation order of HTTP_XFER_BODY and XFER_DATA analyzers
+  * BUG/MINOR: http: Call XFER_DATA analyzer when HTTP txn is switched in tunnel mode
+
+-------------------------------------------------------------------
+Fri Dec 02 07:30:49 UTC 2016 - kgronlund@suse.com
+
+- Update to version 1.6.10:
+  * BUG/MEDIUM: systemd-wrapper: return correct exit codes
+  * BUG/MEDIUM: srv-state: properly restore the DRAIN state
+  * BUG/MINOR: srv-state: allow to have both CMAINT and FDRAIN flags
+  * BUG/MEDIUM: servers: properly propagate the maintenance states during startup
+  * BUG: vars: Fix 'set-var' converter because of a typo
+  * BUG/MEDIUM: channel: bad unlikely macro
+  * CLEANUP: lua: move comment
+  * CLEANUP: lua: control executed twice
+  * CLEANUP: ssl: Fix bind keywords name in comments
+  * DOC: ssl: Use correct wording for ca-sign-pass
+  * BUG/MINOR: stick-table: handle out-of-memory condition gracefully
+  * BUG/MEDIUM: connection: check the control layer before stopping polling
+  * BUG/MEDIUM: stick-table: fix regression caused by recent fix for out-of-memory
+  * CONTRIB: initiate a debugging suite to make debugging easier
+  * BUG/MINOR: cli: properly decrement ref count on tables during failed dumps
+  * BUG/MEDIUM: lua: In some case, the return of sample-fetche is ignored
+
 -------------------------------------------------------------------
 Wed Nov 02 16:56:57 UTC 2016 - kgronlund@suse.com
 
diff --git a/haproxy.spec b/haproxy.spec
index e587e22..1e610a0 100644
--- a/haproxy.spec
+++ b/haproxy.spec
@@ -41,7 +41,7 @@
 %bcond_without  apparmor
 
 Name:           haproxy
-Version:        1.6.9
+Version:        1.7.0
 Release:        0
 #
 #