Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/files/
Date: Tue, 21 Sep 2021 18:26:39
Message-Id: 1632248754.23411f7dc9810cf379414a43fbab00738af3417b.conikost@gentoo
1 commit: 23411f7dc9810cf379414a43fbab00738af3417b
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Tue Sep 21 17:01:57 2021 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 21 18:25:54 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23411f7d
7
8 net-proxy/haproxy: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/22357
11 Package-Manager: Portage-3.0.23, Repoman-3.0.3
12 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
13 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
14
15 .../files/haproxy-2.3.0-hpack-VAR_ARRAY.patch | 37 ----------------------
16 1 file changed, 37 deletions(-)
17
18 diff --git a/net-proxy/haproxy/files/haproxy-2.3.0-hpack-VAR_ARRAY.patch b/net-proxy/haproxy/files/haproxy-2.3.0-hpack-VAR_ARRAY.patch
19 deleted file mode 100644
20 index 4f6bf4cf717..00000000000
21 --- a/net-proxy/haproxy/files/haproxy-2.3.0-hpack-VAR_ARRAY.patch
22 +++ /dev/null
23 @@ -1,37 +0,0 @@
24 -From 759146f0de143939b841ba987aabb83aa178a4fc Mon Sep 17 00:00:00 2001
25 -From: Christian Ruppert <idl0r@××××.de>
26 -Date: Mon, 9 Nov 2020 09:15:21 +0100
27 -Subject: [PATCH] hpack-tbl-t.h uses VAR_ARRAY and requires compiler.h to be
28 - included
29 -
30 -This fixes building hpack from contrib, which failed because of the
31 -undeclared VAR_ARRAY:
32 -
33 -make -C contrib/hpack
34 -...
35 -cc -O2 -Wall -g -I../../include -fwrapv -fno-strict-aliasing -c -o gen-enc.o gen-enc.c
36 -In file included from gen-enc.c:18:
37 -../../include/haproxy/hpack-tbl-t.h:105:23: error: 'VAR_ARRAY' undeclared here (not in a function)
38 - 105 | struct hpack_dte dte[VAR_ARRAY]; /* dynamic table entries */
39 -...
40 -
41 -Signed-off-by: Christian Ruppert <idl0r@××××.de>
42 ----
43 - include/haproxy/hpack-tbl-t.h | 1 +
44 - 1 file changed, 1 insertion(+)
45 -
46 -diff --git a/include/haproxy/hpack-tbl-t.h b/include/haproxy/hpack-tbl-t.h
47 -index 344f665dd..07f1ca9ea 100644
48 ---- a/include/haproxy/hpack-tbl-t.h
49 -+++ b/include/haproxy/hpack-tbl-t.h
50 -@@ -28,6 +28,7 @@
51 - #define _HAPROXY_HPACK_TBL_T_H
52 -
53 - #include <inttypes.h>
54 -+#include "compiler.h"
55 -
56 - /* Dynamic Headers Table, usable for tables up to 4GB long and values of 64kB-1.
57 - * The model can be improved by using offsets relative to the table entry's end
58 ---
59 -2.26.2
60 -