diff --git a/_service b/_service
index 544758e..2e3c0bf 100644
--- a/_service
+++ b/_service
@@ -6,7 +6,7 @@
@PARENT_TAG@+git@TAG_OFFSET@.%h
v(.*)
\1
- v2.1.4
+ v2.1.5
enable
diff --git a/_servicedata b/_servicedata
index 48db717..5bf9d64 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,6 +1,6 @@
http://git.haproxy.org/git/haproxy-2.1.git
- 3cfc2f1d978f475c258dcd8c60b2bff8d02be92c
+ 36e14bd3189a239a146994e924c0b2fd5f7b6b46
\ No newline at end of file
diff --git a/haproxy-2.1.4+git0.3cfc2f1d9.tar.gz b/haproxy-2.1.4+git0.3cfc2f1d9.tar.gz
deleted file mode 100644
index a38b35c..0000000
--- a/haproxy-2.1.4+git0.3cfc2f1d9.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c79c6152fe32051fee901234f8ccd6722ee5ac255afc090a518b6cf5d5f90781
-size 2762999
diff --git a/haproxy-2.1.5+git0.36e14bd31.tar.gz b/haproxy-2.1.5+git0.36e14bd31.tar.gz
new file mode 100644
index 0000000..5f46423
--- /dev/null
+++ b/haproxy-2.1.5+git0.36e14bd31.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aa58e344adba1fa5e34d88021bd41b66e2d3cdca92a286147bfb214cfbb78396
+size 2787594
diff --git a/haproxy.changes b/haproxy.changes
index b99bde7..bfa7d93 100644
--- a/haproxy.changes
+++ b/haproxy.changes
@@ -1,3 +1,99 @@
+-------------------------------------------------------------------
+Fri May 29 11:28:18 UTC 2020 - mrueckert@suse.de
+
+- Update to version 2.1.5+git0.36e14bd31:
+ * [RELEASE] Released version 2.1.5
+ * BUG/MINOR: nameservers: fix error handling in parsing of resolv.conf
+ * BUG/MINOR: lua: Add missing string length for lua sticktable lookup
+ * BUG/MEDIUM: logs: fix trailing zeros on log message.
+ * REGTESTS: checks: Fix tls_health_checks when IPv6 addresses are used
+ * BUG/MINOR: logs: prevent double line returns in some events.
+ * DOC: SPOE is no longer experimental
+ * DOC/MINOR: halog: Add long help info for ic flag
+ * DOC: retry-on can only be used with mode http
+ * BUG/MINOR: server: Fix server_finalize_init() to avoid unused variable
+ * BUG/MINOR: checks: Respect check-ssl param when a port or an addr is specified
+ * BUG/MEDIUM: ring: write-lock the ring while attaching/detaching
+ * BUG/MAJOR: mux-fcgi: Stop sending loop if FCGI stream is blocked for any reason
+ * BUG/MINOR: cache: Don't needlessly test "cache" keyword in parse_cache_flt()
+ * BUG/MEDIUM: stream: Only allow L7 retries when using HTTP.
+ * BUG/MEDIUM: streams: Remove SF_ADDR_SET if we're retrying due to L7 retry.
+ * BUILD: select: only declare existing local labels to appease clang
+ * BUG/MINOR: soft-stop: always wake up waiting threads on stopping
+ * BUG/MINOR: pollers: remove uneeded free in global init
+ * BUG/MINOR: pools: use %u not %d to report pool stats in "show pools"
+ * BUG/MINOR: cfgparse: Abort parsing the current line if an invalid \x sequence is encountered
+ * BUG/MEDIUM: http_ana: make the detection of NTLM variants safer
+ * BUG/MINOR: http-ana: fix NTLM response parsing again
+ * BUG/MINOR: config: Make use_backend and use-server post-parsing less obscur
+ * BUG/MEDIUM: lua: Fix dumping of stick table entries for STD_T_DICT
+ * BUG/MINOR: threads: fix multiple use of argument inside HA_ATOMIC_UPDATE_{MIN,MAX}()
+ * BUG/MINOR: threads: fix multiple use of argument inside HA_ATOMIC_CAS()
+ * BUG/MINOR: sample: Set the correct type when a binary is converted to a string
+ * CLEANUP: connections: align function declaration
+ * BUG/MEDIUM: ssl: fix the id length check within smp_fetch_ssl_fc_session_id()
+ * BUG/MEDIUM: h1: Don't compare host and authority if only h1 headers are parsed
+ * BUG/MEDIUM: connections: force connections cleanup on server changes
+ * BUG/MEDIUM: mux-fcgi: Fix wrong test on FCGI_CF_KEEP_CONN in fcgi_detach()
+ * BUG/MEDIUM: mux_fcgi: Free the FCGI connection at the end of fcgi_release()
+ * BUG/MINOR: checks: Remove a warning about http health checks
+ * BUG/MINOR: checks: Compute the right HTTP request length for HTTP health checks
+ * BUG/MINOR: checks/server: use_ssl member must be signed
+ * Revert "BUG/MINOR: connection: make sure to correctly tag local PROXY connections"
+ * Revert "BUG/MINOR: connection: always send address-less LOCAL PROXY connections"
+ * REGTEST: http-rules: Require PCRE or PCRE2 option to run map_redirect script
+ * REGTEST: ssl: test the client certificate authentication
+ * BUILD: Makefile: add linux-musl to TARGET
+ * BUILD: tools: rely on __ELF__ not USE_DL to enable use of dladdr()
+ * BUILD: tools: unbreak resolve_sym_name() on non-GNU platforms
+ * MINOR: debug: dump the whole trace if we can't spot the starting point
+ * MINOR: debug: use our own backtrace function on clang+x86_64
+ * MINOR: debug: improve backtrace() on aarch64 and possibly other systems
+ * MINOR: debug: report the number of entries in the backtrace
+ * MINOR: wdt: do not depend on USE_THREAD
+ * BUILD: Makefile: include librt before libpthread
+ * MINOR: debug: call backtrace() once upon startup
+ * MEDIUM: debug: add support for dumping backtraces of stuck threads
+ * MINOR: cli: make "show fd" rely on resolve_sym_name()
+ * MINOR: debug: use resolve_sym_name() to dump task handlers
+ * MINOR: tools: add resolve_sym_name() to resolve function pointers
+ * MINOR: tools: add new function dump_addr_and_bytes()
+ * MINOR: haproxy: export run_poll_loop
+ * MINOR: stream: report the list of active filters on stream crashes
+ * BUG/MEDIUM: shctx: bound the number of loops that can happen around the lock
+ * BUG/MEDIUM: shctx: really check the lock's value while waiting
+ * BUG/MINOR: debug: properly use long long instead of long for the thread ID
+ * MINOR: threads: export the POSIX thread ID in panic dumps
+ * BUG/MEDIUM: listener: mark the thread as not stuck inside the loop
+ * BUG/MEDIUM: sample: make the CPU and latency sample fetches check for a stream
+ * BUG/MEDIUM: http: the "unique-id" sample fetch could crash without a steeam
+ * BUG/MEDIUM: http: the "http_first_req" sample fetch could crash without a steeam
+ * BUG/MEDIUM: capture: capture.{req,res}.* crash without a stream
+ * BUG/MEDIUM: capture: capture-req/capture-res converters crash without a stream
+ * BUG/MINOR: mux-fcgi: Be sure to have a connection as session's origin to use it
+ * BUG/MINOR: obj_type: Handle stream object in obj_base_ptr() function
+ * BUG/MINOR: checks: chained expect will not properly wait for enough data
+ * BUG/MEDIUM: server/checks: Init server check during config validity check
+ * BUG/MINOR: checks: Respect the no-check-ssl option
+ * MINOR: checks: Add a way to send custom headers and payload during http chekcs
+ * BUG/MINOR: check: Update server address and port to execute an external check
+ * MINOR: contrib: make the peers wireshark dissector a plugin
+ * MEDIUM: memory: make pool_gc() run under thread isolation
+ * DOC: option logasap does not depend on mode
+ * BUG/MINOR: http: make url_decode() optionally convert '+' to SP
+ * BUG/MINOR: tools: fix the i386 version of the div64_32 function
+ * BUG/MEDIUM: http-ana: Handle NTLM messages correctly.
+ * BUG/MINOR: ssl: default settings for ssl server options are not used
+ * DOC: Improve documentation on http-request set-src
+ * MINOR: version: Show uname output in display_version()
+ * DOC: hashing: update link to hashing functions
+ * BUG/MINOR: peers: Incomplete peers sections should be validated.
+ * BUG/MINOR: connection: always send address-less LOCAL PROXY connections
+ * BUG/MINOR: ssl: memleak of the struct cert_key_and_chain
+ * BUG/MINOR: ssl/cli: memory leak in 'set ssl cert'
+ * MINOR: ssl: improve the errors when a crt can't be open
+ * BUG/MINOR: protocol_buffer: Wrong maximum shifting.
+
-------------------------------------------------------------------
Wed Apr 15 23:10:28 UTC 2020 - Marcus Rueckert
diff --git a/haproxy.spec b/haproxy.spec
index 890ad1d..7880571 100644
--- a/haproxy.spec
+++ b/haproxy.spec
@@ -53,7 +53,7 @@
%endif
Name: haproxy
-Version: 2.1.4+git0.3cfc2f1d9
+Version: 2.1.5+git0.36e14bd31
Release: 0
#
#