haproxy: updated to 2.7.0

2.7.0
- MINOR: ssl: forgotten newline in error messages on ca-file
- BUG/MINOR: ssl: shut the ca-file errors emitted during httpclient init
- DOC: config: provide some configuration hints for "http-reuse"
- DOC: config: refer to section about quoting in the "add_item" converter
- DOC: halog: explain how to use -ac and -ad in the help message
- DOC: config: clarify the fact that SNI should not be used in HTTP scenarios
- DOC: config: mention that a single monitor-uri rule is supported
- DOC: config: explain how default matching method for ACL works
- DOC: config: clarify the fact that "retries" is not just for connections
- BUILD: halog: fix missing double-quote at end of help line
- DOC: config: clarify the -m dir and -m dom pattern matching methods
- MINOR: activity: report uptime in "show activity"
- REORG: activity/cli: move the "show activity" handler to activity.c
- DEV: poll: add support for epoll
- DEV: tcploop: centralize the polling code into wait_for_fd()
- DEV: tcploop: add support for POLLRDHUP when supported
- DEV: tcploop: do not report an error on POLLERR
- DEV: tcploop: add optional support for epoll
- SCRIPTS: announce-release: add a link to the data plane API
- CLEANUP: stick-table: fill alignment holes in the stktable struct
- MINOR: stick-table: store a per-table hash seed and use it
- MINOR: stick-table: show the shard number in each entry's "show table" output
- CLEANUP: ncbuf: remove ncb_blk args by value
- CLEANUP: ncbuf: inline small functions
- CLEANUP: ncbuf: use standard BUG_ON with DEBUG_STRICT
- BUG/MINOR: quic: Endless loop during retransmissions
- MINOR: mux-h2: add the expire task and its expiration date in "show fd"
- BUG/MINOR: peers: always initialize the stksess shard value
- REGTESTS: fix peers-related regtests regarding "show table"
- BUG/MEDIUM: mux-h1: Close client H1C on EOS when there is no output data
- MINOR: stick-table: change the API of the function used to calculate the shard
- CLEANUP: peers: factor out the key len calculation in received updates
- BUG/MINOR: peers: always update the stksess shard number on incoming updates
- CLEANUP: assorted typo fixes in the code and comments
- MINOR: mux-h1: add the expire task and its expiration date in "show fd"
- MINOR: debug: improve error handling on the memstats command parser
- BUILD: quic: allow build with USE_QUIC and USE_OPENSSL_WOLFSSL
- CLEANUP: anon: clarify the help message on "debug dev hash"
- MINOR: debug: relax access restrictions on "debug dev hash" and "memstats"
- SCRIPTS: run-regtests: add a version check
- MINOR: version: mention that it's stable now

3 files changed, 11 insertions, 11 deletions

diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index 406f982de28..0fd32685847 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.101 2022/09/26 09:52:14 adam Exp $
+# $NetBSD: Makefile,v 1.102 2022/12/06 08:18:17 adam Exp $
 
-DISTNAME=	haproxy-2.6.6
+DISTNAME=	haproxy-2.7.0
 CATEGORIES=	net www
 MASTER_SITES=	https://www.haproxy.org/download/${PKGVERSION_NOREV:R}/src/
 
diff --git a/net/haproxy/distinfo b/net/haproxy/distinfo
index 3d6440c3271..e3f509ba42b 100644
--- a/net/haproxy/distinfo
+++ b/net/haproxy/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.94 2022/09/26 09:52:14 adam Exp $
+$NetBSD: distinfo,v 1.95 2022/12/06 08:18:17 adam Exp $
 
-BLAKE2s (haproxy-2.6.6.tar.gz) = e92ef2bf4c0cd0a6a0d4838693bbb55d362d8cabb80192f986d31638a8ff0782
-SHA512 (haproxy-2.6.6.tar.gz) = 0b416d200e9b406a96896d3570483d24e94fdfa3f781bee663476e218a57851aefdf8768f00c8a2e9df1bb028f6398690f07da452f59656327967685787ee5c2
-Size (haproxy-2.6.6.tar.gz) = 4015438 bytes
+BLAKE2s (haproxy-2.7.0.tar.gz) = 3d1ceb6de15674e1005843be9a0eba7e2e86bef4c38c955fa405eb1d67f6e10e
+SHA512 (haproxy-2.7.0.tar.gz) = cc2eb49c6055cca1d4744cb715d43048621e3078b2621cc104b3e54671f6b9a0a530c0c044c23e4cbd276f3d792bfa46d88bf034c777a671dc49ace0777829ad
+Size (haproxy-2.7.0.tar.gz) = 4105416 bytes
 SHA1 (patch-Makefile) = 36c0e5d46b30d7b28fdb4b3fdbb4fe052fa8d850
 SHA1 (patch-include_haproxy_proxy-t.h) = 5560f5f50e66cf122fe8464f74541f226e127e8d
 SHA1 (patch-include_haproxy_queue-t.h) = bf2ea918a6d8ec3d3fb2f88b7b9303a695381d96
 SHA1 (patch-include_haproxy_queue.h) = eed5ea43212462134fb60b50c2a32e619e104d51
-SHA1 (patch-include_haproxy_server-t.h) = 3bf9112c3264bd3cc20e8ddb01be8d6fe56eaf85
+SHA1 (patch-include_haproxy_server-t.h) = 4328e1cba03b27d832d3e13e6c6370395c6d8f1d
 SHA1 (patch-src_cli.c) = 4bc5cf0116df121ac4c3c38b8f962c3a62d536e5
 SHA1 (patch-src_haproxy.c) = a466acb853b5018b70571d0a03b9d28ed9245d06
 SHA1 (patch-src_proto__sockpair.c) = 67b8b94768d029d412eddc35c2165e9183ab69f9
diff --git a/net/haproxy/patches/patch-include_haproxy_server-t.h b/net/haproxy/patches/patch-include_haproxy_server-t.h
index 2f04946d678..8618c37d5a1 100644
--- a/net/haproxy/patches/patch-include_haproxy_server-t.h
+++ b/net/haproxy/patches/patch-include_haproxy_server-t.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-include_haproxy_server-t.h,v 1.1 2021/12/09 10:36:07 jperkin Exp $
+$NetBSD: patch-include_haproxy_server-t.h,v 1.2 2022/12/06 08:18:17 adam Exp $
 
 Avoid 'struct queue' conflict.
 
---- include/haproxy/server-t.h.orig	2021-11-23 14:40:21.000000000 +0000
+--- include/haproxy/server-t.h.orig	2022-12-01 14:16:46.000000000 +0000
 +++ include/haproxy/server-t.h
-@@ -282,7 +282,7 @@ struct server {
+@@ -289,7 +289,7 @@ struct server {
+ 	unsigned int max_used_conns;            /* Max number of used connections (the counter is reset at each connection purges */
  	unsigned int est_need_conns;            /* Estimate on the number of needed connections (max of curr and previous max_used) */
- 	unsigned int next_takeover;             /* thread ID to try to steal connections from next time */
  
 -	struct queue queue;			/* pending connections */
 +	struct haqueue queue;			/* pending connections */