* [PR PATCH] haproxy: update to 2.2.4.
@ 2020-10-28 18:41 zdykstra
2020-10-30 0:40 ` ericonr
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: zdykstra @ 2020-10-28 18:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 430 bytes --]
There is a new pull request by zdykstra against master on the void-packages repository
https://github.com/zdykstra/void-packages haproxy-2.2
https://github.com/void-linux/void-packages/pull/25947
haproxy: update to 2.2.4.
Assume maintainership, enable the `prometheus-exporter` service and bump to the latest LTS (2.1 is EOL in Q1 2021)
A patch file from https://github.com/void-linux/void-packages/pull/25947.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-haproxy-2.2-25947.patch --]
[-- Type: text/x-diff, Size: 1716 bytes --]
From 88bea0742872c8fcc0657e99f26424e386575d50 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Wed, 28 Oct 2020 13:38:53 -0500
Subject: [PATCH] haproxy: update to 2.2.4.
---
srcpkgs/haproxy/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index a51a4126e14..4c130165b11 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,17 +1,17 @@
# Template file for 'haproxy'
pkgname=haproxy
-version=2.1.7
-revision=3
+version=2.2.4
+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"
checkdepends="varnish"
short_desc="Reliable, high performance TCP/HTTP load balancer"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
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=87a4d9d4ff8dc3094cb61bbed4a8eed2c40b5ac47b9604daebaf036d7b541be2
haproxy_homedir="/var/lib/${pkgname}"
make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
@@ -27,7 +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 \
- ADDLIB="$atomic"
+ ADDLIB="$atomic" EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
}
do_check() {
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: haproxy: update to 2.2.4.
2020-10-28 18:41 [PR PATCH] haproxy: update to 2.2.4 zdykstra
@ 2020-10-30 0:40 ` ericonr
2020-10-30 0:55 ` zdykstra
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: ericonr @ 2020-10-30 0:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1231 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/25947#issuecomment-719102393
Comment:
Cross build to armv7l-musl:
```
In file included from include/haproxy/stream-t.h:33,
from include/haproxy/http_ana.h:29,
from include/haproxy/connection.h:30,
from include/haproxy/ssl_sock.h:27,
from src/ssl_utils.c:18:
include/haproxy/hlua-t.h: At top level:
include/haproxy/hlua-t.h:27:10: fatal error: lua.h: No such file or directory
27 | #include <lua.h>
| ^~~~~~~
compilation terminated.
make: *** [Makefile:870: src/ssl_utils.o] Error 1
```
It also has a lot of warnings about alignment.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: haproxy: update to 2.2.4.
2020-10-28 18:41 [PR PATCH] haproxy: update to 2.2.4 zdykstra
2020-10-30 0:40 ` ericonr
@ 2020-10-30 0:55 ` zdykstra
2020-10-30 17:13 ` [PR PATCH] [Updated] " zdykstra
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: zdykstra @ 2020-10-30 0:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 215 bytes --]
New comment by zdykstra on void-packages repository
https://github.com/void-linux/void-packages/pull/25947#issuecomment-719106132
Comment:
I guess I should get a cross compile environment setup so I can fix this.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] haproxy: update to 2.2.4.
2020-10-28 18:41 [PR PATCH] haproxy: update to 2.2.4 zdykstra
2020-10-30 0:40 ` ericonr
2020-10-30 0:55 ` zdykstra
@ 2020-10-30 17:13 ` zdykstra
2020-10-30 17:23 ` zdykstra
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: zdykstra @ 2020-10-30 17:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 435 bytes --]
There is an updated pull request by zdykstra against master on the void-packages repository
https://github.com/zdykstra/void-packages haproxy-2.2
https://github.com/void-linux/void-packages/pull/25947
haproxy: update to 2.2.4.
Assume maintainership, enable the `prometheus-exporter` service and bump to the latest LTS (2.1 is EOL in Q1 2021)
A patch file from https://github.com/void-linux/void-packages/pull/25947.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-haproxy-2.2-25947.patch --]
[-- Type: text/x-diff, Size: 1936 bytes --]
From e0ea808c6b09fc61e4311eaf55ad773825593e2d Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Wed, 28 Oct 2020 13:38:53 -0500
Subject: [PATCH] haproxy: update to 2.2.4.
---
srcpkgs/haproxy/template | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index a51a4126e14..4911185c21b 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,23 +1,25 @@
# Template file for 'haproxy'
pkgname=haproxy
-version=2.1.7
-revision=3
+version=2.2.4
+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 libressl-devel lua53-devel pcre-devel"
checkdepends="varnish"
short_desc="Reliable, high performance TCP/HTTP load balancer"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
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=87a4d9d4ff8dc3094cb61bbed4a8eed2c40b5ac47b9604daebaf036d7b541be2
haproxy_homedir="/var/lib/${pkgname}"
make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
conf_files="/etc/${pkgname}/${pkgname}.cfg"
system_accounts="$pkgname"
+CFLAGS="-Wno-address-of-packed-member"
do_build() {
local target="linux-${XBPS_TARGET_LIBC}"
local atomic
@@ -27,7 +29,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 \
- ADDLIB="$atomic"
+ ADDLIB="$atomic" EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
}
do_check() {
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: haproxy: update to 2.2.4.
2020-10-28 18:41 [PR PATCH] haproxy: update to 2.2.4 zdykstra
` (2 preceding siblings ...)
2020-10-30 17:13 ` [PR PATCH] [Updated] " zdykstra
@ 2020-10-30 17:23 ` zdykstra
2020-10-31 0:12 ` jnbr
2020-10-31 0:12 ` [PR PATCH] [Merged]: " jnbr
5 siblings, 0 replies; 7+ messages in thread
From: zdykstra @ 2020-10-30 17:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 209 bytes --]
New comment by zdykstra on void-packages repository
https://github.com/void-linux/void-packages/pull/25947#issuecomment-719687950
Comment:
Native and cross builds finishing here without any warnings/errors.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: haproxy: update to 2.2.4.
2020-10-28 18:41 [PR PATCH] haproxy: update to 2.2.4 zdykstra
` (3 preceding siblings ...)
2020-10-30 17:23 ` zdykstra
@ 2020-10-31 0:12 ` jnbr
2020-10-31 0:12 ` [PR PATCH] [Merged]: " jnbr
5 siblings, 0 replies; 7+ messages in thread
From: jnbr @ 2020-10-31 0:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 170 bytes --]
New comment by jnbr on void-packages repository
https://github.com/void-linux/void-packages/pull/25947#issuecomment-719852779
Comment:
no need to wait for slow CI then
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Merged]: haproxy: update to 2.2.4.
2020-10-28 18:41 [PR PATCH] haproxy: update to 2.2.4 zdykstra
` (4 preceding siblings ...)
2020-10-31 0:12 ` jnbr
@ 2020-10-31 0:12 ` jnbr
5 siblings, 0 replies; 7+ messages in thread
From: jnbr @ 2020-10-31 0:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 273 bytes --]
There's a merged pull request on the void-packages repository
haproxy: update to 2.2.4.
https://github.com/void-linux/void-packages/pull/25947
Description:
Assume maintainership, enable the `prometheus-exporter` service and bump to the latest LTS (2.1 is EOL in Q1 2021)
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-10-31 0:12 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-28 18:41 [PR PATCH] haproxy: update to 2.2.4 zdykstra
2020-10-30 0:40 ` ericonr
2020-10-30 0:55 ` zdykstra
2020-10-30 17:13 ` [PR PATCH] [Updated] " zdykstra
2020-10-30 17:23 ` zdykstra
2020-10-31 0:12 ` jnbr
2020-10-31 0:12 ` [PR PATCH] [Merged]: " jnbr
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).