mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-24 18:58:08 -07:00
net-proxy/haproxy: Version bump + cleanup
Package-Manager: Portage-2.3.60, Repoman-2.3.12 Signed-off-by: Christian Ruppert <idl0r@gentoo.org>
This commit is contained in:
Christian Ruppert
@@ -3,10 +3,8 @@ DIST haproxy-1.6.14.tar.gz 1583859 BLAKE2B 91695f0b3d901ba70b6bce6572c2f549479c2
|
||||
DIST haproxy-1.7.10.tar.gz 1750937 BLAKE2B 26d970862e415b079d4130fd00564677584a7aad74d6812cabed36de9a629321330434b7d4fdf7c2e8b2945b7f394ca33e444158e7fa9b49937db501ea33e78a SHA512 ca6c50848c559ee2ffb9af2d281c3931473dd90d1686d95d962cf604cd92d2feb2b63e006e217cf9078cf08fdd73dc523318c97e13400bc0ef325de47111394e
|
||||
DIST haproxy-1.7.11.tar.gz 1752129 BLAKE2B 1947ab837f6b81761eec931e97c7349462561abecc78b2b58b285ebb4b0ae498753d236f3a243d3b5c1115a9ff6e5fe9392d428314a6342e2c1907d6886e09e4 SHA512 48ee30a1057e92971c041b088b6aef16d6843da9ecee9b738aaa64bb55d3c3b0be090a37bb5fc63ac42fe34ce994820349cc770756136c823051039fa6d01f74
|
||||
DIST haproxy-1.8.13.tar.gz 2063046 BLAKE2B 9ebccf2520719cdf209bc9a87bf28d015b5b673e0d017d5387af4025f930ac401f6a2cfa851583ffe6b6645b7b91ad255bb5db737688a1f310958072a11c8a80 SHA512 54d4cb0721a3868267d7e085b3d3bb050384e4279eb49e88abb925bb3ea8cc39ef9069bdc99b7b18a23fd22e0d29e24dfcb8a0507ddca9243a845e4418be9cc5
|
||||
DIST haproxy-1.8.17.tar.gz 2077525 BLAKE2B b4419d541a82399995df448410a8756301ad561001bfe45cfa1c21f6f01bfadb51bb58aeda2e8e34f0580356c8ca136568fd8f2d86507a88e3cd84924b861d5c SHA512 0887d5d84c2cce9355fae032ba82e4b7b94c89d3053f209046a555101b5750c10b51feb38fd14245f806fb4f50ec1dcdf2b23b4f80578abd4a27693fc29b91b1
|
||||
DIST haproxy-1.8.18.tar.gz 2080500 BLAKE2B fcc51fbe6c496dbf99e49add4b582ec9357c94daebaea6396e131b4e6f323fdcc11d40039b9de9b6e2762c46863a1efd5062524df3d42991eef73ae3a42a9787 SHA512 7bcdc8fd110bb77fa3b1f735474218fb766b7701b87e939249697cb780aedf039b3d8f59cbfb5fa271473ad789df4ac60a64cbb6c61330e1125a13676ad25fc0
|
||||
DIST haproxy-1.8.19.tar.gz 2080757 BLAKE2B 46a97620f3b5c3f205e8b9d6e49acca8e107a1e6918ac18c036b9c3408666348400f8d9f6f4a4103e7f206c6373b25a224536c0969e2dad1013c2320b07b0ced SHA512 f62b0a18f19295986d26c5c60b6b1ad55850a175bed67a359282cc37a4c630a0c2be51d608226b4316f2e69c3008c20a1cb91ce10f86311219355973a050e65b
|
||||
DIST haproxy-1.8.8.tar.gz 2054534 BLAKE2B 5eabd37dfb79783dc20425cbb16ca1e1afed23861f66c9e8a738dd56d9ca35b3ceb2604c308543ca99222aa867e11ff613fc09012669882a4bdaaff03cb76450 SHA512 8310f84b364348600273c295a3b315a79cba1f782b86b47d8d47b3ffd1e6fb62fd278c4f2dfa185d0a269f73c1067695a763733736877989a941162b625462a1
|
||||
DIST haproxy-1.8.9.tar.gz 2057051 BLAKE2B d81d18f68a27ae8a77660c1ecb1dfc28599263ebfd57f25ea574af2b101b35eb7a1a89ba4034b55dfa89673ae6ac4c0dca5428b4b494a02184b1b157850ce96b SHA512 e59c29af3a39d6212f012ae8341b169436e10e42fadaf8f1aa68d2bb7ee181fd1fe3b74640bfcd8c37c17dfc5062b36bd69d90290d7c59cd3e4648ef2ab1c8dd
|
||||
DIST haproxy-1.9.2.tar.gz 2350356 BLAKE2B ba147007999d65d214545e5c20567aaa3db67a292eb0df1e1e4aaaeeb7e1c90f593725b112cd222537346cec45b557a2a99e30ef5d4a91bb4b5804212b765121 SHA512 42ad5048c85ac9fdc7ba1b00917508255ffb66f63df1c24382beba6f77765d786b0ab16ddafe5e290f81ea07bd15c63277b5749c4bafab0721e57f837b1bebf8
|
||||
DIST haproxy-1.9.3.tar.gz 2353387 BLAKE2B c3b5d7c4dba4a2557dfbee857e8e2a7ab6d142423788c7cabf96c3d0a0dc4a2dde857db47b0036eac7288249d8416eba8252f0c08290739862457214497e3438 SHA512 5ece759d460d6daba8ed82039fb24037c2b8b36f7ce0f9c9a703ca049ac0d03807ba673b61ae2d74a9e7253b6fb1ca82c504734456c7fb0fec322b67e59ba835
|
||||
DIST haproxy-1.9.4.tar.gz 2357935 BLAKE2B 761118da39742eff07e3bc2772a9318a6aaddbeb706e684afa619a11e4a6f1e91f35212b22b58474334621daaec160a4f9183a65698343a4fbb64d9cb38ad049 SHA512 804baeb0493bfaedce59f04a5c7eedd703aec11fbfc9744c6d3f642e3200a5fccbfc92d9da9555a2b266534b9cd5bb81308c57c7627512b951e5a83cb1b24cb0
|
||||
|
||||
@@ -1,171 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
|
||||
[[ ${PV} == *9999 ]] && SCM="git-r3"
|
||||
inherit user versionator toolchain-funcs flag-o-matic 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/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~arm ~ppc ~x86"
|
||||
else
|
||||
EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/"
|
||||
EGIT_BRANCH=master
|
||||
fi
|
||||
|
||||
LICENSE="GPL-2 LGPL-2.1"
|
||||
SLOT="0"
|
||||
IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl
|
||||
systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
|
||||
REQUIRED_USE="pcre-jit? ( pcre )
|
||||
pcre2-jit? ( pcre2 )
|
||||
pcre? ( !pcre2 )
|
||||
device-atlas? ( pcre )
|
||||
?? ( slz zlib )"
|
||||
|
||||
DEPEND="
|
||||
pcre? (
|
||||
dev-libs/libpcre
|
||||
pcre-jit? ( dev-libs/libpcre[jit] )
|
||||
)
|
||||
pcre2? (
|
||||
dev-libs/libpcre
|
||||
pcre2-jit? ( dev-libs/libpcre2[jit] )
|
||||
)
|
||||
ssl? (
|
||||
!libressl? ( dev-libs/openssl:0=[zlib?] )
|
||||
libressl? ( dev-libs/libressl:0= )
|
||||
)
|
||||
slz? ( dev-libs/libslz:= )
|
||||
zlib? ( sys-libs/zlib )
|
||||
lua? ( dev-lang/lua:5.3 )
|
||||
device-atlas? ( dev-libs/device-atlas-api-c )"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
|
||||
CONTRIBS=( halog iprange )
|
||||
# ip6range is present in 1.6, but broken.
|
||||
version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )
|
||||
# TODO: mod_defender - requires apache / APR, modsecurity - the same
|
||||
version_is_at_least 1.8.0 $PV && CONTRIBS+=( hpack )
|
||||
|
||||
haproxy_use() {
|
||||
(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
|
||||
|
||||
usex "${1}" "USE_${2}=1" "USE_${2}="
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup haproxy
|
||||
enewuser haproxy -1 -1 -1 haproxy
|
||||
|
||||
if use net_ns; then
|
||||
CONFIG_CHECK="~NET_NS"
|
||||
linux-info_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
local -a args=(
|
||||
V=1
|
||||
TARGET=linux2628
|
||||
USE_GETADDRINFO=1
|
||||
USE_TFO=1
|
||||
)
|
||||
|
||||
# TODO: PCRE2_WIDTH?
|
||||
args+=( $(haproxy_use threads THREAD) )
|
||||
args+=( $(haproxy_use crypt LIBCRYPT) )
|
||||
args+=( $(haproxy_use net_ns NS) )
|
||||
args+=( $(haproxy_use pcre PCRE) )
|
||||
args+=( $(haproxy_use pcre-jit PCRE_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 device-atlas DEVICEATLAS) )
|
||||
args+=( $(haproxy_use wurfl WURFL) )
|
||||
args+=( $(haproxy_use systemd SYSTEMD) )
|
||||
|
||||
# For now, until the strict-aliasing breakage will be fixed
|
||||
append-cflags -fno-strict-aliasing
|
||||
|
||||
emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
|
||||
emake -C contrib/systemd SBINDIR=/usr/sbin
|
||||
|
||||
if use tools ; then
|
||||
for contrib in ${CONTRIBS[@]} ; do
|
||||
# Those two includes are a workaround for hpack Makefile missing those
|
||||
emake -C contrib/${contrib} \
|
||||
CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dosbin haproxy
|
||||
dosym ../sbin/haproxy /usr/bin/haproxy
|
||||
|
||||
newconfd "${FILESDIR}/${PN}.confd" $PN
|
||||
newinitd "${FILESDIR}/${PN}.initd-r6" $PN
|
||||
|
||||
doman doc/haproxy.1
|
||||
|
||||
systemd_dounit contrib/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 halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
|
||||
has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
|
||||
has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
|
||||
has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
|
||||
has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
|
||||
has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
|
||||
has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
|
||||
fi
|
||||
|
||||
if use examples ; then
|
||||
docinto examples
|
||||
dodoc examples/*.cfg
|
||||
dodoc examples/seamless_reload.txt
|
||||
fi
|
||||
|
||||
if use vim-syntax ; then
|
||||
insinto /usr/share/vim/vimfiles/syntax
|
||||
doins examples/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
|
||||
}
|
||||
@@ -1,171 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
|
||||
[[ ${PV} == *9999 ]] && SCM="git-r3"
|
||||
inherit user versionator toolchain-funcs flag-o-matic 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/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~arm ~ppc ~x86"
|
||||
else
|
||||
EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/"
|
||||
EGIT_BRANCH=master
|
||||
fi
|
||||
|
||||
LICENSE="GPL-2 LGPL-2.1"
|
||||
SLOT="0"
|
||||
IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl
|
||||
systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
|
||||
REQUIRED_USE="pcre-jit? ( pcre )
|
||||
pcre2-jit? ( pcre2 )
|
||||
pcre? ( !pcre2 )
|
||||
device-atlas? ( pcre )
|
||||
?? ( slz zlib )"
|
||||
|
||||
DEPEND="
|
||||
pcre? (
|
||||
dev-libs/libpcre
|
||||
pcre-jit? ( dev-libs/libpcre[jit] )
|
||||
)
|
||||
pcre2? (
|
||||
dev-libs/libpcre
|
||||
pcre2-jit? ( dev-libs/libpcre2[jit] )
|
||||
)
|
||||
ssl? (
|
||||
!libressl? ( dev-libs/openssl:0=[zlib?] )
|
||||
libressl? ( dev-libs/libressl:0= )
|
||||
)
|
||||
slz? ( dev-libs/libslz:= )
|
||||
zlib? ( sys-libs/zlib )
|
||||
lua? ( dev-lang/lua:5.3 )
|
||||
device-atlas? ( dev-libs/device-atlas-api-c )"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
|
||||
CONTRIBS=( halog iprange )
|
||||
# ip6range is present in 1.6, but broken.
|
||||
version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )
|
||||
# TODO: mod_defender - requires apache / APR, modsecurity - the same
|
||||
version_is_at_least 1.8.0 $PV && CONTRIBS+=( hpack )
|
||||
|
||||
haproxy_use() {
|
||||
(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
|
||||
|
||||
usex "${1}" "USE_${2}=1" "USE_${2}="
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup haproxy
|
||||
enewuser haproxy -1 -1 -1 haproxy
|
||||
|
||||
if use net_ns; then
|
||||
CONFIG_CHECK="~NET_NS"
|
||||
linux-info_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
local -a args=(
|
||||
V=1
|
||||
TARGET=linux2628
|
||||
USE_GETADDRINFO=1
|
||||
USE_TFO=1
|
||||
)
|
||||
|
||||
# TODO: PCRE2_WIDTH?
|
||||
args+=( $(haproxy_use threads THREAD) )
|
||||
args+=( $(haproxy_use crypt LIBCRYPT) )
|
||||
args+=( $(haproxy_use net_ns NS) )
|
||||
args+=( $(haproxy_use pcre PCRE) )
|
||||
args+=( $(haproxy_use pcre-jit PCRE_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 device-atlas DEVICEATLAS) )
|
||||
args+=( $(haproxy_use wurfl WURFL) )
|
||||
args+=( $(haproxy_use systemd SYSTEMD) )
|
||||
|
||||
# For now, until the strict-aliasing breakage will be fixed
|
||||
append-cflags -fno-strict-aliasing
|
||||
|
||||
emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
|
||||
emake -C contrib/systemd SBINDIR=/usr/sbin
|
||||
|
||||
if use tools ; then
|
||||
for contrib in ${CONTRIBS[@]} ; do
|
||||
# Those two includes are a workaround for hpack Makefile missing those
|
||||
emake -C contrib/${contrib} \
|
||||
CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dosbin haproxy
|
||||
dosym ../sbin/haproxy /usr/bin/haproxy
|
||||
|
||||
newconfd "${FILESDIR}/${PN}.confd" $PN
|
||||
newinitd "${FILESDIR}/${PN}.initd-r6" $PN
|
||||
|
||||
doman doc/haproxy.1
|
||||
|
||||
systemd_dounit contrib/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 halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
|
||||
has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
|
||||
has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
|
||||
has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
|
||||
has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
|
||||
has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
|
||||
has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
|
||||
fi
|
||||
|
||||
if use examples ; then
|
||||
docinto examples
|
||||
dodoc examples/*.cfg
|
||||
dodoc examples/seamless_reload.txt
|
||||
fi
|
||||
|
||||
if use vim-syntax ; then
|
||||
insinto /usr/share/vim/vimfiles/syntax
|
||||
doins examples/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
|
||||
}
|
||||
Reference in New Issue
Block a user