Re: [PR PATCH] [Updated] haproxy: update to 2.6.8.

[zdykstra <zdykstra@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 832 bytes --]

There is an updated pull request by zdykstra against master on the void-packages repository

https://github.com/zdykstra/void-packages haproxy
https://github.com/void-linux/void-packages/pull/42194

haproxy: update to 2.6.8.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl

HAProxy 2.6 is the latest LTS release with some nice improvements over the 2.4 series. Until another LTS hits, it's reasonable to lock the package to 2.6.x.


A patch file from https://github.com/void-linux/void-packages/pull/42194.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-haproxy-42194.patch --]
[-- Type: text/x-diff, Size: 2206 bytes --]

From aba916e38a10d5aa666b20ae978adaef150e77d0 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Fri, 10 Feb 2023 12:26:41 -0600
Subject: [PATCH] haproxy: update to 2.6.8.

---
 srcpkgs/haproxy/template | 10 +++++-----
 srcpkgs/haproxy/update   |  2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/haproxy/update

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 373ff4e2c3c9..3ddd08a7d90f 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,19 +1,19 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.4.20
+version=2.6.8
 revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
-makedepends="libatomic-devel openssl-devel lua53-devel pcre-devel"
+makedepends="libatomic-devel openssl-devel lua53-devel pcre2-devel"
 checkdepends="curl varnish"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
-changelog="https://www.haproxy.org/download/2.4/src/CHANGELOG"
+changelog="https://www.haproxy.org/download/2.6/src/CHANGELOG"
 distfiles="https://www.haproxy.org/download/${version%.*}/src/haproxy-${version}.tar.gz"
-checksum=415c62d2159941a17c443941aa85e7353047d79f3b72a0e7062473f7e753cacc
+checksum=a02ad64550dd30a94b25fd0e225ba699649d0c4037bca3b36b20e8e3235bb86f
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
@@ -28,7 +28,7 @@ do_build() {
 		atomic="-latomic"
 	fi
 	make ${makejobs} CC="$CC" DEBUG_CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
-		TARGET=$target USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 \
+		TARGET=$target USE_PCRE2=1 USE_PCRE2_JIT=1 USE_ZLIB=1 \
 		USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1 \
 		USE_PROMEX=1 ADDLIB="$atomic"
 }
diff --git a/srcpkgs/haproxy/update b/srcpkgs/haproxy/update
new file mode 100644
index 000000000000..a91811c640f5
--- /dev/null
+++ b/srcpkgs/haproxy/update
@@ -0,0 +1,2 @@
+# 2.6 is the current LTS
+ignore="2\.[!6].*"