1 |
commit: 37dffd21ca217af7b98d19719fb09781d7238c84 |
2 |
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jun 1 11:13:55 2022 +0000 |
4 |
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 1 11:35:25 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37dffd21 |
7 |
|
8 |
net-proxy/haproxy: Get rid of 2.0.x |
9 |
|
10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
11 |
Signed-off-by: Christian Ruppert <idl0r <AT> gentoo.org> |
12 |
|
13 |
net-proxy/haproxy/Manifest | 3 - |
14 |
net-proxy/haproxy/haproxy-2.0.25.ebuild | 183 ------------------------------ |
15 |
net-proxy/haproxy/haproxy-2.0.27.ebuild | 183 ------------------------------ |
16 |
net-proxy/haproxy/haproxy-2.0.29.ebuild | 181 ----------------------------- |
17 |
net-proxy/haproxy/haproxy-2.0.9999.ebuild | 181 ----------------------------- |
18 |
5 files changed, 731 deletions(-) |
19 |
|
20 |
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest |
21 |
index d309f058249a..9078acef4d09 100644 |
22 |
--- a/net-proxy/haproxy/Manifest |
23 |
+++ b/net-proxy/haproxy/Manifest |
24 |
@@ -1,6 +1,3 @@ |
25 |
-DIST haproxy-2.0.25.tar.gz 2707840 BLAKE2B cd85d233623f2791bff8ada00d9ac4ea3743e2c1fbccd45a6fd56b7cc0ae5904619b50849a23576f0a6d21ae2798166acd41692d0311bcf361355dc6ee0da790 SHA512 2c238844a8c82f877d3039b20b76fd22717f95a4e5d94a0bfd501c6e134042ef744d3731fc0ccced0a94e5cb1c1822d3272ed961e07bd9acc4d637eba0529155 |
26 |
-DIST haproxy-2.0.27.tar.gz 2716937 BLAKE2B 08ab2905b26b8e33068af77f3a153dc489f509436451d2711f9929100ecebfbec9edd14b449c48739b1d20990431fa6a8b49e4fc98d32ade5c1688f72d310f63 SHA512 339a013cb11778ed444370ff1887b4db121947784bda08f818a39b98261d02a5ebeb681ef7040cbb0e493d89c5b8e2c5a32f0cdccf9e89a6327e9d95cc6d5891 |
27 |
-DIST haproxy-2.0.29.tar.gz 2722893 BLAKE2B 1f4763ef87c32cb93fcba58ad428938bf08295236d6cc7b81f2098a2a74d26d41af2bac70d9994c1108815caf58e37bcf6c84518c41514a8c8cce5fae60383c4 SHA512 e635a522d62fea040e996f0a518419c7d4a49e3770b2fc15a5cbf1aa98ccf42b8d698a9bf260ae6658bc4896510a8b056487af8f2cf023a1fc97172cc110f553 |
28 |
DIST haproxy-2.2.17.tar.gz 2933836 BLAKE2B 750d2c5048f994442d13c05ce6624731d296462951ee2e86110467d517a6708b498e98260a3f0770e110dc5c2cb2bdd746fb76f23ba7cebc1642b0b9c8124a67 SHA512 174197e1e0915a6ae6062b9a070f16102ac7f3429f991f36cdb2e2cce587bd26059bd1dc71a368f904bcdecd292ab5926715160400ae96d498d902aac356864f |
29 |
DIST haproxy-2.2.21.tar.gz 2947789 BLAKE2B 3462f0a67070bd61266cc67d7d419dfb9e209314982f2035bdce6b905f9fe567780669adc09905598a6129152dbb77416790976249076935fcb90e7e03767284 SHA512 2404bf0938b88c3249668bef1f13195973c5b1db8dc056ed9d5b882b8cdabf71076b73de723e8d3d0d953193294edea4acac5edeee8ac472e93ae0bd917bf99b |
30 |
DIST haproxy-2.2.24.tar.gz 2952103 BLAKE2B 4e795c06ed329619135d553210e70d1abf57e20a27e857ea26f003cd9fcebba2ea964581fa9d1f33067fb3faa7304806f3a598d2e2b0c08d6c1d4593ad01203c SHA512 021d065e53503248de122fdd9431786b9f375a5f87aca76f870e17e44c8c4001a778bfb4e430b28af781a3f175f3643a549e363e964210c717f212c5966e68d8 |
31 |
|
32 |
diff --git a/net-proxy/haproxy/haproxy-2.0.25.ebuild b/net-proxy/haproxy/haproxy-2.0.25.ebuild |
33 |
deleted file mode 100644 |
34 |
index 6009c169081c..000000000000 |
35 |
--- a/net-proxy/haproxy/haproxy-2.0.25.ebuild |
36 |
+++ /dev/null |
37 |
@@ -1,183 +0,0 @@ |
38 |
-# Copyright 1999-2022 Gentoo Authors |
39 |
-# Distributed under the terms of the GNU General Public License v2 |
40 |
- |
41 |
-EAPI="7" |
42 |
- |
43 |
-LUA_COMPAT=( lua5-3 ) |
44 |
- |
45 |
-[[ ${PV} == *9999 ]] && SCM="git-r3" |
46 |
-inherit toolchain-funcs flag-o-matic lua-single 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://www.haproxy.org" |
52 |
-if [[ ${PV} != *9999 ]]; then |
53 |
- SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz" |
54 |
- KEYWORDS="amd64 arm ppc x86" |
55 |
-else |
56 |
- EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/" |
57 |
- EGIT_BRANCH=master |
58 |
-fi |
59 |
- |
60 |
-LICENSE="GPL-2 LGPL-2.1" |
61 |
-SLOT="0/$(ver_cut 1-2)" |
62 |
-IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter |
63 |
-ssl systemd +threads tools vim-syntax +zlib lua 51degrees wurfl" |
64 |
-REQUIRED_USE="pcre-jit? ( pcre ) |
65 |
- pcre2-jit? ( pcre2 ) |
66 |
- pcre? ( !pcre2 ) |
67 |
- lua? ( ${LUA_REQUIRED_USE} ) |
68 |
- ?? ( slz zlib )" |
69 |
- |
70 |
-BDEPEND="virtual/pkgconfig" |
71 |
-DEPEND=" |
72 |
- crypt? ( virtual/libcrypt:= ) |
73 |
- pcre? ( |
74 |
- dev-libs/libpcre |
75 |
- pcre-jit? ( dev-libs/libpcre[jit] ) |
76 |
- ) |
77 |
- pcre2? ( |
78 |
- dev-libs/libpcre2:= |
79 |
- pcre2-jit? ( dev-libs/libpcre2:=[jit] ) |
80 |
- ) |
81 |
- ssl? ( |
82 |
- dev-libs/openssl:0= |
83 |
- ) |
84 |
- slz? ( dev-libs/libslz:= ) |
85 |
- systemd? ( sys-apps/systemd ) |
86 |
- zlib? ( sys-libs/zlib ) |
87 |
- lua? ( ${LUA_DEPS} )" |
88 |
-RDEPEND="${DEPEND} |
89 |
- acct-group/haproxy |
90 |
- acct-user/haproxy" |
91 |
- |
92 |
-S="${WORKDIR}/${MY_P}" |
93 |
- |
94 |
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) |
95 |
-CONTRIBS=( halog iprange ) |
96 |
-# ip6range is present in 1.6, but broken. |
97 |
-ver_test ${PV} -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop ) |
98 |
-# TODO: mod_defender - requires apache / APR, modsecurity - the same |
99 |
-ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack ) |
100 |
- |
101 |
-haproxy_use() { |
102 |
- (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>" |
103 |
- |
104 |
- usex "${1}" "USE_${2}=1" "USE_${2}=" |
105 |
-} |
106 |
- |
107 |
-pkg_setup() { |
108 |
- use lua && lua-single_pkg_setup |
109 |
- if use net_ns; then |
110 |
- CONFIG_CHECK="~NET_NS" |
111 |
- linux-info_pkg_setup |
112 |
- fi |
113 |
-} |
114 |
- |
115 |
-src_compile() { |
116 |
- local -a args=( |
117 |
- V=1 |
118 |
- TARGET=linux-glibc |
119 |
- ) |
120 |
- |
121 |
- # TODO: PCRE2_WIDTH? |
122 |
- args+=( $(haproxy_use threads THREAD) ) |
123 |
- args+=( $(haproxy_use crypt LIBCRYPT) ) |
124 |
- args+=( $(haproxy_use net_ns NS) ) |
125 |
- args+=( $(haproxy_use pcre PCRE) ) |
126 |
- args+=( $(haproxy_use pcre-jit PCRE_JIT) ) |
127 |
- args+=( $(haproxy_use pcre2 PCRE2) ) |
128 |
- args+=( $(haproxy_use pcre2-jit PCRE2_JIT) ) |
129 |
- args+=( $(haproxy_use ssl OPENSSL) ) |
130 |
- args+=( $(haproxy_use slz SLZ) ) |
131 |
- args+=( $(haproxy_use zlib ZLIB) ) |
132 |
- args+=( $(haproxy_use lua LUA) ) |
133 |
- args+=( $(haproxy_use 51degrees 51DEGREES) ) |
134 |
- args+=( $(haproxy_use wurfl WURFL) ) |
135 |
- args+=( $(haproxy_use systemd SYSTEMD) ) |
136 |
- |
137 |
- # For now, until the strict-aliasing breakage will be fixed |
138 |
- append-cflags -fno-strict-aliasing |
139 |
- |
140 |
- # Bug #668002 |
141 |
- if use ppc || use arm || use hppa; then |
142 |
- TARGET_LDFLAGS=-latomic |
143 |
- fi |
144 |
- |
145 |
- if use prometheus-exporter; then |
146 |
- EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" |
147 |
- fi |
148 |
- |
149 |
- # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing |
150 |
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]} |
151 |
- emake -C contrib/systemd SBINDIR=/usr/sbin |
152 |
- |
153 |
- if use tools ; then |
154 |
- for contrib in ${CONTRIBS[@]} ; do |
155 |
- # Those two includes are a workaround for hpack Makefile missing those |
156 |
- emake -C contrib/${contrib} \ |
157 |
- CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" ${args[@]} |
158 |
- done |
159 |
- fi |
160 |
-} |
161 |
- |
162 |
-src_install() { |
163 |
- dosbin haproxy |
164 |
- dosym ../sbin/haproxy /usr/bin/haproxy |
165 |
- |
166 |
- newconfd "${FILESDIR}/${PN}.confd" ${PN} |
167 |
- newinitd "${FILESDIR}/${PN}.initd-r6" ${PN} |
168 |
- |
169 |
- doman doc/haproxy.1 |
170 |
- |
171 |
- systemd_dounit contrib/systemd/haproxy.service |
172 |
- |
173 |
- einstalldocs |
174 |
- |
175 |
- # The errorfiles are used by upstream defaults. |
176 |
- insinto /etc/haproxy/errors/ |
177 |
- doins examples/errorfiles/* |
178 |
- |
179 |
- if use doc; then |
180 |
- dodoc ROADMAP doc/*.txt |
181 |
- #if use lua; then |
182 |
- # TODO: doc/lua-api/ |
183 |
- #fi |
184 |
- fi |
185 |
- |
186 |
- if use tools ; then |
187 |
- has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog |
188 |
- has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange |
189 |
- has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range |
190 |
- has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example |
191 |
- has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example |
192 |
- has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop |
193 |
- has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack |
194 |
- fi |
195 |
- |
196 |
- if use examples ; then |
197 |
- docinto examples |
198 |
- dodoc examples/*.cfg |
199 |
- dodoc doc/seamless_reload.txt |
200 |
- fi |
201 |
- |
202 |
- if use vim-syntax ; then |
203 |
- insinto /usr/share/vim/vimfiles/syntax |
204 |
- doins contrib/syntax-highlight/haproxy.vim |
205 |
- fi |
206 |
-} |
207 |
- |
208 |
-pkg_postinst() { |
209 |
- if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then |
210 |
- ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service." |
211 |
- ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created." |
212 |
- ewarn "Make use of them with the \"user\" and \"group\" directives." |
213 |
- |
214 |
- if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then |
215 |
- einfo "Please consult the installed documentation for learning the configuration file's syntax." |
216 |
- einfo "The documentation and sample configuration files are installed here:" |
217 |
- einfo " ${EROOT}/usr/share/doc/${PF}" |
218 |
- fi |
219 |
- fi |
220 |
-} |
221 |
|
222 |
diff --git a/net-proxy/haproxy/haproxy-2.0.27.ebuild b/net-proxy/haproxy/haproxy-2.0.27.ebuild |
223 |
deleted file mode 100644 |
224 |
index 75cceb7c91f7..000000000000 |
225 |
--- a/net-proxy/haproxy/haproxy-2.0.27.ebuild |
226 |
+++ /dev/null |
227 |
@@ -1,183 +0,0 @@ |
228 |
-# Copyright 1999-2022 Gentoo Authors |
229 |
-# Distributed under the terms of the GNU General Public License v2 |
230 |
- |
231 |
-EAPI="7" |
232 |
- |
233 |
-LUA_COMPAT=( lua5-3 ) |
234 |
- |
235 |
-[[ ${PV} == *9999 ]] && SCM="git-r3" |
236 |
-inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM} |
237 |
- |
238 |
-MY_P="${PN}-${PV/_beta/-dev}" |
239 |
- |
240 |
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments" |
241 |
-HOMEPAGE="http://www.haproxy.org" |
242 |
-if [[ ${PV} != *9999 ]]; then |
243 |
- SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz" |
244 |
- KEYWORDS="amd64 ~arm ~ppc x86" |
245 |
-else |
246 |
- EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/" |
247 |
- EGIT_BRANCH=master |
248 |
-fi |
249 |
- |
250 |
-LICENSE="GPL-2 LGPL-2.1" |
251 |
-SLOT="0/$(ver_cut 1-2)" |
252 |
-IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter |
253 |
-ssl systemd +threads tools vim-syntax +zlib lua 51degrees wurfl" |
254 |
-REQUIRED_USE="pcre-jit? ( pcre ) |
255 |
- pcre2-jit? ( pcre2 ) |
256 |
- pcre? ( !pcre2 ) |
257 |
- lua? ( ${LUA_REQUIRED_USE} ) |
258 |
- ?? ( slz zlib )" |
259 |
- |
260 |
-BDEPEND="virtual/pkgconfig" |
261 |
-DEPEND=" |
262 |
- crypt? ( virtual/libcrypt:= ) |
263 |
- pcre? ( |
264 |
- dev-libs/libpcre |
265 |
- pcre-jit? ( dev-libs/libpcre[jit] ) |
266 |
- ) |
267 |
- pcre2? ( |
268 |
- dev-libs/libpcre2:= |
269 |
- pcre2-jit? ( dev-libs/libpcre2:=[jit] ) |
270 |
- ) |
271 |
- ssl? ( |
272 |
- dev-libs/openssl:0= |
273 |
- ) |
274 |
- slz? ( dev-libs/libslz:= ) |
275 |
- systemd? ( sys-apps/systemd ) |
276 |
- zlib? ( sys-libs/zlib ) |
277 |
- lua? ( ${LUA_DEPS} )" |
278 |
-RDEPEND="${DEPEND} |
279 |
- acct-group/haproxy |
280 |
- acct-user/haproxy" |
281 |
- |
282 |
-S="${WORKDIR}/${MY_P}" |
283 |
- |
284 |
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) |
285 |
-CONTRIBS=( halog iprange ) |
286 |
-# ip6range is present in 1.6, but broken. |
287 |
-ver_test ${PV} -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop ) |
288 |
-# TODO: mod_defender - requires apache / APR, modsecurity - the same |
289 |
-ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack ) |
290 |
- |
291 |
-haproxy_use() { |
292 |
- (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>" |
293 |
- |
294 |
- usex "${1}" "USE_${2}=1" "USE_${2}=" |
295 |
-} |
296 |
- |
297 |
-pkg_setup() { |
298 |
- use lua && lua-single_pkg_setup |
299 |
- if use net_ns; then |
300 |
- CONFIG_CHECK="~NET_NS" |
301 |
- linux-info_pkg_setup |
302 |
- fi |
303 |
-} |
304 |
- |
305 |
-src_compile() { |
306 |
- local -a args=( |
307 |
- V=1 |
308 |
- TARGET=linux-glibc |
309 |
- ) |
310 |
- |
311 |
- # TODO: PCRE2_WIDTH? |
312 |
- args+=( $(haproxy_use threads THREAD) ) |
313 |
- args+=( $(haproxy_use crypt LIBCRYPT) ) |
314 |
- args+=( $(haproxy_use net_ns NS) ) |
315 |
- args+=( $(haproxy_use pcre PCRE) ) |
316 |
- args+=( $(haproxy_use pcre-jit PCRE_JIT) ) |
317 |
- args+=( $(haproxy_use pcre2 PCRE2) ) |
318 |
- args+=( $(haproxy_use pcre2-jit PCRE2_JIT) ) |
319 |
- args+=( $(haproxy_use ssl OPENSSL) ) |
320 |
- args+=( $(haproxy_use slz SLZ) ) |
321 |
- args+=( $(haproxy_use zlib ZLIB) ) |
322 |
- args+=( $(haproxy_use lua LUA) ) |
323 |
- args+=( $(haproxy_use 51degrees 51DEGREES) ) |
324 |
- args+=( $(haproxy_use wurfl WURFL) ) |
325 |
- args+=( $(haproxy_use systemd SYSTEMD) ) |
326 |
- |
327 |
- # For now, until the strict-aliasing breakage will be fixed |
328 |
- append-cflags -fno-strict-aliasing |
329 |
- |
330 |
- # Bug #668002 |
331 |
- if use ppc || use arm || use hppa; then |
332 |
- TARGET_LDFLAGS=-latomic |
333 |
- fi |
334 |
- |
335 |
- if use prometheus-exporter; then |
336 |
- EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" |
337 |
- fi |
338 |
- |
339 |
- # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing |
340 |
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]} |
341 |
- emake -C contrib/systemd SBINDIR=/usr/sbin |
342 |
- |
343 |
- if use tools ; then |
344 |
- for contrib in ${CONTRIBS[@]} ; do |
345 |
- # Those two includes are a workaround for hpack Makefile missing those |
346 |
- emake -C contrib/${contrib} \ |
347 |
- CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" ${args[@]} |
348 |
- done |
349 |
- fi |
350 |
-} |
351 |
- |
352 |
-src_install() { |
353 |
- dosbin haproxy |
354 |
- dosym ../sbin/haproxy /usr/bin/haproxy |
355 |
- |
356 |
- newconfd "${FILESDIR}/${PN}.confd" ${PN} |
357 |
- newinitd "${FILESDIR}/${PN}.initd-r6" ${PN} |
358 |
- |
359 |
- doman doc/haproxy.1 |
360 |
- |
361 |
- systemd_dounit contrib/systemd/haproxy.service |
362 |
- |
363 |
- einstalldocs |
364 |
- |
365 |
- # The errorfiles are used by upstream defaults. |
366 |
- insinto /etc/haproxy/errors/ |
367 |
- doins examples/errorfiles/* |
368 |
- |
369 |
- if use doc; then |
370 |
- dodoc ROADMAP doc/*.txt |
371 |
- #if use lua; then |
372 |
- # TODO: doc/lua-api/ |
373 |
- #fi |
374 |
- fi |
375 |
- |
376 |
- if use tools ; then |
377 |
- has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog |
378 |
- has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange |
379 |
- has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range |
380 |
- has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example |
381 |
- has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example |
382 |
- has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop |
383 |
- has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack |
384 |
- fi |
385 |
- |
386 |
- if use examples ; then |
387 |
- docinto examples |
388 |
- dodoc examples/*.cfg |
389 |
- dodoc doc/seamless_reload.txt |
390 |
- fi |
391 |
- |
392 |
- if use vim-syntax ; then |
393 |
- insinto /usr/share/vim/vimfiles/syntax |
394 |
- doins contrib/syntax-highlight/haproxy.vim |
395 |
- fi |
396 |
-} |
397 |
- |
398 |
-pkg_postinst() { |
399 |
- if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then |
400 |
- ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service." |
401 |
- ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created." |
402 |
- ewarn "Make use of them with the \"user\" and \"group\" directives." |
403 |
- |
404 |
- if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then |
405 |
- einfo "Please consult the installed documentation for learning the configuration file's syntax." |
406 |
- einfo "The documentation and sample configuration files are installed here:" |
407 |
- einfo " ${EROOT}/usr/share/doc/${PF}" |
408 |
- fi |
409 |
- fi |
410 |
-} |
411 |
|
412 |
diff --git a/net-proxy/haproxy/haproxy-2.0.29.ebuild b/net-proxy/haproxy/haproxy-2.0.29.ebuild |
413 |
deleted file mode 100644 |
414 |
index 4ec0188ead43..000000000000 |
415 |
--- a/net-proxy/haproxy/haproxy-2.0.29.ebuild |
416 |
+++ /dev/null |
417 |
@@ -1,181 +0,0 @@ |
418 |
-# Copyright 1999-2022 Gentoo Authors |
419 |
-# Distributed under the terms of the GNU General Public License v2 |
420 |
- |
421 |
-EAPI="7" |
422 |
- |
423 |
-LUA_COMPAT=( lua5-3 ) |
424 |
- |
425 |
-[[ ${PV} == *9999 ]] && SCM="git-r3" |
426 |
-inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM} |
427 |
- |
428 |
-MY_P="${PN}-${PV/_beta/-dev}" |
429 |
- |
430 |
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments" |
431 |
-HOMEPAGE="http://www.haproxy.org" |
432 |
-if [[ ${PV} != *9999 ]]; then |
433 |
- SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz" |
434 |
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" |
435 |
-elif [[ ${PV} == 9999 ]]; then |
436 |
- EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/" |
437 |
- EGIT_BRANCH=master |
438 |
-else |
439 |
- EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/" |
440 |
- EGIT_BRANCH=master |
441 |
-fi |
442 |
- |
443 |
-LICENSE="GPL-2 LGPL-2.1" |
444 |
-SLOT="0/$(ver_cut 1-2)" |
445 |
-IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit prometheus-exporter |
446 |
-ssl systemd +threads tools vim-syntax +zlib lua 51degrees wurfl" |
447 |
-REQUIRED_USE="pcre-jit? ( pcre ) |
448 |
- lua? ( ${LUA_REQUIRED_USE} ) |
449 |
- ?? ( slz zlib )" |
450 |
- |
451 |
-BDEPEND="virtual/pkgconfig" |
452 |
-DEPEND=" |
453 |
- crypt? ( virtual/libcrypt:= ) |
454 |
- pcre? ( |
455 |
- dev-libs/libpcre2:= |
456 |
- pcre-jit? ( dev-libs/libpcre2:=[jit] ) |
457 |
- ) |
458 |
- ssl? ( |
459 |
- dev-libs/openssl:0= |
460 |
- ) |
461 |
- slz? ( dev-libs/libslz:= ) |
462 |
- systemd? ( sys-apps/systemd ) |
463 |
- zlib? ( sys-libs/zlib ) |
464 |
- lua? ( ${LUA_DEPS} )" |
465 |
-RDEPEND="${DEPEND} |
466 |
- acct-group/haproxy |
467 |
- acct-user/haproxy" |
468 |
- |
469 |
-S="${WORKDIR}/${MY_P}" |
470 |
- |
471 |
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) |
472 |
-CONTRIBS=( halog iprange ) |
473 |
-# ip6range is present in 1.6, but broken. |
474 |
-ver_test ${PV} -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop ) |
475 |
-# TODO: mod_defender - requires apache / APR, modsecurity - the same |
476 |
-ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack ) |
477 |
- |
478 |
-haproxy_use() { |
479 |
- (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>" |
480 |
- |
481 |
- usex "${1}" "USE_${2}=1" "USE_${2}=" |
482 |
-} |
483 |
- |
484 |
-pkg_setup() { |
485 |
- use lua && lua-single_pkg_setup |
486 |
- if use net_ns; then |
487 |
- CONFIG_CHECK="~NET_NS" |
488 |
- linux-info_pkg_setup |
489 |
- fi |
490 |
-} |
491 |
- |
492 |
-src_compile() { |
493 |
- local -a args=( |
494 |
- V=1 |
495 |
- TARGET=linux-glibc |
496 |
- # Switching to PCRE2 by default, bug 838013 |
497 |
- PCRE= |
498 |
- PCRE_JIT= |
499 |
- ) |
500 |
- |
501 |
- # TODO: PCRE2_WIDTH? |
502 |
- args+=( $(haproxy_use threads THREAD) ) |
503 |
- args+=( $(haproxy_use crypt LIBCRYPT) ) |
504 |
- args+=( $(haproxy_use net_ns NS) ) |
505 |
- args+=( $(haproxy_use pcre PCRE2) ) |
506 |
- args+=( $(haproxy_use pcre-jit PCRE2_JIT) ) |
507 |
- args+=( $(haproxy_use ssl OPENSSL) ) |
508 |
- args+=( $(haproxy_use slz SLZ) ) |
509 |
- args+=( $(haproxy_use zlib ZLIB) ) |
510 |
- args+=( $(haproxy_use lua LUA) ) |
511 |
- args+=( $(haproxy_use 51degrees 51DEGREES) ) |
512 |
- args+=( $(haproxy_use wurfl WURFL) ) |
513 |
- args+=( $(haproxy_use systemd SYSTEMD) ) |
514 |
- |
515 |
- # For now, until the strict-aliasing breakage will be fixed |
516 |
- append-cflags -fno-strict-aliasing |
517 |
- |
518 |
- # Bug #668002 |
519 |
- if use ppc || use arm || use hppa; then |
520 |
- TARGET_LDFLAGS=-latomic |
521 |
- fi |
522 |
- |
523 |
- if use prometheus-exporter; then |
524 |
- EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" |
525 |
- fi |
526 |
- |
527 |
- # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing |
528 |
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]} |
529 |
- emake -C contrib/systemd SBINDIR=/usr/sbin |
530 |
- |
531 |
- if use tools ; then |
532 |
- for contrib in ${CONTRIBS[@]} ; do |
533 |
- # Those two includes are a workaround for hpack Makefile missing those |
534 |
- emake -C contrib/${contrib} \ |
535 |
- CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" ${args[@]} |
536 |
- done |
537 |
- fi |
538 |
-} |
539 |
- |
540 |
-src_install() { |
541 |
- dosbin haproxy |
542 |
- dosym ../sbin/haproxy /usr/bin/haproxy |
543 |
- |
544 |
- newconfd "${FILESDIR}/${PN}.confd" ${PN} |
545 |
- newinitd "${FILESDIR}/${PN}.initd-r7" ${PN} |
546 |
- |
547 |
- doman doc/haproxy.1 |
548 |
- |
549 |
- systemd_dounit contrib/systemd/haproxy.service |
550 |
- |
551 |
- einstalldocs |
552 |
- |
553 |
- # The errorfiles are used by upstream defaults. |
554 |
- insinto /etc/haproxy/errors/ |
555 |
- doins examples/errorfiles/* |
556 |
- |
557 |
- if use doc; then |
558 |
- dodoc ROADMAP doc/*.txt |
559 |
- #if use lua; then |
560 |
- # TODO: doc/lua-api/ |
561 |
- #fi |
562 |
- fi |
563 |
- |
564 |
- if use tools ; then |
565 |
- has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog |
566 |
- has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange |
567 |
- has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range |
568 |
- has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example |
569 |
- has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example |
570 |
- has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop |
571 |
- has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack |
572 |
- fi |
573 |
- |
574 |
- if use examples ; then |
575 |
- docinto examples |
576 |
- dodoc examples/*.cfg |
577 |
- dodoc doc/seamless_reload.txt |
578 |
- fi |
579 |
- |
580 |
- if use vim-syntax ; then |
581 |
- insinto /usr/share/vim/vimfiles/syntax |
582 |
- doins contrib/syntax-highlight/haproxy.vim |
583 |
- fi |
584 |
-} |
585 |
- |
586 |
-pkg_postinst() { |
587 |
- if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then |
588 |
- ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service." |
589 |
- ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created." |
590 |
- ewarn "Make use of them with the \"user\" and \"group\" directives." |
591 |
- |
592 |
- if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then |
593 |
- einfo "Please consult the installed documentation for learning the configuration file's syntax." |
594 |
- einfo "The documentation and sample configuration files are installed here:" |
595 |
- einfo " ${EROOT}/usr/share/doc/${PF}" |
596 |
- fi |
597 |
- fi |
598 |
-} |
599 |
|
600 |
diff --git a/net-proxy/haproxy/haproxy-2.0.9999.ebuild b/net-proxy/haproxy/haproxy-2.0.9999.ebuild |
601 |
deleted file mode 100644 |
602 |
index 4ec0188ead43..000000000000 |
603 |
--- a/net-proxy/haproxy/haproxy-2.0.9999.ebuild |
604 |
+++ /dev/null |
605 |
@@ -1,181 +0,0 @@ |
606 |
-# Copyright 1999-2022 Gentoo Authors |
607 |
-# Distributed under the terms of the GNU General Public License v2 |
608 |
- |
609 |
-EAPI="7" |
610 |
- |
611 |
-LUA_COMPAT=( lua5-3 ) |
612 |
- |
613 |
-[[ ${PV} == *9999 ]] && SCM="git-r3" |
614 |
-inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM} |
615 |
- |
616 |
-MY_P="${PN}-${PV/_beta/-dev}" |
617 |
- |
618 |
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments" |
619 |
-HOMEPAGE="http://www.haproxy.org" |
620 |
-if [[ ${PV} != *9999 ]]; then |
621 |
- SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz" |
622 |
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" |
623 |
-elif [[ ${PV} == 9999 ]]; then |
624 |
- EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/" |
625 |
- EGIT_BRANCH=master |
626 |
-else |
627 |
- EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/" |
628 |
- EGIT_BRANCH=master |
629 |
-fi |
630 |
- |
631 |
-LICENSE="GPL-2 LGPL-2.1" |
632 |
-SLOT="0/$(ver_cut 1-2)" |
633 |
-IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit prometheus-exporter |
634 |
-ssl systemd +threads tools vim-syntax +zlib lua 51degrees wurfl" |
635 |
-REQUIRED_USE="pcre-jit? ( pcre ) |
636 |
- lua? ( ${LUA_REQUIRED_USE} ) |
637 |
- ?? ( slz zlib )" |
638 |
- |
639 |
-BDEPEND="virtual/pkgconfig" |
640 |
-DEPEND=" |
641 |
- crypt? ( virtual/libcrypt:= ) |
642 |
- pcre? ( |
643 |
- dev-libs/libpcre2:= |
644 |
- pcre-jit? ( dev-libs/libpcre2:=[jit] ) |
645 |
- ) |
646 |
- ssl? ( |
647 |
- dev-libs/openssl:0= |
648 |
- ) |
649 |
- slz? ( dev-libs/libslz:= ) |
650 |
- systemd? ( sys-apps/systemd ) |
651 |
- zlib? ( sys-libs/zlib ) |
652 |
- lua? ( ${LUA_DEPS} )" |
653 |
-RDEPEND="${DEPEND} |
654 |
- acct-group/haproxy |
655 |
- acct-user/haproxy" |
656 |
- |
657 |
-S="${WORKDIR}/${MY_P}" |
658 |
- |
659 |
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) |
660 |
-CONTRIBS=( halog iprange ) |
661 |
-# ip6range is present in 1.6, but broken. |
662 |
-ver_test ${PV} -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop ) |
663 |
-# TODO: mod_defender - requires apache / APR, modsecurity - the same |
664 |
-ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack ) |
665 |
- |
666 |
-haproxy_use() { |
667 |
- (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>" |
668 |
- |
669 |
- usex "${1}" "USE_${2}=1" "USE_${2}=" |
670 |
-} |
671 |
- |
672 |
-pkg_setup() { |
673 |
- use lua && lua-single_pkg_setup |
674 |
- if use net_ns; then |
675 |
- CONFIG_CHECK="~NET_NS" |
676 |
- linux-info_pkg_setup |
677 |
- fi |
678 |
-} |
679 |
- |
680 |
-src_compile() { |
681 |
- local -a args=( |
682 |
- V=1 |
683 |
- TARGET=linux-glibc |
684 |
- # Switching to PCRE2 by default, bug 838013 |
685 |
- PCRE= |
686 |
- PCRE_JIT= |
687 |
- ) |
688 |
- |
689 |
- # TODO: PCRE2_WIDTH? |
690 |
- args+=( $(haproxy_use threads THREAD) ) |
691 |
- args+=( $(haproxy_use crypt LIBCRYPT) ) |
692 |
- args+=( $(haproxy_use net_ns NS) ) |
693 |
- args+=( $(haproxy_use pcre PCRE2) ) |
694 |
- args+=( $(haproxy_use pcre-jit PCRE2_JIT) ) |
695 |
- args+=( $(haproxy_use ssl OPENSSL) ) |
696 |
- args+=( $(haproxy_use slz SLZ) ) |
697 |
- args+=( $(haproxy_use zlib ZLIB) ) |
698 |
- args+=( $(haproxy_use lua LUA) ) |
699 |
- args+=( $(haproxy_use 51degrees 51DEGREES) ) |
700 |
- args+=( $(haproxy_use wurfl WURFL) ) |
701 |
- args+=( $(haproxy_use systemd SYSTEMD) ) |
702 |
- |
703 |
- # For now, until the strict-aliasing breakage will be fixed |
704 |
- append-cflags -fno-strict-aliasing |
705 |
- |
706 |
- # Bug #668002 |
707 |
- if use ppc || use arm || use hppa; then |
708 |
- TARGET_LDFLAGS=-latomic |
709 |
- fi |
710 |
- |
711 |
- if use prometheus-exporter; then |
712 |
- EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" |
713 |
- fi |
714 |
- |
715 |
- # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing |
716 |
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]} |
717 |
- emake -C contrib/systemd SBINDIR=/usr/sbin |
718 |
- |
719 |
- if use tools ; then |
720 |
- for contrib in ${CONTRIBS[@]} ; do |
721 |
- # Those two includes are a workaround for hpack Makefile missing those |
722 |
- emake -C contrib/${contrib} \ |
723 |
- CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" ${args[@]} |
724 |
- done |
725 |
- fi |
726 |
-} |
727 |
- |
728 |
-src_install() { |
729 |
- dosbin haproxy |
730 |
- dosym ../sbin/haproxy /usr/bin/haproxy |
731 |
- |
732 |
- newconfd "${FILESDIR}/${PN}.confd" ${PN} |
733 |
- newinitd "${FILESDIR}/${PN}.initd-r7" ${PN} |
734 |
- |
735 |
- doman doc/haproxy.1 |
736 |
- |
737 |
- systemd_dounit contrib/systemd/haproxy.service |
738 |
- |
739 |
- einstalldocs |
740 |
- |
741 |
- # The errorfiles are used by upstream defaults. |
742 |
- insinto /etc/haproxy/errors/ |
743 |
- doins examples/errorfiles/* |
744 |
- |
745 |
- if use doc; then |
746 |
- dodoc ROADMAP doc/*.txt |
747 |
- #if use lua; then |
748 |
- # TODO: doc/lua-api/ |
749 |
- #fi |
750 |
- fi |
751 |
- |
752 |
- if use tools ; then |
753 |
- has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog |
754 |
- has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange |
755 |
- has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range |
756 |
- has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example |
757 |
- has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example |
758 |
- has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop |
759 |
- has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack |
760 |
- fi |
761 |
- |
762 |
- if use examples ; then |
763 |
- docinto examples |
764 |
- dodoc examples/*.cfg |
765 |
- dodoc doc/seamless_reload.txt |
766 |
- fi |
767 |
- |
768 |
- if use vim-syntax ; then |
769 |
- insinto /usr/share/vim/vimfiles/syntax |
770 |
- doins contrib/syntax-highlight/haproxy.vim |
771 |
- fi |
772 |
-} |
773 |
- |
774 |
-pkg_postinst() { |
775 |
- if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then |
776 |
- ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service." |
777 |
- ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created." |
778 |
- ewarn "Make use of them with the \"user\" and \"group\" directives." |
779 |
- |
780 |
- if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then |
781 |
- einfo "Please consult the installed documentation for learning the configuration file's syntax." |
782 |
- einfo "The documentation and sample configuration files are installed here:" |
783 |
- einfo " ${EROOT}/usr/share/doc/${PF}" |
784 |
- fi |
785 |
- fi |
786 |
-} |