commit:     869f8215e5cd7c66d8d63d9c25b2791fc0e8a8a5
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 18 15:30:38 2025 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Thu Dec 18 15:30:38 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=869f8215

net-proxy/haproxy: Bump to 3.2.10

Signed-off-by: Christian Ruppert <idl0r <AT> gentoo.org>

 net-proxy/haproxy/Manifest              |   1 +
 net-proxy/haproxy/haproxy-3.2.10.ebuild | 220 ++++++++++++++++++++++++++++++++
 2 files changed, 221 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index dc4fe31357df..8ed39f75ba72 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -4,6 +4,7 @@ DIST haproxy-2.8.16.tar.gz 4429238 BLAKE2B 
eb1599260a71114a412e95220bc98c85d495c
 DIST haproxy-3.0.12.tar.gz 4745984 BLAKE2B 
6d7ac9fe32440efbd56eb33b784884995f1a4e70814f97ebfdab4c5bb2116146f68aca40f6e925d309f31f6b05b5decf787a3526158e2e5677d4d29e8c2e5057
 SHA512 
ed9b0d0635f14c4825ae0bc342f2a3217a2fb71e8624577cc69af3c06536a716f0701247db505d49bcf5dc58f483b55e617341bbea181b78b1f1034ae7c0c0f9
 DIST haproxy-3.0.13.tar.gz 4755144 BLAKE2B 
616efe76d824c2a1270c1869765306068ced9c711efe130e3bbfec2f147602578079482a3ff0bf56f8e887a4b5cad7456973fb76d568b5623f5b752467d549ee
 SHA512 
c232da0603f7678221356d7bfa270dbea99daef30fab9e71e5112eaa84514e62b119f340191925a8e6a8211779dc5b5d590f3b5a9e90612c3abd44653feabc72
 DIST haproxy-3.0.5.tar.gz 4698022 BLAKE2B 
c64d8799755fddaf5b45a9e2b67c5f03b25af98fbddde68ab1206c288d9a65f91938810b150c4398ee138d9154c90f1af9fb05c3d0bbc80394e71430e1cc4396
 SHA512 
8c16b026d5e26fc030178ecd354c68e8ea32c2b971f143cb2aa2f1b2d16fbfc0a27e3975f78873a0cefe3f904b5f1999f8d75622a04234b9cf88f90161d9ea91
+DIST haproxy-3.2.10.tar.gz 5125928 BLAKE2B 
252c2e11cc30a68a2cf52d16e470fa701b600d69c9b48f9d86b93135c1a977798026764ad1dbb54ec32458e4760159369d47c7cc76327668cf28d21bf4de51a6
 SHA512 
52ef599dd1aa845a724dc52ad23e21cb992a18a410a42aa551f2b1d2304f0833940cf2dab5ca05723d5799f3e6004931b4c618e9c9ad99c8fd7206ce0d3ddd65
 DIST haproxy-3.2.8.tar.gz 5119011 BLAKE2B 
923379be6c1ef32793deb4587a2c626655b836ec2865cd00f2be184475c6cf0c703ed93991563c1d14962633149fd74f7510f655a3a830f4a0343053f82a1ff4
 SHA512 
1640c31c942410f0e7c705bc1cd9f077023f73ea611e3222856089521c7e7dcf8533eef31680883798c0b18137894594dcf9e3f4e958abe2842342755ed68fe4
 DIST haproxy-3.2.9.tar.gz 5123457 BLAKE2B 
37b50abe8f8260453c4b40f6f52186cee276a3a4577d7b6da6a14ea94f43cea6e5a3ab3cb8ec9d6642a5d4d9dc90e94c4757a2306e2a363e0b710db735bc0972
 SHA512 
fd694adcdccbba54121e686f32cfb2281abfc97c6716835aa35013f05b85033c4967a056f02ecbc6ed613dda44d55373d2577e452079ba4e2bfa7b2fe0fff172
 DIST haproxy-3.3.0.tar.gz 5239878 BLAKE2B 
88941d51a98388cc76ff32cb63d156a256dfe607066b220fba824868b5847f4f960622672e9a85e88627b9dd89687c5807a63cfc7992f011e5db8c6a35211b93
 SHA512 
615a49a3295e8bce25b8e58f90e155a2d2f4432f0fac78a9cbee723a20d41ed20e223b6998d37ad84c11c42b4b4e4160ba21fc72fb7d26704a4ebdd4ba1f56cd

diff --git a/net-proxy/haproxy/haproxy-3.2.10.ebuild 
b/net-proxy/haproxy/haproxy-3.2.10.ebuild
new file mode 100644
index 000000000000..81130f8116d6
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-3.2.10.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+LUA_COMPAT=( lua5-4 lua5-3 )
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit toolchain-funcs lua-single systemd linux-info ${SCM} multiprocessing
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://www.haproxy.org";
+if [[ ${PV} != *9999 ]]; then
+       # This is arbitrary; upstream uses master.  Try to update when possible
+       VTEST_COMMIT="af198470d7ce482d3d26eb9ca3f246a438739366"
+       VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}"
+       SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz
+                       test? ( 
https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> 
VTest-${VTEST_COMMIT}.tar.gz )"
+       KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+elif [[ ${PV} == 9999 ]]; then
+       VTEST_DIR="${WORKDIR}/VTest"
+       EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/";
+       EGIT_BRANCH=master
+else
+       VTEST_DIR="${WORKDIR}/VTest"
+       EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
+       EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter quic
+ssl systemd test +threads tools zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+       lua? ( ${LUA_REQUIRED_USE} )
+       ?? ( slz zlib )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+       crypt? ( virtual/libcrypt:= )
+       pcre? (
+               dev-libs/libpcre2:=
+               pcre-jit? ( dev-libs/libpcre2:=[jit] )
+       )
+       ssl? (
+               dev-libs/openssl:0=
+       )
+       quic? (
+               >=dev-libs/openssl-3.5.0:0=
+       )
+       systemd? ( sys-apps/systemd )
+       zlib? ( virtual/zlib:= )
+       lua? ( ${LUA_DEPS} )
+       test? (
+               dev-libs/libpcre2
+               virtual/zlib:=
+       )"
+RDEPEND="${DEPEND}
+       acct-group/haproxy
+       acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS )
+EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
+
+haproxy_use() {
+       (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+       usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+       use lua && lua-single_pkg_setup
+       if use net_ns; then
+               CONFIG_CHECK="~NET_NS"
+               linux-info_pkg_setup
+       fi
+}
+
+src_unpack() {
+       if [[ ${PV} != *9999 ]]; then
+               default
+       else
+               git-r3_src_unpack
+               EGIT_REPO_URI="https://github.com/vtest/VTest"; 
EGIT_CHECKOUT_DIR="${VTEST_DIR}" git-r3_src_unpack
+       fi
+}
+
+src_compile() {
+       local -a args=(
+               V=1
+               # Switching to PCRE2 by default, bug 838013
+               PCRE=
+               PCRE_JIT=
+       )
+
+       if use elibc_musl; then
+               args+=( TARGET=linux-musl )
+       else
+               args+=( TARGET=linux-glibc )
+       fi
+
+       # TODO: PCRE2_WIDTH?
+       args+=( $(haproxy_use threads THREAD) )
+       args+=( $(haproxy_use crypt LIBCRYPT) )
+       args+=( $(haproxy_use net_ns NS) )
+       args+=( $(haproxy_use pcre PCRE2) )
+       args+=( $(haproxy_use pcre-jit PCRE2_JIT) )
+       args+=( $(haproxy_use ssl OPENSSL) )
+       args+=( $(haproxy_use slz SLZ) )
+       args+=( $(haproxy_use zlib ZLIB) )
+       args+=( $(haproxy_use lua LUA) )
+       args+=( $(haproxy_use 51degrees 51DEGREES) )
+       args+=( $(haproxy_use wurfl WURFL) )
+       args+=( $(haproxy_use prometheus-exporter PROMEX) )
+       args+=( $(haproxy_use quic QUIC) )
+
+       # Bug #668002
+       if use ppc || use arm || use hppa; then
+               TARGET_LDFLAGS=-latomic
+       fi
+
+       emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" 
EXTRA_OBJS="${EXTRA_OBJS}" \
+               TARGET_LDFLAGS="${TARGET_LDFLAGS}" 
PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
+       emake -C admin/systemd CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" 
CC="$(tc-getCC)" \
+               EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" 
PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) \
+               SBINDIR=/usr/sbin
+
+       if use tools ; then
+               for extra in ${EXTRAS[@]} ; do
+                       if [ "${extra}" = "admin/halog" ]; then
+                               emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" 
CC="$(tc-getCC)" \
+                                       EXTRA_OBJS="${EXTRA_OBJS}" 
TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
+                                       
PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
+                       elif [ "${extra}" = "dev/hpack" ]; then
+                               emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" 
CC="$(tc-getCC)" \
+                                       EXTRA_OBJS="${EXTRA_OBJS}" 
TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
+                                       
PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} 
dev/hpack/{decode,gen-enc,gen-rht}
+                       else
+                               # Those two includes are a workaround for hpack 
Makefile missing those
+                               emake -C ${extra} \
+                                       CFLAGS="${CFLAGS} -I../../include/ 
-I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+                                               CC="$(tc-getCC)" ${args[@]}
+                       fi
+               done
+       fi
+}
+
+src_test() {
+       # https://github.com/vtest/VTest/issues/12
+       emake -C "${VTEST_DIR}" CC="$(tc-getCC)" FLAGS="${CFLAGS} 
-Wno-error=unused-result"
+       ulimit -n 65536 || die "${PN} requires ulimit -n set to at least 65536 
for tests"
+       env -u A -u D TMPDIR="/tmp" emake reg-tests -- --v --j 
"$(makeopts_jobs)" \
+               HAPROXY_PROGRAM="${S}/haproxy" 
VTEST_PROGRAM="${VTEST_DIR}/vtest" REGTESTS_TYPE="default,bug,devel"
+}
+
+src_install() {
+       dosbin haproxy
+
+       newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+       newinitd "${FILESDIR}/${PN}.initd-r9" ${PN}
+
+       doman doc/haproxy.1
+
+       systemd_dounit admin/systemd/haproxy.service
+
+       einstalldocs
+
+       # The errorfiles are used by upstream defaults.
+       insinto /etc/haproxy/errors/
+       doins examples/errorfiles/*
+
+       if use doc; then
+               dodoc doc/*.txt
+               #if use lua; then
+               # TODO: doc/lua-api/
+               #fi
+       fi
+
+       if use tools ; then
+               has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
+               has admin/iprange "${EXTRAS[@]}" && {
+                       newbin admin/iprange/iprange haproxy_iprange
+                       newbin admin/iprange/ip6range haproxy_ip6range
+               }
+               has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop 
haproxy_tcploop
+               has dev/hpack "${EXTRAS[@]}" && {
+                       newbin dev/hpack/gen-rht haproxy_gen-rht
+                       newbin dev/hpack/gen-enc haproxy_gen-enc
+                       newbin dev/hpack/decode haproxy_decode
+               }
+       fi
+
+       if use examples ; then
+               docinto examples
+               dodoc examples/*.cfg
+               dodoc doc/seamless_reload.txt
+       fi
+
+       insinto /usr/share/vim/vimfiles/syntax
+       doins admin/syntax-highlight/haproxy.vim
+}
+
+pkg_postinst() {
+       if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+               ewarn "You need to create /etc/haproxy/haproxy.cfg before you 
start the haproxy service."
+               ewarn "It's best practice to not run haproxy as root, user and 
group haproxy was therefore created."
+               ewarn "Make use of them with the \"user\" and \"group\" 
directives."
+
+               if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+                       einfo "Please consult the installed documentation for 
learning the configuration file's syntax."
+                       einfo "The documentation and sample configuration files 
are installed here:"
+                       einfo "   ${EROOT}/usr/share/doc/${PF}"
+               fi
+       fi
+}

Reply via email to