1 |
commit: 3bd35bd2acb4a3d31bbe8aee6b0ab9b16716b5dd |
2 |
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 23 08:25:44 2022 +0000 |
4 |
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 23 08:27:41 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bd35bd2 |
7 |
|
8 |
net-proxy/haproxy: Bump to 2.5.9 |
9 |
|
10 |
Signed-off-by: Christian Ruppert <idl0r <AT> gentoo.org> |
11 |
|
12 |
net-proxy/haproxy/Manifest | 1 + |
13 |
net-proxy/haproxy/haproxy-2.5.9.ebuild | 176 +++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 177 insertions(+) |
15 |
|
16 |
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest |
17 |
index 2c8928b326b1..46762f4bfdf5 100644 |
18 |
--- a/net-proxy/haproxy/Manifest |
19 |
+++ b/net-proxy/haproxy/Manifest |
20 |
@@ -8,4 +8,5 @@ DIST haproxy-2.4.18.tar.gz 3626923 BLAKE2B 1ec312a5607634f7906cfcf5d4e22d829bdca |
21 |
DIST haproxy-2.5.4.tar.gz 3819082 BLAKE2B fabc62ebaa968a11a49a6dd131198af31a49adbe73bcae82124ca752c2c90c1d77346621c9d804a10bca8ff254580aa7fbaca774f9df1a6a99ec112375d84a50 SHA512 95eb1ad9121a93cc77f0dd14e0080e18935cd45dc7dc511ab6dd0ecbdbb967bbde5eaa83f70157086796603560b979689f7d50b0cfba93d0245544c3a8c28a87 |
22 |
DIST haproxy-2.5.7.tar.gz 3832801 BLAKE2B 6d54135b56f84129dea497ddc935fecf593abccfb21fc647c7d166f9c1aa4abc670c66bf13e0923e353627d83d47345f632ae8212672c3b3da7a757fd5d24d7c SHA512 cf6994508d559401a84e1304c2b6829952a9b3a14365d03436da42ec7e4553c201ffde9e524044dfa48813e8e614d24095a87b0fae7d9145ce5e66b953666ee9 |
23 |
DIST haproxy-2.5.8.tar.gz 3838130 BLAKE2B fd02c285682815fd1837190b80184e110bb6a37b99dfa30e6cece628e62af6a5a145d97f5849e64364a286593d0ea206506c0b474485b22018a816b899744710 SHA512 99a49556864b178c024e73e5bd45051a7a6e512bbb52906ba6f3888e22a83e2b91198ed1c6a3bcbbc44c474a9ba6a6373fae4216fac8ecdb5d724f281b00fd68 |
24 |
+DIST haproxy-2.5.9.tar.gz 3843788 BLAKE2B dcff2af4beba435abfcf13337f91575a19b13360f0a5abfeedfd214b7811f4d7324ca29476bdef06712dd2a89413450234735e7101f7a22ab4b1b45b3b3c482c SHA512 b00756372f40de65b645cccecc11a835146d34588bd2c805f51c1bc3ab61b054af2a7cc62bbfa56607c26e42bbb791f2bbc191afb7ea992fe03b52e942112c3e |
25 |
DIST haproxy-2.6.6.tar.gz 4015438 BLAKE2B 36e676e011e290cc16ed4d116426639e9c11dcc6383fbcc82da8c9df87f19dde55a420167d926a510f6ca06cedec5588abb1ee1dd78881e3ecafbe428ea247c7 SHA512 0b416d200e9b406a96896d3570483d24e94fdfa3f781bee663476e218a57851aefdf8768f00c8a2e9df1bb028f6398690f07da452f59656327967685787ee5c2 |
26 |
|
27 |
diff --git a/net-proxy/haproxy/haproxy-2.5.9.ebuild b/net-proxy/haproxy/haproxy-2.5.9.ebuild |
28 |
new file mode 100644 |
29 |
index 000000000000..ba2ff38efb00 |
30 |
--- /dev/null |
31 |
+++ b/net-proxy/haproxy/haproxy-2.5.9.ebuild |
32 |
@@ -0,0 +1,176 @@ |
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 |
+ |
153 |
+ newconfd "${FILESDIR}/${PN}.confd-r1" ${PN} |
154 |
+ newinitd "${FILESDIR}/${PN}.initd-r8" ${PN} |
155 |
+ |
156 |
+ doman doc/haproxy.1 |
157 |
+ |
158 |
+ systemd_dounit admin/systemd/haproxy.service |
159 |
+ |
160 |
+ einstalldocs |
161 |
+ |
162 |
+ # The errorfiles are used by upstream defaults. |
163 |
+ insinto /etc/haproxy/errors/ |
164 |
+ doins examples/errorfiles/* |
165 |
+ |
166 |
+ if use doc; then |
167 |
+ dodoc ROADMAP doc/*.txt |
168 |
+ #if use lua; then |
169 |
+ # TODO: doc/lua-api/ |
170 |
+ #fi |
171 |
+ fi |
172 |
+ |
173 |
+ if use tools ; then |
174 |
+ has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog |
175 |
+ has admin/iprange "${EXTRAS[@]}" && { newbin admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range haproxy_ip6range; } |
176 |
+ has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop |
177 |
+ has dev/hpack "${EXTRAS[@]}" && { |
178 |
+ newbin dev/hpack/gen-rht haproxy_gen-rht |
179 |
+ newbin dev/hpack/gen-enc haproxy_gen-enc |
180 |
+ newbin dev/hpack/decode haproxy_decode |
181 |
+ } |
182 |
+ fi |
183 |
+ |
184 |
+ if use examples ; then |
185 |
+ docinto examples |
186 |
+ dodoc examples/*.cfg |
187 |
+ dodoc doc/seamless_reload.txt |
188 |
+ fi |
189 |
+ |
190 |
+ if use vim-syntax ; then |
191 |
+ insinto /usr/share/vim/vimfiles/syntax |
192 |
+ doins admin/syntax-highlight/haproxy.vim |
193 |
+ fi |
194 |
+} |
195 |
+ |
196 |
+pkg_postinst() { |
197 |
+ if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then |
198 |
+ ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service." |
199 |
+ ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created." |
200 |
+ ewarn "Make use of them with the \"user\" and \"group\" directives." |
201 |
+ |
202 |
+ if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then |
203 |
+ einfo "Please consult the installed documentation for learning the configuration file's syntax." |
204 |
+ einfo "The documentation and sample configuration files are installed here:" |
205 |
+ einfo " ${EROOT}/usr/share/doc/${PF}" |
206 |
+ fi |
207 |
+ fi |
208 |
+} |