parent
581ee5b7b2
commit
325e600b7a
3 changed files with 52 additions and 9 deletions
|
@ -713,9 +713,11 @@ libsasl2.so.3 libsasl-2.1.26_1
|
||||||
liblber-2.4.so.2 libldap-2.4.21_1
|
liblber-2.4.so.2 libldap-2.4.21_1
|
||||||
libldap-2.4.so.2 libldap-2.4.21_1
|
libldap-2.4.so.2 libldap-2.4.21_1
|
||||||
libldap_r-2.4.so.2 libldap-2.4.21_1
|
libldap_r-2.4.so.2 libldap-2.4.21_1
|
||||||
libevent-2.1.so.6 libevent-2.1.8_1
|
libevent-2.1.so.7 libevent-2.1.11_1
|
||||||
libevent_core-2.1.so.6 libevent-2.1.8_1
|
libevent_core-2.1.so.7 libevent-2.1.11_1
|
||||||
libevent_pthreads-2.1.so.6 libevent-2.1.8_1
|
libevent_extra-2.1.so.7 libevent-2.1.11_1
|
||||||
|
libevent_pthreads-2.1.so.7 libevent-2.1.11_1
|
||||||
|
libevent_openssl-2.1.so.7 libevent-2.1.11_1
|
||||||
libSDL_mixer-1.2.so.0 SDL_mixer-1.2.11_1
|
libSDL_mixer-1.2.so.0 SDL_mixer-1.2.11_1
|
||||||
libapr-1.so.0 apr-1.4.2_1
|
libapr-1.so.0 apr-1.4.2_1
|
||||||
libaprutil-1.so.0 apr-util-1.3.9_1
|
libaprutil-1.so.0 apr-util-1.3.9_1
|
||||||
|
@ -2929,8 +2931,6 @@ libmirage.so.11 libmirage-3.1.0_1
|
||||||
libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
|
libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
|
||||||
libixml.so.10 libupnp1.8-1.8.2_1
|
libixml.so.10 libupnp1.8-1.8.2_1
|
||||||
libupnp.so.13 libupnp1.8-1.8.4_1
|
libupnp.so.13 libupnp1.8-1.8.4_1
|
||||||
libevent_extra-2.1.so.6 libevent-2.1.8_3
|
|
||||||
libevent_openssl-2.1.so.6 libevent-2.1.8_3
|
|
||||||
libsysprof-3.so sysprof-3.34.0_1
|
libsysprof-3.so sysprof-3.34.0_1
|
||||||
libsysprof-ui-3.so sysprof-3.34.0_1
|
libsysprof-ui-3.so sysprof-3.34.0_1
|
||||||
libmozjs-52.so mozjs52-52.3.0_1
|
libmozjs-52.so mozjs52-52.3.0_1
|
||||||
|
|
|
@ -0,0 +1,43 @@
|
||||||
|
#upstream: yes
|
||||||
|
|
||||||
|
From ddacaef59ab6808a0801007d0a681f2415af4871 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Azat Khuzhin <azat@libevent.org>
|
||||||
|
Date: Thu, 29 Aug 2019 22:57:44 +0300
|
||||||
|
Subject: [PATCH] Revert "Warn if forked from the event loop during
|
||||||
|
event_reinit()"
|
||||||
|
|
||||||
|
Thinking about this more and realizing that this was a mistake, so
|
||||||
|
should be reverted.
|
||||||
|
|
||||||
|
In a nut shell I guess most of the apps calls event_reinit() from the
|
||||||
|
loop (see [1] for example), and this should be totally fine (the bit
|
||||||
|
with the signals [2] handled in event_reinit() gracefully)
|
||||||
|
|
||||||
|
[1]: https://archives.seul.org/libevent/users/Aug-2019/msg00009.html
|
||||||
|
[2]: https://github.com/libevent/libevent/pull/833#issuecomment-501834453
|
||||||
|
|
||||||
|
This reverts commit 497ef904d544ac51de43934549dbeccce8e6e8f8.
|
||||||
|
|
||||||
|
Reported-by: mikulas@twibright.com
|
||||||
|
Backport-to: 2.1
|
||||||
|
---
|
||||||
|
event.c | 6 ------
|
||||||
|
1 file changed, 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/event.c b/event.c
|
||||||
|
index 8cae318d1..ff4e79c84 100644
|
||||||
|
--- event.c
|
||||||
|
+++ event.c
|
||||||
|
@@ -1003,12 +1003,6 @@ event_reinit(struct event_base *base)
|
||||||
|
|
||||||
|
EVBASE_ACQUIRE_LOCK(base, th_base_lock);
|
||||||
|
|
||||||
|
- if (base->running_loop) {
|
||||||
|
- event_warnx("%s: forked from the event_loop.", __func__);
|
||||||
|
- res = -1;
|
||||||
|
- goto done;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
evsel = base->evsel;
|
||||||
|
|
||||||
|
/* check if this event mechanism requires reinit on the backend */
|
|
@ -1,16 +1,16 @@
|
||||||
# Template file for 'libevent'
|
# Template file for 'libevent'
|
||||||
pkgname=libevent
|
pkgname=libevent
|
||||||
version=2.1.10
|
version=2.1.11
|
||||||
revision=2
|
revision=1
|
||||||
wrksrc="${pkgname}-${version}-stable"
|
wrksrc="${pkgname}-${version}-stable"
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
makedepends="libressl-devel"
|
makedepends="libressl-devel"
|
||||||
short_desc="Abstract asynchronous event notification library"
|
short_desc="Abstract asynchronous event notification library"
|
||||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
maintainer="Orphaned <orphan@voidlinux.org>"
|
||||||
|
license="BSD-3-Clause"
|
||||||
homepage="http://libevent.org/"
|
homepage="http://libevent.org/"
|
||||||
license="3-clause-BSD"
|
|
||||||
distfiles="https://github.com/libevent/libevent/releases/download/release-${version}-stable/libevent-${version}-stable.tar.gz"
|
distfiles="https://github.com/libevent/libevent/releases/download/release-${version}-stable/libevent-${version}-stable.tar.gz"
|
||||||
checksum=e864af41a336bb11dab1a23f32993afe963c1f69618bd9292b89ecf6904845b0
|
checksum=a65bac6202ea8c5609fd5c7e480e6d25de467ea1917c08290c521752f147283d
|
||||||
|
|
||||||
post_install() {
|
post_install() {
|
||||||
vlicense LICENSE
|
vlicense LICENSE
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue