[Buildroot] [PATCH 1/1] package/haproxy: bump to version 3.2.1 (lts branch)

[Buildroot] [PATCH 1/1] package/haproxy: bump to version 3.2.1 (lts branch)

[Fred Lefranc]

Signed-off-by: Fred Lefranc <fred.lefranc+evs@gmail.com>
---
 ...mic.h-may-need-compiler.h-on-ARMv8.2.patch | 36 -------------------
 package/haproxy/haproxy.hash                  |  4 +--
 package/haproxy/haproxy.mk                    |  4 +--
 3 files changed, 4 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@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@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/haproxy.hash b/package/haproxy/haproxy.hash
index 42f340fa80..2ab8bcef47 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.22.tar.gz.sha256
-sha256  4c0797f450f997dc287d2c7aafa7a0e5b7a2d71593a2cd58e664e8f3aea614fa
 haproxy-2.6.22.tar.gz
+# From: http://www.haproxy.org/download/3.2/src/haproxy-3.2.1.tar.gz
+sha256  bb3f967a797c8851d08683ec43dfafe4ad7bf5ad86fa6b0721cad033ea9e5ae5
 haproxy-3.2.1.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 77195d966b..06d0c7bd26 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).22
+HAPROXY_VERSION_MAJOR = 3.2
+HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).1
 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.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/haproxy: bump to version 3.2.1 (lts branch)

[Julien Olivain via buildroot]

Hi Fred,

Thanks for the patch!

It was not applying as is, due to word wrapping. Could you make sure
to send patches with git send-email to make sure they are correctly
formatted please?

When doing a bump like this, could you add a link to a change log,
or a release note in the commit log?

For example, adding:
"""
For the change log since v2.6.22, see:
https://www.haproxy.org/download/3.2/src/CHANGELOG
"""

On 23/06/2025 11:00, Fred Lefranc wrote:
> Signed-off-by: Fred Lefranc <fred.lefranc+evs@gmail.com>
> ---
>  ...mic.h-may-need-compiler.h-on-ARMv8.2.patch | 36 -------------------
>  package/haproxy/haproxy.hash                  |  4 +--
>  package/haproxy/haproxy.mk                    |  4 +--
>  3 files changed, 4 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/haproxy.mk b/package/haproxy/haproxy.mk
> index 77195d966b..06d0c7bd26 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).22
> +HAPROXY_VERSION_MAJOR = 3.2
> +HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).1

This bump is introducing build failures for static builds.
See:
https://gitlab.com/jolivain/buildroot/-/pipelines/1923624453

haproxy introduced a malloc_trim() symbol in
https://git.haproxy.org/?p=haproxy-3.2.git;a=commitdiff;h=eaba76b02dd41e0a1a2e85a3e71f91dfc529916d

Then tries to override it with libdl calls:
https://git.haproxy.org/?p=haproxy-3.2.git;a=blob;f=src/tools.c;h=aee750b4180c22c1b360305bf9ecc38a157d2c1e;hb=f4d1a4e279bcb00f758dfbf037e3808512df113b#l5480

Even if there is logic avoiding those libdl calls, the final link
fails due to this multiple definition of malloc_trim symbol.

You can reproduce the issue with commands:

     cat >.config <<EOF
     BR2_aarch64=y
     BR2_STATIC_LIBS=y
     BR2_TOOLCHAIN_EXTERNAL=y
     BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y
     BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_BLEEDING_EDGE=y
     BR2_PACKAGE_HAPROXY=y
     EOF
     make olddefconfig
     make haproxy

Could you have a look to either fix those static builds, or
adding a Kconfig logic to restrict only to dynamic builds?

>  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.25.1

Can you send an updated patch addressing those comment, please?

Best regards,

Julien.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/haproxy: bump to version 3.2.1 (lts branch)

[Fred Lefranc]

Hi,

Thanks for the catch. In the meantime I found that we had a major
issue compiling HAProxy related to CFLAGS that are overridden by the
generic-package build topology.

I've found a patch that is working, but I wanted to have a discussion
about the best way to handle this.

Regards,
Fred

On Sun, Jul 13, 2025 at 12:36 PM Julien Olivain <ju.o@free.fr> wrote:
>
> Hi Fred,
>
> Thanks for the patch!
>
> It was not applying as is, due to word wrapping. Could you make sure
> to send patches with git send-email to make sure they are correctly
> formatted please?
>
> When doing a bump like this, could you add a link to a change log,
> or a release note in the commit log?
>
> For example, adding:
> """
> For the change log since v2.6.22, see:
> https://www.haproxy.org/download/3.2/src/CHANGELOG
> """
>
> On 23/06/2025 11:00, Fred Lefranc wrote:
> > Signed-off-by: Fred Lefranc <fred.lefranc+evs@gmail.com>
> > ---
> >  ...mic.h-may-need-compiler.h-on-ARMv8.2.patch | 36 -------------------
> >  package/haproxy/haproxy.hash                  |  4 +--
> >  package/haproxy/haproxy.mk                    |  4 +--
> >  3 files changed, 4 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/haproxy.mk b/package/haproxy/haproxy.mk
> > index 77195d966b..06d0c7bd26 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).22
> > +HAPROXY_VERSION_MAJOR = 3.2
> > +HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).1
>
> This bump is introducing build failures for static builds.
> See:
> https://gitlab.com/jolivain/buildroot/-/pipelines/1923624453
>
> haproxy introduced a malloc_trim() symbol in
> https://git.haproxy.org/?p=haproxy-3.2.git;a=commitdiff;h=eaba76b02dd41e0a1a2e85a3e71f91dfc529916d
>
> Then tries to override it with libdl calls:
> https://git.haproxy.org/?p=haproxy-3.2.git;a=blob;f=src/tools.c;h=aee750b4180c22c1b360305bf9ecc38a157d2c1e;hb=f4d1a4e279bcb00f758dfbf037e3808512df113b#l5480
>
> Even if there is logic avoiding those libdl calls, the final link
> fails due to this multiple definition of malloc_trim symbol.
>
> You can reproduce the issue with commands:
>
>      cat >.config <<EOF
>      BR2_aarch64=y
>      BR2_STATIC_LIBS=y
>      BR2_TOOLCHAIN_EXTERNAL=y
>      BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y
>      BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_BLEEDING_EDGE=y
>      BR2_PACKAGE_HAPROXY=y
>      EOF
>      make olddefconfig
>      make haproxy
>
> Could you have a look to either fix those static builds, or
> adding a Kconfig logic to restrict only to dynamic builds?
>
> >  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.25.1
>
> Can you send an updated patch addressing those comment, please?
>
> Best regards,
>
> Julien.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot