1 |
commit: 80a85e151a8829d9f5708a6b9e0ce60b370fc07f |
2 |
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jun 19 11:47:41 2017 +0000 |
4 |
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 19 11:48:08 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80a85e15 |
7 |
|
8 |
net-proxy/haproxy: Version bumps |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
11 |
|
12 |
net-proxy/haproxy/Manifest | 2 + |
13 |
net-proxy/haproxy/haproxy-1.6.13.ebuild | 164 +++++++++++++++++++++++++++++++ |
14 |
net-proxy/haproxy/haproxy-1.7.6.ebuild | 165 ++++++++++++++++++++++++++++++++ |
15 |
3 files changed, 331 insertions(+) |
16 |
|
17 |
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest |
18 |
index c8844c01267..84a3b66e25f 100644 |
19 |
--- a/net-proxy/haproxy/Manifest |
20 |
+++ b/net-proxy/haproxy/Manifest |
21 |
@@ -2,4 +2,6 @@ DIST haproxy-1.5.14.tar.gz 1345345 SHA256 9565dd38649064d0350a2883fa81ccfe92eb17 |
22 |
DIST haproxy-1.5.19.tar.gz 1362834 SHA256 e00ae2a633da614967f2e3ebebdb817ec537cba8383b833fc8d9a506876e0d5e SHA512 3462458350d76fe5634428f7b443f21e2d8d4a171ab6254736db2d64587707d11d0df1d851d629c5a2cdfb2858e98cc9345d592859c6d6d8a352b57542dc465a WHIRLPOOL 0cb297dd48e8b9e0c2d6291aa7549c0b6b11e75c58ace3bd50205d7218cf95187129126b21cd13572e0287fc5b311c94ad2ccf664ff30d83a3bc782aea7714ff |
23 |
DIST haproxy-1.6.11.tar.gz 1574029 SHA256 62fe982edb102a9f55205792bc14b0d05745cc7993cd6bee5d73cd3c5ae16ace SHA512 73ff1c7301197b3bd75a3b1355787419676854d132ce2dcdacb2a296e297dcdfc52b0c571a4fb715e369f1126e1a58196fabb21f828c880f15904032da78e434 WHIRLPOOL 4454c51da89bb089579aefcf54093fd4c09b42918e81e41772d263ebc19f243a37b42135a02c4012705e4cc31370f377cf0b429e81707f307cffe9ed23f5183b |
24 |
DIST haproxy-1.6.12.tar.gz 1580114 SHA256 9bdf2bf855991dc4e0bf9b1ba2b1a322fc23f188aab1c8f0162131c32d699ee2 SHA512 dd7ce6ec4d5414cd9f901a9a5e011e3a0f7632edbda685d1458cc01633e4fbca0fda033ae5a6729ae8497e82ac2698600ed35cf6e41c66d6767ef5453b372883 WHIRLPOOL 6698a114740278185a7b0f467f6345b2fbe7b2e69811667b3870c99c187249c599d53ae25f3f1fd7eff2bd822b4551171ac0882c90a185631e35a5e19ecf58a4 |
25 |
+DIST haproxy-1.6.13.tar.gz 1580214 SHA256 7d318583f3a1bf185e857bd40449004b29c95547c89bbb36718f284e29502a1b SHA512 ffed3b347e0cd9cefdc379c91890a3c104d6848b976a9f28984878a9c2d05ca7ddea678f7a93f75cb9d29ae2be921e5a5bd295b1a8771765b099d1c619ded7a3 WHIRLPOOL 70176ee090dacbbdc822c74bba137589f168482c560734c06b98dc23b4d957ed1e016309f11f25a0b486bc6917633455f1174dc6688d6aef53667c61b83a9ff3 |
26 |
DIST haproxy-1.7.5.tar.gz 1743979 SHA256 b04d7db6383c662eb0a421a95af7becac6d9744a1abf0df6b0280c1e61416121 SHA512 9fc62b492b4eb80039511339d6e677107f4ba842f275d4be216a70a0d3d0463c819e10e365a7e9fe2e95e0b446b00350b4ee161e98bd724ca2e0e4e60bea5734 WHIRLPOOL be176d9f237dcb36edaf223b86f3dc9baa964b4bffcba2af1aa267bbcaf2dee00b110c3dc70abc8aa96e37f55a9c99f29f416d9ecce3a62a712769647515b3ae |
27 |
+DIST haproxy-1.7.6.tar.gz 1744267 SHA256 88f84beba34d08a5495d908ca76866e033e6046e7c74f9477b9d5316f8c3d32a SHA512 89de0ba58f98419dd86befede9cb1d30adcbcc6671605d9c41871f0dec5ef89392258781ab41451582f179f8b2fec586bfe5d0694f8e11c3a25cb3d313613737 WHIRLPOOL 100c9d402be3ccf695dabf1fa6aa6d8ef79b8275076acbfd36252d9a7cfa3eeccce9d67fc4730923ec5e647cb99065a982a0541578fd84f0926bd104b381b5fd |
28 |
|
29 |
diff --git a/net-proxy/haproxy/haproxy-1.6.13.ebuild b/net-proxy/haproxy/haproxy-1.6.13.ebuild |
30 |
new file mode 100644 |
31 |
index 00000000000..e1c758115e5 |
32 |
--- /dev/null |
33 |
+++ b/net-proxy/haproxy/haproxy-1.6.13.ebuild |
34 |
@@ -0,0 +1,164 @@ |
35 |
+# Copyright 1999-2017 Gentoo Foundation |
36 |
+# Distributed under the terms of the GNU General Public License v2 |
37 |
+ |
38 |
+EAPI="6" |
39 |
+ |
40 |
+[[ ${PV} == *9999 ]] && SCM="git-r3" |
41 |
+inherit user versionator toolchain-funcs flag-o-matic systemd linux-info $SCM |
42 |
+ |
43 |
+MY_P="${PN}-${PV/_beta/-dev}" |
44 |
+ |
45 |
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments" |
46 |
+HOMEPAGE="http://haproxy.1wt.eu" |
47 |
+if [[ ${PV} != *9999 ]]; then |
48 |
+ SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz" |
49 |
+ KEYWORDS="~amd64 ~arm ~ppc ~x86" |
50 |
+else |
51 |
+ EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/" |
52 |
+ EGIT_BRANCH=master |
53 |
+fi |
54 |
+ |
55 |
+LICENSE="GPL-2 LGPL-2.1" |
56 |
+SLOT="0" |
57 |
+IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools vim-syntax +zlib lua device-atlas 51degrees wurfl" |
58 |
+REQUIRED_USE="pcre-jit? ( pcre ) |
59 |
+ ?? ( slz zlib )" |
60 |
+ |
61 |
+DEPEND=" |
62 |
+ pcre? ( |
63 |
+ dev-libs/libpcre |
64 |
+ pcre-jit? ( dev-libs/libpcre[jit] ) |
65 |
+ ) |
66 |
+ ssl? ( |
67 |
+ !libressl? ( dev-libs/openssl:0=[zlib?] ) |
68 |
+ libressl? ( dev-libs/libressl:0= ) |
69 |
+ ) |
70 |
+ slz? ( dev-libs/libslz:= ) |
71 |
+ zlib? ( sys-libs/zlib ) |
72 |
+ lua? ( dev-lang/lua:5.3 ) |
73 |
+ device-atlas? ( dev-libs/device-atlas-api-c )" |
74 |
+RDEPEND="${DEPEND}" |
75 |
+ |
76 |
+S="${WORKDIR}/${MY_P}" |
77 |
+ |
78 |
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) |
79 |
+version_is_at_least 1.7.0 $PV && PATCHES=( "${FILESDIR}"/haproxy-1.7-contrib.patch ) |
80 |
+CONTRIBS=( halog iprange ) |
81 |
+# ip6range is present in 1.6, but broken. |
82 |
+version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop ) |
83 |
+ |
84 |
+haproxy_use() { |
85 |
+ (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>" |
86 |
+ |
87 |
+ usex "${1}" "USE_${2}=1" "USE_${2}=" |
88 |
+} |
89 |
+ |
90 |
+pkg_setup() { |
91 |
+ enewgroup haproxy |
92 |
+ enewuser haproxy -1 -1 -1 haproxy |
93 |
+ |
94 |
+ if use net_ns; then |
95 |
+ CONFIG_CHECK="~NET_NS" |
96 |
+ linux-info_pkg_setup |
97 |
+ fi |
98 |
+} |
99 |
+ |
100 |
+src_prepare() { |
101 |
+ default |
102 |
+ |
103 |
+ sed -e 's:@SBINDIR@:'/usr/bin':' contrib/systemd/haproxy.service.in \ |
104 |
+ > contrib/systemd/haproxy.service || die |
105 |
+ |
106 |
+ sed -ie 's:/usr/sbin/haproxy:/usr/bin/haproxy:' src/haproxy-systemd-wrapper.c || die |
107 |
+} |
108 |
+ |
109 |
+src_compile() { |
110 |
+ local -a args=( |
111 |
+ TARGET=linux2628 |
112 |
+ USE_GETADDRINFO=1 |
113 |
+ USE_TFO=1 |
114 |
+ ) |
115 |
+ |
116 |
+ args+=( $(haproxy_use crypt LIBCRYPT) ) |
117 |
+ args+=( $(haproxy_use net_ns NS) ) |
118 |
+ args+=( $(haproxy_use pcre PCRE) ) |
119 |
+ args+=( $(haproxy_use pcre-jit PCRE_JIT) ) |
120 |
+ args+=( $(haproxy_use ssl OPENSSL) ) |
121 |
+ args+=( $(haproxy_use slz SLZ) ) |
122 |
+ args+=( $(haproxy_use zlib ZLIB) ) |
123 |
+ args+=( $(haproxy_use lua LUA) ) |
124 |
+ args+=( $(haproxy_use 51degrees 51DEGREES) ) |
125 |
+ args+=( $(haproxy_use device-atlas DEVICEATLAS) ) |
126 |
+ args+=( $(haproxy_use wurfl WURFL) ) |
127 |
+ |
128 |
+ # For now, until the strict-aliasing breakage will be fixed |
129 |
+ append-cflags -fno-strict-aliasing |
130 |
+ |
131 |
+ emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} |
132 |
+ |
133 |
+ if use tools ; then |
134 |
+ for contrib in ${CONTRIBS[@]} ; do |
135 |
+ emake -C contrib/${contrib} \ |
136 |
+ CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} |
137 |
+ done |
138 |
+ fi |
139 |
+} |
140 |
+ |
141 |
+src_install() { |
142 |
+ dobin haproxy |
143 |
+ |
144 |
+ newconfd "${FILESDIR}/${PN}.confd" $PN |
145 |
+ newinitd "${FILESDIR}/${PN}.initd-r3" $PN |
146 |
+ |
147 |
+ doman doc/haproxy.1 |
148 |
+ |
149 |
+ dobin haproxy-systemd-wrapper |
150 |
+ systemd_dounit contrib/systemd/haproxy.service |
151 |
+ |
152 |
+ einstalldocs |
153 |
+ |
154 |
+ # The errorfiles are used by upstream defaults. |
155 |
+ insinto /etc/haproxy/errors/ |
156 |
+ doins examples/errorfiles/* |
157 |
+ |
158 |
+ if use doc; then |
159 |
+ dodoc ROADMAP doc/*.txt |
160 |
+ #if use lua; then |
161 |
+ # TODO: doc/lua-api/ |
162 |
+ #fi |
163 |
+ fi |
164 |
+ |
165 |
+ if use tools ; then |
166 |
+ has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog |
167 |
+ has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange |
168 |
+ has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range |
169 |
+ has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example |
170 |
+ has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example |
171 |
+ has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop |
172 |
+ fi |
173 |
+ |
174 |
+ if use examples ; then |
175 |
+ docinto examples |
176 |
+ dodoc examples/*.cfg |
177 |
+ dodoc examples/seamless_reload.txt |
178 |
+ fi |
179 |
+ |
180 |
+ if use vim-syntax ; then |
181 |
+ insinto /usr/share/vim/vimfiles/syntax |
182 |
+ doins examples/haproxy.vim |
183 |
+ fi |
184 |
+} |
185 |
+ |
186 |
+pkg_postinst() { |
187 |
+ if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then |
188 |
+ ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service." |
189 |
+ ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created." |
190 |
+ ewarn "Make use of them with the \"user\" and \"group\" directives." |
191 |
+ |
192 |
+ if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then |
193 |
+ einfo "Please consult the installed documentation for learning the configuration file's syntax." |
194 |
+ einfo "The documentation and sample configuration files are installed here:" |
195 |
+ einfo " ${EROOT}usr/share/doc/${PF}" |
196 |
+ fi |
197 |
+ fi |
198 |
+} |
199 |
|
200 |
diff --git a/net-proxy/haproxy/haproxy-1.7.6.ebuild b/net-proxy/haproxy/haproxy-1.7.6.ebuild |
201 |
new file mode 100644 |
202 |
index 00000000000..c0a7cc341e6 |
203 |
--- /dev/null |
204 |
+++ b/net-proxy/haproxy/haproxy-1.7.6.ebuild |
205 |
@@ -0,0 +1,165 @@ |
206 |
+# Copyright 1999-2017 Gentoo Foundation |
207 |
+# Distributed under the terms of the GNU General Public License v2 |
208 |
+ |
209 |
+EAPI="6" |
210 |
+ |
211 |
+[[ ${PV} == *9999 ]] && SCM="git-r3" |
212 |
+inherit user versionator toolchain-funcs flag-o-matic systemd linux-info $SCM |
213 |
+ |
214 |
+MY_P="${PN}-${PV/_beta/-dev}" |
215 |
+ |
216 |
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments" |
217 |
+HOMEPAGE="http://haproxy.1wt.eu" |
218 |
+if [[ ${PV} != *9999 ]]; then |
219 |
+ SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz" |
220 |
+ KEYWORDS="~amd64 ~arm ~ppc ~x86" |
221 |
+else |
222 |
+ EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/" |
223 |
+ EGIT_BRANCH=master |
224 |
+fi |
225 |
+ |
226 |
+LICENSE="GPL-2 LGPL-2.1" |
227 |
+SLOT="0" |
228 |
+IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools vim-syntax +zlib lua device-atlas 51degrees wurfl" |
229 |
+REQUIRED_USE="pcre-jit? ( pcre ) |
230 |
+ device-atlas? ( pcre ) |
231 |
+ ?? ( slz zlib )" |
232 |
+ |
233 |
+DEPEND=" |
234 |
+ pcre? ( |
235 |
+ dev-libs/libpcre |
236 |
+ pcre-jit? ( dev-libs/libpcre[jit] ) |
237 |
+ ) |
238 |
+ ssl? ( |
239 |
+ !libressl? ( dev-libs/openssl:0=[zlib?] ) |
240 |
+ libressl? ( dev-libs/libressl:0= ) |
241 |
+ ) |
242 |
+ slz? ( dev-libs/libslz:= ) |
243 |
+ zlib? ( sys-libs/zlib ) |
244 |
+ lua? ( dev-lang/lua:5.3 ) |
245 |
+ device-atlas? ( dev-libs/device-atlas-api-c )" |
246 |
+RDEPEND="${DEPEND}" |
247 |
+ |
248 |
+S="${WORKDIR}/${MY_P}" |
249 |
+ |
250 |
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) |
251 |
+version_is_at_least 1.7.0 $PV && PATCHES=( "${FILESDIR}"/haproxy-1.7-contrib.patch ) |
252 |
+CONTRIBS=( halog iprange ) |
253 |
+# ip6range is present in 1.6, but broken. |
254 |
+version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop ) |
255 |
+ |
256 |
+haproxy_use() { |
257 |
+ (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>" |
258 |
+ |
259 |
+ usex "${1}" "USE_${2}=1" "USE_${2}=" |
260 |
+} |
261 |
+ |
262 |
+pkg_setup() { |
263 |
+ enewgroup haproxy |
264 |
+ enewuser haproxy -1 -1 -1 haproxy |
265 |
+ |
266 |
+ if use net_ns; then |
267 |
+ CONFIG_CHECK="~NET_NS" |
268 |
+ linux-info_pkg_setup |
269 |
+ fi |
270 |
+} |
271 |
+ |
272 |
+src_prepare() { |
273 |
+ default |
274 |
+ |
275 |
+ sed -e 's:@SBINDIR@:'/usr/bin':' contrib/systemd/haproxy.service.in \ |
276 |
+ > contrib/systemd/haproxy.service || die |
277 |
+ |
278 |
+ sed -ie 's:/usr/sbin/haproxy:/usr/bin/haproxy:' src/haproxy-systemd-wrapper.c || die |
279 |
+} |
280 |
+ |
281 |
+src_compile() { |
282 |
+ local -a args=( |
283 |
+ TARGET=linux2628 |
284 |
+ USE_GETADDRINFO=1 |
285 |
+ USE_TFO=1 |
286 |
+ ) |
287 |
+ |
288 |
+ args+=( $(haproxy_use crypt LIBCRYPT) ) |
289 |
+ args+=( $(haproxy_use net_ns NS) ) |
290 |
+ args+=( $(haproxy_use pcre PCRE) ) |
291 |
+ args+=( $(haproxy_use pcre-jit PCRE_JIT) ) |
292 |
+ args+=( $(haproxy_use ssl OPENSSL) ) |
293 |
+ args+=( $(haproxy_use slz SLZ) ) |
294 |
+ args+=( $(haproxy_use zlib ZLIB) ) |
295 |
+ args+=( $(haproxy_use lua LUA) ) |
296 |
+ args+=( $(haproxy_use 51degrees 51DEGREES) ) |
297 |
+ args+=( $(haproxy_use device-atlas DEVICEATLAS) ) |
298 |
+ args+=( $(haproxy_use wurfl WURFL) ) |
299 |
+ |
300 |
+ # For now, until the strict-aliasing breakage will be fixed |
301 |
+ append-cflags -fno-strict-aliasing |
302 |
+ |
303 |
+ emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} |
304 |
+ |
305 |
+ if use tools ; then |
306 |
+ for contrib in ${CONTRIBS[@]} ; do |
307 |
+ emake -C contrib/${contrib} \ |
308 |
+ CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} |
309 |
+ done |
310 |
+ fi |
311 |
+} |
312 |
+ |
313 |
+src_install() { |
314 |
+ dobin haproxy |
315 |
+ |
316 |
+ newconfd "${FILESDIR}/${PN}.confd" $PN |
317 |
+ newinitd "${FILESDIR}/${PN}.initd-r3" $PN |
318 |
+ |
319 |
+ doman doc/haproxy.1 |
320 |
+ |
321 |
+ dobin haproxy-systemd-wrapper |
322 |
+ systemd_dounit contrib/systemd/haproxy.service |
323 |
+ |
324 |
+ einstalldocs |
325 |
+ |
326 |
+ # The errorfiles are used by upstream defaults. |
327 |
+ insinto /etc/haproxy/errors/ |
328 |
+ doins examples/errorfiles/* |
329 |
+ |
330 |
+ if use doc; then |
331 |
+ dodoc ROADMAP doc/*.txt |
332 |
+ #if use lua; then |
333 |
+ # TODO: doc/lua-api/ |
334 |
+ #fi |
335 |
+ fi |
336 |
+ |
337 |
+ if use tools ; then |
338 |
+ has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog |
339 |
+ has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange |
340 |
+ has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range |
341 |
+ has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example |
342 |
+ has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example |
343 |
+ has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop |
344 |
+ fi |
345 |
+ |
346 |
+ if use examples ; then |
347 |
+ docinto examples |
348 |
+ dodoc examples/*.cfg |
349 |
+ dodoc examples/seamless_reload.txt |
350 |
+ fi |
351 |
+ |
352 |
+ if use vim-syntax ; then |
353 |
+ insinto /usr/share/vim/vimfiles/syntax |
354 |
+ doins examples/haproxy.vim |
355 |
+ fi |
356 |
+} |
357 |
+ |
358 |
+pkg_postinst() { |
359 |
+ if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then |
360 |
+ ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service." |
361 |
+ ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created." |
362 |
+ ewarn "Make use of them with the \"user\" and \"group\" directives." |
363 |
+ |
364 |
+ if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then |
365 |
+ einfo "Please consult the installed documentation for learning the configuration file's syntax." |
366 |
+ einfo "The documentation and sample configuration files are installed here:" |
367 |
+ einfo " ${EROOT}usr/share/doc/${PF}" |
368 |
+ fi |
369 |
+ fi |
370 |
+} |