diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-01-01 20:22:33 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-01-01 20:22:33 +0000 |
| commit | 5b7c114c09d07eecd00e6f7fb829563aae3597b9 (patch) | |
| tree | db84e97d92f22634a22ce461f4ca00a294a21b24 /net-misc/curl | |
| parent | ad1d34add08caaf8d68c79e40f0a61c733fd68b8 (diff) | |
gentoo auto-resync : 01:01:2023 - 20:22:32
Diffstat (limited to 'net-misc/curl')
| -rw-r--r-- | net-misc/curl/Manifest | 2 | ||||
| -rw-r--r-- | net-misc/curl/files/curl-7.84.0-easylock.patch | 30 | ||||
| -rw-r--r-- | net-misc/curl/files/curl-7.84.0-include-sched.patch | 24 |
3 files changed, 0 insertions, 56 deletions
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index ba702afe337d..7a1fbd433517 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -1,6 +1,4 @@ AUX curl-7.30.0-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd7fe8762d331d1981834044f8ec4db64d527a4ded3f5f4cccc86f281576668de092439eb19f5477d5fcf8369cf SHA512 c7cd13b9ccbd12ed01ea121ffece9c23b898a5b34698bae59ae1dd23b1cf2445180b84d80c4a640981f16dba5018df944f405dd5c660addab54ca21e0e673b7f -AUX curl-7.84.0-easylock.patch 856 BLAKE2B a77854a75a06ad66ef4dc7d6a2555fe2678f4bfd170e961c35e5ad2a82a62891d125ead2d15a311e2a8951404732c755a03636dd4bf4dd3ad16e8bf32ff4f7ca SHA512 7b94f941577d5b0a240e4e879a7e4c659dbdd4ff50d67465bd1a0adf30f5e37a0af7f15b71810feb05d19b833359b069f86aa3ac4c396fd8ba8ed2012b60fb8f -AUX curl-7.84.0-include-sched.patch 625 BLAKE2B 8c7ecdbc8ffd7cafac915c2d12db1ea98acbd166f18eba538ecd4666152653c36784569f1945b095480120c61124573b094e26ce26c8b85f62baedb40e20d758 SHA512 4be64eff67e56c2584f6c9ee0c9c7b7aca55fc15c8d4be6f9f79da9bb3c1bb1532bcb80eb4f87be2db1058dd41a32e366bfe83988d28b4b263fbb6679b5ec806 AUX curl-7.86.0-noproxy-tailmatch-like-in-7.85.0-and-earlier.patch 3609 BLAKE2B 6f7e80c915d8592b93349d8aade7670f37bf37803ee02130245905636de30a70be51272b2d06392397ffcf76bfda78cfc2fbb671971ab3d18b20677239944544 SHA512 20999f12d5316be5854c9ab09a0f9e887edb7878f157069759c8404d31bfd23db352894c0dca6ce871618d0088f0320ebaa1b6166b54facce0e5faf74600232b AUX curl-7.86.0-proxy-noproxy-match-comma.patch 3143 BLAKE2B 1aa8d62e6082601eae9e3ae7690a1e7ddce7f12be4cf9f20010f32aa51cd5b1c4206be0b731935a9ddd45bb5654ceed3cba3eabb6a1b9dc60112052d7e79ffa7 SHA512 1a0c67bdabeb1ea8cba7a0f93c12ea626bdc329bbe8c3978f03cb25a78c74fa3257a36f2ed53c177b3a256bca2c0dd8081bab1536b0670e1ec9c0541ac23fc11 AUX curl-7.86.0-proxy-noproxy-tailmatching.patch 2302 BLAKE2B c4199bc1eb04c8c69f8c72397ce526df6c2186151f77d5e13551e589712e9032e1a52720bd1b946a1b5b984f49a01b297410f4cf74814a58bf4bf43701435c76 SHA512 aa211a5428cc746d07cfd37571169d59ccc97560a69e7c6d21cc8b4a133182366264470de540e1813eee51b376d9056ec8dd01f8e95957e58a83f33d37db0442 diff --git a/net-misc/curl/files/curl-7.84.0-easylock.patch b/net-misc/curl/files/curl-7.84.0-easylock.patch deleted file mode 100644 index 77ee610fc117..000000000000 --- a/net-misc/curl/files/curl-7.84.0-easylock.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 50efb0822aa0e0ab165158dd0a26e65a2290e6d2 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg <daniel@haxx.se> -Date: Tue, 28 Jun 2022 09:00:25 +0200 -Subject: [PATCH] easy_lock: switch to using atomic_int instead of bool - -To work with more compilers without requiring separate libs to -link. Like with gcc-12 for RISC-V on Linux. - -Reported-by: Adam Sampson -Fixes #9055 -Closes #9061 ---- - lib/easy_lock.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/easy_lock.h b/lib/easy_lock.h -index 07c85c5ffdd19..9c11bc50c5f20 100644 ---- a/lib/easy_lock.h -+++ b/lib/easy_lock.h -@@ -40,8 +40,8 @@ - #include <sched.h> - #endif - --#define curl_simple_lock atomic_bool --#define CURL_SIMPLE_LOCK_INIT false -+#define curl_simple_lock atomic_int -+#define CURL_SIMPLE_LOCK_INIT 0 - - static inline void curl_simple_lock_lock(curl_simple_lock *lock) - { diff --git a/net-misc/curl/files/curl-7.84.0-include-sched.patch b/net-misc/curl/files/curl-7.84.0-include-sched.patch deleted file mode 100644 index 842310d2eaab..000000000000 --- a/net-misc/curl/files/curl-7.84.0-include-sched.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://github.com/curl/curl/commit/e2e7f54b7bea521fa8373095d0f43261a720cda0 -https://bugs.gentoo.org/855710 - -From e2e7f54b7bea521fa8373095d0f43261a720cda0 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg <daniel@haxx.se> -Date: Mon, 27 Jun 2022 08:46:21 +0200 -Subject: [PATCH] easy_lock.h: include sched.h if available to fix build - -Patched-by: Harry Sintonen - -Closes #9054 ---- a/lib/easy_lock.h -+++ b/lib/easy_lock.h -@@ -36,6 +36,9 @@ - - #elif defined (HAVE_ATOMIC) - #include <stdatomic.h> -+#if defined(HAVE_SCHED_YIELD) -+#include <sched.h> -+#endif - - #define curl_simple_lock atomic_bool - #define CURL_SIMPLE_LOCK_INIT false - |