[PR PATCH] Update haproxy to 2.2.2 and enable Prometheus support

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

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

There is a new pull request by andkem against master on the void-packages repository

https://github.com/andkem/void-packages update-haproxy-2.2.2
https://github.com/void-linux/void-packages/pull/24670

Update haproxy to 2.2.2 and enable Prometheus support
Update haproxy to 2.2.2 and enable Prometheus support to allow for configuring export of statistics.

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

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

From 0d2215ba1338754833e3486bf8b2c351fbd596a1 Mon Sep 17 00:00:00 2001
From: Andreas Kempe <kempe@lysator.liu.se>
Date: Fri, 4 Sep 2020 21:53:13 +0200
Subject: [PATCH 1/2] haproxy: update to 2.2.2

---
 srcpkgs/haproxy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index a51a4126e14..2996d222d05 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,7 +1,7 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.1.7
-revision=3
+version=2.2.2
+revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 makedepends="libatomic-devel libressl-devel lua53-devel pcre-devel"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=392e6cf18e75fe7e166102e8c4512942890a0b5ae738f6064faab4687f60a339
+checksum=391c705a46c6208a63a67ea842c6600146ca24618531570c89c7915b0c6a54d6
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"

From 429e0a5ec1bb481641c56c662d61cea7ec6530cc Mon Sep 17 00:00:00 2001
From: Andreas Kempe <kempe@lysator.liu.se>
Date: Fri, 4 Sep 2020 21:54:11 +0200
Subject: [PATCH 2/2] haproxy: enable Prometheus export

Enable the Prometheus exporter build option. Allows enabling statics
export to be enabled.

Example config:

    frontend test
	mode http
	...
	option http-use-htx
	http-request use-service prometheus-exporter if { path /metrics }
	...
---
 srcpkgs/haproxy/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 2996d222d05..5943f3e68fe 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -27,6 +27,7 @@ do_build() {
 	make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
 		TARGET=$target USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 \
 		USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1 \
+		EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" \
 		ADDLIB="$atomic"
 }