commit:     d5425f18e2d1adfef006323dbaae4d59ec4bc358
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue May  2 14:20:05 2023 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue May  2 14:20:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5425f18

net-proxy/haproxy: Bump to 2.6.13

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

 net-proxy/haproxy/Manifest              |   1 +
 net-proxy/haproxy/haproxy-2.6.13.ebuild | 192 ++++++++++++++++++++++++++++++++
 2 files changed, 193 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 72d2dbbfa770..ce941f2c516e 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -4,6 +4,7 @@ DIST haproxy-2.4.18.tar.gz 3626923 BLAKE2B 
1ec312a5607634f7906cfcf5d4e22d829bdca
 DIST haproxy-2.4.22.tar.gz 3648716 BLAKE2B 
b030faa8fb5e906494a8faeda8ee6a4496ed78dbaabb391a8b7020e5ef66803c4cf14438516435af84237352cca982a724857b61d033a1aa4dfa0ea5248f5b77
 SHA512 
c22ad38046e3c70beb3bf57a62e4e74db329559059e2f36d2f801768c26b1f1222631702e83e9839fab4396c1b78089a807750ff743b4192da06c751cf9f0779
 DIST haproxy-2.6.10.tar.gz 4056147 BLAKE2B 
10e54b324826b99f8873e528368519d8cdf758a8796623852bcb8a2fdf2ab28259e1c60e5705041563bcdb5498b4ace72052d646586ab3627a0e444a100340e2
 SHA512 
3f07c3b3e33402e26334682612ada1ddc5feae8cd99fda52a521847baf417d7979d609d94eb34abcc97055cdca248bbf0df297bb7d16a2bd72f78cbe5933d5d3
 DIST haproxy-2.6.12.tar.gz 4060878 BLAKE2B 
c142ea24dfa8d68b8338ce46e326523c7568c5a99493f8418a6d0bd63e94e64a41f5843a017ca9140f0025c7d0baf3356099b32464d3d2046c9cdec20df42f6f
 SHA512 
95841a7379488bf9632151a07f64a1a10af578e41c2749bd5e832f61977e195e3efdbf381db59f56a966732bcbf89f1ccb559f0bf3c369e4462b8419a1e347a6
+DIST haproxy-2.6.13.tar.gz 4065839 BLAKE2B 
5eed5e29d2121117866a1e7dde06ca02743001bd54f9b9a01c82c8c81e24686e3e24f5b8c291db12255d98b10f251b7f6e7612785130a8cf7fb68a0c7c5e28e6
 SHA512 
672b1c5cd373261865d03af1c5cc42d1f6ec672f08c8482185d17dca2bd7dbd1e83e65107bb0bf1eee33a7149d9d25cca3f2c90beeacb38ab2e3ab74e9bdc5ed
 DIST haproxy-2.6.9.tar.gz 4045208 BLAKE2B 
2222e2265b57a252c596c066b2fed0de89669ac6b86e0c76b31ef2b73e2d8d090a51c46d34553aec6d70a2b61717df0d2ac2eb1053cae0364e3e84334ba35f77
 SHA512 
24d000a38d30502f09c3cd44425bf515382c0a7b1bc5a117a078a198f9c05d618a25148ddee0463458884fc566085d9847e5f89e3c7bda1758ccf5fddef7ebf5
 DIST haproxy-2.7.3.tar.gz 4141275 BLAKE2B 
a72c3ee578c2a1fb1648779c4a7c692d136455f24c2e2afc2e3ce1dba651043b2e897a938bf1da9a790cb6f8c731c331301d085a953674f341fbedc1d8c0847a
 SHA512 
f9eeee2d232fd2f4da1959e9265dd6abe6c6182109a0455d4f868a516e78cc6ea67e8456d5bc26e439385d17f52e4b179d7c615bacf15aeae901ab8e172dc758
 DIST haproxy-2.7.4.tar.gz 4154182 BLAKE2B 
16c32de742b0782389e62f5f0e737a50ff42ed8ed37c9d912d22e84f2dc3d68af112015e3774f7f583b73ef3c724171a5d18e55bfa957e55947555a49d9c14ba
 SHA512 
c15be0a59ab86e9793ab0e20728f6f4e4b9d4e6fbaaa1839e25ba26efc4ee0cef0a0123ca5901dd25559213eadb5d2745dbbd2d937f7077fbfc883f44a29b397

diff --git a/net-proxy/haproxy/haproxy-2.6.13.ebuild 
b/net-proxy/haproxy/haproxy-2.6.13.ebuild
new file mode 100644
index 000000000000..7c18e82dbedb
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.6.13.ebuild
@@ -0,0 +1,192 @@
+# 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 )
+
+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
+
+       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
+}

Reply via email to