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