[Buildroot] [PATCH 1/1] package/haproxy: bump version to 3.4.4
Bernd Kuhls
bernd at kuhls.net
Sun Sep 6 15:19:35 UTC 2026
https://www.haproxy.org/news.html
https://www.haproxy.com/blog/announcing-haproxy-3-4
http://www.haproxy.org/download/3.4/src/CHANGELOG
https://git.haproxy.org/?p=haproxy-3.4.git;a=blob_plain;f=CHANGELOG
Version 3.4.x is the new LTS release which also added OpenSSL 4.0
compatibility.
Removed patch which is included in this release.
Disabled static builds due to upstream commit
https://git.haproxy.org/?p=haproxy-2.8.git;a=commitdiff;h=eaba76b02dd41e0a1a2e85a3e71f91dfc529916d
which was added to version 2.8 and causes build errors during static
linking:
/builds/bkuhls/buildroot/br-test-pkg/br-arm-full-static/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld:
/builds/bkuhls/buildroot/br-test-pkg/br-arm-full-static/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/bin/../../usr/lib/libc.a(free.os):
in function `malloc_trim':
free.c:(.text+0x24c): multiple definition of `malloc_trim';
src/pool.o:pool.c:(.text+0xa14): first defined here
as suggested by Julien:
https://lists.buildroot.org/pipermail/buildroot/2025-July/782675.html
Signed-off-by: Bernd Kuhls <bernd at kuhls.net>
---
Gitlab pipelines passed:
https://gitlab.com/bkuhls/buildroot/-/commits/31415f6b2f596562f3e26b72bd6c6b7d04ff0499
tests.package.test_haproxy.TestHaproxy.test_run:
https://gitlab.com/bkuhls/buildroot/-/commits/61aea38f365ef4ef9486c56e17d6201fd3e60970
...mic.h-may-need-compiler.h-on-ARMv8.2.patch | 36 -------------------
package/haproxy/Config.in | 5 +++
package/haproxy/haproxy.hash | 4 +--
package/haproxy/haproxy.mk | 4 +--
4 files changed, 9 insertions(+), 40 deletions(-)
delete mode 100644 package/haproxy/0001-BUILD-atomic-atomic.h-may-need-compiler.h-on-ARMv8.2.patch
diff --git a/package/haproxy/0001-BUILD-atomic-atomic.h-may-need-compiler.h-on-ARMv8.2.patch b/package/haproxy/0001-BUILD-atomic-atomic.h-may-need-compiler.h-on-ARMv8.2.patch
deleted file mode 100644
index b3b1f732ab..0000000000
--- a/package/haproxy/0001-BUILD-atomic-atomic.h-may-need-compiler.h-on-ARMv8.2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 5ab3c61932af7619518169da744ba6346f060405 Mon Sep 17 00:00:00 2001
-From: Willy Tarreau <w at 1wt.eu>
-Date: Thu, 8 Dec 2022 08:32:57 +0100
-Subject: [PATCH] BUILD: atomic: atomic.h may need compiler.h on ARMv8.2-a
-
-We get a build error in ncbuf.c when building for ARMv8.2-a because ncbuf
-has minimal includes and among them bug.h which includes atomic.h. Atomic.h
-may use "forceinline" without including compiler.h, hence the build error.
-It was verified that adding it doesn't inflate the total headers.
-
-Since all other C files include api.h which already covers this, there's
-no real need to bapkport this. The issue was already there in 2.3 though.
-
-Upstream: https://git.haproxy.org/?p=haproxy.git;a=commitdiff;h=5ab3c61932af7619518169da744ba6346f060405#patch1
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>
----
- include/haproxy/atomic.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/include/haproxy/atomic.h b/include/haproxy/atomic.h
-index f60be95..7e3c826 100644
---- a/include/haproxy/atomic.h
-+++ b/include/haproxy/atomic.h
-@@ -23,6 +23,8 @@
- #ifndef _HAPROXY_ATOMIC_H
- #define _HAPROXY_ATOMIC_H
-
-+#include <haproxy/compiler.h>
-+
- /* A few notes for the macros and functions here:
- * - this file is painful to edit, most operations exist in 3 variants,
- * no-thread, threads with gcc<4.7, threads with gcc>=4.7. Be careful when
---
-1.7.10.4
-
diff --git a/package/haproxy/Config.in b/package/haproxy/Config.in
index 320508f7ee..4db0ef00ce 100644
--- a/package/haproxy/Config.in
+++ b/package/haproxy/Config.in
@@ -7,6 +7,7 @@ config BR2_PACKAGE_HAPROXY_ARCH_SUPPORTS
config BR2_PACKAGE_HAPROXY
bool "haproxy"
depends on BR2_PACKAGE_HAPROXY_ARCH_SUPPORTS
+ depends on !BR2_STATIC_LIBS
depends on BR2_USE_MMU # fork()
depends on BR2_TOOLCHAIN_HAS_SYNC_1 && BR2_TOOLCHAIN_HAS_SYNC_4
help
@@ -15,3 +16,7 @@ config BR2_PACKAGE_HAPROXY
HTTP-based applications.
http://www.haproxy.org
+
+comment "haproxy needs a toolchain w/ dynamic library"
+ depends on BR2_PACKAGE_HAPROXY_ARCH_SUPPORTS
+ depends on BR2_STATIC_LIBS
diff --git a/package/haproxy/haproxy.hash b/package/haproxy/haproxy.hash
index 2575c408d7..9f3a08c500 100644
--- a/package/haproxy/haproxy.hash
+++ b/package/haproxy/haproxy.hash
@@ -1,5 +1,5 @@
-# From: http://www.haproxy.org/download/2.6/src/haproxy-2.6.32.tar.gz.sha256
-sha256 8791585ee3bd24cde652d1d840ac7b1f73f086d5e9ec41c5e079592703ea52a4 haproxy-2.6.32.tar.gz
+# From: http://www.haproxy.org/download/3.4/src/haproxy-3.4.4.tar.gz.sha256
+sha256 b0c5053c4d46840ecdee3925736fe9a3de6472559b43c69183d70e593d9133df haproxy-3.4.4.tar.gz
# Locally computed:
sha256 0717ca51fceaa25ac9e5ccc62e0c727dcf27796057201fb5fded56a25ff6ca28 LICENSE
sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a doc/lgpl.txt
diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk
index f75f18e031..d2fba7f920 100644
--- a/package/haproxy/haproxy.mk
+++ b/package/haproxy/haproxy.mk
@@ -4,8 +4,8 @@
#
################################################################################
-HAPROXY_VERSION_MAJOR = 2.6
-HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).32
+HAPROXY_VERSION_MAJOR = 3.4
+HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).4
HAPROXY_SITE = http://www.haproxy.org/download/$(HAPROXY_VERSION_MAJOR)/src
HAPROXY_LICENSE = GPL-2.0+ and LGPL-2.1+ with exceptions
HAPROXY_LICENSE_FILES = LICENSE doc/lgpl.txt doc/gpl.txt
--
2.47.3
More information about the buildroot
mailing list