1 |
commit: 0ae54e439483dd6bc6568c563a26c6780602559d |
2 |
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Oct 5 09:13:10 2020 +0000 |
4 |
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 5 09:16:31 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ae54e43 |
7 |
|
8 |
net-proxy/haproxy: Cleanup + Bumps |
9 |
|
10 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
11 |
Signed-off-by: Christian Ruppert <idl0r <AT> gentoo.org> |
12 |
|
13 |
net-proxy/haproxy/Manifest | 8 +- |
14 |
net-proxy/haproxy/haproxy-1.8.25-r1.ebuild | 169 ------------------- |
15 |
...haproxy-2.0.15.ebuild => haproxy-2.0.18.ebuild} | 0 |
16 |
...{haproxy-2.0.16.ebuild => haproxy-2.1.9.ebuild} | 0 |
17 |
net-proxy/haproxy/haproxy-2.2.1.ebuild | 180 --------------------- |
18 |
.../{haproxy-2.1.7.ebuild => haproxy-2.2.4.ebuild} | 0 |
19 |
6 files changed, 3 insertions(+), 354 deletions(-) |
20 |
|
21 |
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest |
22 |
index 652cf61f733..b08156c53ec 100644 |
23 |
--- a/net-proxy/haproxy/Manifest |
24 |
+++ b/net-proxy/haproxy/Manifest |
25 |
@@ -1,12 +1,10 @@ |
26 |
-DIST haproxy-1.8.25.tar.gz 2184002 BLAKE2B d6ea39af0109eee679d87dde258038bbb38ccf12796b2e6a7172067fce6bd0f10485e2a3d89ca5b3596529db4e34d511bbb194b019c7403703cb636573b0438d SHA512 655eb4056989a3fee321ea9278a2085b0a999e522293f1f6229ebb8d17f3d33cb78abb4fd55a06d0218082e632b2d42de105575d0acd0c1b49996d4b45aa78e8 |
27 |
DIST haproxy-1.8.26.tar.gz 2205531 BLAKE2B 87aaeb3df6668752ec9242bda86b9b28339ad6926ee3ad16c606239693daa0d957271a76e270bf7d2d64102024121d4e9c1458da0f2e1d9bb8188856c0f68949 SHA512 a88f1fab0c234140e949ca12a87a09d7be1e0888bf2022a19c971727af08e579e3e6318d87411772915df6d73880710e6afdab842b622b6c0fa02020fa5c9425 |
28 |
DIST haproxy-2.0.14.tar.gz 2651320 BLAKE2B dd5aed78e52b3d3dd295f3883d45adf8795efac93cf6c23fbe39be031f29d19adad0afb400e8041281413f4570bc074f06d9cd88bee672789311e56f57b258d0 SHA512 6b63b713a1009eff59a2622fa93462deb8794c910685840f142711a61be88ea228c7cb2ec7ca50bba0803288625e1a65b2d2f87ffbcedfd23debfbbbb5d96993 |
29 |
-DIST haproxy-2.0.15.tar.gz 2672167 BLAKE2B 19ffa210a95800e20f5aecbf0a2a99fb977003ba08de4604264ad5d51bcacf51f1898d7c782bfab08653aaf30b706e190fa1caabda1e1a8bd4638c69bae14308 SHA512 cf856b62f0d2e295ebca727e543eab0d91a8188c7ee6ec81f7d42b92b93678996ef05909cfd1d7aeab83208b6a2fc0a20c28a54d119fbbdf20451fc6a7343016 |
30 |
-DIST haproxy-2.0.16.tar.gz 2675207 BLAKE2B 0fd26967e20e52ae7be3c6013f3cf49f84e2370fc8eda98acdbd27570579a203f2f123a1d7b2187e23e9897fb40085aaa6420b343dc1abcf2b490df65dbf2401 SHA512 7b634b292fc72aa41d4ba94bef27cfc975c5aeb549d178b2fc24ac5d29a7b92313e218330be70e10294f758e35cf44658f527f5be2fe187bb2e9a7a7116ff381 |
31 |
DIST haproxy-2.0.17.tar.gz 2676783 BLAKE2B ee17afdf3b34bc28fe810746709ef5cb07cbcc3d7508ab13349f67b59584dfd53d6f2f926615b87095b6f130560a529c480957d62e2943bc0936e1b905896fa9 SHA512 edcd061534ef9a6d7eab9692dccbb22fb7a3bf145cbf555646763c0fd72f7f13d41482744072286327a48951397a11822f1708b26be24b7bc5a327f516ca8816 |
32 |
+DIST haproxy-2.0.18.tar.gz 2679168 BLAKE2B dbc591223f640524bc898b5c2261c4092ddee0b245fcf96ea0ccccab45fdbdadb2880b870ced6141b6325ad5bb7765951d15b0325d3343bea7e90a138db0c68b SHA512 67245c375541b6004667831aaecb38e59429363f45f24fd0c4c36a28fa59dc24d66fe54b093e6b52d6029b6de8b3c86cda19e15f5f438119669bca9d70d4c0a3 |
33 |
DIST haproxy-2.1.4.tar.gz 2684568 BLAKE2B 0618e069e6cf6fd20eb9fad0cfcb5ca1714d4001a794e20ce60d812741f4f65d44088c46599e4181cb79536566a940d748030552d0bd010ba14d1552cf7156f4 SHA512 fd029ac1ec877fa89a9410944439b66795b1392b6c8416aaa7978943170530c3826ba50ea706366f3f7785b7cffed58497cb362fc2480dd6920a99af4f920d98 |
34 |
-DIST haproxy-2.1.7.tar.gz 2709999 BLAKE2B 74f6fb687d2e8d793773046e3a0919051b52eba0c4a91570ad3c6cf798b66daddaecf173c686d8474deb655d67524d7640753e1f5643cc4af4c339f3104d49bb SHA512 d3338f128042f40e2969094a614eb840b1bf7409efa4f85aed7f45411af8532d2f2371436902e7b987b661580f9c21439fc027a65bb2d352cb86711a26545adb |
35 |
DIST haproxy-2.1.8.tar.gz 2715203 BLAKE2B fdf0896c8ee7a10268f422058f5a75c2b245da1bffed765dc618f24d18c95704724022f229b82e8df0cf2220dd3b9aa295825a7a6087009123841bead071974f SHA512 6aaf1822e88189344dadc0ab64ccba3268a913a8676a375039cbe5447d5f54957668b23f1314bf68f97c195400f5817a08dd898318368075f73c1a2cca366a78 |
36 |
+DIST haproxy-2.1.9.tar.gz 2720185 BLAKE2B bdc93093f0bd7b7652376dfb65f5ea373c6420e53c0180ee07c644fe26bcf3c4fb2724624ce5f68504ca89b9c82f52de47a7da42e88e7ee3dc72b9780fab9d69 SHA512 acd0a4f49f67ceba4474223fab098b3f65897f9863bc91bc84af3f78945ad925cf12b2a261ccc4839f0b059557537899879a3929f05c6bb42b025bdb444f345a |
37 |
DIST haproxy-2.2.0.tar.gz 2866916 BLAKE2B 176234efefee72beb1b46e7e8bb2455edc4135323b834a73870e30ca7a439b24cbb62568cb2aacd9d6b4d5c2234ebe7524de119a3ac2ec1c1f701de03a174933 SHA512 25cff09acba29ba36f045d45f894d26a13eea3e71c3e1f868446e739eed1fcfee8fc4af8da2914eef7ecbfe266a498f931cc6ec6c3e73b8874c140618269f480 |
38 |
-DIST haproxy-2.2.1.tar.gz 2868436 BLAKE2B 042718186a3b95d506b2fae54db4fa9b03c2f33806ac8392b4465d38a60cf86c9a41b4872286672754d91ad3634c7886a65b96cd3198a82c242ad2b531dd2998 SHA512 2a08003f55c1ec3bda5cad475ca6c3a62f6d6f87fbaaf42facd8bc5579548f8d972124283740e9728b832b38ea87e61a94d8b9685351a68e5ea1f1000deab32b |
39 |
DIST haproxy-2.2.3.tar.gz 2872195 BLAKE2B 266375aeca17ea0053956d3fd8a4077da70e308501042b67433722f0ed2efbc85438d8cd7a6d7c7a3184349ff6cf6ed5ae90d05a150b6fda1077400f0769d75a SHA512 db99a5069537b6a3f161ad0a32ed884e81e27ed471d7c5f74b0655580c3eb1248376c5b252a9b998bead4fc5c05f28fda9e2280b8b05447bc5bc2d3c8fb55825 |
40 |
+DIST haproxy-2.2.4.tar.gz 2874180 BLAKE2B c53da911f09a5b35ae97709691754aceed09b01dffa27ee69368d26f552c1b87d149477ad8ab0410564e5ef1d520c91e069b36a9f3a5588a8cf9feb3139f9181 SHA512 762b51fdb9609654155ea2feebeb640bdd817481f633f012d767e1481bf888b90790455f0305ea9bbd0aec8363561d183bd510029f1bcce95102328ffbaf8afd |
41 |
|
42 |
diff --git a/net-proxy/haproxy/haproxy-1.8.25-r1.ebuild b/net-proxy/haproxy/haproxy-1.8.25-r1.ebuild |
43 |
deleted file mode 100644 |
44 |
index 2c5c63d0d07..00000000000 |
45 |
--- a/net-proxy/haproxy/haproxy-1.8.25-r1.ebuild |
46 |
+++ /dev/null |
47 |
@@ -1,169 +0,0 @@ |
48 |
-# Copyright 1999-2020 Gentoo Authors |
49 |
-# Distributed under the terms of the GNU General Public License v2 |
50 |
- |
51 |
-EAPI="7" |
52 |
- |
53 |
-[[ ${PV} == *9999 ]] && SCM="git-r3" |
54 |
-inherit toolchain-funcs flag-o-matic systemd linux-info $SCM |
55 |
- |
56 |
-MY_P="${PN}-${PV/_beta/-dev}" |
57 |
- |
58 |
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments" |
59 |
-HOMEPAGE="http://www.haproxy.org" |
60 |
-if [[ ${PV} != *9999 ]]; then |
61 |
- SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz" |
62 |
- KEYWORDS="~amd64 ~arm ~ppc ~x86" |
63 |
-else |
64 |
- EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/" |
65 |
- EGIT_BRANCH=master |
66 |
-fi |
67 |
- |
68 |
-LICENSE="GPL-2 LGPL-2.1" |
69 |
-SLOT="0" |
70 |
-IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl |
71 |
-systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl" |
72 |
-REQUIRED_USE="pcre-jit? ( pcre ) |
73 |
- pcre2-jit? ( pcre2 ) |
74 |
- pcre? ( !pcre2 ) |
75 |
- device-atlas? ( pcre ) |
76 |
- ?? ( slz zlib )" |
77 |
- |
78 |
-DEPEND=" |
79 |
- pcre? ( |
80 |
- dev-libs/libpcre |
81 |
- pcre-jit? ( dev-libs/libpcre[jit] ) |
82 |
- ) |
83 |
- pcre2? ( |
84 |
- dev-libs/libpcre |
85 |
- pcre2-jit? ( dev-libs/libpcre2[jit] ) |
86 |
- ) |
87 |
- ssl? ( |
88 |
- !libressl? ( dev-libs/openssl:0=[zlib?] ) |
89 |
- libressl? ( dev-libs/libressl:0= ) |
90 |
- ) |
91 |
- slz? ( dev-libs/libslz:= ) |
92 |
- zlib? ( sys-libs/zlib ) |
93 |
- lua? ( dev-lang/lua:5.3 ) |
94 |
- device-atlas? ( dev-libs/device-atlas-api-c )" |
95 |
-RDEPEND="${DEPEND} |
96 |
- acct-group/haproxy |
97 |
- acct-user/haproxy" |
98 |
- |
99 |
-S="${WORKDIR}/${MY_P}" |
100 |
- |
101 |
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) |
102 |
-CONTRIBS=( halog iprange ) |
103 |
-# ip6range is present in 1.6, but broken. |
104 |
-ver_test $PV -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop ) |
105 |
-# TODO: mod_defender - requires apache / APR, modsecurity - the same |
106 |
-ver_test $PV -ge 1.8.0 && CONTRIBS+=( hpack ) |
107 |
- |
108 |
-haproxy_use() { |
109 |
- (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>" |
110 |
- |
111 |
- usex "${1}" "USE_${2}=1" "USE_${2}=" |
112 |
-} |
113 |
- |
114 |
-pkg_setup() { |
115 |
- if use net_ns; then |
116 |
- CONFIG_CHECK="~NET_NS" |
117 |
- linux-info_pkg_setup |
118 |
- fi |
119 |
-} |
120 |
- |
121 |
-src_compile() { |
122 |
- local -a args=( |
123 |
- V=1 |
124 |
- TARGET=linux2628 |
125 |
- USE_GETADDRINFO=1 |
126 |
- USE_TFO=1 |
127 |
- ) |
128 |
- |
129 |
- # TODO: PCRE2_WIDTH? |
130 |
- args+=( $(haproxy_use threads THREAD) ) |
131 |
- args+=( $(haproxy_use crypt LIBCRYPT) ) |
132 |
- args+=( $(haproxy_use net_ns NS) ) |
133 |
- args+=( $(haproxy_use pcre PCRE) ) |
134 |
- args+=( $(haproxy_use pcre-jit PCRE_JIT) ) |
135 |
- args+=( $(haproxy_use ssl OPENSSL) ) |
136 |
- args+=( $(haproxy_use slz SLZ) ) |
137 |
- args+=( $(haproxy_use zlib ZLIB) ) |
138 |
- args+=( $(haproxy_use lua LUA) ) |
139 |
- args+=( $(haproxy_use 51degrees 51DEGREES) ) |
140 |
- args+=( $(haproxy_use device-atlas DEVICEATLAS) ) |
141 |
- args+=( $(haproxy_use wurfl WURFL) ) |
142 |
- args+=( $(haproxy_use systemd SYSTEMD) ) |
143 |
- |
144 |
- # For now, until the strict-aliasing breakage will be fixed |
145 |
- append-cflags -fno-strict-aliasing |
146 |
- |
147 |
- emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} |
148 |
- emake -C contrib/systemd SBINDIR=/usr/sbin |
149 |
- |
150 |
- if use tools ; then |
151 |
- for contrib in ${CONTRIBS[@]} ; do |
152 |
- emake -C contrib/${contrib} \ |
153 |
- CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} |
154 |
- done |
155 |
- fi |
156 |
-} |
157 |
- |
158 |
-src_install() { |
159 |
- dosbin haproxy |
160 |
- dosym ../sbin/haproxy /usr/bin/haproxy |
161 |
- |
162 |
- newconfd "${FILESDIR}/${PN}.confd" $PN |
163 |
- newinitd "${FILESDIR}/${PN}.initd-r6" $PN |
164 |
- |
165 |
- doman doc/haproxy.1 |
166 |
- |
167 |
- systemd_dounit contrib/systemd/haproxy.service |
168 |
- |
169 |
- einstalldocs |
170 |
- |
171 |
- # The errorfiles are used by upstream defaults. |
172 |
- insinto /etc/haproxy/errors/ |
173 |
- doins examples/errorfiles/* |
174 |
- |
175 |
- if use doc; then |
176 |
- dodoc ROADMAP doc/*.txt |
177 |
- #if use lua; then |
178 |
- # TODO: doc/lua-api/ |
179 |
- #fi |
180 |
- fi |
181 |
- |
182 |
- if use tools ; then |
183 |
- has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog |
184 |
- has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange |
185 |
- has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range |
186 |
- has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example |
187 |
- has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example |
188 |
- has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop |
189 |
- has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack |
190 |
- fi |
191 |
- |
192 |
- if use examples ; then |
193 |
- docinto examples |
194 |
- dodoc examples/*.cfg |
195 |
- dodoc examples/seamless_reload.txt |
196 |
- fi |
197 |
- |
198 |
- if use vim-syntax ; then |
199 |
- insinto /usr/share/vim/vimfiles/syntax |
200 |
- doins examples/haproxy.vim |
201 |
- fi |
202 |
-} |
203 |
- |
204 |
-pkg_postinst() { |
205 |
- if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then |
206 |
- ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service." |
207 |
- ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created." |
208 |
- ewarn "Make use of them with the \"user\" and \"group\" directives." |
209 |
- |
210 |
- if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then |
211 |
- einfo "Please consult the installed documentation for learning the configuration file's syntax." |
212 |
- einfo "The documentation and sample configuration files are installed here:" |
213 |
- einfo " ${EROOT}/usr/share/doc/${PF}" |
214 |
- fi |
215 |
- fi |
216 |
-} |
217 |
|
218 |
diff --git a/net-proxy/haproxy/haproxy-2.0.15.ebuild b/net-proxy/haproxy/haproxy-2.0.18.ebuild |
219 |
similarity index 100% |
220 |
rename from net-proxy/haproxy/haproxy-2.0.15.ebuild |
221 |
rename to net-proxy/haproxy/haproxy-2.0.18.ebuild |
222 |
|
223 |
diff --git a/net-proxy/haproxy/haproxy-2.0.16.ebuild b/net-proxy/haproxy/haproxy-2.1.9.ebuild |
224 |
similarity index 100% |
225 |
rename from net-proxy/haproxy/haproxy-2.0.16.ebuild |
226 |
rename to net-proxy/haproxy/haproxy-2.1.9.ebuild |
227 |
|
228 |
diff --git a/net-proxy/haproxy/haproxy-2.2.1.ebuild b/net-proxy/haproxy/haproxy-2.2.1.ebuild |
229 |
deleted file mode 100644 |
230 |
index d1c45681b56..00000000000 |
231 |
--- a/net-proxy/haproxy/haproxy-2.2.1.ebuild |
232 |
+++ /dev/null |
233 |
@@ -1,180 +0,0 @@ |
234 |
-# Copyright 1999-2020 Gentoo Authors |
235 |
-# Distributed under the terms of the GNU General Public License v2 |
236 |
- |
237 |
-EAPI="7" |
238 |
- |
239 |
-[[ ${PV} == *9999 ]] && SCM="git-r3" |
240 |
-inherit toolchain-funcs flag-o-matic systemd linux-info $SCM |
241 |
- |
242 |
-MY_P="${PN}-${PV/_beta/-dev}" |
243 |
- |
244 |
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments" |
245 |
-HOMEPAGE="http://www.haproxy.org" |
246 |
-if [[ ${PV} != *9999 ]]; then |
247 |
- SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz" |
248 |
- KEYWORDS="~amd64 ~arm ~ppc ~x86" |
249 |
-else |
250 |
- EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/" |
251 |
- EGIT_BRANCH=master |
252 |
-fi |
253 |
- |
254 |
-LICENSE="GPL-2 LGPL-2.1" |
255 |
-SLOT="0" |
256 |
-IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter |
257 |
-ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl" |
258 |
-REQUIRED_USE="pcre-jit? ( pcre ) |
259 |
- pcre2-jit? ( pcre2 ) |
260 |
- pcre? ( !pcre2 ) |
261 |
- device-atlas? ( pcre ) |
262 |
- ?? ( slz zlib )" |
263 |
- |
264 |
-DEPEND=" |
265 |
- pcre? ( |
266 |
- dev-libs/libpcre |
267 |
- pcre-jit? ( dev-libs/libpcre[jit] ) |
268 |
- ) |
269 |
- pcre2? ( |
270 |
- dev-libs/libpcre |
271 |
- pcre2-jit? ( dev-libs/libpcre2[jit] ) |
272 |
- ) |
273 |
- ssl? ( |
274 |
- !libressl? ( dev-libs/openssl:0=[zlib?] ) |
275 |
- libressl? ( dev-libs/libressl:0= ) |
276 |
- ) |
277 |
- slz? ( dev-libs/libslz:= ) |
278 |
- zlib? ( sys-libs/zlib ) |
279 |
- lua? ( dev-lang/lua:5.3 ) |
280 |
- device-atlas? ( dev-libs/device-atlas-api-c )" |
281 |
-RDEPEND="${DEPEND} |
282 |
- acct-group/haproxy |
283 |
- acct-user/haproxy" |
284 |
- |
285 |
-S="${WORKDIR}/${MY_P}" |
286 |
- |
287 |
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) |
288 |
-CONTRIBS=( halog iprange ) |
289 |
-# ip6range is present in 1.6, but broken. |
290 |
-ver_test $PV -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop ) |
291 |
-# TODO: mod_defender - requires apache / APR, modsecurity - the same |
292 |
-ver_test $PV -ge 1.8.0 && CONTRIBS+=( hpack ) |
293 |
- |
294 |
-haproxy_use() { |
295 |
- (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>" |
296 |
- |
297 |
- usex "${1}" "USE_${2}=1" "USE_${2}=" |
298 |
-} |
299 |
- |
300 |
-pkg_setup() { |
301 |
- if use net_ns; then |
302 |
- CONFIG_CHECK="~NET_NS" |
303 |
- linux-info_pkg_setup |
304 |
- fi |
305 |
-} |
306 |
- |
307 |
-src_compile() { |
308 |
- local -a args=( |
309 |
- V=1 |
310 |
- TARGET=linux-glibc |
311 |
- ) |
312 |
- |
313 |
- # TODO: PCRE2_WIDTH? |
314 |
- args+=( $(haproxy_use threads THREAD) ) |
315 |
- args+=( $(haproxy_use crypt LIBCRYPT) ) |
316 |
- args+=( $(haproxy_use net_ns NS) ) |
317 |
- args+=( $(haproxy_use pcre PCRE) ) |
318 |
- args+=( $(haproxy_use pcre-jit PCRE_JIT) ) |
319 |
- args+=( $(haproxy_use pcre2 PCRE2) ) |
320 |
- args+=( $(haproxy_use pcre2-jit PCRE2_JIT) ) |
321 |
- args+=( $(haproxy_use ssl OPENSSL) ) |
322 |
- args+=( $(haproxy_use slz SLZ) ) |
323 |
- args+=( $(haproxy_use zlib ZLIB) ) |
324 |
- args+=( $(haproxy_use lua LUA) ) |
325 |
- args+=( $(haproxy_use 51degrees 51DEGREES) ) |
326 |
- args+=( $(haproxy_use device-atlas DEVICEATLAS) ) |
327 |
- args+=( $(haproxy_use wurfl WURFL) ) |
328 |
- args+=( $(haproxy_use systemd SYSTEMD) ) |
329 |
- |
330 |
- # For now, until the strict-aliasing breakage will be fixed |
331 |
- append-cflags -fno-strict-aliasing |
332 |
- |
333 |
- # Bug #668002 |
334 |
- if use ppc || use arm || use hppa; then |
335 |
- TARGET_LDFLAGS=-latomic |
336 |
- fi |
337 |
- |
338 |
- if use prometheus-exporter; then |
339 |
- EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" |
340 |
- fi |
341 |
- |
342 |
- # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing |
343 |
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]} |
344 |
- emake -C contrib/systemd SBINDIR=/usr/sbin |
345 |
- |
346 |
- if use tools ; then |
347 |
- for contrib in ${CONTRIBS[@]} ; do |
348 |
- # Those two includes are a workaround for hpack Makefile missing those |
349 |
- emake -C contrib/${contrib} \ |
350 |
- CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} |
351 |
- done |
352 |
- fi |
353 |
-} |
354 |
- |
355 |
-src_install() { |
356 |
- dosbin haproxy |
357 |
- dosym ../sbin/haproxy /usr/bin/haproxy |
358 |
- |
359 |
- newconfd "${FILESDIR}/${PN}.confd" $PN |
360 |
- newinitd "${FILESDIR}/${PN}.initd-r6" $PN |
361 |
- |
362 |
- doman doc/haproxy.1 |
363 |
- |
364 |
- systemd_dounit contrib/systemd/haproxy.service |
365 |
- |
366 |
- einstalldocs |
367 |
- |
368 |
- # The errorfiles are used by upstream defaults. |
369 |
- insinto /etc/haproxy/errors/ |
370 |
- doins examples/errorfiles/* |
371 |
- |
372 |
- if use doc; then |
373 |
- dodoc ROADMAP doc/*.txt |
374 |
- #if use lua; then |
375 |
- # TODO: doc/lua-api/ |
376 |
- #fi |
377 |
- fi |
378 |
- |
379 |
- if use tools ; then |
380 |
- has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog |
381 |
- has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange |
382 |
- has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range |
383 |
- has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example |
384 |
- has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example |
385 |
- has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop |
386 |
- has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack |
387 |
- fi |
388 |
- |
389 |
- if use examples ; then |
390 |
- docinto examples |
391 |
- dodoc examples/*.cfg |
392 |
- dodoc doc/seamless_reload.txt |
393 |
- fi |
394 |
- |
395 |
- if use vim-syntax ; then |
396 |
- insinto /usr/share/vim/vimfiles/syntax |
397 |
- doins contrib/syntax-highlight/haproxy.vim |
398 |
- fi |
399 |
-} |
400 |
- |
401 |
-pkg_postinst() { |
402 |
- if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then |
403 |
- ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service." |
404 |
- ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created." |
405 |
- ewarn "Make use of them with the \"user\" and \"group\" directives." |
406 |
- |
407 |
- if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then |
408 |
- einfo "Please consult the installed documentation for learning the configuration file's syntax." |
409 |
- einfo "The documentation and sample configuration files are installed here:" |
410 |
- einfo " ${EROOT}/usr/share/doc/${PF}" |
411 |
- fi |
412 |
- fi |
413 |
-} |
414 |
|
415 |
diff --git a/net-proxy/haproxy/haproxy-2.1.7.ebuild b/net-proxy/haproxy/haproxy-2.2.4.ebuild |
416 |
similarity index 100% |
417 |
rename from net-proxy/haproxy/haproxy-2.1.7.ebuild |
418 |
rename to net-proxy/haproxy/haproxy-2.2.4.ebuild |