1 |
commit: 686e611e17545717c3a6d6ab4c69fb9077f437c1 |
2 |
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 8 08:36:29 2021 +0000 |
4 |
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 8 08:36:42 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=686e611e |
7 |
|
8 |
net-proxy/haproxy: Version bumps + cleanup |
9 |
|
10 |
Package-Manager: Portage-3.0.13, Repoman-3.0.2 |
11 |
Signed-off-by: Christian Ruppert <idl0r <AT> gentoo.org> |
12 |
|
13 |
net-proxy/haproxy/Manifest | 7 +- |
14 |
net-proxy/haproxy/haproxy-1.8.27-r1.ebuild | 169 ------------------- |
15 |
net-proxy/haproxy/haproxy-2.1.10-r1.ebuild | 180 -------------------- |
16 |
net-proxy/haproxy/haproxy-2.2.6-r1.ebuild | 181 --------------------- |
17 |
...proxy-2.0.19-r1.ebuild => haproxy-2.2.9.ebuild} | 2 +- |
18 |
...aproxy-2.3.2-r1.ebuild => haproxy-2.3.5.ebuild} | 3 +- |
19 |
6 files changed, 4 insertions(+), 538 deletions(-) |
20 |
|
21 |
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest |
22 |
index 3c3f9976aea..5aa510035db 100644 |
23 |
--- a/net-proxy/haproxy/Manifest |
24 |
+++ b/net-proxy/haproxy/Manifest |
25 |
@@ -1,13 +1,10 @@ |
26 |
-DIST haproxy-1.8.27.tar.gz 2209243 BLAKE2B 31d83f41fd5e8f77ec28a7c168661c7e8a24b51890cbc8336fd45668b031fca87a3533c9f78ee18302394e54e58b89786300a32506dadf0d7275c84e62b0f395 SHA512 d8b36787ea75cb3a8332b1b95fc154d6e83a52ffd91548d1d0bacab62a069d3c05e859e2e40ddb65c1a37d0a30cc6a29a07c8260ce69413a3e80c83b4143dd8a |
27 |
DIST haproxy-1.8.28.tar.gz 2211162 BLAKE2B 81123750285a34891248fad675511c372aa87ff5047b2d7d8635984a7a71183ee2b3fce78c42a999424b70b1ee5d8a26b46bbe9dec1e951ed1845332bc566109 SHA512 67e7ff9bb5cba7b2ca2274a9fe72397d9a9c85257acdb963f20988db3760c0cd2deba09022b95df18d8a90601c55bd83fe7282fc0a124c796c54714788a39794 |
28 |
DIST haproxy-2.0.14.tar.gz 2651320 BLAKE2B dd5aed78e52b3d3dd295f3883d45adf8795efac93cf6c23fbe39be031f29d19adad0afb400e8041281413f4570bc074f06d9cd88bee672789311e56f57b258d0 SHA512 6b63b713a1009eff59a2622fa93462deb8794c910685840f142711a61be88ea228c7cb2ec7ca50bba0803288625e1a65b2d2f87ffbcedfd23debfbbbb5d96993 |
29 |
-DIST haproxy-2.0.19.tar.gz 2682426 BLAKE2B 6e14842bfcc23167414e2f4e222708bc2d08947b0c420b758b5eaf35a5145c1d013b376a2e84df77802277fe8cc2fd5a14ed9cab3232a74590ec76813fa06952 SHA512 6484c14e7296f4600a1b7a2123809097cac563767dc79c1cbcd29d5fc0e580926b4701d3d095fe146c1de334e5ec50502d2f97fcdd0b711889711e806720fa2f |
30 |
DIST haproxy-2.0.20.tar.gz 2693943 BLAKE2B ff09ca70ed0644c190af73b691aeaced1b491289cf7f4d05dace9cd469bb47f6e8507fc210936b0489867f7e799220278a2b8076b2ee0b87b58e2bd62f1af9ea SHA512 804c0e46f2aa0495b796710335c9080c17b98ea0fa2d60a65eb3cdc51e960a76a13b4c34945ebed75766088836e80f8e5c8e40abaa8caf2c5a5cc4a449d1eb2b |
31 |
-DIST haproxy-2.1.10.tar.gz 2721955 BLAKE2B b7fb27aac039cc52a35afc2710c83200727fb8fad570980ed92e68ec4e0be002d4c0e792ce2636b6470a81cd5b6c1e80be9ea53490034d67a173522801cd7315 SHA512 923db1b5374e5026304f593d939e905c72a9850dd7199f655ec250ce9e81bf8b712895d7eafaf5f248885d138b31d3dda679fb92bd8a9536ed681f2a09acded6 |
32 |
DIST haproxy-2.1.11.tar.gz 2726723 BLAKE2B eef039eaf2808aa7a9b824ddd8e5e25623fc2467d541d5c24f71e7308c167c8eaa8fa6f7356250388c40802aa0581ae02f370b973e8f1169048dea7a7eaea3dc SHA512 59c72cd5154a387849e3dbca87ef5a635508342e7690c5bfa2d325bd6c5a00786f3dc834903a8b81a35ea90d05694eaac17a87b17235ba02cd6657acfec9c69f |
33 |
DIST haproxy-2.1.4.tar.gz 2684568 BLAKE2B 0618e069e6cf6fd20eb9fad0cfcb5ca1714d4001a794e20ce60d812741f4f65d44088c46599e4181cb79536566a940d748030552d0bd010ba14d1552cf7156f4 SHA512 fd029ac1ec877fa89a9410944439b66795b1392b6c8416aaa7978943170530c3826ba50ea706366f3f7785b7cffed58497cb362fc2480dd6920a99af4f920d98 |
34 |
DIST haproxy-2.2.5.tar.gz 2876429 BLAKE2B 1da993769302186ab0d7e1b0c8651c7e9a151295176da44bc854461f6b27831cadaa01a71b153046a23b43de91b2ba17b11ee52ecea12f744ae7af5b9f66ee98 SHA512 74e3c8b2b786f1fb5fcb8b8071751450f45a58ff847b336a8e4413727dea87b7d5a140853e3a445603ae5c4079f371ce9aa31a9f06c18ff4eea7462661775dca |
35 |
-DIST haproxy-2.2.6.tar.gz 2890554 BLAKE2B c1a8f2611f373a80d3a246e5daac9ce7f69cbb7c7104057e9afbcb83b373ed97a5ae8d35d0152f4739b112693b312cd3535ef9b3c6c22b3e92f5ec6fbd5321ae SHA512 b9afa4a4112dccaf192fce07b1cdbb1547060d998801595147a41674042741b62852f65a65aa9b2d033db8808697fd3a522494097710a19071fbb0c604544de5 |
36 |
DIST haproxy-2.2.8.tar.gz 2895932 BLAKE2B ee918f3f9e05a99266bc27507daf5b42073ff4b51708db052e3cadc10bbd5de0f9e458925ef47ce4ddd30e1d7c292d82092d9a4cb971c18eb0577b94c1c144b3 SHA512 acbdd0b9d186b7d54a161247ae3e35017a8646ac2724ae8cfaa662b4dfbe495e0b321142d7b5a7af5c71a817cfe8156aa8ec5980a64f3d88bc5c5590b9e88886 |
37 |
-DIST haproxy-2.3.2.tar.gz 2903983 BLAKE2B f4acc499e9210f1f520d1cc0913511986c1ecc74d5b9cc492e398cbeb29824d28c6983646d21a6c1eaf1f04010815778e582d1de464d39cd2660c63d5aa2b043 SHA512 ffabf499781220f71fd99d7f66f3a77f310ef69735e5c7e714f976052122788c917593d5e665d3a60d687a3ff63579331fdc5816414a8b75c7c8573e0b286ed5 |
38 |
+DIST haproxy-2.2.9.tar.gz 2900486 BLAKE2B b468d71c3caaf660b5cd3aff0d6113adf169dfb26254d7d759eb6f979a41e0ebfc754956d914391f0463ba6989609b0cc0c33bf46e34e8472fe471f8020821be SHA512 579af88b53c626ff05facbe452e28e3dc8195579be7c02c0b64d2a241332311b41ff3f0b38557fe342d663d4b94be1e0812db6804042139cef943cfa79b8a246 |
39 |
DIST haproxy-2.3.4.tar.gz 2909672 BLAKE2B 4d1b3e6aaa13c30385056c4cefe86c5bcdc98cd34a94ea388a115e2fe547242fb68a9e4b2e22cc4990db16c76eb220d52999209958409bfda7a777eee587b947 SHA512 b6db7f6c573f700ce5e2f533c6b60c5e5cb15fbc31057f3e98c03144c52b87612420e962e5e8ba63176eb1b7459a956c80a0403e9189cb3fde1dcef5bfa64ac5 |
40 |
+DIST haproxy-2.3.5.tar.gz 2915064 BLAKE2B ce52ab3226bb03a39aad7c94f674b646eceaaf78be1e20fd48b9173fef6cfb9e8ea1db9cec9944b7c916d317efab8339f08a20b376b4331e0744bd9d4d26a03a SHA512 1d7d191b72157b9b504fd5b58a50225c737491b03b1ed52de4eb61e0cc7898abae298a1fee1c3a576a7de88dd6df5f0630906001046d26c0dfa3c4bf0cd0de50 |
41 |
|
42 |
diff --git a/net-proxy/haproxy/haproxy-1.8.27-r1.ebuild b/net-proxy/haproxy/haproxy-1.8.27-r1.ebuild |
43 |
deleted file mode 100644 |
44 |
index 598b9437c2a..00000000000 |
45 |
--- a/net-proxy/haproxy/haproxy-1.8.27-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/$(ver_cut 1-2)" |
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.1.10-r1.ebuild b/net-proxy/haproxy/haproxy-2.1.10-r1.ebuild |
219 |
deleted file mode 100644 |
220 |
index ff5a7fefefd..00000000000 |
221 |
--- a/net-proxy/haproxy/haproxy-2.1.10-r1.ebuild |
222 |
+++ /dev/null |
223 |
@@ -1,180 +0,0 @@ |
224 |
-# Copyright 1999-2020 Gentoo Authors |
225 |
-# Distributed under the terms of the GNU General Public License v2 |
226 |
- |
227 |
-EAPI="7" |
228 |
- |
229 |
-[[ ${PV} == *9999 ]] && SCM="git-r3" |
230 |
-inherit 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://www.haproxy.org" |
236 |
-if [[ ${PV} != *9999 ]]; then |
237 |
- SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 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-$(ver_cut 1-2).git/" |
241 |
- EGIT_BRANCH=master |
242 |
-fi |
243 |
- |
244 |
-LICENSE="GPL-2 LGPL-2.1" |
245 |
-SLOT="0/$(ver_cut 1-2)" |
246 |
-IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter |
247 |
-ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl" |
248 |
-REQUIRED_USE="pcre-jit? ( pcre ) |
249 |
- pcre2-jit? ( pcre2 ) |
250 |
- pcre? ( !pcre2 ) |
251 |
- device-atlas? ( pcre ) |
252 |
- ?? ( slz zlib )" |
253 |
- |
254 |
-DEPEND=" |
255 |
- pcre? ( |
256 |
- dev-libs/libpcre |
257 |
- pcre-jit? ( dev-libs/libpcre[jit] ) |
258 |
- ) |
259 |
- pcre2? ( |
260 |
- dev-libs/libpcre |
261 |
- pcre2-jit? ( dev-libs/libpcre2[jit] ) |
262 |
- ) |
263 |
- ssl? ( |
264 |
- !libressl? ( dev-libs/openssl:0=[zlib?] ) |
265 |
- libressl? ( dev-libs/libressl:0= ) |
266 |
- ) |
267 |
- slz? ( dev-libs/libslz:= ) |
268 |
- zlib? ( sys-libs/zlib ) |
269 |
- lua? ( dev-lang/lua:5.3 ) |
270 |
- device-atlas? ( dev-libs/device-atlas-api-c )" |
271 |
-RDEPEND="${DEPEND} |
272 |
- acct-group/haproxy |
273 |
- acct-user/haproxy" |
274 |
- |
275 |
-S="${WORKDIR}/${MY_P}" |
276 |
- |
277 |
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) |
278 |
-CONTRIBS=( halog iprange ) |
279 |
-# ip6range is present in 1.6, but broken. |
280 |
-ver_test $PV -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop ) |
281 |
-# TODO: mod_defender - requires apache / APR, modsecurity - the same |
282 |
-ver_test $PV -ge 1.8.0 && CONTRIBS+=( hpack ) |
283 |
- |
284 |
-haproxy_use() { |
285 |
- (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>" |
286 |
- |
287 |
- usex "${1}" "USE_${2}=1" "USE_${2}=" |
288 |
-} |
289 |
- |
290 |
-pkg_setup() { |
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 |
- V=1 |
300 |
- TARGET=linux-glibc |
301 |
- ) |
302 |
- |
303 |
- # TODO: PCRE2_WIDTH? |
304 |
- args+=( $(haproxy_use threads THREAD) ) |
305 |
- args+=( $(haproxy_use crypt LIBCRYPT) ) |
306 |
- args+=( $(haproxy_use net_ns NS) ) |
307 |
- args+=( $(haproxy_use pcre PCRE) ) |
308 |
- args+=( $(haproxy_use pcre-jit PCRE_JIT) ) |
309 |
- args+=( $(haproxy_use pcre2 PCRE2) ) |
310 |
- args+=( $(haproxy_use pcre2-jit PCRE2_JIT) ) |
311 |
- args+=( $(haproxy_use ssl OPENSSL) ) |
312 |
- args+=( $(haproxy_use slz SLZ) ) |
313 |
- args+=( $(haproxy_use zlib ZLIB) ) |
314 |
- args+=( $(haproxy_use lua LUA) ) |
315 |
- args+=( $(haproxy_use 51degrees 51DEGREES) ) |
316 |
- args+=( $(haproxy_use device-atlas DEVICEATLAS) ) |
317 |
- args+=( $(haproxy_use wurfl WURFL) ) |
318 |
- args+=( $(haproxy_use systemd SYSTEMD) ) |
319 |
- |
320 |
- # For now, until the strict-aliasing breakage will be fixed |
321 |
- append-cflags -fno-strict-aliasing |
322 |
- |
323 |
- # Bug #668002 |
324 |
- if use ppc || use arm || use hppa; then |
325 |
- TARGET_LDFLAGS=-latomic |
326 |
- fi |
327 |
- |
328 |
- if use prometheus-exporter; then |
329 |
- EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" |
330 |
- fi |
331 |
- |
332 |
- # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing |
333 |
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]} |
334 |
- emake -C contrib/systemd SBINDIR=/usr/sbin |
335 |
- |
336 |
- if use tools ; then |
337 |
- for contrib in ${CONTRIBS[@]} ; do |
338 |
- # Those two includes are a workaround for hpack Makefile missing those |
339 |
- emake -C contrib/${contrib} \ |
340 |
- CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} |
341 |
- done |
342 |
- fi |
343 |
-} |
344 |
- |
345 |
-src_install() { |
346 |
- dosbin haproxy |
347 |
- dosym ../sbin/haproxy /usr/bin/haproxy |
348 |
- |
349 |
- newconfd "${FILESDIR}/${PN}.confd" $PN |
350 |
- newinitd "${FILESDIR}/${PN}.initd-r6" $PN |
351 |
- |
352 |
- doman doc/haproxy.1 |
353 |
- |
354 |
- systemd_dounit contrib/systemd/haproxy.service |
355 |
- |
356 |
- einstalldocs |
357 |
- |
358 |
- # The errorfiles are used by upstream defaults. |
359 |
- insinto /etc/haproxy/errors/ |
360 |
- doins examples/errorfiles/* |
361 |
- |
362 |
- if use doc; then |
363 |
- dodoc ROADMAP doc/*.txt |
364 |
- #if use lua; then |
365 |
- # TODO: doc/lua-api/ |
366 |
- #fi |
367 |
- fi |
368 |
- |
369 |
- if use tools ; then |
370 |
- has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog |
371 |
- has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange |
372 |
- has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range |
373 |
- has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example |
374 |
- has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example |
375 |
- has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop |
376 |
- has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack |
377 |
- fi |
378 |
- |
379 |
- if use examples ; then |
380 |
- docinto examples |
381 |
- dodoc examples/*.cfg |
382 |
- dodoc doc/seamless_reload.txt |
383 |
- fi |
384 |
- |
385 |
- if use vim-syntax ; then |
386 |
- insinto /usr/share/vim/vimfiles/syntax |
387 |
- doins contrib/syntax-highlight/haproxy.vim |
388 |
- fi |
389 |
-} |
390 |
- |
391 |
-pkg_postinst() { |
392 |
- if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then |
393 |
- ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service." |
394 |
- ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created." |
395 |
- ewarn "Make use of them with the \"user\" and \"group\" directives." |
396 |
- |
397 |
- if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then |
398 |
- einfo "Please consult the installed documentation for learning the configuration file's syntax." |
399 |
- einfo "The documentation and sample configuration files are installed here:" |
400 |
- einfo " ${EROOT}/usr/share/doc/${PF}" |
401 |
- fi |
402 |
- fi |
403 |
-} |
404 |
|
405 |
diff --git a/net-proxy/haproxy/haproxy-2.2.6-r1.ebuild b/net-proxy/haproxy/haproxy-2.2.6-r1.ebuild |
406 |
deleted file mode 100644 |
407 |
index f03a40b4b36..00000000000 |
408 |
--- a/net-proxy/haproxy/haproxy-2.2.6-r1.ebuild |
409 |
+++ /dev/null |
410 |
@@ -1,181 +0,0 @@ |
411 |
-# Copyright 1999-2020 Gentoo Authors |
412 |
-# Distributed under the terms of the GNU General Public License v2 |
413 |
- |
414 |
-EAPI="7" |
415 |
- |
416 |
-[[ ${PV} == *9999 ]] && SCM="git-r3" |
417 |
-inherit toolchain-funcs flag-o-matic systemd linux-info $SCM |
418 |
- |
419 |
-MY_P="${PN}-${PV/_beta/-dev}" |
420 |
- |
421 |
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments" |
422 |
-HOMEPAGE="http://www.haproxy.org" |
423 |
-if [[ ${PV} != *9999 ]]; then |
424 |
- SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz" |
425 |
- KEYWORDS="~amd64 ~arm ~ppc ~x86" |
426 |
-else |
427 |
- EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/" |
428 |
- EGIT_BRANCH=master |
429 |
-fi |
430 |
- |
431 |
-LICENSE="GPL-2 LGPL-2.1" |
432 |
-SLOT="0/$(ver_cut 1-2)" |
433 |
-IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter |
434 |
-ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl" |
435 |
-REQUIRED_USE="pcre-jit? ( pcre ) |
436 |
- pcre2-jit? ( pcre2 ) |
437 |
- pcre? ( !pcre2 ) |
438 |
- device-atlas? ( pcre ) |
439 |
- ?? ( slz zlib )" |
440 |
- |
441 |
-DEPEND=" |
442 |
- pcre? ( |
443 |
- dev-libs/libpcre |
444 |
- pcre-jit? ( dev-libs/libpcre[jit] ) |
445 |
- ) |
446 |
- pcre2? ( |
447 |
- dev-libs/libpcre |
448 |
- pcre2-jit? ( dev-libs/libpcre2[jit] ) |
449 |
- ) |
450 |
- ssl? ( |
451 |
- !libressl? ( dev-libs/openssl:0=[zlib?] ) |
452 |
- libressl? ( dev-libs/libressl:0= ) |
453 |
- ) |
454 |
- slz? ( dev-libs/libslz:= ) |
455 |
- zlib? ( sys-libs/zlib ) |
456 |
- lua? ( dev-lang/lua:5.3 ) |
457 |
- device-atlas? ( dev-libs/device-atlas-api-c )" |
458 |
-RDEPEND="${DEPEND} |
459 |
- acct-group/haproxy |
460 |
- acct-user/haproxy" |
461 |
- |
462 |
-S="${WORKDIR}/${MY_P}" |
463 |
- |
464 |
-PATCHES=( "${FILESDIR}/${PN}-2.3.0-hpack-VAR_ARRAY.patch" ) |
465 |
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) |
466 |
-CONTRIBS=( halog iprange ) |
467 |
-# ip6range is present in 1.6, but broken. |
468 |
-ver_test $PV -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop ) |
469 |
-# TODO: mod_defender - requires apache / APR, modsecurity - the same |
470 |
-ver_test $PV -ge 1.8.0 && CONTRIBS+=( hpack ) |
471 |
- |
472 |
-haproxy_use() { |
473 |
- (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>" |
474 |
- |
475 |
- usex "${1}" "USE_${2}=1" "USE_${2}=" |
476 |
-} |
477 |
- |
478 |
-pkg_setup() { |
479 |
- if use net_ns; then |
480 |
- CONFIG_CHECK="~NET_NS" |
481 |
- linux-info_pkg_setup |
482 |
- fi |
483 |
-} |
484 |
- |
485 |
-src_compile() { |
486 |
- local -a args=( |
487 |
- V=1 |
488 |
- TARGET=linux-glibc |
489 |
- ) |
490 |
- |
491 |
- # TODO: PCRE2_WIDTH? |
492 |
- args+=( $(haproxy_use threads THREAD) ) |
493 |
- args+=( $(haproxy_use crypt LIBCRYPT) ) |
494 |
- args+=( $(haproxy_use net_ns NS) ) |
495 |
- args+=( $(haproxy_use pcre PCRE) ) |
496 |
- args+=( $(haproxy_use pcre-jit PCRE_JIT) ) |
497 |
- args+=( $(haproxy_use pcre2 PCRE2) ) |
498 |
- args+=( $(haproxy_use pcre2-jit PCRE2_JIT) ) |
499 |
- args+=( $(haproxy_use ssl OPENSSL) ) |
500 |
- args+=( $(haproxy_use slz SLZ) ) |
501 |
- args+=( $(haproxy_use zlib ZLIB) ) |
502 |
- args+=( $(haproxy_use lua LUA) ) |
503 |
- args+=( $(haproxy_use 51degrees 51DEGREES) ) |
504 |
- args+=( $(haproxy_use device-atlas DEVICEATLAS) ) |
505 |
- args+=( $(haproxy_use wurfl WURFL) ) |
506 |
- args+=( $(haproxy_use systemd SYSTEMD) ) |
507 |
- |
508 |
- # For now, until the strict-aliasing breakage will be fixed |
509 |
- append-cflags -fno-strict-aliasing |
510 |
- |
511 |
- # Bug #668002 |
512 |
- if use ppc || use arm || use hppa; then |
513 |
- TARGET_LDFLAGS=-latomic |
514 |
- fi |
515 |
- |
516 |
- if use prometheus-exporter; then |
517 |
- EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" |
518 |
- fi |
519 |
- |
520 |
- # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing |
521 |
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]} |
522 |
- emake -C contrib/systemd SBINDIR=/usr/sbin |
523 |
- |
524 |
- if use tools ; then |
525 |
- for contrib in ${CONTRIBS[@]} ; do |
526 |
- # Those two includes are a workaround for hpack Makefile missing those |
527 |
- emake -C contrib/${contrib} \ |
528 |
- CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} |
529 |
- done |
530 |
- fi |
531 |
-} |
532 |
- |
533 |
-src_install() { |
534 |
- dosbin haproxy |
535 |
- dosym ../sbin/haproxy /usr/bin/haproxy |
536 |
- |
537 |
- newconfd "${FILESDIR}/${PN}.confd" $PN |
538 |
- newinitd "${FILESDIR}/${PN}.initd-r6" $PN |
539 |
- |
540 |
- doman doc/haproxy.1 |
541 |
- |
542 |
- systemd_dounit contrib/systemd/haproxy.service |
543 |
- |
544 |
- einstalldocs |
545 |
- |
546 |
- # The errorfiles are used by upstream defaults. |
547 |
- insinto /etc/haproxy/errors/ |
548 |
- doins examples/errorfiles/* |
549 |
- |
550 |
- if use doc; then |
551 |
- dodoc ROADMAP doc/*.txt |
552 |
- #if use lua; then |
553 |
- # TODO: doc/lua-api/ |
554 |
- #fi |
555 |
- fi |
556 |
- |
557 |
- if use tools ; then |
558 |
- has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog |
559 |
- has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange |
560 |
- has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range |
561 |
- has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example |
562 |
- has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example |
563 |
- has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop |
564 |
- has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack |
565 |
- fi |
566 |
- |
567 |
- if use examples ; then |
568 |
- docinto examples |
569 |
- dodoc examples/*.cfg |
570 |
- dodoc doc/seamless_reload.txt |
571 |
- fi |
572 |
- |
573 |
- if use vim-syntax ; then |
574 |
- insinto /usr/share/vim/vimfiles/syntax |
575 |
- doins contrib/syntax-highlight/haproxy.vim |
576 |
- fi |
577 |
-} |
578 |
- |
579 |
-pkg_postinst() { |
580 |
- if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then |
581 |
- ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service." |
582 |
- ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created." |
583 |
- ewarn "Make use of them with the \"user\" and \"group\" directives." |
584 |
- |
585 |
- if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then |
586 |
- einfo "Please consult the installed documentation for learning the configuration file's syntax." |
587 |
- einfo "The documentation and sample configuration files are installed here:" |
588 |
- einfo " ${EROOT}/usr/share/doc/${PF}" |
589 |
- fi |
590 |
- fi |
591 |
-} |
592 |
|
593 |
diff --git a/net-proxy/haproxy/haproxy-2.0.19-r1.ebuild b/net-proxy/haproxy/haproxy-2.2.9.ebuild |
594 |
similarity index 99% |
595 |
rename from net-proxy/haproxy/haproxy-2.0.19-r1.ebuild |
596 |
rename to net-proxy/haproxy/haproxy-2.2.9.ebuild |
597 |
index ff5a7fefefd..09bca46c32f 100644 |
598 |
--- a/net-proxy/haproxy/haproxy-2.0.19-r1.ebuild |
599 |
+++ b/net-proxy/haproxy/haproxy-2.2.9.ebuild |
600 |
@@ -1,4 +1,4 @@ |
601 |
-# Copyright 1999-2020 Gentoo Authors |
602 |
+# Copyright 1999-2021 Gentoo Authors |
603 |
# Distributed under the terms of the GNU General Public License v2 |
604 |
|
605 |
EAPI="7" |
606 |
|
607 |
diff --git a/net-proxy/haproxy/haproxy-2.3.2-r1.ebuild b/net-proxy/haproxy/haproxy-2.3.5.ebuild |
608 |
similarity index 98% |
609 |
rename from net-proxy/haproxy/haproxy-2.3.2-r1.ebuild |
610 |
rename to net-proxy/haproxy/haproxy-2.3.5.ebuild |
611 |
index 07881439217..b7ea2373967 100644 |
612 |
--- a/net-proxy/haproxy/haproxy-2.3.2-r1.ebuild |
613 |
+++ b/net-proxy/haproxy/haproxy-2.3.5.ebuild |
614 |
@@ -1,4 +1,4 @@ |
615 |
-# Copyright 1999-2020 Gentoo Authors |
616 |
+# Copyright 1999-2021 Gentoo Authors |
617 |
# Distributed under the terms of the GNU General Public License v2 |
618 |
|
619 |
EAPI="7" |
620 |
@@ -51,7 +51,6 @@ RDEPEND="${DEPEND} |
621 |
|
622 |
S="${WORKDIR}/${MY_P}" |
623 |
|
624 |
-PATCHES=( "${FILESDIR}/${PN}-2.3.0-hpack-VAR_ARRAY.patch" ) |
625 |
DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) |
626 |
CONTRIBS=( halog iprange ) |
627 |
# ip6range is present in 1.6, but broken. |