diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-05-02 23:23:40 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-05-02 23:23:40 +0100 |
commit | f20958f66a5e97c92cc44354e07e3e3089dfc23d (patch) | |
tree | fbf2993fb14c0f373d35922030b711e3fda4f864 /dev-libs/libevent/files | |
parent | e805507c58bab294dddb75f6fc9b551d9d92de86 (diff) |
gentoo auto-resync : 02:05:2023 - 23:23:39
Diffstat (limited to 'dev-libs/libevent/files')
-rw-r--r-- | dev-libs/libevent/files/libevent-2.1.12-clang16.patch | 105 | ||||
-rw-r--r-- | dev-libs/libevent/files/libevent-2.1.12-libressl.patch | 30 |
2 files changed, 135 insertions, 0 deletions
diff --git a/dev-libs/libevent/files/libevent-2.1.12-clang16.patch b/dev-libs/libevent/files/libevent-2.1.12-clang16.patch new file mode 100644 index 000000000000..2ecf2472079f --- /dev/null +++ b/dev-libs/libevent/files/libevent-2.1.12-clang16.patch @@ -0,0 +1,105 @@ +https://bugs.gentoo.org/880381 +https://github.com/libevent/libevent/commit/35375101e741d78bf49642c6929c1eb69a7c3d79 + +From 35375101e741d78bf49642c6929c1eb69a7c3d79 Mon Sep 17 00:00:00 2001 +From: Azat Khuzhin <azat@libevent.org> +Date: Fri, 27 Jan 2023 08:57:33 +0100 +Subject: [PATCH] Fixes some new warnings under clang-15 + +- -Wdeprecated-non-prototype + + /src/le/libevent/strlcpy.c:48:1: warning: a function definition without a prototype is deprecated in all versions of C and is not supported in C2x [-Wdeprecated-non-prototype] + event_strlcpy_(dst, src, siz) + +- -Wstrict-prototypes + + /src/le/libevent/evthread.c:82:70: warning: a function declaration without a prototype is deprecated in all versions of C [-Wstrict-prototypes] + struct evthread_condition_callbacks *evthread_get_condition_callbacks() + +- -Wunused-but-set-variable + + /src/le/libevent/test/regress_buffer.c:130:6: warning: variable 'n' set but not used [-Wunused-but-set-variable] + int n = 0; + ^ +--- + evthread.c | 4 ++-- + strlcpy.c | 6 +----- + test/regress_buffer.c | 5 ----- + 3 files changed, 3 insertions(+), 12 deletions(-) + +diff --git a/evthread.c b/evthread.c +index 3eac594d64..c2da914da1 100644 +--- a/evthread.c ++++ b/evthread.c +@@ -74,12 +74,12 @@ evthread_set_id_callback(unsigned long (*id_fn)(void)) + evthread_id_fn_ = id_fn; + } + +-struct evthread_lock_callbacks *evthread_get_lock_callbacks() ++struct evthread_lock_callbacks *evthread_get_lock_callbacks(void) + { + return evthread_lock_debugging_enabled_ + ? &original_lock_fns_ : &evthread_lock_fns_; + } +-struct evthread_condition_callbacks *evthread_get_condition_callbacks() ++struct evthread_condition_callbacks *evthread_get_condition_callbacks(void) + { + return evthread_lock_debugging_enabled_ + ? &original_cond_fns_ : &evthread_cond_fns_; +diff --git a/strlcpy.c b/strlcpy.c +index 3876475f5a..04c74298dc 100644 +--- a/strlcpy.c ++++ b/strlcpy.c +@@ -44,11 +44,7 @@ static char *rcsid = "$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp + * will be copied. Always NUL terminates (unless siz == 0). + * Returns strlen(src); if retval >= siz, truncation occurred. + */ +-size_t +-event_strlcpy_(dst, src, siz) +- char *dst; +- const char *src; +- size_t siz; ++size_t event_strlcpy_(char *dst, const char *src, size_t siz) + { + register char *d = dst; + register const char *s = src; +diff --git a/test/regress_buffer.c b/test/regress_buffer.c +index 5683810e26..b0a9e0c162 100644 +--- a/test/regress_buffer.c ++++ b/test/regress_buffer.c +@@ -127,19 +127,16 @@ evbuffer_get_waste(struct evbuffer *buf, size_t *allocatedp, size_t *wastedp, si + { + struct evbuffer_chain *chain; + size_t a, w, u; +- int n = 0; + u = a = w = 0; + + chain = buf->first; + /* skip empty at start */ + while (chain && chain->off==0) { +- ++n; + a += chain->buffer_len; + chain = chain->next; + } + /* first nonempty chain: stuff at the end only is wasted. */ + if (chain) { +- ++n; + a += chain->buffer_len; + u += chain->off; + if (chain->next && chain->next->off) +@@ -148,7 +145,6 @@ evbuffer_get_waste(struct evbuffer *buf, size_t *allocatedp, size_t *wastedp, si + } + /* subsequent nonempty chains */ + while (chain && chain->off) { +- ++n; + a += chain->buffer_len; + w += (size_t)chain->misalign; + u += chain->off; +@@ -158,7 +154,6 @@ evbuffer_get_waste(struct evbuffer *buf, size_t *allocatedp, size_t *wastedp, si + } + /* subsequent empty chains */ + while (chain) { +- ++n; + a += chain->buffer_len; + } + *allocatedp = a; diff --git a/dev-libs/libevent/files/libevent-2.1.12-libressl.patch b/dev-libs/libevent/files/libevent-2.1.12-libressl.patch new file mode 100644 index 000000000000..4c809aface12 --- /dev/null +++ b/dev-libs/libevent/files/libevent-2.1.12-libressl.patch @@ -0,0 +1,30 @@ +https://bugs.gentoo.org/903001 +https://github.com/libevent/libevent/issues/1277 +https://github.com/libevent/libevent/pull/1227 +https://github.com/libevent/libevent/commit/883630f76cbf512003b81de25cd96cb75c6cf0f9 + +From 883630f76cbf512003b81de25cd96cb75c6cf0f9 Mon Sep 17 00:00:00 2001 +From: Theo Buehler <tb@openbsd.org> +Date: Sun, 21 Nov 2021 21:38:20 +0100 +Subject: [PATCH] Don't define BIO_get_init() for LibreSSL 3.5+ + +BIO_get_init() is available in LibreSSL 3.5 and later. The BIO type +will become opaque, so the existing macro will break the build. +--- + openssl-compat.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/openssl-compat.h b/openssl-compat.h +index a23e34251b..f5de25539f 100644 +--- a/openssl-compat.h ++++ b/openssl-compat.h +@@ -40,7 +40,8 @@ static inline BIO_METHOD *BIO_meth_new(int type, const char *name) + #endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) || \ + (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) */ + +-#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L ++#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L && \ ++ LIBRESSL_VERSION_NUMBER < 0x30500000L + #define BIO_get_init(b) (b)->init + #endif + |