1 |
commit: 8cda07fe4e5f899b7756a547ede64c4c6da39f13 |
2 |
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Nov 27 09:27:05 2019 +0000 |
4 |
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Nov 27 09:51:37 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cda07fe |
7 |
|
8 |
net-proxy/haproxy: Cleanup old versions |
9 |
|
10 |
Package-Manager: Portage-2.3.78, Repoman-2.3.17 |
11 |
Signed-off-by: Christian Ruppert <idl0r <AT> gentoo.org> |
12 |
|
13 |
net-proxy/haproxy/Manifest | 4 - |
14 |
net-proxy/haproxy/files/haproxy-1.7-contrib.patch | 31 ---- |
15 |
net-proxy/haproxy/haproxy-1.6.11-r2.ebuild | 164 ---------------------- |
16 |
net-proxy/haproxy/haproxy-1.6.15.ebuild | 158 --------------------- |
17 |
net-proxy/haproxy/haproxy-1.7.10.ebuild | 159 --------------------- |
18 |
net-proxy/haproxy/haproxy-1.7.12.ebuild | 159 --------------------- |
19 |
6 files changed, 675 deletions(-) |
20 |
|
21 |
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest |
22 |
index 22654dee2d2..ef7e789f4cb 100644 |
23 |
--- a/net-proxy/haproxy/Manifest |
24 |
+++ b/net-proxy/haproxy/Manifest |
25 |
@@ -1,7 +1,3 @@ |
26 |
-DIST haproxy-1.6.11.tar.gz 1574029 BLAKE2B 553f74c2c24a1b07cef2acc6fbc4def1bbe81e41a7b01ba44937c6ff2e14c1f1a4f1472dde229ecef1ed3170f4e89d356324cb2ce1e7d7064837f37fbd4c3b46 SHA512 73ff1c7301197b3bd75a3b1355787419676854d132ce2dcdacb2a296e297dcdfc52b0c571a4fb715e369f1126e1a58196fabb21f828c880f15904032da78e434 |
27 |
-DIST haproxy-1.6.15.tar.gz 1589782 BLAKE2B d65684b75c9577644d88a2ca17bf90f5cb845ca8c4c149ddf95a06b0ad2d25bb6a457c4c380c6cae4745bac2c00ec49cdb89df60ba8704965239cb0f2951670a SHA512 fd50c8451a357494a7c767347d1d9d957e07664e2388f3f8f0d492823e6d974d55b9f8699bd98c8d37d9829e4180c395569d0d7a4da2dc3c0f4849607598e9c0 |
28 |
-DIST haproxy-1.7.10.tar.gz 1750937 BLAKE2B 26d970862e415b079d4130fd00564677584a7aad74d6812cabed36de9a629321330434b7d4fdf7c2e8b2945b7f394ca33e444158e7fa9b49937db501ea33e78a SHA512 ca6c50848c559ee2ffb9af2d281c3931473dd90d1686d95d962cf604cd92d2feb2b63e006e217cf9078cf08fdd73dc523318c97e13400bc0ef325de47111394e |
29 |
-DIST haproxy-1.7.12.tar.gz 1760527 BLAKE2B da46b21140c242eda7df09a91d2f6fd88912e62aa0c316cd3cd6a7726be96cd9b579b3c908ec5aabec6a3e98a77e2b40f930c0e491e806ba2c1c857e5676fabc SHA512 66c099ff3057e5a18e0ac6155382cc208fe583a215ae530541056eb634e5c30062558ce182360772684c403b6574b5f02f900d90c847ffc5f6a823c41bfb7766 |
30 |
DIST haproxy-1.8.13.tar.gz 2063046 BLAKE2B 9ebccf2520719cdf209bc9a87bf28d015b5b673e0d017d5387af4025f930ac401f6a2cfa851583ffe6b6645b7b91ad255bb5db737688a1f310958072a11c8a80 SHA512 54d4cb0721a3868267d7e085b3d3bb050384e4279eb49e88abb925bb3ea8cc39ef9069bdc99b7b18a23fd22e0d29e24dfcb8a0507ddca9243a845e4418be9cc5 |
31 |
DIST haproxy-1.8.23.tar.gz 2101424 BLAKE2B e1be06fd604f8715d52ad66ea77a1eb56d38eae46442eca9d497bd4eb5f34124ba32f5c9f44d0232063af3f3803e37b205eda9bd21266064de6db287b49fabe6 SHA512 bfd65179345285f6f4581a7dce42e638b89e12717d4cb9218afa085759161e04b6c78307d04265a6c97cd484b67949781639da5236edb89137585c625130be4f |
32 |
DIST haproxy-1.8.9.tar.gz 2057051 BLAKE2B d81d18f68a27ae8a77660c1ecb1dfc28599263ebfd57f25ea574af2b101b35eb7a1a89ba4034b55dfa89673ae6ac4c0dca5428b4b494a02184b1b157850ce96b SHA512 e59c29af3a39d6212f012ae8341b169436e10e42fadaf8f1aa68d2bb7ee181fd1fe3b74640bfcd8c37c17dfc5062b36bd69d90290d7c59cd3e4648ef2ab1c8dd |
33 |
|
34 |
diff --git a/net-proxy/haproxy/files/haproxy-1.7-contrib.patch b/net-proxy/haproxy/files/haproxy-1.7-contrib.patch |
35 |
deleted file mode 100644 |
36 |
index 9ecffe7e3c7..00000000000 |
37 |
--- a/net-proxy/haproxy/files/haproxy-1.7-contrib.patch |
38 |
+++ /dev/null |
39 |
@@ -1,31 +0,0 @@ |
40 |
-diff -Nuar --exclude '*~' haproxy-1.7.9999.orig/contrib/tcploop/Makefile haproxy-1.7.9999/contrib/tcploop/Makefile |
41 |
---- haproxy-1.7.9999.orig/contrib/tcploop/Makefile 2016-12-04 16:08:05.497256646 -0800 |
42 |
-+++ haproxy-1.7.9999/contrib/tcploop/Makefile 2016-12-04 16:12:20.558141392 -0800 |
43 |
-@@ -5,7 +5,7 @@ |
44 |
- OBJS = tcploop |
45 |
- |
46 |
- tcploop: tcploop.c |
47 |
-- $(CC) $(OPTIMIZE) $(DEFINE) $(INCLUDE) -o $@ $^ |
48 |
-+ $(CC) $(OPTIMIZE) $(DEFINE) $(INCLUDE) $(LDFLAGS) -o $@ $^ $(LIBS) |
49 |
- |
50 |
- clean: |
51 |
- rm -f $(OBJS) *.[oas] *~ |
52 |
-diff -Nuar --exclude '*~' haproxy-1.7.9999.orig/contrib/spoa_example/Makefile haproxy-1.7.9999/contrib/spoa_example/Makefile |
53 |
---- haproxy-1.7.9999.orig/contrib/spoa_example/Makefile 2016-12-04 15:56:49.068302156 -0800 |
54 |
-+++ haproxy-1.7.9999/contrib/spoa_example/Makefile 2016-12-04 15:58:51.360644213 -0800 |
55 |
-@@ -6,13 +6,13 @@ |
56 |
- LD = $(CC) |
57 |
- |
58 |
- CFLAGS = -g -O2 -Wall -Werror -pthread |
59 |
--LDFLAGS = -lpthread |
60 |
-+LIBS = -lpthread |
61 |
- |
62 |
- OBJS = spoa.o |
63 |
- |
64 |
- |
65 |
- spoa: $(OBJS) |
66 |
-- $(LD) $(LDFLAGS) -o $@ $^ |
67 |
-+ $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) |
68 |
- |
69 |
- install: spoa |
70 |
- install spoa $(DESTDIR)$(BINDIR) |
71 |
|
72 |
diff --git a/net-proxy/haproxy/haproxy-1.6.11-r2.ebuild b/net-proxy/haproxy/haproxy-1.6.11-r2.ebuild |
73 |
deleted file mode 100644 |
74 |
index 9b9f889a0e0..00000000000 |
75 |
--- a/net-proxy/haproxy/haproxy-1.6.11-r2.ebuild |
76 |
+++ /dev/null |
77 |
@@ -1,164 +0,0 @@ |
78 |
-# Copyright 1999-2017 Gentoo Foundation |
79 |
-# Distributed under the terms of the GNU General Public License v2 |
80 |
- |
81 |
-EAPI="6" |
82 |
- |
83 |
-[[ ${PV} == *9999 ]] && SCM="git-r3" |
84 |
-inherit user versionator toolchain-funcs flag-o-matic systemd linux-info $SCM |
85 |
- |
86 |
-MY_P="${PN}-${PV/_beta/-dev}" |
87 |
- |
88 |
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments" |
89 |
-HOMEPAGE="http://haproxy.1wt.eu" |
90 |
-if [[ ${PV} != *9999 ]]; then |
91 |
- SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz" |
92 |
- KEYWORDS="amd64 arm ppc x86" |
93 |
-else |
94 |
- EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/" |
95 |
- EGIT_BRANCH=master |
96 |
-fi |
97 |
- |
98 |
-LICENSE="GPL-2 LGPL-2.1" |
99 |
-SLOT="0" |
100 |
-IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools vim-syntax +zlib lua device-atlas 51degrees wurfl" |
101 |
-REQUIRED_USE="pcre-jit? ( pcre ) |
102 |
- ?? ( slz zlib )" |
103 |
- |
104 |
-DEPEND=" |
105 |
- pcre? ( |
106 |
- dev-libs/libpcre |
107 |
- pcre-jit? ( dev-libs/libpcre[jit] ) |
108 |
- ) |
109 |
- ssl? ( |
110 |
- !libressl? ( dev-libs/openssl:0=[zlib?] ) |
111 |
- libressl? ( dev-libs/libressl:0= ) |
112 |
- ) |
113 |
- slz? ( dev-libs/libslz:= ) |
114 |
- zlib? ( sys-libs/zlib ) |
115 |
- lua? ( dev-lang/lua:5.3 ) |
116 |
- device-atlas? ( dev-libs/device-atlas-api-c )" |
117 |
-RDEPEND="${DEPEND}" |
118 |
- |
119 |
-S="${WORKDIR}/${MY_P}" |
120 |
- |
121 |
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) |
122 |
-version_is_at_least 1.7.0 $PV && PATCHES=( "${FILESDIR}"/haproxy-1.7-contrib.patch ) |
123 |
-CONTRIBS=( halog iprange ) |
124 |
-# ip6range is present in 1.6, but broken. |
125 |
-version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop ) |
126 |
- |
127 |
-haproxy_use() { |
128 |
- (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>" |
129 |
- |
130 |
- usex "${1}" "USE_${2}=1" "USE_${2}=" |
131 |
-} |
132 |
- |
133 |
-pkg_setup() { |
134 |
- enewgroup haproxy |
135 |
- enewuser haproxy -1 -1 -1 haproxy |
136 |
- |
137 |
- if use net_ns; then |
138 |
- CONFIG_CHECK="~NET_NS" |
139 |
- linux-info_pkg_setup |
140 |
- fi |
141 |
-} |
142 |
- |
143 |
-src_prepare() { |
144 |
- default |
145 |
- |
146 |
- sed -e 's:@SBINDIR@:'/usr/bin':' contrib/systemd/haproxy.service.in \ |
147 |
- > contrib/systemd/haproxy.service || die |
148 |
- |
149 |
- sed -ie 's:/usr/sbin/haproxy:/usr/bin/haproxy:' src/haproxy-systemd-wrapper.c || die |
150 |
-} |
151 |
- |
152 |
-src_compile() { |
153 |
- local -a args=( |
154 |
- TARGET=linux2628 |
155 |
- USE_GETADDRINFO=1 |
156 |
- USE_TFO=1 |
157 |
- ) |
158 |
- |
159 |
- args+=( $(haproxy_use crypt LIBCRYPT) ) |
160 |
- args+=( $(haproxy_use net_ns NS) ) |
161 |
- args+=( $(haproxy_use pcre PCRE) ) |
162 |
- args+=( $(haproxy_use pcre-jit PCRE_JIT) ) |
163 |
- args+=( $(haproxy_use ssl OPENSSL) ) |
164 |
- args+=( $(haproxy_use slz SLZ) ) |
165 |
- args+=( $(haproxy_use zlib ZLIB) ) |
166 |
- args+=( $(haproxy_use lua LUA) ) |
167 |
- args+=( $(haproxy_use 51degrees 51DEGREES) ) |
168 |
- args+=( $(haproxy_use device-atlas DEVICEATLAS) ) |
169 |
- args+=( $(haproxy_use wurfl WURFL) ) |
170 |
- |
171 |
- # For now, until the strict-aliasing breakage will be fixed |
172 |
- append-cflags -fno-strict-aliasing |
173 |
- |
174 |
- emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} |
175 |
- |
176 |
- if use tools ; then |
177 |
- for contrib in ${CONTRIBS[@]} ; do |
178 |
- emake -C contrib/${contrib} \ |
179 |
- CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} |
180 |
- done |
181 |
- fi |
182 |
-} |
183 |
- |
184 |
-src_install() { |
185 |
- dobin haproxy |
186 |
- |
187 |
- newconfd "${FILESDIR}/${PN}.confd" $PN |
188 |
- newinitd "${FILESDIR}/${PN}.initd-r6" $PN |
189 |
- |
190 |
- doman doc/haproxy.1 |
191 |
- |
192 |
- dobin haproxy-systemd-wrapper |
193 |
- systemd_dounit contrib/systemd/haproxy.service |
194 |
- |
195 |
- einstalldocs |
196 |
- |
197 |
- # The errorfiles are used by upstream defaults. |
198 |
- insinto /etc/haproxy/errors/ |
199 |
- doins examples/errorfiles/* |
200 |
- |
201 |
- if use doc; then |
202 |
- dodoc ROADMAP doc/*.txt |
203 |
- #if use lua; then |
204 |
- # TODO: doc/lua-api/ |
205 |
- #fi |
206 |
- fi |
207 |
- |
208 |
- if use tools ; then |
209 |
- has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog |
210 |
- has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange |
211 |
- has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range |
212 |
- has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example |
213 |
- has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example |
214 |
- has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop |
215 |
- fi |
216 |
- |
217 |
- if use examples ; then |
218 |
- docinto examples |
219 |
- dodoc examples/*.cfg |
220 |
- dodoc examples/seamless_reload.txt |
221 |
- fi |
222 |
- |
223 |
- if use vim-syntax ; then |
224 |
- insinto /usr/share/vim/vimfiles/syntax |
225 |
- doins examples/haproxy.vim |
226 |
- fi |
227 |
-} |
228 |
- |
229 |
-pkg_postinst() { |
230 |
- if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then |
231 |
- ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service." |
232 |
- ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created." |
233 |
- ewarn "Make use of them with the \"user\" and \"group\" directives." |
234 |
- |
235 |
- if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then |
236 |
- einfo "Please consult the installed documentation for learning the configuration file's syntax." |
237 |
- einfo "The documentation and sample configuration files are installed here:" |
238 |
- einfo " ${EROOT}usr/share/doc/${PF}" |
239 |
- fi |
240 |
- fi |
241 |
-} |
242 |
|
243 |
diff --git a/net-proxy/haproxy/haproxy-1.6.15.ebuild b/net-proxy/haproxy/haproxy-1.6.15.ebuild |
244 |
deleted file mode 100644 |
245 |
index 634b436d835..00000000000 |
246 |
--- a/net-proxy/haproxy/haproxy-1.6.15.ebuild |
247 |
+++ /dev/null |
248 |
@@ -1,158 +0,0 @@ |
249 |
-# Copyright 1999-2019 Gentoo Authors |
250 |
-# Distributed under the terms of the GNU General Public License v2 |
251 |
- |
252 |
-EAPI="6" |
253 |
- |
254 |
-[[ ${PV} == *9999 ]] && SCM="git-r3" |
255 |
-inherit user versionator toolchain-funcs flag-o-matic systemd linux-info $SCM |
256 |
- |
257 |
-MY_P="${PN}-${PV/_beta/-dev}" |
258 |
- |
259 |
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments" |
260 |
-HOMEPAGE="http://haproxy.1wt.eu" |
261 |
-if [[ ${PV} != *9999 ]]; then |
262 |
- SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz" |
263 |
- KEYWORDS="~amd64 ~arm ~ppc ~x86" |
264 |
-else |
265 |
- EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/" |
266 |
- EGIT_BRANCH=master |
267 |
-fi |
268 |
- |
269 |
-LICENSE="GPL-2 LGPL-2.1" |
270 |
-SLOT="0" |
271 |
-IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools vim-syntax +zlib lua device-atlas 51degrees wurfl" |
272 |
-REQUIRED_USE="pcre-jit? ( pcre ) |
273 |
- ?? ( slz zlib )" |
274 |
- |
275 |
-DEPEND=" |
276 |
- pcre? ( |
277 |
- dev-libs/libpcre |
278 |
- pcre-jit? ( dev-libs/libpcre[jit] ) |
279 |
- ) |
280 |
- ssl? ( |
281 |
- !libressl? ( dev-libs/openssl:0=[zlib?] ) |
282 |
- libressl? ( dev-libs/libressl:0= ) |
283 |
- ) |
284 |
- slz? ( dev-libs/libslz:= ) |
285 |
- zlib? ( sys-libs/zlib ) |
286 |
- lua? ( dev-lang/lua:5.3 ) |
287 |
- device-atlas? ( dev-libs/device-atlas-api-c )" |
288 |
-RDEPEND="${DEPEND}" |
289 |
- |
290 |
-S="${WORKDIR}/${MY_P}" |
291 |
- |
292 |
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) |
293 |
-version_is_at_least 1.7.0 $PV && PATCHES=( "${FILESDIR}"/haproxy-1.7-contrib.patch ) |
294 |
-CONTRIBS=( halog iprange ) |
295 |
-# ip6range is present in 1.6, but broken. |
296 |
-version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop ) |
297 |
- |
298 |
-haproxy_use() { |
299 |
- (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>" |
300 |
- |
301 |
- usex "${1}" "USE_${2}=1" "USE_${2}=" |
302 |
-} |
303 |
- |
304 |
-pkg_setup() { |
305 |
- enewgroup haproxy |
306 |
- enewuser haproxy -1 -1 -1 haproxy |
307 |
- |
308 |
- if use net_ns; then |
309 |
- CONFIG_CHECK="~NET_NS" |
310 |
- linux-info_pkg_setup |
311 |
- fi |
312 |
-} |
313 |
- |
314 |
-src_compile() { |
315 |
- local -a args=( |
316 |
- TARGET=linux2628 |
317 |
- USE_GETADDRINFO=1 |
318 |
- USE_TFO=1 |
319 |
- ) |
320 |
- |
321 |
- args+=( $(haproxy_use crypt LIBCRYPT) ) |
322 |
- args+=( $(haproxy_use net_ns NS) ) |
323 |
- args+=( $(haproxy_use pcre PCRE) ) |
324 |
- args+=( $(haproxy_use pcre-jit PCRE_JIT) ) |
325 |
- args+=( $(haproxy_use ssl OPENSSL) ) |
326 |
- args+=( $(haproxy_use slz SLZ) ) |
327 |
- args+=( $(haproxy_use zlib ZLIB) ) |
328 |
- args+=( $(haproxy_use lua LUA) ) |
329 |
- args+=( $(haproxy_use 51degrees 51DEGREES) ) |
330 |
- args+=( $(haproxy_use device-atlas DEVICEATLAS) ) |
331 |
- args+=( $(haproxy_use wurfl WURFL) ) |
332 |
- |
333 |
- # For now, until the strict-aliasing breakage will be fixed |
334 |
- append-cflags -fno-strict-aliasing |
335 |
- |
336 |
- emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} |
337 |
- emake -C contrib/systemd SBINDIR=/usr/sbin |
338 |
- |
339 |
- if use tools ; then |
340 |
- for contrib in ${CONTRIBS[@]} ; do |
341 |
- emake -C contrib/${contrib} \ |
342 |
- CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} |
343 |
- done |
344 |
- fi |
345 |
-} |
346 |
- |
347 |
-src_install() { |
348 |
- dosbin haproxy |
349 |
- dosym /usr/sbin/haproxy /usr/bin/haproxy |
350 |
- |
351 |
- newconfd "${FILESDIR}/${PN}.confd" $PN |
352 |
- newinitd "${FILESDIR}/${PN}.initd-r6" $PN |
353 |
- |
354 |
- doman doc/haproxy.1 |
355 |
- |
356 |
- dosbin haproxy-systemd-wrapper |
357 |
- dosym /usr/sbin/haproxy-systemd-wrapper /usr/bin/haproxy-systemd-wrapper |
358 |
- systemd_dounit contrib/systemd/haproxy.service |
359 |
- |
360 |
- einstalldocs |
361 |
- |
362 |
- # The errorfiles are used by upstream defaults. |
363 |
- insinto /etc/haproxy/errors/ |
364 |
- doins examples/errorfiles/* |
365 |
- |
366 |
- if use doc; then |
367 |
- dodoc ROADMAP doc/*.txt |
368 |
- #if use lua; then |
369 |
- # TODO: doc/lua-api/ |
370 |
- #fi |
371 |
- fi |
372 |
- |
373 |
- if use tools ; then |
374 |
- has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog |
375 |
- has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange |
376 |
- has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range |
377 |
- has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example |
378 |
- has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example |
379 |
- has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop |
380 |
- fi |
381 |
- |
382 |
- if use examples ; then |
383 |
- docinto examples |
384 |
- dodoc examples/*.cfg |
385 |
- dodoc examples/seamless_reload.txt |
386 |
- fi |
387 |
- |
388 |
- if use vim-syntax ; then |
389 |
- insinto /usr/share/vim/vimfiles/syntax |
390 |
- doins examples/haproxy.vim |
391 |
- fi |
392 |
-} |
393 |
- |
394 |
-pkg_postinst() { |
395 |
- if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then |
396 |
- ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service." |
397 |
- ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created." |
398 |
- ewarn "Make use of them with the \"user\" and \"group\" directives." |
399 |
- |
400 |
- if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then |
401 |
- einfo "Please consult the installed documentation for learning the configuration file's syntax." |
402 |
- einfo "The documentation and sample configuration files are installed here:" |
403 |
- einfo " ${EROOT}usr/share/doc/${PF}" |
404 |
- fi |
405 |
- fi |
406 |
-} |
407 |
|
408 |
diff --git a/net-proxy/haproxy/haproxy-1.7.10.ebuild b/net-proxy/haproxy/haproxy-1.7.10.ebuild |
409 |
deleted file mode 100644 |
410 |
index 2848b4df635..00000000000 |
411 |
--- a/net-proxy/haproxy/haproxy-1.7.10.ebuild |
412 |
+++ /dev/null |
413 |
@@ -1,159 +0,0 @@ |
414 |
-# Copyright 1999-2018 Gentoo Foundation |
415 |
-# Distributed under the terms of the GNU General Public License v2 |
416 |
- |
417 |
-EAPI="6" |
418 |
- |
419 |
-[[ ${PV} == *9999 ]] && SCM="git-r3" |
420 |
-inherit user versionator toolchain-funcs flag-o-matic systemd linux-info $SCM |
421 |
- |
422 |
-MY_P="${PN}-${PV/_beta/-dev}" |
423 |
- |
424 |
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments" |
425 |
-HOMEPAGE="http://haproxy.1wt.eu" |
426 |
-if [[ ${PV} != *9999 ]]; then |
427 |
- SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz" |
428 |
- KEYWORDS="amd64 arm ppc x86" |
429 |
-else |
430 |
- EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/" |
431 |
- EGIT_BRANCH=master |
432 |
-fi |
433 |
- |
434 |
-LICENSE="GPL-2 LGPL-2.1" |
435 |
-SLOT="0" |
436 |
-IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools vim-syntax +zlib lua device-atlas 51degrees wurfl" |
437 |
-REQUIRED_USE="pcre-jit? ( pcre ) |
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 |
- ssl? ( |
447 |
- !libressl? ( dev-libs/openssl:0=[zlib?] ) |
448 |
- libressl? ( dev-libs/libressl:0= ) |
449 |
- ) |
450 |
- slz? ( dev-libs/libslz:= ) |
451 |
- zlib? ( sys-libs/zlib ) |
452 |
- lua? ( dev-lang/lua:5.3 ) |
453 |
- device-atlas? ( dev-libs/device-atlas-api-c )" |
454 |
-RDEPEND="${DEPEND}" |
455 |
- |
456 |
-S="${WORKDIR}/${MY_P}" |
457 |
- |
458 |
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) |
459 |
-version_is_at_least 1.7.0 $PV && PATCHES=( "${FILESDIR}"/haproxy-1.7-contrib.patch ) |
460 |
-CONTRIBS=( halog iprange ) |
461 |
-# ip6range is present in 1.6, but broken. |
462 |
-version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop ) |
463 |
- |
464 |
-haproxy_use() { |
465 |
- (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>" |
466 |
- |
467 |
- usex "${1}" "USE_${2}=1" "USE_${2}=" |
468 |
-} |
469 |
- |
470 |
-pkg_setup() { |
471 |
- enewgroup haproxy |
472 |
- enewuser haproxy -1 -1 -1 haproxy |
473 |
- |
474 |
- if use net_ns; then |
475 |
- CONFIG_CHECK="~NET_NS" |
476 |
- linux-info_pkg_setup |
477 |
- fi |
478 |
-} |
479 |
- |
480 |
-src_compile() { |
481 |
- local -a args=( |
482 |
- TARGET=linux2628 |
483 |
- USE_GETADDRINFO=1 |
484 |
- USE_TFO=1 |
485 |
- ) |
486 |
- |
487 |
- args+=( $(haproxy_use crypt LIBCRYPT) ) |
488 |
- args+=( $(haproxy_use net_ns NS) ) |
489 |
- args+=( $(haproxy_use pcre PCRE) ) |
490 |
- args+=( $(haproxy_use pcre-jit PCRE_JIT) ) |
491 |
- args+=( $(haproxy_use ssl OPENSSL) ) |
492 |
- args+=( $(haproxy_use slz SLZ) ) |
493 |
- args+=( $(haproxy_use zlib ZLIB) ) |
494 |
- args+=( $(haproxy_use lua LUA) ) |
495 |
- args+=( $(haproxy_use 51degrees 51DEGREES) ) |
496 |
- args+=( $(haproxy_use device-atlas DEVICEATLAS) ) |
497 |
- args+=( $(haproxy_use wurfl WURFL) ) |
498 |
- |
499 |
- # For now, until the strict-aliasing breakage will be fixed |
500 |
- append-cflags -fno-strict-aliasing |
501 |
- |
502 |
- emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} |
503 |
- emake -C contrib/systemd SBINDIR=/usr/sbin |
504 |
- |
505 |
- if use tools ; then |
506 |
- for contrib in ${CONTRIBS[@]} ; do |
507 |
- emake -C contrib/${contrib} \ |
508 |
- CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} |
509 |
- done |
510 |
- fi |
511 |
-} |
512 |
- |
513 |
-src_install() { |
514 |
- dosbin haproxy |
515 |
- dosym /usr/sbin/haproxy /usr/bin/haproxy |
516 |
- |
517 |
- newconfd "${FILESDIR}/${PN}.confd" $PN |
518 |
- newinitd "${FILESDIR}/${PN}.initd-r6" $PN |
519 |
- |
520 |
- doman doc/haproxy.1 |
521 |
- |
522 |
- dosbin haproxy-systemd-wrapper |
523 |
- dosym /usr/sbin/haproxy-systemd-wrapper /usr/bin/haproxy-systemd-wrapper |
524 |
- systemd_dounit contrib/systemd/haproxy.service |
525 |
- |
526 |
- einstalldocs |
527 |
- |
528 |
- # The errorfiles are used by upstream defaults. |
529 |
- insinto /etc/haproxy/errors/ |
530 |
- doins examples/errorfiles/* |
531 |
- |
532 |
- if use doc; then |
533 |
- dodoc ROADMAP doc/*.txt |
534 |
- #if use lua; then |
535 |
- # TODO: doc/lua-api/ |
536 |
- #fi |
537 |
- fi |
538 |
- |
539 |
- if use tools ; then |
540 |
- has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog |
541 |
- has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange |
542 |
- has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range |
543 |
- has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example |
544 |
- has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example |
545 |
- has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop |
546 |
- fi |
547 |
- |
548 |
- if use examples ; then |
549 |
- docinto examples |
550 |
- dodoc examples/*.cfg |
551 |
- dodoc examples/seamless_reload.txt |
552 |
- fi |
553 |
- |
554 |
- if use vim-syntax ; then |
555 |
- insinto /usr/share/vim/vimfiles/syntax |
556 |
- doins examples/haproxy.vim |
557 |
- fi |
558 |
-} |
559 |
- |
560 |
-pkg_postinst() { |
561 |
- if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then |
562 |
- ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service." |
563 |
- ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created." |
564 |
- ewarn "Make use of them with the \"user\" and \"group\" directives." |
565 |
- |
566 |
- if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then |
567 |
- einfo "Please consult the installed documentation for learning the configuration file's syntax." |
568 |
- einfo "The documentation and sample configuration files are installed here:" |
569 |
- einfo " ${EROOT}usr/share/doc/${PF}" |
570 |
- fi |
571 |
- fi |
572 |
-} |
573 |
|
574 |
diff --git a/net-proxy/haproxy/haproxy-1.7.12.ebuild b/net-proxy/haproxy/haproxy-1.7.12.ebuild |
575 |
deleted file mode 100644 |
576 |
index 0b2ddea1094..00000000000 |
577 |
--- a/net-proxy/haproxy/haproxy-1.7.12.ebuild |
578 |
+++ /dev/null |
579 |
@@ -1,159 +0,0 @@ |
580 |
-# Copyright 1999-2019 Gentoo Authors |
581 |
-# Distributed under the terms of the GNU General Public License v2 |
582 |
- |
583 |
-EAPI="6" |
584 |
- |
585 |
-[[ ${PV} == *9999 ]] && SCM="git-r3" |
586 |
-inherit user versionator toolchain-funcs flag-o-matic systemd linux-info $SCM |
587 |
- |
588 |
-MY_P="${PN}-${PV/_beta/-dev}" |
589 |
- |
590 |
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments" |
591 |
-HOMEPAGE="http://haproxy.1wt.eu" |
592 |
-if [[ ${PV} != *9999 ]]; then |
593 |
- SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz" |
594 |
- KEYWORDS="~amd64 ~arm ~ppc ~x86" |
595 |
-else |
596 |
- EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/" |
597 |
- EGIT_BRANCH=master |
598 |
-fi |
599 |
- |
600 |
-LICENSE="GPL-2 LGPL-2.1" |
601 |
-SLOT="0" |
602 |
-IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools vim-syntax +zlib lua device-atlas 51degrees wurfl" |
603 |
-REQUIRED_USE="pcre-jit? ( pcre ) |
604 |
- device-atlas? ( pcre ) |
605 |
- ?? ( slz zlib )" |
606 |
- |
607 |
-DEPEND=" |
608 |
- pcre? ( |
609 |
- dev-libs/libpcre |
610 |
- pcre-jit? ( dev-libs/libpcre[jit] ) |
611 |
- ) |
612 |
- ssl? ( |
613 |
- !libressl? ( dev-libs/openssl:0=[zlib?] ) |
614 |
- libressl? ( dev-libs/libressl:0= ) |
615 |
- ) |
616 |
- slz? ( dev-libs/libslz:= ) |
617 |
- zlib? ( sys-libs/zlib ) |
618 |
- lua? ( dev-lang/lua:5.3 ) |
619 |
- device-atlas? ( dev-libs/device-atlas-api-c )" |
620 |
-RDEPEND="${DEPEND}" |
621 |
- |
622 |
-S="${WORKDIR}/${MY_P}" |
623 |
- |
624 |
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) |
625 |
-version_is_at_least 1.7.0 $PV && PATCHES=( "${FILESDIR}"/haproxy-1.7-contrib.patch ) |
626 |
-CONTRIBS=( halog iprange ) |
627 |
-# ip6range is present in 1.6, but broken. |
628 |
-version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop ) |
629 |
- |
630 |
-haproxy_use() { |
631 |
- (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>" |
632 |
- |
633 |
- usex "${1}" "USE_${2}=1" "USE_${2}=" |
634 |
-} |
635 |
- |
636 |
-pkg_setup() { |
637 |
- enewgroup haproxy |
638 |
- enewuser haproxy -1 -1 -1 haproxy |
639 |
- |
640 |
- if use net_ns; then |
641 |
- CONFIG_CHECK="~NET_NS" |
642 |
- linux-info_pkg_setup |
643 |
- fi |
644 |
-} |
645 |
- |
646 |
-src_compile() { |
647 |
- local -a args=( |
648 |
- TARGET=linux2628 |
649 |
- USE_GETADDRINFO=1 |
650 |
- USE_TFO=1 |
651 |
- ) |
652 |
- |
653 |
- args+=( $(haproxy_use crypt LIBCRYPT) ) |
654 |
- args+=( $(haproxy_use net_ns NS) ) |
655 |
- args+=( $(haproxy_use pcre PCRE) ) |
656 |
- args+=( $(haproxy_use pcre-jit PCRE_JIT) ) |
657 |
- args+=( $(haproxy_use ssl OPENSSL) ) |
658 |
- args+=( $(haproxy_use slz SLZ) ) |
659 |
- args+=( $(haproxy_use zlib ZLIB) ) |
660 |
- args+=( $(haproxy_use lua LUA) ) |
661 |
- args+=( $(haproxy_use 51degrees 51DEGREES) ) |
662 |
- args+=( $(haproxy_use device-atlas DEVICEATLAS) ) |
663 |
- args+=( $(haproxy_use wurfl WURFL) ) |
664 |
- |
665 |
- # For now, until the strict-aliasing breakage will be fixed |
666 |
- append-cflags -fno-strict-aliasing |
667 |
- |
668 |
- emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} |
669 |
- emake -C contrib/systemd SBINDIR=/usr/sbin |
670 |
- |
671 |
- if use tools ; then |
672 |
- for contrib in ${CONTRIBS[@]} ; do |
673 |
- emake -C contrib/${contrib} \ |
674 |
- CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} |
675 |
- done |
676 |
- fi |
677 |
-} |
678 |
- |
679 |
-src_install() { |
680 |
- dosbin haproxy |
681 |
- dosym /usr/sbin/haproxy /usr/bin/haproxy |
682 |
- |
683 |
- newconfd "${FILESDIR}/${PN}.confd" $PN |
684 |
- newinitd "${FILESDIR}/${PN}.initd-r6" $PN |
685 |
- |
686 |
- doman doc/haproxy.1 |
687 |
- |
688 |
- dosbin haproxy-systemd-wrapper |
689 |
- dosym /usr/sbin/haproxy-systemd-wrapper /usr/bin/haproxy-systemd-wrapper |
690 |
- systemd_dounit contrib/systemd/haproxy.service |
691 |
- |
692 |
- einstalldocs |
693 |
- |
694 |
- # The errorfiles are used by upstream defaults. |
695 |
- insinto /etc/haproxy/errors/ |
696 |
- doins examples/errorfiles/* |
697 |
- |
698 |
- if use doc; then |
699 |
- dodoc ROADMAP doc/*.txt |
700 |
- #if use lua; then |
701 |
- # TODO: doc/lua-api/ |
702 |
- #fi |
703 |
- fi |
704 |
- |
705 |
- if use tools ; then |
706 |
- has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog |
707 |
- has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange |
708 |
- has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range |
709 |
- has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example |
710 |
- has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example |
711 |
- has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop |
712 |
- fi |
713 |
- |
714 |
- if use examples ; then |
715 |
- docinto examples |
716 |
- dodoc examples/*.cfg |
717 |
- dodoc examples/seamless_reload.txt |
718 |
- fi |
719 |
- |
720 |
- if use vim-syntax ; then |
721 |
- insinto /usr/share/vim/vimfiles/syntax |
722 |
- doins examples/haproxy.vim |
723 |
- fi |
724 |
-} |
725 |
- |
726 |
-pkg_postinst() { |
727 |
- if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then |
728 |
- ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service." |
729 |
- ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created." |
730 |
- ewarn "Make use of them with the \"user\" and \"group\" directives." |
731 |
- |
732 |
- if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then |
733 |
- einfo "Please consult the installed documentation for learning the configuration file's syntax." |
734 |
- einfo "The documentation and sample configuration files are installed here:" |
735 |
- einfo " ${EROOT}usr/share/doc/${PF}" |
736 |
- fi |
737 |
- fi |
738 |
-} |