mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-24 06:48:18 -07:00
net-proxy/haproxy: Bump to 2.5.11, 2.6.8 and also fix hpack compiling
Bug: https://bugs.gentoo.org/891859 Signed-off-by: Christian Ruppert <idl0r@gentoo.org>
This commit is contained in:
Christian Ruppert
@@ -4,9 +4,11 @@ DIST haproxy-2.4.18.tar.gz 3626923 BLAKE2B 1ec312a5607634f7906cfcf5d4e22d829bdca
|
||||
DIST haproxy-2.4.19.tar.gz 67414 BLAKE2B 5fcb3b582e6bfa52849f45a04360da7ccf7888e1a84ae7039a77ecf0f7f76be369941c6b81e9b3610416736c35c40d08f831ea8fd264b05874b376029267e660 SHA512 82b6e4d4f5a2170ac8399a69b5aa9cfe7c4d9df7aa611d087c5654730b593250b2c1af8113bad96e39c1953301f4b5e40311741bff1588f4360a019f06d8929b
|
||||
DIST haproxy-2.4.20.tar.gz 3640093 BLAKE2B 45c6b9d22628c34177154900a85d303392b4de4c9fc74db64fed7bd31bc64df5ca6c853c393a59afbd762c0f96b27c54717ca7d89bc46e336678574f333bbccc SHA512 dbd3a025627b2115f9e16cf8d2774138049760aa89ad235e7c7f0fa7c706e6bd83cb41be0e597c70948825fa90f968579ca8ab35f7a435a4ea18dbbea72405d7
|
||||
DIST haproxy-2.5.10.tar.gz 3850472 BLAKE2B c5d7301447ece3733aa78ce2aa4f41b73f03e9b684d609469f68cb109a477e99aa569ee7a7d23cd8f0734dc1c631233b12b9e4367b71b06d139c8aba5faaa2b9 SHA512 0a91bc1c65924fa5c43f9c58eedd59213a431ed3196a0479df74b59885de0e6ead799d3943ede38f42ddd5ffb6e61b95bf0653c758ec442ff5bb3533645788c5
|
||||
DIST haproxy-2.5.11.tar.gz 3860869 BLAKE2B 657651c6e9a3fa03cfa932d50e6cc72023973531685bccb3690f9458437bcf5a9da81faf0e7cd35bacb4747f5cf2a0b7250e8355d5b849129ea58b41cf0beed3 SHA512 11f63ddc590823b312819e1baa5a05fac97bdcf20ea36de5ff9cbc0c8b18ef81954492b6ef4ca7a3e93848ea81543edfa9bc3a27e48b517b60f0da589ec9005e
|
||||
DIST haproxy-2.5.7.tar.gz 3832801 BLAKE2B 6d54135b56f84129dea497ddc935fecf593abccfb21fc647c7d166f9c1aa4abc670c66bf13e0923e353627d83d47345f632ae8212672c3b3da7a757fd5d24d7c SHA512 cf6994508d559401a84e1304c2b6829952a9b3a14365d03436da42ec7e4553c201ffde9e524044dfa48813e8e614d24095a87b0fae7d9145ce5e66b953666ee9
|
||||
DIST haproxy-2.5.8.tar.gz 3838130 BLAKE2B fd02c285682815fd1837190b80184e110bb6a37b99dfa30e6cece628e62af6a5a145d97f5849e64364a286593d0ea206506c0b474485b22018a816b899744710 SHA512 99a49556864b178c024e73e5bd45051a7a6e512bbb52906ba6f3888e22a83e2b91198ed1c6a3bcbbc44c474a9ba6a6373fae4216fac8ecdb5d724f281b00fd68
|
||||
DIST haproxy-2.6.6.tar.gz 4015438 BLAKE2B 36e676e011e290cc16ed4d116426639e9c11dcc6383fbcc82da8c9df87f19dde55a420167d926a510f6ca06cedec5588abb1ee1dd78881e3ecafbe428ea247c7 SHA512 0b416d200e9b406a96896d3570483d24e94fdfa3f781bee663476e218a57851aefdf8768f00c8a2e9df1bb028f6398690f07da452f59656327967685787ee5c2
|
||||
DIST haproxy-2.6.7.tar.gz 4028355 BLAKE2B 3af8123bf534cc6dc2bf6777c080c9ccaf9d910f4b53ae4349d9abf8868f3fd552855c86d0ff9a1e3a948b769232400377786aed1ac6404a671bfadb6f66dc5d SHA512 d6f4399195647cef39a502e4c2170a9a494992880d5a805cf7ceae8b0845f7b5768b25e2f3c025dcfffd6da478058ae0b687904020ca21fee486223ad22e9c35
|
||||
DIST haproxy-2.6.8.tar.gz 4041517 BLAKE2B 1f3fe78e04565440f6a578ec15a436df4857ecbf0256333df8c195f2ce7fc4c7d522be8a7bdbaadc882c0f02ee2b4af543b4bf236d63994a8699c829cc9c6b28 SHA512 b5c126c6e0249ebd461bd1a98c63f821392a665f0ae2c6cb1527becb5e1be6326121680f17b6f96785e9a7bd6b5bc6789091eb21cb70000c2fc7b88cd6a87b12
|
||||
DIST haproxy-2.7.1.tar.gz 4120306 BLAKE2B aa9e6273468e07b91efb8ecedcf06f2bdcb0ba7949ba710bf94d23a59987031be0f94d78a3efa707fbaba711773db76516f76e1cdc2a92b1eaeac0786e1b8663 SHA512 89df867b2f052618480d1e28293e84111160c31fa250c2af1a452f8fce627fd2c69c929bcfd5d68399fd02ebbf77301b0ff34a58a64fe73f034a234491c3e4d2
|
||||
DIST haproxy-2.7.2.tar.gz 4130348 BLAKE2B 97cd3a28c64b1fe0b14976f29a7b2f07e10dfb6a2abfe0c8baaced58a706f54e0c8bcbd8da1a8f3741e72bc2f59fea37ea16297f996906cac039662d19b062e8 SHA512 0746f715b9f0acce3c5eb6ade6f201f21806ee51cdd3da453cf32c7e36fab772a74b4a476ed80f1176fe29a0c706479017cfeb8850d53fc6ad2ee40da66ba1e1
|
||||
|
||||
49
net-proxy/haproxy/files/haproxy-2.7.2-hpack.patch
Normal file
49
net-proxy/haproxy/files/haproxy-2.7.2-hpack.patch
Normal file
@@ -0,0 +1,49 @@
|
||||
From 494ae0c35c883632faf1d22b54083d3e97a7c129 Mon Sep 17 00:00:00 2001
|
||||
From: Aurelien DARRAGON <adarragon@haproxy.com>
|
||||
Date: Wed, 25 Jan 2023 16:35:00 +0100
|
||||
Subject: [PATCH] DEV: hpack: fix `trash` build regression
|
||||
|
||||
Since 7d84439 ("BUILD: hpack: include global.h for the trash that is needed
|
||||
in debug mode"), hpack decode tool fails to compile on targets that enable
|
||||
USE_THREAD. (ie: linux-glibc target as reported by Christian Ruppert)
|
||||
|
||||
When building hpack devtool, we are including src/hpack-dec.c as a dependency.
|
||||
src/hpack-dec.c relies on the global trash whe debug mode is enabled.
|
||||
But as we're building hpack tool with a limited scope of haproxy
|
||||
sources, global trash (which is declared in src/chunk.c) is not available.
|
||||
Thus, src/hpack-dec.c relies on a local 'trash' variable declared within
|
||||
dev/hpack/decode.c
|
||||
|
||||
This used to work fine until 7d84439.
|
||||
But now that global.h is explicitely included in src/hpack-dec.c,
|
||||
trash variable definition from decode.c conflicts with the one from global.h:
|
||||
|
||||
In file included from include/../src/hpack-dec.c:35,
|
||||
from dev/hpack/decode.c:87:
|
||||
include/haproxy/global.h:52:35: error: thread-local declaration of 'trash' follows non-thread-local declaration
|
||||
52 | extern THREAD_LOCAL struct buffer trash;
|
||||
|
||||
Adding THREAD_LOCAL attribute to 'decode.c' local trash variable definition
|
||||
makes the compiler happy again.
|
||||
|
||||
This should fix GH issue #2009
|
||||
---
|
||||
dev/hpack/decode.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dev/hpack/decode.c b/dev/hpack/decode.c
|
||||
index ae825120f..13c95c77a 100644
|
||||
--- a/dev/hpack/decode.c
|
||||
+++ b/dev/hpack/decode.c
|
||||
@@ -30,7 +30,7 @@ uint8_t buf[MAX_RQ_SIZE];
|
||||
char trash_buf[MAX_RQ_SIZE];
|
||||
char tmp_buf[MAX_RQ_SIZE];
|
||||
|
||||
-struct buffer trash = { .area = trash_buf, .data = 0, .size = sizeof(trash_buf) };
|
||||
+THREAD_LOCAL struct buffer trash = { .area = trash_buf, .data = 0, .size = sizeof(trash_buf) };
|
||||
struct buffer tmp = { .area = tmp_buf, .data = 0, .size = sizeof(tmp_buf) };
|
||||
|
||||
/* displays a <len> long memory block at <buf>, assuming first byte of <buf>
|
||||
--
|
||||
2.34.1
|
||||
|
||||
188
net-proxy/haproxy/haproxy-2.5.11.ebuild
Normal file
188
net-proxy/haproxy/haproxy-2.5.11.ebuild
Normal file
@@ -0,0 +1,188 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="7"
|
||||
|
||||
LUA_COMPAT=( lua5-3 lua5-3 )
|
||||
|
||||
[[ ${PV} == *9999 ]] && SCM="git-r3"
|
||||
inherit toolchain-funcs lua-single systemd linux-info ${SCM}
|
||||
|
||||
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
|
||||
SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
|
||||
elif [[ ${PV} == 9999 ]]; then
|
||||
EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
|
||||
EGIT_BRANCH=master
|
||||
else
|
||||
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 +threads tools vim-syntax zlib lua 51degrees wurfl"
|
||||
REQUIRED_USE="pcre-jit? ( pcre )
|
||||
lua? ( ${LUA_REQUIRED_USE} )
|
||||
?? ( slz zlib )"
|
||||
|
||||
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} )"
|
||||
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 )
|
||||
PATCHES=( "${FILESDIR}/${PN}-2.7.2-hpack.patch" )
|
||||
|
||||
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_compile() {
|
||||
local -a args=(
|
||||
V=1
|
||||
TARGET=linux-glibc
|
||||
# Switching to PCRE2 by default, bug 838013
|
||||
PCRE=
|
||||
PCRE_JIT=
|
||||
)
|
||||
|
||||
# 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_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 ROADMAP 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
|
||||
|
||||
if use vim-syntax ; then
|
||||
insinto /usr/share/vim/vimfiles/syntax
|
||||
doins admin/syntax-highlight/haproxy.vim
|
||||
fi
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
188
net-proxy/haproxy/haproxy-2.6.8.ebuild
Normal file
188
net-proxy/haproxy/haproxy-2.6.8.ebuild
Normal file
@@ -0,0 +1,188 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="7"
|
||||
|
||||
LUA_COMPAT=( lua5-4 lua5-3 )
|
||||
|
||||
[[ ${PV} == *9999 ]] && SCM="git-r3"
|
||||
inherit toolchain-funcs lua-single systemd linux-info ${SCM}
|
||||
|
||||
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
|
||||
SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
|
||||
elif [[ ${PV} == 9999 ]]; then
|
||||
EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
|
||||
EGIT_BRANCH=master
|
||||
else
|
||||
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 +threads tools vim-syntax zlib lua 51degrees wurfl"
|
||||
REQUIRED_USE="pcre-jit? ( pcre )
|
||||
lua? ( ${LUA_REQUIRED_USE} )
|
||||
?? ( slz zlib )"
|
||||
|
||||
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} )"
|
||||
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 )
|
||||
PATCHES=( "${FILESDIR}/${PN}-2.7.2-hpack.patch" )
|
||||
|
||||
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_compile() {
|
||||
local -a args=(
|
||||
V=1
|
||||
TARGET=linux-glibc
|
||||
# Switching to PCRE2 by default, bug 838013
|
||||
PCRE=
|
||||
PCRE_JIT=
|
||||
)
|
||||
|
||||
# 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_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
|
||||
|
||||
if use vim-syntax ; then
|
||||
insinto /usr/share/vim/vimfiles/syntax
|
||||
doins admin/syntax-highlight/haproxy.vim
|
||||
fi
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
@@ -52,6 +52,7 @@ S="${WORKDIR}/${MY_P}"
|
||||
|
||||
DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
|
||||
EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
|
||||
PATCHES=( "${FILESDIR}/${P}-hpack.patch" )
|
||||
|
||||
haproxy_use() {
|
||||
(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
|
||||
|
||||
Reference in New Issue
Block a user