1 |
commit: 52146d7af3b6fc8fa470cfc873c2e3b69e641e88 |
2 |
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jul 16 11:14:38 2018 +0000 |
4 |
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 16 11:14:38 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52146d7a |
7 |
|
8 |
net-proxy/haproxy: Version bump |
9 |
|
10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
11 |
|
12 |
net-proxy/haproxy/Manifest | 1 + |
13 |
net-proxy/haproxy/haproxy-1.8.12.ebuild | 169 ++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 170 insertions(+) |
15 |
|
16 |
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest |
17 |
index 4805d7b6997..fff6a5035d5 100644 |
18 |
--- a/net-proxy/haproxy/Manifest |
19 |
+++ b/net-proxy/haproxy/Manifest |
20 |
@@ -4,5 +4,6 @@ DIST haproxy-1.6.11.tar.gz 1574029 BLAKE2B 553f74c2c24a1b07cef2acc6fbc4def1bbe81 |
21 |
DIST haproxy-1.6.14.tar.gz 1583859 BLAKE2B 91695f0b3d901ba70b6bce6572c2f549479c28010ed391b20faae7cd1fd84cdb181e560353337eb9230e38ac2570673725884c131501820c3ef4559ef12f95f2 SHA512 389be3935d901af1fb3a748b5bf73a454578a3ca3e4cc0b881980c2f1e875c47feb2681b42f8d9244d70777261a965c8e47cf5175b7790ff995bff8333902a11 |
22 |
DIST haproxy-1.7.10.tar.gz 1750937 BLAKE2B 26d970862e415b079d4130fd00564677584a7aad74d6812cabed36de9a629321330434b7d4fdf7c2e8b2945b7f394ca33e444158e7fa9b49937db501ea33e78a SHA512 ca6c50848c559ee2ffb9af2d281c3931473dd90d1686d95d962cf604cd92d2feb2b63e006e217cf9078cf08fdd73dc523318c97e13400bc0ef325de47111394e |
23 |
DIST haproxy-1.7.11.tar.gz 1752129 BLAKE2B 1947ab837f6b81761eec931e97c7349462561abecc78b2b58b285ebb4b0ae498753d236f3a243d3b5c1115a9ff6e5fe9392d428314a6342e2c1907d6886e09e4 SHA512 48ee30a1057e92971c041b088b6aef16d6843da9ecee9b738aaa64bb55d3c3b0be090a37bb5fc63ac42fe34ce994820349cc770756136c823051039fa6d01f74 |
24 |
+DIST haproxy-1.8.12.tar.gz 2059925 BLAKE2B 73893c8a0eaf5c1af2f12e4f8e9e53c70841f2ba60d1e004f90b90e1c829cbf76b01457384de777ea76a3a7ca0a5f6cbe33da8162525706f25d08a2c7cb60c42 SHA512 2b782a54988cc88d1af0e5f011af062910e8fac28eab13db7e05a58d0d23961f827da47e3871e8d081f5a2d222588480d81dec2e9f14ec9f54a1c3cb5bf3d56a |
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 |
|
28 |
diff --git a/net-proxy/haproxy/haproxy-1.8.12.ebuild b/net-proxy/haproxy/haproxy-1.8.12.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000000..44131da836d |
31 |
--- /dev/null |
32 |
+++ b/net-proxy/haproxy/haproxy-1.8.12.ebuild |
33 |
@@ -0,0 +1,169 @@ |
34 |
+# Copyright 1999-2018 Gentoo Foundation |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+ |
37 |
+EAPI="6" |
38 |
+ |
39 |
+[[ ${PV} == *9999 ]] && SCM="git-r3" |
40 |
+inherit user versionator toolchain-funcs flag-o-matic systemd linux-info $SCM |
41 |
+ |
42 |
+MY_P="${PN}-${PV/_beta/-dev}" |
43 |
+ |
44 |
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments" |
45 |
+HOMEPAGE="http://www.haproxy.org" |
46 |
+if [[ ${PV} != *9999 ]]; then |
47 |
+ SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz" |
48 |
+ KEYWORDS="~amd64 ~arm ~ppc ~x86" |
49 |
+else |
50 |
+ EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/" |
51 |
+ EGIT_BRANCH=master |
52 |
+fi |
53 |
+ |
54 |
+LICENSE="GPL-2 LGPL-2.1" |
55 |
+SLOT="0" |
56 |
+IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl |
57 |
+systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl" |
58 |
+REQUIRED_USE="pcre-jit? ( pcre ) |
59 |
+ pcre2-jit? ( pcre2 ) |
60 |
+ pcre? ( !pcre2 ) |
61 |
+ device-atlas? ( pcre ) |
62 |
+ ?? ( slz zlib )" |
63 |
+ |
64 |
+DEPEND=" |
65 |
+ pcre? ( |
66 |
+ dev-libs/libpcre |
67 |
+ pcre-jit? ( dev-libs/libpcre[jit] ) |
68 |
+ ) |
69 |
+ pcre2? ( |
70 |
+ dev-libs/libpcre |
71 |
+ pcre2-jit? ( dev-libs/libpcre2[jit] ) |
72 |
+ ) |
73 |
+ ssl? ( |
74 |
+ !libressl? ( dev-libs/openssl:0=[zlib?] ) |
75 |
+ libressl? ( dev-libs/libressl:0= ) |
76 |
+ ) |
77 |
+ slz? ( dev-libs/libslz:= ) |
78 |
+ zlib? ( sys-libs/zlib ) |
79 |
+ lua? ( dev-lang/lua:5.3 ) |
80 |
+ device-atlas? ( dev-libs/device-atlas-api-c )" |
81 |
+RDEPEND="${DEPEND}" |
82 |
+ |
83 |
+S="${WORKDIR}/${MY_P}" |
84 |
+ |
85 |
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) |
86 |
+CONTRIBS=( halog iprange ) |
87 |
+# ip6range is present in 1.6, but broken. |
88 |
+version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop ) |
89 |
+# TODO: mod_defender - requires apache / APR, modsecurity - the same |
90 |
+version_is_at_least 1.8.0 $PV && CONTRIBS+=( hpack ) |
91 |
+ |
92 |
+haproxy_use() { |
93 |
+ (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>" |
94 |
+ |
95 |
+ usex "${1}" "USE_${2}=1" "USE_${2}=" |
96 |
+} |
97 |
+ |
98 |
+pkg_setup() { |
99 |
+ enewgroup haproxy |
100 |
+ enewuser haproxy -1 -1 -1 haproxy |
101 |
+ |
102 |
+ if use net_ns; then |
103 |
+ CONFIG_CHECK="~NET_NS" |
104 |
+ linux-info_pkg_setup |
105 |
+ fi |
106 |
+} |
107 |
+ |
108 |
+src_compile() { |
109 |
+ local -a args=( |
110 |
+ TARGET=linux2628 |
111 |
+ USE_GETADDRINFO=1 |
112 |
+ USE_TFO=1 |
113 |
+ ) |
114 |
+ |
115 |
+ # TODO: PCRE2_WIDTH? |
116 |
+ args+=( $(haproxy_use threads THREAD) ) |
117 |
+ args+=( $(haproxy_use crypt LIBCRYPT) ) |
118 |
+ args+=( $(haproxy_use net_ns NS) ) |
119 |
+ args+=( $(haproxy_use pcre PCRE) ) |
120 |
+ args+=( $(haproxy_use pcre-jit PCRE_JIT) ) |
121 |
+ args+=( $(haproxy_use ssl OPENSSL) ) |
122 |
+ args+=( $(haproxy_use slz SLZ) ) |
123 |
+ args+=( $(haproxy_use zlib ZLIB) ) |
124 |
+ args+=( $(haproxy_use lua LUA) ) |
125 |
+ args+=( $(haproxy_use 51degrees 51DEGREES) ) |
126 |
+ args+=( $(haproxy_use device-atlas DEVICEATLAS) ) |
127 |
+ args+=( $(haproxy_use wurfl WURFL) ) |
128 |
+ args+=( $(haproxy_use systemd SYSTEMD) ) |
129 |
+ |
130 |
+ # For now, until the strict-aliasing breakage will be fixed |
131 |
+ append-cflags -fno-strict-aliasing |
132 |
+ |
133 |
+ emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} |
134 |
+ emake -C contrib/systemd SBINDIR=/usr/sbin |
135 |
+ |
136 |
+ if use tools ; then |
137 |
+ for contrib in ${CONTRIBS[@]} ; do |
138 |
+ emake -C contrib/${contrib} \ |
139 |
+ CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} |
140 |
+ done |
141 |
+ fi |
142 |
+} |
143 |
+ |
144 |
+src_install() { |
145 |
+ dosbin haproxy |
146 |
+ dosym ../sbin/haproxy /usr/bin/haproxy |
147 |
+ |
148 |
+ newconfd "${FILESDIR}/${PN}.confd" $PN |
149 |
+ newinitd "${FILESDIR}/${PN}.initd-r6" $PN |
150 |
+ |
151 |
+ doman doc/haproxy.1 |
152 |
+ |
153 |
+ systemd_dounit contrib/systemd/haproxy.service |
154 |
+ |
155 |
+ einstalldocs |
156 |
+ |
157 |
+ # The errorfiles are used by upstream defaults. |
158 |
+ insinto /etc/haproxy/errors/ |
159 |
+ doins examples/errorfiles/* |
160 |
+ |
161 |
+ if use doc; then |
162 |
+ dodoc ROADMAP doc/*.txt |
163 |
+ #if use lua; then |
164 |
+ # TODO: doc/lua-api/ |
165 |
+ #fi |
166 |
+ fi |
167 |
+ |
168 |
+ if use tools ; then |
169 |
+ has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog |
170 |
+ has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange |
171 |
+ has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range |
172 |
+ has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example |
173 |
+ has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example |
174 |
+ has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop |
175 |
+ has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack |
176 |
+ fi |
177 |
+ |
178 |
+ if use examples ; then |
179 |
+ docinto examples |
180 |
+ dodoc examples/*.cfg |
181 |
+ dodoc examples/seamless_reload.txt |
182 |
+ fi |
183 |
+ |
184 |
+ if use vim-syntax ; then |
185 |
+ insinto /usr/share/vim/vimfiles/syntax |
186 |
+ doins examples/haproxy.vim |
187 |
+ fi |
188 |
+} |
189 |
+ |
190 |
+pkg_postinst() { |
191 |
+ if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then |
192 |
+ ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service." |
193 |
+ ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created." |
194 |
+ ewarn "Make use of them with the \"user\" and \"group\" directives." |
195 |
+ |
196 |
+ if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then |
197 |
+ einfo "Please consult the installed documentation for learning the configuration file's syntax." |
198 |
+ einfo "The documentation and sample configuration files are installed here:" |
199 |
+ einfo " ${EROOT}usr/share/doc/${PF}" |
200 |
+ fi |
201 |
+ fi |
202 |
+} |