From d036845ead667355079ce16f51feec75ef69fff6 Mon Sep 17 00:00:00 2001 From: eweos-helper <134289199+eweos-helper[bot]@users.noreply.github.com> Date: Wed, 1 Jul 2026 17:13:44 +0000 Subject: [PATCH 1/4] [libevent] 2.1.13-1: new upstream version --- EVENT__SIZEOF_TIME_T.patch | 37 -------------- PKGBUILD | 23 ++------- libevent-2.1.12-openssl-compat.patch | 74 ---------------------------- 3 files changed, 5 insertions(+), 129 deletions(-) delete mode 100644 EVENT__SIZEOF_TIME_T.patch delete mode 100644 libevent-2.1.12-openssl-compat.patch diff --git a/EVENT__SIZEOF_TIME_T.patch b/EVENT__SIZEOF_TIME_T.patch deleted file mode 100644 index 30089040d..000000000 --- a/EVENT__SIZEOF_TIME_T.patch +++ /dev/null @@ -1,37 +0,0 @@ -From f5ad737d73ed18b95ce63f1d8e933a89a26653e9 Mon Sep 17 00:00:00 2001 -From: Azat Khuzhin -Date: Sat, 9 Jul 2022 14:22:38 +0300 -Subject: [PATCH] Add -Wundef for cmake and fix EVENT__SIZEOF_TIME_T usage - -Note, autotools already supports it. ---- - CMakeLists.txt | 1 + - event-config.h.cmake | 3 +++ - 2 files changed, 4 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5ee0df2f7..9237252c7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -295,6 +295,7 @@ if (${GNUC}) - - list(APPEND __FLAGS - -Wall -Wextra -Wno-unused-parameter -Wstrict-aliasing -Wstrict-prototypes -+ -Wundef - - -fno-strict-aliasing # gcc 2.9.5+ - -Wmissing-prototypes -diff --git a/event-config.h.cmake b/event-config.h.cmake -index 9fff34877..4a6267017 100644 ---- a/event-config.h.cmake -+++ b/event-config.h.cmake -@@ -485,6 +485,9 @@ - /* The size of 'void *', as computer by sizeof */ - #define EVENT__SIZEOF_VOID_P @EVENT__SIZEOF_VOID_P@ - -+/* The size of 'time_t', as computer by sizeof */ -+#define EVENT__SIZEOF_TIME_T @EVENT__SIZEOF_TIME_T@ -+ - /* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ - #ifndef __cplusplus diff --git a/PKGBUILD b/PKGBUILD index 306ee11bf..f744dbf5d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,8 +2,8 @@ # Maintainer: Aleksana QwQ pkgname=libevent -pkgver=2.1.12 -pkgrel=8 +pkgver=2.1.13 +pkgrel=1 pkgdesc="Event notification library" url="https://libevent.org/" arch=(x86_64 aarch64 riscv64 loongarch64) @@ -12,20 +12,8 @@ depends=(openssl) makedepends=(cmake ninja python zlib) optdepends=('python: event_rpcgen.py') provides=(libevent{,_core,_extra,_openssl,_pthreads}-2.1.so) -# EVENT__SIZEOF_TIME_T.patch: Fix Firefox build -# libevent-2.1.12-openssl-compat.patch: Fix build with OpenSSL 3.0 -source=( - "https://github.com/libevent/libevent/releases/download/release-$pkgver-stable/libevent-$pkgver-stable.tar.gz" - EVENT__SIZEOF_TIME_T.patch - libevent-2.1.12-openssl-compat.patch -) -sha256sums=('92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb' - '945fc885b15692721bc7ae52f5774ef4fab8cc0f6108baa8860ab368de8675cf' - 'e41527c55f6dacc6453b13eeeea2664798496896b796abcd2a5c8304c9eb2bae') - -prepare(){ - _patch_ libevent-$pkgver-stable -} +source=("https://github.com/libevent/libevent/releases/download/release-$pkgver-stable/libevent-$pkgver-stable.tar.gz") +sha256sums=('f7e9383b8c0baa81b687e5b5eecc01beefaf1b19b64151d95ed61647fe7a315c') build() { @@ -42,8 +30,7 @@ build() check() { cd build - # four matching test failed, unknown reason (suspect zlib-ng) - ctest -E "regress__(timerfd_)?(changelist_)?(EPOLL|SELECT|POLL)(_debug)?" \ + ctest \ --output-on-failure \ --stop-on-failure \ -j$(nproc) diff --git a/libevent-2.1.12-openssl-compat.patch b/libevent-2.1.12-openssl-compat.patch deleted file mode 100644 index ba7393083..000000000 --- a/libevent-2.1.12-openssl-compat.patch +++ /dev/null @@ -1,74 +0,0 @@ -commit 7f4684c0d362fefee8697ceed3f4f8642ed147ce -Author: William Marlow -Date: Sat Jun 18 21:43:31 2022 +0100 - - Initial OpenSSL 3.0 support - - * Don't use deprecated functions when building against OpenSSL 3.0. - * Recognise that OpenSSL 3.0 can signal a dirty shutdown as a protocol. - error in addition to the expected IO error produced by OpenSSL 1.1.1 - * Update regress_mbedtls.c for compatibility with OpenSSL 3 - - (cherry picked from commit 29c420c418aeb497e5e8b7abd45dee39194ca5fc) - - Conflicts: - bufferevent_openssl.c - sample/becat.c - test/regress_mbedtls.c - -diff --git a/bufferevent_openssl.c b/bufferevent_openssl.c -index b51b834b..520e2d6f 100644 ---- a/bufferevent_openssl.c -+++ b/bufferevent_openssl.c -@@ -514,7 +514,9 @@ conn_closed(struct bufferevent_openssl *bev_ssl, int when, int errcode, int ret) - put_error(bev_ssl, errcode); - break; - case SSL_ERROR_SSL: -- /* Protocol error. */ -+ /* Protocol error; possibly a dirty shutdown. */ -+ if (ret == 0 && SSL_is_init_finished(bev_ssl->ssl) == 0) -+ dirty_shutdown = 1; - put_error(bev_ssl, errcode); - break; - case SSL_ERROR_WANT_X509_LOOKUP: -diff --git a/sample/le-proxy.c b/sample/le-proxy.c -index 13e0e2ae..e9af3c68 100644 ---- a/sample/le-proxy.c -+++ b/sample/le-proxy.c -@@ -112,10 +112,15 @@ eventcb(struct bufferevent *bev, short what, void *ctx) - ERR_reason_error_string(err); - const char *lib = (const char*) - ERR_lib_error_string(err); -+#if OPENSSL_VERSION_MAJOR >= 3 -+ fprintf(stderr, -+ "%s in %s\n", msg, lib); -+#else - const char *func = (const char*) - ERR_func_error_string(err); - fprintf(stderr, - "%s in %s %s\n", msg, lib, func); -+#endif - } - if (errno) - perror("connection error"); -diff --git a/test/regress_ssl.c b/test/regress_ssl.c -index 37dc334d..490be9b2 100644 ---- a/test/regress_ssl.c -+++ b/test/regress_ssl.c -@@ -374,7 +374,16 @@ eventcb(struct bufferevent *bev, short what, void *ctx) - ++n_connected; - ssl = bufferevent_openssl_get_ssl(bev); - tt_assert(ssl); -+#if OPENSSL_VERSION_MAJOR >= 3 -+ /* SSL_get1_peer_certificate() means we want -+ * to increase the reference count on the cert -+ * and so we will need to free it ourselves later -+ * when we're done with it. The non-reference count -+ * increasing version is not available in OpenSSL 1.1.1. */ -+ peer_cert = SSL_get1_peer_certificate(ssl); -+#else - peer_cert = SSL_get_peer_certificate(ssl); -+#endif - if (type & REGRESS_OPENSSL_SERVER) { - tt_assert(peer_cert == NULL); - } else { From c23f458a746667fa19c953a07e10af687d74ff18 Mon Sep 17 00:00:00 2001 From: Yao Zi Date: Sun, 5 Jul 2026 22:31:21 +0000 Subject: [PATCH 2/4] [libevent] 2.1.13-1: Clean up PKGBUILD --- PKGBUILD | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index f744dbf5d..2b30d53f6 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -15,8 +15,7 @@ provides=(libevent{,_core,_extra,_openssl,_pthreads}-2.1.so) source=("https://github.com/libevent/libevent/releases/download/release-$pkgver-stable/libevent-$pkgver-stable.tar.gz") sha256sums=('f7e9383b8c0baa81b687e5b5eecc01beefaf1b19b64151d95ed61647fe7a315c') -build() -{ +build() { cmake -S libevent-$pkgver-stable -B build -G Ninja \ -DCMAKE_BUILD_TYPE=None \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -27,8 +26,7 @@ build() cmake --build build } -check() -{ +check() { cd build ctest \ --output-on-failure \ @@ -36,8 +34,7 @@ check() -j$(nproc) } -package_libevent() -{ +package() { DESTDIR="$pkgdir" cmake --install build install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 libevent-$pkgver-stable/LICENSE } From e19a6e7cc085a71de8676d19414f67b98ef86b7f Mon Sep 17 00:00:00 2001 From: Yao Zi Date: Sun, 5 Jul 2026 22:34:57 +0000 Subject: [PATCH 3/4] [libevent] 2.1.13-1: Add musl to depends --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 2b30d53f6..a07c249bb 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -8,7 +8,7 @@ pkgdesc="Event notification library" url="https://libevent.org/" arch=(x86_64 aarch64 riscv64 loongarch64) license=(BSD) -depends=(openssl) +depends=(musl openssl) makedepends=(cmake ninja python zlib) optdepends=('python: event_rpcgen.py') provides=(libevent{,_core,_extra,_openssl,_pthreads}-2.1.so) From caff708b61b3379dea6efcb8ef4c2112c12b4836 Mon Sep 17 00:00:00 2001 From: Yao Zi Date: Sun, 5 Jul 2026 22:35:35 +0000 Subject: [PATCH 4/4] [libevent] 2.1.13-1: Use SPDX license identifier --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index a07c249bb..45c8e1af6 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ pkgrel=1 pkgdesc="Event notification library" url="https://libevent.org/" arch=(x86_64 aarch64 riscv64 loongarch64) -license=(BSD) +license=(BSD-3-Clause) depends=(musl openssl) makedepends=(cmake ninja python zlib) optdepends=('python: event_rpcgen.py')