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: Tue, 26 Apr 2022 15:28:15
Message-Id: 1650986893.43be7f46ea7b36017eb98ef839a8f430f5b46030.idl0r@gentoo
1 commit: 43be7f46ea7b36017eb98ef839a8f430f5b46030
2 Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 26 15:20:54 2022 +0000
4 Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 26 15:28:13 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43be7f46
7
8 net-proxy/haproxy: Bump to 2.5.6 and default to PCRE2, bug 838013
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Christian Ruppert <idl0r <AT> gentoo.org>
12
13 net-proxy/haproxy/Manifest | 1 +
14 net-proxy/haproxy/haproxy-2.5.6.ebuild | 177 +++++++++++++++++++++++++++++++++
15 2 files changed, 178 insertions(+)
16
17 diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
18 index 293f553dfde3..e7414543e774 100644
19 --- a/net-proxy/haproxy/Manifest
20 +++ b/net-proxy/haproxy/Manifest
21 @@ -8,3 +8,4 @@ DIST haproxy-2.4.14.tar.gz 3613642 BLAKE2B b45af8f62cefead1f471b0b61e9bc262dc25e
22 DIST haproxy-2.4.15.tar.gz 3616441 BLAKE2B 425444a54e22cca8d15cb808283be3baefcd2ce56447d91bce3b4f4b7f6606e03d2eb8a242891c619cfd0fad9aba5bb84026c68d41f07cd55f083481df234899 SHA512 da6f6a4f021bfa719926f4c73dc559429357a77da2c560a4375d2edbb4f342a05548d39ce0a7e3346c305f1779e579a738d8442e8e9e01903f9c435a7b0b6d71
23 DIST haproxy-2.5.4.tar.gz 3819082 BLAKE2B fabc62ebaa968a11a49a6dd131198af31a49adbe73bcae82124ca752c2c90c1d77346621c9d804a10bca8ff254580aa7fbaca774f9df1a6a99ec112375d84a50 SHA512 95eb1ad9121a93cc77f0dd14e0080e18935cd45dc7dc511ab6dd0ecbdbb967bbde5eaa83f70157086796603560b979689f7d50b0cfba93d0245544c3a8c28a87
24 DIST haproxy-2.5.5.tar.gz 3821477 BLAKE2B 0680925026edf56f4369c71092c39f4ff3956a8cf04320326623b3031f719d62077acdca457a6cfd82f6bcbf510920113a0328a2d8cd4a208c3d9e49e1d431b5 SHA512 f68af2be330b0fa817f7611ff46e0d3e0cc52d024b20394a5f1eedf33e6774115ee6f35ecd82d33b9ecedea2fe5afcfa32270cee33a1f6ce1726d96cc8c0d821
25 +DIST haproxy-2.5.6.tar.gz 3826838 BLAKE2B 571acbb5dd9fad6ee560a3db25e88815dad4278640730337257ac18ad670b1d69cd9669c7e6a60e03a784adc9c7d8aba8d4e035152d3c13072c1a05a1534facb SHA512 e97f422379af0589edf5c1dea949e95f76a7d1ce05ece75580248607f6c05cfda4a430390aca74f4d37c35de8af6d73c9a0768a699c231e11c8bb4194cb98d41
26
27 diff --git a/net-proxy/haproxy/haproxy-2.5.6.ebuild b/net-proxy/haproxy/haproxy-2.5.6.ebuild
28 new file mode 100644
29 index 000000000000..959a7a9dac4f
30 --- /dev/null
31 +++ b/net-proxy/haproxy/haproxy-2.5.6.ebuild
32 @@ -0,0 +1,177 @@
33 +# Copyright 1999-2022 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI="7"
37 +
38 +LUA_COMPAT=( lua5-3 )
39 +
40 +[[ ${PV} == *9999 ]] && SCM="git-r3"
41 +inherit toolchain-funcs flag-o-matic lua-single 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/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
49 + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
50 +elif [[ ${PV} == 9999 ]]; then
51 + EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
52 + EGIT_BRANCH=master
53 +else
54 + EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
55 + EGIT_BRANCH=master
56 +fi
57 +
58 +LICENSE="GPL-2 LGPL-2.1"
59 +SLOT="0/$(ver_cut 1-2)"
60 +IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter
61 +ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl"
62 +REQUIRED_USE="pcre-jit? ( pcre )
63 + lua? ( ${LUA_REQUIRED_USE} )
64 + ?? ( slz zlib )"
65 +
66 +BDEPEND="virtual/pkgconfig"
67 +DEPEND="
68 + crypt? ( virtual/libcrypt:= )
69 + pcre? (
70 + dev-libs/libpcre2:=
71 + pcre-jit? ( dev-libs/libpcre2:=[jit] )
72 + )
73 + ssl? (
74 + dev-libs/openssl:0=
75 + )
76 + systemd? ( sys-apps/systemd )
77 + zlib? ( sys-libs/zlib )
78 + lua? ( ${LUA_DEPS} )"
79 +RDEPEND="${DEPEND}
80 + acct-group/haproxy
81 + acct-user/haproxy"
82 +
83 +S="${WORKDIR}/${MY_P}"
84 +
85 +DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
86 +EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
87 +
88 +haproxy_use() {
89 + (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
90 +
91 + usex "${1}" "USE_${2}=1" "USE_${2}="
92 +}
93 +
94 +pkg_setup() {
95 + use lua && lua-single_pkg_setup
96 + if use net_ns; then
97 + CONFIG_CHECK="~NET_NS"
98 + linux-info_pkg_setup
99 + fi
100 +}
101 +
102 +src_compile() {
103 + local -a args=(
104 + V=1
105 + TARGET=linux-glibc
106 + # Switching to PCRE2 by default, bug 838013
107 + PCRE=
108 + PCRE_JIT=
109 + )
110 +
111 + # TODO: PCRE2_WIDTH?
112 + args+=( $(haproxy_use threads THREAD) )
113 + args+=( $(haproxy_use crypt LIBCRYPT) )
114 + args+=( $(haproxy_use net_ns NS) )
115 + args+=( $(haproxy_use pcre PCRE2) )
116 + args+=( $(haproxy_use pcre-jit PCRE2_JIT) )
117 + args+=( $(haproxy_use ssl OPENSSL) )
118 + args+=( $(haproxy_use slz SLZ) )
119 + args+=( $(haproxy_use zlib ZLIB) )
120 + args+=( $(haproxy_use lua LUA) )
121 + args+=( $(haproxy_use 51degrees 51DEGREES) )
122 + args+=( $(haproxy_use wurfl WURFL) )
123 + args+=( $(haproxy_use systemd SYSTEMD) )
124 + args+=( $(haproxy_use prometheus-exporter PROMEX) )
125 +
126 + # Bug #668002
127 + if use ppc || use arm || use hppa; then
128 + TARGET_LDFLAGS=-latomic
129 + fi
130 +
131 + # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
132 + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]}
133 + emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) SBINDIR=/usr/sbin
134 +
135 + if use tools ; then
136 + for extra in ${EXTRAS[@]} ; do
137 + if [ "${extra}" = "admin/halog" ]; then
138 + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} admin/halog/halog
139 + elif [ "${extra}" = "dev/hpack" ]; then
140 + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
141 + else
142 + # Those two includes are a workaround for hpack Makefile missing those
143 + emake -C ${extra} \
144 + CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" ${args[@]}
145 + fi
146 + done
147 + fi
148 +}
149 +
150 +src_install() {
151 + dosbin haproxy
152 + dosym ../sbin/haproxy /usr/bin/haproxy
153 +
154 + newconfd "${FILESDIR}/${PN}.confd" ${PN}
155 + newinitd "${FILESDIR}/${PN}.initd-r7" ${PN}
156 +
157 + doman doc/haproxy.1
158 +
159 + systemd_dounit admin/systemd/haproxy.service
160 +
161 + einstalldocs
162 +
163 + # The errorfiles are used by upstream defaults.
164 + insinto /etc/haproxy/errors/
165 + doins examples/errorfiles/*
166 +
167 + if use doc; then
168 + dodoc ROADMAP doc/*.txt
169 + #if use lua; then
170 + # TODO: doc/lua-api/
171 + #fi
172 + fi
173 +
174 + if use tools ; then
175 + has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
176 + has admin/iprange "${EXTRAS[@]}" && { newbin admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range haproxy_ip6range; }
177 + has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
178 + has dev/hpack "${EXTRAS[@]}" && {
179 + newbin dev/hpack/gen-rht haproxy_gen-rht
180 + newbin dev/hpack/gen-enc haproxy_gen-enc
181 + newbin dev/hpack/decode haproxy_decode
182 + }
183 + fi
184 +
185 + if use examples ; then
186 + docinto examples
187 + dodoc examples/*.cfg
188 + dodoc doc/seamless_reload.txt
189 + fi
190 +
191 + if use vim-syntax ; then
192 + insinto /usr/share/vim/vimfiles/syntax
193 + doins admin/syntax-highlight/haproxy.vim
194 + fi
195 +}
196 +
197 +pkg_postinst() {
198 + if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
199 + ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
200 + ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
201 + ewarn "Make use of them with the \"user\" and \"group\" directives."
202 +
203 + if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
204 + einfo "Please consult the installed documentation for learning the configuration file's syntax."
205 + einfo "The documentation and sample configuration files are installed here:"
206 + einfo " ${EROOT}/usr/share/doc/${PF}"
207 + fi
208 + fi
209 +}