From 84c8220da769534a6bb8ae05c700e415b1b73121 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 30 2018 04:49:45 +0000 Subject: import libtevent-0.9.36-1.el7 --- diff --git a/.gitignore b/.gitignore index 7206b49..d29c4a6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/tevent-0.9.33.tar.gz +SOURCES/tevent-0.9.36.tar.gz diff --git a/.libtevent.metadata b/.libtevent.metadata index cfa3928..49080a1 100644 --- a/.libtevent.metadata +++ b/.libtevent.metadata @@ -1 +1 @@ -3e50a2f17146abb339f0ab0f5b575873c06a789e SOURCES/tevent-0.9.33.tar.gz +52abcf7e7e298ccaca3b13e72a567cfaf3fb2da0 SOURCES/tevent-0.9.36.tar.gz diff --git a/SOURCES/0001-tevent-Fix-a-race-condition.patch b/SOURCES/0001-tevent-Fix-a-race-condition.patch deleted file mode 100644 index b5a8c12..0000000 --- a/SOURCES/0001-tevent-Fix-a-race-condition.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 75f163dbcbd46922934e24cac6d4b7101e06321d Mon Sep 17 00:00:00 2001 -From: Volker Lendecke -Date: Fri, 10 Nov 2017 21:22:26 +0100 -Subject: [PATCH] tevent: Fix a race condition - -We can't rely on tctx to exist after we unlocked the mutex. It took a -while, but this does lead to data corruption. If *tctx is replaced with -something where tctx->wakeup_fd points to a real, existing file -descriptor, we're screwed. And by screwed, this means file corruption -on disk. - -Again. I am not tall enough for this business. - -http://bholley.net/blog/2015/must-be-this-tall-to-write-multi-threaded-code.html - -BUG: https://bugzilla.samba.org/show_bug.cgi?id=13130 - -Signed-off-by: Volker Lendecke -Reviewed-by: Jeremy Allison ---- - lib/tevent/tevent_threads.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/lib/tevent/tevent_threads.c b/lib/tevent/tevent_threads.c -index 4d1a8805181..2e83f1b66c2 100644 ---- a/lib/tevent/tevent_threads.c -+++ b/lib/tevent/tevent_threads.c -@@ -451,7 +451,7 @@ void _tevent_threaded_schedule_immediate(struct tevent_threaded_context *tctx, - { - #ifdef HAVE_PTHREAD - struct tevent_context *ev; -- int ret; -+ int ret, wakeup_fd; - - ret = pthread_mutex_lock(&tctx->event_ctx_mutex); - if (ret != 0) { -@@ -495,6 +495,8 @@ void _tevent_threaded_schedule_immediate(struct tevent_threaded_context *tctx, - abort(); - } - -+ wakeup_fd = tctx->wakeup_fd; -+ - ret = pthread_mutex_unlock(&tctx->event_ctx_mutex); - if (ret != 0) { - abort(); -@@ -510,7 +512,7 @@ void _tevent_threaded_schedule_immediate(struct tevent_threaded_context *tctx, - * than a noncontended one. So I'd opt for the lower footprint - * initially. Maybe we have to change that later. - */ -- tevent_common_wakeup_fd(tctx->wakeup_fd); -+ tevent_common_wakeup_fd(wakeup_fd); - #else - /* - * tevent_threaded_context_create() returned NULL with ENOSYS... --- -2.15.0.448.gf294e3d99a-goog - diff --git a/SPECS/libtevent.spec b/SPECS/libtevent.spec index ebdcf54..0a827fc 100644 --- a/SPECS/libtevent.spec +++ b/SPECS/libtevent.spec @@ -1,6 +1,6 @@ Name: libtevent -Version: 0.9.33 -Release: 2%{?dist} +Version: 0.9.36 +Release: 1%{?dist} Group: System Environment/Daemons Summary: The tevent library License: LGPLv3+ @@ -18,7 +18,6 @@ BuildRequires: libxslt Provides: bundled(libreplace) # Patches -Patch0001: 0001-tevent-Fix-a-race-condition.patch %description Tevent is an event system based on the talloc memory management library. @@ -118,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig %changelog +* Tue Apr 10 2018 Jakub Hrozek - 0.9.36 +- Resolves: #1558494 - Rebase tevent to the latest available upstream release + * Thu Nov 16 2017 Jakub Hrozek - 0.9.34-1 - Resolves: #1512414 - tevent can cause a Samba file corruption bug under heavy threaded load