haproxy: updated to 2.6.0

2.6.0
- DOC: Fix formatting in configuration.txt to fix dconv
- CLEANUP: tcpcheck: Remove useless test on the stream-connector in tcpcheck_main
- CLEANUP: muxes: Consider stream's sd as defined in .show_fd callback functions
- MINOR: quic: Ignore out of packet padding.
- CLEANUP: quic: Useless QUIC_CONN_TX_BUF_SZ definition
- CLEANUP: quic: No more used handshake output buffer
- MINOR: quic: QUIC transport parameters split.
- MINOR: quic: Transport parameters dump
- DOC: quic: Update documentation for QUIC Retry
- MINOR: quic: Tunable "max_idle_timeout" transport parameter
- MINOR: quic: Tunable "initial_max_streams_bidi" transport parameter
- MINOR: quic: Clarifications about transport parameters value
- MINOIR: quic_stats: add QUIC connection errors counters
- BUG/MINOR: quic: Largest RX packet numbers mixing
- MINOR: quic_stats: Add transport new counters (lost, stateless reset, drop)
- DOC: quic: Documentation update for QUIC
- MINOR: quic: Connection TX buffer setting renaming.
- MINOR: h3: Add a statistics module for h3
- MINOR: quic: Send STOP_SENDING frames if mux is released
- MINOR: quic: Do not drop packets with RESET_STREAM frames
- BUG/MINOR: qpack: fix buffer API usage on prefix integer encoding
- BUG/MINOR: qpack: support bigger prefix-integer encoding
- BUG/MINOR: h3: do not report bug on unknown method
- SCRIPTS: add make-releases-json to recreate a releases.json file in download dirs
- SCRIPTS: make publish-release try to launch make-releases-json
- MINOR: htx: add an unchecked version of htx_get_head_blk()
- BUILD: htx: use the unchecked version of htx_get_head_blk() where needed
- BUILD: quic: use inttypes.h instead of stdint.h
- DOC: internal: remove totally outdated diagrams
- DOC: remove the outdated ROADMAP file
- DOC: add maintainers for QUIC and HTTP/3
- MINOR: h3: define h3 trace module
- MINOR: h3: add traces on frame recv
- MINOR: h3: add traces on frame send
- MINOR: h3: add traces on h3s init/end
- EXAMPLES: remove completely outdated acl-content-sw.cfg
- BUILD: makefile: reorder objects by build time
- DOC: fix a few spelling mistakes in the docs
- BUG/MEDIUM: peers/cli: fix "show peers" crash
- CLEANUP: peers/cli: stop misusing the appctx local variable
- CLEANUP: peers/cli: make peers_dump_peer() take an appctx instead of an stconn
- BUG/MINOR: peers: set the proxy's name to the peers section name
- MINOR: server: indicate when no address was expected for a server
- BUG/MINOR: peers: detect and warn on init_addr/resolvers/check/agent-check
- DOC: peers: indicate that some server settings are not usable
- DOC: peers: clarify when entry expiration date is renewed.
- DOC: peers: fix port number and addresses on new peers section format
- DOC: gpc/gpt: add commments of gpc/gpt array definitions on stick tables.
- DOC: install: update supported OpenSSL versions in the INSTALL doc
- MINOR: ncbuf: adjust ncb_data with NCBUF_NULL
- BUG/MINOR: h3: fix frame demuxing
- BUG/MEDIUM: h3: fix H3_EXCESSIVE_LOAD when receiving H3 frame header only
- BUG/MINOR: quic: Fix QUIC_EV_CONN_PRSAFRM event traces
- CLEANUP: quic: remove useless check on local UNI stream reception
- BUG/MINOR: qpack: do not consider empty enc/dec stream as error
- DOC: intro: adjust the numbering of paragrams to keep the output ordered
- MINOR: version: mention that it's LTS now.

5 files changed, 15 insertions, 16 deletions

diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index 5d1c805a8f9..1c18cc20451 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.95 2022/05/17 07:33:48 adam Exp $
+# $NetBSD: Makefile,v 1.96 2022/06/17 08:07:30 adam Exp $
 
-DISTNAME=	haproxy-2.5.7
+DISTNAME=	haproxy-2.6.0
 CATEGORIES=	net www
 MASTER_SITES=	https://www.haproxy.org/download/${PKGVERSION_NOREV:R}/src/
 
diff --git a/net/haproxy/PLIST b/net/haproxy/PLIST
index 996fc29092f..ee1111ca9c2 100644
--- a/net/haproxy/PLIST
+++ b/net/haproxy/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.10 2021/05/21 08:36:57 adam Exp $
+@comment $NetBSD: PLIST,v 1.11 2022/06/17 08:07:30 adam Exp $
 man/man1/haproxy.1
 sbin/haproxy
 share/doc/haproxy/architecture.txt
 share/doc/haproxy/configuration.txt
-share/examples/haproxy/acl-content-sw.cfg
 share/examples/haproxy/basic-config-edge.cfg
 share/examples/haproxy/content-sw-sample.cfg
 share/examples/haproxy/option-http_proxy.cfg
diff --git a/net/haproxy/distinfo b/net/haproxy/distinfo
index 114f658d908..5f098c420c3 100644
--- a/net/haproxy/distinfo
+++ b/net/haproxy/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.88 2022/05/17 07:33:48 adam Exp $
+$NetBSD: distinfo,v 1.89 2022/06/17 08:07:30 adam Exp $
 
-BLAKE2s (haproxy-2.5.7.tar.gz) = 34a9c014a7ff9363b091058a09aaf9a6c47b8b4ebafbd1e322ca58f2ec959d11
-SHA512 (haproxy-2.5.7.tar.gz) = cf6994508d559401a84e1304c2b6829952a9b3a14365d03436da42ec7e4553c201ffde9e524044dfa48813e8e614d24095a87b0fae7d9145ce5e66b953666ee9
-Size (haproxy-2.5.7.tar.gz) = 3832801 bytes
+BLAKE2s (haproxy-2.6.0.tar.gz) = d1fc424084b8eee71b6eae9d10225f5abd436b3859c6ad99a374fa84621c8131
+SHA512 (haproxy-2.6.0.tar.gz) = 7bb70bfb5606bbdac61d712bc510c5e8d5a5126ed8827d699b14a2f4562b3bd57f8f21344d955041cee0812c661350cca8082078afe2f277ff1399e461ddb7bb
+Size (haproxy-2.6.0.tar.gz) = 3972772 bytes
 SHA1 (patch-Makefile) = 6fc9a19a8526b91473448822beab18878d6db1ac
 SHA1 (patch-include_haproxy_proxy-t.h) = 5560f5f50e66cf122fe8464f74541f226e127e8d
 SHA1 (patch-include_haproxy_queue-t.h) = bf2ea918a6d8ec3d3fb2f88b7b9303a695381d96
@@ -10,6 +10,6 @@ SHA1 (patch-include_haproxy_queue.h) = eed5ea43212462134fb60b50c2a32e619e104d51
 SHA1 (patch-include_haproxy_server-t.h) = 3bf9112c3264bd3cc20e8ddb01be8d6fe56eaf85
 SHA1 (patch-src_cli.c) = 4bc5cf0116df121ac4c3c38b8f962c3a62d536e5
 SHA1 (patch-src_haproxy.c) = a466acb853b5018b70571d0a03b9d28ed9245d06
-SHA1 (patch-src_proto__sockpair.c) = 4d389c1f12d060517b8038ada9f0f4b5c87cf519
+SHA1 (patch-src_proto__sockpair.c) = 67b8b94768d029d412eddc35c2165e9183ab69f9
 SHA1 (patch-src_queue.c) = 6b58df1a4d9a17ee19514ddba478a8f01e9b2987
-SHA1 (patch-src_sock.c) = fd573e97669cfc02ed446f99d84464f251253f06
+SHA1 (patch-src_sock.c) = 95ed06506907e76941d763486215df87a260f417
diff --git a/net/haproxy/patches/patch-src_proto__sockpair.c b/net/haproxy/patches/patch-src_proto__sockpair.c
index 59320ed0f1c..73a6ab4d06b 100644
--- a/net/haproxy/patches/patch-src_proto__sockpair.c
+++ b/net/haproxy/patches/patch-src_proto__sockpair.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_proto__sockpair.c,v 1.2 2020/12/06 17:42:28 otis Exp $
+$NetBSD: patch-src_proto__sockpair.c,v 1.3 2022/06/17 08:07:31 adam Exp $
 
 Special handling for XPG4_2 on SunOS.
 
---- src/proto_sockpair.c.orig	2019-07-23 13:21:26.000000000 +0000
+--- src/proto_sockpair.c.orig	2022-05-31 14:58:21.000000000 +0000
 +++ src/proto_sockpair.c
 @@ -10,6 +10,14 @@
   *
@@ -18,4 +18,4 @@ Special handling for XPG4_2 on SunOS.
 +
  #include <ctype.h>
  #include <errno.h>
- #include <fcntl.h>
+ #include <pwd.h>
diff --git a/net/haproxy/patches/patch-src_sock.c b/net/haproxy/patches/patch-src_sock.c
index eeea0b6d63c..973edb77d47 100644
--- a/net/haproxy/patches/patch-src_sock.c
+++ b/net/haproxy/patches/patch-src_sock.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_sock.c,v 1.2 2020/12/10 09:34:21 jperkin Exp $
+$NetBSD: patch-src_sock.c,v 1.3 2022/06/17 08:07:31 adam Exp $
 
 Special handling for XPG4_2 on SunOS.
 
---- src/sock.c.orig	2020-11-28 15:51:33.000000000 +0000
+--- src/sock.c.orig	2022-05-31 14:58:21.000000000 +0000
 +++ src/sock.c
 @@ -11,6 +11,13 @@
   */
@@ -17,4 +17,4 @@ Special handling for XPG4_2 on SunOS.
 +#endif
  #include <ctype.h>
  #include <errno.h>
- #include <fcntl.h>
+ #include <stdio.h>