commit:     4269b04a2ffc324157687e204b143175ffff84f6
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  3 12:46:40 2023 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Jul  3 12:46:43 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4269b04a

net-proxy/haproxy: Bump to 2.8.1

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

 net-proxy/haproxy/Manifest             |   1 +
 net-proxy/haproxy/haproxy-2.8.1.ebuild | 190 +++++++++++++++++++++++++++++++++
 2 files changed, 191 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 1ae30827b831..0491795496e7 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -11,3 +11,4 @@ DIST haproxy-2.7.3.tar.gz 4141275 BLAKE2B 
a72c3ee578c2a1fb1648779c4a7c692d136455
 DIST haproxy-2.7.8.tar.gz 4176647 BLAKE2B 
2627c28fed6e760406a7eac824da1209a2f7473374e4b6dbce7995ac85ca888ee29e7554cfdea1f53841e90f53edad653124546173218366cd79565e3f197729
 SHA512 
00ea172faccb7a329a08baff1ba67345a233f94f2c0c388eb1446a8f00972a0fa77015645351ec80763f739889a24dcbfa5b0e92eec79fd310c0cafc88b5a700
 DIST haproxy-2.7.9.tar.gz 4186553 BLAKE2B 
a2c7e92d008886ac5b5cf9f67be808bed68faea41b4bc25a3e5e187a4a2116bc37c40a5df9e2f640dba6c79caea39615eff434e904470e67d7703125a5ffc7e2
 SHA512 
774d0ae7a402fae0805706f4b88891162e18179f6ad9c2d0916ae30be2502409afdd11dfbbbce9b49564c7e14e8625e4a26751bbfc3b19e3e13ac12c8cc19495
 DIST haproxy-2.8.0.tar.gz 4328018 BLAKE2B 
a5382e153f08a315b7df7f92736aabad8e9d4cd0152a9178c448d1071440b88dbd723599fd3709d266f97eee4fa89d336a3390d70a0c4ab7f0b46e4ae713fa12
 SHA512 
4197e94df3d4ab8b27487146181335422358a097f7d50188b40ae23263c58ddeab6d17d9ed91e93d239a7fccec2fa58319e3f2cf07ac589c79fd78a3839c2b81
+DIST haproxy-2.8.1.tar.gz 4329591 BLAKE2B 
4c4cb6d0a50d1a5d799b4d861f1dff98d5b3cf6f33c94c1b5927dd1998afb968c0bded9ddbac3e95fc1b16b5515d3d29695d5a6e20ee4424e7240e6a309e8b89
 SHA512 
65950da1287bfa806109e29ff62b4416ac45754af37bb899e3be0acce31457ca687d22f43ce8d311310e8134fb214a04ebfaaaa99bca379f91db79b1dfa19137

diff --git a/net-proxy/haproxy/haproxy-2.8.1.ebuild 
b/net-proxy/haproxy/haproxy-2.8.1.ebuild
new file mode 100644
index 000000000000..843fa7ff2a33
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.8.1.ebuild
@@ -0,0 +1,190 @@
+# 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 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 )
+
+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
+               # 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_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