1 |
commit: 745a33654cac030e18d13aa1dd068cd5b20192ee |
2 |
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 10 14:22:19 2019 +0000 |
4 |
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 10 14:22:29 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=745a3365 |
7 |
|
8 |
net-proxy/haproxy: Version bumps. Cleanup old versions |
9 |
|
10 |
Package-Manager: Portage-2.3.71, Repoman-2.3.17 |
11 |
Signed-off-by: Christian Ruppert <idl0r <AT> gentoo.org> |
12 |
|
13 |
net-proxy/haproxy/Manifest | 5 +- |
14 |
...haproxy-1.8.19.ebuild => haproxy-1.8.21.ebuild} | 0 |
15 |
net-proxy/haproxy/haproxy-1.9.9.ebuild | 173 --------------------- |
16 |
.../{haproxy-2.0.3.ebuild => haproxy-2.0.5.ebuild} | 0 |
17 |
4 files changed, 2 insertions(+), 176 deletions(-) |
18 |
|
19 |
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest |
20 |
index e09019fd8c4..d1ef236d2c0 100644 |
21 |
--- a/net-proxy/haproxy/Manifest |
22 |
+++ b/net-proxy/haproxy/Manifest |
23 |
@@ -3,10 +3,9 @@ DIST haproxy-1.6.14.tar.gz 1583859 BLAKE2B 91695f0b3d901ba70b6bce6572c2f549479c2 |
24 |
DIST haproxy-1.7.10.tar.gz 1750937 BLAKE2B 26d970862e415b079d4130fd00564677584a7aad74d6812cabed36de9a629321330434b7d4fdf7c2e8b2945b7f394ca33e444158e7fa9b49937db501ea33e78a SHA512 ca6c50848c559ee2ffb9af2d281c3931473dd90d1686d95d962cf604cd92d2feb2b63e006e217cf9078cf08fdd73dc523318c97e13400bc0ef325de47111394e |
25 |
DIST haproxy-1.7.11.tar.gz 1752129 BLAKE2B 1947ab837f6b81761eec931e97c7349462561abecc78b2b58b285ebb4b0ae498753d236f3a243d3b5c1115a9ff6e5fe9392d428314a6342e2c1907d6886e09e4 SHA512 48ee30a1057e92971c041b088b6aef16d6843da9ecee9b738aaa64bb55d3c3b0be090a37bb5fc63ac42fe34ce994820349cc770756136c823051039fa6d01f74 |
26 |
DIST haproxy-1.8.13.tar.gz 2063046 BLAKE2B 9ebccf2520719cdf209bc9a87bf28d015b5b673e0d017d5387af4025f930ac401f6a2cfa851583ffe6b6645b7b91ad255bb5db737688a1f310958072a11c8a80 SHA512 54d4cb0721a3868267d7e085b3d3bb050384e4279eb49e88abb925bb3ea8cc39ef9069bdc99b7b18a23fd22e0d29e24dfcb8a0507ddca9243a845e4418be9cc5 |
27 |
-DIST haproxy-1.8.19.tar.gz 2080757 BLAKE2B 46a97620f3b5c3f205e8b9d6e49acca8e107a1e6918ac18c036b9c3408666348400f8d9f6f4a4103e7f206c6373b25a224536c0969e2dad1013c2320b07b0ced SHA512 f62b0a18f19295986d26c5c60b6b1ad55850a175bed67a359282cc37a4c630a0c2be51d608226b4316f2e69c3008c20a1cb91ce10f86311219355973a050e65b |
28 |
DIST haproxy-1.8.20.tar.gz 2083917 BLAKE2B a73e01bacd6c3d256f92bba3dc5f1d38feea686d92d9ba2d93c33c082b10f84e0f150b3ce3e98cddaa664443c3661220f2993fea2d52bc3d6c32d5c913e70471 SHA512 c288ccf223da71a29ae0f08f3c9753002735816229ea83ca497d46c860fb8a4bd422077a94652aa475e48aefb78787979cdce7f1bd0b5919dc671ba25212c133 |
29 |
+DIST haproxy-1.8.21.tar.gz 2097089 BLAKE2B 359dba31685d4213721deb7bd553f2e037b960522e6b7727af45b87f4161b52bd02f47e5337e8003e5ae78dfcf1b0de1626af55dc1d177e98608c5d9799e8756 SHA512 a5244146150fd0e6d00eab3b1be0b778a242b393d72b09033d8edd99c434c4c8a25c326bf639ca7f7f7387a5cecd5033bd6e7159eca4c6dc18b580e893d2d274 |
30 |
DIST haproxy-1.8.9.tar.gz 2057051 BLAKE2B d81d18f68a27ae8a77660c1ecb1dfc28599263ebfd57f25ea574af2b101b35eb7a1a89ba4034b55dfa89673ae6ac4c0dca5428b4b494a02184b1b157850ce96b SHA512 e59c29af3a39d6212f012ae8341b169436e10e42fadaf8f1aa68d2bb7ee181fd1fe3b74640bfcd8c37c17dfc5062b36bd69d90290d7c59cd3e4648ef2ab1c8dd |
31 |
DIST haproxy-1.9.10.tar.gz 2386066 BLAKE2B 4dea3f42686cd41d9f6f6849c42f9cf604b26f33925747ec5311243117bcf51729d16e5c09c5eb2cfc9fea88cf49c976a0542dcd90ddee4016b467de699e8bdc SHA512 b204c91633949d20dd06c29c69d2c783134819493f132430aaedddd2aad74eac08da7de7ddc1c45b250446273c35b268ab37fcb3b98eaa6b97b6caf5530ed628 |
32 |
-DIST haproxy-1.9.9.tar.gz 2383704 BLAKE2B 1596d6a96ba8d4b61343ede78e39b7a08b34619396a81ebfa44e42df26770ee3d425e8c091918af1471e7687d52b88131cc67f3de2c58af456b619638eb48985 SHA512 96d650097ef4840634987b31df181848e4940fc9a27a1d92f09c9ed304da299811c1b6592cb7e502c500607a7a0450c1fc50831168d44bf14492ed73b6e75ae5 |
33 |
-DIST haproxy-2.0.3.tar.gz 2534678 BLAKE2B 1753c1ac1cabbe50bd8c20a9b95ac317b9f726ae20bd22e402936b5cb4ee69bbe554b85331c8268704a564f437b1990d831a3e21737df2f9b6c709fb58f638ec SHA512 dd7eaf7e05c9b3ee162fcc17bc116f81184523437d6f4dbd940b0a6a8e4d01e1984fc8fabafcfc20261203e60e8bd0bc5b0bf813f5eff47b9ba364465bd0633c |
34 |
DIST haproxy-2.0.4.tar.gz 2538442 BLAKE2B 95dd770d1424a7d783a2bcbdc4b2a39271b633826e458edf8e9323a20422e25ebeaf4d866195f9bafe464cb457f62d7a4ea50ba03821a0910d81e02513a73135 SHA512 38b5dc86b2947418b4af0bb746958abb1b40dec64f1f6969e8643f3e6ac7f553c9ea2b37ef21086f5c795834c0943feedee31cc4498b095037630bb16987ac75 |
35 |
+DIST haproxy-2.0.5.tar.gz 2539226 BLAKE2B 63218261ff4c5b4efb26ec1d255270d1c5cfca6744c325dbe5c65fff09bf922f6623702b67ca0253791a6fe626170008cb6dbc70c7e8547733006a1cc784b871 SHA512 501de6d81e0d07dbe5f57f416d485ebe125144745441c0f5341d6000c92514f723f35a7402f2cb7b404e1d6e6b4ba4148ef7360799b2ecf3bd6b1e3d6805097b |
36 |
|
37 |
diff --git a/net-proxy/haproxy/haproxy-1.8.19.ebuild b/net-proxy/haproxy/haproxy-1.8.21.ebuild |
38 |
similarity index 100% |
39 |
rename from net-proxy/haproxy/haproxy-1.8.19.ebuild |
40 |
rename to net-proxy/haproxy/haproxy-1.8.21.ebuild |
41 |
|
42 |
diff --git a/net-proxy/haproxy/haproxy-1.9.9.ebuild b/net-proxy/haproxy/haproxy-1.9.9.ebuild |
43 |
deleted file mode 100644 |
44 |
index 0eacacdc48d..00000000000 |
45 |
--- a/net-proxy/haproxy/haproxy-1.9.9.ebuild |
46 |
+++ /dev/null |
47 |
@@ -1,173 +0,0 @@ |
48 |
-# Copyright 1999-2019 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 user 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 |
- |
97 |
-S="${WORKDIR}/${MY_P}" |
98 |
- |
99 |
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) |
100 |
-CONTRIBS=( halog iprange ) |
101 |
-# ip6range is present in 1.6, but broken. |
102 |
-ver_test $PV -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop ) |
103 |
-# TODO: mod_defender - requires apache / APR, modsecurity - the same |
104 |
-ver_test $PV -ge 1.8.0 && CONTRIBS+=( hpack ) |
105 |
- |
106 |
-haproxy_use() { |
107 |
- (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>" |
108 |
- |
109 |
- usex "${1}" "USE_${2}=1" "USE_${2}=" |
110 |
-} |
111 |
- |
112 |
-pkg_setup() { |
113 |
- enewgroup haproxy |
114 |
- enewuser haproxy -1 -1 -1 haproxy |
115 |
- |
116 |
- if use net_ns; then |
117 |
- CONFIG_CHECK="~NET_NS" |
118 |
- linux-info_pkg_setup |
119 |
- fi |
120 |
-} |
121 |
- |
122 |
-src_compile() { |
123 |
- local -a args=( |
124 |
- V=1 |
125 |
- TARGET=linux2628 |
126 |
- USE_GETADDRINFO=1 |
127 |
- USE_TFO=1 |
128 |
- ) |
129 |
- |
130 |
- # TODO: PCRE2_WIDTH? |
131 |
- args+=( $(haproxy_use threads THREAD) ) |
132 |
- args+=( $(haproxy_use crypt LIBCRYPT) ) |
133 |
- args+=( $(haproxy_use net_ns NS) ) |
134 |
- args+=( $(haproxy_use pcre PCRE) ) |
135 |
- args+=( $(haproxy_use pcre-jit PCRE_JIT) ) |
136 |
- args+=( $(haproxy_use pcre2 PCRE2) ) |
137 |
- args+=( $(haproxy_use pcre2-jit PCRE2_JIT) ) |
138 |
- args+=( $(haproxy_use ssl OPENSSL) ) |
139 |
- args+=( $(haproxy_use slz SLZ) ) |
140 |
- args+=( $(haproxy_use zlib ZLIB) ) |
141 |
- args+=( $(haproxy_use lua LUA) ) |
142 |
- args+=( $(haproxy_use 51degrees 51DEGREES) ) |
143 |
- args+=( $(haproxy_use device-atlas DEVICEATLAS) ) |
144 |
- args+=( $(haproxy_use wurfl WURFL) ) |
145 |
- args+=( $(haproxy_use systemd SYSTEMD) ) |
146 |
- |
147 |
- # For now, until the strict-aliasing breakage will be fixed |
148 |
- append-cflags -fno-strict-aliasing |
149 |
- |
150 |
- emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} |
151 |
- emake -C contrib/systemd SBINDIR=/usr/sbin |
152 |
- |
153 |
- if use tools ; then |
154 |
- for contrib in ${CONTRIBS[@]} ; do |
155 |
- # Those two includes are a workaround for hpack Makefile missing those |
156 |
- emake -C contrib/${contrib} \ |
157 |
- CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} |
158 |
- done |
159 |
- fi |
160 |
-} |
161 |
- |
162 |
-src_install() { |
163 |
- dosbin haproxy |
164 |
- dosym ../sbin/haproxy /usr/bin/haproxy |
165 |
- |
166 |
- newconfd "${FILESDIR}/${PN}.confd" $PN |
167 |
- newinitd "${FILESDIR}/${PN}.initd-r6" $PN |
168 |
- |
169 |
- doman doc/haproxy.1 |
170 |
- |
171 |
- systemd_dounit contrib/systemd/haproxy.service |
172 |
- |
173 |
- einstalldocs |
174 |
- |
175 |
- # The errorfiles are used by upstream defaults. |
176 |
- insinto /etc/haproxy/errors/ |
177 |
- doins examples/errorfiles/* |
178 |
- |
179 |
- if use doc; then |
180 |
- dodoc ROADMAP doc/*.txt |
181 |
- #if use lua; then |
182 |
- # TODO: doc/lua-api/ |
183 |
- #fi |
184 |
- fi |
185 |
- |
186 |
- if use tools ; then |
187 |
- has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog |
188 |
- has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange |
189 |
- has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range |
190 |
- has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example |
191 |
- has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example |
192 |
- has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop |
193 |
- has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack |
194 |
- fi |
195 |
- |
196 |
- if use examples ; then |
197 |
- docinto examples |
198 |
- dodoc examples/*.cfg |
199 |
- dodoc examples/seamless_reload.txt |
200 |
- fi |
201 |
- |
202 |
- if use vim-syntax ; then |
203 |
- insinto /usr/share/vim/vimfiles/syntax |
204 |
- doins examples/haproxy.vim |
205 |
- fi |
206 |
-} |
207 |
- |
208 |
-pkg_postinst() { |
209 |
- if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then |
210 |
- ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service." |
211 |
- ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created." |
212 |
- ewarn "Make use of them with the \"user\" and \"group\" directives." |
213 |
- |
214 |
- if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then |
215 |
- einfo "Please consult the installed documentation for learning the configuration file's syntax." |
216 |
- einfo "The documentation and sample configuration files are installed here:" |
217 |
- einfo " ${EROOT}/usr/share/doc/${PF}" |
218 |
- fi |
219 |
- fi |
220 |
-} |
221 |
|
222 |
diff --git a/net-proxy/haproxy/haproxy-2.0.3.ebuild b/net-proxy/haproxy/haproxy-2.0.5.ebuild |
223 |
similarity index 100% |
224 |
rename from net-proxy/haproxy/haproxy-2.0.3.ebuild |
225 |
rename to net-proxy/haproxy/haproxy-2.0.5.ebuild |