Index | Thread | Search

From:
Lucas Gabriel Vuotto <lucas@sexy.is>
Subject:
Re: UPDATE net/haproxy 3.2.0 from MAINTAINER
To:
ports@openbsd.org
Date:
Mon, 23 Jun 2025 09:41:59 +0000

Download raw body.

Thread
Bump.

On Tue, Jun 10, 2025 at 09:15:01AM +0000, Lucas Gabriel Vuotto wrote:
> Hello ports,
> 
> There was a new HAProxy LTS branch released a couple of days ago. The
> changelog is quite long to include in this email, but can be found at:
> 
> - Mailing list announcement:
>   https://www.mail-archive.com/haproxy@formilux.org/msg45917.html
> - Blog: https://www.haproxy.com/blog/announcing-haproxy-3-2
> - Detailed list: https://www.haproxy.org/download/3.2/src/CHANGELOG
> 
> On the port side of things, the most lines comes from a change in the
> config example we provide, using the crt-store directive that I missed
> during 3.0 and makes managing the certificates with acme-client easier
> and adjusts the example binds for dualstack. There is a lot of
> whitespace churn there too, as I replaced the non-leading tabs with
> spaces. Because of that, the inlined patch is the output of `diff -w`.
> The patch to be commited is attached.


diff refs/heads/master f25db98dde9cd34acd7b963eae37445ef4017779
commit - b75638b7060216da009348900c6d908b08d340ca
commit + f25db98dde9cd34acd7b963eae37445ef4017779
blob - fb2b41cabe16d4cf538ba2a690b22a587fff5b12
blob + 5b65c2c76c11999dbe5df1d9e7982c03f57fe083
--- net/haproxy/Makefile
+++ net/haproxy/Makefile
@@ -1,6 +1,6 @@
 COMMENT =	reliable, high performance TCP/HTTP load balancer
 
-DISTNAME =	haproxy-3.0.10
+DISTNAME =	haproxy-3.2.0
 CATEGORIES =	net www
 HOMEPAGE =	https://www.haproxy.org/
 MAINTAINER =	Lucas Gabriel Vuotto <lucas@sexy.is>
@@ -12,7 +12,7 @@ WANTLIB +=	c crypto pcre2-8 pcre2-posix pthread ssl z
 
 DEBUG_PACKAGES = ${BUILD_PACKAGES}
 
-SITES =		${HOMEPAGE}/download/3.0/src/
+SITES =		${HOMEPAGE}/download/3.2/src/
 
 USE_GMAKE =	Yes
 MAKE_FLAGS +=	CPU_CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
blob - ce2243048979729dc79b6d92faf3325e0e98148e
blob + b12ded0a6f3f1f3b884505a5d394521fff7258fc
--- net/haproxy/distinfo
+++ net/haproxy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (haproxy-3.0.10.tar.gz) = 0VCGcLb9WDnGaaCpFoQvDT09C1eLs1Gip0od49kpziY=
-SIZE (haproxy-3.0.10.tar.gz) = 4734325
+SHA256 (haproxy-3.2.0.tar.gz) = 92KuMbyhtR/rieQ5Xjbhf4Z8JTcqEIU8cNKSw90Xt7A=
+SIZE (haproxy-3.2.0.tar.gz) = 5090982
blob - 99030a2bb355b7a75851937ff393f07179241d9b
blob + 2fff5df9774ce36002bbeb45d682a8cf2f941aa2
--- net/haproxy/files/haproxy.cfg
+++ net/haproxy/files/haproxy.cfg
@@ -16,8 +16,15 @@ defaults
 	retries	3
 	maxconn	2000
 
+#crt-store main
+#	crt-base /etc/ssl/
+#	key-base /etc/ssl/private/
+#	load crt "example.com.fullchain.pem" key "example.com.key" alias "example.com"
+
 frontend haproxy
-	bind *:80
+	bind ipv4@:80,ipv6@:80
+	#bind ipv4@:443,ipv6@:443 ssl
+	#ssl-f-use crt "@main/example.com"
 	default_backend httpd
 
 backend httpd
blob - 80afa917bba6891b62364c489a3583bd15a841e4
blob + d0e370c7b70dc829437922e635b0d8299de091cc
--- net/haproxy/pkg/PLIST
+++ net/haproxy/pkg/PLIST
@@ -11,7 +11,6 @@ share/doc/haproxy/DeviceAtlas-device-detection.txt
 share/doc/haproxy/SOCKS4.protocol.txt
 share/doc/haproxy/SPOE.txt
 share/doc/haproxy/WURFL-device-detection.txt
-share/doc/haproxy/architecture.txt
 share/doc/haproxy/configuration.txt
 share/doc/haproxy/cookie-options.txt
 share/doc/haproxy/intro.txt
@@ -28,10 +27,13 @@ share/doc/haproxy/seamless_reload.txt
 share/examples/haproxy/
 share/examples/haproxy/basic-config-edge.cfg
 share/examples/haproxy/content-sw-sample.cfg
+share/examples/haproxy/games.cfg
 share/examples/haproxy/haproxy.cfg
 @sample ${SYSCONFDIR}/haproxy/haproxy.cfg
+share/examples/haproxy/mptcp.cfg
 share/examples/haproxy/option-http_proxy.cfg
 share/examples/haproxy/quick-test.cfg
 share/examples/haproxy/socks4.cfg
+share/examples/haproxy/traces.cfg
 share/examples/haproxy/transparent_proxy.cfg
 share/examples/haproxy/wurfl-example.cfg
diff refs/heads/master f25db98dde9cd34acd7b963eae37445ef4017779
commit - b75638b7060216da009348900c6d908b08d340ca
commit + f25db98dde9cd34acd7b963eae37445ef4017779
blob - fb2b41cabe16d4cf538ba2a690b22a587fff5b12
blob + 5b65c2c76c11999dbe5df1d9e7982c03f57fe083
--- net/haproxy/Makefile
+++ net/haproxy/Makefile
@@ -1,6 +1,6 @@
 COMMENT =	reliable, high performance TCP/HTTP load balancer
 
-DISTNAME =	haproxy-3.0.10
+DISTNAME =	haproxy-3.2.0
 CATEGORIES =	net www
 HOMEPAGE =	https://www.haproxy.org/
 MAINTAINER =	Lucas Gabriel Vuotto <lucas@sexy.is>
@@ -12,7 +12,7 @@ WANTLIB +=	c crypto pcre2-8 pcre2-posix pthread ssl z
 
 DEBUG_PACKAGES = ${BUILD_PACKAGES}
 
-SITES =		${HOMEPAGE}/download/3.0/src/
+SITES =		${HOMEPAGE}/download/3.2/src/
 
 USE_GMAKE =	Yes
 MAKE_FLAGS +=	CPU_CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
blob - ce2243048979729dc79b6d92faf3325e0e98148e
blob + b12ded0a6f3f1f3b884505a5d394521fff7258fc
--- net/haproxy/distinfo
+++ net/haproxy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (haproxy-3.0.10.tar.gz) = 0VCGcLb9WDnGaaCpFoQvDT09C1eLs1Gip0od49kpziY=
-SIZE (haproxy-3.0.10.tar.gz) = 4734325
+SHA256 (haproxy-3.2.0.tar.gz) = 92KuMbyhtR/rieQ5Xjbhf4Z8JTcqEIU8cNKSw90Xt7A=
+SIZE (haproxy-3.2.0.tar.gz) = 5090982
blob - 99030a2bb355b7a75851937ff393f07179241d9b
blob + 2fff5df9774ce36002bbeb45d682a8cf2f941aa2
--- net/haproxy/files/haproxy.cfg
+++ net/haproxy/files/haproxy.cfg
@@ -1,23 +1,30 @@
 global
-	log 127.0.0.1	local0 debug
-	maxconn 1024
+	log 127.0.0.1 local0 debug
+	maxconn	1024
 	chroot /var/haproxy
 	user _haproxy
 	group _haproxy
 	daemon
-	pidfile	/var/run/haproxy.pid
+	pidfile /var/run/haproxy.pid
 
 defaults
-	log	global
-	mode	http
-	option	httplog
-	option	dontlognull
-	option	redispatch
-	retries	3
-	maxconn	2000
+	log global
+	mode http
+	option httplog
+	option dontlognull
+	option redispatch
+	retries 3
+	maxconn 2000
 
+#crt-store main
+#	crt-base /etc/ssl/
+#	key-base /etc/ssl/private/
+#	load crt "example.com.fullchain.pem" key "example.com.key" alias "example.com"
+
 frontend haproxy
-	bind *:80
+	bind ipv4@:80,ipv6@:80
+	#bind ipv4@:443,ipv6@:443 ssl
+	#ssl-f-use crt "@main/example.com"
 	default_backend httpd
 
 backend httpd
blob - 80afa917bba6891b62364c489a3583bd15a841e4
blob + d0e370c7b70dc829437922e635b0d8299de091cc
--- net/haproxy/pkg/PLIST
+++ net/haproxy/pkg/PLIST
@@ -11,7 +11,6 @@ share/doc/haproxy/DeviceAtlas-device-detection.txt
 share/doc/haproxy/SOCKS4.protocol.txt
 share/doc/haproxy/SPOE.txt
 share/doc/haproxy/WURFL-device-detection.txt
-share/doc/haproxy/architecture.txt
 share/doc/haproxy/configuration.txt
 share/doc/haproxy/cookie-options.txt
 share/doc/haproxy/intro.txt
@@ -28,10 +27,13 @@ share/doc/haproxy/seamless_reload.txt
 share/examples/haproxy/
 share/examples/haproxy/basic-config-edge.cfg
 share/examples/haproxy/content-sw-sample.cfg
+share/examples/haproxy/games.cfg
 share/examples/haproxy/haproxy.cfg
 @sample ${SYSCONFDIR}/haproxy/haproxy.cfg
+share/examples/haproxy/mptcp.cfg
 share/examples/haproxy/option-http_proxy.cfg
 share/examples/haproxy/quick-test.cfg
 share/examples/haproxy/socks4.cfg
+share/examples/haproxy/traces.cfg
 share/examples/haproxy/transparent_proxy.cfg
 share/examples/haproxy/wurfl-example.cfg