gentoo resync : 07.10.2018

3 files changed, 171 insertions, 0 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 85440cd83d4f..02865ee65a77 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 0e837af01874..47683c4e4536 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -9,6 +9,7 @@ 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.14.tar.gz 2070813 BLAKE2B 113c80cc2f5f427dd419f9c4602d852dec3ae396f8f2cda67993aff4571c88edbd0a84df5c13585999369081182d5d9f8ac86b5bac3d81f7c04c08a00fcd16d2 SHA512 17727c19e0439a2b45be2ec583cd2ce30d1af2bf48bd3cdb2dce1eff670ab8b24d93eaa7bebb410947528d1ad88c3856495e498fff518620efbd32b9adf4eb66
 DIST haproxy-1.8.8.tar.gz 2054534 BLAKE2B 5eabd37dfb79783dc20425cbb16ca1e1afed23861f66c9e8a738dd56d9ca35b3ceb2604c308543ca99222aa867e11ff613fc09012669882a4bdaaff03cb76450 SHA512 8310f84b364348600273c295a3b315a79cba1f782b86b47d8d47b3ffd1e6fb62fd278c4f2dfa185d0a269f73c1067695a763733736877989a941162b625462a1
 DIST haproxy-1.8.9.tar.gz 2057051 BLAKE2B d81d18f68a27ae8a77660c1ecb1dfc28599263ebfd57f25ea574af2b101b35eb7a1a89ba4034b55dfa89673ae6ac4c0dca5428b4b494a02184b1b157850ce96b SHA512 e59c29af3a39d6212f012ae8341b169436e10e42fadaf8f1aa68d2bb7ee181fd1fe3b74640bfcd8c37c17dfc5062b36bd69d90290d7c59cd3e4648ef2ab1c8dd
 EBUILD haproxy-1.5.14.ebuild 3269 BLAKE2B fed37e73d128612260d8266045891a5e271ba399ee61af005409ab07b089297f4ca39adb67c50e0721efa9b7cdc112f0d5d30a65cb60ac027684ddb69e606c9c SHA512 41d1cfec30d177661f4402143ccf1335f5407adeb9f1581ea866011b1ec26c99da67fb2edd33e71e96b64665fa9c62641fd4b5dc1cd1383cc49877a0ce4292b4
@@ -18,6 +19,7 @@ EBUILD haproxy-1.6.14.ebuild 4608 BLAKE2B d85f4160498f8af8fcc05ccdbe68d771b9d8b5
 EBUILD haproxy-1.7.10.ebuild 4628 BLAKE2B 267e5228e4c1eb2386ab13a6f21d018e8f8643d9adcdb61851d150b281e2241eda97c701b4577fef8feee00c01409f8f2fc715a9681874fc05fc3f89c09da440 SHA512 941f9c3e0982ee44d51339b3feef43d93c7259413f2d77f8919e63056a0d0504468bd0637965141842af6c8dbb223f23155ffc0728f54bc1bbf539eef678c235
 EBUILD haproxy-1.7.11.ebuild 4632 BLAKE2B 06dd613111ce7410ce9190b2cbd825f4b9acd16d3c9995ca507fda90a77696e6c931b2f2caeb916ed0f6894110edaa056df5923c204107230af6a4f596c061ab SHA512 bb080ed92cbef8e2851262648519b5e0563749e3bd92396707791775801bf19f029e57fbe4fa029ea240cbc8f55b14e91d5656e85101fb2dc1e8ae219d111d51
 EBUILD haproxy-1.8.13.ebuild 4886 BLAKE2B 61bc37ea42b0dd5bc447b68cb45532c184f14ad40461faddb940e041682e88ac81af36ce44d961d1011bc54b788ad9baa4c9447950a97708ea33dcb9d677fc32 SHA512 5dad241368a64aba2b07e429ab82adff67df556fc2b5a447d4863a12d50098545127f30725887b447e6ed583e39177458267777c5b321636211aab5a61b85a65
+EBUILD haproxy-1.8.14.ebuild 4886 BLAKE2B de3d4a728a6ebc7d0aa7861982921a6de7ee412efcf819df59f7f63872866a848c395af26b5bfbfa2b29ef3969e60306ccb6a0c2c93bcbd7cdce1df976ab2c31 SHA512 6a9fc1b8200c62be0d271e4ba5d293c07fb872d4832a2d7ff743ed7b2c21995adb2007295dcf3653cd75e5af724bf9f184ae32ae132c88f8e8dd18dfc273c3b8
 EBUILD haproxy-1.8.8.ebuild 4889 BLAKE2B a40d2bf75ece4fcba6f0ac6e8bfcf81763ded4b315781183230a8b514f5931de4c383afbe8d4152f4d2d4d496fd2421f2f10d04e4240b52a7ab15f3c31bc0864 SHA512 2e132cd3018d845450a94857a544c0306a5cf0efe08d5102a7096a424355a4b628bf85c69f02f812577d134ebabef197aa2bb4ff6f5b8f8d3609d072a55af86e
 EBUILD haproxy-1.8.9.ebuild 4885 BLAKE2B beb86eb5714d77b8dad4ac0abc55b46a0e4727ceae1a503ff1febe3943f6393f8ce99f97c098e4046c17de04a32c4f9d0a8708fd4c81eeb69e82f900f156285a SHA512 93290df98b67334d2c89ced563d15d25943a5c87c691fdce2ace423ca38acc364f9307f8a28a6654fb390d41c72ec627e005d0179d10138d92396365496ab8b8
 EBUILD haproxy-1.9.9999.ebuild 4889 BLAKE2B a40d2bf75ece4fcba6f0ac6e8bfcf81763ded4b315781183230a8b514f5931de4c383afbe8d4152f4d2d4d496fd2421f2f10d04e4240b52a7ab15f3c31bc0864 SHA512 2e132cd3018d845450a94857a544c0306a5cf0efe08d5102a7096a424355a4b628bf85c69f02f812577d134ebabef197aa2bb4ff6f5b8f8d3609d072a55af86e
diff --git a/net-proxy/haproxy/haproxy-1.8.14.ebuild b/net-proxy/haproxy/haproxy-1.8.14.ebuild
new file mode 100644
index 000000000000..5e9022d20eb6
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-1.8.14.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2018 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=(
+		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
+			emake -C contrib/${contrib} \
+				CFLAGS="${CFLAGS}" 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
+}