CVS commit: pkgsrc/net/haproxy

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/haproxy
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Fri, 5 Jun 2026 08:14:34 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Jun  5 08:14:34 UTC 2026

Modified Files:
        pkgsrc/net/haproxy: Makefile PLIST distinfo
        pkgsrc/net/haproxy/patches: patch-include_haproxy_proxy-t.h
            patch-include_haproxy_queue-t.h patch-include_haproxy_server-t.h

Log Message:
haproxy: updated to 3.4.0

3.4.0
- BUG/MINOR: tcpcheck: Check LDAP response to not read more data than available
- BUG/MINOR: ssl-gencert: validate SNI characters to prevent SAN certificate injection
- BUG/MINOR: mux-h1: H2 preface rejection doesn't update stick-table glitches
- BUG/MEDIUM: cpu-topo: Enforce thread-hard-limit on policy
- BUG/MEDIUM: qmux: do not crash on too large record
- BUG/MEDIUM: qmux: do not crash on receiving an invalid first frame
- BUG/MINOR: qmux: reject too large initial record
- Revert "BUG/MEDIUM: dns: fix long loops in additional records parse on name failure"
- BUG/MINOR: qpack: Fix index calculation in debug functions
- BUG/MINOR: qpack: fix potential null-pointer dereference in qpack_dht_insert()
- CLEANUP: qpack: fix copy-paste typo in value Huffman debug string
- BUG/MINOR: qpack: fix sign bit mask in qpack_decode_fs_pfx()
- CLEANUP: qpack: fix copy-paste typo in value Huffman debug string for WLN
- BUG/MINOR: qpack: fix huff_dec() error handling in qpack_decode_fs()
- CLEANUP: qpack: move encoded macros to qpack-t.h to avoid duplication
- BUG/MEDIUM: quic: handle ECONNREFUSED on RX side
- BUG/MINOR: quic: Fix memory leak in quic_deallocate_dghdlrs()
- BUG/MEDIUM: lua: defer Lua VM initialisation to the first Lua config keyword
- REGTESTS: lua: fix tune.lua.openlibs in Lua reg-tests
- BUG/MINOR: mux-h2: Count padding for connection flow control on error path
- BUILD: addons: convert 51d addon to EXTRA_MAKE
- BUILD: addons: convert deviceatlas addon to EXTRA_MAKE
- BUILD: addons: convert WURFL addon to EXTRA_MAKE
- MINOR: mux_quic/flags: add missing flags
- BUG/MINOR: mux_quic: open an idle QCS on reset on BE side
- BUG/MINOR: mux_quic: fix BE conn removal on app shutdown
- BUG/MINOR: mux_quic: prevent BE reuse with an errored conn
- BUG/MINOR: quic: fix ack range node pool_free call passing wrong pointer type
- MEDIUM: quic: optimize HKDF operations by reusing per-thread contexts
- BUG/MEDIUM: quic: reset cwnd in slow_start on persistent congestion (cubic)
- BUG/MEDIUM: quic: reset consecutive_losses on exit from recovery period (cubic)
- BUG/MINOR: quic: update drs->lost before calling on_ack_recv
- Revert "MEDIUM: quic: optimize HKDF operations by reusing per-thread contexts"
- BUG/MEDIUM: lua: register hlua_init() as a pre-check to fix crash without Lua config
- REGTESTS: quic: disable quic/ocsp_auto_update for now
- BUG/MINOR: threads: set at least grp_max when mtpg is too small
- BUG/MEDIUM: threads: ignore max-threads-per-group when thread-groups is set
- CLEANUP: thread: indicate when max-threads-per-group is ignored
- MINOR: cpu-topo: notify when cpu-policy is ignored due to other settings
- MINOR: thread: report when thread-groups or nbthread results in less threads
- BUILD: makefile: include EXTRA_MAKE in the .build_opts construction
- BUG/MINOR: quic: Fix another buffer overflow with sockaddr_in46
- MINOR: quic: Copy sin6_flowinfo and sin6_scope_id too
- BUILD: Makefile: put EXTRA_MAKE help at the right place
- BUG/MINOR: cache: fix cache tree iteration
- BUG/MEDIUM: resolvers: Wait a bit before calling the xprt prepare_srv
- CLEANUP: addons/51degrees: initialize variables
- MINOR: addons/51degrees: handle memory allocation failures
- CLEANUP: ncbmbuf: improve handling of memory allocation errors in unit tests
- CLEANUP: admin/halog: improve handling of memory allocation errors
- DOC: internals: clarify ambiguous wording in core-principles
- DOC: internals: add a threat model definition
- DOC: add security.txt describing how to report security issues
- DOC: security: also add a note to exclude dev/ and admin/
- BUG/MEDIUM: qmux: Close connection on invalid frame
- CLEANUP: fix comment typo
- BUG/MEDIUM: h3: fix MAX_PUSH_ID handling
- BUG/MINOR: cache: Fix copy of value when parsing maxage
- BUG/MEDIUM: mux-h1: Dup connection/upgrade value to parse it when making headers
- BUG/MEDIUM: htx: Fix headers rollback on partial copy in htx_xfer()
- MINOR: deinit: release the in-memory copy of shared libs
- MINOR: debug: add -dA to dump an archive of all dependencies
- BUG/MEDIUM: ssl: Make sure the alpn length is small enough
- BUG/MINOR: applet: Commit changes into input buffer after sending HTX data
- BUG/MINOR: mux-spop: Fix possible off-by-one OOB read in spop_get_varint()
- BUG/MEDIUM: leastconn: Unlock the write lock on allocation failure
- BUG/MINOR: tasks: Increase the right niced_task counter
- BUILD: makefile: search for Lua 5.5 as well
- DEV: dev/gdb: improve ebtree pointer handling
- DEV: dev/gdb: add simple task dump
- DEV: dev/gdb: add simple thread dump
- DEV: dev/gdb: add fdtab dump
- DOC: config: add a few more explanation in http-reusee regarding sni-auto
- REGTESTS: add basic QMux tests
- BUG/MINOR: http-act: Properly handle final evaluation in pause action
- BUILD: makefile/lua: use the system's default library before all other variants
- BUG/MINOR: startup: unbreak chroot with CAP_SYS_CHROOT
- BUG/MINOR: haterm: do not try to bind QUIC when not supported
- BUG/MINOR: haterm: also apply the tcp-bind-opts to clear TCP "bind" lines
- CLEANUP: haterm: do not try to bind to SSL when not built in
- MINOR: haterm: enable ktls on the SSL bind line when supported
- CI: github: replace cirrus by a vmactions/freebsd-vm job
- BUILD: makefile: fix build error with GNU make 4.2.1 and /bin/dash
- BUG/MEDIUM: channel: Fix condition to know if a channel may send
- BUG/MEDIUM: vars: Properly eval set-var-fmt action for emtpy log-format string
- CI: github: run illumos job weekly on Mondays at 03:00 instead of monthly
- BUG/MEDIUM: stream: Don't use small buffer on queuing with a request data filter
- BUG/MINOR: jwe: don't write randoms past MAX_DECRYPTED_CEK_LEN in RSA_PKCS1_PADDING
- BUG/MEDIUM: chunk: do not rely on small trash by default for expressions
- CLEANUP: map: always test pat->ref in sample_conv_map_key()
- DEV: patchbot: prepare for new version 3.5-dev
- MINOR: version: mention that it's 3.4 LTS now.


To generate a diff of this commit:
cvs rdiff -u -r1.158 -r1.159 pkgsrc/net/haproxy/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/haproxy/PLIST
cvs rdiff -u -r1.149 -r1.150 pkgsrc/net/haproxy/distinfo
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/net/haproxy/patches/patch-include_haproxy_proxy-t.h \
    pkgsrc/net/haproxy/patches/patch-include_haproxy_server-t.h
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/net/haproxy/patches/patch-include_haproxy_queue-t.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/haproxy/Makefile
diff -u pkgsrc/net/haproxy/Makefile:1.158 pkgsrc/net/haproxy/Makefile:1.159
--- pkgsrc/net/haproxy/Makefile:1.158   Thu Jun  4 13:40:31 2026
+++ pkgsrc/net/haproxy/Makefile Fri Jun  5 08:14:34 2026
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.158 2026/06/04 13:40:31 wiz Exp $
+# $NetBSD: Makefile,v 1.159 2026/06/05 08:14:34 adam Exp $
 
-DISTNAME=      haproxy-3.3.10
+DISTNAME=      haproxy-3.4.0
 CATEGORIES=    net www
 MASTER_SITES=  https://www.haproxy.org/download/${PKGVERSION_NOREV:R}/src/
 

Index: pkgsrc/net/haproxy/PLIST
diff -u pkgsrc/net/haproxy/PLIST:1.13 pkgsrc/net/haproxy/PLIST:1.14
--- pkgsrc/net/haproxy/PLIST:1.13       Thu May 29 20:36:26 2025
+++ pkgsrc/net/haproxy/PLIST    Fri Jun  5 08:14:34 2026
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.13 2025/05/29 20:36:26 adam Exp $
+@comment $NetBSD: PLIST,v 1.14 2026/06/05 08:14:34 adam Exp $
 man/man1/haproxy.1
 sbin/haproxy
 share/examples/haproxy/basic-config-edge.cfg
 share/examples/haproxy/content-sw-sample.cfg
 share/examples/haproxy/games.cfg
+share/examples/haproxy/keylog-test.cfg
 share/examples/haproxy/mptcp.cfg
 share/examples/haproxy/option-http_proxy.cfg
 share/examples/haproxy/quick-test.cfg

Index: pkgsrc/net/haproxy/distinfo
diff -u pkgsrc/net/haproxy/distinfo:1.149 pkgsrc/net/haproxy/distinfo:1.150
--- pkgsrc/net/haproxy/distinfo:1.149   Tue May 12 05:19:53 2026
+++ pkgsrc/net/haproxy/distinfo Fri Jun  5 08:14:34 2026
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.149 2026/05/12 05:19:53 adam Exp $
+$NetBSD: distinfo,v 1.150 2026/06/05 08:14:34 adam Exp $
 
-BLAKE2s (haproxy-3.3.10.tar.gz) = 71bf0cd7bbb1c8d490600dd95ae4504e7300ee974ae05fd0601787067063aa12
-SHA512 (haproxy-3.3.10.tar.gz) = d7a39a949a3d33d6bfa901a4d74f3e11d73c8e11c2fc10907edf3be90b84b2282b1c483a5ab5b0dc7a54530c01e5644b0e40b57a612704d7c2f11000bc4726cb
-Size (haproxy-3.3.10.tar.gz) = 5278275 bytes
-SHA1 (patch-include_haproxy_proxy-t.h) = 5fb2f6748c57f1f2dab6b355a4191d9ada2d367b
-SHA1 (patch-include_haproxy_queue-t.h) = bf2ea918a6d8ec3d3fb2f88b7b9303a695381d96
+BLAKE2s (haproxy-3.4.0.tar.gz) = f488d0652d8639ff07b25565b1e1a4db3d2657ba5e1612d9455926b46185e98f
+SHA512 (haproxy-3.4.0.tar.gz) = 982dd97c9d148179e12cdac0e9675960c665f64a9cfb02eb974de9844ef7edfc1d0b99a3a1b3b8e9b145b475fbb9bfe764548486445f66805fc26cf619815310
+Size (haproxy-3.4.0.tar.gz) = 5470166 bytes
+SHA1 (patch-include_haproxy_proxy-t.h) = 7aab2e32aacff45e7a2a0d6a48550b72d1fe7619
+SHA1 (patch-include_haproxy_queue-t.h) = a9f41857d66037b3f66f8d43090dab2d06c7bfb2
 SHA1 (patch-include_haproxy_queue.h) = eed5ea43212462134fb60b50c2a32e619e104d51
-SHA1 (patch-include_haproxy_server-t.h) = b9d0cc41f56d7103e4e016b1ce3dc7960e10008a
+SHA1 (patch-include_haproxy_server-t.h) = 153928a1fd86650fb1b453134f3d0d1959727f8c
 SHA1 (patch-src_backend.c) = a729f02af1c63ab8359b8dbd1dbdf86cc32e523b
 SHA1 (patch-src_queue.c) = d0665fa30d3906bc8362ff0ee81b91459014afe1

Index: pkgsrc/net/haproxy/patches/patch-include_haproxy_proxy-t.h
diff -u pkgsrc/net/haproxy/patches/patch-include_haproxy_proxy-t.h:1.5 pkgsrc/net/haproxy/patches/patch-include_haproxy_proxy-t.h:1.6
--- pkgsrc/net/haproxy/patches/patch-include_haproxy_proxy-t.h:1.5      Tue Dec  2 12:55:24 2025
+++ pkgsrc/net/haproxy/patches/patch-include_haproxy_proxy-t.h  Fri Jun  5 08:14:34 2026
@@ -1,15 +1,15 @@
-$NetBSD: patch-include_haproxy_proxy-t.h,v 1.5 2025/12/02 12:55:24 adam Exp $
+$NetBSD: patch-include_haproxy_proxy-t.h,v 1.6 2026/06/05 08:14:34 adam Exp $
 
 Avoid 'struct queue' conflict.
 
---- include/haproxy/proxy-t.h.orig     2025-11-26 14:55:57.000000000 +0000
+--- include/haproxy/proxy-t.h.orig     2026-06-03 13:01:51.000000000 +0000
 +++ include/haproxy/proxy-t.h
-@@ -302,7 +302,7 @@ struct error_snapshot {
+@@ -307,7 +307,7 @@ struct error_snapshot {
  
  /* Each proxy will have one occurrence of this structure per thread group */
  struct proxy_per_tgroup {
 -      struct queue queue;
 +      struct haqueue queue;
        struct lbprm_per_tgrp lbprm;
- } THREAD_ALIGNED(64);
- 
+       char *extra_counters_fe_storage;        /* storage for extra_counters_fe */
+       char *extra_counters_be_storage;        /* storage for extra_counters_be */
Index: pkgsrc/net/haproxy/patches/patch-include_haproxy_server-t.h
diff -u pkgsrc/net/haproxy/patches/patch-include_haproxy_server-t.h:1.5 pkgsrc/net/haproxy/patches/patch-include_haproxy_server-t.h:1.6
--- pkgsrc/net/haproxy/patches/patch-include_haproxy_server-t.h:1.5     Thu May 29 20:36:26 2025
+++ pkgsrc/net/haproxy/patches/patch-include_haproxy_server-t.h Fri Jun  5 08:14:34 2026
@@ -1,10 +1,10 @@
-$NetBSD: patch-include_haproxy_server-t.h,v 1.5 2025/05/29 20:36:26 adam Exp $
+$NetBSD: patch-include_haproxy_server-t.h,v 1.6 2026/06/05 08:14:34 adam Exp $
 
 Avoid 'struct queue' conflict.
 
---- include/haproxy/server-t.h.orig    2025-05-28 14:35:14.000000000 +0000
+--- include/haproxy/server-t.h.orig    2026-06-03 13:01:51.000000000 +0000
 +++ include/haproxy/server-t.h
-@@ -273,7 +273,7 @@ struct srv_per_thread {
+@@ -286,7 +286,7 @@ struct srv_per_thread {
  
  /* Each server will have one occurrence of this structure per thread group */
  struct srv_per_tgroup {
@@ -12,4 +12,4 @@ Avoid 'struct queue' conflict.
 +      struct haqueue queue;                   /* pending connections */
        struct server *server;                  /* pointer to the corresponding server */
        struct eb32_node lb_node;               /* node used for tree-based load balancing */
-       struct server *next_full;               /* next server in the temporary full list */
+       char *extra_counters_storage;           /* storage for extra_counters */

Index: pkgsrc/net/haproxy/patches/patch-include_haproxy_queue-t.h
diff -u pkgsrc/net/haproxy/patches/patch-include_haproxy_queue-t.h:1.1 pkgsrc/net/haproxy/patches/patch-include_haproxy_queue-t.h:1.2
--- pkgsrc/net/haproxy/patches/patch-include_haproxy_queue-t.h:1.1      Thu Dec  9 10:36:07 2021
+++ pkgsrc/net/haproxy/patches/patch-include_haproxy_queue-t.h  Fri Jun  5 08:14:34 2026
@@ -1,10 +1,10 @@
-$NetBSD: patch-include_haproxy_queue-t.h,v 1.1 2021/12/09 10:36:07 jperkin Exp $
+$NetBSD: patch-include_haproxy_queue-t.h,v 1.2 2026/06/05 08:14:34 adam Exp $
 
 Avoid 'struct queue' conflict.
 
---- include/haproxy/queue-t.h.orig     2021-11-23 14:40:21.000000000 +0000
+--- include/haproxy/queue-t.h.orig     2026-06-03 13:01:51.000000000 +0000
 +++ include/haproxy/queue-t.h
-@@ -28,19 +28,19 @@
+@@ -29,19 +29,19 @@
  struct proxy;
  struct server;
  struct stream;
@@ -24,6 +24,6 @@ Avoid 'struct queue' conflict.
  
 -struct queue {
 +struct haqueue {
-       struct eb_root head;                    /* queued pendconnds */
+       struct eb_root head;                    /* queued pendconns */
        struct proxy  *px;                      /* the proxy we're waiting for, never NULL in queue */
        struct server *sv;                      /* the server we are waiting for, may be NULL if don't care */

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/multimedia/libde265
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/multimedia/libde265
Indexes:

Home | Main Index | Thread Index | Old Index