Gentoo Archives: gentoo-commits

From: Christian Ruppert <idl0r@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/
Date: Mon, 15 Apr 2019 07:26:33
Message-Id: 1555313178.c0138f254ba0016c4ed3fcef2db097b87752001d.idl0r@gentoo
1 commit: c0138f254ba0016c4ed3fcef2db097b87752001d
2 Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
3 AuthorDate: Mon Apr 15 07:24:31 2019 +0000
4 Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
5 CommitDate: Mon Apr 15 07:26:18 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0138f25
7
8 net-proxy/haproxy: Remove old version
9
10 Package-Manager: Portage-2.3.62, Repoman-2.3.12
11 Signed-off-by: Christian Ruppert <idl0r <AT> gentoo.org>
12
13 net-proxy/haproxy/Manifest | 1 -
14 net-proxy/haproxy/haproxy-1.8.8.ebuild | 169 ---------------------------------
15 2 files changed, 170 deletions(-)
16
17 diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
18 index 353a810ca3b..83f720177b5 100644
19 --- a/net-proxy/haproxy/Manifest
20 +++ b/net-proxy/haproxy/Manifest
21 @@ -5,6 +5,5 @@ DIST haproxy-1.7.11.tar.gz 1752129 BLAKE2B 1947ab837f6b81761eec931e97c7349462561
22 DIST haproxy-1.8.13.tar.gz 2063046 BLAKE2B 9ebccf2520719cdf209bc9a87bf28d015b5b673e0d017d5387af4025f930ac401f6a2cfa851583ffe6b6645b7b91ad255bb5db737688a1f310958072a11c8a80 SHA512 54d4cb0721a3868267d7e085b3d3bb050384e4279eb49e88abb925bb3ea8cc39ef9069bdc99b7b18a23fd22e0d29e24dfcb8a0507ddca9243a845e4418be9cc5
23 DIST haproxy-1.8.18.tar.gz 2080500 BLAKE2B fcc51fbe6c496dbf99e49add4b582ec9357c94daebaea6396e131b4e6f323fdcc11d40039b9de9b6e2762c46863a1efd5062524df3d42991eef73ae3a42a9787 SHA512 7bcdc8fd110bb77fa3b1f735474218fb766b7701b87e939249697cb780aedf039b3d8f59cbfb5fa271473ad789df4ac60a64cbb6c61330e1125a13676ad25fc0
24 DIST haproxy-1.8.19.tar.gz 2080757 BLAKE2B 46a97620f3b5c3f205e8b9d6e49acca8e107a1e6918ac18c036b9c3408666348400f8d9f6f4a4103e7f206c6373b25a224536c0969e2dad1013c2320b07b0ced SHA512 f62b0a18f19295986d26c5c60b6b1ad55850a175bed67a359282cc37a4c630a0c2be51d608226b4316f2e69c3008c20a1cb91ce10f86311219355973a050e65b
25 -DIST haproxy-1.8.8.tar.gz 2054534 BLAKE2B 5eabd37dfb79783dc20425cbb16ca1e1afed23861f66c9e8a738dd56d9ca35b3ceb2604c308543ca99222aa867e11ff613fc09012669882a4bdaaff03cb76450 SHA512 8310f84b364348600273c295a3b315a79cba1f782b86b47d8d47b3ffd1e6fb62fd278c4f2dfa185d0a269f73c1067695a763733736877989a941162b625462a1
26 DIST haproxy-1.8.9.tar.gz 2057051 BLAKE2B d81d18f68a27ae8a77660c1ecb1dfc28599263ebfd57f25ea574af2b101b35eb7a1a89ba4034b55dfa89673ae6ac4c0dca5428b4b494a02184b1b157850ce96b SHA512 e59c29af3a39d6212f012ae8341b169436e10e42fadaf8f1aa68d2bb7ee181fd1fe3b74640bfcd8c37c17dfc5062b36bd69d90290d7c59cd3e4648ef2ab1c8dd
27 DIST haproxy-1.9.4.tar.gz 2357935 BLAKE2B 761118da39742eff07e3bc2772a9318a6aaddbeb706e684afa619a11e4a6f1e91f35212b22b58474334621daaec160a4f9183a65698343a4fbb64d9cb38ad049 SHA512 804baeb0493bfaedce59f04a5c7eedd703aec11fbfc9744c6d3f642e3200a5fccbfc92d9da9555a2b266534b9cd5bb81308c57c7627512b951e5a83cb1b24cb0
28
29 diff --git a/net-proxy/haproxy/haproxy-1.8.8.ebuild b/net-proxy/haproxy/haproxy-1.8.8.ebuild
30 deleted file mode 100644
31 index 44131da836d..00000000000
32 --- a/net-proxy/haproxy/haproxy-1.8.8.ebuild
33 +++ /dev/null
34 @@ -1,169 +0,0 @@
35 -# Copyright 1999-2018 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://www.haproxy.org"
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 pcre2 pcre2-jit ssl
58 -systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
59 -REQUIRED_USE="pcre-jit? ( pcre )
60 - pcre2-jit? ( pcre2 )
61 - pcre? ( !pcre2 )
62 - device-atlas? ( pcre )
63 - ?? ( slz zlib )"
64 -
65 -DEPEND="
66 - pcre? (
67 - dev-libs/libpcre
68 - pcre-jit? ( dev-libs/libpcre[jit] )
69 - )
70 - pcre2? (
71 - dev-libs/libpcre
72 - pcre2-jit? ( dev-libs/libpcre2[jit] )
73 - )
74 - ssl? (
75 - !libressl? ( dev-libs/openssl:0=[zlib?] )
76 - libressl? ( dev-libs/libressl:0= )
77 - )
78 - slz? ( dev-libs/libslz:= )
79 - zlib? ( sys-libs/zlib )
80 - lua? ( dev-lang/lua:5.3 )
81 - device-atlas? ( dev-libs/device-atlas-api-c )"
82 -RDEPEND="${DEPEND}"
83 -
84 -S="${WORKDIR}/${MY_P}"
85 -
86 -DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
87 -CONTRIBS=( halog iprange )
88 -# ip6range is present in 1.6, but broken.
89 -version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )
90 -# TODO: mod_defender - requires apache / APR, modsecurity - the same
91 -version_is_at_least 1.8.0 $PV && CONTRIBS+=( hpack )
92 -
93 -haproxy_use() {
94 - (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
95 -
96 - usex "${1}" "USE_${2}=1" "USE_${2}="
97 -}
98 -
99 -pkg_setup() {
100 - enewgroup haproxy
101 - enewuser haproxy -1 -1 -1 haproxy
102 -
103 - if use net_ns; then
104 - CONFIG_CHECK="~NET_NS"
105 - linux-info_pkg_setup
106 - fi
107 -}
108 -
109 -src_compile() {
110 - local -a args=(
111 - TARGET=linux2628
112 - USE_GETADDRINFO=1
113 - USE_TFO=1
114 - )
115 -
116 - # TODO: PCRE2_WIDTH?
117 - args+=( $(haproxy_use threads THREAD) )
118 - args+=( $(haproxy_use crypt LIBCRYPT) )
119 - args+=( $(haproxy_use net_ns NS) )
120 - args+=( $(haproxy_use pcre PCRE) )
121 - args+=( $(haproxy_use pcre-jit PCRE_JIT) )
122 - args+=( $(haproxy_use ssl OPENSSL) )
123 - args+=( $(haproxy_use slz SLZ) )
124 - args+=( $(haproxy_use zlib ZLIB) )
125 - args+=( $(haproxy_use lua LUA) )
126 - args+=( $(haproxy_use 51degrees 51DEGREES) )
127 - args+=( $(haproxy_use device-atlas DEVICEATLAS) )
128 - args+=( $(haproxy_use wurfl WURFL) )
129 - args+=( $(haproxy_use systemd SYSTEMD) )
130 -
131 - # For now, until the strict-aliasing breakage will be fixed
132 - append-cflags -fno-strict-aliasing
133 -
134 - emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
135 - emake -C contrib/systemd SBINDIR=/usr/sbin
136 -
137 - if use tools ; then
138 - for contrib in ${CONTRIBS[@]} ; do
139 - emake -C contrib/${contrib} \
140 - CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
141 - done
142 - fi
143 -}
144 -
145 -src_install() {
146 - dosbin haproxy
147 - dosym ../sbin/haproxy /usr/bin/haproxy
148 -
149 - newconfd "${FILESDIR}/${PN}.confd" $PN
150 - newinitd "${FILESDIR}/${PN}.initd-r6" $PN
151 -
152 - doman doc/haproxy.1
153 -
154 - systemd_dounit contrib/systemd/haproxy.service
155 -
156 - einstalldocs
157 -
158 - # The errorfiles are used by upstream defaults.
159 - insinto /etc/haproxy/errors/
160 - doins examples/errorfiles/*
161 -
162 - if use doc; then
163 - dodoc ROADMAP doc/*.txt
164 - #if use lua; then
165 - # TODO: doc/lua-api/
166 - #fi
167 - fi
168 -
169 - if use tools ; then
170 - has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
171 - has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
172 - has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
173 - has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
174 - has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
175 - has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
176 - has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
177 - fi
178 -
179 - if use examples ; then
180 - docinto examples
181 - dodoc examples/*.cfg
182 - dodoc examples/seamless_reload.txt
183 - fi
184 -
185 - if use vim-syntax ; then
186 - insinto /usr/share/vim/vimfiles/syntax
187 - doins examples/haproxy.vim
188 - fi
189 -}
190 -
191 -pkg_postinst() {
192 - if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
193 - ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
194 - ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
195 - ewarn "Make use of them with the \"user\" and \"group\" directives."
196 -
197 - if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
198 - einfo "Please consult the installed documentation for learning the configuration file's syntax."
199 - einfo "The documentation and sample configuration files are installed here:"
200 - einfo " ${EROOT}usr/share/doc/${PF}"
201 - fi
202 - fi
203 -}