From b6323af2602e6a5cd4920d4af06b5c2f3949b9d0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 14 Aug 2023 12:12:48 +0100 Subject: gentoo auto-resync : 14:08:2023 - 12:12:48 --- net-proxy/Manifest.gz | Bin 5369 -> 5374 bytes net-proxy/haproxy/Manifest | 1 - net-proxy/haproxy/files/haproxy-2.4.22-hpack.patch | 49 --------------------- 3 files changed, 50 deletions(-) delete mode 100644 net-proxy/haproxy/files/haproxy-2.4.22-hpack.patch (limited to 'net-proxy') diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz index 0f629f64e014..d3760d9b9a59 100644 Binary files a/net-proxy/Manifest.gz and b/net-proxy/Manifest.gz differ diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest index b007417b69f1..2327edc5833c 100644 --- a/net-proxy/haproxy/Manifest +++ b/net-proxy/haproxy/Manifest @@ -1,4 +1,3 @@ -AUX haproxy-2.4.22-hpack.patch 2088 BLAKE2B ae1200151ab4fe6af1bc97c275308257cf5a70d815a9d4235566d0409340f01098f247b4670c16ea3e6cc3e40e5a9ee22c1b92ab187b07f8884b25e842aabbbb SHA512 d916707e9f8da46306eb27b43aea0e7f636b2c040c46ebc4e37fc0ae29fe73a67cb5e46ba7d7dba27694d90959061b2e6d30e99af5c582d051e5bbfa2e0abc68 AUX haproxy.confd 610 BLAKE2B 89c6ea0c2f623bbe7aa80a4f42de1d7fb38a2fa6e9edb5b9c758ee1c5140e750fa6be046e4854c94806a609bd3b487f2553bfeafb1db43871032731425b54f59 SHA512 80a6e109432c7e751e9e1063853f73d3269c4c3967728a90cf94230cb32308b396f9f9ad7795b74b919dae4f61e5a29a9ae7badf0908148accbe0e8ca2238913 AUX haproxy.confd-r1 637 BLAKE2B 5b79a652f0cd124ab9349ceee026c7b54de10c5c4ceccba189c856204fb149b2be667f1bcbd73cb438848d7b34f1ce15812c4fd0e3445b5a6d8c3bd77bdfeda4 SHA512 19cd0dad0fabf579b86c4de74f291e6caf6f5b91d9ae37da2315169dbb75fd35337a7a3e07f4d9e424cfe9776f39952c91f69abd6580c2df16b0d2cc8f3f099a AUX haproxy.initd-r8 1677 BLAKE2B 2bc1d95f5718fd674dbac7f41df07f3d36f83667ffa91de7dea73878af368251ede94b0aed97074b6459a44d2867a69d10b4e4a26ca8a1a4c3e58f68078bbebf SHA512 164fbafeba8475085b7c3c3356f6a39a8c7ae9ed7d602391bd78185a55ed3aa342d5e4d0aa4c4e8f07581ea4299b50614b30808dff6e1f5beec834c55b3bf8a2 diff --git a/net-proxy/haproxy/files/haproxy-2.4.22-hpack.patch b/net-proxy/haproxy/files/haproxy-2.4.22-hpack.patch deleted file mode 100644 index f744eccfaba9..000000000000 --- a/net-proxy/haproxy/files/haproxy-2.4.22-hpack.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 494ae0c35c883632faf1d22b54083d3e97a7c129 Mon Sep 17 00:00:00 2001 -From: Aurelien DARRAGON -Date: Wed, 25 Jan 2023 16:35:00 +0100 -Subject: [PATCH] DEV: hpack: fix `trash` build regression - -Since 7d84439 ("BUILD: hpack: include global.h for the trash that is needed -in debug mode"), hpack decode tool fails to compile on targets that enable -USE_THREAD. (ie: linux-glibc target as reported by Christian Ruppert) - -When building hpack devtool, we are including src/hpack-dec.c as a dependency. -src/hpack-dec.c relies on the global trash whe debug mode is enabled. -But as we're building hpack tool with a limited scope of haproxy -sources, global trash (which is declared in src/chunk.c) is not available. -Thus, src/hpack-dec.c relies on a local 'trash' variable declared within -dev/hpack/decode.c - -This used to work fine until 7d84439. -But now that global.h is explicitely included in src/hpack-dec.c, -trash variable definition from decode.c conflicts with the one from global.h: - - In file included from include/../src/hpack-dec.c:35, - from dev/hpack/decode.c:87: - include/haproxy/global.h:52:35: error: thread-local declaration of 'trash' follows non-thread-local declaration - 52 | extern THREAD_LOCAL struct buffer trash; - -Adding THREAD_LOCAL attribute to 'decode.c' local trash variable definition -makes the compiler happy again. - -This should fix GH issue #2009 ---- - dev/hpack/decode.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dev/hpack/decode.c b/dev/hpack/decode.c -index ae825120f..13c95c77a 100644 ---- a/dev/hpack/decode.c -+++ b/dev/hpack/decode.c -@@ -30,7 +30,7 @@ uint8_t buf[MAX_RQ_SIZE]; - char trash_buf[MAX_RQ_SIZE]; - char tmp_buf[MAX_RQ_SIZE]; - --struct buffer trash = { .area = trash_buf, .data = 0, .size = sizeof(trash_buf) }; -+THREAD_LOCAL struct buffer trash = { .area = trash_buf, .data = 0, .size = sizeof(trash_buf) }; - struct buffer tmp = { .area = tmp_buf, .data = 0, .size = sizeof(tmp_buf) }; - - /* displays a long memory block at , assuming first byte of --- -2.34.1 - -- cgit v1.2.3