From 9ec2b9e494356223596881970c90fe367f91ced3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=2E=20Stani=C4=87?= <mps@arvanta.net>
Date: Sun, 16 May 2021 07:14:03 +0000
Subject: [PATCH] main/haproxy: upgrade to 2.4.0

---
 main/haproxy/APKBUILD | 42 ++++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/main/haproxy/APKBUILD b/main/haproxy/APKBUILD
index cffa764fde21..44c0891d685d 100644
--- a/main/haproxy/APKBUILD
+++ b/main/haproxy/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=haproxy
 # NOTE: Upgrade only to LTS versions announced on upstream site url!
 # Using LTS versions is easier to keep it in good shape for stable releases
-pkgver=2.2.14
+pkgver=2.4.0
 _pkgmajorver=${pkgver%.*}
 pkgrel=0
 pkgdesc="A TCP/HTTP reverse proxy for high availability environments"
@@ -27,17 +27,17 @@ source="https://www.haproxy.org/download/$_pkgmajorver/src/haproxy-$pkgver.tar.g
 build() {
 	case "$CARCH" in mips|mipsel*) _carchflags="ADDLIB=-latomic";; esac
 	make \
-	     $_carchflags \
-	     TARGET=linux-musl \
-	     USE_PCRE=1 \
-	     USE_OPENSSL=1 \
-	     USE_ZLIB=1 \
-	     USE_LUA=1 \
-	     USE_NS=1 \
-	     LUA_LIB=/usr/lib/lua$_luaver \
-	     LUA_INC=/usr/include/lua$_luaver \
-	     EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" \
-	     CFLAGS="$CFLAGS"
+		$_carchflags \
+		TARGET=linux-musl \
+		USE_PCRE=1 \
+		USE_OPENSSL=1 \
+		USE_ZLIB=1 \
+		USE_LUA=1 \
+		USE_NS=1 \
+		USE_PROMEX=1 \
+		LUA_LIB=/usr/lib/lua$_luaver \
+		LUA_INC=/usr/include/lua$_luaver \
+		CFLAGS="$CFLAGS"
 }
 
 check() {
@@ -46,17 +46,19 @@ check() {
 
 package() {
 	make install \
-	     DESTDIR="$pkgdir" PREFIX=/usr DOCDIR=/usr/share/doc/haproxy
+		DESTDIR="$pkgdir" PREFIX=/usr DOCDIR=/usr/share/doc/haproxy
 	install -d \
-	        "$pkgdir"/var/lib/haproxy
+		"$pkgdir"/var/lib/haproxy
 	install -D -m 755 \
-	        "$srcdir"/$pkgname.initd \
-	        "$pkgdir"/etc/init.d/$pkgname
+		"$srcdir"/$pkgname.initd \
+		"$pkgdir"/etc/init.d/$pkgname
 	install -D -m 644 \
-	        "$srcdir"/haproxy.cfg \
-	        "$pkgdir"/etc/haproxy/haproxy.cfg
+		"$srcdir"/haproxy.cfg \
+		"$pkgdir"/etc/haproxy/haproxy.cfg
 }
 
-sha512sums="ec5e2bf0c38a9af878f69f062e81e096b849c3ae93957bbcddc32f7c0e972d678136c8f06a16e594b60b7e2f41228e8179e93b4b0a3478ab775bece6745db877  haproxy-2.2.14.tar.gz
+sha512sums="
+846faffb7ac2ccbfe314f7c72d4ab3f1955338f3be45906e76a53934c32934e6a3ed9b7a04411717e9a91966e55266183e9cf583df5375f67d03d26c6c6fc273  haproxy-2.4.0.tar.gz
 4aa8fc812079baf1d17cf9484a9b44568c3dd94f35243a57a4a7868e7f88146a4e94c80ea8ab86f1b08a524567e269a3ec119b67fc679f6bd0d9f1c70ce4f080  haproxy.initd
-26bc8f8ac504fcbaec113ecbb9bb59b9da47dc8834779ebbb2870a8cadf2ee7561b3a811f01e619358a98c6c7768e8fdd90ab447098c05b82e788c8212c4c41f  haproxy.cfg"
+26bc8f8ac504fcbaec113ecbb9bb59b9da47dc8834779ebbb2870a8cadf2ee7561b3a811f01e619358a98c6c7768e8fdd90ab447098c05b82e788c8212c4c41f  haproxy.cfg
+"
-- 
GitLab