1 |
commit: 71f2a86997ac105182f2efd5d5fc92982f99c177 |
2 |
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 14 08:40:17 2021 +0000 |
4 |
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 14 08:40:32 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71f2a869 |
7 |
|
8 |
net-proxy/haproxy: Version bumps to 1.8.28, 2.2.8, 2.3.4 |
9 |
|
10 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
11 |
Signed-off-by: Christian Ruppert <idl0r <AT> gentoo.org> |
12 |
|
13 |
net-proxy/haproxy/Manifest | 5 ++-- |
14 |
...{haproxy-2.2.7.ebuild => haproxy-1.8.28.ebuild} | 29 +++++++--------------- |
15 |
.../{haproxy-2.2.7.ebuild => haproxy-2.2.8.ebuild} | 0 |
16 |
.../{haproxy-2.3.3.ebuild => haproxy-2.3.4.ebuild} | 0 |
17 |
4 files changed, 12 insertions(+), 22 deletions(-) |
18 |
|
19 |
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest |
20 |
index 973aeacc47e..3c3f9976aea 100644 |
21 |
--- a/net-proxy/haproxy/Manifest |
22 |
+++ b/net-proxy/haproxy/Manifest |
23 |
@@ -1,4 +1,5 @@ |
24 |
DIST haproxy-1.8.27.tar.gz 2209243 BLAKE2B 31d83f41fd5e8f77ec28a7c168661c7e8a24b51890cbc8336fd45668b031fca87a3533c9f78ee18302394e54e58b89786300a32506dadf0d7275c84e62b0f395 SHA512 d8b36787ea75cb3a8332b1b95fc154d6e83a52ffd91548d1d0bacab62a069d3c05e859e2e40ddb65c1a37d0a30cc6a29a07c8260ce69413a3e80c83b4143dd8a |
25 |
+DIST haproxy-1.8.28.tar.gz 2211162 BLAKE2B 81123750285a34891248fad675511c372aa87ff5047b2d7d8635984a7a71183ee2b3fce78c42a999424b70b1ee5d8a26b46bbe9dec1e951ed1845332bc566109 SHA512 67e7ff9bb5cba7b2ca2274a9fe72397d9a9c85257acdb963f20988db3760c0cd2deba09022b95df18d8a90601c55bd83fe7282fc0a124c796c54714788a39794 |
26 |
DIST haproxy-2.0.14.tar.gz 2651320 BLAKE2B dd5aed78e52b3d3dd295f3883d45adf8795efac93cf6c23fbe39be031f29d19adad0afb400e8041281413f4570bc074f06d9cd88bee672789311e56f57b258d0 SHA512 6b63b713a1009eff59a2622fa93462deb8794c910685840f142711a61be88ea228c7cb2ec7ca50bba0803288625e1a65b2d2f87ffbcedfd23debfbbbb5d96993 |
27 |
DIST haproxy-2.0.19.tar.gz 2682426 BLAKE2B 6e14842bfcc23167414e2f4e222708bc2d08947b0c420b758b5eaf35a5145c1d013b376a2e84df77802277fe8cc2fd5a14ed9cab3232a74590ec76813fa06952 SHA512 6484c14e7296f4600a1b7a2123809097cac563767dc79c1cbcd29d5fc0e580926b4701d3d095fe146c1de334e5ec50502d2f97fcdd0b711889711e806720fa2f |
28 |
DIST haproxy-2.0.20.tar.gz 2693943 BLAKE2B ff09ca70ed0644c190af73b691aeaced1b491289cf7f4d05dace9cd469bb47f6e8507fc210936b0489867f7e799220278a2b8076b2ee0b87b58e2bd62f1af9ea SHA512 804c0e46f2aa0495b796710335c9080c17b98ea0fa2d60a65eb3cdc51e960a76a13b4c34945ebed75766088836e80f8e5c8e40abaa8caf2c5a5cc4a449d1eb2b |
29 |
@@ -7,6 +8,6 @@ DIST haproxy-2.1.11.tar.gz 2726723 BLAKE2B eef039eaf2808aa7a9b824ddd8e5e25623fc2 |
30 |
DIST haproxy-2.1.4.tar.gz 2684568 BLAKE2B 0618e069e6cf6fd20eb9fad0cfcb5ca1714d4001a794e20ce60d812741f4f65d44088c46599e4181cb79536566a940d748030552d0bd010ba14d1552cf7156f4 SHA512 fd029ac1ec877fa89a9410944439b66795b1392b6c8416aaa7978943170530c3826ba50ea706366f3f7785b7cffed58497cb362fc2480dd6920a99af4f920d98 |
31 |
DIST haproxy-2.2.5.tar.gz 2876429 BLAKE2B 1da993769302186ab0d7e1b0c8651c7e9a151295176da44bc854461f6b27831cadaa01a71b153046a23b43de91b2ba17b11ee52ecea12f744ae7af5b9f66ee98 SHA512 74e3c8b2b786f1fb5fcb8b8071751450f45a58ff847b336a8e4413727dea87b7d5a140853e3a445603ae5c4079f371ce9aa31a9f06c18ff4eea7462661775dca |
32 |
DIST haproxy-2.2.6.tar.gz 2890554 BLAKE2B c1a8f2611f373a80d3a246e5daac9ce7f69cbb7c7104057e9afbcb83b373ed97a5ae8d35d0152f4739b112693b312cd3535ef9b3c6c22b3e92f5ec6fbd5321ae SHA512 b9afa4a4112dccaf192fce07b1cdbb1547060d998801595147a41674042741b62852f65a65aa9b2d033db8808697fd3a522494097710a19071fbb0c604544de5 |
33 |
-DIST haproxy-2.2.7.tar.gz 2896196 BLAKE2B 424ff54e190281392a786fa86cbb51586d838c78642c7c6aa08907b12df34caa31d279bdb679195311884977feb5cf0b0539efbc49583edd56d331592d53adf2 SHA512 cc73617787822afbcc6ba3f48e9b076aed4433c1dd217d475d3df0db625f232c677a880bfd40470a1357d20e9aa1d42e3748f33cd97ba63e66067314daf6934b |
34 |
+DIST haproxy-2.2.8.tar.gz 2895932 BLAKE2B ee918f3f9e05a99266bc27507daf5b42073ff4b51708db052e3cadc10bbd5de0f9e458925ef47ce4ddd30e1d7c292d82092d9a4cb971c18eb0577b94c1c144b3 SHA512 acbdd0b9d186b7d54a161247ae3e35017a8646ac2724ae8cfaa662b4dfbe495e0b321142d7b5a7af5c71a817cfe8156aa8ec5980a64f3d88bc5c5590b9e88886 |
35 |
DIST haproxy-2.3.2.tar.gz 2903983 BLAKE2B f4acc499e9210f1f520d1cc0913511986c1ecc74d5b9cc492e398cbeb29824d28c6983646d21a6c1eaf1f04010815778e582d1de464d39cd2660c63d5aa2b043 SHA512 ffabf499781220f71fd99d7f66f3a77f310ef69735e5c7e714f976052122788c917593d5e665d3a60d687a3ff63579331fdc5816414a8b75c7c8573e0b286ed5 |
36 |
-DIST haproxy-2.3.3.tar.gz 2910244 BLAKE2B 58433956c8d2e5eead3abdbd93850131f0f7b955f291db50ef6eed659fb1cb02f7707f1a4975217df6410ae3433dc2acc3821a9b9c7f8dde69cd6029ab841c8d SHA512 1a591d6fa7ed0273d68e1f1f85d20a4c6e9a8d0ae7ffaf0424131218c0f1ed6cebfda4988340d14eaa36adeebef8e3b549baf39cea09273864b6c199d873c18c |
37 |
+DIST haproxy-2.3.4.tar.gz 2909672 BLAKE2B 4d1b3e6aaa13c30385056c4cefe86c5bcdc98cd34a94ea388a115e2fe547242fb68a9e4b2e22cc4990db16c76eb220d52999209958409bfda7a777eee587b947 SHA512 b6db7f6c573f700ce5e2f533c6b60c5e5cb15fbc31057f3e98c03144c52b87612420e962e5e8ba63176eb1b7459a956c80a0403e9189cb3fde1dcef5bfa64ac5 |
38 |
|
39 |
diff --git a/net-proxy/haproxy/haproxy-2.2.7.ebuild b/net-proxy/haproxy/haproxy-1.8.28.ebuild |
40 |
similarity index 81% |
41 |
copy from net-proxy/haproxy/haproxy-2.2.7.ebuild |
42 |
copy to net-proxy/haproxy/haproxy-1.8.28.ebuild |
43 |
index 09bca46c32f..038c860b368 100644 |
44 |
--- a/net-proxy/haproxy/haproxy-2.2.7.ebuild |
45 |
+++ b/net-proxy/haproxy/haproxy-1.8.28.ebuild |
46 |
@@ -20,8 +20,8 @@ fi |
47 |
|
48 |
LICENSE="GPL-2 LGPL-2.1" |
49 |
SLOT="0/$(ver_cut 1-2)" |
50 |
-IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter |
51 |
-ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl" |
52 |
+IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl |
53 |
+systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl" |
54 |
REQUIRED_USE="pcre-jit? ( pcre ) |
55 |
pcre2-jit? ( pcre2 ) |
56 |
pcre? ( !pcre2 ) |
57 |
@@ -74,7 +74,9 @@ pkg_setup() { |
58 |
src_compile() { |
59 |
local -a args=( |
60 |
V=1 |
61 |
- TARGET=linux-glibc |
62 |
+ TARGET=linux2628 |
63 |
+ USE_GETADDRINFO=1 |
64 |
+ USE_TFO=1 |
65 |
) |
66 |
|
67 |
# TODO: PCRE2_WIDTH? |
68 |
@@ -83,8 +85,6 @@ src_compile() { |
69 |
args+=( $(haproxy_use net_ns NS) ) |
70 |
args+=( $(haproxy_use pcre PCRE) ) |
71 |
args+=( $(haproxy_use pcre-jit PCRE_JIT) ) |
72 |
- args+=( $(haproxy_use pcre2 PCRE2) ) |
73 |
- args+=( $(haproxy_use pcre2-jit PCRE2_JIT) ) |
74 |
args+=( $(haproxy_use ssl OPENSSL) ) |
75 |
args+=( $(haproxy_use slz SLZ) ) |
76 |
args+=( $(haproxy_use zlib ZLIB) ) |
77 |
@@ -97,24 +97,13 @@ src_compile() { |
78 |
# For now, until the strict-aliasing breakage will be fixed |
79 |
append-cflags -fno-strict-aliasing |
80 |
|
81 |
- # Bug #668002 |
82 |
- if use ppc || use arm || use hppa; then |
83 |
- TARGET_LDFLAGS=-latomic |
84 |
- fi |
85 |
- |
86 |
- if use prometheus-exporter; then |
87 |
- EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" |
88 |
- fi |
89 |
- |
90 |
- # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing |
91 |
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]} |
92 |
+ emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} |
93 |
emake -C contrib/systemd SBINDIR=/usr/sbin |
94 |
|
95 |
if use tools ; then |
96 |
for contrib in ${CONTRIBS[@]} ; do |
97 |
- # Those two includes are a workaround for hpack Makefile missing those |
98 |
emake -C contrib/${contrib} \ |
99 |
- CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} |
100 |
+ CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} |
101 |
done |
102 |
fi |
103 |
} |
104 |
@@ -156,12 +145,12 @@ src_install() { |
105 |
if use examples ; then |
106 |
docinto examples |
107 |
dodoc examples/*.cfg |
108 |
- dodoc doc/seamless_reload.txt |
109 |
+ dodoc examples/seamless_reload.txt |
110 |
fi |
111 |
|
112 |
if use vim-syntax ; then |
113 |
insinto /usr/share/vim/vimfiles/syntax |
114 |
- doins contrib/syntax-highlight/haproxy.vim |
115 |
+ doins examples/haproxy.vim |
116 |
fi |
117 |
} |
118 |
|
119 |
|
120 |
diff --git a/net-proxy/haproxy/haproxy-2.2.7.ebuild b/net-proxy/haproxy/haproxy-2.2.8.ebuild |
121 |
similarity index 100% |
122 |
rename from net-proxy/haproxy/haproxy-2.2.7.ebuild |
123 |
rename to net-proxy/haproxy/haproxy-2.2.8.ebuild |
124 |
|
125 |
diff --git a/net-proxy/haproxy/haproxy-2.3.3.ebuild b/net-proxy/haproxy/haproxy-2.3.4.ebuild |
126 |
similarity index 100% |
127 |
rename from net-proxy/haproxy/haproxy-2.3.3.ebuild |
128 |
rename to net-proxy/haproxy/haproxy-2.3.4.ebuild |