pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/net/haproxy
Module Name: pkgsrc
Committed By: adam
Date: Thu May 29 20:36:26 UTC 2025
Modified Files:
pkgsrc/net/haproxy: Makefile PLIST distinfo
pkgsrc/net/haproxy/patches: patch-include_haproxy_proxy-t.h
patch-include_haproxy_server-t.h patch-src_queue.c
Log Message:
haproxy: updated to 3.2.0
3.2.0
- MINOR: promex: Add agent check status/code/duration metrics
- MINOR: ssl: support strict-sni in ssl-default-bind-options
- MINOR: ssl: also provide the "tls-tickets" bind option
- MINOR: server: define CLI I/O handler for "add server"
- MINOR: server: implement "add server help"
- MINOR: server: use stress mode for "add server help"
- BUG/MEDIUM: server: fix crash after duplicate GUID insertion
- BUG/MEDIUM: server: fix potential null-deref after previous fix
- MINOR: config: list recently added sections with -dKcfg
- BUG/MAJOR: cache: Crash because of wrong cache entry deleted
- DOC: configuration: fix the example in crt-store
- DOC: config: clarify the wording around single/double quotes
- DOC: config: clarify the legacy cookie and header captures
- DOC: config: fix alphabetical ordering of layer 7 sample fetch functions
- DOC: config: fix alphabetical ordering of layer 6 sample fetch functions
- DOC: config: fix alphabetical ordering of layer 5 sample fetch functions
- DOC: config: fix alphabetical ordering of layer 4 sample fetch functions
- DOC: config: fix alphabetical ordering of internal sample fetch functions
- BUG/MINOR: h3: Set HTX flags corresponding to the scheme found in the request
- BUG/MEDIUM: h3: Declare absolute URI as normalized when a :authority is found
- DOC: config: mention in bytes_in and bytes_out that they're read on input
- DOC: config: clarify the basics of ACLs (call point, multi-valued etc)
- REGTESTS: Make the script testing conditional set-var compatible with Vtest2
- REGTESTS: Explicitly allow failing shell commands in some scripts
- MINOR: listeners: Add support for a label on bind line
- BUG/MEDIUM: cli/ring: Properly handle shutdown in "show event" I/O handler
- BUG/MEDIUM: hlua: Properly detect shudowns for TCP applets based on the new API
- BUG/MEDIUM: hlua: Fix getline() for TCP applets to work with applet's buffers
- BUG/MEDIUM: hlua: Fix receive API for TCP applets to properly handle shutdowns
- CI: vtest: Rely on VTest2 to run regression tests
- CI: vtest: Fix the build script to properly work on MaOS
- CI: combine AWS-LC and AWS-LC-FIPS by template
- BUG/MEDIUM: httpclient: Throw an error if an lua httpclient instance is reused
- DOC: hlua: Add a note to warn user about httpclient object reuse
- DOC: hlua: fix a few typos in HTTPMessage.set_body_len() documentation
- DEV: patchbot: prepare for new version 3.3-dev
- MINOR: version: mention that it's 3.2 LTS now.
To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 pkgsrc/net/haproxy/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/haproxy/PLIST
cvs rdiff -u -r1.127 -r1.128 pkgsrc/net/haproxy/distinfo
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/net/haproxy/patches/patch-include_haproxy_proxy-t.h \
pkgsrc/net/haproxy/patches/patch-src_queue.c
cvs rdiff -u -r1.4 -r1.5 \
pkgsrc/net/haproxy/patches/patch-include_haproxy_server-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.135 pkgsrc/net/haproxy/Makefile:1.136
--- pkgsrc/net/haproxy/Makefile:1.135 Fri Apr 18 07:39:48 2025
+++ pkgsrc/net/haproxy/Makefile Thu May 29 20:36:26 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.135 2025/04/18 07:39:48 adam Exp $
+# $NetBSD: Makefile,v 1.136 2025/05/29 20:36:26 adam Exp $
-DISTNAME= haproxy-3.1.7
+DISTNAME= haproxy-3.2.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.12 pkgsrc/net/haproxy/PLIST:1.13
--- pkgsrc/net/haproxy/PLIST:1.12 Thu Nov 28 18:11:42 2024
+++ pkgsrc/net/haproxy/PLIST Thu May 29 20:36:26 2025
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.12 2024/11/28 18:11:42 adam Exp $
+@comment $NetBSD: PLIST,v 1.13 2025/05/29 20:36:26 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/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.127 pkgsrc/net/haproxy/distinfo:1.128
--- pkgsrc/net/haproxy/distinfo:1.127 Fri Apr 18 07:39:48 2025
+++ pkgsrc/net/haproxy/distinfo Thu May 29 20:36:26 2025
@@ -1,15 +1,16 @@
-$NetBSD: distinfo,v 1.127 2025/04/18 07:39:48 adam Exp $
+$NetBSD: distinfo,v 1.128 2025/05/29 20:36:26 adam Exp $
-BLAKE2s (haproxy-3.1.7.tar.gz) = 45b32ce0b58471350b0312b42141a8861bac5a4d211a0a46f738e1eb846ded1b
-SHA512 (haproxy-3.1.7.tar.gz) = 4cf13b96fcc0c7748ebf2a9bd512474d8aa5f760dd9e40961ba6c0ce72324450b556657b129114c3ca150826fff2b161d062366419fac7bd9c4d44a68e8b6a73
-Size (haproxy-3.1.7.tar.gz) = 4917146 bytes
+BLAKE2s (haproxy-3.2.0.tar.gz) = 909fc1d731d00c0e6925eb2fef76561bdee3e9ad03c1af1bd32497b98ddf18b6
+SHA512 (haproxy-3.2.0.tar.gz) = bba758f5541f79bbff1be43222c93146c785e64efeef53977c5a07c44de2d3830096323d5d5ce4d1572fec6f9aa5f1bc9452d0d06df864f67474f9adee0c169b
+Size (haproxy-3.2.0.tar.gz) = 5090982 bytes
SHA1 (patch-Makefile) = 36c0e5d46b30d7b28fdb4b3fdbb4fe052fa8d850
-SHA1 (patch-include_haproxy_proxy-t.h) = c8786f431a13c6515553c77314cc8b3a002d6d03
+SHA1 (patch-include_haproxy_proxy-t.h) = 2006a3bd2cc95652b9e7d52fb85b3065788138cd
SHA1 (patch-include_haproxy_queue-t.h) = bf2ea918a6d8ec3d3fb2f88b7b9303a695381d96
SHA1 (patch-include_haproxy_queue.h) = eed5ea43212462134fb60b50c2a32e619e104d51
-SHA1 (patch-include_haproxy_server-t.h) = 33daa2f809934a76b8b085c42b2623c6e3e2dda6
+SHA1 (patch-include_haproxy_server-t.h) = b9d0cc41f56d7103e4e016b1ce3dc7960e10008a
+SHA1 (patch-src_backend.c) = a729f02af1c63ab8359b8dbd1dbdf86cc32e523b
SHA1 (patch-src_cli.c) = 4bc5cf0116df121ac4c3c38b8f962c3a62d536e5
SHA1 (patch-src_haproxy.c) = a466acb853b5018b70571d0a03b9d28ed9245d06
SHA1 (patch-src_proto__sockpair.c) = 67b8b94768d029d412eddc35c2165e9183ab69f9
-SHA1 (patch-src_queue.c) = d579a24b0a0889dcc2a4008124fed5e8aaae0dab
+SHA1 (patch-src_queue.c) = d0665fa30d3906bc8362ff0ee81b91459014afe1
SHA1 (patch-src_sock.c) = 95ed06506907e76941d763486215df87a260f417
Index: pkgsrc/net/haproxy/patches/patch-include_haproxy_proxy-t.h
diff -u pkgsrc/net/haproxy/patches/patch-include_haproxy_proxy-t.h:1.2 pkgsrc/net/haproxy/patches/patch-include_haproxy_proxy-t.h:1.3
--- pkgsrc/net/haproxy/patches/patch-include_haproxy_proxy-t.h:1.2 Wed May 29 20:27:50 2024
+++ pkgsrc/net/haproxy/patches/patch-include_haproxy_proxy-t.h Thu May 29 20:36:26 2025
@@ -1,15 +1,15 @@
-$NetBSD: patch-include_haproxy_proxy-t.h,v 1.2 2024/05/29 20:27:50 adam Exp $
+$NetBSD: patch-include_haproxy_proxy-t.h,v 1.3 2025/05/29 20:36:26 adam Exp $
Avoid 'struct queue' conflict.
---- include/haproxy/proxy-t.h.orig 2024-05-29 12:43:38.000000000 +0000
+--- include/haproxy/proxy-t.h.orig 2025-05-28 14:35:14.000000000 +0000
+++ include/haproxy/proxy-t.h
-@@ -350,7 +350,7 @@ struct proxy {
- __decl_thread(HA_RWLOCK_T lock); /* may be taken under the server's lock */
+@@ -302,7 +302,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 *id, *desc; /* proxy id (name) and description */
-- struct queue queue; /* queued requests (pendconns) */
-+ struct haqueue queue; /* queued requests (pendconns) */
- int totpend; /* total number of pending connections on this instance (for stats) */
- unsigned int feconn, beconn; /* # of active frontend and backends streams */
- unsigned int fe_sps_lim; /* limit on new sessions per second on the frontend */
Index: pkgsrc/net/haproxy/patches/patch-src_queue.c
diff -u pkgsrc/net/haproxy/patches/patch-src_queue.c:1.2 pkgsrc/net/haproxy/patches/patch-src_queue.c:1.3
--- pkgsrc/net/haproxy/patches/patch-src_queue.c:1.2 Sat Sep 14 08:00:13 2024
+++ pkgsrc/net/haproxy/patches/patch-src_queue.c Thu May 29 20:36:26 2025
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_queue.c,v 1.2 2024/09/14 08:00:13 adam Exp $
+$NetBSD: patch-src_queue.c,v 1.3 2025/05/29 20:36:26 adam Exp $
Avoid 'struct queue' conflict.
---- src/queue.c.orig 2024-09-03 13:37:09.000000000 +0000
+--- src/queue.c.orig 2025-05-28 14:35:14.000000000 +0000
+++ src/queue.c
@@ -177,7 +177,7 @@ static inline void pendconn_queue_unlock
*/
@@ -13,21 +13,30 @@ Avoid 'struct queue' conflict.
struct proxy *px = q->px;
struct server *sv = q->sv;
uint oldidx;
-@@ -430,7 +430,7 @@ struct pendconn *pendconn_add(struct str
+@@ -555,7 +555,7 @@ struct pendconn *pendconn_add(struct str
struct pendconn *p;
struct proxy *px;
struct server *srv;
- struct queue *q;
+ struct haqueue *q;
unsigned int *max_ptr;
+ unsigned int *queueslength;
unsigned int old_max, new_max;
+@@ -628,7 +628,7 @@ int pendconn_redistribute(struct server
+ goto skip_srv_queue;
-@@ -630,7 +630,7 @@ int pendconn_dequeue(struct stream *strm
- */
- int pendconn_must_try_again(struct pendconn *p)
- {
-- struct queue *q = p->queue;
-+ struct haqueue *q = p->queue;
- struct proxy *px = q->px;
- struct server *sv = q->sv;
- int ret = 0;
+ for (i = 0; i < global.nbtgroups; i++) {
+- struct queue *queue = &s->per_tgrp[i].queue;
++ struct haqueue *queue = &s->per_tgrp[i].queue;
+ int local_xferred = 0;
+
+ HA_SPIN_LOCK(QUEUE_LOCK, &queue->lock);
+@@ -663,7 +663,7 @@ int pendconn_redistribute(struct server
+ goto done;
+
+ for (i = 0; i < global.nbtgroups; i++) {
+- struct queue *queue = &px->per_tgrp[i].queue;
++ struct haqueue *queue = &px->per_tgrp[i].queue;
+ int local_xferred = 0;
+
+ HA_SPIN_LOCK(QUEUE_LOCK, &queue->lock);
Index: pkgsrc/net/haproxy/patches/patch-include_haproxy_server-t.h
diff -u pkgsrc/net/haproxy/patches/patch-include_haproxy_server-t.h:1.4 pkgsrc/net/haproxy/patches/patch-include_haproxy_server-t.h:1.5
--- pkgsrc/net/haproxy/patches/patch-include_haproxy_server-t.h:1.4 Mon Sep 30 17:09:27 2024
+++ pkgsrc/net/haproxy/patches/patch-include_haproxy_server-t.h Thu May 29 20:36:26 2025
@@ -1,15 +1,15 @@
-$NetBSD: patch-include_haproxy_server-t.h,v 1.4 2024/09/30 17:09:27 adam Exp $
+$NetBSD: patch-include_haproxy_server-t.h,v 1.5 2025/05/29 20:36:26 adam Exp $
Avoid 'struct queue' conflict.
---- include/haproxy/server-t.h.orig 2024-09-19 12:07:01.000000000 +0000
+--- include/haproxy/server-t.h.orig 2025-05-28 14:35:14.000000000 +0000
+++ include/haproxy/server-t.h
-@@ -347,7 +347,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) */
+@@ -273,7 +273,7 @@ struct srv_per_thread {
+ /* Each server will have one occurrence of this structure per thread group */
+ struct srv_per_tgroup {
- struct queue queue; /* pending connections */
+ struct haqueue queue; /* pending connections */
- struct mt_list sess_conns; /* list of private conns managed by a session on this server */
- unsigned int dequeuing; /* non-zero = dequeuing in progress (atomic) */
-
+ 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 */
Home |
Main Index |
Thread Index |
Old Index