Pullup ticket #6095 - requested by morr

net/haproxy: security fix

Revisions pulled up:
- net/haproxy/Makefile                                          1.55
- net/haproxy/distinfo                                          1.48

---
   Module Name:    pkgsrc
   Committed By:   morr
   Date:           Wed Dec  4 07:50:35 UTC 2019

   Modified Files:
           pkgsrc/net/haproxy: Makefile distinfo

   Log Message:
   Update to version 2.0.10.

   Changes:

   2019/11/25 : 2.0.10
       - BUG/MINOR: init: fix set-dumpable when using uid/gid
       - MINOR: peers: Alway show the table info for disconnected peers.
       - MINOR: peers: Add TX/RX heartbeat counters.
       - MINOR: peers: Add debugging information to "show peers".
       - BUG/MINOR: peers: Wrong null "server_name" data field handling.
       - BUG/MINOR: ssl: fix crt-list neg filter for openssl < 1.1.1
       - BUG/MEDIUM: mworker: don't fill the -sf argument with -1 during the reexec
       - BUG/MINOR: peers: "peer alive" flag not reset when deconnecting.
       - BUILD/MINOR: ssl: fix compiler warning about useless statement
       - BUG/MEDIUM: stream-int: Don't loose events on the CS when an EOS is reported
       - BUILD: debug: Avoid warnings in dev mode with -02 because of some BUG_ON tests
       - BUG/MINOR: mux-h1: Fix tunnel mode detection on the response path
       - BUG/MINOR: http-ana: Properly catch aborts during the payload forwarding
       - MINOR: freq_ctr: Make the sliding window sums thread-safe
       - MINOR: stream: Remove the lock on the proxy to update time stats
       - MINOR: counters: Add fields to store the max observed for {q,c,d,t}_time
       - MINOR: contrib/prometheus-exporter: Report metrics about max times for sessions
       - BUG/MINOR: contrib/prometheus-exporter: Rename some metrics
       - MINOR: contrib/prometheus-exporter: report the number of idle conns per server
       - MINOR: contrib/prometheus-exporter: filter exported metrics by scope
       - MINOR: contrib/prometheus-exporter: Add a param to ignore servers in maintenance
       - BUG/MINOR: stream-int: Fix si_cs_recv() return value
       - MINOR: stats: Report max times in addition of the averages for sessions
       - REGTEST: vtest can now enable mcli with its own flag
       - MEDIUM: mux-h1: Add the support of headers adjustment for bogus HTTP/1 apps
       - BUG/MINOR: mux-h1: Fix a UAF in cfg_h1_headers_case_adjust_postparser()
       - BUG/MINOR: mux-h1: Adjust header case when chunked encoding is add to a message
       - DOC: Add missing stats fields in the management manual
       - DOC: Add documentation about the use-service action
       - BUG/MINOR: cli: fix out of bounds in -S parser
       - BUG/MINOR: ssl: fix curve setup with LibreSSL
       - MINOR: ist: add ist_find_ctl()
       - BUG/MAJOR: h2: reject header values containing invalid chars
       - BUG/MAJOR: h2: make header field name filtering stronger
       - BUG/MAJOR: mux-h2: don't try to decode a response HEADERS frame in idle state
       - SCRIPTS: create-release: show the correct origin name in suggested commands
       - SCRIPTS: git-show-backports: add "-s" to proposed cherry-pick commands

   2019/11/15 : 2.0.9
       - MINOR: config: warn on presence of "\n" in header values/replacements
       - BUG/MINOR: mux-h2: do not emit logs on backend connections
       - MINOR: tcp: avoid confusion in time parsing init
       - BUG/MINOR: cli: don't call the kw->io_release if kw->parse failed
       - BUG/MINOR: mux-h2: Don't pretend mux buffers aren't full anymore if nothing sent
       - BUG/MAJOR: stream-int: Don't receive data from mux until SI_ST_EST is reached
       - BUG/MINOR: spoe: fix off-by-one length in UUID format string
       - MINOR: mux: Add a new method to get informations about a mux.
       - BUG/MEDIUM: stream_interface: Only use SI_ST_RDY when the mux is ready.
       - BUG/MEDIUM: servers: Only set SF_SRV_REUSED if the connection if fully ready.
       - BUG/MINOR: config: Update cookie domain warn to RFC6265
       - BUG/MEDIUM: mux-h2: report no available stream on a connection having errors
       - BUG/MEDIUM: mux-h2: immediately remove a failed connection from the idle list
       - BUG/MEDIUM: mux-h2: immediately report connection errors on streams
       - BUG/MEDIUM: mux-h1: Disable splicing for chunked messages
       - BUG/MEDIUM: stream: Be sure to support splicing at the mux level to enable it
       - MINOR: doc: http-reuse connection pool fix
       - BUG/MEDIUM: stream: Be sure to release allocated captures for TCP streams
       - BUG/MINOR: action: do-resolve now use cached response
       - BUG: dns: timeout resolve not applied for valid resolutions
       - DOC: management: document reuse and connect counters in the CSV format
       - DOC: management: document cache_hits and cache_lookups in the CSV format
       - DOC: management: fix typo on "cache_lookups" stats output
       - BUG/MINOR: queue/threads: make the queue unlinking atomic
       - BUG/MEDIUM: listeners: always pause a listener on out-of-resource condition
       - BUG/MEDIUM: Make sure we leave the session list in session_free().
       - CLEANUP: session: slightly simplify idle connection cleanup logic
       - MINOR: memory: also poison the area on freeing
       - BUILD: contrib/da: remove an "unused" warning
       - BUG/MINOR: log: limit the size of the startup-logs
       - BUG/MEDIUM: filters: Don't call TCP callbacks for HTX streams
       - BUG/MINOR: mux-h1: Don't set CS_FL_EOS on a read0 when receiving data to pipe

2 files changed, 7 insertions, 7 deletions

diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index 8bb5d810460..d6e0870941b 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.52 2019/09/15 14:53:13 nia Exp $
+# $NetBSD: Makefile,v 1.52.2.1 2019/12/07 18:09:39 bsiegert Exp $
 
-DISTNAME=	haproxy-2.0.6
+DISTNAME=	haproxy-2.0.10
 CATEGORIES=	net www
 MASTER_SITES=	http://www.haproxy.org/download/${PKGVERSION_NOREV:R}/src/
 
diff --git a/net/haproxy/distinfo b/net/haproxy/distinfo
index 9ac92ef1ef2..2e14576b7ef 100644
--- a/net/haproxy/distinfo
+++ b/net/haproxy/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.45 2019/09/15 12:22:33 nia Exp $
+$NetBSD: distinfo,v 1.45.2.1 2019/12/07 18:09:39 bsiegert Exp $
 
-SHA1 (haproxy-2.0.6.tar.gz) = 090530f959af9c5801edacf9a9f6341a71da232e
-RMD160 (haproxy-2.0.6.tar.gz) = 6d39610be3520ed843a9f28fc870fdaa925fc30b
-SHA512 (haproxy-2.0.6.tar.gz) = 78c8483a97845928dc3ec7da68bedfda73303c88e8146a6b38c3d2b4e2089af5668817f0675180d41274c6337d5fae7cad5534013bd15d9b06071b89a09a86b5
-Size (haproxy-2.0.6.tar.gz) = 2541637 bytes
+SHA1 (haproxy-2.0.10.tar.gz) = 7a81094c367621a981012480cebc7c152c482d75
+RMD160 (haproxy-2.0.10.tar.gz) = 1bcb2e039698cc9b90f93ef3bf265dcb956c59e1
+SHA512 (haproxy-2.0.10.tar.gz) = d3f0c0a7cce49d394dda7553ed79102cfef2c21ea6d640fbc325246806c93d862cb48c40f4717d9e1b50b2390698466282fe8c4d8b305259e3057f3711e69a39
+Size (haproxy-2.0.10.tar.gz) = 2557865 bytes
 SHA1 (patch-Makefile) = 790242ebde13ac1a9d95a16cba29e30a9bccd57c
 SHA1 (patch-src_cli.c) = 4bc5cf0116df121ac4c3c38b8f962c3a62d536e5
 SHA1 (patch-src_haproxy.c) = badb172013541087d84f03726ea928c6f5634dc3