From 42e82780761e75f17a5cc96626558a297782f385 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 10 Jun 2023 15:51:39 +0100 Subject: gentoo auto-resync : 10:06:2023 - 15:51:39 --- net-misc/Manifest.gz | Bin 54089 -> 54088 bytes net-misc/curl/Manifest | 4 - net-misc/curl/files/curl-8.1.0-header-length.patch | 86 -------- .../curl/files/curl-8.1.0-numeric-hostname.patch | 227 --------------------- .../curl/files/curl-8.1.1-configure-compiler.patch | 73 ------- net-misc/curl/files/curl-8.1.1-hanging-http2.patch | 36 ---- net-misc/linuxptp/Manifest | 2 + net-misc/linuxptp/linuxptp-4.0.ebuild | 50 +++++ net-misc/vncsnapshot/Manifest | 2 +- net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild | 4 +- 10 files changed, 55 insertions(+), 429 deletions(-) delete mode 100644 net-misc/curl/files/curl-8.1.0-header-length.patch delete mode 100644 net-misc/curl/files/curl-8.1.0-numeric-hostname.patch delete mode 100644 net-misc/curl/files/curl-8.1.1-configure-compiler.patch delete mode 100644 net-misc/curl/files/curl-8.1.1-hanging-http2.patch create mode 100644 net-misc/linuxptp/linuxptp-4.0.ebuild (limited to 'net-misc') diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz index 6e4d600280dc..e186dd8882dd 100644 Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index cf4dc50ddabf..d10a01c402ca 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -1,8 +1,4 @@ AUX curl-8.0.1-onion-resolution.patch 4036 BLAKE2B 7f9a693f5090585c46d596133e915b67cf6a0b0a78ee164f987de166f24fb3d64a968f6263110c119710735363429447d52e5cc52df90d0f3830cf0e10c3673b SHA512 72efe3cd6d594cd2b73a19596e587c88a7ca89ed6f9a7325df98df2e18a1e85f26232ea48e80097d2d1e2f8db2c1cd945896311cd70ee830c8838afbcb7628d9 -AUX curl-8.1.0-header-length.patch 2979 BLAKE2B f5028eeec1960abbe05124fa0bcc8e0de039facdf7b0b148abefbbe20b9051d252014e95ef942c0c1ccaab5acc878c69c8ff69ef51d5da7f39be6594eebb8ac5 SHA512 cb6145dc0471ab51bd9e901c3680f7597b2d351d0b6e7149c6436bf01c06945eb58acd6753f9994eccb13adf26794005f0379900bc7efc39aeb5459edd8dfdb2 -AUX curl-8.1.0-numeric-hostname.patch 8375 BLAKE2B 3936764975eea8499b699d126f58a8b8ad35a19a563b84c40e8f2031251bd1f7094f1bee975e1d00dde84613045a7a61a3bb9cb85794dfc9a72d0341033f75e2 SHA512 f630dc2ef72b1a918437eb1ab4bf0c64e2787fdf4dd003de215246633518d8cbf555607c5d6ac65215e6a44a678849528ea0961a9a186feff6ed994c530c0ee4 -AUX curl-8.1.1-configure-compiler.patch 2764 BLAKE2B b275f023ffcdc55ec8515470e4d48118321b0039929765f516a43546951aa92c072cb56b4ed746c991fec439c40f947a2b867eb7c2d051b8c44bdef622de24b4 SHA512 45fd81839e1b0bf5c1ffa270966066c4301be9109e87f07ac061a39f3fb7f2ae5a845daf10818524a9467f0d58d18b93f1f99f186fb5de96be80e52e37fb8f45 -AUX curl-8.1.1-hanging-http2.patch 1751 BLAKE2B 4b3cf019a630033897529a6cea985ed4bb3d4b7b205980d231c077d67f7ad3ff99edbd70dfb579236780cdb05cec36d2285c1a4b1fe014bd2b7bf543b407e70e SHA512 a7f1bad5d3d7100c293594f1429cb0d2484e55f9f8b8a73cad6c40ca21f613c75d1ca70fa985a8644230f70ad0fee30dc335de322eb8b18a4e524df99cd6a961 AUX curl-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd7fe8762d331d1981834044f8ec4db64d527a4ded3f5f4cccc86f281576668de092439eb19f5477d5fcf8369cf SHA512 c7cd13b9ccbd12ed01ea121ffece9c23b898a5b34698bae59ae1dd23b1cf2445180b84d80c4a640981f16dba5018df944f405dd5c660addab54ca21e0e673b7f AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54 DIST curl-8.0.1.tar.xz 2575544 BLAKE2B 67d82e9d71f0a351b5c2ed3ad5eab02e367ded872658a295179b935729d5105015f8c29569c396e11cd14036656af894ded85c8838cba260d9f6f1a8dcb5e22b SHA512 3bb777982659ed697ae90f113ff7b65d6ce8ba9fe6a8984cfd6769d2f051a72ba953c911abe234c204ec2cc5a35d68b4d033037fad7fba31bb92a52543f8d13d diff --git a/net-misc/curl/files/curl-8.1.0-header-length.patch b/net-misc/curl/files/curl-8.1.0-header-length.patch deleted file mode 100644 index 6229fd817f2a..000000000000 --- a/net-misc/curl/files/curl-8.1.0-header-length.patch +++ /dev/null @@ -1,86 +0,0 @@ -https://github.com/curl/curl/commit/77c9a9845bbee66f3aff158b8452dc8cd963cbd5.patch -From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= -Date: Thu, 18 May 2023 18:22:57 +0200 -Subject: [PATCH] http2: double http request parser max line length - -This works around #11138, by doubling the limit, and should be a -relatively safe fix. - -Ideally the buffer would grow as needed and there would be no need for a -limit? But that might be follow-up material. - -Fixes #11138 -Closes #11139 ---- - lib/http1.h | 2 ++ - lib/http2.c | 2 +- - lib/vquic/curl_msh3.c | 2 +- - lib/vquic/curl_ngtcp2.c | 2 +- - lib/vquic/curl_quiche.c | 2 +- - 5 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/lib/http1.h b/lib/http1.h -index c2d107587a6f8..8acb9db401a95 100644 ---- a/lib/http1.h -+++ b/lib/http1.h -@@ -33,6 +33,8 @@ - #define H1_PARSE_OPT_NONE (0) - #define H1_PARSE_OPT_STRICT (1 << 0) - -+#define H1_PARSE_DEFAULT_MAX_LINE_LEN (8 * 1024) -+ - struct h1_req_parser { - struct http_req *req; - struct bufq scratch; -diff --git a/lib/http2.c b/lib/http2.c -index 47e6f71393156..4e3b182b8d815 100644 ---- a/lib/http2.c -+++ b/lib/http2.c -@@ -1860,7 +1860,7 @@ static ssize_t h2_submit(struct stream_ctx **pstream, - nghttp2_priority_spec pri_spec; - ssize_t nwritten; - -- Curl_h1_req_parse_init(&h1, (4*1024)); -+ Curl_h1_req_parse_init(&h1, H1_PARSE_DEFAULT_MAX_LINE_LEN); - Curl_dynhds_init(&h2_headers, 0, DYN_HTTP_REQUEST); - - *err = http2_data_setup(cf, data, &stream); -diff --git a/lib/vquic/curl_msh3.c b/lib/vquic/curl_msh3.c -index 40e89379fc402..173886739b6dc 100644 ---- a/lib/vquic/curl_msh3.c -+++ b/lib/vquic/curl_msh3.c -@@ -575,7 +575,7 @@ static ssize_t cf_msh3_send(struct Curl_cfilter *cf, struct Curl_easy *data, - - CF_DATA_SAVE(save, cf, data); - -- Curl_h1_req_parse_init(&h1, (4*1024)); -+ Curl_h1_req_parse_init(&h1, H1_PARSE_DEFAULT_MAX_LINE_LEN); - Curl_dynhds_init(&h2_headers, 0, DYN_HTTP_REQUEST); - - /* Sizes must match for cast below to work" */ -diff --git a/lib/vquic/curl_ngtcp2.c b/lib/vquic/curl_ngtcp2.c -index 05f960afdffa1..7794f148c6ec9 100644 ---- a/lib/vquic/curl_ngtcp2.c -+++ b/lib/vquic/curl_ngtcp2.c -@@ -1550,7 +1550,7 @@ static ssize_t h3_stream_open(struct Curl_cfilter *cf, - nghttp3_data_reader reader; - nghttp3_data_reader *preader = NULL; - -- Curl_h1_req_parse_init(&h1, (4*1024)); -+ Curl_h1_req_parse_init(&h1, H1_PARSE_DEFAULT_MAX_LINE_LEN); - Curl_dynhds_init(&h2_headers, 0, DYN_HTTP_REQUEST); - - *err = h3_data_setup(cf, data); -diff --git a/lib/vquic/curl_quiche.c b/lib/vquic/curl_quiche.c -index 392b9beb83c59..c63e8e10a22e0 100644 ---- a/lib/vquic/curl_quiche.c -+++ b/lib/vquic/curl_quiche.c -@@ -913,7 +913,7 @@ static ssize_t h3_open_stream(struct Curl_cfilter *cf, - DEBUGASSERT(stream); - } - -- Curl_h1_req_parse_init(&h1, (4*1024)); -+ Curl_h1_req_parse_init(&h1, H1_PARSE_DEFAULT_MAX_LINE_LEN); - Curl_dynhds_init(&h2_headers, 0, DYN_HTTP_REQUEST); - - DEBUGASSERT(stream); diff --git a/net-misc/curl/files/curl-8.1.0-numeric-hostname.patch b/net-misc/curl/files/curl-8.1.0-numeric-hostname.patch deleted file mode 100644 index 6a0dd1382d62..000000000000 --- a/net-misc/curl/files/curl-8.1.0-numeric-hostname.patch +++ /dev/null @@ -1,227 +0,0 @@ -https://github.com/curl/curl/commit/92772e6d395bbdda0e7822d980caf86e8c4aa51c.patch -From: Daniel Stenberg -Date: Thu, 18 May 2023 00:31:17 +0200 -Subject: [PATCH] urlapi: allow numerical parts in the host name - -It can only be an IPv4 address if all parts are all digits and no more than -four parts, otherwise it is a host name. Even slightly wrong IPv4 will now be -passed through as a host name. - -Regression from 17a15d88467 shipped in 8.1.0 - -Extended test 1560 accordingly. - -Reported-by: Pavel Kalyugin -Fixes #11129 -Closes #11131 ---- a/lib/urlapi.c -+++ b/lib/urlapi.c -@@ -34,6 +34,7 @@ - #include "inet_ntop.h" - #include "strdup.h" - #include "idn.h" -+#include "curl_memrchr.h" - - /* The last 3 #include files should be in this order */ - #include "curl_printf.h" -@@ -643,8 +644,8 @@ static CURLUcode hostname_check(struct Curl_URL *u, char *hostname, - * Handle partial IPv4 numerical addresses and different bases, like - * '16843009', '0x7f', '0x7f.1' '0177.1.1.1' etc. - * -- * If the given input string is syntactically wrong or any part for example is -- * too big, this function returns FALSE and doesn't create any output. -+ * If the given input string is syntactically wrong IPv4 or any part for -+ * example is too big, this function returns HOST_NAME. - * - * Output the "normalized" version of that input string in plain quad decimal - * integers. -@@ -675,7 +676,7 @@ static int ipv4_normalize(struct dynbuf *host) - unsigned long l; - if(!ISDIGIT(*c)) - /* most importantly this doesn't allow a leading plus or minus */ -- return n ? HOST_BAD : HOST_NAME; -+ return HOST_NAME; - l = strtoul(c, &endp, 0); - - parts[n] = l; -@@ -684,7 +685,7 @@ static int ipv4_normalize(struct dynbuf *host) - switch(*c) { - case '.': - if(n == 3) -- return HOST_BAD; -+ return HOST_NAME; - n++; - c++; - break; -@@ -694,39 +695,40 @@ static int ipv4_normalize(struct dynbuf *host) - break; - - default: -- return n ? HOST_BAD : HOST_NAME; -+ return HOST_NAME; - } - - /* overflow */ - if((l == ULONG_MAX) && (errno == ERANGE)) -- return HOST_BAD; -+ return HOST_NAME; - - #if SIZEOF_LONG > 4 - /* a value larger than 32 bits */ - if(l > UINT_MAX) -- return HOST_BAD; -+ return HOST_NAME; - #endif - } - -- /* this is a valid IPv4 numerical address */ -- Curl_dyn_reset(host); -- - switch(n) { - case 0: /* a -- 32 bits */ -+ Curl_dyn_reset(host); -+ - result = Curl_dyn_addf(host, "%u.%u.%u.%u", - parts[0] >> 24, (parts[0] >> 16) & 0xff, - (parts[0] >> 8) & 0xff, parts[0] & 0xff); - break; - case 1: /* a.b -- 8.24 bits */ - if((parts[0] > 0xff) || (parts[1] > 0xffffff)) -- return HOST_BAD; -+ return HOST_NAME; -+ Curl_dyn_reset(host); - result = Curl_dyn_addf(host, "%u.%u.%u.%u", - parts[0], (parts[1] >> 16) & 0xff, - (parts[1] >> 8) & 0xff, parts[1] & 0xff); - break; - case 2: /* a.b.c -- 8.8.16 bits */ - if((parts[0] > 0xff) || (parts[1] > 0xff) || (parts[2] > 0xffff)) -- return HOST_BAD; -+ return HOST_NAME; -+ Curl_dyn_reset(host); - result = Curl_dyn_addf(host, "%u.%u.%u.%u", - parts[0], parts[1], (parts[2] >> 8) & 0xff, - parts[2] & 0xff); -@@ -734,7 +736,8 @@ static int ipv4_normalize(struct dynbuf *host) - case 3: /* a.b.c.d -- 8.8.8.8 bits */ - if((parts[0] > 0xff) || (parts[1] > 0xff) || (parts[2] > 0xff) || - (parts[3] > 0xff)) -- return HOST_BAD; -+ return HOST_NAME; -+ Curl_dyn_reset(host); - result = Curl_dyn_addf(host, "%u.%u.%u.%u", - parts[0], parts[1], parts[2], parts[3]); - break; -@@ -796,6 +799,9 @@ static CURLUcode parse_authority(struct Curl_URL *u, - if(result) - goto out; - -+ if(!Curl_dyn_len(host)) -+ return CURLUE_NO_HOST; -+ - switch(ipv4_normalize(host)) { - case HOST_IPV4: - break; ---- a/tests/libtest/lib1560.c -+++ b/tests/libtest/lib1560.c -@@ -474,6 +474,13 @@ static const struct testcase get_parts_list[] ={ - }; - - static const struct urltestcase get_url_list[] = { -+ {"https://1.0x1000000", "https://1.0x1000000/", 0, 0, CURLUE_OK}, -+ {"https://0x7f.1", "https://127.0.0.1/", 0, 0, CURLUE_OK}, -+ {"https://1.2.3.256.com", "https://1.2.3.256.com/", 0, 0, CURLUE_OK}, -+ {"https://10.com", "https://10.com/", 0, 0, CURLUE_OK}, -+ {"https://1.2.com", "https://1.2.com/", 0, 0, CURLUE_OK}, -+ {"https://1.2.3.com", "https://1.2.3.com/", 0, 0, CURLUE_OK}, -+ {"https://1.2.com.99", "https://1.2.com.99/", 0, 0, CURLUE_OK}, - {"https://[fe80::0000:20c:29ff:fe9c:409b]:80/moo", - "https://[fe80::20c:29ff:fe9c:409b]:80/moo", - 0, 0, CURLUE_OK}, -@@ -522,22 +529,24 @@ static const struct urltestcase get_url_list[] = { - - /* IPv4 trickeries */ - {"https://16843009", "https://1.1.1.1/", 0, 0, CURLUE_OK}, -- {"https://0x7f.1", "https://127.0.0.1/", 0, 0, CURLUE_OK}, - {"https://0177.1", "https://127.0.0.1/", 0, 0, CURLUE_OK}, - {"https://0111.02.0x3", "https://73.2.0.3/", 0, 0, CURLUE_OK}, -+ {"https://0111.02.0x3.", "https://0111.02.0x3./", 0, 0, CURLUE_OK}, -+ {"https://0111.02.030", "https://73.2.0.24/", 0, 0, CURLUE_OK}, -+ {"https://0111.02.030.", "https://0111.02.030./", 0, 0, CURLUE_OK}, - {"https://0xff.0xff.0377.255", "https://255.255.255.255/", 0, 0, CURLUE_OK}, - {"https://1.0xffffff", "https://1.255.255.255/", 0, 0, CURLUE_OK}, - /* IPv4 numerical overflows or syntax errors will not normalize */ - {"https://a127.0.0.1", "https://a127.0.0.1/", 0, 0, CURLUE_OK}, - {"https://\xff.127.0.0.1", "https://%FF.127.0.0.1/", 0, CURLU_URLENCODE, - CURLUE_OK}, -- {"https://127.-0.0.1", "https://127.-0.0.1/", 0, 0, CURLUE_BAD_HOSTNAME}, -+ {"https://127.-0.0.1", "https://127.-0.0.1/", 0, 0, CURLUE_OK}, - {"https://127.0. 1", "https://127.0.0.1/", 0, 0, CURLUE_MALFORMED_INPUT}, -- {"https://1.0x1000000", "https://1.0x1000000/", 0, 0, CURLUE_BAD_HOSTNAME}, -- {"https://1.2.3.256", "https://1.2.3.256/", 0, 0, CURLUE_BAD_HOSTNAME}, -- {"https://1.2.3.4.5", "https://1.2.3.4.5/", 0, 0, CURLUE_BAD_HOSTNAME}, -- {"https://1.2.0x100.3", "https://1.2.0x100.3/", 0, 0, CURLUE_BAD_HOSTNAME}, -- {"https://4294967296", "https://4294967296/", 0, 0, CURLUE_BAD_HOSTNAME}, -+ {"https://1.2.3.256", "https://1.2.3.256/", 0, 0, CURLUE_OK}, -+ {"https://1.2.3.256.", "https://1.2.3.256./", 0, 0, CURLUE_OK}, -+ {"https://1.2.3.4.5", "https://1.2.3.4.5/", 0, 0, CURLUE_OK}, -+ {"https://1.2.0x100.3", "https://1.2.0x100.3/", 0, 0, CURLUE_OK}, -+ {"https://4294967296", "https://4294967296/", 0, 0, CURLUE_OK}, - {"https://123host", "https://123host/", 0, 0, CURLUE_OK}, - /* 40 bytes scheme is the max allowed */ - {"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA://hostname/path", -@@ -599,20 +608,11 @@ static const struct urltestcase get_url_list[] = { - 0, 0, CURLUE_OK}, - /* here the password has the semicolon */ - {"http://user:pass;word@host/file", -- "http://user:pass;word@host/file", -- 0, 0, CURLUE_OK}, -- {"file:///file.txt#moo", -- "file:///file.txt#moo", -- 0, 0, CURLUE_OK}, -- {"file:////file.txt", -- "file:////file.txt", -- 0, 0, CURLUE_OK}, -- {"file:///file.txt", -- "file:///file.txt", -- 0, 0, CURLUE_OK}, -- {"file:./", -- "file://", -- 0, 0, CURLUE_BAD_SCHEME}, -+ "http://user:pass;word@host/file", 0, 0, CURLUE_OK}, -+ {"file:///file.txt#moo", "file:///file.txt#moo", 0, 0, CURLUE_OK}, -+ {"file:////file.txt", "file:////file.txt", 0, 0, CURLUE_OK}, -+ {"file:///file.txt", "file:///file.txt", 0, 0, CURLUE_OK}, -+ {"file:./", "file://", 0, 0, CURLUE_OK}, - {"http://example.com/hello/../here", - "http://example.com/hello/../here", - CURLU_PATH_AS_IS, 0, CURLUE_OK}, -@@ -1124,7 +1124,7 @@ static int get_url(void) - } - curl_free(url); - } -- else if(rc != get_url_list[i].ucode) { -+ if(rc != get_url_list[i].ucode) { - fprintf(stderr, "Get URL\nin: %s\nreturned %d (expected %d)\n", - get_url_list[i].in, (int)rc, get_url_list[i].ucode); - error++; -@@ -1515,6 +1515,9 @@ int test(char *URL) - { - (void)URL; /* not used */ - -+ if(get_url()) -+ return 3; -+ - if(huge()) - return 9; - -@@ -1533,9 +1536,6 @@ int test(char *URL) - if(set_parts()) - return 2; - -- if(get_url()) -- return 3; -- - if(get_parts()) - return 4; - diff --git a/net-misc/curl/files/curl-8.1.1-configure-compiler.patch b/net-misc/curl/files/curl-8.1.1-configure-compiler.patch deleted file mode 100644 index f769b35880cf..000000000000 --- a/net-misc/curl/files/curl-8.1.1-configure-compiler.patch +++ /dev/null @@ -1,73 +0,0 @@ -The check for "basic compiler options" hangs otherwise. - -https://github.com/curl/curl/commit/471dab2da0c6b2b08ca2b96a1da0a4825e2c3c36 -https://github.com/curl/curl/commit/c4a019603b82a08c3572591a9393df0818ee02f6 - -From 471dab2da0c6b2b08ca2b96a1da0a4825e2c3c36 Mon Sep 17 00:00:00 2001 -From: Christian Hesse -Date: Tue, 23 May 2023 09:40:18 +0200 -Subject: [PATCH] configure: quote the assignments for run-compiler - -Building for multilib failed, as the compiler command contains an -extra argument. That needs quoting. - -Regression from b78ca50cb3dda361f9c1 - -Fixes #11179 -Closes #11180 ---- a/configure.ac -+++ b/configure.ac -@@ -193,8 +193,8 @@ dnl something different but only have that affect the execution of the results - dnl of the compile, not change the libraries for the compiler itself. - dnl - compilersh="run-compiler" --echo "CC=$CC" > $compilersh --echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $compilersh -+echo "CC=\"$CC\"" > $compilersh -+echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"" >> $compilersh - echo 'exec $CC $@' >> $compilersh - - dnl ********************************************************************** - -From c4a019603b82a08c3572591a9393df0818ee02f6 Mon Sep 17 00:00:00 2001 -From: Emanuele Torre -Date: Tue, 23 May 2023 11:59:59 +0200 -Subject: [PATCH] configure: fix build with arbitrary CC and LD_LIBRARY_PATH - -Since ./configure and processes that inherit its environment variables -are the only callers of the run-compiler script, we can just save the -current value of the LD_LIBRARY_PATH and CC variables to another pair of -environment variables, and make run-compiler a static script that -simply restores CC and LD_LIBRARY_PATH to the saved value, and before -running the compiler. - -This avoids having to inject the values of the variables in the script, -possibly causing problems if they contains spaces, quotes, and other -special characters. - -Also add exports in the script just in case LD_LIBRARY_PATH and CC are -not already in the environment. - -follow-up from 471dab2 - -Closes #11182 ---- a/configure.ac -+++ b/configure.ac -@@ -193,9 +193,13 @@ dnl something different but only have that affect the execution of the results - dnl of the compile, not change the libraries for the compiler itself. - dnl - compilersh="run-compiler" --echo "CC=\"$CC\"" > $compilersh --echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"" >> $compilersh --echo 'exec $CC $@' >> $compilersh -+export "CURL_SAVED_CC=$CC" -+export "CURL_SAVED_LD_LIBRARY_PATH=$LD_LIBRARY_PATH" -+cat <<\EOF > "$compilersh" -+export "CC=$CURL_SAVED_CC" -+export "LD_LIBRARY_PATH=$CURL_SAVED_LD_LIBRARY_PATH" -+exec $CC "$@" -+EOF - - dnl ********************************************************************** - dnl See which TLS backend(s) that are requested. Just do all the - diff --git a/net-misc/curl/files/curl-8.1.1-hanging-http2.patch b/net-misc/curl/files/curl-8.1.1-hanging-http2.patch deleted file mode 100644 index 4777c4dd35ed..000000000000 --- a/net-misc/curl/files/curl-8.1.1-hanging-http2.patch +++ /dev/null @@ -1,36 +0,0 @@ -https://github.com/curl/curl/commit/5c58cb0212bcf63cce33a974906bf9905948b4bb -From: Stefan Eissing -Date: Wed, 24 May 2023 18:48:16 +0200 -Subject: [PATCH] http2: fix EOF handling on uploads with auth negotiation - -- doing a POST with `--digest` does an override on the initial request - with `Content-Length: 0`, but the http2 filter was unaware of that - and expected the originally request body. It did therefore not - send a final DATA frame with EOF flag to the server. -- The fix overrides any initial notion of post size when the `done_send` - event is triggered by the transfer loop, leading to the EOF that - is necessary. -- refs #11194. The fault did not happen in testing, as Apache httpd - never tries to read the request body of the initial request, - sends the 401 reply and closes the stream. The server used in the - reported issue however tried to read the EOF and timed out on the - request. - -Reported-by: Aleksander Mazur -Fixes #11194 -Cloes #11200 ---- a/lib/http2.c -+++ b/lib/http2.c -@@ -1527,10 +1527,8 @@ static CURLcode http2_data_done_send(struct Curl_cfilter *cf, - if(!stream->send_closed) { - stream->send_closed = TRUE; - if(stream->upload_left) { -- /* If we operated with unknown length, we now know that everything -- * that is buffered is all we have to send. */ -- if(stream->upload_left == -1) -- stream->upload_left = Curl_bufq_len(&stream->sendbuf); -+ /* we now know that everything that is buffered is all there is. */ -+ stream->upload_left = Curl_bufq_len(&stream->sendbuf); - /* resume sending here to trigger the callback to get called again so - that it can signal EOF to nghttp2 */ - (void)nghttp2_session_resume_data(ctx->h2, stream->id); diff --git a/net-misc/linuxptp/Manifest b/net-misc/linuxptp/Manifest index 8d107a235dab..fe087f189ddc 100644 --- a/net-misc/linuxptp/Manifest +++ b/net-misc/linuxptp/Manifest @@ -4,5 +4,7 @@ AUX phc2sysAT.service 248 BLAKE2B b0e1926a7755314bd0def600e81dbf7b60707216ff3844 AUX ptp4lAT.service 242 BLAKE2B 2b0ca6ca5b7e4adde39ca360713af02450c0d36b1f4a2393350a59d80dcb0cc26000862546b732aac9f6b89ed6fdec0175485685cc3343d2d33fc48d671cca03 SHA512 f182fc52ebfc8fa878d94604fd398d071fcf8347cc8c251a2f8f78fbce518181c543f2eae971ecfb768bc9337c816d894ab150b37ce1642e854a65792324a50b AUX timemaster.service 234 BLAKE2B c59cfb10a85db09dc48830b166e6c3338949a2f12b4170a00d0f5b44f118fff5a56dd2fb74fecead5068f8b345399bb27dfef1e382fa27a777e9ddc65b7b92a9 SHA512 d3b1f7fb31ca0b233575bc491ba52700be8d586ead5657facda3b84141cd1467b55c52f4cafea972f13d1c647cc8b3bb1092bca580fd0b0d135688d00a641a82 DIST linuxptp-3.1.1.tgz 218784 BLAKE2B 5b46580a0e1b6e003f5f03e512c4f9b348c086f356fd47d3480da5e8223ba291fdb213798c696c37759896a99bccf21cd7e7daddce5aa5ed5701afb0e622a755 SHA512 c3c40987fe68480a8473097ebc3c506fb4f8f3b6456bbe637b2b3cb0b3e0182f1513b511fdc04b3607d5f7d8bd1bd22502bb86eb13f9fa4fa63a3331846b33ec +DIST linuxptp-4.0.tgz 250862 BLAKE2B 2c790e35677ee443b39130459b51e9b7237ec780f6e9774028e3c956de6e962ae8272157bf5e6bea847a098654b8cf9621a907b57c38778d55383182ec2d63aa SHA512 763de5654f0426f2f489223e02fb3dd39a3a830751b366406657efe33bb923b5b38edada7b62de3efed6d257d5d386ece0d42a5eb92da5e5d443eac9b32e105d EBUILD linuxptp-3.1.1-r1.ebuild 1244 BLAKE2B 3d3fd5c5fd85addbaddfec4e4344722ac57bc9ebb91699c501ed0ce9e36e9f48eb45e63b0d4c049c7aa717b7ec2cbf6dfa46283df39b239a48086eb39a3f3aa6 SHA512 92dd2c98a1391bf8a6ce22d8bcd354f705a83e38352a1175c240770705fc0251f65bf8276282b08a53ec565bf5abba3264db4a59cb0c516f45260eb4228a550a +EBUILD linuxptp-4.0.ebuild 1241 BLAKE2B d7900407df59dd26f86588e2ee63ec6db597e5c7c50fe5078bf12faadf7eedc35fe2ec0eb2b0b5e65977a5a6ad850fe6bc91eb12cf35aa4c59192af240aea674 SHA512 3bea6af0e7d08bebe89d7bab08ff3559dd8b53ad6e5405b47f2e0b2f694b494a325bfe30d4634c3cc915bee769843b52de63cd15c814bb3875f34dd3f1103c00 MISC metadata.xml 434 BLAKE2B 6294b76d69b7459ff51a8b3f679ca7bfd940a70088eb53be6e15092465a3cb01f4a7b8b5430244b871321c320ec389ac1b05b239f3eef54e9284e881910e13cf SHA512 7f2fb3921793510144e823c70d1ac263297d3591055c680fc8192dd8402e8a763bc8de8882f9c441e060e23cebaa5e6c684873d82738a6ae8f54b6e027b5c837 diff --git a/net-misc/linuxptp/linuxptp-4.0.ebuild b/net-misc/linuxptp/linuxptp-4.0.ebuild new file mode 100644 index 000000000000..482409416297 --- /dev/null +++ b/net-misc/linuxptp/linuxptp-4.0.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-info systemd toolchain-funcs + +DESCRIPTION="The Linux Precision Time Protocol (PTP) implementation" +HOMEPAGE="https://linuxptp.nwtime.org/" +SRC_URI="mirror://sourceforge/project/${PN}/v$(ver_cut 1-2)/${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" + +DEPEND="elibc_musl? ( sys-libs/queue-standalone )" + +CONFIG_CHECK="~NETWORK_PHY_TIMESTAMPING ~PPS ~PTP_1588_CLOCK" + +PATCHES=( + "${FILESDIR}"/${PN}-3.1.1-user_cpp.patch + "${FILESDIR}"/${PN}-3.1.1-string-include.patch +) + +pkg_setup() { + linux-info_pkg_setup +} + +src_compile() { + # parse needed additional CFLAGS + export MY_FLAGS=$(CPP="$(tc-getCPP)" ./incdefs.sh) + export EXTRA_CFLAGS="${CFLAGS} ${MY_FLAGS}" + emake CC="$(tc-getCC)" prefix=/usr mandir=/usr/share/man +} + +src_install() { + emake \ + prefix="${D}"/usr \ + mandir="${D}"/usr/share/man \ + infodir="${D}"/usr/share/info \ + libdir="${D}"/usr/$(get_libdir) \ + install + + systemd_newunit "${FILESDIR}"/phc2sysAT.service phc2sys@.service + systemd_newunit "${FILESDIR}"/ptp4lAT.service ptp4l@.service + systemd_dounit "${FILESDIR}"/timemaster.service + + dodoc README.org + dodoc -r configs +} diff --git a/net-misc/vncsnapshot/Manifest b/net-misc/vncsnapshot/Manifest index 421ebea88c85..732447390147 100644 --- a/net-misc/vncsnapshot/Manifest +++ b/net-misc/vncsnapshot/Manifest @@ -1,4 +1,4 @@ AUX vncsnapshot-1.2a-amd64grey.patch 312 BLAKE2B 573ec5b25b6829f3702c3f6e1c26160c89edf043ffa59e90e6d4664d51e124dfe688a282ab252f112a55e9eb5df31a2c1e205b7287bc0e8805f005288f29588c SHA512 73065578ac7cc52dbee7043feeea9bab3ec37ed4b0264232fcc531247a685feb41891588141863f861881b982be25db957d0c65ff23775ebcdddeabeaace6d7a DIST vncsnapshot-1.2a-src.tar.bz2 70121 BLAKE2B 91e2d1e998f102707e00e5e83e9060fa88f1140b64029564977b93ac5b701be3408540ef76addf4ddf2cccfa973c59f94a127c74f44143c3683e38b0e9359c6d SHA512 2ae53a043c11d02bbb7ff6afc000eef268448643ba1db7b6c5a55fe3e25e65e1b22e64e855d33dfe55b1df04dc57f592e48c44918943642da19f7d06df77027c -EBUILD vncsnapshot-1.2a.ebuild 1231 BLAKE2B bdc88a19c6b5434da7460492d350a4fd765afaf786289f4b4d0d1678d14fdc22f774dddf499aaee08ab216366066ff149611c92c55e3141fb383486dbd3d4e4c SHA512 bd1adad07f345ac834c40f6ae9ac1bf7981783dd6cce9dd17a55d74038914d38035ace7458631e6658d67db6f13cc999d80dd8872a76a7529a68d07ff9be8d00 +EBUILD vncsnapshot-1.2a.ebuild 1238 BLAKE2B 1621803c316c2ec3398d6ebc5fbe3528ea07ea2f2bcc3c959c1781ba027e6e5d39ab3b7b7b2ec878cc95c3f7646d73958bbc852ac862f80c43ae3bedbe56d991 SHA512 edad3422a19f4226b109a501c9cd8c5ff13e3986aaaa445302e9882e12a479d8490c3173341699dc84cbe1f4c9000a423d8c0173334544c8030b3ae1806390cc MISC metadata.xml 249 BLAKE2B de21f79d81f60af5286e45d77ea4badf023f24a6bcf35b636ac0cbcb078333fb76e64047f95e386439f2a0481e241f994794f281e6099992ebbe1b8f03da701b SHA512 4629240a2f020dae0d03c273c695cf068cbb9736584caaad9bcb15c175b5d9dc3e8a5fdb9d104c9fa0432b887f16f3d68bee70f52767f6b8125faa7162a269f5 diff --git a/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild b/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild index 91d250b58b94..082dd8ddf017 100644 --- a/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild +++ b/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ppc x86" +KEYWORDS="~amd64 ~arm64 ppc x86" DEPEND=" sys-libs/zlib -- cgit v1.2.3