Gentoo Archives: gentoo-commits

From: Christian Ruppert <idl0r@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/
Date: Fri, 14 Feb 2020 15:00:55
Message-Id: 1581692432.f564c9ebf7cfa9d4fa4bfa668b3c27efa9245e9d.idl0r@gentoo
1 commit: f564c9ebf7cfa9d4fa4bfa668b3c27efa9245e9d
2 Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 14 14:53:56 2020 +0000
4 Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 14 15:00:32 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f564c9eb
7
8 net-proxy/haproxy: Version bump
9
10 Package-Manager: Portage-2.3.88, Repoman-2.3.20
11 Signed-off-by: Christian Ruppert <idl0r <AT> gentoo.org>
12
13 net-proxy/haproxy/Manifest | 1 +
14 net-proxy/haproxy/haproxy-2.1.3.ebuild | 176 +++++++++++++++++++++++++++++++++
15 2 files changed, 177 insertions(+)
16
17 diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
18 index b001679ac00..12c9624e976 100644
19 --- a/net-proxy/haproxy/Manifest
20 +++ b/net-proxy/haproxy/Manifest
21 @@ -6,3 +6,4 @@ DIST haproxy-1.9.13.tar.gz 2395999 BLAKE2B 1b54aa732e7972b151ea00d76c6dd152fd6e0
22 DIST haproxy-2.0.10.tar.gz 2557865 BLAKE2B 0e98fd2461414b4b55fc2bf100c80f17cbc34da2cae6d5c09fdbf708b4606f564c51bf54f77b98a2f455b61f31ac793fdc92873beb269dcbd15ea45379f0aca1 SHA512 d3f0c0a7cce49d394dda7553ed79102cfef2c21ea6d640fbc325246806c93d862cb48c40f4717d9e1b50b2390698466282fe8c4d8b305259e3057f3711e69a39
23 DIST haproxy-2.0.12.tar.gz 2634202 BLAKE2B 0f2ea426076cdda20b18f068e7a5f5e92045056115a057ac4785fb5ad528697e2ecfdc482c5291c28f803ee817b8cb569ed966fbcc2db886d70e3f897285ac3f SHA512 bc81a5f88278b56bddfec52dba5231a06567177fe806faeb5ffb1965d8c4731704e0b92949cc72de0b4738c8baad28c5211d46d1dc980c4145c90081fc2d838c
24 DIST haproxy-2.1.2.tar.gz 2663193 BLAKE2B ebe48e25fb636b71fc5d621d57822dfc6c6a530ae7e79aeec29a72631643158d99d69ff94cb056e834c8905cdb94dbc7375a9e465e93e9024c0f728e07caa249 SHA512 929d244a67f93337e3c791b1a29f9643ac288acdf0090dc7a05c72caf61c3b04ef376b84737351f0c54d58bca66ed8af18faa20ec3adc97067313732e0dfcd7d
25 +DIST haproxy-2.1.3.tar.gz 2675529 BLAKE2B be663fd629c001c1c91d6e3db5a8d940ed5ee674d5b886283284d2077ed8e0d13d295aeb376f6580131bdeb105c9d88f7afe367f2279d6c548d5888bd943e2b6 SHA512 4728c1177b2bba69465cbc56b1ed73a1b2d36891ba2d94d29bb49714ad98ccfac4b52947735aded211f0cd8070002f5406ddd77cabd2f8230b00438189dd7a60
26
27 diff --git a/net-proxy/haproxy/haproxy-2.1.3.ebuild b/net-proxy/haproxy/haproxy-2.1.3.ebuild
28 new file mode 100644
29 index 00000000000..9d63986726c
30 --- /dev/null
31 +++ b/net-proxy/haproxy/haproxy-2.1.3.ebuild
32 @@ -0,0 +1,176 @@
33 +# Copyright 1999-2020 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI="7"
37 +
38 +[[ ${PV} == *9999 ]] && SCM="git-r3"
39 +inherit user toolchain-funcs flag-o-matic systemd linux-info $SCM
40 +
41 +MY_P="${PN}-${PV/_beta/-dev}"
42 +
43 +DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
44 +HOMEPAGE="http://www.haproxy.org"
45 +if [[ ${PV} != *9999 ]]; then
46 + SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
47 + KEYWORDS="~amd64 ~arm ~ppc ~x86"
48 +else
49 + EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
50 + EGIT_BRANCH=master
51 +fi
52 +
53 +LICENSE="GPL-2 LGPL-2.1"
54 +SLOT="0"
55 +IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
56 +ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
57 +REQUIRED_USE="pcre-jit? ( pcre )
58 + pcre2-jit? ( pcre2 )
59 + pcre? ( !pcre2 )
60 + device-atlas? ( pcre )
61 + ?? ( slz zlib )"
62 +
63 +DEPEND="
64 + pcre? (
65 + dev-libs/libpcre
66 + pcre-jit? ( dev-libs/libpcre[jit] )
67 + )
68 + pcre2? (
69 + dev-libs/libpcre
70 + pcre2-jit? ( dev-libs/libpcre2[jit] )
71 + )
72 + ssl? (
73 + !libressl? ( dev-libs/openssl:0=[zlib?] )
74 + libressl? ( dev-libs/libressl:0= )
75 + )
76 + slz? ( dev-libs/libslz:= )
77 + zlib? ( sys-libs/zlib )
78 + lua? ( dev-lang/lua:5.3 )
79 + device-atlas? ( dev-libs/device-atlas-api-c )"
80 +RDEPEND="${DEPEND}"
81 +
82 +S="${WORKDIR}/${MY_P}"
83 +
84 +DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
85 +CONTRIBS=( halog iprange )
86 +# ip6range is present in 1.6, but broken.
87 +ver_test $PV -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
88 +# TODO: mod_defender - requires apache / APR, modsecurity - the same
89 +ver_test $PV -ge 1.8.0 && CONTRIBS+=( hpack )
90 +
91 +haproxy_use() {
92 + (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
93 +
94 + usex "${1}" "USE_${2}=1" "USE_${2}="
95 +}
96 +
97 +pkg_setup() {
98 + enewgroup haproxy
99 + enewuser haproxy -1 -1 -1 haproxy
100 +
101 + if use net_ns; then
102 + CONFIG_CHECK="~NET_NS"
103 + linux-info_pkg_setup
104 + fi
105 +}
106 +
107 +src_compile() {
108 + local -a args=(
109 + V=1
110 + TARGET=linux-glibc
111 + )
112 +
113 + # TODO: PCRE2_WIDTH?
114 + args+=( $(haproxy_use threads THREAD) )
115 + args+=( $(haproxy_use crypt LIBCRYPT) )
116 + args+=( $(haproxy_use net_ns NS) )
117 + args+=( $(haproxy_use pcre PCRE) )
118 + args+=( $(haproxy_use pcre-jit PCRE_JIT) )
119 + args+=( $(haproxy_use pcre2 PCRE2) )
120 + args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
121 + args+=( $(haproxy_use ssl OPENSSL) )
122 + args+=( $(haproxy_use slz SLZ) )
123 + args+=( $(haproxy_use zlib ZLIB) )
124 + args+=( $(haproxy_use lua LUA) )
125 + args+=( $(haproxy_use 51degrees 51DEGREES) )
126 + args+=( $(haproxy_use device-atlas DEVICEATLAS) )
127 + args+=( $(haproxy_use wurfl WURFL) )
128 + args+=( $(haproxy_use systemd SYSTEMD) )
129 +
130 + # For now, until the strict-aliasing breakage will be fixed
131 + append-cflags -fno-strict-aliasing
132 +
133 + if use prometheus-exporter; then
134 + EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
135 + fi
136 +
137 + # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
138 + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" ${args[@]}
139 + emake -C contrib/systemd SBINDIR=/usr/sbin
140 +
141 + if use tools ; then
142 + for contrib in ${CONTRIBS[@]} ; do
143 + # Those two includes are a workaround for hpack Makefile missing those
144 + emake -C contrib/${contrib} \
145 + CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
146 + done
147 + fi
148 +}
149 +
150 +src_install() {
151 + dosbin haproxy
152 + dosym ../sbin/haproxy /usr/bin/haproxy
153 +
154 + newconfd "${FILESDIR}/${PN}.confd" $PN
155 + newinitd "${FILESDIR}/${PN}.initd-r6" $PN
156 +
157 + doman doc/haproxy.1
158 +
159 + systemd_dounit contrib/systemd/haproxy.service
160 +
161 + einstalldocs
162 +
163 + # The errorfiles are used by upstream defaults.
164 + insinto /etc/haproxy/errors/
165 + doins examples/errorfiles/*
166 +
167 + if use doc; then
168 + dodoc ROADMAP doc/*.txt
169 + #if use lua; then
170 + # TODO: doc/lua-api/
171 + #fi
172 + fi
173 +
174 + if use tools ; then
175 + has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
176 + has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
177 + has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
178 + has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
179 + has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
180 + has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
181 + has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
182 + fi
183 +
184 + if use examples ; then
185 + docinto examples
186 + dodoc examples/*.cfg
187 + dodoc doc/seamless_reload.txt
188 + fi
189 +
190 + if use vim-syntax ; then
191 + insinto /usr/share/vim/vimfiles/syntax
192 + doins contrib/syntax-highlight/haproxy.vim
193 + fi
194 +}
195 +
196 +pkg_postinst() {
197 + if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
198 + ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
199 + ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
200 + ewarn "Make use of them with the \"user\" and \"group\" directives."
201 +
202 + if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
203 + einfo "Please consult the installed documentation for learning the configuration file's syntax."
204 + einfo "The documentation and sample configuration files are installed here:"
205 + einfo " ${EROOT}/usr/share/doc/${PF}"
206 + fi
207 + fi
208 +}