gentoo resync : 29.06.2021

3 files changed, 178 insertions, 0 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 52bb7f8057d5..75f4753f750f 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 56c4b144c8d2..4ebe9c367864 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -13,6 +13,7 @@ DIST haproxy-2.2.5.tar.gz 2876429 BLAKE2B 1da993769302186ab0d7e1b0c8651c7e9a1512
 DIST haproxy-2.3.10.tar.gz 2942240 BLAKE2B 1fecbf3dde98b4839911e3e6437fa01ebf2e8b5b534665619703d42c9163afcd2b19768d408b27484ad73061e10b54b4bb512f09444944c403a30431814e8f8a SHA512 595a62d677240cb8a463245e5d5d497bb584a379852e533d82e45a77e1b91b469f84e386adcd42b6ec24e5806e256fc2708f672a0da5c1c4f784e3b76a9e7318
 DIST haproxy-2.3.9.tar.gz 2928660 BLAKE2B 48b56aa72d50d4783bf54c6dbf642388d6f12d4e2ede09e86e9262d62a981177365dc2d2999e76c2be124c0576fe0b8d16a7a5bf412133fcbf87d45d8abfe3dd SHA512 49ee2a9be8dc7836e73be8e01ccbde52e29522f94d0bc80cf753fe76f4b32657fb123df7d443228afef36928f5a6cef67b693f05008a891001082b4264f015f6
 DIST haproxy-2.4.0.tar.gz 3570069 BLAKE2B f37df37232edd5066564bb0f8b02125f697dc1e4d1d8121321a7a5e5089a63c16fb6919f329ac0adf8450f3088efc959fd0cad873151bddf5b53c149530a6e8e SHA512 846faffb7ac2ccbfe314f7c72d4ab3f1955338f3be45906e76a53934c32934e6a3ed9b7a04411717e9a91966e55266183e9cf583df5375f67d03d26c6c6fc273
+DIST haproxy-2.4.1.tar.gz 3575591 BLAKE2B ae5d9f12cf2ef8e114f3ec65a3f636c81b3816ea8dd20635ebc2f2e62ed351463ea97f834a166e2d0e8debc168ef23cbe1fab2f4951a2528bb4e02720e59138f SHA512 6251f0ac77b7bceb349a174faff003bbe621490e5380dcdcd06bf712e13e0c94fd08a3651a62e68c862978031ca2fc9ac8432ea4c6062bb1c718db697030de9d
 EBUILD haproxy-1.8.29.ebuild 4801 BLAKE2B b8e35cc672d3baa46ac81934fe6fca6e0c103f4d76c5353d9d563b74da87aa00bd71848716ed4296972d3c45d5e0a6b745a7df3990cee9c4e34cba21334a73c1 SHA512 798ef5b92290651e20ee5b8f6d76c84930d629926b320ee261be04b906d7db959b005a59e719d8c7739b57edd4c5a6342ee2c260ef5a950508dab9d7f96a8b95
 EBUILD haproxy-1.8.30.ebuild 4801 BLAKE2B b8e35cc672d3baa46ac81934fe6fca6e0c103f4d76c5353d9d563b74da87aa00bd71848716ed4296972d3c45d5e0a6b745a7df3990cee9c4e34cba21334a73c1 SHA512 798ef5b92290651e20ee5b8f6d76c84930d629926b320ee261be04b906d7db959b005a59e719d8c7739b57edd4c5a6342ee2c260ef5a950508dab9d7f96a8b95
 EBUILD haproxy-2.0.14-r2.ebuild 5338 BLAKE2B 3660a27183936423478dfadd77f5b592f7bd52a5fe07dcea642151f3af732c2f51eb16375aa811a3b300e37549ed0270ccbffe514987dba9492b5d9e421afead SHA512 e655fff56e642bf7b172654c9905b56ecc4f50b71412038ec4b5224dc62f80e0f416a777abd9abe54c7f73f929f569b0771b1658aab647c4044696615d86e639
@@ -28,5 +29,6 @@ EBUILD haproxy-2.3.10.ebuild 5250 BLAKE2B bced61c6fff7d187f486a5fe05b1a376dc98d4
 EBUILD haproxy-2.3.9.ebuild 5250 BLAKE2B bced61c6fff7d187f486a5fe05b1a376dc98d42123a7cedc5ea748be46d0cafac8561baae81e3f7fd00cdab86e7354051657fb560432fc2ed817f23e5a90aee3 SHA512 ce4b33fb66c6c7584fbbfccebe9d0583c4ec684d0e14eb866130cee02848e3b3a50cd95a2514266e719914e1b3ee315410f55d348fa3b78a616b048791575c16
 EBUILD haproxy-2.3.9999.ebuild 5341 BLAKE2B 785c444ee4ed1a43ab19be26c4367221a1e65cb3c1f28eac5d5776b4f5104180ad1a3496b20197f1a9c340e429e48b4521dcadd9906e231058b9f10946bac12c SHA512 47f6cceb730d9dd460213856ff06d95b46c04689cbc55549c794d50ad1ad1ecec3d244cadafcf5526e4cfa385be0565e14f1503ebf08d0c187b18feec2f6ffd2
 EBUILD haproxy-2.4.0.ebuild 5560 BLAKE2B cecea7f074f16008081caad02b9b698bd3c15bc29b536a8abebd689f5e1873d1994cc98f33efa2b3dd95a616a4290cd77ab6ccd9512bb61a96fd2ecee0df35a4 SHA512 5a8bc9598a149311da85c716a620869625db1dd01499c18a0f927a54f55c112d7ca871a1c8c9e0f4ed1ef524262b73c0a84eb73018c07cdb856293c41fdc7696
+EBUILD haproxy-2.4.1.ebuild 5560 BLAKE2B cecea7f074f16008081caad02b9b698bd3c15bc29b536a8abebd689f5e1873d1994cc98f33efa2b3dd95a616a4290cd77ab6ccd9512bb61a96fd2ecee0df35a4 SHA512 5a8bc9598a149311da85c716a620869625db1dd01499c18a0f927a54f55c112d7ca871a1c8c9e0f4ed1ef524262b73c0a84eb73018c07cdb856293c41fdc7696
 EBUILD haproxy-2.4.9999.ebuild 5560 BLAKE2B cecea7f074f16008081caad02b9b698bd3c15bc29b536a8abebd689f5e1873d1994cc98f33efa2b3dd95a616a4290cd77ab6ccd9512bb61a96fd2ecee0df35a4 SHA512 5a8bc9598a149311da85c716a620869625db1dd01499c18a0f927a54f55c112d7ca871a1c8c9e0f4ed1ef524262b73c0a84eb73018c07cdb856293c41fdc7696
 MISC metadata.xml 2148 BLAKE2B 2f273c8d5c4704b482cf5b09e038415e0faa6ecba7297f99d0c55d96ba0b8f0bfa50b21dc857680951c3b4794be98f8781a6d1dcfb622ec5f6827648cfdd247e SHA512 91834d33a145ce6f887f83849ea90da984cf131e657824e63fb44b49761dc9999c00796fb20879cc670b83a2f4aae2263aeacc1dc6bf71b9db34a21ef9a3026d
diff --git a/net-proxy/haproxy/haproxy-2.4.1.ebuild b/net-proxy/haproxy/haproxy-2.4.1.ebuild
new file mode 100644
index 000000000000..ec2939f568a0
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.4.1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit 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/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+else
+	EGIT_REPO_URI="http://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 pcre2 pcre2-jit prometheus-exporter
+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? (
+		dev-libs/openssl:0=[zlib?]
+	)
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	lua? ( dev-lang/lua:5.3 )
+	device-atlas? ( dev-libs/device-atlas-api-c )"
+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() {
+	if use net_ns; then
+		CONFIG_CHECK="~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_compile() {
+	local -a args=(
+		V=1
+		TARGET=linux-glibc
+	)
+
+	# 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 pcre2 PCRE2) )
+	args+=( $(haproxy_use pcre2-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 device-atlas DEVICEATLAS) )
+	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=${ERROT}/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=${ERROT}/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=${ERROT}/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=${ERROT}/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
+	dosym ../sbin/haproxy /usr/bin/haproxy
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r6" ${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
+}