commit:     73bddd6bcab5dd2b92e0d7dc1d9845e34967ceb2
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 19 16:05:01 2024 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Thu Sep 19 16:05:56 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73bddd6b

net-proxy/haproxy: Bump to 2.6.19 and 2.8.11

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

 net-proxy/haproxy/Manifest              |   2 +
 net-proxy/haproxy/haproxy-2.6.19.ebuild | 218 ++++++++++++++++++++++++++++++++
 net-proxy/haproxy/haproxy-2.8.11.ebuild | 218 ++++++++++++++++++++++++++++++++
 3 files changed, 438 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 39d30fa0191b..4ba01ae153cf 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -3,9 +3,11 @@ DIST haproxy-2.4.25.tar.gz 3664305 BLAKE2B 
b02eca0ef2719fad33c8db65b6568706cff3a
 DIST haproxy-2.4.27.tar.gz 3671596 BLAKE2B 
987df4b07686e68805ff31a6832498ad8a7487a63b37e8d5ba9cd20be245a91c42e50d754d7d580d0899fed630a6bf99bd594cfec7b3a9d00ccac744a09da19b
 SHA512 
97227805acd6131df8b4d398099bd9b89d1cd2aaddce4a3f334bf5b8b4dd01a30a0c3b56a7c23268456cf0e3a39244ddfd3ea0c27ee44f2c3bdf49c045b5fd8c
 DIST haproxy-2.6.16.tar.gz 4084854 BLAKE2B 
15a33d6d88de9181d4b1b05d59d32f1c76496e3c8d4a8be8d762ff5945a3e56d416f463473dfb9e3c266032458dab737264fea0d18f467e66cca016da33c9fdc
 SHA512 
81d55c46debe61f691cd0d8ccefd6eb8b5387ce1f4591ed7011ddbcc13b521f708499c9921983c9089e7f9ffcf1ed545d5b6124a92409b78def1f7eb1044e147
 DIST haproxy-2.6.18.tar.gz 4103766 BLAKE2B 
e55f401ede25e54b199b33b7fc3dd788a45e9abbeef10fde5be6939124ab14e119ace3a2dd9d191b7c32270989c98787bdc30d2defa80c012215e2761538ce4c
 SHA512 
44bc0504b62c9553fe084c607e8e4d73df100b371a3493663f82fe661d07852046e1be5dc7d195a3d85f1170d9096c6a0770251ed10c1bc88f8f982ce740042f
+DIST haproxy-2.6.19.tar.gz 4110701 BLAKE2B 
fe003ac433a7756e57751db8f5430fb5f16e20d328bd28c0c5595304570a1450cecc19ca600fae515b21af00bfd6699ba08bd8ccfe43a09b6719e0f90b985a02
 SHA512 
cdcf6c2108d844c08b586e0e4ee4bd64dde3ef0da7487d65ea68f6fb52d9a1c2c34f4438ffacebea1d0f2400aac9f9f1b9000714a08cbac192a9f302dcc6c345
 DIST haproxy-2.7.11.tar.gz 4213212 BLAKE2B 
ca5713d694b8d709188457dd821218d3474d05dd63ed6d3906d98bf4b24b2ea9847b032d6264c7e80a59043a9e085595fdcbdc0dec44137f0b7d71f1189688e0
 SHA512 
1e5298397e8759cb260997bf23336b9aa62b56ca7dd832cb4155526d9e7c5c664122e33717ce5be34bbf1539a85a8fbdb6e535aa056d2c232673a4034446288a
 DIST haproxy-2.7.9.tar.gz 4186553 BLAKE2B 
a2c7e92d008886ac5b5cf9f67be808bed68faea41b4bc25a3e5e187a4a2116bc37c40a5df9e2f640dba6c79caea39615eff434e904470e67d7703125a5ffc7e2
 SHA512 
774d0ae7a402fae0805706f4b88891162e18179f6ad9c2d0916ae30be2502409afdd11dfbbbce9b49564c7e14e8625e4a26751bbfc3b19e3e13ac12c8cc19495
 DIST haproxy-2.8.10.tar.gz 4392333 BLAKE2B 
4afc387970adbd6f882aa9b1d95cf6cc914d98ce69648282798fe2d97be82adc60c6ad4d0f3a78f56e2eca26d91a47044de2ca7277ca2567ecfdd2233ad64f32
 SHA512 
0a36f1e17702f4ab6eccf1c10643f4685e8c8b272cc71cbf5feb61c8c95ea52b5fc47eeefc97390bb8cb4ac1d52db0c9ad3c0510f8ca017bf10204690554c6d2
+DIST haproxy-2.8.11.tar.gz 4400628 BLAKE2B 
0daccc4dbae5cecae3ad0bc1d164ea78a9584a0f4cb71e15664aff4b76fc05a828030dee355722c99a77270427bd3e9e43939ae59a3f3b1cabcc0179faff34b9
 SHA512 
59517187a5c0e0dbcb8629d2a922f7a865e1ebdbb9fe0f4fbe273913e0f15a1a26767808bd1607f10e79d3abcdd8c35c1ae648df149a1d5c0df32604df553655
 DIST haproxy-2.8.7.tar.gz 4376705 BLAKE2B 
ae145fe6b642f860af814c2c43e84452a0bbc1b545b1b11eb07c65d903b97e42576b94e1774838b32b29ce32778941b79222669fc7615779c49f2ced85bf3fdc
 SHA512 
dd2fe2ccd5d8805da3f7544451507b182377c34a9951747643c04cb9ee178b7be0978d56a0586c59771c2bb955765d3e961f6f06187afb768dc1fd27f08da464
 DIST haproxy-2.9.10.tar.gz 4532342 BLAKE2B 
a015b04cb008b6b0d0397e57caa0ae2fda7c91cf0c21f581cc58088fc853d962a5fc1750cd07012e03e3a063e9710803c5100e326aa89bc013b87d638764b11b
 SHA512 
3aea657c37251cdeed295e90cbe0b54a87821c87ef17f80cd057a16102212fb1b992c6fe8b7c4f1a5d6f1890170f470a703b74bd17e2546cfd9847323d2c687f
 DIST haproxy-2.9.11.tar.gz 4540689 BLAKE2B 
53f81c845e2bb8b3c9935a6035cb28d49708337e16081c2197cab60e4c1f01642cc64f1b2162bdabef07ab79cf72af9fac136bfa19fe89518b7de110433a1789
 SHA512 
316ab1dfbc60da4fe39acd4f9dc62d352690b35f0787f4fc0ae51853c7d35c656417e97945650bd79900d815414ad9504e4ff368e852657690f20ddc69bd3693

diff --git a/net-proxy/haproxy/haproxy-2.6.19.ebuild 
b/net-proxy/haproxy/haproxy-2.6.19.ebuild
new file mode 100644
index 000000000000..ce11ece1a066
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.6.19.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2024 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
+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=
+       )
+       systemd? ( sys-apps/systemd )
+       zlib? ( sys-libs/zlib )
+       lua? ( ${LUA_DEPS} )
+       test? (
+               dev-libs/libpcre2
+               sys-libs/zlib
+       )"
+RDEPEND="${DEPEND}
+       acct-group/haproxy
+       acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+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 systemd SYSTEMD) )
+       args+=( $(haproxy_use prometheus-exporter PROMEX) )
+
+       # Bug #668002
+       if use ppc || use arm || use hppa; then
+               TARGET_LDFLAGS=-latomic
+       fi
+
+       # HAProxy really needs some of those "SPEC_CFLAGS", like 
-fno-strict-aliasing
+       emake CFLAGS="${CFLAGS} \$(SPEC_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} \$(SPEC_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} \$(SPEC_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} \$(SPEC_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-r8" ${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
+}

diff --git a/net-proxy/haproxy/haproxy-2.8.11.ebuild 
b/net-proxy/haproxy/haproxy-2.8.11.ebuild
new file mode 100644
index 000000000000..ce11ece1a066
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.8.11.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2024 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
+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=
+       )
+       systemd? ( sys-apps/systemd )
+       zlib? ( sys-libs/zlib )
+       lua? ( ${LUA_DEPS} )
+       test? (
+               dev-libs/libpcre2
+               sys-libs/zlib
+       )"
+RDEPEND="${DEPEND}
+       acct-group/haproxy
+       acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+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 systemd SYSTEMD) )
+       args+=( $(haproxy_use prometheus-exporter PROMEX) )
+
+       # Bug #668002
+       if use ppc || use arm || use hppa; then
+               TARGET_LDFLAGS=-latomic
+       fi
+
+       # HAProxy really needs some of those "SPEC_CFLAGS", like 
-fno-strict-aliasing
+       emake CFLAGS="${CFLAGS} \$(SPEC_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} \$(SPEC_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} \$(SPEC_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} \$(SPEC_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-r8" ${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