1 |
commit: f67e1a08b47a6993b97d1d3e27666249e1cfaeb1 |
2 |
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jan 29 08:46:29 2019 +0000 |
4 |
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 29 08:47:23 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f67e1a08 |
7 |
|
8 |
net-proxy/haproxy: Cleanup old versions |
9 |
|
10 |
Package-Manager: Portage-2.3.58, Repoman-2.3.12 |
11 |
Signed-off-by: Christian Ruppert <idl0r <AT> gentoo.org> |
12 |
|
13 |
net-proxy/haproxy/Manifest | 2 - |
14 |
net-proxy/haproxy/files/haproxy.initd-r2 | 46 ---------- |
15 |
net-proxy/haproxy/haproxy-1.5.14.ebuild | 134 ---------------------------- |
16 |
net-proxy/haproxy/haproxy-1.5.19-r2.ebuild | 135 ----------------------------- |
17 |
4 files changed, 317 deletions(-) |
18 |
|
19 |
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest |
20 |
index 4bfa08e4930..1c0b0271536 100644 |
21 |
--- a/net-proxy/haproxy/Manifest |
22 |
+++ b/net-proxy/haproxy/Manifest |
23 |
@@ -1,5 +1,3 @@ |
24 |
-DIST haproxy-1.5.14.tar.gz 1345345 BLAKE2B b2971826c81716f126e3f9cef9861c425a44348fb0824ea65f55c82917f8b80441ee7752bff5e1c1c9cf22492577b0bf256b2955cba7c81f79e1e19616eb7a41 SHA512 83d6101fd402f37845ab3febc914335e4c6d9bdebbb0ff81c8e048d5252ffa5a1b77c4250a434fed5dd541ef1f1f2c47d969b59f7a51d6ab9aea38a8646a9798 |
25 |
-DIST haproxy-1.5.19.tar.gz 1362834 BLAKE2B 72543acf3e78b804e778746ae0dbd1a386e31c9f3f956d91da49e5c4c5f2ace8e46e99372148e7cb97f52a1812501c21319c06eb0230928522d674825b3b1e17 SHA512 3462458350d76fe5634428f7b443f21e2d8d4a171ab6254736db2d64587707d11d0df1d851d629c5a2cdfb2858e98cc9345d592859c6d6d8a352b57542dc465a |
26 |
DIST haproxy-1.6.11.tar.gz 1574029 BLAKE2B 553f74c2c24a1b07cef2acc6fbc4def1bbe81e41a7b01ba44937c6ff2e14c1f1a4f1472dde229ecef1ed3170f4e89d356324cb2ce1e7d7064837f37fbd4c3b46 SHA512 73ff1c7301197b3bd75a3b1355787419676854d132ce2dcdacb2a296e297dcdfc52b0c571a4fb715e369f1126e1a58196fabb21f828c880f15904032da78e434 |
27 |
DIST haproxy-1.6.14.tar.gz 1583859 BLAKE2B 91695f0b3d901ba70b6bce6572c2f549479c28010ed391b20faae7cd1fd84cdb181e560353337eb9230e38ac2570673725884c131501820c3ef4559ef12f95f2 SHA512 389be3935d901af1fb3a748b5bf73a454578a3ca3e4cc0b881980c2f1e875c47feb2681b42f8d9244d70777261a965c8e47cf5175b7790ff995bff8333902a11 |
28 |
DIST haproxy-1.7.10.tar.gz 1750937 BLAKE2B 26d970862e415b079d4130fd00564677584a7aad74d6812cabed36de9a629321330434b7d4fdf7c2e8b2945b7f394ca33e444158e7fa9b49937db501ea33e78a SHA512 ca6c50848c559ee2ffb9af2d281c3931473dd90d1686d95d962cf604cd92d2feb2b63e006e217cf9078cf08fdd73dc523318c97e13400bc0ef325de47111394e |
29 |
|
30 |
diff --git a/net-proxy/haproxy/files/haproxy.initd-r2 b/net-proxy/haproxy/files/haproxy.initd-r2 |
31 |
deleted file mode 100644 |
32 |
index e58c7c1fbfb..00000000000 |
33 |
--- a/net-proxy/haproxy/files/haproxy.initd-r2 |
34 |
+++ /dev/null |
35 |
@@ -1,46 +0,0 @@ |
36 |
-#!/sbin/openrc-run |
37 |
-# Copyright 1999-2016 Gentoo Foundation |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
- |
40 |
-extra_commands="checkconfig" |
41 |
-extra_started_commands="reload" |
42 |
- |
43 |
-command="/usr/bin/haproxy" |
44 |
-pidfile="/run/${SVCNAME}.pid" |
45 |
- |
46 |
-if [ -z "${CONFFILE}" -a -d "/etc/haproxy" -a -f "/etc/haproxy/${SVCNAME}.cfg" ]; then |
47 |
- CONFFILE=/etc/haproxy/${SVCNAME}.cfg |
48 |
-else |
49 |
- CONFFILE=/etc/${SVCNAME}.cfg |
50 |
-fi |
51 |
- |
52 |
-command_args="-D -p ${pidfile} -f ${CONFFILE}" |
53 |
- |
54 |
-depend() { |
55 |
- need net |
56 |
- use dns logger |
57 |
-} |
58 |
- |
59 |
-checkconfig() { |
60 |
- if [ ! -f "${CONFFILE}" ]; then |
61 |
- eerror "${CONFFILE} does not exist!" |
62 |
- return 1 |
63 |
- fi |
64 |
- |
65 |
- ebegin "Checking ${CONFFILE}" |
66 |
- $command -q -c -f "${CONFFILE}" |
67 |
- eend $? |
68 |
-} |
69 |
- |
70 |
-stop_pre() { |
71 |
- if [ "${RC_CMD}" = "restart" ]; then |
72 |
- checkconfig || return 1 |
73 |
- fi |
74 |
-} |
75 |
- |
76 |
-reload() { |
77 |
- ebegin "Reloading ${SVCNAME}" |
78 |
- checkconfig || { eerror "Reloading failed, please fix your ${CONFFILE} first"; return 1; } |
79 |
- $command -D -p "${pidfile}" -f "${CONFFILE}" -sf $(cat "${pidfile}") |
80 |
- eend $? |
81 |
-} |
82 |
|
83 |
diff --git a/net-proxy/haproxy/haproxy-1.5.14.ebuild b/net-proxy/haproxy/haproxy-1.5.14.ebuild |
84 |
deleted file mode 100644 |
85 |
index 6a343de9ba8..00000000000 |
86 |
--- a/net-proxy/haproxy/haproxy-1.5.14.ebuild |
87 |
+++ /dev/null |
88 |
@@ -1,134 +0,0 @@ |
89 |
-# Copyright 1999-2015 Gentoo Foundation |
90 |
-# Distributed under the terms of the GNU General Public License v2 |
91 |
- |
92 |
-EAPI="5" |
93 |
- |
94 |
-inherit user versionator toolchain-funcs flag-o-matic systemd |
95 |
- |
96 |
-MY_P="${PN}-${PV/_beta/-dev}" |
97 |
- |
98 |
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments" |
99 |
-HOMEPAGE="http://haproxy.1wt.eu" |
100 |
-SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz" |
101 |
- |
102 |
-LICENSE="GPL-2 LGPL-2.1" |
103 |
-SLOT="0" |
104 |
-KEYWORDS="amd64 ppc x86" |
105 |
-IUSE="+crypt examples +pcre pcre-jit ssl tools vim-syntax +zlib" |
106 |
- |
107 |
-DEPEND="pcre? ( dev-libs/libpcre |
108 |
- pcre-jit? ( dev-libs/libpcre[jit] ) |
109 |
- ) |
110 |
- ssl? ( dev-libs/openssl:0[zlib?] ) |
111 |
- zlib? ( sys-libs/zlib )" |
112 |
-RDEPEND="${DEPEND}" |
113 |
- |
114 |
-S="${WORKDIR}/${MY_P}" |
115 |
- |
116 |
-pkg_setup() { |
117 |
- enewgroup haproxy |
118 |
- enewuser haproxy -1 -1 -1 haproxy |
119 |
-} |
120 |
- |
121 |
-src_prepare() { |
122 |
- sed -e 's:@SBINDIR@:'/usr/bin':' contrib/systemd/haproxy.service.in \ |
123 |
- > contrib/systemd/haproxy.service || die |
124 |
- |
125 |
- sed -ie 's:/usr/sbin/haproxy:/usr/bin/haproxy:' src/haproxy-systemd-wrapper.c || die |
126 |
-} |
127 |
- |
128 |
-src_compile() { |
129 |
- local args="TARGET=linux2628 USE_GETADDRINFO=1" |
130 |
- |
131 |
- if use pcre ; then |
132 |
- args="${args} USE_PCRE=1" |
133 |
- if use pcre-jit; then |
134 |
- args="${args} USE_PCRE_JIT=1" |
135 |
- else |
136 |
- args="${args} USE_PCRE_JIT=" |
137 |
- fi |
138 |
- else |
139 |
- args="${args} USE_PCRE= USE_PCRE_JIT=" |
140 |
- fi |
141 |
- |
142 |
-# if use kernel_linux; then |
143 |
-# args="${args} USE_LINUX_SPLICE=1 USE_LINUX_TPROXY=1" |
144 |
-# else |
145 |
-# args="${args} USE_LINUX_SPLICE= USE_LINUX_TPROXY=" |
146 |
-# fi |
147 |
- |
148 |
- if use crypt ; then |
149 |
- args="${args} USE_LIBCRYPT=1" |
150 |
- else |
151 |
- args="${args} USE_LIBCRYPT=" |
152 |
- fi |
153 |
- |
154 |
- if use ssl ; then |
155 |
- args="${args} USE_OPENSSL=1" |
156 |
- else |
157 |
- args="${args} USE_OPENSSL=" |
158 |
- fi |
159 |
- |
160 |
- if use zlib ; then |
161 |
- args="${args} USE_ZLIB=1" |
162 |
- else |
163 |
- args="${args} USE_ZLIB=" |
164 |
- fi |
165 |
- |
166 |
- # For now, until the strict-aliasing breakage will be fixed |
167 |
- append-cflags -fno-strict-aliasing |
168 |
- |
169 |
- emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args} |
170 |
- |
171 |
- if use tools ; then |
172 |
- for contrib in halog iprange ; do |
173 |
- emake -C contrib/${contrib} \ |
174 |
- CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args} |
175 |
- done |
176 |
- fi |
177 |
-} |
178 |
- |
179 |
-src_install() { |
180 |
- dobin haproxy |
181 |
- |
182 |
- newinitd "${FILESDIR}/haproxy.initd-r2" haproxy |
183 |
- |
184 |
- # Don't install useless files |
185 |
-# rm examples/build.cfg doc/*gpl.txt |
186 |
- |
187 |
- dodoc CHANGELOG ROADMAP doc/{configuration,haproxy-en}.txt |
188 |
- doman doc/haproxy.1 |
189 |
- |
190 |
- dobin haproxy-systemd-wrapper |
191 |
- systemd_dounit contrib/systemd/haproxy.service |
192 |
- |
193 |
- if use tools ; then |
194 |
- for contrib in halog iprange ; do |
195 |
- dobin contrib/${contrib}/${contrib} |
196 |
- done |
197 |
- fi |
198 |
- |
199 |
- if use examples ; then |
200 |
- docinto examples |
201 |
- dodoc examples/*.cfg |
202 |
- fi |
203 |
- |
204 |
- if use vim-syntax ; then |
205 |
- insinto /usr/share/vim/vimfiles/syntax |
206 |
- doins examples/haproxy.vim |
207 |
- fi |
208 |
-} |
209 |
- |
210 |
-pkg_postinst() { |
211 |
- if [[ ! -f "${ROOT}/etc/haproxy.cfg" ]] ; then |
212 |
- ewarn "You need to create /etc/haproxy.cfg before you start the haproxy service." |
213 |
- ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created." |
214 |
- ewarn "Make use of them with the \"user\" and \"group\" directives." |
215 |
- |
216 |
- if [[ -d "${ROOT}/usr/share/doc/${PF}" ]]; then |
217 |
- einfo "Please consult the installed documentation for learning the configuration file's syntax." |
218 |
- einfo "The documentation and sample configuration files are installed here:" |
219 |
- einfo " ${ROOT}usr/share/doc/${PF}" |
220 |
- fi |
221 |
- fi |
222 |
-} |
223 |
|
224 |
diff --git a/net-proxy/haproxy/haproxy-1.5.19-r2.ebuild b/net-proxy/haproxy/haproxy-1.5.19-r2.ebuild |
225 |
deleted file mode 100644 |
226 |
index 7b4655b91af..00000000000 |
227 |
--- a/net-proxy/haproxy/haproxy-1.5.19-r2.ebuild |
228 |
+++ /dev/null |
229 |
@@ -1,135 +0,0 @@ |
230 |
-# Copyright 1999-2017 Gentoo Foundation |
231 |
-# Distributed under the terms of the GNU General Public License v2 |
232 |
- |
233 |
-EAPI="5" |
234 |
- |
235 |
-inherit user versionator toolchain-funcs flag-o-matic systemd |
236 |
- |
237 |
-MY_P="${PN}-${PV/_beta/-dev}" |
238 |
- |
239 |
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments" |
240 |
-HOMEPAGE="http://haproxy.1wt.eu" |
241 |
-SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz" |
242 |
- |
243 |
-LICENSE="GPL-2 LGPL-2.1" |
244 |
-SLOT="0" |
245 |
-KEYWORDS="~amd64 ~arm ~ppc ~x86" |
246 |
-IUSE="+crypt examples libressl +pcre pcre-jit ssl tools vim-syntax +zlib" |
247 |
- |
248 |
-DEPEND=" |
249 |
- pcre? ( |
250 |
- dev-libs/libpcre |
251 |
- pcre-jit? ( dev-libs/libpcre[jit] ) |
252 |
- ) |
253 |
- ssl? ( |
254 |
- !libressl? ( dev-libs/openssl:0=[zlib?] ) |
255 |
- libressl? ( dev-libs/libressl:0= ) |
256 |
- ) |
257 |
- zlib? ( sys-libs/zlib )" |
258 |
-RDEPEND="${DEPEND}" |
259 |
- |
260 |
-S="${WORKDIR}/${MY_P}" |
261 |
- |
262 |
-pkg_setup() { |
263 |
- enewgroup haproxy |
264 |
- enewuser haproxy -1 -1 -1 haproxy |
265 |
-} |
266 |
- |
267 |
-src_compile() { |
268 |
- local args="TARGET=linux2628 USE_GETADDRINFO=1" |
269 |
- |
270 |
- if use pcre ; then |
271 |
- args="${args} USE_PCRE=1" |
272 |
- if use pcre-jit; then |
273 |
- args="${args} USE_PCRE_JIT=1" |
274 |
- else |
275 |
- args="${args} USE_PCRE_JIT=" |
276 |
- fi |
277 |
- else |
278 |
- args="${args} USE_PCRE= USE_PCRE_JIT=" |
279 |
- fi |
280 |
- |
281 |
-# if use kernel_linux; then |
282 |
-# args="${args} USE_LINUX_SPLICE=1 USE_LINUX_TPROXY=1" |
283 |
-# else |
284 |
-# args="${args} USE_LINUX_SPLICE= USE_LINUX_TPROXY=" |
285 |
-# fi |
286 |
- |
287 |
- if use crypt ; then |
288 |
- args="${args} USE_LIBCRYPT=1" |
289 |
- else |
290 |
- args="${args} USE_LIBCRYPT=" |
291 |
- fi |
292 |
- |
293 |
- if use ssl ; then |
294 |
- args="${args} USE_OPENSSL=1" |
295 |
- else |
296 |
- args="${args} USE_OPENSSL=" |
297 |
- fi |
298 |
- |
299 |
- if use zlib ; then |
300 |
- args="${args} USE_ZLIB=1" |
301 |
- else |
302 |
- args="${args} USE_ZLIB=" |
303 |
- fi |
304 |
- |
305 |
- # For now, until the strict-aliasing breakage will be fixed |
306 |
- append-cflags -fno-strict-aliasing |
307 |
- |
308 |
- emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args} |
309 |
- emake -C contrib/systemd SBINDIR=/usr/sbin |
310 |
- |
311 |
- if use tools ; then |
312 |
- for contrib in halog iprange ; do |
313 |
- emake -C contrib/${contrib} \ |
314 |
- CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args} |
315 |
- done |
316 |
- fi |
317 |
-} |
318 |
- |
319 |
-src_install() { |
320 |
- dosbin haproxy |
321 |
- dosym /usr/sbin/haproxy /usr/bin/haproxy |
322 |
- |
323 |
- newinitd "${FILESDIR}/haproxy.initd-r6" haproxy |
324 |
- |
325 |
- # Don't install useless files |
326 |
-# rm examples/build.cfg doc/*gpl.txt |
327 |
- |
328 |
- dodoc CHANGELOG ROADMAP doc/{configuration,haproxy-en}.txt |
329 |
- doman doc/haproxy.1 |
330 |
- |
331 |
- dosbin haproxy-systemd-wrapper |
332 |
- dosym /usr/sbin/haproxy-systemd-wrapper /usr/bin/haproxy-systemd-wrapper |
333 |
- systemd_dounit contrib/systemd/haproxy.service |
334 |
- |
335 |
- if use tools ; then |
336 |
- for contrib in halog iprange ; do |
337 |
- dobin contrib/${contrib}/${contrib} |
338 |
- done |
339 |
- fi |
340 |
- |
341 |
- if use examples ; then |
342 |
- docinto examples |
343 |
- dodoc examples/*.cfg |
344 |
- fi |
345 |
- |
346 |
- if use vim-syntax ; then |
347 |
- insinto /usr/share/vim/vimfiles/syntax |
348 |
- doins examples/haproxy.vim |
349 |
- fi |
350 |
-} |
351 |
- |
352 |
-pkg_postinst() { |
353 |
- if [[ ! -f "${ROOT}/etc/haproxy.cfg" ]] ; then |
354 |
- ewarn "You need to create /etc/haproxy.cfg before you start the haproxy service." |
355 |
- ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created." |
356 |
- ewarn "Make use of them with the \"user\" and \"group\" directives." |
357 |
- |
358 |
- if [[ -d "${ROOT}/usr/share/doc/${PF}" ]]; then |
359 |
- einfo "Please consult the installed documentation for learning the configuration file's syntax." |
360 |
- einfo "The documentation and sample configuration files are installed here:" |
361 |
- einfo " ${ROOT}usr/share/doc/${PF}" |
362 |
- fi |
363 |
- fi |
364 |
-} |