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: Tue, 29 Oct 2019 08:11:21
Message-Id: 1572336668.3c374917e574ece1a08b65298bf1bf881bf4f7cc.idl0r@gentoo
1 commit: 3c374917e574ece1a08b65298bf1bf881bf4f7cc
2 Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
3 AuthorDate: Tue Oct 29 08:11:06 2019 +0000
4 Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 29 08:11:08 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c374917
7
8 net-proxy/haproxy: Cleanup
9
10 Package-Manager: Portage-2.3.76, Repoman-2.3.17
11 Signed-off-by: Christian Ruppert <idl0r <AT> gentoo.org>
12
13 net-proxy/haproxy/Manifest | 5 +-
14 net-proxy/haproxy/haproxy-1.6.14.ebuild | 158 -------------------
15 ...haproxy-1.7.11.ebuild => haproxy-1.7.12.ebuild} | 2 +-
16 net-proxy/haproxy/haproxy-1.8.20.ebuild | 169 ---------------------
17 net-proxy/haproxy/haproxy-1.8.21.ebuild | 169 ---------------------
18 5 files changed, 2 insertions(+), 501 deletions(-)
19
20 diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
21 index 6762cf18180..6a6f619000a 100644
22 --- a/net-proxy/haproxy/Manifest
23 +++ b/net-proxy/haproxy/Manifest
24 @@ -1,11 +1,8 @@
25 DIST haproxy-1.6.11.tar.gz 1574029 BLAKE2B 553f74c2c24a1b07cef2acc6fbc4def1bbe81e41a7b01ba44937c6ff2e14c1f1a4f1472dde229ecef1ed3170f4e89d356324cb2ce1e7d7064837f37fbd4c3b46 SHA512 73ff1c7301197b3bd75a3b1355787419676854d132ce2dcdacb2a296e297dcdfc52b0c571a4fb715e369f1126e1a58196fabb21f828c880f15904032da78e434
26 -DIST haproxy-1.6.14.tar.gz 1583859 BLAKE2B 91695f0b3d901ba70b6bce6572c2f549479c28010ed391b20faae7cd1fd84cdb181e560353337eb9230e38ac2570673725884c131501820c3ef4559ef12f95f2 SHA512 389be3935d901af1fb3a748b5bf73a454578a3ca3e4cc0b881980c2f1e875c47feb2681b42f8d9244d70777261a965c8e47cf5175b7790ff995bff8333902a11
27 DIST haproxy-1.6.15.tar.gz 1589782 BLAKE2B d65684b75c9577644d88a2ca17bf90f5cb845ca8c4c149ddf95a06b0ad2d25bb6a457c4c380c6cae4745bac2c00ec49cdb89df60ba8704965239cb0f2951670a SHA512 fd50c8451a357494a7c767347d1d9d957e07664e2388f3f8f0d492823e6d974d55b9f8699bd98c8d37d9829e4180c395569d0d7a4da2dc3c0f4849607598e9c0
28 DIST haproxy-1.7.10.tar.gz 1750937 BLAKE2B 26d970862e415b079d4130fd00564677584a7aad74d6812cabed36de9a629321330434b7d4fdf7c2e8b2945b7f394ca33e444158e7fa9b49937db501ea33e78a SHA512 ca6c50848c559ee2ffb9af2d281c3931473dd90d1686d95d962cf604cd92d2feb2b63e006e217cf9078cf08fdd73dc523318c97e13400bc0ef325de47111394e
29 -DIST haproxy-1.7.11.tar.gz 1752129 BLAKE2B 1947ab837f6b81761eec931e97c7349462561abecc78b2b58b285ebb4b0ae498753d236f3a243d3b5c1115a9ff6e5fe9392d428314a6342e2c1907d6886e09e4 SHA512 48ee30a1057e92971c041b088b6aef16d6843da9ecee9b738aaa64bb55d3c3b0be090a37bb5fc63ac42fe34ce994820349cc770756136c823051039fa6d01f74
30 +DIST haproxy-1.7.12.tar.gz 1760527 BLAKE2B da46b21140c242eda7df09a91d2f6fd88912e62aa0c316cd3cd6a7726be96cd9b579b3c908ec5aabec6a3e98a77e2b40f930c0e491e806ba2c1c857e5676fabc SHA512 66c099ff3057e5a18e0ac6155382cc208fe583a215ae530541056eb634e5c30062558ce182360772684c403b6574b5f02f900d90c847ffc5f6a823c41bfb7766
31 DIST haproxy-1.8.13.tar.gz 2063046 BLAKE2B 9ebccf2520719cdf209bc9a87bf28d015b5b673e0d017d5387af4025f930ac401f6a2cfa851583ffe6b6645b7b91ad255bb5db737688a1f310958072a11c8a80 SHA512 54d4cb0721a3868267d7e085b3d3bb050384e4279eb49e88abb925bb3ea8cc39ef9069bdc99b7b18a23fd22e0d29e24dfcb8a0507ddca9243a845e4418be9cc5
32 -DIST haproxy-1.8.20.tar.gz 2083917 BLAKE2B a73e01bacd6c3d256f92bba3dc5f1d38feea686d92d9ba2d93c33c082b10f84e0f150b3ce3e98cddaa664443c3661220f2993fea2d52bc3d6c32d5c913e70471 SHA512 c288ccf223da71a29ae0f08f3c9753002735816229ea83ca497d46c860fb8a4bd422077a94652aa475e48aefb78787979cdce7f1bd0b5919dc671ba25212c133
33 -DIST haproxy-1.8.21.tar.gz 2097089 BLAKE2B 359dba31685d4213721deb7bd553f2e037b960522e6b7727af45b87f4161b52bd02f47e5337e8003e5ae78dfcf1b0de1626af55dc1d177e98608c5d9799e8756 SHA512 a5244146150fd0e6d00eab3b1be0b778a242b393d72b09033d8edd99c434c4c8a25c326bf639ca7f7f7387a5cecd5033bd6e7159eca4c6dc18b580e893d2d274
34 DIST haproxy-1.8.22.tar.gz 2100471 BLAKE2B cb42d01bd61d457c1c8ea2372073d424a4a37058843d7b8acd1c28f36449f88328ed3536b71c9f2b7cb4e3663910311378c93ee4353c1c5b74a2abb9793048cf SHA512 fd017288e9bd21fe2568f0fb2bdd90daa2e2bf72ef0d6fda123280cdbd1edff1b928c90ccd641eb00416b908321f5d146b293871d67fc4666377e46a214fabee
35 DIST haproxy-1.8.9.tar.gz 2057051 BLAKE2B d81d18f68a27ae8a77660c1ecb1dfc28599263ebfd57f25ea574af2b101b35eb7a1a89ba4034b55dfa89673ae6ac4c0dca5428b4b494a02184b1b157850ce96b SHA512 e59c29af3a39d6212f012ae8341b169436e10e42fadaf8f1aa68d2bb7ee181fd1fe3b74640bfcd8c37c17dfc5062b36bd69d90290d7c59cd3e4648ef2ab1c8dd
36 DIST haproxy-1.9.10.tar.gz 2386066 BLAKE2B 4dea3f42686cd41d9f6f6849c42f9cf604b26f33925747ec5311243117bcf51729d16e5c09c5eb2cfc9fea88cf49c976a0542dcd90ddee4016b467de699e8bdc SHA512 b204c91633949d20dd06c29c69d2c783134819493f132430aaedddd2aad74eac08da7de7ddc1c45b250446273c35b268ab37fcb3b98eaa6b97b6caf5530ed628
37
38 diff --git a/net-proxy/haproxy/haproxy-1.6.14.ebuild b/net-proxy/haproxy/haproxy-1.6.14.ebuild
39 deleted file mode 100644
40 index 236fc4ec8bd..00000000000
41 --- a/net-proxy/haproxy/haproxy-1.6.14.ebuild
42 +++ /dev/null
43 @@ -1,158 +0,0 @@
44 -# Copyright 1999-2018 Gentoo Foundation
45 -# Distributed under the terms of the GNU General Public License v2
46 -
47 -EAPI="6"
48 -
49 -[[ ${PV} == *9999 ]] && SCM="git-r3"
50 -inherit user versionator toolchain-funcs flag-o-matic systemd linux-info $SCM
51 -
52 -MY_P="${PN}-${PV/_beta/-dev}"
53 -
54 -DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
55 -HOMEPAGE="http://haproxy.1wt.eu"
56 -if [[ ${PV} != *9999 ]]; then
57 - SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
58 - KEYWORDS="~amd64 ~arm ~ppc ~x86"
59 -else
60 - EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/"
61 - EGIT_BRANCH=master
62 -fi
63 -
64 -LICENSE="GPL-2 LGPL-2.1"
65 -SLOT="0"
66 -IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
67 -REQUIRED_USE="pcre-jit? ( pcre )
68 - ?? ( slz zlib )"
69 -
70 -DEPEND="
71 - pcre? (
72 - dev-libs/libpcre
73 - pcre-jit? ( dev-libs/libpcre[jit] )
74 - )
75 - ssl? (
76 - !libressl? ( dev-libs/openssl:0=[zlib?] )
77 - libressl? ( dev-libs/libressl:0= )
78 - )
79 - slz? ( dev-libs/libslz:= )
80 - zlib? ( sys-libs/zlib )
81 - lua? ( dev-lang/lua:5.3 )
82 - device-atlas? ( dev-libs/device-atlas-api-c )"
83 -RDEPEND="${DEPEND}"
84 -
85 -S="${WORKDIR}/${MY_P}"
86 -
87 -DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
88 -version_is_at_least 1.7.0 $PV && PATCHES=( "${FILESDIR}"/haproxy-1.7-contrib.patch )
89 -CONTRIBS=( halog iprange )
90 -# ip6range is present in 1.6, but broken.
91 -version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )
92 -
93 -haproxy_use() {
94 - (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
95 -
96 - usex "${1}" "USE_${2}=1" "USE_${2}="
97 -}
98 -
99 -pkg_setup() {
100 - enewgroup haproxy
101 - enewuser haproxy -1 -1 -1 haproxy
102 -
103 - if use net_ns; then
104 - CONFIG_CHECK="~NET_NS"
105 - linux-info_pkg_setup
106 - fi
107 -}
108 -
109 -src_compile() {
110 - local -a args=(
111 - TARGET=linux2628
112 - USE_GETADDRINFO=1
113 - USE_TFO=1
114 - )
115 -
116 - args+=( $(haproxy_use crypt LIBCRYPT) )
117 - args+=( $(haproxy_use net_ns NS) )
118 - args+=( $(haproxy_use pcre PCRE) )
119 - args+=( $(haproxy_use pcre-jit PCRE_JIT) )
120 - args+=( $(haproxy_use ssl OPENSSL) )
121 - args+=( $(haproxy_use slz SLZ) )
122 - args+=( $(haproxy_use zlib ZLIB) )
123 - args+=( $(haproxy_use lua LUA) )
124 - args+=( $(haproxy_use 51degrees 51DEGREES) )
125 - args+=( $(haproxy_use device-atlas DEVICEATLAS) )
126 - args+=( $(haproxy_use wurfl WURFL) )
127 -
128 - # For now, until the strict-aliasing breakage will be fixed
129 - append-cflags -fno-strict-aliasing
130 -
131 - emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
132 - emake -C contrib/systemd SBINDIR=/usr/sbin
133 -
134 - if use tools ; then
135 - for contrib in ${CONTRIBS[@]} ; do
136 - emake -C contrib/${contrib} \
137 - CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
138 - done
139 - fi
140 -}
141 -
142 -src_install() {
143 - dosbin haproxy
144 - dosym /usr/sbin/haproxy /usr/bin/haproxy
145 -
146 - newconfd "${FILESDIR}/${PN}.confd" $PN
147 - newinitd "${FILESDIR}/${PN}.initd-r6" $PN
148 -
149 - doman doc/haproxy.1
150 -
151 - dosbin haproxy-systemd-wrapper
152 - dosym /usr/sbin/haproxy-systemd-wrapper /usr/bin/haproxy-systemd-wrapper
153 - systemd_dounit contrib/systemd/haproxy.service
154 -
155 - einstalldocs
156 -
157 - # The errorfiles are used by upstream defaults.
158 - insinto /etc/haproxy/errors/
159 - doins examples/errorfiles/*
160 -
161 - if use doc; then
162 - dodoc ROADMAP doc/*.txt
163 - #if use lua; then
164 - # TODO: doc/lua-api/
165 - #fi
166 - fi
167 -
168 - if use tools ; then
169 - has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
170 - has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
171 - has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
172 - has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
173 - has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
174 - has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
175 - fi
176 -
177 - if use examples ; then
178 - docinto examples
179 - dodoc examples/*.cfg
180 - dodoc examples/seamless_reload.txt
181 - fi
182 -
183 - if use vim-syntax ; then
184 - insinto /usr/share/vim/vimfiles/syntax
185 - doins examples/haproxy.vim
186 - fi
187 -}
188 -
189 -pkg_postinst() {
190 - if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
191 - ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
192 - ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
193 - ewarn "Make use of them with the \"user\" and \"group\" directives."
194 -
195 - if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
196 - einfo "Please consult the installed documentation for learning the configuration file's syntax."
197 - einfo "The documentation and sample configuration files are installed here:"
198 - einfo " ${EROOT}usr/share/doc/${PF}"
199 - fi
200 - fi
201 -}
202
203 diff --git a/net-proxy/haproxy/haproxy-1.7.11.ebuild b/net-proxy/haproxy/haproxy-1.7.12.ebuild
204 similarity index 99%
205 rename from net-proxy/haproxy/haproxy-1.7.11.ebuild
206 rename to net-proxy/haproxy/haproxy-1.7.12.ebuild
207 index 38e5fbe7304..0b2ddea1094 100644
208 --- a/net-proxy/haproxy/haproxy-1.7.11.ebuild
209 +++ b/net-proxy/haproxy/haproxy-1.7.12.ebuild
210 @@ -1,4 +1,4 @@
211 -# Copyright 1999-2018 Gentoo Foundation
212 +# Copyright 1999-2019 Gentoo Authors
213 # Distributed under the terms of the GNU General Public License v2
214
215 EAPI="6"
216
217 diff --git a/net-proxy/haproxy/haproxy-1.8.20.ebuild b/net-proxy/haproxy/haproxy-1.8.20.ebuild
218 deleted file mode 100644
219 index be9a23a9cd2..00000000000
220 --- a/net-proxy/haproxy/haproxy-1.8.20.ebuild
221 +++ /dev/null
222 @@ -1,169 +0,0 @@
223 -# Copyright 1999-2019 Gentoo Authors
224 -# Distributed under the terms of the GNU General Public License v2
225 -
226 -EAPI="6"
227 -
228 -[[ ${PV} == *9999 ]] && SCM="git-r3"
229 -inherit user versionator toolchain-funcs flag-o-matic systemd linux-info $SCM
230 -
231 -MY_P="${PN}-${PV/_beta/-dev}"
232 -
233 -DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
234 -HOMEPAGE="http://www.haproxy.org"
235 -if [[ ${PV} != *9999 ]]; then
236 - SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
237 - KEYWORDS="~amd64 ~arm ~ppc ~x86"
238 -else
239 - EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/"
240 - EGIT_BRANCH=master
241 -fi
242 -
243 -LICENSE="GPL-2 LGPL-2.1"
244 -SLOT="0"
245 -IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl
246 -systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
247 -REQUIRED_USE="pcre-jit? ( pcre )
248 - pcre2-jit? ( pcre2 )
249 - pcre? ( !pcre2 )
250 - device-atlas? ( pcre )
251 - ?? ( slz zlib )"
252 -
253 -DEPEND="
254 - pcre? (
255 - dev-libs/libpcre
256 - pcre-jit? ( dev-libs/libpcre[jit] )
257 - )
258 - pcre2? (
259 - dev-libs/libpcre
260 - pcre2-jit? ( dev-libs/libpcre2[jit] )
261 - )
262 - ssl? (
263 - !libressl? ( dev-libs/openssl:0=[zlib?] )
264 - libressl? ( dev-libs/libressl:0= )
265 - )
266 - slz? ( dev-libs/libslz:= )
267 - zlib? ( sys-libs/zlib )
268 - lua? ( dev-lang/lua:5.3 )
269 - device-atlas? ( dev-libs/device-atlas-api-c )"
270 -RDEPEND="${DEPEND}"
271 -
272 -S="${WORKDIR}/${MY_P}"
273 -
274 -DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
275 -CONTRIBS=( halog iprange )
276 -# ip6range is present in 1.6, but broken.
277 -version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )
278 -# TODO: mod_defender - requires apache / APR, modsecurity - the same
279 -version_is_at_least 1.8.0 $PV && CONTRIBS+=( hpack )
280 -
281 -haproxy_use() {
282 - (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
283 -
284 - usex "${1}" "USE_${2}=1" "USE_${2}="
285 -}
286 -
287 -pkg_setup() {
288 - enewgroup haproxy
289 - enewuser haproxy -1 -1 -1 haproxy
290 -
291 - if use net_ns; then
292 - CONFIG_CHECK="~NET_NS"
293 - linux-info_pkg_setup
294 - fi
295 -}
296 -
297 -src_compile() {
298 - local -a args=(
299 - TARGET=linux2628
300 - USE_GETADDRINFO=1
301 - USE_TFO=1
302 - )
303 -
304 - # TODO: PCRE2_WIDTH?
305 - args+=( $(haproxy_use threads THREAD) )
306 - args+=( $(haproxy_use crypt LIBCRYPT) )
307 - args+=( $(haproxy_use net_ns NS) )
308 - args+=( $(haproxy_use pcre PCRE) )
309 - args+=( $(haproxy_use pcre-jit PCRE_JIT) )
310 - args+=( $(haproxy_use ssl OPENSSL) )
311 - args+=( $(haproxy_use slz SLZ) )
312 - args+=( $(haproxy_use zlib ZLIB) )
313 - args+=( $(haproxy_use lua LUA) )
314 - args+=( $(haproxy_use 51degrees 51DEGREES) )
315 - args+=( $(haproxy_use device-atlas DEVICEATLAS) )
316 - args+=( $(haproxy_use wurfl WURFL) )
317 - args+=( $(haproxy_use systemd SYSTEMD) )
318 -
319 - # For now, until the strict-aliasing breakage will be fixed
320 - append-cflags -fno-strict-aliasing
321 -
322 - emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
323 - emake -C contrib/systemd SBINDIR=/usr/sbin
324 -
325 - if use tools ; then
326 - for contrib in ${CONTRIBS[@]} ; do
327 - emake -C contrib/${contrib} \
328 - CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
329 - done
330 - fi
331 -}
332 -
333 -src_install() {
334 - dosbin haproxy
335 - dosym ../sbin/haproxy /usr/bin/haproxy
336 -
337 - newconfd "${FILESDIR}/${PN}.confd" $PN
338 - newinitd "${FILESDIR}/${PN}.initd-r6" $PN
339 -
340 - doman doc/haproxy.1
341 -
342 - systemd_dounit contrib/systemd/haproxy.service
343 -
344 - einstalldocs
345 -
346 - # The errorfiles are used by upstream defaults.
347 - insinto /etc/haproxy/errors/
348 - doins examples/errorfiles/*
349 -
350 - if use doc; then
351 - dodoc ROADMAP doc/*.txt
352 - #if use lua; then
353 - # TODO: doc/lua-api/
354 - #fi
355 - fi
356 -
357 - if use tools ; then
358 - has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
359 - has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
360 - has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
361 - has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
362 - has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
363 - has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
364 - has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
365 - fi
366 -
367 - if use examples ; then
368 - docinto examples
369 - dodoc examples/*.cfg
370 - dodoc examples/seamless_reload.txt
371 - fi
372 -
373 - if use vim-syntax ; then
374 - insinto /usr/share/vim/vimfiles/syntax
375 - doins examples/haproxy.vim
376 - fi
377 -}
378 -
379 -pkg_postinst() {
380 - if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
381 - ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
382 - ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
383 - ewarn "Make use of them with the \"user\" and \"group\" directives."
384 -
385 - if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
386 - einfo "Please consult the installed documentation for learning the configuration file's syntax."
387 - einfo "The documentation and sample configuration files are installed here:"
388 - einfo " ${EROOT}usr/share/doc/${PF}"
389 - fi
390 - fi
391 -}
392
393 diff --git a/net-proxy/haproxy/haproxy-1.8.21.ebuild b/net-proxy/haproxy/haproxy-1.8.21.ebuild
394 deleted file mode 100644
395 index be9a23a9cd2..00000000000
396 --- a/net-proxy/haproxy/haproxy-1.8.21.ebuild
397 +++ /dev/null
398 @@ -1,169 +0,0 @@
399 -# Copyright 1999-2019 Gentoo Authors
400 -# Distributed under the terms of the GNU General Public License v2
401 -
402 -EAPI="6"
403 -
404 -[[ ${PV} == *9999 ]] && SCM="git-r3"
405 -inherit user versionator toolchain-funcs flag-o-matic systemd linux-info $SCM
406 -
407 -MY_P="${PN}-${PV/_beta/-dev}"
408 -
409 -DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
410 -HOMEPAGE="http://www.haproxy.org"
411 -if [[ ${PV} != *9999 ]]; then
412 - SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
413 - KEYWORDS="~amd64 ~arm ~ppc ~x86"
414 -else
415 - EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/"
416 - EGIT_BRANCH=master
417 -fi
418 -
419 -LICENSE="GPL-2 LGPL-2.1"
420 -SLOT="0"
421 -IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl
422 -systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
423 -REQUIRED_USE="pcre-jit? ( pcre )
424 - pcre2-jit? ( pcre2 )
425 - pcre? ( !pcre2 )
426 - device-atlas? ( pcre )
427 - ?? ( slz zlib )"
428 -
429 -DEPEND="
430 - pcre? (
431 - dev-libs/libpcre
432 - pcre-jit? ( dev-libs/libpcre[jit] )
433 - )
434 - pcre2? (
435 - dev-libs/libpcre
436 - pcre2-jit? ( dev-libs/libpcre2[jit] )
437 - )
438 - ssl? (
439 - !libressl? ( dev-libs/openssl:0=[zlib?] )
440 - libressl? ( dev-libs/libressl:0= )
441 - )
442 - slz? ( dev-libs/libslz:= )
443 - zlib? ( sys-libs/zlib )
444 - lua? ( dev-lang/lua:5.3 )
445 - device-atlas? ( dev-libs/device-atlas-api-c )"
446 -RDEPEND="${DEPEND}"
447 -
448 -S="${WORKDIR}/${MY_P}"
449 -
450 -DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
451 -CONTRIBS=( halog iprange )
452 -# ip6range is present in 1.6, but broken.
453 -version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )
454 -# TODO: mod_defender - requires apache / APR, modsecurity - the same
455 -version_is_at_least 1.8.0 $PV && CONTRIBS+=( hpack )
456 -
457 -haproxy_use() {
458 - (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
459 -
460 - usex "${1}" "USE_${2}=1" "USE_${2}="
461 -}
462 -
463 -pkg_setup() {
464 - enewgroup haproxy
465 - enewuser haproxy -1 -1 -1 haproxy
466 -
467 - if use net_ns; then
468 - CONFIG_CHECK="~NET_NS"
469 - linux-info_pkg_setup
470 - fi
471 -}
472 -
473 -src_compile() {
474 - local -a args=(
475 - TARGET=linux2628
476 - USE_GETADDRINFO=1
477 - USE_TFO=1
478 - )
479 -
480 - # TODO: PCRE2_WIDTH?
481 - args+=( $(haproxy_use threads THREAD) )
482 - args+=( $(haproxy_use crypt LIBCRYPT) )
483 - args+=( $(haproxy_use net_ns NS) )
484 - args+=( $(haproxy_use pcre PCRE) )
485 - args+=( $(haproxy_use pcre-jit PCRE_JIT) )
486 - args+=( $(haproxy_use ssl OPENSSL) )
487 - args+=( $(haproxy_use slz SLZ) )
488 - args+=( $(haproxy_use zlib ZLIB) )
489 - args+=( $(haproxy_use lua LUA) )
490 - args+=( $(haproxy_use 51degrees 51DEGREES) )
491 - args+=( $(haproxy_use device-atlas DEVICEATLAS) )
492 - args+=( $(haproxy_use wurfl WURFL) )
493 - args+=( $(haproxy_use systemd SYSTEMD) )
494 -
495 - # For now, until the strict-aliasing breakage will be fixed
496 - append-cflags -fno-strict-aliasing
497 -
498 - emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
499 - emake -C contrib/systemd SBINDIR=/usr/sbin
500 -
501 - if use tools ; then
502 - for contrib in ${CONTRIBS[@]} ; do
503 - emake -C contrib/${contrib} \
504 - CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
505 - done
506 - fi
507 -}
508 -
509 -src_install() {
510 - dosbin haproxy
511 - dosym ../sbin/haproxy /usr/bin/haproxy
512 -
513 - newconfd "${FILESDIR}/${PN}.confd" $PN
514 - newinitd "${FILESDIR}/${PN}.initd-r6" $PN
515 -
516 - doman doc/haproxy.1
517 -
518 - systemd_dounit contrib/systemd/haproxy.service
519 -
520 - einstalldocs
521 -
522 - # The errorfiles are used by upstream defaults.
523 - insinto /etc/haproxy/errors/
524 - doins examples/errorfiles/*
525 -
526 - if use doc; then
527 - dodoc ROADMAP doc/*.txt
528 - #if use lua; then
529 - # TODO: doc/lua-api/
530 - #fi
531 - fi
532 -
533 - if use tools ; then
534 - has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
535 - has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
536 - has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
537 - has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
538 - has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
539 - has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
540 - has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
541 - fi
542 -
543 - if use examples ; then
544 - docinto examples
545 - dodoc examples/*.cfg
546 - dodoc examples/seamless_reload.txt
547 - fi
548 -
549 - if use vim-syntax ; then
550 - insinto /usr/share/vim/vimfiles/syntax
551 - doins examples/haproxy.vim
552 - fi
553 -}
554 -
555 -pkg_postinst() {
556 - if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
557 - ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
558 - ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
559 - ewarn "Make use of them with the \"user\" and \"group\" directives."
560 -
561 - if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
562 - einfo "Please consult the installed documentation for learning the configuration file's syntax."
563 - einfo "The documentation and sample configuration files are installed here:"
564 - einfo " ${EROOT}usr/share/doc/${PF}"
565 - fi
566 - fi
567 -}