From 4a4ff75a8df9480251a408f3dc05d709cbe8187b Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 21 Feb 2022 17:13:39 +0000 Subject: [PATCH] haproxy: updated to 2.5.3 2.5.3 - MINOR: sock: move the unused socket cleaning code into its own function - BUG/MEDIUM: mworker: close unused transferred FDs on load failure - BUG/MINOR: mworker: fix a FD leak of a sockpair upon a failed reload - BUG/MINOR: sink: Use the right field in appctx context in release callback - BUG/MEDIUM: resolvers: Really ignore trailing dot in domain names - BUG/MEDIUM: fd: always align fdtab[] to 64 bytes - BUG/MAJOR: compiler: relax alignment constraints on certain structures - MINOR: httpclient: Don't limit data transfer to 1024 bytes - BUG/MINOR: httpclient: reinit flags in httpclient_start() - BUG/MINOR: mailers: negotiate SMTP, not ESMTP - BUG/MINOR: ssl: Add missing return value check in ssl_ocsp_response_print - BUG/MINOR: ssl: Fix leak in "show ssl ocsp-response" CLI command - BUG/MINOR: ssl: Missing return value check in ssl_ocsp_response_print - CLEANUP: httpclient/cli: fix indentation alignment of the help message - BUG/MINOR: tools: url2sa reads ipv4 too far - BUG/MEDIUM: httpclient: limit transfers to the maximum available room - DEBUG: buffer: check in __b_put_blk() whether the buffer room is respected 2.5.2 - BUG/MEDIUM: connection: properly leave stopping list on error - BUG/MEDIUM: htx: Adjust length to add DATA block in an empty HTX buffer - BUG/MINOR: httpclient: don't send an empty body - BUG/MINOR: httpclient: set default Accept and User-Agent headers - BUG/MINOR: httpclient/lua: don't pop the lua stack when getting headers - BUILD/MINOR: fix solaris build with clang. - BUG/MEDIUM: server: avoid changing healthcheck ctx with set server ssl - DOC: management: mark "set server ssl" as deprecated - MEDIUM: cli: yield between each pipelined command - MINOR: channel: add new function co_getdelim() to support multiple delimiters - BUG/MINOR: cli: avoid O(bufsize) parsing cost on pipelined commands - MEDIUM: h2/hpack: emit a Dynamic Table Size Update after settings change - BUG/MEDIUM: cli: Never wait for more data on client shutdown - BUG/MEDIUM: mcli: do not try to parse empty buffers - BUG/MEDIUM: mcli: always realign wrapping buffers before parsing them - BUG/MINOR: stream: make the call_rate only count the no-progress calls - DEBUG: cli: add a new "debug dev fd" expert command - BUILD: debug/cli: condition test of O_ASYNC to its existence - DEBUG: pools: add new build option DEBUG_POOL_INTEGRITY - REGTESTS: ssl: Fix ssl_errors regtest with OpenSSL 1.0.2 - BUG/MEDIUM: mworker: don't lose the stats socket on failed reload - BUG/MINOR: mworker: does not add the -sf in wait mode - BUG/MINOR: pools: always flush pools about to be destroyed - DEBUG: pools: add extra sanity checks when picking objects from a local cache - DEBUG: pools: let's add reverse mapping from cache heads to thread and pool - DEBUG: pools: replace the link pointer with the caller's address on pool_free() - BUG/MAJOR: sched: prevent rare concurrent wakeup of multi-threaded tasks - BUG/MINOR: mworker: does not erase the pidfile upon reload - DEBUG: fd: make sure we never try to insert/delete an impossible FD number - MINOR: listener: replace the listener's spinlock with an rwlock - BUG/MEDIUM: listener: read-lock the listener during accept() - BUG/MINOR: httpclient: Revisit HC request and response buffers allocation - BUG/MEDIUM: httpclient: Xfer the request when the stream is created - BUG/MINOR: ssl: Remove empty lines from "show ssl ocsp-response " output - BUG/MINOR: jwt: Double free in deinit function - BUG/MINOR: jwt: Missing pkey free during cleanup - BUG/MINOR: jwt: Memory leak if same key is used in multiple jwt_verify calls - BUG/MINOR: httpclient/cli: display junk characters in vsn - BUG/MAJOR: http/htx: prevent unbounded loop in http_manage_server_side_cookies - BUG/MAJOR: spoe: properly detach all agents when releasing the applet - REGTESTS: server: close an occasional race on dynamic_server_ssl.vtc - REGTESTS: peers: leave a bit more time to peers to synchronize - BUG/MEDIUM: h2/hpack: fix emission of HPACK DTSU after settings change - BUG/MINOR: mux-h2: update the session's idle delay before creating the stream --- net/haproxy/Makefile | 4 ++-- net/haproxy/distinfo | 10 +++++----- net/haproxy/patches/patch-Makefile | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index eb120453f055..ea664262a3c4 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.90 2022/01/31 13:06:20 adam Exp $ +# $NetBSD: Makefile,v 1.91 2022/02/21 17:13:39 adam Exp $ -DISTNAME= haproxy-2.5.1 +DISTNAME= haproxy-2.5.3 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 5aa53d5f9522..522d027aaead 100644 --- a/net/haproxy/distinfo +++ b/net/haproxy/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.83 2022/01/31 13:06:20 adam Exp $ +$NetBSD: distinfo,v 1.84 2022/02/21 17:13:39 adam Exp $ -BLAKE2s (haproxy-2.5.1.tar.gz) = 70bd9b5ffd113a60eca3ca85179bd8a6c906df40b327fc873875f9be9e872274 -SHA512 (haproxy-2.5.1.tar.gz) = d0ef80e68b99c3dd2f286a18a4061f1fc6dda5aa501c80d42a0fe97f6bb88d7f7999da6f7ff97b2c318c9ec5fccffd9cf5b2eb4cdf1cf1101b4f002da27f4e5c -Size (haproxy-2.5.1.tar.gz) = 3811260 bytes -SHA1 (patch-Makefile) = fcb2de85189526ae42ccf0b789789ee9b834f375 +BLAKE2s (haproxy-2.5.3.tar.gz) = c1df3d020ff7168d9cec6834469cea71501d26efc981f9b1da0268ef55c6eb24 +SHA512 (haproxy-2.5.3.tar.gz) = 691a65eae3912df655124b754ef72785776084c2376220e2ceeaa89c8c5c392eb7d2b2ab72ac06c638c3169bf59b2d83ce0caa42c19ba6ebf7a8c6036bc62280 +Size (haproxy-2.5.3.tar.gz) = 3818959 bytes +SHA1 (patch-Makefile) = 6fc9a19a8526b91473448822beab18878d6db1ac SHA1 (patch-include_haproxy_proxy-t.h) = 5560f5f50e66cf122fe8464f74541f226e127e8d SHA1 (patch-include_haproxy_queue-t.h) = bf2ea918a6d8ec3d3fb2f88b7b9303a695381d96 SHA1 (patch-include_haproxy_queue.h) = eed5ea43212462134fb60b50c2a32e619e104d51 diff --git a/net/haproxy/patches/patch-Makefile b/net/haproxy/patches/patch-Makefile index b21aec872ee3..9f80efcfb443 100644 --- a/net/haproxy/patches/patch-Makefile +++ b/net/haproxy/patches/patch-Makefile @@ -1,19 +1,19 @@ -$NetBSD: patch-Makefile,v 1.8 2020/12/06 11:22:53 adam Exp $ +$NetBSD: patch-Makefile,v 1.9 2022/02/21 17:13:39 adam Exp $ Do not hardcode _XOPEN_SOURCE. ---- Makefile.orig 2020-11-28 15:51:33.000000000 +0000 +--- Makefile.orig 2022-02-18 17:08:02.000000000 +0000 +++ Makefile -@@ -361,7 +361,7 @@ ifeq ($(TARGET),solaris) +@@ -378,7 +378,7 @@ ifeq ($(TARGET),solaris) set_target_defaults = $(call default_opts, \ USE_POLL USE_TPROXY USE_LIBCRYPT USE_CRYPT_H USE_GETADDRINFO USE_THREAD \ USE_RT USE_OBSOLETE_LINKER USE_EVPORTS USE_CLOSEFROM) -- TARGET_CFLAGS = -DFD_SETSIZE=65536 -D_REENTRANT -D_XOPEN_SOURCE=500 -D__EXTENSIONS__ +- TARGET_CFLAGS = -DFD_SETSIZE=65536 -D_REENTRANT -D_XOPEN_SOURCE=600 -D__EXTENSIONS__ + TARGET_CFLAGS = -DFD_SETSIZE=65536 -D_REENTRANT -D__EXTENSIONS__ TARGET_LDFLAGS = -lnsl -lsocket endif -@@ -924,8 +924,8 @@ src/haproxy.o: src/haproxy.c $(DEP) +@@ -994,8 +994,8 @@ src/haproxy.o: src/haproxy.c $(DEP) -c -o $@ $< install-man: @@ -24,7 +24,7 @@ Do not hardcode _XOPEN_SOURCE. EXCLUDE_DOCUMENTATION = lgpl gpl coding-style DOCUMENTATION = $(filter-out $(EXCLUDE_DOCUMENTATION),$(patsubst doc/%.txt,%,$(wildcard doc/*.txt))) -@@ -943,8 +943,8 @@ install-bin: +@@ -1013,8 +1013,8 @@ install-bin: exit 1; \ fi; \ done