From 095c2736efe655c252bef44cc7eda71f66d44cda Mon Sep 17 00:00:00 2001
From: Whyme Lyu <callme5long@gmail.com>
Date: Fri, 20 Feb 2026 14:28:05 +0800
Subject: [PATCH] haproxy 3.3.4-1

- Upgrade to 3.3.4
- Move chroot notice to config file. Don't print it everytime
- Tune pkgdesc
---
 .SRCINFO        | 13 ++++++-------
 PKGBUILD        | 12 +++++-------
 haproxy.cfg     |  3 +++
 haproxy.install | 10 ----------
 4 files changed, 14 insertions(+), 24 deletions(-)
 delete mode 100644 haproxy.install

diff --git a/.SRCINFO b/.SRCINFO
index b999cb649a3c..2a496e848684 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = haproxy-awslc
-	pkgdesc = Reliable, high performance TCP/HTTP load balancer built with aws-lc
-	pkgver = 3.3.3
-	pkgrel = 3
+	pkgdesc = Reliable, high performance TCP/HTTP load balancer. Built with aws-lc
+	pkgver = 3.3.4
+	pkgrel = 1
 	url = https://www.haproxy.org/
-	install = haproxy.install
 	arch = x86_64
 	license = GPL-2.0-or-later
 	checkdepends = varnish
@@ -20,15 +19,15 @@ pkgbase = haproxy-awslc
 	provides = haproxy
 	conflicts = haproxy
 	backup = etc/haproxy/haproxy.cfg
-	source = git+https://git.haproxy.org/git/haproxy-3.3.git#tag=v3.3.3?signed
+	source = git+https://git.haproxy.org/git/haproxy-3.3.git#tag=v3.3.4?signed
 	source = haproxy.cfg
 	source = haproxy.sysusers
 	source = 0001-Use-CFLAGS-and-LDFLAGS-when-building-admin.patch
 	validpgpkeys = 0C9568FA554656551590C5E44E386D9C9C61702F
 	validpgpkeys = 07D5F18D201984D7D13FB7AAF5F936267AA4B280
 	validpgpkeys = 692A51FE968BDB627C8C4B0E12F8CCEE5C19FD8D
-	sha256sums = 9a899b1a3595e69689dc085a5c12707da93b575a3dd4b576b3096dce5e187f91
-	sha256sums = b37d90a870e8c36b960847e586cb5af4583a028552df20663fae30bad27eb983
+	sha256sums = c1d15274f99564bfcba458995e836bfdb6bb02453a92d3c5a4587127d9194bc6
+	sha256sums = bd6ebf57fa417d42fe48340664e3620f08d4b40312d4be41dba51ef34bc0223c
 	sha256sums = c6e716ea59272a8e871af53703726dd2a75b56c82dacf097d4bf08ac5e841a0d
 	sha256sums = a1e3a1c2923465081383eb431bae55ff9841d89909469311cdba4b394ec4a998
 
diff --git a/PKGBUILD b/PKGBUILD
index 99f621686d99..d11bc2f0d187 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,10 +14,10 @@
 # (why is it not called haproxy-pp though)
 pkgname=haproxy-awslc
 _pkgname=haproxy
-pkgver=3.3.3
-pkgrel=3
+pkgver=3.3.4
+pkgrel=1
 
-pkgdesc='Reliable, high performance TCP/HTTP load balancer built with aws-lc'
+pkgdesc='Reliable, high performance TCP/HTTP load balancer. Built with aws-lc'
 url='https://www.haproxy.org/'
 arch=('x86_64')
 license=('GPL-2.0-or-later')
@@ -41,8 +41,6 @@ conflicts=($_pkgname)
 
 backup=('etc/haproxy/haproxy.cfg')
 
-install=haproxy.install
-
 validpgpkeys=('0C9568FA554656551590C5E44E386D9C9C61702F'  # Willy Tarreau <w@1wt.eu>
               '07D5F18D201984D7D13FB7AAF5F936267AA4B280'  # Christopher Faulet <christopher.faulet@capflam.org>
               '692A51FE968BDB627C8C4B0E12F8CCEE5C19FD8D') # Amaury Denoyelle <adenoyelle@haproxy.com>
@@ -62,8 +60,8 @@ source=("git+https://git.haproxy.org/git/haproxy-${pkgver%.*}.git#tag=v${pkgver}
 # implies some sort of integrity check.
 #
 # However, I've already setup this repo to run updpkgsums easily...
-sha256sums=('9a899b1a3595e69689dc085a5c12707da93b575a3dd4b576b3096dce5e187f91'
-            'b37d90a870e8c36b960847e586cb5af4583a028552df20663fae30bad27eb983'
+sha256sums=('c1d15274f99564bfcba458995e836bfdb6bb02453a92d3c5a4587127d9194bc6'
+            'bd6ebf57fa417d42fe48340664e3620f08d4b40312d4be41dba51ef34bc0223c'
             'c6e716ea59272a8e871af53703726dd2a75b56c82dacf097d4bf08ac5e841a0d'
             'a1e3a1c2923465081383eb431bae55ff9841d89909469311cdba4b394ec4a998')
 prepare() {
diff --git a/haproxy.cfg b/haproxy.cfg
index 9e890296a5df..e4e80f1da389 100644
--- a/haproxy.cfg
+++ b/haproxy.cfg
@@ -9,6 +9,9 @@ global
     maxconn     20000
     log         127.0.0.1 local0
     user        haproxy
+    # NOTE: with chroot, logging to journald won't work.
+    # Either disable chrooting, use rsyslog, or bind
+    # /run/systemd/journal/dev-log into the chroot.
     chroot      /usr/share/haproxy
     pidfile     /run/haproxy.pid
     daemon
diff --git a/haproxy.install b/haproxy.install
deleted file mode 100644
index f89d22e1cbd1..000000000000
--- a/haproxy.install
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-post_install() {
-  printf '==> %s\n' "The example config chroots HAProxy, meaning that logging to journald won't work."
-  printf '    %s\n' "Either disable chrooting, use rsyslog, or bind /run/systemd/journal/dev-log into the chroot."
-}
-
-post_upgrade() {
-  post_install $1
-}